configs/debian-indirect-default | 7 +++++++
configs/debian-indirect-hurd-i386 | 9 +++++++++
debian/changelog | 4 +++-
debian/control | 4 ++--
debian/scripts/choose-configs | 8 ++++++--
5 files changed, 27 insertions(+), 5 deletions(-)
New commits:
commit 498b4dbba4589b00c7733f44cabe10c57d0efa0a
Author: Samuel Thibault <[EMAIL PROTECTED]>
Date: Thu Jun 28 22:33:05 2007 +0100
Fix build on hurd-i386.
Build libgl1-mesa-glx without direct rendering support on that arch, and
don't build any dri driver.
diff --git a/configs/debian-indirect-default b/configs/debian-indirect-default
new file mode 100644
index 0000000..a6926c9
--- /dev/null
+++ b/configs/debian-indirect-default
@@ -0,0 +1,7 @@
+# Configuration defaults for building GLX-enabled libGL.
+
+include $(TOP)/configs/debian-dri-default
+
+CONFIG_NAME = debian-indirect-default
+
+DRI_DIRS =
diff --git a/configs/debian-indirect-hurd-i386
b/configs/debian-indirect-hurd-i386
new file mode 100644
index 0000000..dd4bb07
--- /dev/null
+++ b/configs/debian-indirect-hurd-i386
@@ -0,0 +1,9 @@
+# Configuration for building the DRI drivers on the build architecture.
+
+include $(TOP)/configs/linux-indirect
+include $(TOP)/configs/debian-indirect-default
+
+CONFIG_NAME = debian-indirect-hurd-i386
+
+# vim: ft=make
+
diff --git a/debian/changelog b/debian/changelog
index d3df28b..2039721 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,10 @@ mesa (7.0-1) UNRELEASED; urgency=low
* Modify the short descriptions of various packages so they fit in .changes
files without being cut off. Thanks, Marc 'HE' Brockschmidt!
* Add a shlibs file for libgl1-mesa-swx11-i686.
+ * Fix build on hurd-i386 (build libgl1-mesa-glx without dri support and
+ don't build the dri drivers); closes: #420403. Thanks, Samuel Thibault!
- -- Julien Cristau <[EMAIL PROTECTED]> Thu, 28 Jun 2007 21:59:50 +0100
+ -- Julien Cristau <[EMAIL PROTECTED]> Thu, 28 Jun 2007 22:26:10 +0100
mesa (6.5.3-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index e6ad530..17f1e9a 100644
--- a/debian/control
+++ b/debian/control
@@ -153,7 +153,7 @@ Description: Debugging symbols for the Mesa GLX runtime
Package: libgl1-mesa-dri
Section: libs
Priority: optional
-Architecture: any
+Architecture: alpha amd64 arm armeb armel hppa i386 ia64 kfreebsd-i386
kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc
Depends: ${shlibs:Depends}, libgl1-mesa-glx (= ${binary:Version})
Suggests: libglide3
Conflicts: xlibmesa-dri (<< 1:7.0.0)
@@ -174,7 +174,7 @@ Description: A free implementation of the OpenGL API -- DRI
modules
Package: libgl1-mesa-dri-dbg
Section: libdevel
Priority: extra
-Architecture: any
+Architecture: alpha amd64 arm armeb armel hppa i386 ia64 kfreebsd-i386
kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc
Depends: libgl1-mesa-dri (= ${binary:Version})
Description: Debugging symbols for the Mesa DRI modules
This version of Mesa provides GLX and DRI capabilities: it is capable of
diff --git a/debian/scripts/choose-configs b/debian/scripts/choose-configs
index 3f5f986..16e0082 100644
--- a/debian/scripts/choose-configs
+++ b/debian/scripts/choose-configs
@@ -22,10 +22,14 @@ else
endif
# and for the GLX/DRI-enabled libGL
-ifneq ($(wildcard configs/debian-dri-$(DEB_BUILD_ARCH)),)
- DRI_CONFIGS := debian-dri-$(DEB_BUILD_ARCH)
+ifneq ($(wildcard configs/debian-indirect-$(DEB_BUILD_ARCH)),)
+ DRI_CONFIGS := debian-indirect-$(DEB_BUILD_ARCH)
else
+ ifneq ($(wildcard configs/debian-dri-$(DEB_BUILD_ARCH)),)
+ DRI_CONFIGS := debian-dri-$(DEB_BUILD_ARCH)
+ else
DRI_CONFIGS := debian-dri-any
+ endif
endif
##############################################################################
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
