diff options
| author | Samuel Thibault <[email protected]> | 2007-06-28 22:33:05 +0100 |
|---|---|---|
| committer | Julien Cristau <[email protected]> | 2007-06-28 22:33:05 +0100 |
| commit | 498b4dbba4589b00c7733f44cabe10c57d0efa0a (patch) | |
| tree | b07036da475bc960fac7275ebacef7288769bbf8 /debian | |
| parent | ecc42e79aee93504d0e43916ab8dec672b3359c2 (diff) | |
Fix build on hurd-i386.
Build libgl1-mesa-glx without direct rendering support on that arch, and
don't build any dri driver.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | debian/scripts/choose-configs | 8 |
3 files changed, 11 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index d3df28b1d62..203972196e5 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 e6ad5308986..17f1e9ada06 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 3f5f9868e51..16e00828a76 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 ############################################################################## |