From 2963857d2e1acb79694c03b3a4a395322d9b2cee Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@hotmail.com>
Date: Fri, 30 Aug 2024 16:38:59 +0300
Subject: [PATCH 1/2] mesa ver. bump

---
 x11/library/mesa/actions.py | 11 ++++++-----
 x11/library/mesa/pspec.xml  | 12 ++++++++++--
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/x11/library/mesa/actions.py b/x11/library/mesa/actions.py
index 6f83cf402a..530013f2db 100644
--- a/x11/library/mesa/actions.py
+++ b/x11/library/mesa/actions.py
@@ -36,13 +36,14 @@ def setup():
                -Dlibunwind=disabled \
                -Dbuild-tests=false \
                -Dosmesa=true \
-               -Dgallium-opencl=icd \
               " % (libdir)
 
     if get.buildTYPE() == "emul32":
+        # shelltools.export("LDFLAGS", "%s -L/usr/lib32"  % get.LDFLAGS())
+        # shelltools.export("PKG_CONFIG_PATH", "/usr/lib32/pkgconfig")
         options += " -Dlmsensors=disabled --native-file crossfile.ini -Dzstd=disabled \
                      -Dvulkan-drivers=amd,intel,intel_hasvk,swrast,virtio \
-                     -Dgallium-drivers=r300,r600,nouveau,radeonsi,svga,iris,swrast,virgl,crocus,zink \
+                     -Dgallium-drivers=r300,r600,nouveau,radeonsi,svga,iris,llvmpipe,softpipe,virgl,crocus,i915,zink \
                    "
         #shelltools.export("CC", "clang -m32")
         #shelltools.export("CXX", "clang++ -m32")
@@ -57,11 +58,11 @@ def setup():
         #shelltools.export("CXX", "clang++")
         pisitools.cflags.add("-m64 ")
         pisitools.cxxflags.add("-m64")
-        options += " -Dgallium-omx=bellagio -Dlmsensors=enabled -Dzstd=enabled \
+        options += " -Dgallium-omx=bellagio -Dgallium-opencl=icd -Dlmsensors=enabled -Dzstd=enabled \
                              -Dgallium-rusticl=true \
                              -Drust_std=2021 \
-                             -Dvulkan-drivers=amd,intel,intel_hasvk,swrast,virtio,nouveau \
-                             -Dgallium-drivers=r300,r600,nouveau,radeonsi,svga,iris,swrast,virgl,crocus,zink,d3d12"
+                             -Dvulkan-drivers=amd,intel,intel_hasvk,nouveau,swrast,virtio \
+                             -Dgallium-drivers=r300,r600,nouveau,radeonsi,svga,iris,llvmpipe,softpipe,virgl,crocus,i915,zink,d3d12"
     
     #pisitools.ldflags.add("-fuse-ld=lld")
     mesontools.configure(options)
diff --git a/x11/library/mesa/pspec.xml b/x11/library/mesa/pspec.xml
index edb62c367f..f711631ec4 100644
--- a/x11/library/mesa/pspec.xml
+++ b/x11/library/mesa/pspec.xml
@@ -14,7 +14,7 @@
         <Icon>mesa</Icon>
         <Summary>Mesa graphics libraries and utilities</Summary>
         <Description>Mesa is an open-source implementation of the OpenGL specification - a system for rendering interactive 3D graphics.</Description>
-        <Archive sha1sum="d8ffc5cbb9943f58d56360885becaa4bd4bd2cb7" type="tarxz">https://archive.mesa3d.org/mesa-24.1.6.tar.xz</Archive>
+        <Archive sha1sum="73d4095cd0a604026f408f211572fa84c2b83c1d" type="tarxz">https://archive.mesa3d.org/mesa-24.2.1.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>meson</Dependency>
             <Dependency>cbindgen</Dependency>
@@ -76,7 +76,7 @@
             <AdditionalFile owner="root" permission="0644" target="crossfile.ini">crossfile.ini</AdditionalFile>
         </AdditionalFiles>
         <Patches>
-<!--             <Patch level="1">swr-llvm13-patch2.patch</Patch> -->
+            <Patch level="1">0001-rusticl-do-not-use-CL-vector-types-in-bindings-and-c.patch</Patch>
         </Patches>
     </Source>
 
@@ -230,6 +230,7 @@
             <Dependency>libclc-32bit</Dependency>
             <Dependency>spirv-llvm-32bit</Dependency>
             <Dependency>spirv-tools-32bit</Dependency>
+            <Dependency>llvm-clang-32bit</Dependency>
         </BuildDependencies>
         <RuntimeDependencies>
             <Dependency>zlib-32bit</Dependency>
@@ -273,6 +274,13 @@
     </Package>
 
     <History>
+        <Update release="117">
+            <Date>2024-08-29</Date>
+            <Version>24.2.1</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Pisi Linux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
         <Update release="116">
             <Date>2024-08-15</Date>
             <Version>24.1.6</Version>

From 2bff906681f7b5083b6687e9cafb4ae926a8775d Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@hotmail.com>
Date: Fri, 30 Aug 2024 16:41:04 +0300
Subject: [PATCH 2/2] mesa ver. bump

---
 x11/library/mesa/pspec.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11/library/mesa/pspec.xml b/x11/library/mesa/pspec.xml
index f711631ec4..dc73d8586f 100644
--- a/x11/library/mesa/pspec.xml
+++ b/x11/library/mesa/pspec.xml
@@ -76,7 +76,7 @@
             <AdditionalFile owner="root" permission="0644" target="crossfile.ini">crossfile.ini</AdditionalFile>
         </AdditionalFiles>
         <Patches>
-            <Patch level="1">0001-rusticl-do-not-use-CL-vector-types-in-bindings-and-c.patch</Patch>
+<!--             <Patch level="1">swr-llvm13-patch2.patch</Patch> -->
         </Patches>
     </Source>