[arch-commits] Commit in mesa/trunk (PKGBUILD)

[Laurent Carlier]

    Date: Friday, July 5, 2013 @ 12:23:18
  Author: lcarlier
Revision: 189707

upgpkg: mesa 9.1.4-3

properly remove vdpau drivers from nouveau (FS#36004)

Modified:
  mesa/trunk/PKGBUILD

----------+
 PKGBUILD |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-05 09:49:13 UTC (rev 189706)
+++ PKGBUILD	2013-07-05 10:23:18 UTC (rev 189707)
@@ -5,7 +5,7 @@
 pkgbase=mesa
 pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl')
 pkgver=9.1.4
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage'
              'libvdpau' 'wayland' 'llvm-amdgpu-snapshot' 'systemd')
@@ -86,8 +86,9 @@
   depends=("mesa-libgl=${pkgver}")
 
   # vdpau driver is problematic, so remove it (FS#36004)
-  # install -m755 -d ${pkgdir}/usr/lib/vdpau/
-  # mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_nouveau.* ${pkgdir}/usr/lib/vdpau/
+  install -m755 -d ${pkgdir}/usr/lib/vdpau/
+  mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_nouveau.* ${pkgdir}/usr/lib/vdpau/
+  rm -rf ${pkgdir}/usr/lib/vdpau/
 
   install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
   mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/nouveau_{dri,vieux_dri}.so ${pkgdir}/usr/lib/xorg/modules/dri/