diff options
author | Javier Villavicencio <the_paya@gentoo.org> | 2006-09-21 19:30:46 +0000 |
---|---|---|
committer | Javier Villavicencio <the_paya@gentoo.org> | 2006-09-21 19:30:46 +0000 |
commit | b751c465841e9c2ce4127e348bf73643d9815627 (patch) | |
tree | c485aa650bc4d7fa97de163ce794de74d853f5d6 /media-libs | |
parent | Clean-up as requested by bug #148464. (diff) | |
download | historical-b751c465841e9c2ce4127e348bf73643d9815627.tar.gz historical-b751c465841e9c2ce4127e348bf73643d9815627.tar.bz2 historical-b751c465841e9c2ce4127e348bf73643d9815627.zip |
Fixes to build on Gentoo/FreeBSD with DRI enabled wrt bug #146892.
Package-Manager: portage-2.1.2_pre1
Diffstat (limited to 'media-libs')
-rw-r--r-- | media-libs/akode/Manifest | 26 | ||||
-rw-r--r-- | media-libs/mesa/ChangeLog | 6 | ||||
-rw-r--r-- | media-libs/mesa/Manifest | 20 | ||||
-rw-r--r-- | media-libs/mesa/files/6.5.1-freebsd-dri.patch | 28 | ||||
-rw-r--r-- | media-libs/mesa/mesa-6.5.1-r1.ebuild | 14 |
5 files changed, 64 insertions, 30 deletions
diff --git a/media-libs/akode/Manifest b/media-libs/akode/Manifest index 5087fd53199e..a9246675b3be 100644 --- a/media-libs/akode/Manifest +++ b/media-libs/akode/Manifest @@ -1,13 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - DIST 30375-akode-2.0.1.tar.bz2 460964 RMD160 e476f01a6baea4051e407166b1997ecdca1bfa86 SHA1 122fe6aabda78a8bda6d81074b7b66eb424f34eb SHA256 a1a31d3ea59e151ff1ff51e9f2be0db84fc9fcb40f590abb1c46494d6ff1c08e DIST 30375-akode-2.0b3.tar.gz 643404 DIST 30375-akode-2.0rc1.tar.gz 650104 RMD160 8db2eefab88b204231947f29a4963f2c91944d26 SHA1 f1c7193f3d0f173d19668b67485b973e63f06f20 SHA256 26f77ca7f41e494b7e97c2cf2f7aad2a3cd77f7f6728118d0b8b9b752a655b1a -EBUILD akode-2.0.1.ebuild 1265 RMD160 48f1d72011e0810460f09a173e63e435e5074735 SHA1 dc78c6e0089e980d025f67e0d9ca427fe1e5cc99 SHA256 7a4487fa78c2d5d5394b59382cb208de209deeaa78bcc89393fac46653ff8c57 -MD5 b29d69c177e213a5162b8c5a8ff1d4f1 akode-2.0.1.ebuild 1265 -RMD160 48f1d72011e0810460f09a173e63e435e5074735 akode-2.0.1.ebuild 1265 -SHA256 7a4487fa78c2d5d5394b59382cb208de209deeaa78bcc89393fac46653ff8c57 akode-2.0.1.ebuild 1265 +EBUILD akode-2.0.1.ebuild 1266 RMD160 192222a1d0c93b8fdc4f119eb98ec0f7ad5118ad SHA1 91e83a0c9d13ec9446723732bca94713cfa3b7dc SHA256 7fec20722aafa368b37db553c69963a560d642bbc7c0581a512df9a53cf78297 +MD5 8782a2518b34212dfd9c6cdec678ed3c akode-2.0.1.ebuild 1266 +RMD160 192222a1d0c93b8fdc4f119eb98ec0f7ad5118ad akode-2.0.1.ebuild 1266 +SHA256 7fec20722aafa368b37db553c69963a560d642bbc7c0581a512df9a53cf78297 akode-2.0.1.ebuild 1266 EBUILD akode-2.0_beta3.ebuild 1234 RMD160 714820290016701eeda27b97404e1c5ca1717e22 SHA1 4749e404d9883699c661ffc12f269bd0a5c0ec00 SHA256 eac4676d9c05cef8560de450d1825db6316b3f872d0893a104045b8b883f1f0c MD5 2c8a1f84787af2e08dd9a03507b854f2 akode-2.0_beta3.ebuild 1234 RMD160 714820290016701eeda27b97404e1c5ca1717e22 akode-2.0_beta3.ebuild 1234 @@ -16,10 +13,10 @@ EBUILD akode-2.0_rc1.ebuild 1201 RMD160 8e5b090f73932e4edf019ba69c07238110f1ebac MD5 fecad643d719164baa3dfe44c26733c7 akode-2.0_rc1.ebuild 1201 RMD160 8e5b090f73932e4edf019ba69c07238110f1ebac akode-2.0_rc1.ebuild 1201 SHA256 dd9c1926ff18e1d55d9627ee7a2c6ccb7044b545b9044a6c2704ff98b18bfca7 akode-2.0_rc1.ebuild 1201 -MISC ChangeLog 2242 RMD160 08684a782adc1d26bea43d0625463ccec5641610 SHA1 c104e29f01a22dcd506ab36a850fdf3a7efe0360 SHA256 4ca6bed3367092ab59a559c427c6ea37179c0442c9584641bc9f8a38b1bf3434 -MD5 d4217c634447709633b8f305bb115d28 ChangeLog 2242 -RMD160 08684a782adc1d26bea43d0625463ccec5641610 ChangeLog 2242 -SHA256 4ca6bed3367092ab59a559c427c6ea37179c0442c9584641bc9f8a38b1bf3434 ChangeLog 2242 +MISC ChangeLog 2348 RMD160 ce951bf647deb2cb33c1a8e664d9e2d26ec96c3b SHA1 885ec9081b2de9f184c49728b4bb06a597294861 SHA256 c1d020f80fc5fb443134b6864ff0413d522f499da1079dd55d988f799c79af8a +MD5 20c521ba43d0a3b8dc17ea088adca675 ChangeLog 2348 +RMD160 ce951bf647deb2cb33c1a8e664d9e2d26ec96c3b ChangeLog 2348 +SHA256 c1d020f80fc5fb443134b6864ff0413d522f499da1079dd55d988f799c79af8a ChangeLog 2348 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156 @@ -33,10 +30,3 @@ SHA256 6ab472964e9ff3d44f01b64726beba26fd9391ea1835af28c82edb5fe3cba760 files/di MD5 687d74f954b244f9078631094f47e54a files/digest-akode-2.0_rc1 256 RMD160 8a4c6a9f79f9c7b5c6027315c38d5f619f87d809 files/digest-akode-2.0_rc1 256 SHA256 a74d9e3b1d96324604408df4bea931381b2b7726edc83005717f978524d23e0c files/digest-akode-2.0_rc1 256 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux) - -iD8DBQFFEpp7KRy60XGEcJIRAtzqAJ9nhcwgSo7fuAR5htGsE1T03UYYfACbBMxD -pHJcti4X9Zub3Xl75eCT4Yo= -=P9wx ------END PGP SIGNATURE----- diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog index 121f22babdb2..b35419e5c8a9 100644 --- a/media-libs/mesa/ChangeLog +++ b/media-libs/mesa/ChangeLog @@ -1,6 +1,10 @@ # 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.114 2006/09/18 05:45:18 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.115 2006/09/21 19:30:46 the_paya Exp $ + + 21 Sep 2006; Javier Villavicencio <the_paya@gentoo.org> + +files/6.5.1-freebsd-dri.patch, mesa-6.5.1-r1.ebuild: + Fixes to build on Gentoo/FreeBSD with DRI enabled wrt bug #146892. 18 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; ChangeLog: Add bug number for libGL.la fix. diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index e65df9ffced6..8c0fd42d6907 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -14,6 +14,10 @@ AUX 6.5-re-order-context-destruction.patch 2295 RMD160 5c2648f9d4fca2f3abf53ad9d MD5 621322964afb60d36444f1dfe86719b2 files/6.5-re-order-context-destruction.patch 2295 RMD160 5c2648f9d4fca2f3abf53ad9d29101fd931493be files/6.5-re-order-context-destruction.patch 2295 SHA256 dda980be89d14df3659c0d409c56e4ccd6a03afdca2e8edc502845943423a600 files/6.5-re-order-context-destruction.patch 2295 +AUX 6.5.1-freebsd-dri.patch 1255 RMD160 71ee7336e879d72a20095251899ec8c7472c6255 SHA1 503398070fe682a7021886d2da2c057eec3562fb SHA256 ddd69fc07866d1efda8a78d26708e821196e844c8d941e7fcc0e30afa18b0ed6 +MD5 b4af1ae8f957df589e6e0462cfa91dbf files/6.5.1-freebsd-dri.patch 1255 +RMD160 71ee7336e879d72a20095251899ec8c7472c6255 files/6.5.1-freebsd-dri.patch 1255 +SHA256 ddd69fc07866d1efda8a78d26708e821196e844c8d941e7fcc0e30afa18b0ed6 files/6.5.1-freebsd-dri.patch 1255 AUX 64bit-fix-have-dix-config.patch 645 RMD160 4a05bcdab2828f9b5ad80df80d63d4767617b756 SHA1 9ad64261cbbbe6c3e897701dad2f4f0e2f67d4c7 SHA256 757a94fe2e76f6ea4d831a3aaf3fac7e344527239a10b014d6900af341e7abab MD5 0009bfb15983cd6258cde8ca9ec7134c files/64bit-fix-have-dix-config.patch 645 RMD160 4a05bcdab2828f9b5ad80df80d63d4767617b756 files/64bit-fix-have-dix-config.patch 645 @@ -61,18 +65,18 @@ EBUILD mesa-6.5-r4.ebuild 9197 RMD160 a46afe05b7c85024258dc66c37773c0634665df6 S MD5 af8cf0fd55bce47f58db2c1440edea47 mesa-6.5-r4.ebuild 9197 RMD160 a46afe05b7c85024258dc66c37773c0634665df6 mesa-6.5-r4.ebuild 9197 SHA256 ffa34ab0dcd60fcbfc20c929f788b6585a9c9d50a1abf989e50df02b70e246a7 mesa-6.5-r4.ebuild 9197 -EBUILD mesa-6.5.1-r1.ebuild 8116 RMD160 4a344842fa0f7b4f27d006aa5ce035e6598c9704 SHA1 58b6fea340f6cbf44f5b22a9846417d19ac1e3b8 SHA256 87acae8f469942fca151b50a6f06fafa1cb72bc0158390421a6ab951badd1ec3 -MD5 6c45cf6dee2b14622be78ba776242625 mesa-6.5.1-r1.ebuild 8116 -RMD160 4a344842fa0f7b4f27d006aa5ce035e6598c9704 mesa-6.5.1-r1.ebuild 8116 -SHA256 87acae8f469942fca151b50a6f06fafa1cb72bc0158390421a6ab951badd1ec3 mesa-6.5.1-r1.ebuild 8116 +EBUILD mesa-6.5.1-r1.ebuild 8430 RMD160 d41f940f1c5d65a6325c60cbec6470262146183b SHA1 6c5d4798bab0f4bb992934f6be9213938131a749 SHA256 f325efbc1c6ea00663134aee5ecf1e9493e5d41ab9f75ca7afa05bd87c69751c +MD5 4a1bd1e56e1dc768b6aa8b14449ebf09 mesa-6.5.1-r1.ebuild 8430 +RMD160 d41f940f1c5d65a6325c60cbec6470262146183b mesa-6.5.1-r1.ebuild 8430 +SHA256 f325efbc1c6ea00663134aee5ecf1e9493e5d41ab9f75ca7afa05bd87c69751c mesa-6.5.1-r1.ebuild 8430 EBUILD mesa-6.5.1.ebuild 8113 RMD160 c3ef0cac1562e69969dc9d2f28fc14ae328f0d77 SHA1 b02f8c6c75b112d4a724f51bffc5b6912c942567 SHA256 9581b2a78e72e9fb4efd0c2039384bef7bc84251d69bab728fe870cf6caba307 MD5 4bed5d64cdfce685fe651664230edd6c mesa-6.5.1.ebuild 8113 RMD160 c3ef0cac1562e69969dc9d2f28fc14ae328f0d77 mesa-6.5.1.ebuild 8113 SHA256 9581b2a78e72e9fb4efd0c2039384bef7bc84251d69bab728fe870cf6caba307 mesa-6.5.1.ebuild 8113 -MISC ChangeLog 21004 RMD160 96653bd0fbe5376700b41d2099bbbc0746554aa8 SHA1 c69cda29373196ebd6ec30c35801d455501a38a3 SHA256 f0b26bf5cfa76478f418ce5c8ca2d3b77aa5645cd522f1b20d47149c261cd787 -MD5 b5f9cf85bd19416d24da3df99219451c ChangeLog 21004 -RMD160 96653bd0fbe5376700b41d2099bbbc0746554aa8 ChangeLog 21004 -SHA256 f0b26bf5cfa76478f418ce5c8ca2d3b77aa5645cd522f1b20d47149c261cd787 ChangeLog 21004 +MISC ChangeLog 21187 RMD160 196610cb84efd47a9a4791760eb6683225e52d9d SHA1 e5f9aa9d22e597b76a54e32f41c509966e385620 SHA256 3dbf76cb79c5306998b5e784177e7b4f492c35f8d61ee32c4a3d0c8738042377 +MD5 affc963d683bc16c416d9b561c0f3d56 ChangeLog 21187 +RMD160 196610cb84efd47a9a4791760eb6683225e52d9d ChangeLog 21187 +SHA256 3dbf76cb79c5306998b5e784177e7b4f492c35f8d61ee32c4a3d0c8738042377 ChangeLog 21187 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156 diff --git a/media-libs/mesa/files/6.5.1-freebsd-dri.patch b/media-libs/mesa/files/6.5.1-freebsd-dri.patch new file mode 100644 index 000000000000..aac4ab4232a9 --- /dev/null +++ b/media-libs/mesa/files/6.5.1-freebsd-dri.patch @@ -0,0 +1,28 @@ +--- Mesa-6.5.1/configs/freebsd-dri.orig 2006-08-17 11:09:02 -0300 ++++ Mesa-6.5.1/configs/freebsd-dri 2006-09-19 19:29:35 -0300 +@@ -16,20 +16,21 @@ + DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \ + -DGLX_DIRECT_RENDERING -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN + +-CFLAGS = -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math \ +- $(ASM_FLAGS) $(X11_INCLUDES) $(DEFINES) ++CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) -Wmissing-prototypes -std=c99 -Wundef -ffast-math \ ++ $(ASM_FLAGS) $(X11_INCLUDES) $(DEFINES) + +-CXXFLAGS = $(DEFINES) -Wall -g -ansi -pedantic -fPIC ++CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) -Wall -ansi -pedantic $(ASM_FLAGS) $(X11_INCLUDES) + + ASM_SOURCES = + + # Library/program dependencies + LIBDRM_LIB = `pkg-config --libs libdrm` ++LIBDRM_CFLAGS = `pkg-config --cflags libdrm` + DRI_LIB_DEPS = -L/usr/local/lib -lm -lpthread -lexpat $(LIBDRM_LIB) + GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lm -lpthread $(LIBDRM_LIB) + + GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm +-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lXm -lX11 ++GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lX11 + + + # Directories diff --git a/media-libs/mesa/mesa-6.5.1-r1.ebuild b/media-libs/mesa/mesa-6.5.1-r1.ebuild index 0c2f69b56ecc..0745623cc92f 100644 --- a/media-libs/mesa/mesa-6.5.1-r1.ebuild +++ b/media-libs/mesa/mesa-6.5.1-r1.ebuild @@ -1,6 +1,6 @@ # 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.1-r1.ebuild,v 1.1 2006/09/18 05:42:13 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.1-r1.ebuild,v 1.2 2006/09/21 19:30:46 the_paya Exp $ inherit eutils toolchain-funcs multilib flag-o-matic portability @@ -76,8 +76,12 @@ pkg_setup() { append-flags -fno-strict-aliasing - if [[ ${KERNEL} == "FreeBSD" ]]; then - CONFIG="freebsd" + if use x86-fbsd; then + CONFIG="freebsd-dri-x86" + elif use amd64-fbsd; then + CONFIG="freebsd-dri-amd64" + elif use kernel_FreeBSD; then + CONFIG="freebsd-dri" elif use x86; then CONFIG="linux-dri-x86" elif use amd64; then @@ -93,7 +97,11 @@ src_unpack() { HOSTCONF="${S}/configs/${CONFIG}" unpack ${A} + # Fixes for bug #146892 + epatch "${FILESDIR}"/6.5.1-freebsd-dri.patch cd ${S} + # FreeBSD 6.* doesn't have posix_memalign(). + [[ ${CHOST} == *-freebsd6.* ]] && sed -i -e "s/-DHAVE_POSIX_MEMALIGN//" configs/freebsd{,-dri} # Don't compile debug code with USE=-debug - bug #125004 if ! use debug; then |