Merge pull request #152 from rhubert/update-mesa

Update mesa + spirv

Author: jkloetzke

recipes/libs/mesa3d.yaml

@@ -2,7 +2,7 @@ inherit: [meson, wayland-scanner]
 
 metaEnvironment:
     PKG_DESCRIPTION: "Mesa OpenGL library"
-    PKG_VERSION: "25.0.5"
+    PKG_VERSION: "25.3.1"
     PKG_LICENSE: "MIT, SGI, Khronos"
 
 Config:
@@ -50,7 +50,7 @@ depends:
 checkoutSCM:
     scm: url
     url: https://archive.mesa3d.org/mesa-${PKG_VERSION}.tar.xz
-    digestSHA1: d6427cb320fcbd8bbe223ad69b16619391812fee
+    digestSHA256: 059d0d985622f49588f01aa29152804f4da8ffe6add046e00a52923379c2d8da
     stripComponents: 1
 
 buildTools: [bison, flex, m4]
@@ -77,18 +77,13 @@ multiPackage:
 
         buildScript: |
             mesonBuild $1 \
-                -Dintel-clc=enabled \
-                -Dinstall-intel-clc=True \
                 -Dmesa-clc=enabled \
                 -Dinstall-mesa-clc=True \
-                -Dgallium-xa=disabled \
                 -Dglvnd=disabled \
-                -Dgallium-opencl=disabled \
                 -Dgallium-drivers="" \
                 -Dvulkan-drivers="" \
                 -Dplatforms="" \
                 -Dvalgrind=disabled \
-                -Dosmesa=false \
                 -Dshared-llvm=disabled \
 
         multiPackage:
@@ -155,14 +150,14 @@ multiPackage:
                         - libs::xorg::libXxf86vm-tgt
                         - virtual::core::udev-tgt
 
-            - if: "$(match,$MESA3D_GALLIUM_DRIVERS,llvmpipe)"
+            - if: "$(match,$MESA3D_GALLIUM_DRIVERS,[llvmpipe|iris])"
               depends:
                   - devel::llvm-libs-dev
                   - use: []
                     depends:
                         - devel::llvm-libs-tgt
 
-            - if: "$(match,$MESA3D_GALLIUM_DRIVERS,iris)"
+            - if: "$(match,$MESA3D_GALLIUM_DRIVERS,[llvmpipe|iris])"
               tools:
                   target-toolchain: host-compat-toolchain
               depends:
@@ -177,16 +172,23 @@ multiPackage:
                     cross_file.txt
             fi
         buildTools:
-            - if: "$(match,$MESA3D_GALLIUM_DRIVERS,iris)"
+            - if: "$(match,$MESA3D_GALLIUM_DRIVERS,[llvmpipe|iris])"
               name: mesa_clc
         buildVars: [MESA3D_GALLIUM_DRIVERS, MESA3D_GLX, MESA3D_PLATFORM,
                     MESA3D_GLX_READ_ONLY_TEXT]
         buildScript: |
+            CLC_DRIVERS=("llvmpipe" "iris")
+            ENABLE_LLV=false
+            IFS=',' read -ra ENABLED_DRIVERS <<< "$MESA3D_GALLIUM_DRIVERS"
+            for i in "${ENABLED_DRIVERS[@]}"; do
+              if [[ " ${CLC_DRIVERS[*]} " == *" $i "* ]]; then
+                ENABLE_LLV=true
+              fi
+            done
+
             mesonBuild $1 \
                 -Dglx=$([[ $MESA3D_PLATFORM == x11 ]] && echo ${MESA3D_GLX} || echo disabled) \
-                -Dgallium-xa=disabled \
                 -Dglvnd=disabled \
-                -Dgallium-opencl=disabled \
                 -Dgallium-drivers="$MESA3D_GALLIUM_DRIVERS" \
                 -Dvulkan-drivers="" \
                 -Dplatforms=${MESA3D_PLATFORM} \
@@ -197,10 +199,8 @@ multiPackage:
                 -Dgles2=enabled \
                 -Dglx-read-only-text=$([[ $MESA3D_GLX_READ_ONLY_TEXT -ne 0 ]] && echo true || echo false) \
                 -Dvalgrind=disabled \
-                -Dllvm=$([[ "$MESA3D_GALLIUM_DRIVERS" =~ "llvmpipe" ]] && echo 'enabled' || echo 'disabled') \
-                -Dintel-clc=system \
+                -Dllvm=$($ENABLE_LLV && echo 'enabled' || echo 'disabled') \
                 ${BOB_TOOL_PATHS[mesa_clc]+-Dmesa-clc=system} \
-                -Dosmesa=false
 
         multiPackage:
             dev:

recipes/libs/spirv-headers.yaml

@@ -1,13 +1,13 @@
 inherit: [cmake]
 
 metaEnvironment:
-    PKG_VERSION: "1.4.309.0"
+    PKG_VERSION: "1.4.341.0"
     PKG_LICENSE: "MIT"
 
 checkoutSCM:
     scm: url
-    url: https://github.com/KhronosGroup/SPIRV-Headers/archive/refs/tags/vulkan-sdk-1.4.309.0.tar.gz
-    digestSHA256: a96f8b4f2dfb18f7432e5c523e220ab0075372a9509e0c25fbff21c76af0de7c
+    url: https://github.com/KhronosGroup/SPIRV-Headers/archive/refs/tags/vulkan-sdk-${PKG_VERSION}.tar.gz
+    digestSHA256: cab0a654c4917e16367483296b44cdb1d614e3120c721beafcd37e3a8580486c
     stripComponents: 1
 
 buildScript: |

recipes/libs/spirv-llvm-translator.yaml

@@ -1,24 +1,26 @@
 inherit: [cmake]
 
 metaEnvironment:
-    PKG_VERSION: "20.1.2"
+    PKG_VERSION: "21.1.4"
     PKG_LICENSE: "LicenseRef-spirv-llvm-trans"
     PKG_LICENSE_PATH: "spirv-llvm-trans:LICENSE.TXT"
 
 depends:
     - devel::llvm-libs-dev
     - libs::spirv-headers-dev
+    - libs::spirv-tools-dev
     - libs::zlib-dev
     - use: []
       depends:
           - devel::llvm-libs-tgt
           - libs::spirv-headers-tgt
+          - libs::spirv-tools-tgt
           - libs::zlib-tgt
 
 checkoutSCM:
     scm: url
     url: ${GITHUB_MIRROR}/KhronosGroup/SPIRV-LLVM-Translator/archive/refs/tags/v${PKG_VERSION}.tar.gz
-    digestSHA256: d1b4a55dc457edbd9cc50d23583d4bedda9479176efcd34b3e20166bc7a4a562
+    digestSHA256: e900c907b62f82cf541a611b33d6685f375fe3bda6f041087fcdba350ffb437d
     stripComponents: 1
 
 buildTools: [python3, llvm]

recipes/libs/spirv-tools.yaml

@@ -2,7 +2,7 @@ inherit: [cmake]
 
 metaEnvironment:
     PKG_LICENSE: "Apache-2.0"
-    PKG_VERSION: "1.4.309.0"
+    PKG_VERSION: "1.4.341.0"
 
 depends:
     - libs::spirv-headers-dev
@@ -13,7 +13,7 @@ depends:
 checkoutSCM:
     scm: url
     url: ${GITHUB_MIRROR}/KhronosGroup/SPIRV-Tools/archive/refs/tags/vulkan-sdk-${PKG_VERSION}.tar.gz
-    digestSHA256: 6b8577054c575573ead3ad71cb6a2c0b3397b64c746cc3c99e48cc5e324c1b55
+    digestSHA256: 15bfb678138cdf9cd1480dfb952547bbb66b763a735b6d5582578572f5c2e6f9
     stripComponents: 1
 
 buildTools: [python3]