mesa: Changes to 'ubuntu'
debian/changelog | 13 +++++++++++
debian/libgl1-mesa-dri.install.linux | 5 +++-
debian/patches/111_export_searchdirs_in_dripc.diff | 24 +++++++++++++++++++++
debian/patches/series | 1
debian/rules | 20 ++++-------------
5 files changed, 47 insertions(+), 16 deletions(-)
New commits:
commit 1c37326e9471ba76251ac2af810dfe1f8789dfbb
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Fri Feb 18 21:35:13 2011 +1100
Export mesa DRI searchpaths in dri.pc for the Xserver
diff --git a/debian/changelog b/debian/changelog
index 9d9a3a1..0c8a5ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ mesa (7.10.1~git20110215.cc1636b6-0ubuntu2) natty; urgency=low
- Add /usr/lib/dri-alternates to the driver search path, and install the
classic r300 and r600 drivers there so mesa will fallback when the
gallium drivers are unavailable (such as when using UMS).
+ * debian/patches/111_export_searchdirs_in_dripc.diff:
+ - Add drisearchdirs variable to dri.pc so the Xserver can pick up the
+ alternate DRI driver dirs.
-- Christopher James Halse Rogers <raof@ubuntu.com> Fri, 18 Feb 2011 21:31:37 +1100
diff --git a/debian/patches/111_export_searchdirs_in_dripc.diff b/debian/patches/111_export_searchdirs_in_dripc.diff
new file mode 100644
index 0000000..8c85ccd
--- /dev/null
+++ b/debian/patches/111_export_searchdirs_in_dripc.diff
@@ -0,0 +1,24 @@
+Index: mesa/src/mesa/drivers/dri/Makefile
+===================================================================
+--- mesa.orig/src/mesa/drivers/dri/Makefile 2011-02-18 21:02:23.777115341 +1100
++++ mesa/src/mesa/drivers/dri/Makefile 2011-02-18 21:03:12.557186884 +1100
+@@ -26,6 +26,7 @@
+ -e 's,@INSTALL_INC_DIR@,$(INSTALL_INC_DIR),' \
+ -e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),' \
+ -e 's,@DRI_DRIVER_DIR@,$(DRI_DRIVER_INSTALL_DIR),' \
++ -e 's,@DRI_DRIVER_SEARCH_DIR@,$(DRI_DRIVER_SEARCH_DIR),' \
+ -e 's,@DRI_PC_REQ_PRIV@,$(DRI_PC_REQ_PRIV),'
+
+ dri.pc: dri.pc.in
+Index: mesa/src/mesa/drivers/dri/dri.pc.in
+===================================================================
+--- mesa.orig/src/mesa/drivers/dri/dri.pc.in 2011-02-18 21:02:23.717115253 +1100
++++ mesa/src/mesa/drivers/dri/dri.pc.in 2011-02-18 21:02:45.337146969 +1100
+@@ -3,6 +3,7 @@
+ libdir=@INSTALL_LIB_DIR@
+ includedir=@INSTALL_INC_DIR@
+ dridriverdir=@DRI_DRIVER_DIR@
++drisearchdirs=@DRI_DRIVER_SEARCH_DIR@
+
+ Name: dri
+ Description: Direct Rendering Infrastructure
diff --git a/debian/patches/series b/debian/patches/series
index 20444fc..217d136 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@
108_fix_leaks_dri2_screen_creation.patch
109_fix_length_of_glxgetfbconfigssgix.patch
110_nv50_fix_tgsi_sign_mode.diff
+111_export_searchdirs_in_dripc.diff
commit edc7d807fe2b4e025fa2afc3d222f0cb1b778c90
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Fri Feb 18 21:33:18 2011 +1100
Install classic radeon DRI in /usr/lib/dri-alternates
and point mesa at that as a fallback path
diff --git a/debian/changelog b/debian/changelog
index fa84821..9d9a3a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+mesa (7.10.1~git20110215.cc1636b6-0ubuntu2) natty; urgency=low
+
+ * debian/rules:
+ * debian/libgl1-mesa-dri.install.linux:
+ - Add /usr/lib/dri-alternates to the driver search path, and install the
+ classic r300 and r600 drivers there so mesa will fallback when the
+ gallium drivers are unavailable (such as when using UMS).
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com> Fri, 18 Feb 2011 21:31:37 +1100
+
mesa (7.10.1~git20110215.cc1636b6-0ubuntu1) natty; urgency=low
* Merge from Debian. Remaining Ubuntu changes:
diff --git a/debian/libgl1-mesa-dri.install.linux b/debian/libgl1-mesa-dri.install.linux
index 1cb383b..c2718c2 100644
--- a/debian/libgl1-mesa-dri.install.linux
+++ b/debian/libgl1-mesa-dri.install.linux
@@ -5,4 +5,7 @@ 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/r600g_dri.so usr/lib/dri
+build/dri/lib/gallium/r600_dri.so usr/lib/dri
+# Install the classic radeon drivers for UMS fallback
+build/dri/lib/r300_dri.so usr/lib/dri-alternates
+build/dri/lib/r600_dri.so usr/lib/dri-alternates
diff --git a/debian/rules b/debian/rules
index ab6b9bf..e89e053 100755
--- a/debian/rules
+++ b/debian/rules
@@ -183,8 +183,12 @@ 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
+#
+# Add /usr/lib/dri-alternates for classic fallback for gallium drivers
ifeq ($(DEB_BUILD_ARCH),i386)
- confflags-dri += --with-dri-searchpath=/usr/lib/dri:/usr/lib32/dri
+ 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
endif
configure: $(QUILT_STAMPFN) configure.ac
@@ -207,20 +211,6 @@ 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: