From: Joshua Baergen Date: Sun, 12 Mar 2006 18:18:51 +0000 (+0000) Subject: Fix a Radeon crash in certain applications (such as Croquet 0.3), and don't X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d54cf571148bc611f808eb808a79c526c2d2455d;p=gentoo.git Fix a Radeon crash in certain applications (such as Croquet 0.3), and don't compile debug code into the drivers if USE=-debug (Santiago Gala, bug #125004). Also, fix a naming conflict between SGI GLU code and glibc 2.4 (SpanKY, KIMURA Masaru / hiyuh, bug #125809). Package-Manager: portage-2.1_pre5-r4 --- diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog index df7334aca0aa..29cb79fba5b9 100644 --- a/media-libs/mesa/ChangeLog +++ b/media-libs/mesa/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for media-libs/mesa # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.70 2006/02/28 01:28:43 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.71 2006/03/12 18:18:51 joshuabaergen Exp $ + +*mesa-6.4.2-r2 (12 Mar 2006) + + 12 Mar 2006; Joshua Baergen + +files/radeon-texture-problem.patch, -mesa-6.4.2-r1.ebuild, + +mesa-6.4.2-r2.ebuild: + Fix a Radeon crash in certain applications (such as Croquet 0.3), and don't + compile debug code into the drivers if USE=-debug (Santiago Gala, bug + #125004). Also, fix a naming conflict between SGI GLU code and glibc 2.4 + (SpanKY, KIMURA Masaru / hiyuh, bug #125809). 28 Feb 2006; Donnie Berkholz ; mesa-6.4.2-r1.ebuild: Make USE=debug work more nicely with FEATURES=splitdebug. diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index 0b4fb4023cc5..f35cfb3d70fb 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -1,6 +1,6 @@ -MD5 2feebcbd9ddbc680703d8f7c5becb029 ChangeLog 13712 -RMD160 15d31381cf2797e793f4fe1cd71b295875709339 ChangeLog 13712 -SHA256 61d75458eb3d5e0ba453ddaa89d399e4ac106a7e5816bbb0e4ad68b981ebc4d9 ChangeLog 13712 +MD5 9adb616645e0a941ac013858c373615f ChangeLog 14165 +RMD160 25249ce29116034828f74c341cfbf07438210017 ChangeLog 14165 +SHA256 e0f912e5022109440a93859d58ac39b789467017da8b635ba8dbce26e076f3f6 ChangeLog 14165 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,9 +16,9 @@ SHA256 2e070e5e4aa4b1a1f12ccce290496c5eca92d76819805fe8d529a4f7fd71c82c files/64 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 -MD5 573c1cb18905c1d9339a9a84bd9779d8 files/digest-mesa-6.4.2-r1 247 -RMD160 2d14f708463f76c30291f3950a6448c1227fbaf4 files/digest-mesa-6.4.2-r1 247 -SHA256 097fd81c0c397325418ce66f42aa19a137843d8953e4ac9265bc4f90cf2f2ab7 files/digest-mesa-6.4.2-r1 247 +MD5 573c1cb18905c1d9339a9a84bd9779d8 files/digest-mesa-6.4.2-r2 247 +RMD160 2d14f708463f76c30291f3950a6448c1227fbaf4 files/digest-mesa-6.4.2-r2 247 +SHA256 097fd81c0c397325418ce66f42aa19a137843d8953e4ac9265bc4f90cf2f2ab7 files/digest-mesa-6.4.2-r2 247 MD5 f0ebdc72043e76ad7eddc4ad91349927 files/lib/libGL.la 763 RMD160 a6882fb5d6d8ad195845bdda3bcbbef2aef79099 files/lib/libGL.la 763 SHA256 0fb9c02b01c9b2306fac89034144bb3e87aedba0dee0a49203aa18fbf0b706bf files/lib/libGL.la 763 @@ -28,9 +28,12 @@ SHA256 e28519d7ae719bc106f7d4239799580474d1b69a2254ede3b2179a5e50655fe5 files/li MD5 ceae0782c8844ebdc68ede6b4d8969d9 files/makedepend-location.patch 375 RMD160 30e1c4a45cdd2077edd80043911bf05275493195 files/makedepend-location.patch 375 SHA256 c0ec505e5fb263d4cde901ce9afe3197346acf67372460a2177231be8425e0ab files/makedepend-location.patch 375 -MD5 1d6080f5b2066238854d1a3bea0d782e mesa-6.4.2-r1.ebuild 7667 -RMD160 15d2510d316ef91742a962940517873f8551fca5 mesa-6.4.2-r1.ebuild 7667 -SHA256 301bf0091fcef5ea4a72bbde856b8a8182dba79cb9f94dbba6f1b6419c009739 mesa-6.4.2-r1.ebuild 7667 +MD5 5bd06d12cc0c1f11b9671eb7ec57f5f0 files/radeon-texture-problem.patch 363 +RMD160 d7241f061f4f0abbab57920cfaa480ad819bf9cb files/radeon-texture-problem.patch 363 +SHA256 01d74821fedfd3409d5aa5c7620c2d51e7f1ddad63b6b01d4bd25595afdfbbea files/radeon-texture-problem.patch 363 +MD5 e94fdb74446ed56b9e65765187c41dbe mesa-6.4.2-r2.ebuild 8313 +RMD160 b2549d3e52e60dec185c5c9a8316f31e4b03786a mesa-6.4.2-r2.ebuild 8313 +SHA256 1cf5993a67d13c42c3019c603e0de575253abaf6a3a7bc8ec852e2e21bd80748 mesa-6.4.2-r2.ebuild 8313 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156 diff --git a/media-libs/mesa/files/digest-mesa-6.4.2-r1 b/media-libs/mesa/files/digest-mesa-6.4.2-r2 similarity index 100% rename from media-libs/mesa/files/digest-mesa-6.4.2-r1 rename to media-libs/mesa/files/digest-mesa-6.4.2-r2 diff --git a/media-libs/mesa/files/radeon-texture-problem.patch b/media-libs/mesa/files/radeon-texture-problem.patch new file mode 100644 index 000000000000..c39d7e974cd2 --- /dev/null +++ b/media-libs/mesa/files/radeon-texture-problem.patch @@ -0,0 +1,11 @@ +diff -u -r1.11 -r1.12 +--- src/mesa/drivers/dri/r200/r200_texmem.c 2005/02/10 22:36:06 1.11 ++++ src/mesa/drivers/dri/r200/r200_texmem.c 2005/08/25 03:38:07 1.12 +@@ -427,7 +427,7 @@ + fprintf(stderr, "DRM_RADEON_TEXTURE: again!\n"); + usleep(1); + } +- } while ( ret && errno == EAGAIN ); ++ } while ( ret == -EAGAIN ); + + UNLOCK_HARDWARE( rmesa ); diff --git a/media-libs/mesa/mesa-6.4.2-r1.ebuild b/media-libs/mesa/mesa-6.4.2-r2.ebuild similarity index 90% rename from media-libs/mesa/mesa-6.4.2-r1.ebuild rename to media-libs/mesa/mesa-6.4.2-r2.ebuild index 12e89965a44d..4c69ed1cdd39 100644 --- a/media-libs/mesa/mesa-6.4.2-r1.ebuild +++ b/media-libs/mesa/mesa-6.4.2-r2.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.4.2-r1.ebuild,v 1.2 2006/02/28 01:28:43 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.4.2-r2.ebuild,v 1.1 2006/03/12 18:18:51 joshuabaergen Exp $ inherit eutils toolchain-funcs multilib flag-o-matic @@ -92,6 +92,21 @@ src_unpack() { epatch ${FILESDIR}/64bit-fix-have-dix-config.patch epatch ${FILESDIR}/64bit-fix-indirect-vertex-array.patch + # Problem triggered by croquet 0.3 - bug #125004 + epatch ${FILESDIR}/radeon-texture-problem.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)/xorg/modules/dri\"'" >> ${HOSTCONF}