debian/changelog | 7 ++++++ debian/control | 46 +++++++++++++++++++++--------------------- debian/rules | 1 debian/scripts/choose-configs | 6 ++--- 4 files changed, 33 insertions(+), 27 deletions(-)
New commits: commit f8549d10a69214d05633cf5afbf1b8e0d9b4b042 Author: Christopher James Halse Rogers <[email protected]> Date: Thu May 20 12:14:25 2010 +1000 Drop -i686 version of mesa-swx11. Maverick i386 defaults to i686 arch anyway diff --git a/debian/changelog b/debian/changelog index ef95af9..b2cf80d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -40,6 +40,11 @@ mesa (7.8.1-1ubuntu1) UNRELEASED; urgency=low so that the Intel DRI drivers are actually built. - Drop LDFLAGS unexport. Mesa builds fine on amd64 with Ubuntu's default LDFLAGS. + * debian/control: + - Drop libgl1-mesa-swx11-i686 package. This package is pointless on + Maverick, as i386 now defaults to i686 + * debian/scripts/choose-configs: + - Drop libgl1-mesa-swx11-i686 from CPU-optimised swrast configs. -- Christopher James Halse Rogers <[email protected]> Wed, 19 May 2010 14:47:25 +1000 diff --git a/debian/control b/debian/control index a6d872c..f62902d 100644 --- a/debian/control +++ b/debian/control @@ -62,29 +62,29 @@ Description: A free implementation of the OpenGL API -- debugging symbols This package contains debugging symbols for the software rasterization GL library. -Package: libgl1-mesa-swx11-i686 -Section: libs -Priority: extra -Architecture: i386 kfreebsd-i386 hurd-i386 -Depends: libgl1-mesa-swx11 (= ${binary:Version}), ${shlibs:Depends} -Description: Mesa OpenGL runtime [i686 optimized] - Mesa is a 3-D graphics library with an API which is very similar to - that of OpenGL. To the extent that Mesa utilizes the OpenGL command - syntax or state machine, it is being used with authorization from - Silicon Graphics, Inc. However, the author makes no claim that Mesa - is in any way a compatible replacement for OpenGL or associated with - Silicon Graphics, Inc. - . - This library provides a pure software rasteriser; it does not provide - a direct rendering-capable library, or one which uses GLX. For that, - please see libgl1-mesa-glx. - . - On Linux, this library is also known as libGL or libGL.so.1. - . - This set of libraries is optimized for i686 machines and will only be used if - you are running a 2.6 kernel on an i686 class CPU. This includes Pentium Pro, - Pentium II/II/IV, Celeron CPU's and similar class CPU's (including clones - such as AMD Athlon/Opteron, VIA C3 Nehemiah, but not VIA C3 Ezla). +# Package: libgl1-mesa-swx11-i686 +# Section: libs +# Priority: extra +# Architecture: i386 kfreebsd-i386 hurd-i386 +# Depends: libgl1-mesa-swx11 (= ${binary:Version}), ${shlibs:Depends} +# Description: Mesa OpenGL runtime [i686 optimized] +# Mesa is a 3-D graphics library with an API which is very similar to +# that of OpenGL. To the extent that Mesa utilizes the OpenGL command +# syntax or state machine, it is being used with authorization from +# Silicon Graphics, Inc. However, the author makes no claim that Mesa +# is in any way a compatible replacement for OpenGL or associated with +# Silicon Graphics, Inc. +# . +# This library provides a pure software rasteriser; it does not provide +# a direct rendering-capable library, or one which uses GLX. For that, +# please see libgl1-mesa-glx. +# . +# On Linux, this library is also known as libGL or libGL.so.1. +# . +# This set of libraries is optimized for i686 machines and will only be used if +# you are running a 2.6 kernel on an i686 class CPU. This includes Pentium Pro, +# Pentium II/II/IV, Celeron CPU's and similar class CPU's (including clones +# such as AMD Athlon/Opteron, VIA C3 Nehemiah, but not VIA C3 Ezla). Package: libgl1-mesa-swx11-dev Section: libdevel diff --git a/debian/scripts/choose-configs b/debian/scripts/choose-configs index b7d68e2..6126790 100644 --- a/debian/scripts/choose-configs +++ b/debian/scripts/choose-configs @@ -37,10 +37,10 @@ endif ############################################################################## ## CPU-optimized configurations ############################################## -ifneq (,$(filter $(DEB_BUILD_ARCH), i386 kfreebsd-i386 hurd-i386)) - SWX11_GLU_CONFIGS += swx11+glu-i386-i686 +#ifneq (,$(filter $(DEB_BUILD_ARCH), i386 kfreebsd-i386 hurd-i386)) +# SWX11_GLU_CONFIGS += swx11+glu-i386-i686 # DRI_CONFIGS += debian-dri-i386-i686 -endif +#endif #ifeq ($(DEB_BUILD_ARCH), alpha) # SWX11_GLU_CONFIGS += debian-swx11+glu-alpha-ev5 commit 0014cdf6a1c12236a033b964915d660749c287b3 Author: Christopher James Halse Rogers <[email protected]> Date: Thu May 20 12:03:22 2010 +1000 Drop LDFLAGS unexport; mesa builds just fine with Ubuntu's default LDFLAGS diff --git a/debian/changelog b/debian/changelog index 79eabcd..ef95af9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,8 @@ mesa (7.8.1-1ubuntu1) UNRELEASED; urgency=low generated. - The i386 architecture for Maverick is now i686, not i486. Adapt rules so that the Intel DRI drivers are actually built. + - Drop LDFLAGS unexport. Mesa builds fine on amd64 with Ubuntu's + default LDFLAGS. -- Christopher James Halse Rogers <[email protected]> Wed, 19 May 2010 14:47:25 +1000 diff --git a/debian/rules b/debian/rules index 435154a..ede4d75 100755 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -unexport LDFLAGS CFLAGS = -Wall -g ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
