Date: Saturday, February 18, 2023 @ 18:44:39
Author: heftig
Revision: 1402939
22.3.5-1
Modified:
lib32-mesa/trunk/0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
lib32-mesa/trunk/0002-iris-Retry-DRM_IOCTL_I915_GEM_EXECBUFFER2-on-ENOMEM.patch
lib32-mesa/trunk/0003-Revert-iris-Avoid-abort-if-kernel-can-t-allocate-mem.patch
lib32-mesa/trunk/PKGBUILD
-----------------------------------------------------------------+
0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch | 4 +-
0002-iris-Retry-DRM_IOCTL_I915_GEM_EXECBUFFER2-on-ENOMEM.patch | 6 +--
0003-Revert-iris-Avoid-abort-if-kernel-can-t-allocate-mem.patch | 4 +-
PKGBUILD | 20
++++------
4 files changed, 16 insertions(+), 18 deletions(-)
Modified: 0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
===================================================================
--- 0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
2023-02-18 18:39:33 UTC (rev 1402938)
+++ 0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
2023-02-18 18:44:39 UTC (rev 1402939)
@@ -26,10 +26,10 @@
1 file changed, 14 insertions(+)
diff --git a/src/intel/vulkan/genX_cmd_buffer.c
b/src/intel/vulkan/genX_cmd_buffer.c
-index 6e4ecbe5939b..700b824e3e8f 100644
+index 594b2e595139..4529cd3826fc 100644
--- a/src/intel/vulkan/genX_cmd_buffer.c
+++ b/src/intel/vulkan/genX_cmd_buffer.c
-@@ -6030,6 +6030,20 @@ genX(flush_pipeline_select)(struct anv_cmd_buffer
*cmd_buffer,
+@@ -6039,6 +6039,20 @@ genX(flush_pipeline_select)(struct anv_cmd_buffer
*cmd_buffer,
}
#endif
Modified: 0002-iris-Retry-DRM_IOCTL_I915_GEM_EXECBUFFER2-on-ENOMEM.patch
===================================================================
--- 0002-iris-Retry-DRM_IOCTL_I915_GEM_EXECBUFFER2-on-ENOMEM.patch
2023-02-18 18:39:33 UTC (rev 1402938)
+++ 0002-iris-Retry-DRM_IOCTL_I915_GEM_EXECBUFFER2-on-ENOMEM.patch
2023-02-18 18:44:39 UTC (rev 1402939)
@@ -18,13 +18,13 @@
flipped, iris_get_query_result() can proceed normally.
Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/6851
-(cherry picked from commit 35462bab70db7312b2960796344c37738c93ce91)
+(cherry picked from commit 3b38add239795fa5fe97ae37e6ec62cab4f1f968)
---
src/gallium/drivers/iris/iris_batch.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/gallium/drivers/iris/iris_batch.c
b/src/gallium/drivers/iris/iris_batch.c
-index ec32d88cc9bc..65261e371b20 100644
+index d598fd701fbd..9ea1ea3f10e7 100644
--- a/src/gallium/drivers/iris/iris_batch.c
+++ b/src/gallium/drivers/iris/iris_batch.c
@@ -987,9 +987,14 @@ submit_batch(struct iris_batch *batch)
@@ -40,7 +40,7 @@
+ } while (ret && errno == ENOMEM);
+
+ if (ret)
-+ ret = -errno;
++ ret = -errno;
+ }
simple_mtx_unlock(bo_deps_lock);
Modified: 0003-Revert-iris-Avoid-abort-if-kernel-can-t-allocate-mem.patch
===================================================================
--- 0003-Revert-iris-Avoid-abort-if-kernel-can-t-allocate-mem.patch
2023-02-18 18:39:33 UTC (rev 1402938)
+++ 0003-Revert-iris-Avoid-abort-if-kernel-can-t-allocate-mem.patch
2023-02-18 18:44:39 UTC (rev 1402939)
@@ -8,13 +8,13 @@
Now ENOMEM is handled in submit_batch(), we don't need to check it for
resetting anymore.
-(cherry picked from commit af935f451f7437ab86235903da8fefb71f0d4bb7)
+(cherry picked from commit e6add12416315b77a420dc8ccb59307ada663a1d)
---
src/gallium/drivers/iris/iris_batch.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/gallium/drivers/iris/iris_batch.c
b/src/gallium/drivers/iris/iris_batch.c
-index 65261e371b20..d9023efeab21 100644
+index 9ea1ea3f10e7..32bddb72b933 100644
--- a/src/gallium/drivers/iris/iris_batch.c
+++ b/src/gallium/drivers/iris/iris_batch.c
@@ -1103,9 +1103,8 @@ _iris_batch_flush(struct iris_batch *batch, const char
*file, int line)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2023-02-18 18:39:33 UTC (rev 1402938)
+++ PKGBUILD 2023-02-18 18:44:39 UTC (rev 1402939)
@@ -6,7 +6,7 @@
pkgbase=lib32-mesa
pkgname=('lib32-vulkan-mesa-layers' 'lib32-opencl-mesa' 'lib32-vulkan-intel'
'lib32-vulkan-radeon' 'lib32-vulkan-virtio' 'lib32-libva-mesa-driver'
'lib32-mesa-vdpau' 'lib32-mesa')
pkgdesc="An open-source implementation of the OpenGL specification (32-bit)"
-pkgver=22.3.4
+pkgver=22.3.5
pkgrel=1
arch=('x86_64')
makedepends=('python-mako' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11'
'xorgproto' 'lib32-libdrm'
@@ -23,11 +23,11 @@
0002-iris-Retry-DRM_IOCTL_I915_GEM_EXECBUFFER2-on-ENOMEM.patch
0003-Revert-iris-Avoid-abort-if-kernel-can-t-allocate-mem.patch
LICENSE)
-sha512sums=('6af340153244d3e95d0e155a45d6db134335654d62590797ae0ef6ba44c2ccfe91ebf95f70ff82c67cee108ac35536767b1f6848d6d1129f52eb9e8414ee321d'
+sha512sums=('a4cad9b7e6501678fac279bd88a37e522633c7128afa8df04982f469c930e3557bb1d05b4b0f5ae16704d8d04e50c90a7489943a48861df17dd947704c329b85'
'SKIP'
-
'64f55c8fbb53c6cdf4a2898d8fc633e37a9f5b71284c222030914dedbddd0a712969378f3e7dc336c5e6349d5dd3d2e117e4ff5d83a9336847a20a1bd0dc09bb'
-
'f0dfde13bd7c08ece286c04c67729ec86e60dd61730a947c7bef19605303f413e3a125eec6081a40ef8fc15b7571aef2b8e42fe0bece9c53de4e5774783e48b4'
-
'6f5ff5185815c878999a4aa2f6b8251a68403c6755de9f58f89332251e04658729af7d9570761b2dc1367c5e33e2cce22b7e7199dcf6a64717e704034db6f8c0'
+
'44981f1f86b72eec0a358d1764546443a7e6734a074e1e15929dc4312fe660eab1a04b8a8359c5f57b6f5815cbe149677f5b3f0e3919112e78c6ec1f64a97b61'
+
'c181cc258a3a96817f9733be53e0ddf3f5b093ec8d7b731e37c095077c1b423d13ddb902993e1056aed29c4163421e4873b64f7593ef5e39d8cba11516651724'
+
'4f3ef686b2244c5da033596336bdffa42f9f55061be7125cba47a5ae3c16037523d1ba9d17269d141498b8ad2e020f25d9d778fdf307329809fc25d30d59c470'
'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7')
validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov
<[email protected]>
'946D09B5E4C9845E63075FF1D961C596A7203456' # Andres Gomez
<[email protected]>
@@ -58,15 +58,11 @@
export CC="gcc -m32"
export CXX="g++ -m32"
export PKG_CONFIG="i686-pc-linux-gnu-pkg-config"
- cat >crossfile.ini <<END
-[binaries]
-llvm-config = '/usr/bin/llvm-config32'
-END
+ export LLVM_CONFIG="llvm-config32"
# swr driver is broken with some cpu see FS#66972
arch-meson mesa-$pkgver build \
- --native-file crossfile.ini \
--libdir=/usr/lib32 \
-D b_ndebug=true \
-D b_lto=false \
@@ -192,6 +188,7 @@
pkgdesc="VA-API implementation for gallium (32-bit)"
depends=('lib32-libdrm' 'lib32-libx11' 'lib32-llvm-libs' 'lib32-expat'
'lib32-libelf'
'lib32-libxshmfence' 'lib32-zstd')
+ depends+=('libexpat.so')
provides=('lib32-libva-driver')
_install fakeinstall/usr/lib32/dri/*_drv_video.so
@@ -203,6 +200,7 @@
pkgdesc="Mesa VDPAU drivers (32-bit)"
depends=('lib32-libdrm' 'lib32-libx11' 'lib32-llvm-libs' 'lib32-expat'
'lib32-libelf'
'lib32-libxshmfence' 'lib32-zstd')
+ depends+=('libexpat.so')
provides=('lib32-vdpau-driver')
_install fakeinstall/usr/lib32/vdpau
@@ -214,7 +212,7 @@
depends=('lib32-libdrm' 'lib32-wayland' 'lib32-libxxf86vm'
'lib32-libxdamage' 'lib32-libxshmfence'
'lib32-libelf' 'lib32-libunwind' 'lib32-llvm-libs'
'lib32-lm_sensors' 'lib32-libglvnd'
'lib32-zstd' 'lib32-vulkan-icd-loader')
- depends+=('libsensors.so')
+ depends+=('libsensors.so' 'libexpat.so')
depends+=('mesa')
optdepends=('opengl-man-pages: for the OpenGL API man pages'
'lib32-mesa-vdpau: for accelerated video playback'
