debian/changelog | 13 +++++++++++++
debian/libgl1-mesa-dri.install.linux.in | 1 -
debian/rules | 3 +++
3 files changed, 16 insertions(+), 1 deletion(-)
New commits:
commit 1af5c48fc405f5e1efda830f9773b315547eaec2
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Wed Jun 29 19:11:35 2011 +0100
Only install r300 when we build it
diff --git a/debian/changelog b/debian/changelog
index 4817d24..ef95398 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,10 @@ mesa (7.11~1-1) UNRELEASED; urgency=low
* Drop 12-llvm-config-check.diff; upstream.
* Add strictly versioned dependencies on libglapi-mesa to libgl1-mesa-glx
and libegl1-mesa-drivers as they also now depend on this internal library.
+ * debian/rules:
+ * debian/libgl1-mesa-dri.install.linux.in:
+ - Manually install r300g only when we actually build it. Fixes build on
+ non-i386, non-amd64 linux.
-- Christopher James Halse Rogers <r...@ubuntu.com> Tue, 28 Jun 2011
21:34:53 +0100
diff --git a/debian/libgl1-mesa-dri.install.linux.in
b/debian/libgl1-mesa-dri.install.linux.in
index 31019af..9a649a4 100644
--- a/debian/libgl1-mesa-dri.install.linux.in
+++ b/debian/libgl1-mesa-dri.install.linux.in
@@ -2,5 +2,4 @@
build/dri/${DEB_HOST_MULTIARCH}/*_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
# This part is Linux-specific:
-build/dri/${DEB_HOST_MULTIARCH}/gallium/r300_dri.so
usr/lib/${DEB_HOST_MULTIARCH}/dri
build/dri/${DEB_HOST_MULTIARCH}/gallium/r600_dri.so
usr/lib/${DEB_HOST_MULTIARCH}/dri
diff --git a/debian/rules b/debian/rules
index 61c649c..a6bfca4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -305,6 +305,9 @@ endif
# No need for this .so, libglapi is just a convenience library:
rm debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/libglapi.so
+ifneq (,$(filter r300,$(GALLIUM_DRIVERS)))
+ dh_install build/dri/$(DEB_HOST_MULTIARCH)/gallium/r300_dri.so
+endif
dh_install -s --fail-missing
dh_installman -s
dh_lintian -s
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qcepw-0004b2...@vasks.debian.org
