configs/debian-indirect-default | 7 +++++++ configs/debian-indirect-hurd-i386 | 9 +++++++++ debian/changelog | 6 ++++-- debian/control | 4 ++-- debian/scripts/choose-configs | 8 ++++++-- 5 files changed, 28 insertions(+), 6 deletions(-)
New commits: commit 31f3433635e46d76be48f2b0ddeaf76d7c9df77e Author: Julien Cristau <[EMAIL PROTECTED]> Date: Thu Jul 5 00:56:56 2007 +0200 Prepare changelog for upload. diff --git a/debian/changelog b/debian/changelog index 5e71fec..9655724 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mesa (6.5.2-6) UNRELEASED; urgency=low +mesa (6.5.2-6) unstable; urgency=low * libgl1-mesa-swx11 needs to depend on libosmesa6 (>= 6.5.2-1) because it used to contain libOSMesa.so.6. This means that programs linked @@ -7,7 +7,7 @@ mesa (6.5.2-6) UNRELEASED; urgency=low * 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, 05 Jul 2007 00:47:14 +0200 + -- Julien Cristau <[EMAIL PROTECTED]> Thu, 05 Jul 2007 00:56:35 +0200 mesa (6.5.2-5) unstable; urgency=low commit 639eaceee74f0f3787b2b6e1c682c90696c085d4 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 b597377..5e71fec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,10 @@ mesa (6.5.2-6) UNRELEASED; urgency=low it used to contain libOSMesa.so.6. This means that programs linked against this lib got a dependency on -swx11 which was broken since 6.5.2-1. + * 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]> Tue, 03 Jul 2007 05:28:37 +0200 + -- Julien Cristau <[EMAIL PROTECTED]> Thu, 05 Jul 2007 00:47:14 +0200 mesa (6.5.2-5) unstable; urgency=low diff --git a/debian/control b/debian/control index ae265c8..83e5907 100644 --- a/debian/control +++ b/debian/control @@ -158,7 +158,7 @@ Description: A free implementation of the OpenGL API -- GLX runtime -- debugging 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) @@ -179,7 +179,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: A free implementation of the OpenGL API -- DRI modules -- debugging symbols 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]