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

[Laurent Carlier]

    Date: Monday, December 25, 2017 @ 19:47:59
  Author: lcarlier
Revision: 276026

upgpkg: lib32-mesa 17.3.1-2

drop historical Arch dri module path - use upstream default path - FS#56847

Modified:
  lib32-mesa/trunk/PKGBUILD

----------+
 PKGBUILD |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-12-25 17:23:47 UTC (rev 276025)
+++ PKGBUILD	2017-12-25 19:47:59 UTC (rev 276026)
@@ -6,7 +6,7 @@
 pkgbase=lib32-mesa
 pkgname=('lib32-vulkan-intel' 'lib32-vulkan-radeon' 'lib32-libva-mesa-driver' 'lib32-mesa-vdpau' 'lib32-mesa')
 pkgver=17.3.1
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 makedepends=('python2-mako' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11' 'glproto' 'lib32-libdrm' 'dri2proto' 'dri3proto' 'presentproto'
              'lib32-libxshmfence' 'lib32-libxxf86vm' 'lib32-libxdamage' 'gcc-multilib' 'lib32-libelf' 'lib32-llvm' 'lib32-libvdpau'
@@ -47,7 +47,6 @@
     --libdir=/usr/lib32 \
     --prefix=/usr \
     --sysconfdir=/etc \
-    --with-dri-driverdir=/usr/lib32/xorg/modules/dri \
     --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast,virgl,swr \
     --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
     --with-platforms=x11,drm,wayland \
@@ -114,7 +113,7 @@
            'lib32-libxshmfence')
 
   install -m755 -d ${pkgdir}/usr/lib32/dri
-  cp -av ${srcdir}/fakeinstall/usr/lib32/dri/* ${pkgdir}/usr/lib32/dri
+  cp -av ${srcdir}/fakeinstall/usr/lib32/dri/*_drv_video.so ${pkgdir}/usr/lib32/dri
    
   install -m755 -d "${pkgdir}/usr/share/licenses/lib32-libva-mesa-driver"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-libva-mesa-driver/"
@@ -142,9 +141,9 @@
   conflicts=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri' 'lib32-mesa-libgl')
   replaces=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri' 'lib32-mesa-libgl')
 
-  install -m755 -d ${pkgdir}/usr/lib32/xorg/modules/dri
+  install -m755 -d ${pkgdir}/usr/lib32/dri
   # ati-dri, nouveay-dri, intel-dri, swrast
-  cp -av ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/* ${pkgdir}/usr/lib32/xorg/modules/dri
+  cp -av ${srcdir}/fakeinstall/usr/lib32/dri/*_dri.so ${pkgdir}/usr/lib32/dri
 
   install -m755 -d ${pkgdir}/usr/lib32
   cp -rv ${srcdir}/fakeinstall/usr/lib32/d3d  ${pkgdir}/usr/lib32