Revert "Mesa 24.3.0"

This reverts commit 7e148ed.
SteamFork · Nov 27, 2024 · d801dcd · d801dcd
1 parent 7e148ed
commit d801dcd
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 60 deletions.
diff --git a/PKGBUILD/lib32-mesa-radv/PKGBUILD b/PKGBUILD/lib32-mesa-radv/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="An open-source implementation of the OpenGL specification (32-bit)"
 # When updating the tag, consider if you are adding any shader compiler changes. If so,
 # or if you are not sure, regenerate the radv-build-id below. To update, see
 # https://gitlab.steamos.cloud/jupiter/docs/-/wikis/How-to-make-a-new-Mesa-release#updating-the-radv-build-id
-pkgver=24.3.0
+pkgver=24.2.6
 _tag=mesa-${pkgver}
 pkgrel=1
 arch=('x86_64')
@@ -99,6 +99,7 @@ END
     -D android-libbacktrace=disabled \
     -D vulkan-drivers=amd \
     -D vulkan-layers= \
+    -D dri3=enabled \
     -D egl=disabled \
     -D gbm=disabled \
     -D gles1=disabled \
@@ -228,6 +229,7 @@ package_lib32-mesa() {
   # ati-dri, nouveau-dri, intel-dri, svga-dri, swrast, swr
   _install fakeinstall/usr/lib32/dri/*_dri.so
 
+  #_install fakeinstall/usr/lib32/bellagio
   _install fakeinstall/usr/lib32/d3d
   _install fakeinstall/usr/lib32/lib{gbm,glapi}.so*
   _install fakeinstall/usr/lib32/libOSMesa.so*

diff --git a/PKGBUILD/lib32-mesa/PKGBUILD b/PKGBUILD/lib32-mesa/PKGBUILD
@@ -9,15 +9,15 @@ pkgbase=lib32-mesa
 #  - drop lib32-opencl-mesa - unnecessary and requires to install more dependencies
 pkgname=('lib32-vulkan-mesa-layers' 'lib32-vulkan-intel' 'lib32-libva-mesa-driver' 'lib32-mesa-vdpau' 'lib32-mesa')
 pkgdesc="An open-source implementation of the OpenGL specification (32-bit)"
-pkgver=24.3.0
+pkgver=24.2.6
 _tag=mesa-${pkgver}
 pkgrel=1
 arch=('x86_64')
 
 makedepends=('multilib-devel' 'git' 'openssh' 'python-mako' 'python-ply' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11' 'xorgproto' 'lib32-libdrm' 
 	     'lib32-libxshmfence' 'lib32-libxxf86vm' 'lib32-libxdamage' 'lib32-libvdpau'
 	     'lib32-libva' 'lib32-wayland' 'wayland-protocols' 'lib32-zstd' 'lib32-libelf'
-	     'lib32-llvm' 'lib32-libdrm' 'libclc' 'clang' 'lib32-clang' 'lib32-libglvnd' 'lib32-libunwind'
+	     'lib32-llvm' 'lib32-libomxil-bellagio' 'lib32-libdrm' 'libclc' 'clang' 'lib32-clang' 'lib32-libglvnd' 'lib32-libunwind'
 	     'lib32-lm_sensors' 'lib32-libxrandr' 'lib32-systemd' 'valgrind' 'glslang' 'lib32-vulkan-icd-loader' 'directx-headers' 'cmake' 'meson'
 	     'python-sphinx-hawkmoth' 'lib32-spirv-tools' 'lib32-spirv-llvm-translator')
 
@@ -90,9 +90,11 @@ END
     -D gallium-drivers=iris,i915,radeonsi,softpipe,llvmpipe,zink \
     -D vulkan-drivers=intel \
     -D vulkan-layers=device-select,intel-nullhw,overlay \
+    -D dri3=enabled \
     -D egl=enabled \
     -D gallium-extra-hud=true \
     -D gallium-nine=true \
+    -D gallium-omx=disabled \
     -D gallium-opencl=disabled \
     -D gallium-va=enabled \
     -D gallium-vdpau=enabled \
@@ -213,9 +215,7 @@ package_lib32-mesa() {
   # ati-dri, nouveau-dri, intel-dri, svga-dri, swrast, swr
   _install fakeinstall/usr/lib32/dri/*_dri.so
 
-  # gbm
-  _install fakeinstall/usr/lib32/gbm/dri_gbm.so
-
+  #_install fakeinstall/usr/lib32/bellagio
   _install fakeinstall/usr/lib32/d3d
   _install fakeinstall/usr/lib32/lib{gbm,glapi}.so*
   _install fakeinstall/usr/lib32/libOSMesa.so*

diff --git a/PKGBUILD/mesa-radv/PKGBUILD b/PKGBUILD/mesa-radv/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="An open-source implementation of the OpenGL specification"
 # When updating the tag, consider if you are adding any shader compiler changes. If so,
 # or if you are not sure, regenerate the radv-build-id below. To update, see
 # https://gitlab.steamos.cloud/jupiter/docs/-/wikis/How-to-make-a-new-Mesa-release#updating-the-radv-build-id
-pkgver=24.3.0
+pkgver=24.2.6
 _tag=mesa-${pkgver}
 pkgrel=1
 arch=('x86_64')
@@ -86,6 +86,7 @@ build() {
     -D android-libbacktrace=disabled \
     -D vulkan-drivers=amd \
     -D vulkan-layers= \
+    -D dri3=enabled \
     -D egl=disabled \
     -D gbm=disabled \
     -D gles1=disabled \
@@ -210,7 +211,7 @@ package_mesa-vdpau() {
 
 package_mesa() {
   depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf'
-           'libunwind' 'llvm-libs' 'lm_sensors' 'libglvnd'
+           'libomxil-bellagio' 'libunwind' 'llvm-libs' 'lm_sensors' 'libglvnd'
            'zstd' 'vulkan-icd-loader')
   depends+=('libsensors.so' 'libexpat.so' 'libvulkan.so')
   optdepends=('opengl-man-pages: for the OpenGL API man pages'
@@ -226,6 +227,7 @@ package_mesa() {
   # ati-dri, nouveau-dri, intel-dri, svga-dri, swrast, swr
   _install fakeinstall/usr/lib/dri/*_dri.so
 
+  _install fakeinstall/usr/lib/bellagio
   _install fakeinstall/usr/lib/d3d
   _install fakeinstall/usr/lib/lib{gbm,glapi}.so*
   _install fakeinstall/usr/lib/libOSMesa.so*

diff --git a/PKGBUILD/mesa/PKGBUILD b/PKGBUILD/mesa/PKGBUILD
@@ -9,13 +9,13 @@ pkgbase=mesa
 #  - drop opencl-mesa - unnecessary and requires to install more dependencies
 pkgname=('vulkan-mesa-layers' 'vulkan-intel' 'vulkan-swrast' 'libva-mesa-driver' 'mesa-vdpau' 'mesa')
 pkgdesc="An open-source implementation of the OpenGL specification"
-pkgver=24.3.0
+pkgver=24.2.6
 _tag=${pkgbase}-${pkgver}
 pkgrel=1
 arch=('x86_64')
 makedepends=('git' 'openssh' 'python-mako' 'python-ply' 'libxml2' 'libx11' 'xorgproto' 'libdrm' 'libxshmfence' 'libxxf86vm'
              'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols' 'zstd' 'elfutils' 'llvm'
-             'libdrm' 'libclc' 'clang' 'libglvnd' 'libunwind' 'lm_sensors' 'libxrandr'
+             'libomxil-bellagio' 'libdrm' 'libclc' 'clang' 'libglvnd' 'libunwind' 'lm_sensors' 'libxrandr'
              'systemd' 'valgrind' 'glslang' 'vulkan-icd-loader' 'directx-headers' 'cmake' 'meson'
 	     'python-sphinx-hawkmoth' 'spirv-llvm-translator')
 url="https://www.mesa3d.org/"
@@ -75,9 +75,11 @@ build() {
     -D gallium-drivers=iris,i915,radeonsi,softpipe,llvmpipe,zink \
     -D vulkan-drivers=intel,swrast \
     -D vulkan-layers=device-select,intel-nullhw,overlay \
+    -D dri3=enabled \
     -D egl=enabled \
     -D gallium-extra-hud=true \
     -D gallium-nine=true \
+    -D gallium-omx=bellagio \
     -D gallium-opencl=disabled \
     -D gallium-va=enabled \
     -D gallium-vdpau=enabled \
@@ -192,7 +194,7 @@ package_mesa-vdpau() {
 
 package_mesa() {
   depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf'
-           'libunwind' 'llvm-libs' 'lm_sensors' 'libglvnd'
+           'libomxil-bellagio' 'libunwind' 'llvm-libs' 'lm_sensors' 'libglvnd'
            'zstd' 'vulkan-icd-loader')
   depends+=('libsensors.so' 'libexpat.so' 'libvulkan.so')
   optdepends=('opengl-man-pages: for the OpenGL API man pages'
@@ -208,9 +210,7 @@ package_mesa() {
   # ati-dri, nouveau-dri, intel-dri, svga-dri, swrast, swr
   _install fakeinstall/usr/lib/dri/*_dri.so
 
-  # gbm
-  _install fakeinstall/usr/lib/gbm/dri_gbm.so
-
+  _install fakeinstall/usr/lib/bellagio
   _install fakeinstall/usr/lib/d3d
   _install fakeinstall/usr/lib/lib{gbm,glapi}.so*
   _install fakeinstall/usr/lib/libOSMesa.so*

diff --git a/PKGBUILD/wayland-protocols/PKGBUILD b/PKGBUILD/wayland-protocols/PKGBUILD
diff --git a/rootfs/steamfork/presets/rel.sh b/rootfs/steamfork/presets/rel.sh
@@ -486,6 +486,7 @@ export STEAMOS_PKGS="accounts-qml-module
                     libnotify
                     libnsl
                     libogg
+                    libomxil-bellagio
                     libopenmpt
                     libp11-kit
                     libpaper