Merge pull request #140 from sixtyfourktec/graphics

Graphics

Author: jkloetzke

recipes/graphics/wayland/wayland-protocols.yaml

@@ -1,14 +1,14 @@
 inherit: [meson, wayland-scanner]
 
 metaEnvironment:
-    PKG_VERSION: "1.38"
+    PKG_VERSION: "1.47"
     PKG_LICENSE: "MIT"
 
 checkoutSCM:
     scm: url
     url: "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/\
           ${PKG_VERSION}/downloads/wayland-protocols-${PKG_VERSION}.tar.xz"
-    digestSHA1: 3fbb7095a8a33e8465351c25ff1fc01bedeafacd
+    digestSHA1: cc3915eb646e607abc82242e84652e4a548832d0
     stripComponents: 1
 
 buildScript: |

recipes/graphics/wayland/wayland.yaml

@@ -1,7 +1,7 @@
 inherit: [meson]
 
 metaEnvironment:
-    PKG_VERSION: "1.23.0"
+    PKG_VERSION: "1.24.0"
     PKG_LICENSE: "MIT"
 
 depends:
@@ -18,7 +18,7 @@ depends:
 checkoutSCM:
     scm: url
     url: https://gitlab.freedesktop.org/wayland/wayland/-/archive/${PKG_VERSION}/wayland-${PKG_VERSION}.tar.bz2
-    digestSHA1: 118c3a94f1f4a20e488a1451cdc1dd3f8ec8696e
+    digestSHA1: b2e4f077a60c07bfaa7b241bcdeecea6bfa85c78
     stripComponents: 1
 
 multiPackage:

recipes/libs/mesa3d.yaml

@@ -11,7 +11,7 @@ Config:
         type: str
         # crocus,etnaviv,freedreno,i915,iris,lima,nouveau,panfrost,r300,r600,radeonsi,svga,softpipe,llvmpipe,tegra,v3d,vc4,virgl
         # this is the maximum we support right now:
-        default: "crocus,lima,panfrost,svga,nouveau,tegra,v3d,vc4,virgl"
+        default: "crocus,lima,panfrost,svga,nouveau,llvmpipe,tegra,v3d,vc4,virgl"
     MESA3D_GLX:
         help: "Build support for GLX platform. Ignored if building for wayland. Default: auto."
         type: choice
@@ -66,6 +66,7 @@ multiPackage:
                   - devel::llvm-libclc-tgt
                   - libs::spirv-tools-tgt
                   - libs::spirv-llvm-translator-tgt
+
         buildTools: [llvm]
         buildSetup: |
             if [ -e cross_file.txt ] && ! grep -q llvm-config cross_file.txt ; then
@@ -108,12 +109,26 @@ multiPackage:
                     mesa_clc: "usr/bin"
 
     "":
+        environment:
+            LLVM_OCAML_BINDINGS: "0"
+
         depends:
+            - libs::libunwind-dev
+            - libs::zlib-dev
+            - virtual::libs::libdrm-dev
+            - use: []
+              depends:
+                  - libs::libunwind-tgt
+                  - libs::zlib-tgt
+                  - virtual::libs::libdrm-tgt
 
             - if: "$(eq,$MESA3D_PLATFORM,wayland)"
               depends:
                   - graphics::wayland::wayland-protocols
                   - graphics::wayland::wayland-dev
+                  - use: []
+                    depends:
+                        - graphics::wayland::wayland-tgt
 
             - if: "$(eq,$MESA3D_PLATFORM,x11)"
               depends:
@@ -127,27 +142,7 @@ multiPackage:
                   - libs::xorg::libXt-dev
                   - libs::xorg::libXxf86vm-dev
                   - virtual::core::udev-dev
-
-            - if: "$(match,$MESA3D_GALLIUM_DRIVERS,iris)"
-              tools:
-                  target-toolchain: host-compat-toolchain
-              depends:
-                  - name: libs::mesa3d-clc
-                    use: [tools]
-
-            - libs::libunwind-dev
-            - libs::zlib-dev
-            - virtual::libs::libdrm-dev
-            - use: []
-              depends:
-                  - libs::libunwind-tgt
-                  - libs::zlib-tgt
-                  - virtual::libs::libdrm-tgt
-
-                  - if: "$(eq,$MESA3D_PLATFORM,wayland)"
-                    name: graphics::wayland::wayland-tgt
-
-                  - if: "$(eq,$MESA3D_PLATFORM,x11)"
+                  - use: []
                     depends:
                         - libs::xcb::libxcb-tgt
                         - libs::xorg::libX11-tgt
@@ -160,6 +155,27 @@ multiPackage:
                         - libs::xorg::libXxf86vm-tgt
                         - virtual::core::udev-tgt
 
+            - if: "$(match,$MESA3D_GALLIUM_DRIVERS,llvmpipe)"
+              depends:
+                  - devel::llvm-libs-dev
+                  - use: []
+                    depends:
+                        - devel::llvm-libs-tgt
+
+            - if: "$(match,$MESA3D_GALLIUM_DRIVERS,iris)"
+              tools:
+                  target-toolchain: host-compat-toolchain
+              depends:
+                  - name: libs::mesa3d-clc
+                    use: [tools]
+
+        buildSetup: |
+            if [[ ${BOB_DEP_PATHS['devel::llvm-libs-dev']:+set} && -e cross_file.txt ]] &&
+                  ! grep -q llvm-config cross_file.txt ; then
+                sed -i \
+                    "/\[binaries\]/a llvm-config = '${BOB_DEP_PATHS['devel::llvm-libs-dev']}\/usr\/bin\/llvm-config'" \
+                    cross_file.txt
+            fi
         buildTools:
             - if: "$(match,$MESA3D_GALLIUM_DRIVERS,iris)"
               name: mesa_clc
@@ -181,7 +197,7 @@ multiPackage:
                 -Dgles2=enabled \
                 -Dglx-read-only-text=$([[ $MESA3D_GLX_READ_ONLY_TEXT -ne 0 ]] && echo true || echo false) \
                 -Dvalgrind=disabled \
-                -Dllvm=disabled \
+                -Dllvm=$([[ "$MESA3D_GALLIUM_DRIVERS" =~ "llvmpipe" ]] && echo 'enabled' || echo 'disabled') \
                 -Dintel-clc=system \
                 ${BOB_TOOL_PATHS[mesa_clc]+-Dmesa-clc=system} \
                 -Dosmesa=false