debian/changelog | 4 ++++
debian/libgl1-mesa-dri.install.linux.in | 2 +-
debian/rules | 10 ++--------
3 files changed, 7 insertions(+), 9 deletions(-)
New commits:
commit d35fc9e2d8d1a73fc519537a4702b2e6a9742924
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Thu Feb 2 12:08:14 2012 +0200
rules: Handle installing r300_dri.so like other gallium drivers
diff --git a/debian/changelog b/debian/changelog
index 7e2f2a2..bab3925 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ mesa (8.0~rc2-1) UNRELEASED; urgency=low
rest.
* rules: No need to copy nouveau_vieux to the gallium dir, it's
installed in libgl1-mesa-dri now.
+ * rules: Handle installing r300_dri.so like other gallium drivers,
+ in libgl1-mesa-dri.install.linux.in.
[ Robert Hooker ]
* Bump libdrm build dep to 2.4.30, x11proto-gl-dev to 1.4.14, and
diff --git a/debian/libgl1-mesa-dri.install.linux.in
b/debian/libgl1-mesa-dri.install.linux.in
index 807486f..ee1acd8 100644
--- a/debian/libgl1-mesa-dri.install.linux.in
+++ b/debian/libgl1-mesa-dri.install.linux.in
@@ -2,6 +2,7 @@
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
build/dri/${DEB_HOST_MULTIARCH}/gallium/nouveau_dri.so
usr/lib/${DEB_HOST_MULTIARCH}/dri
build/dri/${DEB_HOST_MULTIARCH}/gallium/vmwgfx_dri.so
usr/lib/${DEB_HOST_MULTIARCH}/dri
diff --git a/debian/rules b/debian/rules
index c5d56ff..952d726 100755
--- a/debian/rules
+++ b/debian/rules
@@ -293,14 +293,13 @@ binary-arch: install
rm debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/libglapi.so
dh_install -s --fail-missing
-ifneq (,$(filter r300,$(GALLIUM_DRIVERS)))
- dh_install -plibgl1-mesa-dri
build/dri/$(DEB_HOST_MULTIARCH)/gallium/r300_dri.so
usr/lib/${DEB_HOST_MULTIARCH}/dri
-endif
+
# If the llvmpipe driver was built, copy it to the package dir
ifneq (,$(filter swrast,$(GALLIUM_DRIVERS)))
dh_install -plibgl1-mesa-dri
build/dri/$(DEB_HOST_MULTIARCH)/gallium/swrast_dri.so \
usr/lib/${DEB_HOST_MULTIARCH}/dri
endif
+
dh_installman -s
dh_lintian -s
dh_link -s
commit 989e935f2db156996d9d42a4b0043d83e3c2cd66
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Thu Feb 2 11:09:36 2012 +0200
rules: No need to copy nouveau_vieux to the gallium dir, it's installed in
libgl1-mesa-dri now.
diff --git a/debian/changelog b/debian/changelog
index fe6e144..7e2f2a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ mesa (8.0~rc2-1) UNRELEASED; urgency=low
* Enable vmwgfx gallium driver & xatracker. (Closes: #652501).
* Build llvmpipe swrast only on non-hurd x86, traditional for the
rest.
+ * rules: No need to copy nouveau_vieux to the gallium dir, it's
+ installed in libgl1-mesa-dri now.
[ Robert Hooker ]
* Bump libdrm build dep to 2.4.30, x11proto-gl-dev to 1.4.14, and
diff --git a/debian/libgl1-mesa-dri.install.linux.in
b/debian/libgl1-mesa-dri.install.linux.in
index 4dfc182..807486f 100644
--- a/debian/libgl1-mesa-dri.install.linux.in
+++ b/debian/libgl1-mesa-dri.install.linux.in
@@ -4,5 +4,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/r600_dri.so
usr/lib/${DEB_HOST_MULTIARCH}/dri
build/dri/${DEB_HOST_MULTIARCH}/gallium/nouveau_dri.so
usr/lib/${DEB_HOST_MULTIARCH}/dri
-build/dri/${DEB_HOST_MULTIARCH}/gallium/nouveau_vieux_dri.so
usr/lib/${DEB_HOST_MULTIARCH}/dri
build/dri/${DEB_HOST_MULTIARCH}/gallium/vmwgfx_dri.so
usr/lib/${DEB_HOST_MULTIARCH}/dri
diff --git a/debian/rules b/debian/rules
index 2df88ec..c5d56ff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -284,11 +284,6 @@ binary-arch: install
# install the right files manually.
rm -r debian/tmp/dri/usr/lib/$(DEB_HOST_MULTIARCH)/dri
- # Move nouveau_vieux alongside nouveau to install in dri-experimental
package
-ifneq (,$(filter nouveau,$(DRI_DRIVERS)))
- mv build/dri/$(DEB_HOST_MULTIARCH)/nouveau_vieux_dri.so
build/dri/$(DEB_HOST_MULTIARCH)/gallium/
-endif
-
# Also get rid of other files which aren't installed. Do not
# use -f to ensure we notice disappearing files:
set -e; for file in $(NOT_INSTALLED); do rm debian/tmp/$$file; done
--
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/e1rstr8-0007rr...@vasks.debian.org
