[gentoo-commits] proj/x11:master commit in: media-libs/mesa/files/

["David Heidelberger" <d.okias@gmail.com>]

commit:     1e97c86c51e510952388ad7dbe487ce6d4d3bcc8
Author:     David Heidelberger <david.heidelberger <AT> ixit <DOT> cz>
AuthorDate: Mon Mar  3 03:40:01 2014 +0000
Commit:     David Heidelberger <d.okias <AT> gmail <DOT> com>
CommitDate: Mon Mar  3 03:40:01 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=1e97c86c

media-libs/mesa: update r300 patch

---
 .../mesa/files/mesa-9999-dont-require-llvm-for-r300.patch | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/media-libs/mesa/files/mesa-9999-dont-require-llvm-for-r300.patch b/media-libs/mesa/files/mesa-9999-dont-require-llvm-for-r300.patch
index bd24787..a85a3c1 100644
--- a/media-libs/mesa/files/mesa-9999-dont-require-llvm-for-r300.patch
+++ b/media-libs/mesa/files/mesa-9999-dont-require-llvm-for-r300.patch
@@ -1,12 +1,11 @@
-diff --git a/configure.ac b/configure.ac
-index 21a1986..94b2247 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1777,7 +1777,6 @@ if test "x$with_gallium_drivers" != x; then
-         xr300)
+diff -Naur a/configure.ac b/configure.ac
+--- a/configure.ac	2014-03-03 04:05:33.110522943 +0100
++++ b/configure.ac	2014-03-03 04:06:44.165518094 +0100
+@@ -1774,7 +1774,6 @@
              HAVE_GALLIUM_R300=yes
              PKG_CHECK_MODULES([RADEON], [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED])
+             gallium_require_drm_loader
 -            gallium_require_llvm "Gallium R300"
              GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
-             gallium_check_st "radeon/drm" "dri-r300" "" "" "xvmc-r300" "vdpau-r300"
-             ;;
+             gallium_check_st "radeon/drm" "r300/dri" "" "" ""
+             DRICOMMON_NEED_LIBDRM=yes