upg mesa

2024-05-13 15:32:34 +03:00 · 2024-05-13 15:32:34 +03:00 · 86a113181c
parent e60e03e46e
commit 86a113181c
4 changed files with 44 additions and 68 deletions
--- a/mesa/PKGBUILD
+++ b/mesa/PKGBUILD
@ -8,13 +8,14 @@
 pkgbase=mesa
 pkgname=('vulkan-mesa-layers' 'opencl-clover-mesa' 'opencl-rusticl-mesa' 'vulkan-intel' 'vulkan-nouveau' 'vulkan-radeon'
 	'vulkan-swrast' 'vulkan-virtio' 'libva-mesa-driver' 'mesa-vdpau' 'mesa')
-pkgver=24.0.6
-pkgrel=01
+pkgver=24.0.7
+pkgrel=03
 epoch=1
 pkgdesc="An open-source implementation of the OpenGL specification w/o systemd or zstd"
 url="https://www.mesa3d.org/"
 #options=('debug' '!lto')  #  uncomment this if you want the debug package built # Arch removed debug for 22.3.3-3 version
-#options=('!lto')
+# GCC 14 LTO causes segfault in LLVM under si_llvm_optimize_module
+options=('!lto')
 makedepends=(
  'clang'
  'expat'
@ -108,41 +109,31 @@ build() {
    --libdir=/$_libdir \
    -D android-libbacktrace=disabled \
    -D b_ndebug=true \
-    -D dri3=enabled \
-    -D egl=enabled \
    -D gallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,swrast,i915,iris,crocus,zink,d3d12 \
    -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=enabled \
-    -D gbm=enabled \
    -D gles1=disabled \
-    -D gles2=enabled \
    -D glvnd=true \
    -D glx=dri \
    -D intel-clc=enabled \
    -D libunwind=disabled \
-    -D llvm=enabled \
-    -D lmsensors=enabled \
    -D microsoft-clc=disabled \
    -D osmesa=true \
    -D platforms=x11,wayland \
    -D zstd=disabled \
-    -D shared-glapi=enabled \
    -D valgrind=enabled \
    -D video-codecs=all \
    -D vulkan-drivers=amd,intel,intel_hasvk,swrast,virtio,nouveau-experimental \
    -D vulkan-layers=device-select,intel-nullhw,overlay
-  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() {
@ -459,32 +450,22 @@ validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D'  # Emil Velikov <emil.l
              '71C4B75620BC75708B4BDB254C95FAAB3EB073EC'  # Dylan Baker <dylan@pnwbakers.com>
              '57551DE15B968F6341C248F68D8E31AFC32428A6') # Eric Engestrom <eric@engestrom.ch>

-sha256sums=(8b7a92dbe6468c18f2383700135b5fe9de836cdf0cc8fd7dbae3c7110237d604  # mesa-24.0.6.tar.xz
-	2f254a13ac9df0aeb676acd7e15c431152bb129e1292f332106726bf6fc5dd9f  # mesa-24.0.6.tar.xz.sig
+sha256sums=(7454425f1ed4a6f1b5b107e1672b30c88b22ea0efea000ae2c7d96db93f6c26a  # mesa-24.0.7.tar.xz
+	745cb0ead510d01fea5aa713a21b6f0db5ebce1b68484fc4f31bb0d1a5d031d5  # mesa-24.0.7.tar.xz.sig
 	39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b  # proc-macro2-1.0.70.tar.gz
 	3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b  # unicode-ident-1.0.12.tar.gz
 	5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae  # quote-1.0.33.tar.gz
 	23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a) # syn-2.0.39.tar.gz

-##  
-##  311aa283c203af100bc29a8b5d2d07cc337b89032c87615a78b8658a234294e6  libva-mesa-driver-1_24.0.6-01-x86_64.pkg.tar.lz
-##  0a07e490468cacec5f5555ccd787524e907afd2d18f2372d5d6532785e36be85  mesa-1_24.0.6-01-x86_64.pkg.tar.lz
-##  3af91108d8bad6b3e60ea7381aa5d11fde29b8ae18f624e1b8d970f2f18bb9b1  mesa-vdpau-1_24.0.6-01-x86_64.pkg.tar.lz
-##  7fcccbe2f8b5a07ab0aaae2dbc232aedcab46f63ec3826394a014063f27f889d  opencl-clover-mesa-1_24.0.6-01-x86_64.pkg.tar.lz
-##  db836cd8bfc1e2daf589fd66e982f8734e9956aebad53aed44340800c4d9649f  opencl-rusticl-mesa-1_24.0.6-01-x86_64.pkg.tar.lz
-##  218d67b76a3990bf62fe418bb1ea01ce02ea7923912e29b564d5b510d8bc99ae  vulkan-intel-1_24.0.6-01-x86_64.pkg.tar.lz
-##  ce089fa727def38da5da54b2ef305b2c0a0ebf582d495aaa5a55c4b234eec38b  vulkan-mesa-layers-1_24.0.6-01-x86_64.pkg.tar.lz
-##  34cc9957441102df5466614385fd13bad89f2ec8d44cd5a0afcf94f3e2c6b20e  vulkan-nouveau-1_24.0.6-01-x86_64.pkg.tar.lz
-##  cd765962c37e8bc306afa24751c51e6aa52256c41d0f24c87e8b4d12d02fa612  vulkan-radeon-1_24.0.6-01-x86_64.pkg.tar.lz
-##  03cc31e0d0ff7b370bbf5964bea4dc36d3de79f71cf5198ca6ef216ce03d6c77  vulkan-swrast-1_24.0.6-01-x86_64.pkg.tar.lz
-##  4734ad029d57fcec0345c9c74a0bc60c331c052745c603905fa21ff44a144d04  vulkan-virtio-1_24.0.6-01-x86_64.pkg.tar.lz
+##  e152662905936a62aee187285dfe487f826acd93a35629ae824f8011ccbdd403  libva-mesa-driver-1:24.0.7-03-x86_64.pkg.tar.lz
+##  4ec7609a5eee3456f8f0118c2e048143ed1a243a0fa793a45bc35497182da5e9  mesa-1:24.0.7-03-x86_64.pkg.tar.lz
+##  8a2dd9a905e34ad3fcf873c4ed5168edf5e8dbe973d8d06b09cb0e5488a2eb79  mesa-vdpau-1:24.0.7-03-x86_64.pkg.tar.lz
+##  f4b1d1444d5d71de5d71728069f24d7af3f725195fcf81749589f7b440dbf65a  opencl-clover-mesa-1:24.0.7-03-x86_64.pkg.tar.lz
+##  92e2d4dadc1cea839affb1f589c39450c10616a1188ecd12e69a91f4df00ad87  opencl-rusticl-mesa-1:24.0.7-03-x86_64.pkg.tar.lz
+##  4a01114e0b0932dda69b0bf2a75a5144649b005393e73b7a0c181e3707b00d18  vulkan-intel-1:24.0.7-03-x86_64.pkg.tar.lz
+##  9aa7284d77570bad31af7814cadd1b427839d58aeb3531dae3cc81377fba6930  vulkan-mesa-layers-1:24.0.7-03-x86_64.pkg.tar.lz
+##  b6c239313577c5d1009056792eadfe51fa1a35c0dd3da1fb7a3fc5027375fc97  vulkan-nouveau-1:24.0.7-03-x86_64.pkg.tar.lz
+##  a1cb0ca92fc6c7146863f2496fcfe77bda286e296499606558e852ebdf7ed71a  vulkan-radeon-1:24.0.7-03-x86_64.pkg.tar.lz
+##  462208d742d1e1c3cc54e17e1d98b64017fef22332395e8e203090cb2837f1d2  vulkan-swrast-1:24.0.7-03-x86_64.pkg.tar.lz
+##  9a8501cbf506158538154cd367b41d5d023a7bb353e19b293ff4244c8ab99f27  vulkan-virtio-1:24.0.7-03-x86_64.pkg.tar.lz

-##  this was a rebuilt just to add python-packaging in the dependencies ... next time, it's not worth the trouble
-##  When we tried to build it first time it couldn't find module mako 
-##  from python-mako, so we added python-setuptools which brings in 
-##  python-packaging and it worked.  We wonder sometimes in what minimal
-##  chroot is arch building packages when they have unnecessary dependencies
-##  installed that are not in their base-devel.
-
- 
- 
--- a/mesa/PKGBUILD-arch
+++ b/mesa/PKGBUILD-arch
@ -18,8 +18,8 @@ pkgname=(
  'mesa-vdpau'
  'mesa'
 )
-pkgver=24.0.6
-pkgrel=2
+pkgver=24.0.7
+pkgrel=3
 epoch=1
 pkgdesc="Open-source OpenGL drivers"
 url="https://www.mesa3d.org/"
@ -79,6 +79,10 @@ makedepends=(
  # 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-${pkgver}.tar.xz{,.sig}
 )
@ -103,13 +107,13 @@ for _crate in "${!_crates[@]}"; do
  source+=($_crate-${_crates[$_crate]}.tar.gz::https://crates.io/api/v1/crates/$_crate/${_crates[$_crate]}/download)
 done

-sha256sums=('8b7a92dbe6468c18f2383700135b5fe9de836cdf0cc8fd7dbae3c7110237d604'
+sha256sums=('7454425f1ed4a6f1b5b107e1672b30c88b22ea0efea000ae2c7d96db93f6c26a'
            'SKIP'
            '39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b'
            '3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b'
            '5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae'
            '23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a')
-b2sums=('531482c1a01ec4c0bd6b2f0857640c14fcc2ba70e85a14e4edf0f44ba466c12e39ad067690e6a571a0744ae06080943b1328a29263225cb7570f119464e17fbe'
+b2sums=('d9438e533b471445b2403e01e1fd593d83c0013b0991585f718122f1cadc6ac6bb1fb913f0fb257354ae21ddd9fe1f970ad9ac46f05d756c223ed56a11b9c9ce'
        'SKIP'
        'fff0dec06b21e391783cc136790238acb783780eaedcf14875a350e7ceb46fdc100c8b9e3f09fb7f4c2196c25d4c6b61e574c0dad762d94533b628faab68cf5c'
        '4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac'
@ -129,30 +133,20 @@ build() {
  local meson_options=(
    -D android-libbacktrace=disabled
    -D b_ndebug=true
-    -D dri3=enabled
-    -D egl=enabled
    -D gallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,swrast,i915,iris,crocus,zink,d3d12
    -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=enabled
-    -D gbm=enabled
    -D gles1=disabled
-    -D gles2=enabled
    -D glvnd=true
    -D glx=dri
    -D intel-clc=enabled
    -D libunwind=disabled
-    -D llvm=enabled
-    -D lmsensors=enabled
    -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,virtio,nouveau-experimental
@ -167,12 +161,12 @@ build() {
  export MESON_PACKAGE_CACHE_DIR="$srcdir"

  arch-meson mesa-$pkgver 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() {
--- a/mesa/chepoch.sh
+++ b/mesa/chepoch.sh
@ -1,11 +1,11 @@
-mv vulkan-mesa-layers-1:24.0.6-01-x86_64.pkg.tar.lz vulkan-mesa-layers-1_24.0.6-01-x86_64.pkg.tar.lz
-mv opencl-clover-mesa-1:24.0.6-01-x86_64.pkg.tar.lz opencl-clover-mesa-1_24.0.6-01-x86_64.pkg.tar.lz
-mv opencl-rusticl-mesa-1:24.0.6-01-x86_64.pkg.tar.lz opencl-rusticl-mesa-1_24.0.6-01-x86_64.pkg.tar.lz
-mv vulkan-intel-1:24.0.6-01-x86_64.pkg.tar.lz vulkan-intel-1_24.0.6-01-x86_64.pkg.tar.lz
-mv vulkan-radeon-1:24.0.6-01-x86_64.pkg.tar.lz vulkan-radeon-1_24.0.6-01-x86_64.pkg.tar.lz
-mv vulkan-swrast-1:24.0.6-01-x86_64.pkg.tar.lz vulkan-swrast-1_24.0.6-01-x86_64.pkg.tar.lz
-mv vulkan-virtio-1:24.0.6-01-x86_64.pkg.tar.lz vulkan-virtio-1_24.0.6-01-x86_64.pkg.tar.lz
-mv libva-mesa-driver-1:24.0.6-01-x86_64.pkg.tar.lz libva-mesa-driver-1_24.0.6-01-x86_64.pkg.tar.lz
-mv mesa-vdpau-1:24.0.6-01-x86_64.pkg.tar.lz mesa-vdpau-1_24.0.6-01-x86_64.pkg.tar.lz
-mv mesa-1:24.0.6-01-x86_64.pkg.tar.lz mesa-1_24.0.6-01-x86_64.pkg.tar.lz
-mv vulkan-nouveau-1:24.0.6-01-x86_64.pkg.tar.lz vulkan-nouveau-1_24.0.6-01-x86_64.pkg.tar.lz
+mv vulkan-mesa-layers-1:24.0.7-03-x86_64.pkg.tar.lz vulkan-mesa-layers-1_24.0.7-03-x86_64.pkg.tar.lz
+mv opencl-clover-mesa-1:24.0.7-03-x86_64.pkg.tar.lz opencl-clover-mesa-1_24.0.7-03-x86_64.pkg.tar.lz
+mv opencl-rusticl-mesa-1:24.0.7-03-x86_64.pkg.tar.lz opencl-rusticl-mesa-1_24.0.7-03-x86_64.pkg.tar.lz
+mv vulkan-intel-1:24.0.7-03-x86_64.pkg.tar.lz vulkan-intel-1_24.0.7-03-x86_64.pkg.tar.lz
+mv vulkan-radeon-1:24.0.7-03-x86_64.pkg.tar.lz vulkan-radeon-1_24.0.7-03-x86_64.pkg.tar.lz
+mv vulkan-swrast-1:24.0.7-03-x86_64.pkg.tar.lz vulkan-swrast-1_24.0.7-03-x86_64.pkg.tar.lz
+mv vulkan-virtio-1:24.0.7-03-x86_64.pkg.tar.lz vulkan-virtio-1_24.0.7-03-x86_64.pkg.tar.lz
+mv libva-mesa-driver-1:24.0.7-03-x86_64.pkg.tar.lz libva-mesa-driver-1_24.0.7-03-x86_64.pkg.tar.lz
+mv mesa-vdpau-1:24.0.7-03-x86_64.pkg.tar.lz mesa-vdpau-1_24.0.7-03-x86_64.pkg.tar.lz
+mv mesa-1:24.0.7-03-x86_64.pkg.tar.lz mesa-1_24.0.7-03-x86_64.pkg.tar.lz
+mv vulkan-nouveau-1:24.0.7-03-x86_64.pkg.tar.lz vulkan-nouveau-1_24.0.7-03-x86_64.pkg.tar.lz
--- a/mesa/time
+++ b/mesa/time
@ -1,6 +1,7 @@
+ mesa-24.0.7 


-real	39m36.217s
-user	191m43.778s
-sys	5m26.573s
+real	19m27.914s
+user	67m43.940s
+sys	2m42.458s