mesa-chimeraos 24.3.0-chos1-2

Stop generating debug packages.
Generate virtio and documentation even if those packages won't be installed.

.github/workflows/main.yaml

@@ -35,7 +35,9 @@ jobs:
           mkdir -p /etc/gnupg && echo "auto-key-retrieve" >> /etc/gnupg/gpg.conf
           echo -e "[multilib]\nInclude = /etc/pacman.d/mirrorlist\n" >> /etc/pacman.conf
       - name: Disable generation of debug packages
-        run: sed -i '/BUILDENV/s/ debug/ !debug/g' /etc/makepkg.conf
+        run: |
+          sed -i '/BUILDENV/s/debug/!debug/g' /etc/makepkg.conf
+          sed -i '/BUILDENV/s/!!debug/!debug/g' /etc/makepkg.conf
       - name: Generate .SRCINFO
         run: |
           su build bash -c "cd /home/build/mesa && makepkg --printsrcinfo > /home/build/mesa/.SRCINFO"

lib32-mesa/PKGBUILD

@@ -14,11 +14,11 @@ pkgname=(
   lib32-vulkan-nouveau
   lib32-vulkan-radeon
   lib32-vulkan-swrast
-  #lib32-vulkan-virtio
+  lib32-vulkan-virtio
 )
 _mesaver=24.3.0
 pkgver=${_mesaver//-/.}.chos1
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="Open-source OpenGL drivers - 32-bit"
 url="https://www.mesa3d.org/"
@@ -74,6 +74,9 @@ makedepends=(
 options=(
   # GCC 14 LTO causes segfault in LLVM under si_llvm_optimize_module
   !lto
+
+  # debug packages are a waste of time and space
+  !debug
 )
 source=(
   https://mesa.freedesktop.org/archive/mesa-${_mesaver}.tar.xz{,.sig}
@@ -264,8 +267,8 @@ package_lib32-mesa() {
     _pick vkswrast $icddir/lvp_icd*.json
     _pick vkswrast $libdir/libvulkan_lvp.so
 
-    #_pick vkvirtio $icddir/virtio_icd*.json
-    #_pick vkvirtio $libdir/libvulkan_virtio.so
+    _pick vkvirtio $icddir/virtio_icd*.json
+    _pick vkvirtio $libdir/libvulkan_virtio.so
 
     rm -rv etc usr/{bin,include,share}
 

mesa/PKGBUILD

@@ -14,12 +14,12 @@ pkgname=(
   vulkan-nouveau
   vulkan-radeon
   vulkan-swrast
-#  vulkan-virtio
-#  mesa-docs
+  vulkan-virtio
+  mesa-docs
 )
 _mesaver=24.3.0
 pkgver=${_mesaver//-/.}.chos1
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="Open-source OpenGL drivers"
 url="https://www.mesa3d.org/"
@@ -75,6 +75,9 @@ makedepends=(
 options=(
   # GCC 14 LTO causes segfault in LLVM under si_llvm_optimize_module
   !lto
+
+  # debug packages are a waste of time and space
+  !debug
 )
 source=(
   https://mesa.freedesktop.org/archive/mesa-${_mesaver}.tar.xz{,.sig}
@@ -264,10 +267,10 @@ package_mesa() {
     _pick vkswrast $icddir/lvp_icd*.json
     _pick vkswrast $libdir/libvulkan_lvp.so
 
-    #_pick vkvirtio $icddir/virtio_icd*.json
-    #_pick vkvirtio $libdir/libvulkan_virtio.so
+    _pick vkvirtio $icddir/virtio_icd*.json
+    _pick vkvirtio $libdir/libvulkan_virtio.so
 
-    #_pick docs usr/share/doc
+    _pick docs usr/share/doc
 
     # indirect rendering
     ln -sr $libdir/libGLX_{mesa,indirect}.so.0