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

Laurent Carlier lcarlier at archlinux.org
Sun Dec 14 18:35:48 UTC 2014


    Date: Sunday, December 14, 2014 @ 19:35:47
  Author: lcarlier
Revision: 123885

upgpkg: lib32-mesa 10.4.0-1

upstream update 10.4.0

Modified:
  lib32-mesa/trunk/PKGBUILD

----------+
 PKGBUILD |   61 ++++++++++++++++++++++---------------------------------------
 1 file changed, 22 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-12-14 17:32:43 UTC (rev 123884)
+++ PKGBUILD	2014-12-14 18:35:47 UTC (rev 123885)
@@ -3,8 +3,8 @@
 # Contributor: Andreas Radke <andyrtr at archlinux.org>
 
 pkgbase=lib32-mesa
-pkgname=('lib32-mesa-dri' 'lib32-mesa-vdpau' 'lib32-mesa' 'lib32-mesa-libgl')
-pkgver=10.3.5
+pkgname=('lib32-mesa-vdpau' 'lib32-mesa' 'lib32-mesa-libgl')
+pkgver=10.4.0
 pkgrel=1
 arch=('x86_64')
 makedepends=('python2' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11' 'glproto' 'lib32-libdrm' 'dri2proto' 'dri3proto' 'presentproto'
@@ -15,7 +15,7 @@
 source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2{,.sig}
 #source=(ftp://ftp.freedesktop.org/pub/mesa/10.3/MesaLib-${pkgver}.tar.bz2{,.sig}
 	LICENSE)
-sha256sums=('eb75d2790f1606d59d50a6acaa637b6c75f2155b3e0eca3d5099165c0d9556ae'
+sha256sums=('98a7dff3a1a6708c79789de8b9a05d8042e867067f70e8f30387c15026233219'
             'SKIP'
             '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2')
 
@@ -41,8 +41,6 @@
     --with-egl-platforms=x11,drm,wayland \
     --enable-llvm-shared-libs \
     --enable-egl \
-    --disable-gallium-egl \
-    --disable-gallium-gbm \
     --enable-gbm \
     --enable-gallium-llvm \
     --enable-shared-glapi \
@@ -53,6 +51,7 @@
     --enable-gles1 \
     --enable-gles2 \
     --enable-texture-float \
+    --enable-nine \
     --enable-vdpau 
 
   make
@@ -61,28 +60,6 @@
   make DESTDIR=${srcdir}/fakeinstall install
 }
 
-package_lib32-mesa-dri() {
-  pkgdesc="Mesa DRI drivers (32-bit)"
-  depends=('lib32-expat' 'lib32-libdrm' 'lib32-llvm-libs' 'lib32-elfutils' 'lib32-libtxc_dxtn')
-  conflicts=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri')
-  provides=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri')
-  replaces=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri')
-  optdepends=('lib32-mesa-vdpau: for accelerated video playback')
-  
-  install -m755 -d ${pkgdir}/usr/lib32/xorg/modules/dri
-  # ati-dri
-  mv -v ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/{r200,r300,r600,radeon{,si}}_dri.so ${pkgdir}/usr/lib32/xorg/modules/dri
-  # nouveau-dri
-  mv -v ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/nouveau{,_vieux}_dri.so ${pkgdir}/usr/lib32/xorg/modules/dri
-  # intel-dri
-  mv -v ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/{i915,i965}_dri.so ${pkgdir}/usr/lib32/xorg/modules/dri
-  # swrast
-  mv -v ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/{kms_,}swrast_dri.so ${pkgdir}/usr/lib32/xorg/modules/dri
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/lib32-mesa-dri"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-mesa-dri/"
-}
-
 package_lib32-mesa-vdpau() {
   pkgdesc="Mesa VDPAU drivers (32-bit)"
   depends=('lib32-libdrm' 'lib32-libx11' 'lib32-expat' 'lib32-llvm-libs' 'lib32-elfutils')
@@ -97,25 +74,31 @@
 package_lib32-mesa() {
   pkgdesc="an open-source implementation of the OpenGL specification (32-bit)"
   depends=('lib32-libdrm' 'lib32-libxxf86vm' 'lib32-libxdamage' 'lib32-libxshmfence' 'lib32-systemd'
-           'lib32-elfutils' 'lib32-llvm-libs' 'lib32-wayland' 'lib32-mesa-dri' 'mesa')
-  optdepends=('opengl-man-pages: for the OpenGL API man pages')
-  provides=('lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm' 'lib32-libgles' 'lib32-libegl')
-  conflicts=('lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm' 'lib32-libgles' 'lib32-libegl')
-  replaces=('lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm' 'lib32-libgles' 'lib32-libegl')
+           'lib32-elfutils' 'lib32-llvm-libs' 'lib32-wayland' 'lib32-libtxc_dxtn' 'lib32-expat' 'mesa')
+  optdepends=('opengl-man-pages: for the OpenGL API man pages'
+              'lib32-mesa-vdpau: for accelerated video playback')
+  provides=('lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm' 'lib32-libgles' 'lib32-libegl'
+            'lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri')
+  conflicts=('lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm' 'lib32-libgles' 'lib32-libegl'
+            'lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri')
+  replaces=('lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm' 'lib32-libgles' 'lib32-libegl'
+            'lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri')
 
+  install -m755 -d ${pkgdir}/usr/lib32/xorg/modules/dri
+  # ati-dri, nouveay-dri, intel-dri, swrast
+  mv -v ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/* ${pkgdir}/usr/lib32/xorg/modules/dri
+
   install -m755 -d ${pkgdir}/usr/lib32
-  mv -v ${srcdir}/fakeinstall/usr/lib32/lib{OSMesa,gbm,glapi,wayland-egl}.so* ${pkgdir}/usr/lib32/
-  #mv -v ${srcdir}/fakeinstall/usr/lib32/gallium-pipe/pipe_swrast* ${pkgdir}/usr/lib32/gallium-pipe/
-  # FS#41337
-  #mv -v ${srcdir}/fakeinstall/usr/lib32/gbm/gbm_gallium_drm* ${pkgdir}/usr/lib32/gbm/
+  mv -v ${srcdir}/fakeinstall/usr/lib32/d3d ${pkgdir}/usr/lib32
+  mv -v ${srcdir}/fakeinstall/usr/lib32/*.so* ${pkgdir}/usr/lib32/
 
   mv -v ${srcdir}/fakeinstall/usr/lib32/pkgconfig ${pkgdir}/usr/lib32/
 
   install -m755 -d ${pkgdir}/usr/lib32/mesa
   # move libgl/EGL/glesv*.so to not conflict with blobs - may break .pc files ?
-  mv -v ${srcdir}/fakeinstall/usr/lib32/libGL.so*    ${pkgdir}/usr/lib32/mesa/
-  mv -v ${srcdir}/fakeinstall/usr/lib32/libEGL.so*   ${pkgdir}/usr/lib32/mesa/
-  mv -v ${srcdir}/fakeinstall/usr/lib32/libGLES*.so* ${pkgdir}/usr/lib32/mesa/
+  mv -v ${pkgdir}/usr/lib32/libGL.so*    ${pkgdir}/usr/lib32/mesa/
+  mv -v ${pkgdir}/usr/lib32/libEGL.so*   ${pkgdir}/usr/lib32/mesa/
+  mv -v ${pkgdir}/usr/lib32/libGLES*.so* ${pkgdir}/usr/lib32/mesa/
 
   # keep symlinks until pacman 4.2 FS#42046
   #install -m755 -d "${pkgdir}/usr/share/licenses/lib32-mesa"



More information about the arch-commits mailing list