update lib32-mesa (with lib32-libva-mesa-driver and lib32-opencl-mesa only)

1 files changed, 26 insertions, 110 deletions

diff --git a/libre-multilib/lib32-mesa/PKGBUILD b/libre-multilib/lib32-mesa/PKGBUILD
index 5f8ff8507..059d84a1a 100644
--- a/libre-multilib/lib32-mesa/PKGBUILD
+++ b/libre-multilib/lib32-mesa/PKGBUILD
@@ -1,29 +1,34 @@
-# Maintainer (Arch): Jan de Groot <jgc@archlinux.org>
-# Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Márcio Silva <coadde@parabola.nu>
 
+# Based on mesa package from Arch and Arch ARM
+
 pkgbase=mesa
-pkgname=('lib32-opencl-mesa' 'lib32-libva-mesa-driver' 'lib32-mesa-vdpau' 'lib32-mesa'
-         'lib32-mesa-libgl' 'lib32-vulkan-radeon' 'lib32-vulkan-intel')
+pkgname=('lib32-opencl-mesa' 'lib32-libva-mesa-driver')
 pkgver=17.0.2
-pkgrel=2.parabola4
+pkgrel=3
 arch=('x86_64')
 makedepends=('python2-mako' 'lib32-libxml2' 'lib32-libx11' 'glproto' 'lib32-libdrm' 'dri2proto' 'dri3proto' 'presentproto' 
              'lib32-libxshmfence' 'lib32-libxxf86vm' 'lib32-libxdamage' 'lib32-libvdpau' 'lib32-libva' 'lib32-wayland' 'elfutils' 'lib32-libelf' 'lib32-llvm'
-             'lib32-libomxil-bellagio' 'lib32-libclc' 'lib32-clang' 'lib32-lm_sensors' 'gcc-multilib')
+             'lib32-libomxil-bellagio' 'lib32-libclc' 'lib32-clang' 'gcc-multilib')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
 source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
         LICENSE
         remove-libpthread-stubs.patch
+        0001-EGL-Implement-the-libglvnd-interface-for-EGL-v2.patch
         0001-Fix-linkage-against-shared-glapi.patch
-        0001-glapi-Link-with-glapi-when-built-shared.patch)
+        0001-glapi-Link-with-glapi-when-built-shared.patch
+        0002-fixup-EGL-Implement-the-libglvnd-interface-for-EGL-v.patch
+        glvnd-fix-gl-dot-pc.patch)
 sha256sums=('f8f191f909e01e65de38d5bdea5fb057f21649a3aed20948be02348e77a689d4'
             'SKIP'
             '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2'
             '75ab53ad44b95204c788a2988e97a5cb963bdbf6072a5466949a2afb79821c8f'
+            '1d3475dc2f4f3e450cf313130d3ce965f933f396058828fa843c0df8115feeb9'
             'c68d1522f9bce4ce31c92aa7a688da49f13043f5bb2254795b76dea8f47130b7'
-            '064dcd5a3ab1b7c23383e2cafbd37859e4c353f8839671d9695c6f7c2ef3260b')
+            '064dcd5a3ab1b7c23383e2cafbd37859e4c353f8839671d9695c6f7c2ef3260b'
+            '81d0ced62f61677ea0cf5f69a491093409fa1370f2ef045c41106ca8bf9c46f6'
+            '64a77944a28026b066c1682c7258d02289d257b24b6f173a9f7580c48beed966')
 validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov@gmail.com>
 
 prepare() {
@@ -31,8 +36,13 @@ prepare() {
 
   # Now mesa checks for libpthread-stubs - so remove the check
   patch -Np1 -i ../remove-libpthread-stubs.patch
-  
+
+  # glvnd support patches - from Fedora
+  # https://patchwork.freedesktop.org/series/12354/, v3 & v4
+  patch -Np1 -i ../0001-EGL-Implement-the-libglvnd-interface-for-EGL-v2.patch
+  patch -Np1 -i ../0002-fixup-EGL-Implement-the-libglvnd-interface-for-EGL-v.patch
   # non-upstreamed ones
+  patch -Np1 -i ../glvnd-fix-gl-dot-pc.patch
   patch -Np1 -i ../0001-Fix-linkage-against-shared-glapi.patch
   patch -Np1 -i ../0001-glapi-Link-with-glapi-when-built-shared.patch
 
@@ -40,16 +50,8 @@ prepare() {
 }
 
 build() {
-  # copy source to build mesa-libcl-icd package
-  cp -a ${srcdir}/{mesa,opencl}-${pkgver}
-
   cd ${srcdir}/mesa-${pkgver}
 
-  # softpipe,llvmpipe
-  DRI=i915,i965,r200,radeon,nouveau,swrast
-  GALLIUM=r300,r600,radeonsi,nouveau,svga,swrast,virgl,swr
-  VULKAN=intel,radeon
-
   export CC="gcc -m32"
   export CXX="g++ -m32"
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
@@ -65,15 +67,15 @@ build() {
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --with-dri-driverdir=/usr/lib32/xorg/modules/dri \
-    --with-gallium-drivers=${GALLIUM} \
-    --with-dri-drivers=${DRI} \
+    --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast,virgl \
+    --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
     --with-egl-platforms=x11,drm,wayland \
-    --with-vulkan-drivers=${VULKAN} \
+    --with-vulkan-drivers=intel,radeon \
     --disable-xvmc \
     --enable-gallium-llvm \
     --enable-llvm-shared-libs \
     --enable-shared-glapi \
-    --disable-libglvnd \
+    --enable-libglvnd \
     --enable-egl \
     --enable-glx \
     --enable-glx-tls \
@@ -89,12 +91,11 @@ build() {
     --enable-nine \
     --enable-opencl \
     --enable-opencl-icd \
-    --enable-gallium-extra-hud \
-    --enable-lmsensors \
     --with-clang-libdir=/usr/lib32 \
     --libdir=/usr/lib32 \
     --libexecdir=/usr/lib32 \
     --host=$_HOST
+    #--with-sha1=libgcrypt \
 
   make
 
@@ -105,11 +106,9 @@ build() {
 
 package_lib32-opencl-mesa() {
   pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers (32-bit)"
-  depends=('opencl-mesa' 'lib32-ocl-icd' 'lib32-expat' 'lib32-libdrm' 'lib32-libelf' 'lib32-libclc' 'lib32-clang' 'lib32-lm_sensors')
+  depends=('opencl-mesa' 'lib32-expat' 'lib32-libdrm' 'lib32-libelf' 'lib32-libclc' 'lib32-clang')
   optdepends=('opencl-headers: headers necessary for OpenCL development')
   provides=('lib32-opencl-driver')
-  conflicts=('lib32-opencl-nvidia' 'lib32-opencl-nvidia-340xx' 'lib32-opencl-nvidia-304xx' 'lib32-opencl-catalyst')
-  replaces=('lib32-opencl-nvidia' 'lib32-opencl-nvidia-340xx' 'lib32-opencl-nvidia-304xx' 'lib32-opencl-catalyst')
 
   install -m755 -d ${pkgdir}/usr/lib32/gallium-pipe
   cp -rv ${srcdir}/fakeinstall/usr/lib32/libMesaOpenCL* ${pkgdir}/usr/lib32/
@@ -119,32 +118,9 @@ package_lib32-opencl-mesa() {
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-opencl-mesa/"
 }
 
-package_lib32-vulkan-intel() {
-  pkgdesc="Intel's Vulkan mesa driver (32-bit)"
-  depends=('vulkan-intel' 'lib32-wayland' 'lib32-libx11' 'lib32-libxshmfence')
-  provides=('lib32-vulkan-driver')
-
-  install -m755 -d ${pkgdir}/usr/lib32
-  cp -rv ${srcdir}/fakeinstall/usr/lib32/libvulkan_intel.so ${pkgdir}/usr/lib32/
-  install -m755 -d "${pkgdir}/usr/share/licenses/lib32-vulkan-intel"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-vulkan-intel/"
-}
-
-package_lib32-vulkan-radeon() {
-  pkgdesc="Radeon's Vulkan mesa driver (32-bit)"
-  depends=('vulkan-radeon' 'lib32-wayland' 'lib32-libx11' 'lib32-libxshmfence' 'lib32-libelf' 'lib32-libdrm' 'lib32-llvm-libs')
-  provides=('lib32-vulkan-driver')
- 
-  install -m755 -d ${pkgdir}/usr/lib32
-  cp -rv ${srcdir}/fakeinstall/usr/lib32/libvulkan_radeon.so ${pkgdir}/usr/lib32/
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/lib32-vulkan-radeon"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-vulkan-radeon/"
-}
-
 package_lib32-libva-mesa-driver() {
   pkgdesc="VA-API implementation for gallium (32-bit)"
-  depends=('libva-mesa-driver' 'lib32-libdrm' 'lib32-libx11' 'lib32-llvm-libs' 'lib32-expat' 'lib32-libelf' 'lib32-libxshmfence' 'lib32-lm_sensors')
+  depends=('libva-mesa-driver' 'lib32-libdrm' 'lib32-libx11' 'lib32-llvm-libs' 'lib32-expat' 'lib32-libelf' 'lib32-libxshmfence')
 
   install -m755 -d ${pkgdir}/usr/lib32
   cp -rv ${srcdir}/fakeinstall/usr/lib32/dri ${pkgdir}/usr/lib32
@@ -152,63 +128,3 @@ package_lib32-libva-mesa-driver() {
   install -m755 -d "${pkgdir}/usr/share/licenses/lib32-libva-mesa-driver"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-libva-mesa-driver/"
 }
-
-package_lib32-mesa-vdpau() {
-  pkgdesc="Mesa VDPAU drivers (32-bit)"
-  depends=('mesa-vdpau' 'lib32-libdrm' 'lib32-libx11' 'lib32-llvm-libs' 'lib32-expat' 'lib32-libelf' 'lib32-libxshmfence' 'lib32-lm_sensors')
-
-  install -m755 -d ${pkgdir}/usr/lib32
-  cp -rv ${srcdir}/fakeinstall/usr/lib32/vdpau ${pkgdir}/usr/lib32
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/lib32-mesa-vdpau"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-mesa-vdpau/"
-}
-
-package_lib32-mesa() {
-  pkgdesc="A free implementation of the OpenGL specification (32-bit)"
-  depends=('mesa' 'lib32-libdrm' 'lib32-wayland' 'lib32-libxxf86vm' 'lib32-libxdamage' 'lib32-libxshmfence' 'lib32-libelf' 
-           'lib32-libomxil-bellagio' 'lib32-libtxc_dxtn' 'lib32-llvm-libs' 'lib32-mesa-libgl' 'lib32-lm_sensors')
-  optdepends=('opengl-man-pages: for the OpenGL API man pages'
-              'lib32-mesa-vdpau: for accelerated video playback'
-              'lib32-libva-mesa-driver: for accelerated video playback')
-  provides=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-svga-dri'
-            'lib32-swrast-dri' 'lib32-virgl-dri' 'lib32-swr-dri' 'lib32-mesa-dri' 'lib32-opengl-driver')
-  conflicts=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-svga-dri'
-             'lib32-swrast-dri' 'lib32-virgl-dri' 'lib32-swr-dri' 'lib32-mesa-dri'
-             'lib32-nvidia-utils' 'lib32-nvidia-340xx-utils' 'lib32-nvidia-304xx-utils' 'lib32-catalyst-utils')
-  replaces=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-svga-dri'
-            'lib32-swrast-dri' 'lib32-virgl-dri' 'lib32-swr-dri' 'lib32-mesa-dri'
-            'lib32-nvidia-utils' 'lib32-nvidia-340xx-utils' 'lib32-nvidia-304xx-utils' 'lib32-catalyst-utils')
-
-  install -m755 -d ${pkgdir}/usr/lib32/xorg/modules/dri
-  # ati-dri, nouveau-dri, intel-dri, svga-dri, swrast
-  cp -av ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/* ${pkgdir}/usr/lib32/xorg/modules/dri
-
-  cp -rv ${srcdir}/fakeinstall/usr/lib32/bellagio  ${pkgdir}/usr/lib32
-  cp -rv ${srcdir}/fakeinstall/usr/lib32/d3d  ${pkgdir}/usr/lib32
-  cp -rv ${srcdir}/fakeinstall/usr/lib32/lib{gbm,glapi}.so* ${pkgdir}/usr/lib32/
-  cp -rv ${srcdir}/fakeinstall/usr/lib32/libOSMesa.so* ${pkgdir}/usr/lib32/
-  cp -rv ${srcdir}/fakeinstall/usr/lib32/libwayland*.so* ${pkgdir}/usr/lib32/
-  cp -rv ${srcdir}/fakeinstall/usr/lib32/libxatracker.so* ${pkgdir}/usr/lib32/
-
-  cp -rv ${srcdir}/fakeinstall/usr/lib32/pkgconfig ${pkgdir}/usr/lib32/
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/lib32-mesa"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-mesa/"
-}
-
-package_lib32-mesa-libgl() {
-  pkgdesc="Mesa 3-D graphics library (32-bit)"
-  depends=('mesa-libgl' 'lib32-libdrm' 'lib32-libxdamage' 'lib32-libxshmfence' 'lib32-libxxf86vm' 'lib32-wayland')
-  provides=('lib32-libgl' 'lib32-libegl' 'lib32-libgles' 'lib32-libglvnd')
-  conflicts=('lib32-libglvnd' 'lib32-nvidia-libgl' 'lib32-nvidia-340xx-libgl' 'lib32-nvidia-304xx-libgl' 'lib32-nvidia-cg-toolkit' 'lib32-catalyst-libgl')
-  replaces=('lib32-libglvnd' 'lib32-nvidia-libgl' 'lib32-nvidia-340xx-libgl' 'lib32-nvidia-304xx-libgl' 'lib32-nvidia-cg-toolkit' 'lib32-catalyst-libgl')
-
-  install -m755 -d "${pkgdir}/usr/lib32/"
-  cp -rv ${srcdir}/fakeinstall/usr/lib32/libGL.so*        ${pkgdir}/usr/lib32/
-  cp -rv ${srcdir}/fakeinstall/usr/lib32/libEGL.so*       ${pkgdir}/usr/lib32/
-  cp -rv ${srcdir}/fakeinstall/usr/lib32/libGLES*.so*     ${pkgdir}/usr/lib32/
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/lib32-mesa-libgl"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-mesa-libgl/"
-}