mesa: Changes to 'debian-experimental'
debian/changelog | 1 +
debian/patches/05_hurd-ftbfs.diff | 10 +++++-----
debian/patches/06_kfreebsd-ftbfs.diff | 2 +-
3 files changed, 7 insertions(+), 6 deletions(-)
New commits:
commit c282b0efd9cb80df4cb6b11af1aa6ea9bca28597
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jul 20 14:56:46 2010 +0100
Fixup hurd and kfreebsd patches to apply.
diff --git a/debian/changelog b/debian/changelog
index 7047ab7..a696542 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ mesa (7.8.2-2) UNRELEASED; urgency=low
* intel: Fix invalidate before initialisation (stolen from fdo bugzilla
#29091, fixes server 1.9rc crash when starting an app using GLX 1.3)
* Pull from 7.8-branch up to commit d06e011.
+ * Fixup hurd and kfreebsd patches to apply.
-- Julien Cristau <jcristau@debian.org> Thu, 15 Jul 2010 17:05:56 +0100
diff --git a/debian/patches/05_hurd-ftbfs.diff b/debian/patches/05_hurd-ftbfs.diff
index 632dba4..530fa90 100644
--- a/debian/patches/05_hurd-ftbfs.diff
+++ b/debian/patches/05_hurd-ftbfs.diff
@@ -9,21 +9,21 @@ Index: mesa/configure.ac
===================================================================
--- mesa.orig/configure.ac
+++ mesa/configure.ac
-@@ -584,6 +584,13 @@
+@@ -585,6 +585,13 @@
enable_xcb=no
fi
+dnl Direct rendering or just indirect rendering
+AC_ARG_ENABLE([driglx-direct],
+ [AS_HELP_STRING([--disable-driglx-direct],
-+ [enable direct rendering in GLX for DRI @<:@default=enabled@:>@])],
++ [enable direct rendering in GLX and EGL for DRI @<:@default=enabled@:>@])],
+ [driglx_direct="$enableval"],
+ [driglx_direct="yes"])
+
dnl
dnl libGL configuration per driver
dnl
-@@ -617,12 +624,14 @@
+@@ -618,12 +625,14 @@
AC_MSG_ERROR([Can't use static libraries for DRI drivers])
fi
@@ -44,14 +44,14 @@ Index: mesa/configure.ac
# find the DRI deps for libGL
if test "$x11_pkgconfig" = yes; then
-@@ -696,12 +705,6 @@
+@@ -697,12 +706,6 @@
[DRI_DRIVER_SEARCH_DIR="$withval"],
[DRI_DRIVER_SEARCH_DIR='${DRI_DRIVER_INSTALL_DIR}'])
AC_SUBST([DRI_DRIVER_SEARCH_DIR])
-dnl Direct rendering or just indirect rendering
-AC_ARG_ENABLE([driglx-direct],
- [AS_HELP_STRING([--disable-driglx-direct],
-- [enable direct rendering in GLX for DRI @<:@default=enabled@:>@])],
+- [enable direct rendering in GLX and EGL for DRI @<:@default=enabled@:>@])],
- [driglx_direct="$enableval"],
- [driglx_direct="yes"])
dnl Which drivers to build - default is chosen by platform
diff --git a/debian/patches/06_kfreebsd-ftbfs.diff b/debian/patches/06_kfreebsd-ftbfs.diff
index a8a1e93..285c434 100644
--- a/debian/patches/06_kfreebsd-ftbfs.diff
+++ b/debian/patches/06_kfreebsd-ftbfs.diff
@@ -12,7 +12,7 @@ Index: mesa/configure.ac
===================================================================
--- mesa.orig/configure.ac
+++ mesa/configure.ac
-@@ -776,7 +776,7 @@
+@@ -777,7 +777,7 @@
;;
esac
;;
Reply to: