debian/changelog | 1 debian/patches/05_hurd-ftbfs.diff | 103 ++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 3 files changed, 105 insertions(+)
New commits: commit 4f2bc058f34f3dc5a7cafe601741e5207b3e7e70 Author: Julien Cristau <[email protected]> Date: Sun Apr 19 00:46:32 2009 +0200 Add patch by Samuel Thibault to fix FTBFS on hurd-i386. diff --git a/debian/changelog b/debian/changelog index d4ca359..dbdfe0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ mesa (7.4-3) UNRELEASED; urgency=low for direct rendering (either software or hardware). Mark libgl1-mesa-dri as breaking old xserver-xorg-core and libgl1-mesa-glx, to avoid incompatibilities. + * Add patch by Samuel Thibault to fix FTBFS on hurd-i386. -- Julien Cristau <[email protected]> Wed, 15 Apr 2009 19:25:50 +0200 diff --git a/debian/patches/05_hurd-ftbfs.diff b/debian/patches/05_hurd-ftbfs.diff new file mode 100644 index 0000000..7037a1d --- /dev/null +++ b/debian/patches/05_hurd-ftbfs.diff @@ -0,0 +1,103 @@ +From: Samuel Thibault <[email protected]> +Subject: Fix build on GNU/Hurd + +Index: mesa/src/glx/x11/dri2.c +=================================================================== +--- mesa.orig/src/glx/x11/dri2.c ++++ mesa/src/glx/x11/dri2.c +@@ -30,6 +30,7 @@ + * Kristian Høgsberg ([email protected]) + */ + ++#ifdef GLX_DIRECT_RENDERING + + #define NEED_REPLIES + #include <X11/Xlibint.h> +@@ -299,3 +300,4 @@ + UnlockDisplay(dpy); + SyncHandle(); + } ++#endif +Index: mesa/include/GL/internal/dri_interface.h +=================================================================== +--- mesa.orig/include/GL/internal/dri_interface.h ++++ mesa/include/GL/internal/dri_interface.h +@@ -41,7 +41,7 @@ + #define DRI_INTERFACE_H + + /* For archs with no drm.h */ +-#if !defined(__APPLE__) && !defined(__CYGWIN__) ++#if !defined(__APPLE__) && !defined(__CYGWIN__) && !defined(__GNU__) + #include <drm.h> + #else + typedef unsigned int drm_context_t; +Index: mesa/configure.ac +=================================================================== +--- mesa.orig/configure.ac ++++ mesa/configure.ac +@@ -87,7 +87,7 @@ + DEFINES="" + AC_SUBST([DEFINES]) + case "$host_os" in +-linux*|*-gnu*) ++linux*|*-gnu*|gnu*) + DEFINES="$DEFINES -D_GNU_SOURCE -DPTHREADS" + ;; + solaris*) +@@ -490,6 +490,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 +@@ -523,11 +530,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 + + # find the DRI deps for libGL + if test "$x11_pkgconfig" = yes; then +@@ -594,12 +603,6 @@ + [DRI_DRIVER_INSTALL_DIR="$withval"], + [DRI_DRIVER_INSTALL_DIR='${libdir}/dri']) + AC_SUBST([DRI_DRIVER_INSTALL_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...@:>@], +@@ -698,6 +701,10 @@ + unichrome savage sis swrast" + fi + ;; ++ gnu*) ++ DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER" ++ DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING -DHAVE_ALIAS" ++ ;; + solaris*) + DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER" + DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING" diff --git a/debian/patches/series b/debian/patches/series index 86f17dc..807b350 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 02_use-ieee-fp-on-s390-and-m68k.patch 03_optional-progs-and-install.patch 04_osmesa_version.diff +05_hurd-ftbfs.diff -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
