mesa-32: 21.3.1 -> 21.3.2

4 files changed, 52 insertions, 31 deletions

diff --git a/mesa-32/.footprint b/mesa-32/.footprint
index efa5eb2e..48ef2a11 100644
--- a/mesa-32/.footprint
+++ b/mesa-32/.footprint
@@ -16,35 +16,35 @@ drwxr-xr-x	root/root	usr/lib32/dri/
 -rwxr-xr-x	root/root	usr/lib32/dri/swrast_dri.so
 -rwxr-xr-x	root/root	usr/lib32/dri/virtio_gpu_dri.so
 -rwxr-xr-x	root/root	usr/lib32/dri/vmwgfx_dri.so
--rwxr-xr-x	root/root	usr/lib32/libEGL_mesa.so.0.0.0
-lrwxrwxrwx	root/root	usr/lib32/libEGL_mesa.so.0 -> libEGL_mesa.so.0.0.0
 lrwxrwxrwx	root/root	usr/lib32/libEGL_mesa.so -> libEGL_mesa.so.0
--rwxr-xr-x	root/root	usr/lib32/libgbm.so.1.0.0
-lrwxrwxrwx	root/root	usr/lib32/libgbm.so.1 -> libgbm.so.1.0.0
-lrwxrwxrwx	root/root	usr/lib32/libgbm.so -> libgbm.so.1
--rwxr-xr-x	root/root	usr/lib32/libglapi.so.0.0.0
-lrwxrwxrwx	root/root	usr/lib32/libglapi.so.0 -> libglapi.so.0.0.0
-lrwxrwxrwx	root/root	usr/lib32/libglapi.so -> libglapi.so.0
+lrwxrwxrwx	root/root	usr/lib32/libEGL_mesa.so.0 -> libEGL_mesa.so.0.0.0
+-rwxr-xr-x	root/root	usr/lib32/libEGL_mesa.so.0.0.0
 lrwxrwxrwx	root/root	usr/lib32/libGLX_indirect.so.0 -> libGLX_mesa.so.0
--rwxr-xr-x	root/root	usr/lib32/libGLX_mesa.so.0.0.0
-lrwxrwxrwx	root/root	usr/lib32/libGLX_mesa.so.0 -> libGLX_mesa.so.0.0.0
 lrwxrwxrwx	root/root	usr/lib32/libGLX_mesa.so -> libGLX_mesa.so.0
--rwxr-xr-x	root/root	usr/lib32/libOSMesa.so.8.0.0
-lrwxrwxrwx	root/root	usr/lib32/libOSMesa.so.8 -> libOSMesa.so.8.0.0
+lrwxrwxrwx	root/root	usr/lib32/libGLX_mesa.so.0 -> libGLX_mesa.so.0.0.0
+-rwxr-xr-x	root/root	usr/lib32/libGLX_mesa.so.0.0.0
 lrwxrwxrwx	root/root	usr/lib32/libOSMesa.so -> libOSMesa.so.8
+lrwxrwxrwx	root/root	usr/lib32/libOSMesa.so.8 -> libOSMesa.so.8.0.0
+-rwxr-xr-x	root/root	usr/lib32/libOSMesa.so.8.0.0
+lrwxrwxrwx	root/root	usr/lib32/libXvMCnouveau.so -> libXvMCnouveau.so.1.0.0
+lrwxrwxrwx	root/root	usr/lib32/libXvMCnouveau.so.1 -> libXvMCnouveau.so.1.0.0
+lrwxrwxrwx	root/root	usr/lib32/libXvMCnouveau.so.1.0 -> libXvMCnouveau.so.1.0.0
+-rwxr-xr-x	root/root	usr/lib32/libXvMCnouveau.so.1.0.0
+lrwxrwxrwx	root/root	usr/lib32/libXvMCr600.so -> libXvMCr600.so.1.0.0
+lrwxrwxrwx	root/root	usr/lib32/libXvMCr600.so.1 -> libXvMCr600.so.1.0.0
+lrwxrwxrwx	root/root	usr/lib32/libXvMCr600.so.1.0 -> libXvMCr600.so.1.0.0
+-rwxr-xr-x	root/root	usr/lib32/libXvMCr600.so.1.0.0
+lrwxrwxrwx	root/root	usr/lib32/libgbm.so -> libgbm.so.1
+lrwxrwxrwx	root/root	usr/lib32/libgbm.so.1 -> libgbm.so.1.0.0
+-rwxr-xr-x	root/root	usr/lib32/libgbm.so.1.0.0
+lrwxrwxrwx	root/root	usr/lib32/libglapi.so -> libglapi.so.0
+lrwxrwxrwx	root/root	usr/lib32/libglapi.so.0 -> libglapi.so.0.0.0
+-rwxr-xr-x	root/root	usr/lib32/libglapi.so.0.0.0
 -rwxr-xr-x	root/root	usr/lib32/libvulkan_intel.so
 -rwxr-xr-x	root/root	usr/lib32/libvulkan_radeon.so
--rwxr-xr-x	root/root	usr/lib32/libxatracker.so.2.5.0
-lrwxrwxrwx	root/root	usr/lib32/libxatracker.so.2 -> libxatracker.so.2.5.0
 lrwxrwxrwx	root/root	usr/lib32/libxatracker.so -> libxatracker.so.2
--rwxr-xr-x	root/root	usr/lib32/libXvMCnouveau.so.1.0.0
-lrwxrwxrwx	root/root	usr/lib32/libXvMCnouveau.so.1.0 -> libXvMCnouveau.so.1.0.0
-lrwxrwxrwx	root/root	usr/lib32/libXvMCnouveau.so.1 -> libXvMCnouveau.so.1.0.0
-lrwxrwxrwx	root/root	usr/lib32/libXvMCnouveau.so -> libXvMCnouveau.so.1.0.0
--rwxr-xr-x	root/root	usr/lib32/libXvMCr600.so.1.0.0
-lrwxrwxrwx	root/root	usr/lib32/libXvMCr600.so.1.0 -> libXvMCr600.so.1.0.0
-lrwxrwxrwx	root/root	usr/lib32/libXvMCr600.so.1 -> libXvMCr600.so.1.0.0
-lrwxrwxrwx	root/root	usr/lib32/libXvMCr600.so -> libXvMCr600.so.1.0.0
+lrwxrwxrwx	root/root	usr/lib32/libxatracker.so.2 -> libxatracker.so.2.5.0
+-rwxr-xr-x	root/root	usr/lib32/libxatracker.so.2.5.0
 drwxr-xr-x	root/root	usr/lib32/pkgconfig/
 -rw-r--r--	root/root	usr/lib32/pkgconfig/dri.pc
 -rw-r--r--	root/root	usr/lib32/pkgconfig/gbm.pc
diff --git a/mesa-32/.signature b/mesa-32/.signature
index 2a5acceb..935dbf1b 100644
--- a/mesa-32/.signature
+++ b/mesa-32/.signature
@@ -1,6 +1,7 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXS5BSMRAe5mJOQ5aIGUJRwkgpjB9WgGTJM87T4uwn/6riwVVWPvOLYt4djoEC6S+XvOyXsg4aT+x76gDVZapLgA=
-SHA256 (Pkgfile) = c47764f53905dabd7e2dbb724ee3907d577d0224eb922f3ba7470edc1a1f423f
-SHA256 (.footprint) = 9ca8aafd004e37c3113b56be126f28c277429ee3d3ad74b53054dc1188f4e7c8
-SHA256 (mesa-21.3.1.tar.xz) = 2b0dc2540cb192525741d00f706dbc4586349185dafc65729c7fda0800cc474d
+RWSwxGo/zH7eXXECawFuP2/TUXzfr4xJoq3Yd+8CQs/lFmKNnT02IUOKrNUG7dw2Gxhc7cCMt1fxBd6oiywCQ7RZhjDrafVp7QA=
+SHA256 (Pkgfile) = 21dff5b8d8f971cf270b227ead423bfd5e6fbe901a6f2ddc7e7588a4eeb634a7
+SHA256 (.footprint) = f8989438162b8081cc5783bf7f99d6f4cf4c0525d77fcda2ace54f1143888ca5
+SHA256 (mesa-21.3.2.tar.xz) = e2e7bafb8307e7abc3bf982f39382fae3619c84b45504920a21504be52f126bd
 SHA256 (x86-linux-gnu) = 448877bbe3efe8bdfe6282c8e730fe8a8b6bf3c07f659e71b7292aceca22d8bd
+SHA256 (x86-linux-gnu-ccache) = 7b435803071fa5d72668eeae1a15c4e4dfca7847349de6f4ede0282b85faaac8
diff --git a/mesa-32/Pkgfile b/mesa-32/Pkgfile
index 12d37886..1a1b9ad6 100644
--- a/mesa-32/Pkgfile
+++ b/mesa-32/Pkgfile
@@ -5,13 +5,14 @@
 # Optional: libva libvdpau-32 wayland-protocols
 
 name=mesa-32
-version=21.3.1
+version=21.3.2
 release=1
 source=(https://archive.mesa3d.org/mesa-$version.tar.xz
-	x86-linux-gnu)
+	x86-linux-gnu x86-linux-gnu-ccache)
 
 build() {
 	export PKG_CONFIG_LIBDIR='/usr/lib32/pkgconfig:/usr/share/pkgconfig'
+	prt-get isinst ccache && local _cross_file='x86-linux-gnu-ccache' || local _cross_file='x86-linux-gnu'
 	prt-get isinst glslang && PKGMK_MESA+=' -D vulkan-layers=device-select,intel-nullhw,overlay'
 	prt-get isinst libvdpau-32 && PKGMK_MESA+=' -D gallium-vdpau=enabled' || PKGMK_MESA+=' -D gallium-vdpau=disabled'
 	prt-get isinst wayland-protocols && PKGMK_MESA_PLATFORMS+='wayland'
@@ -20,7 +21,7 @@ build() {
 	PKGMK_MESA_PLATFORMS+=',x11'
 
 	meson setup mesa-$version build $PKGMK_MESA \
-		--cross-file=$SRC/x86-linux-gnu \
+		--cross-file=$SRC/$_cross_file \
 		--prefix=/usr \
 		--libdir=/usr/lib32 \
 		--sysconfdir=/etc \
@@ -49,6 +50,6 @@ build() {
 
 	# indirect rendering symlink
 	ln -s libGLX_mesa.so.0 $PKG/usr/lib32/libGLX_indirect.so.0
-
-	rm -r $PKG/usr/{bin,include,share/{drirc.d,glvnd,vulkan/{explicit_layer.d,implicit_layer.d}}} || true
+	rm -r $PKG/usr/{include,share/{drirc.d,glvnd}}
+	rm -rf $PKG/usr/{bin,share/vulkan/{explicit_layer.d,implicit_layer.d}}
 }
diff --git a/mesa-32/x86-linux-gnu-ccache b/mesa-32/x86-linux-gnu-ccache
new file mode 100644
index 00000000..998b4774
--- /dev/null
+++ b/mesa-32/x86-linux-gnu-ccache
@@ -0,0 +1,19 @@
+[binaries]
+c = '/usr/lib/ccache/gcc'
+cpp = '/usr/lib/ccache/g++'
+ar = '/usr/bin/gcc-ar'
+strip = '/usr/bin/strip'
+pkgconfig = '/usr/bin/pkg-config'
+llvm-config = '/usr/bin/llvm-config-32'
+
+[properties]
+c_args = ['-m32']
+c_link_args = ['-m32']
+cpp_args = ['-m32']
+cpp_link_args = ['-m32']
+
+[host_machine]
+system = 'linux'
+cpu_family = 'x86'
+cpu = 'i686'
+endian = 'little'