* Add patch from Cyril Brulebois to allow package to build on HURD, which

  lacks DRI and directfb. This includes not using lib-directfb in the
  build-depends for hurd-i386. It also creates a new debian config,
  debian-indirect, which is used when building for HURD. This config is
  invoked in the debian-dri config on hurd-i386. Thanks to Cyril Brulebois
  for the patch, Michael Banck, Michel Dänzer, and Samuel Thibault for
  input on an appropriate fix. (closes: #358065)

5 files changed, 32 insertions, 3 deletions

diff --git a/configs/debian-directfb b/configs/debian-directfb
index 6d6c542a321..fb8c711da2e 100644
--- a/configs/debian-directfb
+++ b/configs/debian-directfb
@@ -5,3 +5,12 @@ CONFIG_NAME = debian-directfb
 GL_LIB_DEPS = -lm -lpthread
 
 DRIVER_DIRS = directfb
+
+ifeq ($(DEB_HOST_ARCH),hurd-i386)
+gnudefault:
+    @echo "No directfb on hurd, disabling the build by default target
+diversion"
+    @echo "Creating an empty and invalid shared object so that the build
+runs OK"
+    touch mesa/drivers/directfb/libidirectfbgl_mesa.so
+endif
diff --git a/configs/debian-dri b/configs/debian-dri
index 5a88972b8d1..519f20d4b83 100644
--- a/configs/debian-dri
+++ b/configs/debian-dri
@@ -2,6 +2,11 @@ include $(TOP)/configs/debian
 
 CONFIG_NAME = debian-dri
 
+ifeq ($(DEB_HOST_ARCH_OS),hurd)
+# Switch to debian-indirect target
+    include $(TOP)/configs/debian-indirect
+else
+
 DEBIAN_COMMON_CPPFLAGS += -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING -DHAVE_ALIAS -DDEFAULT_DRIVER_DIR=\"$(DEBIAN_DRIVERS_DIR)\"
 
 LIBDRM_LIB = `pkg-config --libs libdrm`
@@ -32,3 +37,5 @@ endif
 ifeq ($(DEB_HOST_ARCH),amd64)
 DRI_DIRS += i915
 endif
+
+endif # DRI or debian-indirect
diff --git a/configs/debian-indirect b/configs/debian-indirect
new file mode 100644
index 00000000000..77fdab95924
--- /dev/null
+++ b/configs/debian-indirect
@@ -0,0 +1,6 @@
+DEBIAN_COMMON_CPPFLAGS += -DPTHREADS -DHAVE_ALIAS
+
+DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl
+GL_LIB_DEPS  = `pkg-config --libs x11 xext xxf86vm` -lm -lpthread -ldl
+
+SRC_DIRS = glx/x11 glu glut/glx glw
diff --git a/debian/changelog b/debian/changelog
index 9a8ae0c6c7a..00ed7bf4956 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,15 @@ mesa (6.5.1-0.1) UNRELEASED; urgency=low
   * Re-add s390 and m68k to the USE_IEEE test in src/mesa/main/imports.h. This
     package seriously needs to store patches somewhere that are easy to find
     and re-apply.
-
- -- David Nusinow <dnusinow@debian.org>  Mon, 25 Sep 2006 20:31:23 -0400
+  * Add patch from Cyril Brulebois to allow package to build on HURD, which
+    lacks DRI and directfb. This includes not using lib-directfb in the
+    build-depends for hurd-i386. It also creates a new debian config,
+    debian-indirect, which is used when building for HURD. This config is
+    invoked in the debian-dri config on hurd-i386. Thanks to Cyril Brulebois
+    for the patch, Michael Banck, Michel Dänzer, and Samuel Thibault for
+    input on an appropriate fix. (closes: #358065)
+
+ -- David Nusinow <dnusinow@debian.org>  Mon, 25 Sep 2006 20:43:42 -0400
 
 mesa (6.5.0.cvs.20060524-1.1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 2794e37dc7d..7dcc1efa2bb 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Mesa package maintainers <pkg-mesa-devel@lists.alioth.debian.org>
 Uploaders: Marcelo E. Magallon <mmagallo@debian.org>
 Standards-Version: 3.7.2
-Build-Depends: lesstif2-dev, grep-dctrl, debhelper (>> 4), build-essential (>= 11), libdrm-dev (>= 2.0.2) [!hurd-i386], libdirectfb-dev, xutils, libexpat-dev, libxxf86vm-dev, libx11-dev, libxext-dev, pkg-config, x11proto-gl-dev (>= 1.4.8) , dpkg-dev (>= 1.13.19)
+Build-Depends: lesstif2-dev, grep-dctrl, debhelper (>> 4), build-essential (>= 11), libdrm-dev (>= 2.0.2) [!hurd-i386], libdirectfb-dev [!hurd-i386], xutils, libexpat-dev, libxxf86vm-dev, libx11-dev, libxext-dev, pkg-config, x11proto-gl-dev (>= 1.4.8) , dpkg-dev (>= 1.13.19)
 
 Package: libgl1-mesa-swx11
 Section: libs