diff options
author | Joshua Baergen <joshuabaergen@gentoo.org> | 2006-04-14 15:58:02 +0000 |
---|---|---|
committer | Joshua Baergen <joshuabaergen@gentoo.org> | 2006-04-14 15:58:02 +0000 |
commit | aead93b409a04d9b4b00b8f2aeda61d07b0458ae (patch) | |
tree | cbb895e757f6999ec34912905677d12182251dd1 /media-libs/mesa | |
parent | version bump, #129722. removed old versions. 20060301 stable on x86 and amd64 (diff) | |
download | historical-aead93b409a04d9b4b00b8f2aeda61d07b0458ae.tar.gz historical-aead93b409a04d9b4b00b8f2aeda61d07b0458ae.tar.bz2 historical-aead93b409a04d9b4b00b8f2aeda61d07b0458ae.zip |
Revision bump to use new paths for drivers. Drivers now sit in
/usr/$(get_libdir)/dri, rather than /usr/$(get_libdir)/xorg/modules/dri .
Package-Manager: portage-2.1_pre7-r5
Diffstat (limited to 'media-libs/mesa')
-rw-r--r-- | media-libs/mesa/ChangeLog | 9 | ||||
-rw-r--r-- | media-libs/mesa/Manifest | 15 | ||||
-rw-r--r-- | media-libs/mesa/files/change-default-dri-driver-dir-X7.1.patch | 11 | ||||
-rw-r--r-- | media-libs/mesa/files/digest-mesa-6.5-r2 | 3 | ||||
-rw-r--r-- | media-libs/mesa/mesa-6.5-r2.ebuild | 326 |
5 files changed, 360 insertions, 4 deletions
diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog index ccac68bfc9aa..736fc7dca322 100644 --- a/media-libs/mesa/ChangeLog +++ b/media-libs/mesa/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-libs/mesa # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.78 2006/04/12 02:49:02 joshuabaergen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.79 2006/04/14 15:58:02 joshuabaergen Exp $ + +*mesa-6.5-r2 (14 Apr 2006) + + 14 Apr 2006; Joshua Baergen <joshuabaergen@gentoo.org> + +files/change-default-dri-driver-dir-X7.1.patch, +mesa-6.5-r2.ebuild: + Revision bump to use new paths for drivers. Drivers now sit in + /usr/$(get_libdir)/dri, rather than /usr/$(get_libdir)/xorg/modules/dri . *mesa-6.5-r1 (12 Apr 2006) diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index 8ce3f4925619..c4c595882e33 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -1,6 +1,6 @@ -MD5 b649bca8a24340e5839c0d66b3f8959c ChangeLog 15757 -RMD160 d2a7710d42b0945b6c831778dcfd756935fb42a2 ChangeLog 15757 -SHA256 acca462bfdaf33dbaedb988eccff217b39889d50bb51823a834f569a10ce7097 ChangeLog 15757 +MD5 6fc4fced39f87081261c2c29be08f075 ChangeLog 16057 +RMD160 d443c3700419779c74ceeab32824c9c15c9f49e4 ChangeLog 16057 +SHA256 df105fadf68e703e5e9758c63c8b674e7dc6fd5ef5f64f468840790d45001662 ChangeLog 16057 MD5 ae36bba4e878c77dc2e823ce00e98869 files/6.4-dont-install-gles-headers.patch 421 RMD160 70713f143d080b444089a95712efd227227c523f files/6.4-dont-install-gles-headers.patch 421 SHA256 8f636c2e09ac7fdab0d06ebe62af5a311b52a03bf7b7bdecf4789a6e30e0777e files/6.4-dont-install-gles-headers.patch 421 @@ -16,6 +16,9 @@ SHA256 757a94fe2e76f6ea4d831a3aaf3fac7e344527239a10b014d6900af341e7abab files/64 MD5 c955d3e7a9971b7a32359a45383569f8 files/64bit-fix-indirect-vertex-array.patch 748 RMD160 b413df73cc43b83931cd25d5e207d3c49078dd55 files/64bit-fix-indirect-vertex-array.patch 748 SHA256 2e070e5e4aa4b1a1f12ccce290496c5eca92d76819805fe8d529a4f7fd71c82c files/64bit-fix-indirect-vertex-array.patch 748 +MD5 81ac0734b6194da3d9ca40d564303670 files/change-default-dri-driver-dir-X7.1.patch 399 +RMD160 169dd99888a66bf63bc528f183bd4c2b6d16b0f9 files/change-default-dri-driver-dir-X7.1.patch 399 +SHA256 8dbdbad95f47bfc18a366e091ffc1d67ff16da970181626d939a19eed46a212d files/change-default-dri-driver-dir-X7.1.patch 399 MD5 cdc08801bd33dadb19c29e4c91863c73 files/change-default-dri-driver-dir.patch 412 RMD160 84b1a7e60661603735f377759917c1064346ee3e files/change-default-dri-driver-dir.patch 412 SHA256 50868940210dc613b67b87a900158719e96bb38451cbcfbd12edab4b170065d7 files/change-default-dri-driver-dir.patch 412 @@ -28,6 +31,9 @@ SHA256 5a5ab578d50f251808ddf18cd61f6e5518224168555fc288725a8466892b4f88 files/di MD5 80bc8bfb6472d4dcbad6e14a2595c1a9 files/digest-mesa-6.5-r1 241 RMD160 069ddf1320b547a5a5cf1af3d0611a6c35398c7e files/digest-mesa-6.5-r1 241 SHA256 5a5ab578d50f251808ddf18cd61f6e5518224168555fc288725a8466892b4f88 files/digest-mesa-6.5-r1 241 +MD5 80bc8bfb6472d4dcbad6e14a2595c1a9 files/digest-mesa-6.5-r2 241 +RMD160 069ddf1320b547a5a5cf1af3d0611a6c35398c7e files/digest-mesa-6.5-r2 241 +SHA256 5a5ab578d50f251808ddf18cd61f6e5518224168555fc288725a8466892b4f88 files/digest-mesa-6.5-r2 241 MD5 f0ebdc72043e76ad7eddc4ad91349927 files/lib/libGL.la 763 RMD160 a6882fb5d6d8ad195845bdda3bcbbef2aef79099 files/lib/libGL.la 763 SHA256 0fb9c02b01c9b2306fac89034144bb3e87aedba0dee0a49203aa18fbf0b706bf files/lib/libGL.la 763 @@ -46,6 +52,9 @@ SHA256 458b92ef427553d05e75e0ff4ccb0a330ba5b1c7660bbd721b2ac41a871f25d8 mesa-6.4 MD5 f4a6aa479983ecf7a00f29557de8e10a mesa-6.5-r1.ebuild 8876 RMD160 2bed94d0f56b87e3c84f4b00647db96dff5a4078 mesa-6.5-r1.ebuild 8876 SHA256 c7d965b6b38d2c7d376a3dfdd76d15fac1840841de17337adfe28cc1ab887b50 mesa-6.5-r1.ebuild 8876 +MD5 8689ca7f02c86bb6f571f029419a4ea8 mesa-6.5-r2.ebuild 8842 +RMD160 d90d3d2bad3db1fc013c18e2dabb2e2675a4936a mesa-6.5-r2.ebuild 8842 +SHA256 0122fdf4b603766ce208f1cbf952d22c2774a333eec13189361585bf339c39b8 mesa-6.5-r2.ebuild 8842 MD5 031467cd2fc95caabcb10b14d703344d mesa-6.5.ebuild 8810 RMD160 7022c60019fddda6fd88ec0858a476ba8c216a10 mesa-6.5.ebuild 8810 SHA256 2c820275f2b6c91e602fc9c1ee4032dd835bca9bb8b079d134b200aa32bf395f mesa-6.5.ebuild 8810 diff --git a/media-libs/mesa/files/change-default-dri-driver-dir-X7.1.patch b/media-libs/mesa/files/change-default-dri-driver-dir-X7.1.patch new file mode 100644 index 000000000000..5ea692419250 --- /dev/null +++ b/media-libs/mesa/files/change-default-dri-driver-dir-X7.1.patch @@ -0,0 +1,11 @@ +--- Mesa-6.3.1.1.orig/src/glx/x11/dri_glx.c 2005-07-27 17:29:51.000000000 -0700 ++++ Mesa-6.3.1.1/src/glx/x11/dri_glx.c 2005-08-14 11:09:54.000000000 -0700 +@@ -58,7 +58,7 @@ + + #ifndef DEFAULT_DRIVER_DIR + /* this is normally defined in the Imakefile */ +-#define DEFAULT_DRIVER_DIR "/usr/X11R6/lib/modules/dri" ++#define DEFAULT_DRIVER_DIR "/usr/lib/dri" + #endif + + static __DRIdriver *Drivers = NULL; diff --git a/media-libs/mesa/files/digest-mesa-6.5-r2 b/media-libs/mesa/files/digest-mesa-6.5-r2 new file mode 100644 index 000000000000..79639c7ca0fc --- /dev/null +++ b/media-libs/mesa/files/digest-mesa-6.5-r2 @@ -0,0 +1,3 @@ +MD5 61beda590bfc5b4a12e979d5f2d70d7a MesaLib-6.5.tar.bz2 3062363 +RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd MesaLib-6.5.tar.bz2 3062363 +SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd MesaLib-6.5.tar.bz2 3062363 diff --git a/media-libs/mesa/mesa-6.5-r2.ebuild b/media-libs/mesa/mesa-6.5-r2.ebuild new file mode 100644 index 000000000000..cf65c48ad279 --- /dev/null +++ b/media-libs/mesa/mesa-6.5-r2.ebuild @@ -0,0 +1,326 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5-r2.ebuild,v 1.1 2006/04/14 15:58:02 joshuabaergen Exp $ + +inherit eutils toolchain-funcs multilib flag-o-matic portability + +OPENGL_DIR="xorg-x11" + +MY_PN="${PN/m/M}" +MY_P="${MY_PN}-${PV}" +MY_SRC_P="${MY_PN}Lib-${PV}" +DESCRIPTION="OpenGL-like graphic library for Linux" +HOMEPAGE="http://mesa3d.sourceforge.net/" +SRC_URI="mirror://sourceforge/mesa3d/${MY_SRC_P}.tar.bz2" +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE_VIDEO_CARDS=" + video_cards_ati + video_cards_sunffb + video_cards_i810 + video_cards_mga + video_cards_none + video_cards_s3virge + video_cards_savage + video_cards_sis + video_cards_tdfx + video_cards_trident + video_cards_via" +IUSE="${IUSE_VIDEO_CARDS} + debug + motif" + +RDEPEND="dev-libs/expat + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXxf86vm + x11-libs/libXi + x11-libs/libXmu + >=x11-libs/libdrm-2.0.1 + x11-libs/libICE + app-admin/eselect-opengl + motif? ( virtual/motif ) + !<=x11-base/xorg-x11-6.9" +DEPEND="${RDEPEND} + x11-misc/makedepend + x11-proto/inputproto + x11-proto/xextproto + !hppa? ( x11-proto/xf86driproto ) + x11-proto/xf86vidmodeproto + >=x11-proto/glproto-1.4-r1 + motif? ( x11-proto/printproto )" + +PROVIDE="virtual/opengl virtual/glu" + +S="${WORKDIR}/${MY_P}" + +# Think about: ggi, svga, fbcon, no-X configs + +if use debug; then + if ! has splitdebug ${FEATURES}; then + RESTRICT="${RESTRICT} nostrip" + fi +fi + +pkg_setup() { + if use debug; then + strip-flags + append-flags -g + fi + + if [[ ${KERNEL} == "FreeBSD" ]]; then + CONFIG="freebsd" + elif use x86; then + CONFIG="linux-dri-x86" + elif use amd64; then + CONFIG="linux-dri-x86-64" + elif use ppc; then + CONFIG="linux-dri-ppc" + else + CONFIG="linux-dri" + fi +} + +src_unpack() { + HOSTCONF="${S}/configs/${CONFIG}" + + unpack ${A} + cd ${S} + + epatch ${FILESDIR}/6.4-dont-install-gles-headers.patch + epatch ${FILESDIR}/change-default-dri-driver-dir-X7.1.patch + epatch ${FILESDIR}/6.4-multilib-fix.patch + epatch ${FILESDIR}/6.5-re-order-context-destruction.patch + + # Don't compile debug code with USE=-debug - bug #125004 + if ! use debug; then + einfo "Removing DO_DEBUG defs in dri drivers..." + find src/mesa/drivers/dri -name *.[hc] -exec egrep -l "\#define\W+DO_DEBUG\W+1" {} \; | xargs sed -i -re "s/\#define\W+DO_DEBUG\W+1/\#define DO_DEBUG 0/" ; + fi + + + # Fix dprintf issues with sys-libs/glibc-2.4, see bug #125806. + einfo "sed for dprintf to __mesa_dprintf..." + sed -i -e "s:dprintf:__mesa_dprintf:g" $(grep dprintf src/glu/sgi/* -rl) \ + || die "sed for dprintf to __mesa_dprintf failed. :(" + + # Set default dri drivers directory + echo "DEFINES += -DDEFAULT_DRIVER_DIR='\"/usr/$(get_libdir)/dri\"'" >> ${HOSTCONF} + + # Configurable DRI drivers + if use video_cards_ati; then + add_drivers mach64 r128 radeon r200 r300 + fi + if use video_cards_sunffb; then + add_drivers ffb + fi + if use video_cards_i810; then + add_drivers i810 i915 + fi + if use video_cards_mga; then + add_drivers mga + fi + if use video_cards_s3virge; then + add_drivers s3v + fi + if use video_cards_savage; then + add_drivers savage + fi + if use video_cards_sis; then + add_drivers sis + fi + if use video_cards_tdfx; then + add_drivers tdfx + fi + if use video_cards_trident; then + add_drivers trident + fi + if use video_cards_via; then + add_drivers unichrome + fi + + # Defaults based on X.Org 6.9, with some changes + if [[ ! -n "${VIDEO_CARDS}" ]]; then + if use alpha; then + add_drivers mga tdfx r128 r200 r300 radeon + elif use amd64; then + add_drivers i915 mga r128 r200 r300 radeon tdfx + elif use arm; then + add_drivers mga r128 r200 r300 radeon + elif use hppa; then + # no accelerated 3D on hppa + true + elif use ia64; then + add_drivers mach64 mga r128 r200 r300 radeon tdfx unichrome + elif use mips; then + # no accelerated 3D on mips + true + elif use ppc; then + add_drivers mach64 mga r128 r200 r300 radeon tdfx + elif use ppc64; then + add_drivers mga r128 r200 r300 radeon + elif use sparc; then + add_drivers ffb mach64 + elif use x86; then + add_drivers i810 i915 mach64 mga r128 r200 r300 radeon s3v savage \ + sis tdfx trident unichrome + fi + fi + + # Set drivers to everything on which we ran add_drivers() + echo "DRI_DIRS = ${DRI_DRIVERS}" >> ${HOSTCONF} + + if use sparc; then + einfo "Sparc assembly code is not working; deactivating" + echo "ASM_FLAGS =" >> ${HOSTCONF} + echo "ASM_SOURCES =" >> ${HOSTCONF} + fi + + # Kill this; we don't want /usr/X11R6/lib ever to be searched in this + # build. + echo "EXTRA_LIB_PATH =" >> ${HOSTCONF} + + echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF} + echo "CC = $(tc-getCC)" >> ${HOSTCONF} + echo "CXX = $(tc-getCXX)" >> ${HOSTCONF} + # bug #110840 - Build with PIC, since it hasn't been shown to slow it down + echo "PIC_FLAGS = -fPIC" >> ${HOSTCONF} + + # Removed glut, since we have separate freeglut/glut ebuilds + # Remove EGL, since Brian Paul says it's not ready for a release + echo "SRC_DIRS = glx/x11 mesa glu glw" >> ${HOSTCONF} + + # Get rid of glut includes + rm -f ${S}/include/GL/glut*h + + # r200 breaks without this, since it's the only EGL-enabled driver so far + echo "USING_EGL = 0" >> ${HOSTCONF} + + # Don't build EGL demos. EGL isn't ready for release, plus they produce a + # circular dependency with glut. + echo "PROGRAM_DIRS =" >> ${HOSTCONF} + + # Documented in configs/default + if use motif; then + # Add -lXm + echo "GLW_LIB_DEPS += -lXm" >> ${HOSTCONF} + # Add GLwMDrawA.c + echo "GLW_SOURCES += GLwMDrawA.c" >> ${HOSTCONF} + fi +} + +src_compile() { + emake -j1 ${CONFIG} || die "Build failed" +} + +src_install() { + dodir /usr + make \ + DESTDIR=${D}/usr \ + INCLUDE_DIR=${D}/usr/include \ + LIB_DIR=${D}/usr/$(get_libdir) \ + install || die "Installation failed" + + ## + # Install the actual drivers --- 'make install' doesn't install them + # anywhere. + dodir /usr/$(get_libdir)/dri + exeinto /usr/$(get_libdir)/dri + ebegin "Installing drivers to ${EXEDESTTREE}" + find ${S}/lib* -name '*_dri.so' | xargs doexe + eend + + if ! use motif; then + rm ${D}/usr/include/GL/GLwMDrawA.h + fi + + # Don't install private headers + rm ${D}/usr/include/GL/GLw*P.h + + fix_opengl_symlinks + dynamic_libgl_install + + # Install libtool archives + insinto /usr/$(get_libdir) + # (#67729) Needs to be lib, not $(get_libdir) + doins ${FILESDIR}/lib/libGLU.la + insinto /usr/$(get_libdir)/opengl/xorg-x11/lib + doins ${FILESDIR}/lib/libGL.la + + # On *BSD libcs dlopen() and similar functions are present directly in + # libc.so and does not require linking to libdl. portability eclass takes + # care of finding the needed library (if needed) witht the dlopen_lib + # function. + sed -i -e 's:-ldl:'$(dlopen_lib)':g' \ + ${D}/usr/$(get_libdir)/libGLU.la \ + ${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la + + # Create the two-number versioned libs (.so.#.#), since only .so.# and + # .so.#.#.# were made + dosym libGLU.so.1.3.060401 /usr/$(get_libdir)/libGLU.so.1.3 + dosym libGLw.so.1.0.0 /usr/$(get_libdir)/libGLw.so.1.0 + + # libGLU doesn't get the plain .so symlink either + dosym libGLU.so.1 /usr/$(get_libdir)/libGLU.so + + # Figure out why libGL.so.1.5 is built (directfb), and why it's linked to + # as the default libGL.so.1 +} + +pkg_postinst() { + switch_opengl_implem +} + +fix_opengl_symlinks() { + # Remove invalid symlinks + local LINK + for LINK in $(find ${D}/usr/$(get_libdir) \ + -name libGL\.* -type l); do + rm -f ${LINK} + done + # Create required symlinks + if [[ ${CHOST} == *-freebsd* ]]; then + # FreeBSD doesn't use major.minor versioning, so the library is only + # libGL.so.1 and no libGL.so.1.2 is ever used there, thus only create + # libGL.so symlink and leave libGL.so.1 being the real thing + dosym libGL.so.1 /usr/$(get_libdir)/libGL.so + else + dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so + dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so.1 + fi +} + +dynamic_libgl_install() { + # next section is to setup the dynamic libGL stuff + ebegin "Moving libGL and friends for dynamic switching" + dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include} + local x="" + for x in ${D}/usr/$(get_libdir)/libGL.so* \ + ${D}/usr/$(get_libdir)/libGL.la \ + ${D}/usr/$(get_libdir)/libGL.a; do + if [ -f ${x} -o -L ${x} ]; then + # libGL.a cause problems with tuxracer, etc + mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib + fi + done + # glext.h added for #54984 + for x in ${D}/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do + if [ -f ${x} -o -L ${x} ]; then + mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include + fi + done + eend 0 +} + +switch_opengl_implem() { + # Switch to the xorg implementation. + # Use new opengl-update that will not reset user selected + # OpenGL interface ... + echo + eselect opengl set --use-old ${OPENGL_DIR} +} + +add_drivers() { + DRI_DRIVERS="${DRI_DRIVERS} $@" +} |