debian/mesa-vdpau-drivers.install.in | 1 -
debian/rules | 8 ++++++--
2 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 17f74c680c54c85b9b95c8943fd2b9e32bc0f696
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Tue Aug 12 13:47:38 2014 +0200
Create a megablob for vdpau correctly too.
diff --git a/debian/mesa-vdpau-drivers.install.in
b/debian/mesa-vdpau-drivers.install.in
deleted file mode 100644
index 50c703c..0000000
--- a/debian/mesa-vdpau-drivers.install.in
+++ /dev/null
@@ -1 +0,0 @@
-dri/usr/lib/${DEB_HOST_MULTIARCH}/vdpau/*.so*
usr/lib/${DEB_HOST_MULTIARCH}/vdpau/
diff --git a/debian/rules b/debian/rules
index 01c56d1..74568e2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -272,8 +272,6 @@ binary-arch: install
set -e; for file in $(NOT_INSTALLED); do rm debian/tmp/$$file; done
# Files only in git, not in tarballs, OK to use rm -f here:
set -e; for file in $(NOT_INSTALLED_EITHER); do rm -f
debian/tmp/$$file; done
- # No need for these .so, they're just convenience libraries:
- rm debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/libglapi.so
# purge .la files
find debian/tmp/ -name '*.la' -exec rm '{}' ';'
@@ -281,6 +279,12 @@ binary-arch: install
install -m755 -d
debian/libgl1-mesa-dri/usr/lib/${DEB_HOST_MULTIARCH}/dri/
mv debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/dri/*_dri.so \
debian/libgl1-mesa-dri/usr/lib/${DEB_HOST_MULTIARCH}/dri/
+
+ # Copy the hardlinked vdpau drivers correctly.
+ install -m755 -d
debian/mesa-vdpau-drivers/usr/lib/${DEB_HOST_MULTIARCH}/vdpau/
+ mv debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/vdpau/libvdpau*.so* \
+ debian/mesa-vdpau-drivers/usr/lib/${DEB_HOST_MULTIARCH}/vdpau/
+
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: https://lists.debian.org/e1xhazu-0007ys...@moszumanska.debian.org
