mesa-chimeraos 24.0.7

ChimeraOS · May 19, 2024 · 3d41a8f · 3d41a8f
1 parent b2cb3fc
commit 3d41a8f
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 70 deletions.
diff --git a/lib32-mesa/PKGBUILD b/lib32-mesa/PKGBUILD
@@ -17,7 +17,7 @@ pkgname=(
   'lib32-mesa-vdpau'
   'lib32-mesa'
 )
-_mesaver=24.0.5
+_mesaver=24.0.7
 pkgver=${_mesaver//-/.}.chos1
 pkgrel=1
 epoch=1
@@ -35,7 +35,6 @@ makedepends=(
   'lib32-libglvnd'
   'lib32-libva'
   'lib32-libvdpau'
-  'lib32-libunwind'
   'lib32-libx11'
   'lib32-libxcb'
   'lib32-libxext'
@@ -65,11 +64,16 @@ makedepends=(
   'libclc'
   'meson'
   'python-mako'
+  'python-packaging'
   'python-ply'
   'rust-bindgen'
   'wayland-protocols'
   'xorgproto'
 )
+options=(
+  # GCC 14 LTO causes segfault in LLVM under si_llvm_optimize_module
+  !lto
+)
 source=(
   https://mesa.freedesktop.org/archive/mesa-${_mesaver}.tar.xz{,.sig}
   LICENSE
@@ -79,7 +83,28 @@ source=(
   0004-wsi-Use-vendored-gamescope-commit-queue-v1-protocol.patch
   0005-STEAMOS-Dynamic-swapchain-override-for-gamescope-lim.patch
 )
-sha256sums=('38cc245ca8faa3c69da6d2687f8906377001f63365348a62cc6f7fafb1e8c018'
+validpgpkeys=(
+  '8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D'  # Emil Velikov <[email protected]>
+  '946D09B5E4C9845E63075FF1D961C596A7203456'  # Andres Gomez <[email protected]>
+  'E3E8F480C52ADD73B278EE78E1ECBE07D7D70895'  # Juan Antonio Suárez Romero (Igalia, S.L.) <[email protected]>
+  'A5CC9FEC93F2F837CB044912336909B6B25FADFA'  # Juan A. Suarez Romero <[email protected]>
+  '71C4B75620BC75708B4BDB254C95FAAB3EB073EC'  # Dylan Baker <[email protected]>
+  '57551DE15B968F6341C248F68D8E31AFC32428A6'  # Eric Engestrom <[email protected]>
+)
+
+# Rust crates for NVK, used as Meson subprojects
+declare -A _crates=(
+   proc-macro2    1.0.70
+   quote          1.0.33
+   syn            2.0.39
+   unicode-ident  1.0.12
+)
+
+for _crate in "${!_crates[@]}"; do
+  source+=($_crate-${_crates[$_crate]}.tar.gz::https://crates.io/api/v1/crates/$_crate/${_crates[$_crate]}/download)
+done
+
+sha256sums=('7454425f1ed4a6f1b5b107e1672b30c88b22ea0efea000ae2c7d96db93f6c26a'
             'SKIP'
             '7052ba73bb07ea78873a2431ee4e828f4e72bda7d176d07f770fa48373dec537'
             'c8eb8202b9b557df61c98ff1bd9c79652fa9d0cdd2fe13c1426f94102408b698'
@@ -91,7 +116,7 @@ sha256sums=('38cc245ca8faa3c69da6d2687f8906377001f63365348a62cc6f7fafb1e8c018'
             '3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b'
             '5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae'
             '23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a')
-b2sums=('c4c5f493206f761a7171f19c6549dc791559a1fdbcf49aea98016f98c10f9130081a16df6b780062621495a42dc49ef5f0800bda64058e8ba60106f6a046ccef'
+b2sums=('d9438e533b471445b2403e01e1fd593d83c0013b0991585f718122f1cadc6ac6bb1fb913f0fb257354ae21ddd9fe1f970ad9ac46f05d756c223ed56a11b9c9ce'
         'SKIP'
         '1ecf007b82260710a7bf5048f47dd5d600c168824c02c595af654632326536a6527fbe0738670ee7b921dd85a70425108e0f471ba85a8e1ca47d294ad74b4adb'
         'b439afd5317b14f3107c4b1e8725e680f082ac21c8483494611a62661f0f7ce866f6bed9e40a0362cff9c3f1f3d4dc14036017c26a5d0da4700887aa01679678'
@@ -103,25 +128,6 @@ b2sums=('c4c5f493206f761a7171f19c6549dc791559a1fdbcf49aea98016f98c10f9130081a16d
         '4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac'
         '77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d72851d73768d491c56c6779a0882a304c1f30c88732a6168351f0f786b10516ae537cff993892a749175848'
         '2cff6626624d03f70f1662af45a8644c28a9f92e2dfe38999bef3ba4a4c1ce825ae598277e9cb7abd5585eebfb17b239effc8d0bbf1c6ac196499f0d288e5e01')
-validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D'  # Emil Velikov <[email protected]>
-  '946D09B5E4C9845E63075FF1D961C596A7203456'  # Andres Gomez <[email protected]>
-  'E3E8F480C52ADD73B278EE78E1ECBE07D7D70895'  # Juan Antonio Suárez Romero (Igalia, S.L.) <[email protected]>
-  'A5CC9FEC93F2F837CB044912336909B6B25FADFA'  # Juan A. Suarez Romero <[email protected]>
-  '71C4B75620BC75708B4BDB254C95FAAB3EB073EC'  # Dylan Baker <[email protected]>
-  '57551DE15B968F6341C248F68D8E31AFC32428A6')  # Eric Engestrom <[email protected]>
-
-
-# Rust crates for NVK, used as Meson subprojects
-declare -A _crates=(
-   proc-macro2    1.0.70
-   quote          1.0.33
-   syn            2.0.39
-   unicode-ident  1.0.12
-)
-
-for _crate in "${!_crates[@]}"; do
-  source+=($_crate-${_crates[$_crate]}.tar.gz::https://crates.io/api/v1/crates/$_crate/${_crates[$_crate]}/download)
-done
 
 prepare() {
   cd mesa-$_mesaver
@@ -146,29 +152,21 @@ build() {
     --cross-file lib32
     -D android-libbacktrace=disabled
     -D b_ndebug=true
-    -D dri3=enabled
-    -D egl=enabled
     -D gallium-drivers=radeonsi,nouveau,swrast,i915,iris,crocus,zink
     -D gallium-extra-hud=true
     -D gallium-nine=true
     -D gallium-omx=disabled
     -D gallium-opencl=icd
     -D gallium-rusticl=true
-    -D gallium-va=enabled
-    -D gallium-vdpau=enabled
     -D gallium-xa=disabled
-    -D gbm=enabled
     -D gles1=disabled
-    -D gles2=enabled
     -D glvnd=true
     -D glx=dri
     -D intel-clc=enabled
-    -D llvm=enabled
-    -D lmsensors=enabled
+    -D libunwind=disabled
     -D microsoft-clc=disabled
     -D osmesa=true
     -D platforms=x11,wayland
-    -D shared-glapi=enabled
     -D valgrind=disabled
     -D video-codecs=all
     -D vulkan-drivers=amd,intel,intel_hasvk,swrast,nouveau-experimental
@@ -185,12 +183,12 @@ build() {
   export BINDGEN_EXTRA_CLANG_ARGS="-m32"
 
   arch-meson mesa-$_mesaver build "${meson_options[@]}"
-  meson configure build # Print config
+  meson configure build --no-pager # Print config
   meson compile -C build
 
   # fake installation to be seperated into packages
   # outside of fakeroot but mesa doesn't need to chown/mod
-  DESTDIR="${srcdir}/fakeinstall" meson install -C build
+  meson install -C build --destdir "$srcdir/fakeinstall"
 }
 
 _install() {

diff --git a/mesa/PKGBUILD b/mesa/PKGBUILD
@@ -17,7 +17,7 @@ pkgname=(
   'mesa-vdpau'
   'mesa'
 )
-_mesaver=24.0.5
+_mesaver=24.0.7
 pkgver=${_mesaver//-/.}.chos1
 pkgrel=1
 epoch=1
@@ -65,16 +65,18 @@ makedepends=(
   'libclc'
   'meson'
   'python-mako'
+  'python-packaging'
   'python-ply'
   'rust-bindgen'
   'wayland-protocols'
   'xorgproto'
 
   # valgrind deps
   'valgrind'
-
-  # gallium-omx deps
-  'libomxil-bellagio'
+)
+options=(
+  # GCC 14 LTO causes segfault in LLVM under si_llvm_optimize_module
+  !lto
 )
 source=(
   https://mesa.freedesktop.org/archive/mesa-${_mesaver}.tar.xz{,.sig}
@@ -85,7 +87,28 @@ source=(
   0004-wsi-Use-vendored-gamescope-commit-queue-v1-protocol.patch
   0005-STEAMOS-Dynamic-swapchain-override-for-gamescope-lim.patch
 )
-sha256sums=('38cc245ca8faa3c69da6d2687f8906377001f63365348a62cc6f7fafb1e8c018'
+validpgpkeys=(
+  '8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D'  # Emil Velikov <[email protected]>
+  '946D09B5E4C9845E63075FF1D961C596A7203456'  # Andres Gomez <[email protected]>
+  'E3E8F480C52ADD73B278EE78E1ECBE07D7D70895'  # Juan Antonio Suárez Romero (Igalia, S.L.) <[email protected]>
+  'A5CC9FEC93F2F837CB044912336909B6B25FADFA'  # Juan A. Suarez Romero <[email protected]>
+  '71C4B75620BC75708B4BDB254C95FAAB3EB073EC'  # Dylan Baker <[email protected]>
+  '57551DE15B968F6341C248F68D8E31AFC32428A6'  # Eric Engestrom <[email protected]>
+)
+
+# Rust crates for NVK, used as Meson subprojects
+declare -A _crates=(
+   proc-macro2    1.0.70
+   quote          1.0.33
+   syn            2.0.39
+   unicode-ident  1.0.12
+)
+
+for _crate in "${!_crates[@]}"; do
+  source+=($_crate-${_crates[$_crate]}.tar.gz::https://crates.io/api/v1/crates/$_crate/${_crates[$_crate]}/download)
+done
+
+sha256sums=('7454425f1ed4a6f1b5b107e1672b30c88b22ea0efea000ae2c7d96db93f6c26a'
             'SKIP'
             '7052ba73bb07ea78873a2431ee4e828f4e72bda7d176d07f770fa48373dec537'
             'c8eb8202b9b557df61c98ff1bd9c79652fa9d0cdd2fe13c1426f94102408b698'
@@ -97,7 +120,7 @@ sha256sums=('38cc245ca8faa3c69da6d2687f8906377001f63365348a62cc6f7fafb1e8c018'
             '3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b'
             '5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae'
             '23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a')
-b2sums=('c4c5f493206f761a7171f19c6549dc791559a1fdbcf49aea98016f98c10f9130081a16df6b780062621495a42dc49ef5f0800bda64058e8ba60106f6a046ccef'
+b2sums=('d9438e533b471445b2403e01e1fd593d83c0013b0991585f718122f1cadc6ac6bb1fb913f0fb257354ae21ddd9fe1f970ad9ac46f05d756c223ed56a11b9c9ce'
         'SKIP'
         '1ecf007b82260710a7bf5048f47dd5d600c168824c02c595af654632326536a6527fbe0738670ee7b921dd85a70425108e0f471ba85a8e1ca47d294ad74b4adb'
         'b439afd5317b14f3107c4b1e8725e680f082ac21c8483494611a62661f0f7ce866f6bed9e40a0362cff9c3f1f3d4dc14036017c26a5d0da4700887aa01679678'
@@ -109,25 +132,6 @@ b2sums=('c4c5f493206f761a7171f19c6549dc791559a1fdbcf49aea98016f98c10f9130081a16d
         '4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac'
         '77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d72851d73768d491c56c6779a0882a304c1f30c88732a6168351f0f786b10516ae537cff993892a749175848'
         '2cff6626624d03f70f1662af45a8644c28a9f92e2dfe38999bef3ba4a4c1ce825ae598277e9cb7abd5585eebfb17b239effc8d0bbf1c6ac196499f0d288e5e01')
-validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D'  # Emil Velikov <[email protected]>
-  '946D09B5E4C9845E63075FF1D961C596A7203456'  # Andres Gomez <[email protected]>
-  'E3E8F480C52ADD73B278EE78E1ECBE07D7D70895'  # Juan Antonio Suárez Romero (Igalia, S.L.) <[email protected]>
-  'A5CC9FEC93F2F837CB044912336909B6B25FADFA'  # Juan A. Suarez Romero <[email protected]>
-  '71C4B75620BC75708B4BDB254C95FAAB3EB073EC'  # Dylan Baker <[email protected]>
-  '57551DE15B968F6341C248F68D8E31AFC32428A6'  # Eric Engestrom <[email protected]>
-)
-
-# Rust crates for NVK, used as Meson subprojects
-declare -A _crates=(
-   proc-macro2    1.0.70
-   quote          1.0.33
-   syn            2.0.39
-   unicode-ident  1.0.12
-)
-
-for _crate in "${!_crates[@]}"; do
-  source+=($_crate-${_crates[$_crate]}.tar.gz::https://crates.io/api/v1/crates/$_crate/${_crates[$_crate]}/download)
-done
 
 prepare() {
   cd mesa-$_mesaver
@@ -151,29 +155,21 @@ build() {
   local meson_options=(
     -D android-libbacktrace=disabled
     -D b_ndebug=true
-    -D dri3=enabled
-    -D egl=enabled
     -D gallium-drivers=radeonsi,nouveau,swrast,i915,iris,crocus,zink
     -D gallium-extra-hud=true
     -D gallium-nine=true
     -D gallium-omx=bellagio
     -D gallium-opencl=icd
     -D gallium-rusticl=true
-    -D gallium-va=enabled
-    -D gallium-vdpau=enabled
     -D gallium-xa=disabled
-    -D gbm=enabled
     -D gles1=disabled
-    -D gles2=enabled
     -D glvnd=true
     -D glx=dri
     -D intel-clc=enabled
-    -D llvm=enabled
-    -D lmsensors=enabled
+    -D libunwind=disabled
     -D microsoft-clc=disabled
     -D osmesa=true
     -D platforms=x11,wayland
-    -D shared-glapi=enabled
     -D valgrind=enabled
     -D video-codecs=all
     -D vulkan-drivers=amd,intel,intel_hasvk,swrast,nouveau-experimental
@@ -188,12 +184,12 @@ build() {
   export MESON_PACKAGE_CACHE_DIR="$srcdir"
 
   arch-meson mesa-$_mesaver build "${meson_options[@]}"
-  meson configure build # Print config
+  meson configure build --no-pager # Print config
   meson compile -C build
 
   # fake installation to be seperated into packages
   # outside of fakeroot but mesa doesn't need to chown/mod
-  DESTDIR="${srcdir}/fakeinstall" meson install -C build
+  meson install -C build --destdir "$srcdir/fakeinstall"
 }
 
 _install() {