mesa: Changes to 'ubuntu'
debian/changelog | 17 ++++++++++++-----
debian/control | 2 +-
debian/libgl1-mesa-dri.install.linux | 4 +---
debian/not-installed | 13 -------------
debian/rules | 18 +++++++++++++++---
5 files changed, 29 insertions(+), 25 deletions(-)
New commits:
commit b37e2463788452e2c5534cb0af026b844c5f0346
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Thu Feb 17 15:11:09 2011 +1100
Drop i686 files from not-installed; we don't build the i686 swx11 packages
diff --git a/debian/changelog b/debian/changelog
index cf807f2..fa84821 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,6 +43,9 @@ mesa (7.10.1~git20110215.cc1636b6-0ubuntu1) natty; urgency=low
(LP: #710588)
* debian/control:
- Drop no-longer-used libtalloc-dev build-dependency.
+ * debian/not-installed:
+ - Remove i686 files from not-installed list; we don't build the i686 swx11
+ packages.
-- Christopher James Halse Rogers <raof@ubuntu.com> Wed, 16 Feb 2011 10:37:07 +1100
diff --git a/debian/not-installed b/debian/not-installed
index af56423..b6eb7ba 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -24,19 +24,6 @@ NOT_INSTALLED := \
usr/include/GL/wglext.h \
usr/include/GL/wmesa.h
-# Architecture-specific additional files:
-NOT_INSTALLED_i386 = \
- usr/lib/i686/cmov/libGL.so \
- usr/lib/i686/cmov/libGLU.so \
- usr/lib/i686/cmov/libGLU.so.1 \
- usr/lib/i686/cmov/libGLU.so.1.* \
- usr/lib/i686/cmov/libGLw.so \
- usr/lib/i686/cmov/libGLw.so.1 \
- usr/lib/i686/cmov/libGLw.so.1.* \
- usr/lib/i686/cmov/pkgconfig/glw.pc \
- usr/lib/i686/cmov/pkgconfig/glu.pc \
- usr/lib/i686/cmov/pkgconfig/gl.pc \
-
# Detect the current architecture and add the files if any:
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
NOT_INSTALLED += $(NOT_INSTALLED_$(DEB_HOST_ARCH))
commit 909286e6b2fd5be3b153526a244bf7669edb1aef
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Thu Feb 17 14:46:48 2011 +1100
Add mention of more Ubuntu changes remaining from the merge
diff --git a/debian/changelog b/debian/changelog
index 32ed684..cf807f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ mesa (7.10.1~git20110215.cc1636b6-0ubuntu1) natty; urgency=low
+ Comment out GLw libs since it depends on lesstif-dev.
+ Drop i686 swx11 libgl package.
+ Add libdrm-dev to mesa-common-dev Depends.
+ + Drop [linux-any] qualifier from libudev-dev to fix pbuilder FTBFS
+ (see deb bug 600823)
- debian/rules
+ Use --disable-glw for swx11 targets too.
+ Don't enable motif for swx11 targets.
@@ -24,6 +26,11 @@ mesa (7.10.1~git20110215.cc1636b6-0ubuntu1) natty; urgency=low
+ Point at Ubuntu branch to make git-buildpackage less narky.
- debian/patches/105_use_shared_libdricore.patch, debian/rules:
+ Link DRI drivers against shared dricore routines to save CD space.
+ - debian/patches/109_fix_length_of_glxgetfbconfigssgix.patch:
+ Fix "BadLength (poly request too large or internal Xlib length"
+ when using non-C, non-en locales. (LP 714280)
+ - debian/patches/108_fix_leaks_dri2_screen_creation.patch: Cherrypick
+ to fix some leaks in DRI2 screen creation failure paths.
* New upstream snapshot from 7.10 release branch.
* debian/patches/10_fix_talloc_linking.diff:
- Drop. Upstream has replaced talloc with an in-tree replacement
commit e5ab64acfd1cd6c44c45d892099306f99b9324c1
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Thu Feb 17 14:33:17 2011 +1100
Drop unused libtalloc-dev build-dependency
diff --git a/debian/changelog b/debian/changelog
index 405b871..32ed684 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,8 @@ mesa (7.10.1~git20110215.cc1636b6-0ubuntu1) natty; urgency=low
* debian/patches/110_nv50_fix_tgsi_sign_mode.diff:
- Cherry-pick from master. Fixes assert hit by Unity on nv5x hardware
(LP: #710588)
+ * debian/control:
+ - Drop no-longer-used libtalloc-dev build-dependency.
-- Christopher James Halse Rogers <raof@ubuntu.com> Wed, 16 Feb 2011 10:37:07 +1100
diff --git a/debian/control b/debian/control
index cc355dc..12c1f8f 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 7.2.7), quilt (>= 0.40), pkg-config,
linux-libc-dev (>= 2.6.31) [linux-any],
libx11-xcb-dev, libxcb-dri2-0-dev, libxcb-xfixes0-dev, python-libxml2,
# libtalloc-dev, libudev-dev [linux-any],
- libtalloc-dev, libudev-dev,
+ libudev-dev,
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/mesa.git
Homepage: http://mesa3d.sourceforge.net/
commit b7699eaf6695a596118c98ee53326ea8f0f6572e
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Thu Feb 17 11:58:22 2011 +1100
Revert new radeon gallium handling.
This requires Xserver changes and dropping a DDX patch. Just drop
it for now so these don't block getting the rest of the mesa goodness in.
diff --git a/debian/changelog b/debian/changelog
index d9a28e0..405b871 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,11 +34,6 @@ mesa (7.10.1~git20110215.cc1636b6-0ubuntu1) natty; urgency=low
* debian/patches/110_nv50_fix_tgsi_sign_mode.diff:
- Cherry-pick from master. Fixes assert hit by Unity on nv5x hardware
(LP: #710588)
- * debian/rules:
- * debian/libgl1-mesa-dri.install.linux:
- - Add /usr/lib/dri-alternates to DRI search path and install r300c/r600c
- there. The gallium drivers will fail to load without KMS, and libGL
- will then load the classic drivers from dri-alternates.
-- Christopher James Halse Rogers <raof@ubuntu.com> Wed, 16 Feb 2011 10:37:07 +1100
diff --git a/debian/libgl1-mesa-dri.install.linux b/debian/libgl1-mesa-dri.install.linux
index 9d237cc..1cb383b 100644
--- a/debian/libgl1-mesa-dri.install.linux
+++ b/debian/libgl1-mesa-dri.install.linux
@@ -5,6 +5,4 @@ build/dri/lib/libdricore.so usr/lib/dri
# This part is Linux-specific:
build/dri/lib/gallium/r300_dri.so usr/lib/dri
-build/dri/lib/gallium/r600_dri.so usr/lib/dri
-build/dri/lib/r300_dri.so usr/lib/dri-alternates
-build/dri/lib/r600_dri.so usr/lib/dri-alternates
+build/dri/lib/gallium/r600g_dri.so usr/lib/dri
diff --git a/debian/rules b/debian/rules
index c9d00bc..ab6b9bf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -184,9 +184,7 @@ confflags-swx11+glu-i386-i686 = \
# Add /usr/lib32/dri/ on 32 bit systems so that this path is used
# for 32 bit compatibility on 64 bit systems
ifeq ($(DEB_BUILD_ARCH),i386)
- confflags-dri += --with-dri-searchpath=/usr/lib/dri:/usr/lib/dri-alternates:/usr/lib32/dri:/usr/lib32/dri-alternates
-else
- confflags-dri += --with-dri-searchpath=/usr/lib/dri:/usr/lib/dri-alternates
+ confflags-dri += --with-dri-searchpath=/usr/lib/dri:/usr/lib32/dri
endif
configure: $(QUILT_STAMPFN) configure.ac
@@ -209,6 +207,20 @@ build-stamp: $(BUILD_STAMPS)
# Remove gallium drivers which replace existing classic drivers.
# Intel gallium is significantly behind the classic mesa drivers...
rm -f build/dri/lib/gallium/i915_dri.so
+# We want to be able to ship both r300g & r300c for UMS support.
+# If we're building both, rename classic r300_dri to r300c_dri
+ifneq (,$(findstring r300,$(DRI_DRIVERS)))
+ ifneq (,$(findstring radeon,$(GALLIUM_DRIVERS)))
+ mv build/dri/lib/r300_dri.so build/dri/lib/r300c_dri.so
+ endif
+endif
+# Similarly, we want to ship both r600g & r600c, but this
+# time r600c is the default, so rename r600g.
+ifneq (,$(findstring r600,$(DRI_DRIVERS)))
+ ifneq (,$(findstring r600,$(GALLIUM_DRIVERS)))
+ mv build/dri/lib/gallium/r600_dri.so build/dri/lib/gallium/r600g_dri.so
+ endif
+endif
>$@
$(STAMP)-build-%: configure
Reply to: