debian/changelog |    1 +
 debian/rules     |    8 ++------
 2 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 776062238caed0eafdacd73027c3e7607917341f
Author: Timo Aaltonen <[email protected]>
Date:   Thu Jun 23 12:51:39 2016 +0300

    rules: Fix install of va drivers.

diff --git a/debian/changelog b/debian/changelog
index ed2141c..74a5987 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ mesa (12.0.0~rc4-1) UNRELEASED; urgency=medium
     libgcrypt20-dev and libvulkan-dev to build-depends.
   * rules: Tidy up override_dh_clean.
   * rules: Use package version for MESA_GIT_SHA1.
+  * rules: Fix install of va drivers.
 
  -- Timo Aaltonen <[email protected]>  Wed, 04 May 2016 15:41:31 +0300
 
diff --git a/debian/rules b/debian/rules
index ce5c53f..c96cc96 100755
--- a/debian/rules
+++ b/debian/rules
@@ -183,14 +183,10 @@ override_dh_install:
        mv debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/vdpau/libvdpau*.so* \
           debian/mesa-vdpau-drivers/usr/lib/${DEB_HOST_MULTIARCH}/vdpau/
 
-       # Add symlinks to va driver
+       # Copy the hardlinked va drivers correctly.
        install -m755 -d 
debian/mesa-va-drivers/usr/lib/${DEB_HOST_MULTIARCH}/dri/
-       mv debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/dri/gallium_drv_video.so \
+       mv debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/dri/*_drv_video.so \
           debian/mesa-va-drivers/usr/lib/${DEB_HOST_MULTIARCH}/dri/
-       for i in nouveau_drv_video.so r600_drv_video.so radeonsi_drv_video.so; 
do \
-           ln -s gallium_drv_video.so \
-           debian/mesa-va-drivers/usr/lib/${DEB_HOST_MULTIARCH}/dri/$${i}; \
-       done
   endif
 
        dh_install -s --fail-missing

Reply via email to