Date: Saturday, December 31, 2022 @ 17:49:51
Author: heftig
Revision: 1372702
archrelease: copy trunk to multilib-staging-x86_64
Added:
lib32-mesa/repos/multilib-staging-x86_64/0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
(from rev 1372701,
lib32-mesa/trunk/0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch)
lib32-mesa/repos/multilib-staging-x86_64/LICENSE
(from rev 1372701, lib32-mesa/trunk/LICENSE)
lib32-mesa/repos/multilib-staging-x86_64/PKGBUILD
(from rev 1372701, lib32-mesa/trunk/PKGBUILD)
lib32-mesa/repos/multilib-staging-x86_64/keys/
Deleted:
lib32-mesa/repos/multilib-staging-x86_64/0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
lib32-mesa/repos/multilib-staging-x86_64/0003-d3d12-Don-t-crash-when-libd3d12.so-can-t-be-found.patch
lib32-mesa/repos/multilib-staging-x86_64/LICENSE
lib32-mesa/repos/multilib-staging-x86_64/PKGBUILD
lib32-mesa/repos/multilib-staging-x86_64/keys/
-----------------------------------------------------------------+
0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch | 104 +-
0003-d3d12-Don-t-crash-when-libd3d12.so-can-t-be-found.patch | 28
LICENSE | 166 +--
PKGBUILD | 490
+++++-----
4 files changed, 380 insertions(+), 408 deletions(-)
Deleted: 0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
===================================================================
--- 0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
2022-12-31 17:49:24 UTC (rev 1372701)
+++ 0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
2022-12-31 17:49:51 UTC (rev 1372702)
@@ -1,52 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Lionel Landwerlin <[email protected]>
-Date: Sun, 12 Jun 2022 23:59:05 +0300
-Subject: [PATCH] anv: force MEDIA_INTERFACE_DESCRIPTOR_LOAD reemit after
- 3D->GPGPU switch
-
-Seems to fix a hang in the following titles :
- - Age of Empire 4
- - Monster Hunter Rise
-
-where the HW is hung on a PIPE_CONTROL after a GPGPU_WALKER but no
-MEDIA_INTERFACE_DESCRIPTOR_LOAD was emitted since the switch from 3D
-to GPGPU.
-
-This would happen in the following case :
-
- vkCmdBindPipeline(COMPUTE, cs_pipeline);
- vkCmdDispatch(...);
- vkCmdBindPipeline(GRAPHICS, gfx_pipeline);
- vkCmdDraw(...);
- vkCmdDispatch(...);
-
-Signed-off-by: Lionel Landwerlin <[email protected]>
----
- src/intel/vulkan/genX_cmd_buffer.c | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/src/intel/vulkan/genX_cmd_buffer.c
b/src/intel/vulkan/genX_cmd_buffer.c
-index d56f9037fde1..e03dc16c1fc5 100644
---- a/src/intel/vulkan/genX_cmd_buffer.c
-+++ b/src/intel/vulkan/genX_cmd_buffer.c
-@@ -6001,6 +6001,20 @@ genX(flush_pipeline_select)(struct anv_cmd_buffer
*cmd_buffer,
- }
- #endif
-
-+#if GFX_VERx10 == 120
-+ /* Undocumented workaround to force the re-emission of
-+ * MEDIA_INTERFACE_DESCRIPTOR_LOAD when switching from 3D to Compute
-+ * pipeline without rebinding a pipeline :
-+ * vkCmdBindPipeline(COMPUTE, cs_pipeline);
-+ * vkCmdDispatch(...);
-+ * vkCmdBindPipeline(GRAPHICS, gfx_pipeline);
-+ * vkCmdDraw(...);
-+ * vkCmdDispatch(...);
-+ */
-+ if (pipeline == _3D)
-+ cmd_buffer->state.compute.pipeline_dirty = true;
-+#endif
-+
- /* From "BXML » GT » MI » vol1a GPU Overview » [Instruction]
- * PIPELINE_SELECT [DevBWR+]":
- *
Copied:
lib32-mesa/repos/multilib-staging-x86_64/0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
(from rev 1372701,
lib32-mesa/trunk/0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch)
===================================================================
--- 0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
(rev 0)
+++ 0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
2022-12-31 17:49:51 UTC (rev 1372702)
@@ -0,0 +1,52 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Lionel Landwerlin <[email protected]>
+Date: Sun, 12 Jun 2022 23:59:05 +0300
+Subject: [PATCH] anv: force MEDIA_INTERFACE_DESCRIPTOR_LOAD reemit after
+ 3D->GPGPU switch
+
+Seems to fix a hang in the following titles :
+ - Age of Empire 4
+ - Monster Hunter Rise
+
+where the HW is hung on a PIPE_CONTROL after a GPGPU_WALKER but no
+MEDIA_INTERFACE_DESCRIPTOR_LOAD was emitted since the switch from 3D
+to GPGPU.
+
+This would happen in the following case :
+
+ vkCmdBindPipeline(COMPUTE, cs_pipeline);
+ vkCmdDispatch(...);
+ vkCmdBindPipeline(GRAPHICS, gfx_pipeline);
+ vkCmdDraw(...);
+ vkCmdDispatch(...);
+
+Signed-off-by: Lionel Landwerlin <[email protected]>
+---
+ src/intel/vulkan/genX_cmd_buffer.c | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/src/intel/vulkan/genX_cmd_buffer.c
b/src/intel/vulkan/genX_cmd_buffer.c
+index 17629fb7ac87..1651c29d9ebd 100644
+--- a/src/intel/vulkan/genX_cmd_buffer.c
++++ b/src/intel/vulkan/genX_cmd_buffer.c
+@@ -6003,6 +6003,20 @@ genX(flush_pipeline_select)(struct anv_cmd_buffer
*cmd_buffer,
+ }
+ #endif
+
++#if GFX_VERx10 == 120
++ /* Undocumented workaround to force the re-emission of
++ * MEDIA_INTERFACE_DESCRIPTOR_LOAD when switching from 3D to Compute
++ * pipeline without rebinding a pipeline :
++ * vkCmdBindPipeline(COMPUTE, cs_pipeline);
++ * vkCmdDispatch(...);
++ * vkCmdBindPipeline(GRAPHICS, gfx_pipeline);
++ * vkCmdDraw(...);
++ * vkCmdDispatch(...);
++ */
++ if (pipeline == _3D)
++ cmd_buffer->state.compute.pipeline_dirty = true;
++#endif
++
+ /* From "BXML » GT » MI » vol1a GPU Overview » [Instruction]
+ * PIPELINE_SELECT [DevBWR+]":
+ *
Deleted: 0003-d3d12-Don-t-crash-when-libd3d12.so-can-t-be-found.patch
===================================================================
--- 0003-d3d12-Don-t-crash-when-libd3d12.so-can-t-be-found.patch
2022-12-31 17:49:24 UTC (rev 1372701)
+++ 0003-d3d12-Don-t-crash-when-libd3d12.so-can-t-be-found.patch
2022-12-31 17:49:51 UTC (rev 1372702)
@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <[email protected]>
-Date: Sun, 4 Dec 2022 00:17:57 +0000
-Subject: [PATCH] d3d12: Don't crash when libd3d12.so can't be found
-
-`d3d12_destroy_screen` is called by `d3d12_create_dxcore_screen` after
-`d3d12_init_screen_base` fails and attempts to call `util_dl_close` on
-a NULL pointer, leading to an abort.
-
-To fix this, only close the library after if it was actually opened.
----
- src/gallium/drivers/d3d12/d3d12_screen.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/gallium/drivers/d3d12/d3d12_screen.cpp
b/src/gallium/drivers/d3d12/d3d12_screen.cpp
-index 1cbe1fbdd5ec..c21c60e4a29c 100644
---- a/src/gallium/drivers/d3d12/d3d12_screen.cpp
-+++ b/src/gallium/drivers/d3d12/d3d12_screen.cpp
-@@ -741,7 +741,8 @@ d3d12_destroy_screen(struct d3d12_screen *screen)
- slab_destroy_parent(&screen->transfer_pool);
- mtx_destroy(&screen->submit_mutex);
- mtx_destroy(&screen->descriptor_pool_mutex);
-- util_dl_close(screen->d3d12_mod);
-+ if (screen->d3d12_mod)
-+ util_dl_close(screen->d3d12_mod);
- glsl_type_singleton_decref();
- FREE(screen);
- }
Deleted: LICENSE
===================================================================
--- LICENSE 2022-12-31 17:49:24 UTC (rev 1372701)
+++ LICENSE 2022-12-31 17:49:51 UTC (rev 1372702)
@@ -1,83 +0,0 @@
-The Mesa 3D Graphics Library
-
-Disclaimer
-
- Mesa is a 3-D graphics library with an API which is very similar to
- that of [1]OpenGL.* To the extent that Mesa utilizes the OpenGL command
- syntax or state machine, it is being used with authorization from
- [2]Silicon Graphics, Inc.(SGI). However, the author does not possess an
- OpenGL license from SGI, and makes no claim that Mesa is in any way a
- compatible replacement for OpenGL or associated with SGI. Those who
- want a licensed implementation of OpenGL should contact a licensed
- vendor.
-
- Please do not refer to the library as MesaGL (for legal reasons). It's
- just Mesa or The Mesa 3-D graphics library.
-
- * OpenGL is a trademark of [3]Silicon Graphics Incorporated.
-
-License / Copyright Information
-
- The Mesa distribution consists of several components. Different
- copyrights and licenses apply to different components. For example, the
- GLX client code uses the SGI Free Software License B, and some of the
- Mesa device drivers are copyrighted by their authors. See below for a
- list of Mesa's main components and the license for each.
-
- The core Mesa library is licensed according to the terms of the MIT
- license. This allows integration with the XFree86, Xorg and DRI
- projects.
-
- The default Mesa license is as follows:
-
-Copyright (C) 1999-2007 Brian Paul All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-Attention, Contributors
-
- When contributing to the Mesa project you must agree to the licensing
- terms of the component to which you're contributing. The following
- section lists the primary components of the Mesa distribution and their
- respective licenses.
-
-Mesa Component Licenses
-
-Component Location License
-------------------------------------------------------------------
-Main Mesa code src/mesa/ MIT
-
-Device drivers src/mesa/drivers/* MIT, generally
-
-Gallium code src/gallium/ MIT
-
-Ext headers include/GL/glext.h Khronos
- include/GL/glxext.h
-
-GLX client code src/glx/ SGI Free Software License B
-
-C11 thread include/c11/threads*.h Boost (permissive) emulation
-
- In general, consult the source files for license terms.
-
-References
-
- 1. https://www.opengl.org/
- 2. https://www.sgi.com/
- 3. https://www.sgi.com/
Copied: lib32-mesa/repos/multilib-staging-x86_64/LICENSE (from rev 1372701,
lib32-mesa/trunk/LICENSE)
===================================================================
--- LICENSE (rev 0)
+++ LICENSE 2022-12-31 17:49:51 UTC (rev 1372702)
@@ -0,0 +1,83 @@
+The Mesa 3D Graphics Library
+
+Disclaimer
+
+ Mesa is a 3-D graphics library with an API which is very similar to
+ that of [1]OpenGL.* To the extent that Mesa utilizes the OpenGL command
+ syntax or state machine, it is being used with authorization from
+ [2]Silicon Graphics, Inc.(SGI). However, the author does not possess an
+ OpenGL license from SGI, and makes no claim that Mesa is in any way a
+ compatible replacement for OpenGL or associated with SGI. Those who
+ want a licensed implementation of OpenGL should contact a licensed
+ vendor.
+
+ Please do not refer to the library as MesaGL (for legal reasons). It's
+ just Mesa or The Mesa 3-D graphics library.
+
+ * OpenGL is a trademark of [3]Silicon Graphics Incorporated.
+
+License / Copyright Information
+
+ The Mesa distribution consists of several components. Different
+ copyrights and licenses apply to different components. For example, the
+ GLX client code uses the SGI Free Software License B, and some of the
+ Mesa device drivers are copyrighted by their authors. See below for a
+ list of Mesa's main components and the license for each.
+
+ The core Mesa library is licensed according to the terms of the MIT
+ license. This allows integration with the XFree86, Xorg and DRI
+ projects.
+
+ The default Mesa license is as follows:
+
+Copyright (C) 1999-2007 Brian Paul All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+Attention, Contributors
+
+ When contributing to the Mesa project you must agree to the licensing
+ terms of the component to which you're contributing. The following
+ section lists the primary components of the Mesa distribution and their
+ respective licenses.
+
+Mesa Component Licenses
+
+Component Location License
+------------------------------------------------------------------
+Main Mesa code src/mesa/ MIT
+
+Device drivers src/mesa/drivers/* MIT, generally
+
+Gallium code src/gallium/ MIT
+
+Ext headers include/GL/glext.h Khronos
+ include/GL/glxext.h
+
+GLX client code src/glx/ SGI Free Software License B
+
+C11 thread include/c11/threads*.h Boost (permissive) emulation
+
+ In general, consult the source files for license terms.
+
+References
+
+ 1. https://www.opengl.org/
+ 2. https://www.sgi.com/
+ 3. https://www.sgi.com/
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-12-31 17:49:24 UTC (rev 1372701)
+++ PKGBUILD 2022-12-31 17:49:51 UTC (rev 1372702)
@@ -1,245 +0,0 @@
-# Maintainer: Laurent Carlier <[email protected]>
-# Maintainer: Felix Yan <[email protected]>
-# Contributor: Jan de Groot <[email protected]>
-# Contributor: Andreas Radke <[email protected]>
-
-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.1
-pkgrel=3
-arch=('x86_64')
-makedepends=('python-mako' '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' 'libclc' 'clang' 'lib32-clang' 'lib32-libglvnd'
'lib32-libunwind'
- 'lib32-lm_sensors' 'lib32-libxrandr' 'lib32-vulkan-icd-loader'
'lib32-systemd'
- 'glslang' 'cmake' 'meson')
-url="https://www.mesa3d.org/";
-license=('custom')
-options=('debug' '!lto')
-source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
- 0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
- LICENSE)
-sha512sums=('8a7aee67f6351de293d23425229eb7c42d6918fe9ffb46c6e5df9609f79633c98ab78e892507fe48055c51fa88bf103d7b7baa58e826b1758f66067048baed5b'
- 'SKIP'
-
'ccdc1e367262338073b078f80795143026d08fa3fb720afda968907e1b4fa3b12e44edb441d3e17f6836f631319d1f1c3112699bea67014c3cf911fb9a816a3b'
-
'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7')
-validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov
<[email protected]>
- '946D09B5E4C9845E63075FF1D961C596A7203456' # Andres Gomez
<[email protected]>
- 'E3E8F480C52ADD73B278EE78E1ECBE07D7D70895' # Juan Antonio
Suárez Romero (Igalia, S.L.) <[email protected]>
- 'A5CC9FEC93F2F837CB044912336909B6B25FADFA' # Juan A. Suarez
Romero <[email protected]>
- '71C4B75620BC75708B4BDB254C95FAAB3EB073EC' # Dylan Baker
<[email protected]>
- '57551DE15B968F6341C248F68D8E31AFC32428A6') # Eric Engestrom
<[email protected]>
-
-prepare() {
- cd mesa-$pkgver
-
- # https://gitlab.freedesktop.org/mesa/mesa/-/issues/7111
- # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17247
- # https://github.com/HansKristian-Work/vkd3d-proton/issues/1200
- patch -Np1 -i
../0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
-}
-
-build() {
- # Build only minimal debug info to reduce size
- CFLAGS+=' -g1'
- CXXFLAGS+=' -g1'
-
- 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
-
- # 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 \
- -D platforms=x11,wayland \
- -D
gallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,swrast,i915,iris,crocus,zink
\
- -D vulkan-drivers=amd,intel,intel_hasvk,virtio-experimental \
- -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=icd \
- -D gallium-va=enabled \
- -D gallium-vdpau=enabled \
- -D gallium-xa=enabled \
- -D gbm=enabled \
- -D gles1=disabled \
- -D gles2=enabled \
- -D glvnd=true \
- -D glx=dri \
- -D libunwind=enabled \
- -D llvm=enabled \
- -D lmsensors=enabled \
- -D osmesa=true \
- -D shared-glapi=enabled \
- -D microsoft-clc=disabled \
- -D video-codecs=vc1dec,h264dec,h264enc,h265dec,h265enc \
- -D valgrind=disabled
-
- # Print config
- meson configure build
-
- ninja -C build
- meson compile -C build
-
- # fake installation to be seperated into packages
- # outside of fakeroot but mesa doesn't need to chown/mod
- DESTDIR="${srcdir}/fakeinstall" meson install -C build
-}
-
-_install() {
- local src f dir
- for src; do
- f="${src#fakeinstall/}"
- dir="${pkgdir}/${f%/*}"
- install -m755 -d "${dir}"
- mv -v "${src}" "${dir}/"
- done
-}
-
-package_lib32-vulkan-mesa-layers() {
- pkgdesc="Mesa's Vulkan layers (32-bit)"
- depends=('lib32-libdrm' 'lib32-libxcb' 'lib32-wayland')
- depends+=('vulkan-mesa-layers')
- conflicts=('lib32-vulkan-mesa-layer')
- replaces=('lib32-vulkan-mesa-layer')
-
- rm -rv fakeinstall/usr/share/vulkan/explicit_layer.d
- rm -rv fakeinstall/usr/share/vulkan/implicit_layer.d
- rm -rv fakeinstall/usr/bin/mesa-overlay-control.py
-
- _install fakeinstall/usr/lib32/libVkLayer_*.so
-
- install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_lib32-opencl-mesa() {
- pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers (32-bit)"
- depends=('lib32-expat' 'lib32-libdrm' 'lib32-libelf' 'lib32-clang'
'lib32-zstd')
- depends+=('opencl-mesa')
- optdepends=('opencl-headers: headers necessary for OpenCL development')
- provides=('lib32-opencl-driver')
-
- rm -rv fakeinstall/etc/OpenCL
- _install fakeinstall/usr/lib32/lib*OpenCL*
- _install fakeinstall/usr/lib32/gallium-pipe
-
- install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_lib32-vulkan-intel() {
- pkgdesc="Intel's Vulkan mesa driver (32-bit)"
- depends=('lib32-wayland' 'lib32-libx11' 'lib32-libxshmfence' 'lib32-libdrm'
'lib32-zstd'
- 'lib32-systemd')
- optdepends=('lib32-vulkan-mesa-layers: additional vulkan layers')
- provides=('lib32-vulkan-driver')
-
- _install fakeinstall/usr/share/vulkan/icd.d/intel_*.json
- _install fakeinstall/usr/lib32/libvulkan_intel*.so
-
- install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_lib32-vulkan-radeon() {
- pkgdesc="Radeon's Vulkan mesa driver (32-bit)"
- depends=('lib32-wayland' 'lib32-libx11' 'lib32-libxshmfence' 'lib32-libelf'
'lib32-libdrm'
- 'lib32-zstd' 'lib32-llvm-libs' 'lib32-systemd')
- depends+=('vulkan-radeon')
- optdepends=('lib32-vulkan-mesa-layers: additional vulkan layers')
- provides=('lib32-vulkan-driver')
-
- _install fakeinstall/usr/share/vulkan/icd.d/radeon_icd*.json
- _install fakeinstall/usr/lib32/libvulkan_radeon.so
-
- install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_lib32-vulkan-virtio() {
- pkgdesc="Venus Vulkan mesa driver (32-bit)"
- depends=('lib32-wayland' 'lib32-libx11' 'lib32-libxshmfence' 'lib32-libdrm'
'lib32-zstd'
- 'lib32-systemd')
- optdepends=('lib32-vulkan-mesa-layers: additional vulkan layers')
- provides=('lib32-vulkan-driver')
-
- _install fakeinstall/usr/share/vulkan/icd.d/virtio_icd*.json
- _install fakeinstall/usr/lib32/libvulkan_virtio.so
-
- install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_lib32-libva-mesa-driver() {
- pkgdesc="VA-API implementation for gallium (32-bit)"
- depends=('lib32-libdrm' 'lib32-libx11' 'lib32-llvm-libs' 'lib32-expat'
'lib32-libelf'
- 'lib32-libxshmfence' 'lib32-zstd')
- provides=('lib32-libva-driver')
-
- _install fakeinstall/usr/lib32/dri/*_drv_video.so
-
- install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_lib32-mesa-vdpau() {
- pkgdesc="Mesa VDPAU drivers (32-bit)"
- depends=('lib32-libdrm' 'lib32-libx11' 'lib32-llvm-libs' 'lib32-expat'
'lib32-libelf'
- 'lib32-libxshmfence' 'lib32-zstd')
- provides=('lib32-vdpau-driver')
-
- _install fakeinstall/usr/lib32/vdpau
-
- install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_lib32-mesa() {
- 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+=('mesa')
- optdepends=('opengl-man-pages: for the OpenGL API man pages'
- 'lib32-mesa-vdpau: for accelerated video playback'
- 'lib32-libva-mesa-driver: for accelerated video playback')
- provides=('lib32-mesa-libgl' 'lib32-opengl-driver')
- conflicts=('lib32-mesa-libgl')
- replaces=('lib32-mesa-libgl')
-
- rm -rv fakeinstall/usr/share/drirc.d/00-mesa-defaults.conf
- rm -rv fakeinstall/usr/share/drirc.d/00-radv-defaults.conf
- rm -rv fakeinstall/usr/share/glvnd/egl_vendor.d/50_mesa.json
-
- # 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*
- _install fakeinstall/usr/lib32/libxatracker.so*
- #_install fakeinstall/usr/lib32/libswrAVX*.so*
-
- rm -rv fakeinstall/usr/include
- _install fakeinstall/usr/lib32/pkgconfig
-
- # libglvnd support
- _install fakeinstall/usr/lib32/libGLX_mesa.so*
- _install fakeinstall/usr/lib32/libEGL_mesa.so*
-
- # indirect rendering
- ln -s /usr/lib32/libGLX_mesa.so.0 "${pkgdir}/usr/lib32/libGLX_indirect.so.0"
-
- # make sure there are no files left to install
- find fakeinstall -depth -print0 | xargs -0 rmdir
-
- install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
Copied: lib32-mesa/repos/multilib-staging-x86_64/PKGBUILD (from rev 1372701,
lib32-mesa/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-12-31 17:49:51 UTC (rev 1372702)
@@ -0,0 +1,245 @@
+# Maintainer: Laurent Carlier <[email protected]>
+# Maintainer: Felix Yan <[email protected]>
+# Contributor: Jan de Groot <[email protected]>
+# Contributor: Andreas Radke <[email protected]>
+
+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.2
+pkgrel=2
+arch=('x86_64')
+makedepends=('python-mako' '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' 'libclc' 'clang' 'lib32-clang' 'lib32-libglvnd'
'lib32-libunwind'
+ 'lib32-lm_sensors' 'lib32-libxrandr' 'lib32-vulkan-icd-loader'
'lib32-systemd'
+ 'glslang' 'cmake' 'meson')
+url="https://www.mesa3d.org/";
+license=('custom')
+options=('debug' '!lto')
+source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
+ 0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
+ LICENSE)
+sha512sums=('32934dd23cfcd6165c365597d9a469da0b806b72ea98a200f499344c3b47815db3bf78875b4ea766d2d28d9c70b50c1615d2d3fcbfd4769447fe0a9d3b32951f'
+ 'SKIP'
+
'd02f3fd44cf95b7dbfd607a58b764bd79d02b8b8586acd37bd4b2340aea171410b2b5eda7eab5c5d2c87bbf512e2322d5468f95aab0bfedeabc5367ebdee3b1d'
+
'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7')
+validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov
<[email protected]>
+ '946D09B5E4C9845E63075FF1D961C596A7203456' # Andres Gomez
<[email protected]>
+ 'E3E8F480C52ADD73B278EE78E1ECBE07D7D70895' # Juan Antonio
Suárez Romero (Igalia, S.L.) <[email protected]>
+ 'A5CC9FEC93F2F837CB044912336909B6B25FADFA' # Juan A. Suarez
Romero <[email protected]>
+ '71C4B75620BC75708B4BDB254C95FAAB3EB073EC' # Dylan Baker
<[email protected]>
+ '57551DE15B968F6341C248F68D8E31AFC32428A6') # Eric Engestrom
<[email protected]>
+
+prepare() {
+ cd mesa-$pkgver
+
+ # https://gitlab.freedesktop.org/mesa/mesa/-/issues/7111
+ # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17247
+ # https://github.com/HansKristian-Work/vkd3d-proton/issues/1200
+ patch -Np1 -i
../0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
+}
+
+build() {
+ # Build only minimal debug info to reduce size
+ CFLAGS+=' -g1'
+ CXXFLAGS+=' -g1'
+
+ 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
+
+ # 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 \
+ -D platforms=x11,wayland \
+ -D
gallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,swrast,i915,iris,crocus,zink
\
+ -D vulkan-drivers=amd,intel,intel_hasvk,virtio-experimental \
+ -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=icd \
+ -D gallium-va=enabled \
+ -D gallium-vdpau=enabled \
+ -D gallium-xa=enabled \
+ -D gbm=enabled \
+ -D gles1=disabled \
+ -D gles2=enabled \
+ -D glvnd=true \
+ -D glx=dri \
+ -D libunwind=enabled \
+ -D llvm=enabled \
+ -D lmsensors=enabled \
+ -D osmesa=true \
+ -D shared-glapi=enabled \
+ -D microsoft-clc=disabled \
+ -D video-codecs=vc1dec,h264dec,h264enc,h265dec,h265enc \
+ -D valgrind=disabled
+
+ # Print config
+ meson configure build
+
+ ninja -C build
+ meson compile -C build
+
+ # fake installation to be seperated into packages
+ # outside of fakeroot but mesa doesn't need to chown/mod
+ DESTDIR="${srcdir}/fakeinstall" meson install -C build
+}
+
+_install() {
+ local src f dir
+ for src; do
+ f="${src#fakeinstall/}"
+ dir="${pkgdir}/${f%/*}"
+ install -m755 -d "${dir}"
+ mv -v "${src}" "${dir}/"
+ done
+}
+
+package_lib32-vulkan-mesa-layers() {
+ pkgdesc="Mesa's Vulkan layers (32-bit)"
+ depends=('lib32-libdrm' 'lib32-libxcb' 'lib32-wayland')
+ depends+=('vulkan-mesa-layers')
+ conflicts=('lib32-vulkan-mesa-layer')
+ replaces=('lib32-vulkan-mesa-layer')
+
+ rm -rv fakeinstall/usr/share/vulkan/explicit_layer.d
+ rm -rv fakeinstall/usr/share/vulkan/implicit_layer.d
+ rm -rv fakeinstall/usr/bin/mesa-overlay-control.py
+
+ _install fakeinstall/usr/lib32/libVkLayer_*.so
+
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
+
+package_lib32-opencl-mesa() {
+ pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers (32-bit)"
+ depends=('lib32-expat' 'lib32-libdrm' 'lib32-libelf' 'lib32-clang'
'lib32-zstd')
+ depends+=('opencl-mesa')
+ optdepends=('opencl-headers: headers necessary for OpenCL development')
+ provides=('lib32-opencl-driver')
+
+ rm -rv fakeinstall/etc/OpenCL
+ _install fakeinstall/usr/lib32/lib*OpenCL*
+ _install fakeinstall/usr/lib32/gallium-pipe
+
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
+
+package_lib32-vulkan-intel() {
+ pkgdesc="Intel's Vulkan mesa driver (32-bit)"
+ depends=('lib32-wayland' 'lib32-libx11' 'lib32-libxshmfence' 'lib32-libdrm'
'lib32-zstd'
+ 'lib32-systemd')
+ optdepends=('lib32-vulkan-mesa-layers: additional vulkan layers')
+ provides=('lib32-vulkan-driver')
+
+ _install fakeinstall/usr/share/vulkan/icd.d/intel_*.json
+ _install fakeinstall/usr/lib32/libvulkan_intel*.so
+
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
+
+package_lib32-vulkan-radeon() {
+ pkgdesc="Radeon's Vulkan mesa driver (32-bit)"
+ depends=('lib32-wayland' 'lib32-libx11' 'lib32-libxshmfence' 'lib32-libelf'
'lib32-libdrm'
+ 'lib32-zstd' 'lib32-llvm-libs' 'lib32-systemd')
+ depends+=('vulkan-radeon')
+ optdepends=('lib32-vulkan-mesa-layers: additional vulkan layers')
+ provides=('lib32-vulkan-driver')
+
+ _install fakeinstall/usr/share/vulkan/icd.d/radeon_icd*.json
+ _install fakeinstall/usr/lib32/libvulkan_radeon.so
+
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
+
+package_lib32-vulkan-virtio() {
+ pkgdesc="Venus Vulkan mesa driver (32-bit)"
+ depends=('lib32-wayland' 'lib32-libx11' 'lib32-libxshmfence' 'lib32-libdrm'
'lib32-zstd'
+ 'lib32-systemd')
+ optdepends=('lib32-vulkan-mesa-layers: additional vulkan layers')
+ provides=('lib32-vulkan-driver')
+
+ _install fakeinstall/usr/share/vulkan/icd.d/virtio_icd*.json
+ _install fakeinstall/usr/lib32/libvulkan_virtio.so
+
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
+
+package_lib32-libva-mesa-driver() {
+ pkgdesc="VA-API implementation for gallium (32-bit)"
+ depends=('lib32-libdrm' 'lib32-libx11' 'lib32-llvm-libs' 'lib32-expat'
'lib32-libelf'
+ 'lib32-libxshmfence' 'lib32-zstd')
+ provides=('lib32-libva-driver')
+
+ _install fakeinstall/usr/lib32/dri/*_drv_video.so
+
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
+
+package_lib32-mesa-vdpau() {
+ pkgdesc="Mesa VDPAU drivers (32-bit)"
+ depends=('lib32-libdrm' 'lib32-libx11' 'lib32-llvm-libs' 'lib32-expat'
'lib32-libelf'
+ 'lib32-libxshmfence' 'lib32-zstd')
+ provides=('lib32-vdpau-driver')
+
+ _install fakeinstall/usr/lib32/vdpau
+
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
+
+package_lib32-mesa() {
+ 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+=('mesa')
+ optdepends=('opengl-man-pages: for the OpenGL API man pages'
+ 'lib32-mesa-vdpau: for accelerated video playback'
+ 'lib32-libva-mesa-driver: for accelerated video playback')
+ provides=('lib32-mesa-libgl' 'lib32-opengl-driver')
+ conflicts=('lib32-mesa-libgl')
+ replaces=('lib32-mesa-libgl')
+
+ rm -rv fakeinstall/usr/share/drirc.d/00-mesa-defaults.conf
+ rm -rv fakeinstall/usr/share/drirc.d/00-radv-defaults.conf
+ rm -rv fakeinstall/usr/share/glvnd/egl_vendor.d/50_mesa.json
+
+ # 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*
+ _install fakeinstall/usr/lib32/libxatracker.so*
+ #_install fakeinstall/usr/lib32/libswrAVX*.so*
+
+ rm -rv fakeinstall/usr/include
+ _install fakeinstall/usr/lib32/pkgconfig
+
+ # libglvnd support
+ _install fakeinstall/usr/lib32/libGLX_mesa.so*
+ _install fakeinstall/usr/lib32/libEGL_mesa.so*
+
+ # indirect rendering
+ ln -s /usr/lib32/libGLX_mesa.so.0 "${pkgdir}/usr/lib32/libGLX_indirect.so.0"
+
+ # make sure there are no files left to install
+ find fakeinstall -depth -print0 | xargs -0 rmdir
+
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
