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

[Laurent Carlier]

    Date: Friday, September 12, 2014 @ 11:04:30
  Author: lcarlier
Revision: 221440

better mesa-dri packaging

Modified:
  mesa/trunk/PKGBUILD

----------+
 PKGBUILD |   19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-12 04:22:33 UTC (rev 221439)
+++ PKGBUILD	2014-09-12 09:04:30 UTC (rev 221440)
@@ -78,8 +78,8 @@
 }
 
 package_mesa-dri() {
-  pkgdesc="Mesa DRI drivers for AMD, Intel, NVIDIA and VMWare"
-  depends=('mesa-libgl' "mesa=${pkgver}" 'libtxc_dxtn' 'libomxil-bellagio' 'libvdpau')
+  pkgdesc="Mesa DRI drivers"
+  depends=('mesa-libgl' "mesa=${pkgver}" 'libtxc_dxtn')
   conflicts=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri')
   provides=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri')
   replaces=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri')
@@ -88,9 +88,6 @@
   mv -v ${srcdir}/fakeinstall/etc/drirc ${pkgdir}/etc
   
   install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
-
-  mv -v ${srcdir}/fakeinstall/usr/lib/bellagio  ${pkgdir}/usr/lib
-  mv -v ${srcdir}/fakeinstall/usr/lib/vdpau ${pkgdir}/usr/lib
   # ati-dri
   mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{r200,r300,r600,radeon{,si}}_dri.so ${pkgdir}/usr/lib/xorg/modules/dri
   # nouveau-dri
@@ -99,7 +96,9 @@
   mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{i915,i965}_dri.so ${pkgdir}/usr/lib/xorg/modules/dri
   # svga-dri
   mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/vmwgfx_dri.so ${pkgdir}/usr/lib/xorg/modules/dri
-
+  # swrast
+  mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{kms_,}swrast_dri.so ${pkgdir}/usr/lib/xorg/modules/dri
+   
   install -m755 -d "${pkgdir}/usr/share/licenses/mesa-dri"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-dri/"
 }
@@ -106,7 +105,8 @@
 
 package_mesa() {
   pkgdesc="an open-source implementation of the OpenGL specification"
-  depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'systemd' 'elfutils' 'llvm-libs')
+  depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'systemd' 'elfutils' 
+           'libomxil-bellagio' 'libvdpau' 'llvm-libs')
   optdepends=('opengl-man-pages: for the OpenGL API man pages')
   provides=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
   conflicts=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
@@ -113,6 +113,8 @@
   replaces=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
 
   install -m755 -d ${pkgdir}/usr/lib
+  mv -v ${srcdir}/fakeinstall/usr/lib/bellagio  ${pkgdir}/usr/lib
+  mv -v ${srcdir}/fakeinstall/usr/lib/vdpau ${pkgdir}/usr/lib
   mv -v ${srcdir}/fakeinstall/usr/lib/lib{OSMesa,gbm,glapi,wayland-egl,xatracker}.so* ${pkgdir}/usr/lib/
   # FS#41337
   #mv -v ${srcdir}/fakeinstall/usr/lib/gbm/gbm_gallium_drm* ${pkgdir}/usr/lib/gbm/
@@ -120,9 +122,6 @@
   mv -v ${srcdir}/fakeinstall/usr/include ${pkgdir}/usr
   mv -v ${srcdir}/fakeinstall/usr/lib/pkgconfig ${pkgdir}/usr/lib/
   
-  install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
-  mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{kms_,}swrast_dri* ${pkgdir}/usr/lib/xorg/modules/dri/
-  
   install -m755 -d ${pkgdir}/usr/lib/mesa
   # move libgl/EGL/glesv*.so to not conflict with blobs - may break .pc files ?
   mv -v ${srcdir}/fakeinstall/usr/lib/libGL.so* 	${pkgdir}/usr/lib/mesa/