mesa: Changes to 'debian-experimental'
debian/changelog | 4 ++++
debian/control | 4 ++--
debian/rules | 13 ++++++++-----
3 files changed, 14 insertions(+), 7 deletions(-)
New commits:
commit 9a3a20b2b9f893f5b561aa596699d5c72cbe0f4f
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jan 31 23:04:06 2009 +0100
debian/rules: on lpia, only build the i915 and i965 dri drivers
Based on Ubuntu changes, modified to also build swrast.
diff --git a/debian/changelog b/debian/changelog
index 46c0f5a..bb619bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ mesa (7.3-2) UNRELEASED; urgency=low
actual releases.
* debian/control: add lpia to the Architecture field for
libgl1-mesa-dri{,-dbg} to match Ubuntu.
+ * debian/rules: on lpia, only build the i915 and i965 dri drivers (based on
+ Ubuntu changes).
-- Julien Cristau <jcristau@debian.org> Sat, 31 Jan 2009 22:06:36 +0100
diff --git a/debian/rules b/debian/rules
index 120319e..1583dac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -63,15 +63,18 @@ ifeq ($(DEB_HOST_ARCH_OS), hurd)
DIRECT_RENDERING = --disable-driglx-direct
else
DIRECT_RENDERING = --enable-driglx-direct
+ ifeq ($(DEB_HOST_ARCH), lpia)
+ DRI_DRIVERS += i915 i965
+ else
DRI_DRIVERS += mach64 mga r128 r200 r300 radeon s3v savage tdfx trident
-endif
-
-ifeq ($(DEB_HOST_GNU_CPU), i486)
+ ifeq ($(DEB_HOST_GNU_CPU), i486)
DRI_DRIVERS += i810 i915 i965 sis unichrome
-else ifeq ($(DEB_HOST_GNU_CPU), x86_64)
+ else ifeq ($(DEB_HOST_GNU_CPU), x86_64)
DRI_DRIVERS += i915 i965 sis unichrome
-else ifeq ($(DEB_HOST_ARCH), sparc)
+ else ifeq ($(DEB_HOST_ARCH), sparc)
DRI_DRIVERS += ffb
+ endif
+ endif
endif
confflags-dri = \
commit 4672811541f0e7b53c223568644cb938ec22dff4
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jan 31 22:30:15 2009 +0100
debian/control: build the dri drivers on lpia
add lpia to the Architecture field for libgl1-mesa-dri{,-dbg} to match Ubuntu.
diff --git a/debian/changelog b/debian/changelog
index e06a1ca..46c0f5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ mesa (7.3-2) UNRELEASED; urgency=low
* Fix watch file to make uscan not consider release candidates as newer than
actual releases.
+ * debian/control: add lpia to the Architecture field for
+ libgl1-mesa-dri{,-dbg} to match Ubuntu.
-- Julien Cristau <jcristau@debian.org> Sat, 31 Jan 2009 22:06:36 +0100
diff --git a/debian/control b/debian/control
index 0a8f72f..013329d 100644
--- a/debian/control
+++ b/debian/control
@@ -162,7 +162,7 @@ Description: Debugging symbols for the Mesa GLX runtime
Package: libgl1-mesa-dri
Section: libs
Priority: optional
-Architecture: alpha amd64 arm armeb armel hppa i386 ia64 kfreebsd-i386 kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc
+Architecture: alpha amd64 arm armeb armel hppa i386 ia64 kfreebsd-i386 kfreebsd-amd64 lpia m68k mips mipsel powerpc s390 sparc
Depends: ${shlibs:Depends}, libgl1-mesa-glx (= ${binary:Version})
Suggests: libglide3
Conflicts: xlibmesa-dri (<< 1:7.0.0)
@@ -183,7 +183,7 @@ Description: A free implementation of the OpenGL API -- DRI modules
Package: libgl1-mesa-dri-dbg
Section: libdevel
Priority: extra
-Architecture: alpha amd64 arm armeb armel hppa i386 ia64 kfreebsd-i386 kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc
+Architecture: alpha amd64 arm armeb armel hppa i386 ia64 kfreebsd-i386 kfreebsd-amd64 lpia 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
Reply to: