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

[Laurent Carlier]

    Date: Thursday, September 12, 2013 @ 11:44:04
  Author: lcarlier
Revision: 194264

upgpkg: mesa 9.2.0-2

Remove vdpau nouveau driver, still problematic (FS#36754)

Modified:
  mesa/trunk/PKGBUILD

----------+
 PKGBUILD |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-09-11 22:22:58 UTC (rev 194263)
+++ PKGBUILD	2013-09-12 09:44:04 UTC (rev 194264)
@@ -5,7 +5,7 @@
 pkgbase=mesa
 pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl')
 pkgver=9.2.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage'
              'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd')
@@ -18,11 +18,11 @@
          '5c65a0fe315dd347e09b1f2826a1df5a')
 
 build() {
-    cd ${srcdir}/?esa-*
+  cd ${srcdir}/?esa-*
 
-    autoreconf -vfi # our automake is far too new for their build system :)
+  autoreconf -vfi # our automake is far too new for their build system :)
 
-    ./configure --prefix=/usr \
+  ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --with-dri-driverdir=/usr/lib/xorg/modules/dri \
     --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast \
@@ -45,11 +45,11 @@
     --enable-vdpau \
     # --help
 
-    make
+  make
 
-    # fake installation
-    mkdir $srcdir/fakeinstall
-    make DESTDIR=${srcdir}/fakeinstall install
+  # fake installation
+  mkdir $srcdir/fakeinstall
+  make DESTDIR=${srcdir}/fakeinstall install
 }
 
 package_ati-dri() {
@@ -97,6 +97,9 @@
   install -m755 -d ${pkgdir}/usr/lib/gallium-pipe
   mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_nouveau* ${pkgdir}/usr/lib/gallium-pipe/
   
+  # vdpau drivers are still buggy with nouveau, so remove them (FS#36754)
+  rm -rf ${pkgdir}/usr/lib/vdpau/
+
   install -m755 -d "${pkgdir}/usr/share/licenses/nouveau-dri"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/nouveau-dri/"
 }