mesa-18.0.3-1.parabola1: updating version

1 files changed, 104 insertions, 76 deletions

diff --git a/libre/mesa/PKGBUILD b/libre/mesa/PKGBUILD
index ced62b28b..57ff9b558 100644
--- a/libre/mesa/PKGBUILD
+++ b/libre/mesa/PKGBUILD
@@ -4,12 +4,14 @@
 
 pkgbase=mesa
 pkgname=("${pkgbase}")
-pkgver=17.3.7
+pkgdesc="A free implementation of the OpenGL specification, without nonfree software recommendations in drirc"
+pkgver=18.0.3
 pkgrel=1.parabola1
 arch=('i686' 'x86_64' 'armv7h')
 makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto'
              'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols'
-             'elfutils' 'llvm' 'libomxil-bellagio' 'clang' 'libglvnd' 'lm_sensors')
+             'elfutils' 'llvm' 'libomxil-bellagio' 'clang' 'libglvnd' 'lm_sensors'
+             'meson')
 makedepends_x86_64=('libclc' 'libunwind')
 makedepends_i686=("${makedepends_x86_64[@]}")
 url="https://www.mesa3d.org/"
@@ -17,86 +19,108 @@ license=('custom')
 source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
         LICENSE
         0001-glvnd-fix-gl-dot-pc.patch
+        0004-meson-Add-library-versions-to-swr-drivers.patch
+        0005-meson-Version-libMesaOpenCL-like-autotools-does.patch
         drirc)
-sha512sums=('ec48565556aa4281056cee5dbef140553651fdfbb76ce32397de048db1cf65f5e18787c72b998de7da2de795d27e7040bde84651ade4726fc3a69a23b166ba4e'
+source_armv7h=("atomic.patch::https://cgit.freedesktop.org/mesa/mesa/patch/?id=498faea103aa7966b435f21d8ff5e36172389b1e")
+sha512sums=('decd050bab049d17bcde3f832d4da0ffdb80f147c99377a162739bbe72fd6fd32b51e56e6fc66895b8c30fc19a1815bae164b21aa557816c3998ad18c1ffca2d'
             'SKIP'
-            '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2'
+            'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7'
             '75849eca72ca9d01c648d5ea4f6371f1b8737ca35b14be179e14c73cc51dca0739c333343cdc228a6d464135f4791bcdc21734e2debecd29d57023c8c088b028'
+            '0f5da6e48885713c7ddef9e5715e178e0a499bcb622d7f19e15b9e4b4647331d7bf14829218b6ab80f17bae90fd95b8df6a0a81203d8081686805ca5329531ff'
+            'd3c01f61a0a0cc2f01e66e0126ad8b6386d4a53c1dc1b3b134800e4cd25507e458bac860cbed10cf4b46b04e8d50aba233870587b89c058fffd57436b48289bf'
             '7d949d1f45e68b8ec71ca0192569eeb6fc98b540e9696fea437894db02d98a78724ae4021f244137dd2ed2c8c167e96016f20306b4cf83c2defc8acd10170a1e')
-validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov@gmail.com>
-validpgpkeys+=('946D09B5E4C9845E63075FF1D961C596A7203456') #  "Andres Gomez <tanty@igalia.com>"
-validpgpkeys+=('E3E8F480C52ADD73B278EE78E1ECBE07D7D70895') # Juan Antonio Suárez Romero (Igalia, S.L.) <jasuarez@igalia.com>"
+sha512sums_armv7h=('75cd21bccc84a6b6b0de39c6d209c8bee0e5143b486433184ca078e8bc6797d30746be3ce5f7a89eea9bc3c7e2d68880412511fd6b9946252c7c7638523c6caa')
+validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D'  # Emil Velikov <emil.l.velikov@gmail.com>
+              '946D09B5E4C9845E63075FF1D961C596A7203456'  # Andres Gomez <tanty@igalia.com>
+              'E3E8F480C52ADD73B278EE78E1ECBE07D7D70895') # Juan Antonio Suárez Romero (Igalia, S.L.) <jasuarez@igalia.com>"
 
 prepare() {
-  cd ${srcdir}/mesa-${pkgver}
+  cd mesa-${pkgver}
 
   # glvnd support patches - from Fedora
   # non-upstreamed ones
   patch -Np1 -i ../0001-glvnd-fix-gl-dot-pc.patch
 
-  autoreconf -fiv
+  # Upstreamed meson fixes
+  patch -Np1 -i ../0004-meson-Add-library-versions-to-swr-drivers.patch
+  patch -Np1 -i ../0005-meson-Version-libMesaOpenCL-like-autotools-does.patch
 }
 
 build() {
-  cd ${srcdir}/mesa-${pkgver}
-
   case "$CARCH" in
     x86_64|i686)
-      GALLIUM=r300,r600,radeonsi,nouveau,svga,swrast,virgl,swr
-      DRI=i915,i965,r200,radeon,nouveau,swrast
-      VULKAN=intel,radeon
-      LIBUNWIND='--enable-libunwind'
-      VDPAU_AND_XA='--enable-xa --enable-vdpau'
-      OPENCL='--enable-opencl --enable-opencl-icd'
+      DRI=i915,i965,r100,r200,nouveau
+      GALLIUM=r300,r600,radeonsi,nouveau,virgl,svga,swrast,swr
+      VULKAN=amd,intel
+      SWR_ARCHES=avx,avx2
+      OPENCL=icd
+      GALLIUM_XA=true
+      LIBUNWIND=true
       ;;
     armv7h)
-      GALLIUM=freedreno,nouveau,swrast,virgl,vc4,etnaviv,imx
-      DRI=nouveau,swrast
+      DRI=nouveau
+      GALLIUM=freedreno,nouveau,swrast,virgl,etnaviv,imx,vc4
       VULKAN=
-      LIBUNWIND=
-      VDPAU_AND_XA=
+      SWR_ARCHES=
       OPENCL=
+      GALLIUM_XA=false
+      LIBUNWIND=false
       ;;
   esac
 
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --with-gallium-drivers=${GALLIUM} \
-    --with-dri-drivers=${DRI} \
-    --with-platforms=x11,drm,wayland \
-    --with-vulkan-drivers=${VULKAN} \
-    --disable-xvmc \
-    --enable-llvm \
-    --enable-llvm-shared-libs \
-    --enable-shared-glapi \
-    --enable-libglvnd \
-    $LIBUNWIND \
-    --enable-lmsensors \
-    --enable-egl \
-    --enable-glx \
-    --enable-glx-tls \
-    --enable-gles1 \
-    --enable-gles2 \
-    --enable-gbm \
-    --enable-dri \
-    --enable-gallium-osmesa \
-    --enable-gallium-extra-hud \
-    --enable-texture-float \
-    $VDPAU_AND_XA \
-    --enable-omx-bellagio \
-    --enable-nine \
-    $OPENCL \
-    --with-clang-libdir=/usr/lib
-
-  make
-
-  # fake installation
-  mkdir $srcdir/fakeinstall
-  make DESTDIR=${srcdir}/fakeinstall install
+  arch-meson mesa-$pkgver build \
+    -D b_lto=false \
+    -D b_ndebug=true \
+    -D platforms=x11,wayland,drm,surfaceless \
+    -D dri-drivers=${DRI} \
+    -D gallium-drivers=${GALLIUM} \
+    -D vulkan-drivers=${VULKAN} \
+    -D swr-arches=${SWR_ARCHES} \
+    -D dri3=true \
+    -D egl=true \
+    -D gallium-extra-hud=true \
+    -D gallium-nine=true \
+    -D gallium-omx=true \
+    -D gallium-opencl=${OPENCL} \
+    -D gallium-va=true \
+    -D gallium-vdpau=true \
+    -D gallium-xa=${GALLIUM_XA} \
+    -D gallium-xvmc=false \
+    -D gbm=true \
+    -D gles1=true \
+    -D gles2=true \
+    -D glvnd=true \
+    -D glx=dri \
+    -D libunwind=${LIBUNWIND} \
+    -D llvm=true \
+    -D lmsensors=true \
+    -D osmesa=gallium \
+    -D shared-glapi=true \
+    -D texture-float=true \
+    -D valgrind=false
+
+  # Print config
+  meson configure build
+
+  ninja -C build
+
+  # fake installation to be seperated into packages
+  # outside of fakeroot but mesa doesn't need to chown/mod
+  DESTDIR=${srcdir}/fakeinstall ninja -C build install
+}
+
+_install() {
+  local src f dir
+  for src; do
+    f="${src#fakeinstall/}"
+    dir="${pkgdir}/${f%/*}"
+    install -m755 -d "${dir}"
+    mv -v "${src}" "${dir}/"
+  done
 }
 
 package_mesa() {
-  pkgdesc="A free implementation of the OpenGL specification, without nonfree software recommendations in drirc"
   depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf'
            'libomxil-bellagio' 'llvm-libs' 'lm_sensors' 'libglvnd')
   depends_x86_64=('libunwind')
@@ -112,36 +136,40 @@ package_mesa() {
   install -m755 -d ${pkgdir}/etc
   cp -v ${srcdir}/drirc ${pkgdir}/etc
 
-  install -m755 -d ${pkgdir}/usr/share/glvnd/egl_vendor.d
-  cp -rv ${srcdir}/fakeinstall/usr/share/glvnd/egl_vendor.d/50_mesa.json ${pkgdir}/usr/share/glvnd/egl_vendor.d/
+  _install fakeinstall/usr/share/glvnd/egl_vendor.d/50_mesa.json
 
-  install -m755 -d ${pkgdir}/usr/lib/dri
   # ati-dri, nouveau-dri, intel-dri, svga-dri, swrast
-  cp -av ${srcdir}/fakeinstall/usr/lib/dri/*_dri.so ${pkgdir}/usr/lib/dri
+  _install fakeinstall/usr/lib/dri/*_dri.so
 
-  cp -rv ${srcdir}/fakeinstall/usr/lib/bellagio  ${pkgdir}/usr/lib
-  cp -rv ${srcdir}/fakeinstall/usr/lib/d3d  ${pkgdir}/usr/lib
-  cp -rv ${srcdir}/fakeinstall/usr/lib/lib{gbm,glapi}.so* ${pkgdir}/usr/lib/
-  cp -rv ${srcdir}/fakeinstall/usr/lib/libOSMesa.so* ${pkgdir}/usr/lib/
-  cp -rv ${srcdir}/fakeinstall/usr/lib/libwayland*.so* ${pkgdir}/usr/lib/
+  _install fakeinstall/usr/lib/bellagio
+  _install fakeinstall/usr/lib/d3d
+  _install fakeinstall/usr/lib/lib{gbm,glapi}.so*
+  _install fakeinstall/usr/lib/libOSMesa.so*
+  _install fakeinstall/usr/lib/libwayland*.so*
 
   if [ "$CARCH" != "armv7h" ]; then
-    cp -rv ${srcdir}/fakeinstall/usr/lib/libxatracker.so* ${pkgdir}/usr/lib/
-    cp -rv ${srcdir}/fakeinstall/usr/lib/libswrAVX*.so* ${pkgdir}/usr/lib/
+    _install fakeinstall/usr/lib/libxatracker.so*
+    _install fakeinstall/usr/lib/libswrAVX*.so*
   fi
 
-  cp -rv ${srcdir}/fakeinstall/usr/include ${pkgdir}/usr
-  cp -rv ${srcdir}/fakeinstall/usr/lib/pkgconfig ${pkgdir}/usr/lib/
+  # in libglvnd
+  rm -v fakeinstall/usr/lib/libGLESv{1_CM,2}.so*
 
-  # remove vulkan headers
-  rm -rf ${pkgdir}/usr/include/vulkan
+  # in vulkan-headers
+  rm -rv fakeinstall/usr/include/vulkan
+
+  _install fakeinstall/usr/include
+  _install fakeinstall/usr/lib/pkgconfig
 
   # libglvnd support
-  cp -rv ${srcdir}/fakeinstall/usr/lib/libGLX_mesa.so* ${pkgdir}/usr/lib/
-  cp -rv ${srcdir}/fakeinstall/usr/lib/libEGL_mesa.so* ${pkgdir}/usr/lib/
+  _install fakeinstall/usr/lib/libGLX_mesa.so*
+  _install fakeinstall/usr/lib/libEGL_mesa.so*
+
   # indirect rendering
-  ln -s /usr/lib/libGLX_mesa.so.0 ${pkgdir}/usr/lib/libGLX_indirect.so.0
+  ln -s /usr/lib/libGLX_mesa.so.0 "${pkgdir}/usr/lib/libGLX_indirect.so.0"
+
+  # make sure there are no files left to install
+  #find fakeinstall -depth -print0 | xargs -0 rmdir
 
-  install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
+  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
 }