diff options
| author | Luc Verhaegen <libv@skynet.be> | 2010-03-08 07:39:43 +0100 |
|---|---|---|
| committer | Luc Verhaegen <libv@skynet.be> | 2010-03-08 07:39:43 +0100 |
| commit | c670a69782e6391910331c32cfe33059bb7f4d83 (patch) | |
| tree | a04baa81b4032b7494fb4cd42cd53d6b149505f9 /debian/patches/05_hurd-ftbfs.diff | |
| parent | f0e99179bcf95f39ce7c4d2c2270e8a4357eaf19 (diff) | |
Import debian's mesa-7.7-4 release.debian-7.7-4
Diffstat (limited to 'debian/patches/05_hurd-ftbfs.diff')
| -rw-r--r-- | debian/patches/05_hurd-ftbfs.diff | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/debian/patches/05_hurd-ftbfs.diff b/debian/patches/05_hurd-ftbfs.diff new file mode 100644 index 0000000000..4d81262811 --- /dev/null +++ b/debian/patches/05_hurd-ftbfs.diff @@ -0,0 +1,58 @@ +From: Samuel Thibault <samuel.thibault@ens-lyon.org> +Subject: Fix build on GNU/Hurd + +--- + configure.ac | 25 ++++++++++++++----------- + src/glx/x11/dri2.c | 2 ++ + 2 files changed, 16 insertions(+), 11 deletions(-) + +Index: mesa/configure.ac +=================================================================== +--- mesa.orig/configure.ac ++++ mesa/configure.ac +@@ -539,6 +539,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@:>@])], ++ [driglx_direct="$enableval"], ++ [driglx_direct="yes"]) ++ + dnl + dnl libGL configuration per driver + dnl +@@ -572,11 +579,13 @@ + AC_MSG_ERROR([Can't use static libraries for DRI drivers]) + fi + +- # Check for libdrm +- PKG_CHECK_MODULES([LIBDRM], [libdrm >= $LIBDRM_REQUIRED]) +- PKG_CHECK_MODULES([DRI2PROTO], [dri2proto >= $DRI2PROTO_REQUIRED]) +- GL_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED dri2proto >= $DRI2PROTO_REQUIRED" +- DRI_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED" ++ if test x"$driglx_direct" = xyes; then ++ # Check for libdrm ++ PKG_CHECK_MODULES([LIBDRM], [libdrm >= $LIBDRM_REQUIRED]) ++ PKG_CHECK_MODULES([DRI2PROTO], [dri2proto >= $DRI2PROTO_REQUIRED]) ++ GL_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED dri2proto >= $DRI2PROTO_REQUIRED" ++ DRI_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED" ++ fi + + PKG_CHECK_MODULES([LIBDRM_RADEON], [libdrm_radeon libdrm >= $LIBDRM_RADEON_REQUIRED], HAVE_LIBDRM_RADEON=yes, HAVE_LIBDRM_RADEON=no) + +@@ -657,12 +666,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@:>@])], +- [driglx_direct="$enableval"], +- [driglx_direct="yes"]) + dnl Which drivers to build - default is chosen by platform + AC_ARG_WITH([dri-drivers], + [AS_HELP_STRING([--with-dri-drivers@<:@=DIRS...@:>@], |