Build xcb in mesa properly, by appending necessary defines etc to the

arch-specific configs so we don't lose asm and so forth.

2 files changed, 23 insertions, 19 deletions

diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index c7b91f1..a5a4342 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,47 +1,47 @@
-AUX 6.4-dont-install-gles-headers.patch 421 RMD160 70713f143d080b444089a95712efd227227c523f SHA1 ffdf556a66229d0417d5d7e7833c8e9bfdb39741 SHA256 8f636c2e09ac7fdab0d06ebe62af5a311b52a03bf7b7bdecf4789a6e30e0777e size 421
+AUX 6.4-dont-install-gles-headers.patch 421 RMD160 70713f143d080b444089a95712efd227227c523f SHA1 ffdf556a66229d0417d5d7e7833c8e9bfdb39741 SHA256 8f636c2e09ac7fdab0d06ebe62af5a311b52a03bf7b7bdecf4789a6e30e0777e
 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
-AUX 6.4-multilib-fix.patch 535 RMD160 5ab0237e5096728b38675c9c265cfb2c88009c00 SHA1 fe4b95135fd2855c40ab726045e901355a3af4aa SHA256 8fe39ec2ca86b206cb0d870d6644f68eb52af209f5bfb6eaad612deee80d754f size 535
+AUX 6.4-multilib-fix.patch 535 RMD160 5ab0237e5096728b38675c9c265cfb2c88009c00 SHA1 fe4b95135fd2855c40ab726045e901355a3af4aa SHA256 8fe39ec2ca86b206cb0d870d6644f68eb52af209f5bfb6eaad612deee80d754f
 MD5 d6254b7a775480084efcd30d9fb4cbad files/6.4-multilib-fix.patch 535
 RMD160 5ab0237e5096728b38675c9c265cfb2c88009c00 files/6.4-multilib-fix.patch 535
 SHA256 8fe39ec2ca86b206cb0d870d6644f68eb52af209f5bfb6eaad612deee80d754f files/6.4-multilib-fix.patch 535
-AUX change-default-dri-driver-dir-X7.1.patch 399 RMD160 169dd99888a66bf63bc528f183bd4c2b6d16b0f9 SHA1 c44dd4a468d9f4b2ed202bc914bc25d5db206a80 SHA256 8dbdbad95f47bfc18a366e091ffc1d67ff16da970181626d939a19eed46a212d size 399
+AUX change-default-dri-driver-dir-X7.1.patch 399 RMD160 169dd99888a66bf63bc528f183bd4c2b6d16b0f9 SHA1 c44dd4a468d9f4b2ed202bc914bc25d5db206a80 SHA256 8dbdbad95f47bfc18a366e091ffc1d67ff16da970181626d939a19eed46a212d
 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
-AUX lib/libGL.la 763 RMD160 a6882fb5d6d8ad195845bdda3bcbbef2aef79099 SHA1 ded967a6f28e90238b601b422abc76b472e8f732 SHA256 0fb9c02b01c9b2306fac89034144bb3e87aedba0dee0a49203aa18fbf0b706bf size 763
+AUX lib/libGL.la 763 RMD160 a6882fb5d6d8ad195845bdda3bcbbef2aef79099 SHA1 ded967a6f28e90238b601b422abc76b472e8f732 SHA256 0fb9c02b01c9b2306fac89034144bb3e87aedba0dee0a49203aa18fbf0b706bf
 MD5 f0ebdc72043e76ad7eddc4ad91349927 files/lib/libGL.la 763
 RMD160 a6882fb5d6d8ad195845bdda3bcbbef2aef79099 files/lib/libGL.la 763
 SHA256 0fb9c02b01c9b2306fac89034144bb3e87aedba0dee0a49203aa18fbf0b706bf files/lib/libGL.la 763
-AUX lib/libGLU.la 752 RMD160 04de8835526a3472480d7c285dd33d497bcc0bd7 SHA1 12c57ac5e7e8a94d4d41b0f37b0fb3f470791c39 SHA256 e28519d7ae719bc106f7d4239799580474d1b69a2254ede3b2179a5e50655fe5 size 752
+AUX lib/libGLU.la 752 RMD160 04de8835526a3472480d7c285dd33d497bcc0bd7 SHA1 12c57ac5e7e8a94d4d41b0f37b0fb3f470791c39 SHA256 e28519d7ae719bc106f7d4239799580474d1b69a2254ede3b2179a5e50655fe5
 MD5 9abdd26694e6f1d7bd93193f900acc6c files/lib/libGLU.la 752
 RMD160 04de8835526a3472480d7c285dd33d497bcc0bd7 files/lib/libGLU.la 752
 SHA256 e28519d7ae719bc106f7d4239799580474d1b69a2254ede3b2179a5e50655fe5 files/lib/libGLU.la 752
-AUX mesa-radeon-0depthbits.patch 3052 RMD160 370e8f70e899c0b097d43649886fa0061a1da181 SHA1 6d5c643887062d4a254f2e51d47859a1d27d64bb SHA256 f77c8ead3bf78dcc241d69542fa1f2c99ca0900c1287a3501d23cce27348a35b size 3052
+AUX mesa-radeon-0depthbits.patch 3052 RMD160 370e8f70e899c0b097d43649886fa0061a1da181 SHA1 6d5c643887062d4a254f2e51d47859a1d27d64bb SHA256 f77c8ead3bf78dcc241d69542fa1f2c99ca0900c1287a3501d23cce27348a35b
 MD5 7a491058ce29d6ecc9eb5c549dba1c1e files/mesa-radeon-0depthbits.patch 3052
 RMD160 370e8f70e899c0b097d43649886fa0061a1da181 files/mesa-radeon-0depthbits.patch 3052
 SHA256 f77c8ead3bf78dcc241d69542fa1f2c99ca0900c1287a3501d23cce27348a35b files/mesa-radeon-0depthbits.patch 3052
-AUX r200-copy-pixels-1.patch 2741 RMD160 ea4933724b3c02e87b790b88382fbda8b0acaad4 SHA1 1396202a472a59266e884cfef5654af4e4cd451c SHA256 306c14ac818aba218aa518ada076a46c686e07f08c495a66bd84f63109616200 size 2741
+AUX r200-copy-pixels-1.patch 2741 RMD160 ea4933724b3c02e87b790b88382fbda8b0acaad4 SHA1 1396202a472a59266e884cfef5654af4e4cd451c SHA256 306c14ac818aba218aa518ada076a46c686e07f08c495a66bd84f63109616200
 MD5 9a6eaed5ab1fd6748d543679a335f72c files/r200-copy-pixels-1.patch 2741
 RMD160 ea4933724b3c02e87b790b88382fbda8b0acaad4 files/r200-copy-pixels-1.patch 2741
 SHA256 306c14ac818aba218aa518ada076a46c686e07f08c495a66bd84f63109616200 files/r200-copy-pixels-1.patch 2741
-AUX r300-aet.patch 2876 RMD160 440f3ea16c5a62a7db539eacba80031e06d2389c SHA1 4d53b8e6f7c93797c78d622e37adffbf507679f5 SHA256 f304d5a2e4fdb2cb17ee68473d8f6c955311a8fcfede67bb1bd6a4e4b277ae57 size 2876
+AUX r300-aet.patch 2876 RMD160 440f3ea16c5a62a7db539eacba80031e06d2389c SHA1 4d53b8e6f7c93797c78d622e37adffbf507679f5 SHA256 f304d5a2e4fdb2cb17ee68473d8f6c955311a8fcfede67bb1bd6a4e4b277ae57
 MD5 20cb86acf1d60d0503005ce55ff02396 files/r300-aet.patch 2876
 RMD160 440f3ea16c5a62a7db539eacba80031e06d2389c files/r300-aet.patch 2876
 SHA256 f304d5a2e4fdb2cb17ee68473d8f6c955311a8fcfede67bb1bd6a4e4b277ae57 files/r300-aet.patch 2876
-AUX r300-smooth-lines-1.diff 3515 RMD160 def782d13c7f7630b29a9da3a871a28ddac56270 SHA1 4093fe06c9dd59305d0e4f5befc9f3d3edb7ef57 SHA256 68cdb9f1490f8b84dcf121f4931ae83b09e4cf8adfadc0fb1d3559b4cc98b6d7 size 3515
+AUX r300-smooth-lines-1.diff 3515 RMD160 def782d13c7f7630b29a9da3a871a28ddac56270 SHA1 4093fe06c9dd59305d0e4f5befc9f3d3edb7ef57 SHA256 68cdb9f1490f8b84dcf121f4931ae83b09e4cf8adfadc0fb1d3559b4cc98b6d7
 MD5 2ee40b299ff00bc83882c4afab34e1e3 files/r300-smooth-lines-1.diff 3515
 RMD160 def782d13c7f7630b29a9da3a871a28ddac56270 files/r300-smooth-lines-1.diff 3515
 SHA256 68cdb9f1490f8b84dcf121f4931ae83b09e4cf8adfadc0fb1d3559b4cc98b6d7 files/r300-smooth-lines-1.diff 3515
-AUX r300Fallback-always-return-false.patch 756 RMD160 c8994d5c46badb26fcce945739bda65405825238 SHA1 3f930df06be0afc764ddf94598ef8fcaa399b970 SHA256 fe43a9eb36c3afe095b09be5f066f2b89aca186251fa6350604fb7d53b644c11 size 756
+AUX r300Fallback-always-return-false.patch 756 RMD160 c8994d5c46badb26fcce945739bda65405825238 SHA1 3f930df06be0afc764ddf94598ef8fcaa399b970 SHA256 fe43a9eb36c3afe095b09be5f066f2b89aca186251fa6350604fb7d53b644c11
 MD5 98634596bb3b55d66e6e60fdbc7590f9 files/r300Fallback-always-return-false.patch 756
 RMD160 c8994d5c46badb26fcce945739bda65405825238 files/r300Fallback-always-return-false.patch 756
 SHA256 fe43a9eb36c3afe095b09be5f066f2b89aca186251fa6350604fb7d53b644c11 files/r300Fallback-always-return-false.patch 756
-EBUILD mesa-9999.ebuild 9412 RMD160 58f097fcf5aaeebae428affd9f7ae24a6f73b4f6 SHA1 410f75927bacab5af8977494ad3dffb289b406f6 SHA256 fd2bc42194130e71fee27d9fe3aeae064c37d62bf3101141a442b46a354ca6cc size 9412
-MD5 df7c2d73707cdedb1a6cd8a54e795b27 mesa-9999.ebuild 9412
-RMD160 58f097fcf5aaeebae428affd9f7ae24a6f73b4f6 mesa-9999.ebuild 9412
-SHA256 fd2bc42194130e71fee27d9fe3aeae064c37d62bf3101141a442b46a354ca6cc mesa-9999.ebuild 9412
+EBUILD mesa-9999.ebuild 9699 RMD160 a584a752e4fa59cace3861496e34eaed1032f6eb SHA1 5e0dd85b11c1fc07eb1728d96538dd8cf83d1af2 SHA256 b1c2215922b9c144a8a208a84e8e9fb2ad0d5c4452889637b0062bd4a8d14196
+MD5 d7184dab8530e96c429f2837988b8ce9 mesa-9999.ebuild 9699
+RMD160 a584a752e4fa59cace3861496e34eaed1032f6eb mesa-9999.ebuild 9699
+SHA256 b1c2215922b9c144a8a208a84e8e9fb2ad0d5c4452889637b0062bd4a8d14196 mesa-9999.ebuild 9699
 MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-mesa-9999 1
 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-mesa-9999 1
 SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-mesa-9999 1
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 039b3bb..b80b6fd 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -82,8 +82,6 @@ pkg_setup() {
 
 	if [[ ${KERNEL} == "FreeBSD" ]]; then
 		CONFIG="freebsd"
-	elif use xcb; then
-		CONFIG="linux-dri-xcb"
 	elif use x86; then
 		CONFIG="linux-dri-x86"
 	elif use amd64; then
@@ -130,6 +128,13 @@ src_unpack() {
 		echo "ARCH_FLAGS += -DGLX_USE_TLS" >> ${HOSTCONF}
 	fi
 
+	echo "X11_INCLUDES = `pkg-config --cflags-only-I x11`" >> ${HOSTCONF}
+	if use xcb; then
+		echo "DEFINES += -DUSE_XCB" >> ${HOSTCONF}
+		echo "X11_INCLUDES += `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I xcb-glx`" >> ${HOSTCONF}
+		echo "GL_LIB_DEPS += `pkg-config --libs xcb` `pkg-config --libs xcb-glx`" >> ${HOSTCONF}
+	fi
+
 	# Configurable DRI drivers
 	if use video_cards_i810; then
 		add_drivers i810 i915
@@ -211,9 +216,8 @@ src_unpack() {
 		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}
+	# Replace hardcoded /usr/X11R6 with this
+	echo "EXTRA_LIB_PATH = `pkg-config --libs-only-L x11`" >> ${HOSTCONF}
 
 	echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF}
 	echo "CC = $(tc-getCC)" >> ${HOSTCONF}