Merge branch '23.3'

ChimeraOS · Nov 30, 2023 · 958dff4 · 958dff4
2 parents 7830f85 + 2fb7cba
commit 958dff4
Show file tree

Hide file tree

Showing 20 changed files with 1,454 additions and 21 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -41,12 +41,6 @@ jobs:
       - name: Install dependencies (mesa)
         run: |
           pacman -Syu --noconfirm $(sed -n -e 's/^[[:space:]]*\(make\)\?depends\(_x86_64\)\? = \([[:alnum:][:punct:]]*\)[[:space:]]*$/\3/p' /home/build/mesa/.SRCINFO)
-      # Upstream issue: see https://gitlab.freedesktop.org/mesa/mesa/-/issues/9908
-      - name: Downgrade meson
-        run: |
-          pacman -S --noconfirm wget
-          wget https://archive.archlinux.org/packages/m/meson/meson-1.2.1-1-any.pkg.tar.zst
-          pacman -U --noconfirm meson-1.2.1-1-any.pkg.tar.zst
       - name: Build mesa-chimeraos package
         id: build-mesa-package
         shell: bash
@@ -63,12 +57,11 @@ jobs:
         run: |
           pacman -S --noconfirm $(sed -n -e 's/^[[:space:]]*\(make\)\?depends\(_x86_64\)\? = \([[:alnum:][:punct:]]*\)[[:space:]]*$/\3/p' /home/build/lib32-mesa/.SRCINFO)
           pacman --noconfirm -U --overwrite '*' /tmp/mesa-chimeraos/*.pkg.tar.zst --ask=4
-      # Upstream issue: see https://gitlab.freedesktop.org/mesa/mesa/-/issues/9908
       - name: Downgrade meson
         run: |
           pacman -S --noconfirm wget
-          wget https://archive.archlinux.org/packages/m/meson/meson-1.2.1-1-any.pkg.tar.zst
-          pacman -U --noconfirm meson-1.2.1-1-any.pkg.tar.zst
+          wget https://archive.archlinux.org/packages/m/meson/meson-1.2.3-1-any.pkg.tar.zst
+          pacman -U --noconfirm meson-1.2.3-1-any.pkg.tar.zst
       - name: Build lib32-mesa-chimeraos package
         id: build-lib32-mesa-package
         shell: bash