Fixes to build on Gentoo/FreeBSD with DRI enabled wrt bug #146892.

Package-Manager: portage-2.1.2_pre1

4 files changed, 56 insertions, 12 deletions

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