Date: Monday, April 3, 2023 @ 20:22:30
Author: heftig
Revision: 1434421
archrelease: copy trunk to multilib-x86_64
Added:
lib32-mesa/repos/multilib-x86_64/0001-iris-Retry-DRM_IOCTL_I915_GEM_EXECBUFFER2-on-ENOMEM.patch
(from rev 1434420,
lib32-mesa/trunk/0001-iris-Retry-DRM_IOCTL_I915_GEM_EXECBUFFER2-on-ENOMEM.patch)
lib32-mesa/repos/multilib-x86_64/0002-Revert-iris-Avoid-abort-if-kernel-can-t-allocate-mem.patch
(from rev 1434420,
lib32-mesa/trunk/0002-Revert-iris-Avoid-abort-if-kernel-can-t-allocate-mem.patch)
lib32-mesa/repos/multilib-x86_64/0003-intel-fs-fix-scheduling-of-HALT-instructions.patch
(from rev 1434420,
lib32-mesa/trunk/0003-intel-fs-fix-scheduling-of-HALT-instructions.patch)
lib32-mesa/repos/multilib-x86_64/LICENSE
(from rev 1434420, lib32-mesa/trunk/LICENSE)
lib32-mesa/repos/multilib-x86_64/PKGBUILD
(from rev 1434420, lib32-mesa/trunk/PKGBUILD)
lib32-mesa/repos/multilib-x86_64/keys/
Deleted:
lib32-mesa/repos/multilib-x86_64/0001-iris-Retry-DRM_IOCTL_I915_GEM_EXECBUFFER2-on-ENOMEM.patch
lib32-mesa/repos/multilib-x86_64/0002-Revert-iris-Avoid-abort-if-kernel-can-t-allocate-mem.patch
lib32-mesa/repos/multilib-x86_64/LICENSE
lib32-mesa/repos/multilib-x86_64/PKGBUILD
lib32-mesa/repos/multilib-x86_64/keys/
-----------------------------------------------------------------+
0001-iris-Retry-DRM_IOCTL_I915_GEM_EXECBUFFER2-on-ENOMEM.patch | 102 +-
0002-Revert-iris-Avoid-abort-if-kernel-can-t-allocate-mem.patch | 68 -
0003-intel-fs-fix-scheduling-of-HALT-instructions.patch | 130 ++
LICENSE | 166 +--
PKGBUILD | 503
+++++-----
5 files changed, 553 insertions(+), 416 deletions(-)
Deleted: 0001-iris-Retry-DRM_IOCTL_I915_GEM_EXECBUFFER2-on-ENOMEM.patch
===================================================================
--- 0001-iris-Retry-DRM_IOCTL_I915_GEM_EXECBUFFER2-on-ENOMEM.patch
2023-04-03 20:22:14 UTC (rev 1434420)
+++ 0001-iris-Retry-DRM_IOCTL_I915_GEM_EXECBUFFER2-on-ENOMEM.patch
2023-04-03 20:22:30 UTC (rev 1434421)
@@ -1,51 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Kai-Heng Feng <[email protected]>
-Date: Thu, 29 Dec 2022 13:43:27 +0800
-Subject: [PATCH] iris: Retry DRM_IOCTL_I915_GEM_EXECBUFFER2 on ENOMEM
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We are seeing endless DRM_IOCTL_SYNCOBJ_WAIT ioctl when system memory is
-under pressured.
-
-Commit f9d8d9acbb6a ("iris: Avoid abort() if kernel can't allocate
-memory") avoids the abort() on ENOMEM by resetting the batch. However,
-when there's an ongoing OpenGL query, resetting the batch will make the
-snapshots_landed never be flipped, so iris_get_query_result() gets stuck
-in the while loop forever.
-
-Since there's no guarantee that the next batch after resetting won't hit
-ENOMEM, so instead of resetting the batch, be patient and wait until kernel has
-enough memory. Once the batch is submiited and snapshots_landed gets
-flipped, iris_get_query_result() can proceed normally.
-
-Reviewed-by: José Roberto de Souza <[email protected]>
-Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/6851
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20449>
----
- 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 c7a08a0e1f5f..deab85ce4aaf 100644
---- a/src/gallium/drivers/iris/iris_batch.c
-+++ b/src/gallium/drivers/iris/iris_batch.c
-@@ -981,9 +981,14 @@ submit_batch(struct iris_batch *batch)
- }
-
- int ret = 0;
-- if (!batch->screen->devinfo->no_hw &&
-- intel_ioctl(batch->screen->fd, DRM_IOCTL_I915_GEM_EXECBUFFER2,
&execbuf))
-- ret = -errno;
-+ if (!batch->screen->devinfo->no_hw) {
-+ do {
-+ ret = intel_ioctl(batch->screen->fd, DRM_IOCTL_I915_GEM_EXECBUFFER2,
&execbuf);
-+ } while (ret && errno == ENOMEM);
-+
-+ if (ret)
-+ ret = -errno;
-+ }
-
- simple_mtx_unlock(bo_deps_lock);
-
Copied:
lib32-mesa/repos/multilib-x86_64/0001-iris-Retry-DRM_IOCTL_I915_GEM_EXECBUFFER2-on-ENOMEM.patch
(from rev 1434420,
lib32-mesa/trunk/0001-iris-Retry-DRM_IOCTL_I915_GEM_EXECBUFFER2-on-ENOMEM.patch)
===================================================================
--- 0001-iris-Retry-DRM_IOCTL_I915_GEM_EXECBUFFER2-on-ENOMEM.patch
(rev 0)
+++ 0001-iris-Retry-DRM_IOCTL_I915_GEM_EXECBUFFER2-on-ENOMEM.patch
2023-04-03 20:22:30 UTC (rev 1434421)
@@ -0,0 +1,51 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Kai-Heng Feng <[email protected]>
+Date: Thu, 29 Dec 2022 13:43:27 +0800
+Subject: [PATCH] iris: Retry DRM_IOCTL_I915_GEM_EXECBUFFER2 on ENOMEM
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We are seeing endless DRM_IOCTL_SYNCOBJ_WAIT ioctl when system memory is
+under pressured.
+
+Commit f9d8d9acbb6a ("iris: Avoid abort() if kernel can't allocate
+memory") avoids the abort() on ENOMEM by resetting the batch. However,
+when there's an ongoing OpenGL query, resetting the batch will make the
+snapshots_landed never be flipped, so iris_get_query_result() gets stuck
+in the while loop forever.
+
+Since there's no guarantee that the next batch after resetting won't hit
+ENOMEM, so instead of resetting the batch, be patient and wait until kernel has
+enough memory. Once the batch is submiited and snapshots_landed gets
+flipped, iris_get_query_result() can proceed normally.
+
+Reviewed-by: José Roberto de Souza <[email protected]>
+Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/6851
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20449>
+---
+ 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 c7a08a0e1f5f..deab85ce4aaf 100644
+--- a/src/gallium/drivers/iris/iris_batch.c
++++ b/src/gallium/drivers/iris/iris_batch.c
+@@ -981,9 +981,14 @@ submit_batch(struct iris_batch *batch)
+ }
+
+ int ret = 0;
+- if (!batch->screen->devinfo->no_hw &&
+- intel_ioctl(batch->screen->fd, DRM_IOCTL_I915_GEM_EXECBUFFER2,
&execbuf))
+- ret = -errno;
++ if (!batch->screen->devinfo->no_hw) {
++ do {
++ ret = intel_ioctl(batch->screen->fd, DRM_IOCTL_I915_GEM_EXECBUFFER2,
&execbuf);
++ } while (ret && errno == ENOMEM);
++
++ if (ret)
++ ret = -errno;
++ }
+
+ simple_mtx_unlock(bo_deps_lock);
+
Deleted: 0002-Revert-iris-Avoid-abort-if-kernel-can-t-allocate-mem.patch
===================================================================
--- 0002-Revert-iris-Avoid-abort-if-kernel-can-t-allocate-mem.patch
2023-04-03 20:22:14 UTC (rev 1434420)
+++ 0002-Revert-iris-Avoid-abort-if-kernel-can-t-allocate-mem.patch
2023-04-03 20:22:30 UTC (rev 1434421)
@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Kai-Heng Feng <[email protected]>
-Date: Thu, 29 Dec 2022 14:01:31 +0800
-Subject: [PATCH] Revert "iris: Avoid abort() if kernel can't allocate memory"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This reverts commit f9d8d9acbb6a620684fb4dac4affe25816587d92.
-
-Now ENOMEM is handled in submit_batch(), we don't need to check it for
-resetting anymore.
-
-Reviewed-by: José Roberto de Souza <[email protected]>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20449>
----
- 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 deab85ce4aaf..2993f0ab7ee8 100644
---- a/src/gallium/drivers/iris/iris_batch.c
-+++ b/src/gallium/drivers/iris/iris_batch.c
-@@ -1097,9 +1097,8 @@ _iris_batch_flush(struct iris_batch *batch, const char
*file, int line)
- * with a new logical context, and inform iris_context that all state
- * has been lost and needs to be re-initialized. If this succeeds,
- * dubiously claim success...
-- * Also handle ENOMEM here.
- */
-- if ((ret == -EIO || ret == -ENOMEM) && replace_kernel_ctx(batch)) {
-+ if (ret == -EIO && replace_kernel_ctx(batch)) {
- if (batch->reset->reset) {
- /* Tell gallium frontends the device is lost and it was our fault. */
- batch->reset->reset(batch->reset->data, PIPE_GUILTY_CONTEXT_RESET);
Copied:
lib32-mesa/repos/multilib-x86_64/0002-Revert-iris-Avoid-abort-if-kernel-can-t-allocate-mem.patch
(from rev 1434420,
lib32-mesa/trunk/0002-Revert-iris-Avoid-abort-if-kernel-can-t-allocate-mem.patch)
===================================================================
--- 0002-Revert-iris-Avoid-abort-if-kernel-can-t-allocate-mem.patch
(rev 0)
+++ 0002-Revert-iris-Avoid-abort-if-kernel-can-t-allocate-mem.patch
2023-04-03 20:22:30 UTC (rev 1434421)
@@ -0,0 +1,34 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Kai-Heng Feng <[email protected]>
+Date: Thu, 29 Dec 2022 14:01:31 +0800
+Subject: [PATCH] Revert "iris: Avoid abort() if kernel can't allocate memory"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This reverts commit f9d8d9acbb6a620684fb4dac4affe25816587d92.
+
+Now ENOMEM is handled in submit_batch(), we don't need to check it for
+resetting anymore.
+
+Reviewed-by: José Roberto de Souza <[email protected]>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20449>
+---
+ 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 deab85ce4aaf..2993f0ab7ee8 100644
+--- a/src/gallium/drivers/iris/iris_batch.c
++++ b/src/gallium/drivers/iris/iris_batch.c
+@@ -1097,9 +1097,8 @@ _iris_batch_flush(struct iris_batch *batch, const char
*file, int line)
+ * with a new logical context, and inform iris_context that all state
+ * has been lost and needs to be re-initialized. If this succeeds,
+ * dubiously claim success...
+- * Also handle ENOMEM here.
+ */
+- if ((ret == -EIO || ret == -ENOMEM) && replace_kernel_ctx(batch)) {
++ if (ret == -EIO && replace_kernel_ctx(batch)) {
+ if (batch->reset->reset) {
+ /* Tell gallium frontends the device is lost and it was our fault. */
+ batch->reset->reset(batch->reset->data, PIPE_GUILTY_CONTEXT_RESET);
Copied:
lib32-mesa/repos/multilib-x86_64/0003-intel-fs-fix-scheduling-of-HALT-instructions.patch
(from rev 1434420,
lib32-mesa/trunk/0003-intel-fs-fix-scheduling-of-HALT-instructions.patch)
===================================================================
--- 0003-intel-fs-fix-scheduling-of-HALT-instructions.patch
(rev 0)
+++ 0003-intel-fs-fix-scheduling-of-HALT-instructions.patch 2023-04-03
20:22:30 UTC (rev 1434421)
@@ -0,0 +1,130 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Lionel Landwerlin <[email protected]>
+Date: Mon, 3 Apr 2023 14:52:59 +0300
+Subject: [PATCH] intel/fs: fix scheduling of HALT instructions
+
+With the following test :
+
+dEQP-VK.spirv_assembly.instruction.terminate_invocation.terminate.no_out_of_bounds_load
+
+There is a :
+
+shader_start:
+ ... <- no control flow
+ g0 = some_alu
+ g1 = fbl
+ g2 = broadcast g3, g1
+ g4 = get_buffer_size g2
+ ... <- no control flow
+ halt <- on some lanes
+ g5 = send <surface>, g4
+
+eliminate_find_live_channel will remove the fbl/broadcast because it
+assumes lane0 is active at get_buffer_size :
+
+shader_start:
+ ... <- no control flow
+ g0 = some_alu
+ g4 = get_buffer_size g0
+ ... <- no control flow
+ halt <- on some lanes
+ g5 = send <surface>, g4
+
+But then the instruction scheduler will move the get_buffer_size after
+the halt :
+
+shader_start:
+ ... <- no control flow
+ halt <- on some lanes
+ g0 = some_alu
+ g4 = get_buffer_size g0
+ g5 = send <surface>, g4
+
+get_buffer_size pulls the surface index from lane0 in g0 which could
+have been turned off by the halt and we end up accessing an invalid
+surface handle.
+
+Signed-off-by: Lionel Landwerlin <[email protected]>
+Cc: mesa-stable
+---
+ .../compiler/brw_schedule_instructions.cpp | 46 +++++++++++++++++++
+ 1 file changed, 46 insertions(+)
+
+diff --git a/src/intel/compiler/brw_schedule_instructions.cpp
b/src/intel/compiler/brw_schedule_instructions.cpp
+index 3286e3f83b96..43f63784b2e8 100644
+--- a/src/intel/compiler/brw_schedule_instructions.cpp
++++ b/src/intel/compiler/brw_schedule_instructions.cpp
+@@ -651,6 +651,7 @@ public:
+ ralloc_free(this->mem_ctx);
+ }
+ void add_barrier_deps(schedule_node *n);
++ void add_cross_lane_deps(schedule_node *n);
+ void add_dep(schedule_node *before, schedule_node *after, int latency);
+ void add_dep(schedule_node *before, schedule_node *after);
+
+@@ -1098,6 +1099,28 @@ is_scheduling_barrier(const backend_instruction *inst)
+ inst->has_side_effects();
+ }
+
++static bool
++has_cross_lane_access(const fs_inst *inst)
++{
++ if (inst->opcode == SHADER_OPCODE_BROADCAST ||
++ inst->opcode == SHADER_OPCODE_READ_SR_REG ||
++ inst->opcode == SHADER_OPCODE_CLUSTER_BROADCAST ||
++ inst->opcode == SHADER_OPCODE_SHUFFLE ||
++ inst->opcode == FS_OPCODE_LOAD_LIVE_CHANNELS ||
++ inst->opcode == SHADER_OPCODE_FIND_LAST_LIVE_CHANNEL ||
++ inst->opcode == SHADER_OPCODE_FIND_LIVE_CHANNEL)
++ return true;
++
++ for (unsigned s = 0; s < inst->sources; s++) {
++ if (inst->src[s].file == VGRF) {
++ if (inst->src[s].stride == 0)
++ return true;
++ }
++ }
++
++ return false;
++}
++
+ /**
+ * Sometimes we really want this node to execute after everything that
+ * was before it and before everything that followed it. This adds
+@@ -1128,6 +1151,25 @@ instruction_scheduler::add_barrier_deps(schedule_node
*n)
+ }
+ }
+
++/**
++ * Because some instructions like HALT can disable lanes, scheduling prior to
++ * a cross lane access should not be allowed, otherwise we could end up with
++ * later instructions accessing uninitialized data.
++ */
++void
++instruction_scheduler::add_cross_lane_deps(schedule_node *n)
++{
++ schedule_node *prev = (schedule_node *)n->prev;
++
++ if (prev) {
++ while (!prev->is_head_sentinel()) {
++ if (has_cross_lane_access((fs_inst *)prev->inst))
++ add_dep(prev, n, 0);
++ prev = (schedule_node *)prev->prev;
++ }
++ }
++}
++
+ /* instruction scheduling needs to be aware of when an MRF write
+ * actually writes 2 MRFs.
+ */
+@@ -1165,6 +1207,10 @@ fs_instruction_scheduler::calculate_deps()
+ if (is_scheduling_barrier(inst))
+ add_barrier_deps(n);
+
++ if (inst->opcode == BRW_OPCODE_HALT ||
++ inst->opcode == SHADER_OPCODE_HALT_TARGET)
++ add_cross_lane_deps(n);
++
+ /* read-after-write deps. */
+ for (int i = 0; i < inst->sources; i++) {
+ if (inst->src[i].file == VGRF) {
Deleted: LICENSE
===================================================================
--- LICENSE 2023-04-03 20:22:14 UTC (rev 1434420)
+++ LICENSE 2023-04-03 20:22:30 UTC (rev 1434421)
@@ -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-x86_64/LICENSE (from rev 1434420,
lib32-mesa/trunk/LICENSE)
===================================================================
--- LICENSE (rev 0)
+++ LICENSE 2023-04-03 20:22:30 UTC (rev 1434421)
@@ -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 2023-04-03 20:22:14 UTC (rev 1434420)
+++ PKGBUILD 2023-04-03 20:22:30 UTC (rev 1434421)
@@ -1,248 +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=23.0.1
-pkgrel=1
-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')
-source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
- 0001-iris-Retry-DRM_IOCTL_I915_GEM_EXECBUFFER2-on-ENOMEM.patch
- 0002-Revert-iris-Avoid-abort-if-kernel-can-t-allocate-mem.patch
- LICENSE)
-sha256sums=('e8e586856b55893abae9bdcdb98b41c081d909bb1faf372e6e7262307bf34adf'
- 'SKIP'
- '99264c77d63d6fa810e295914808cde9f580a64e913e99fa794c1aa25a4f8fb2'
- 'd6ef8fb1809e8aeae0ec32bfe916adb770c64880bfd3d0f4472a616c9f356a9a'
- '7052ba73bb07ea78873a2431ee4e828f4e72bda7d176d07f770fa48373dec537')
-b2sums=('50d358e393037381d0d848f868ac3439b0851809c3533432dc428bd77e81bc71bbfd2b598e221b6e8c4c2528ef32e5624aec4fe2e552e01ee98abbcf96a1f5b7'
- 'SKIP'
-
'a90bfc47fb3a46eff1ef2455c7aa18c2bb515ec217b423d0a87cc5f3b824a77c0381e1378498464418644108142022dcd3c289e157877c6ae7584beaec1d9987'
-
'bd52994305fc0fa2f12c46ea3208bbb24f97495d9bad73120d83a6cdcf7e48f5ff0d14ac0055765516b70caacdf024fca4159b70b054e85f2783c78c9218aefe'
-
'1ecf007b82260710a7bf5048f47dd5d600c168824c02c595af654632326536a6527fbe0738670ee7b921dd85a70425108e0f471ba85a8e1ca47d294ad74b4adb')
-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/drm/intel/-/issues/6851
- # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20449
- patch -Np1 -i
../0001-iris-Retry-DRM_IOCTL_I915_GEM_EXECBUFFER2-on-ENOMEM.patch
- patch -Np1 -i
../0002-Revert-iris-Avoid-abort-if-kernel-can-t-allocate-mem.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"
- export LLVM_CONFIG="llvm-config32"
-
- # swr driver is broken with some cpu see FS#66972
-
- arch-meson mesa-$pkgver build \
- --libdir=/usr/lib32 \
- -D b_ndebug=true \
- -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')
- depends+=('libexpat.so')
- 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')
- depends+=('libexpat.so')
- 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' 'libexpat.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-x86_64/PKGBUILD (from rev 1434420,
lib32-mesa/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-04-03 20:22:30 UTC (rev 1434421)
@@ -0,0 +1,255 @@
+# 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=23.0.1
+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')
+source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
+ 0001-iris-Retry-DRM_IOCTL_I915_GEM_EXECBUFFER2-on-ENOMEM.patch
+ 0002-Revert-iris-Avoid-abort-if-kernel-can-t-allocate-mem.patch
+ 0003-intel-fs-fix-scheduling-of-HALT-instructions.patch
+ LICENSE)
+sha256sums=('e8e586856b55893abae9bdcdb98b41c081d909bb1faf372e6e7262307bf34adf'
+ 'SKIP'
+ '99264c77d63d6fa810e295914808cde9f580a64e913e99fa794c1aa25a4f8fb2'
+ 'd6ef8fb1809e8aeae0ec32bfe916adb770c64880bfd3d0f4472a616c9f356a9a'
+ 'dc6790b5be0e80c23e74ae18ca1a2b40f57f4211cc7b645bf22b63af3b790e40'
+ '7052ba73bb07ea78873a2431ee4e828f4e72bda7d176d07f770fa48373dec537')
+b2sums=('50d358e393037381d0d848f868ac3439b0851809c3533432dc428bd77e81bc71bbfd2b598e221b6e8c4c2528ef32e5624aec4fe2e552e01ee98abbcf96a1f5b7'
+ 'SKIP'
+
'a90bfc47fb3a46eff1ef2455c7aa18c2bb515ec217b423d0a87cc5f3b824a77c0381e1378498464418644108142022dcd3c289e157877c6ae7584beaec1d9987'
+
'bd52994305fc0fa2f12c46ea3208bbb24f97495d9bad73120d83a6cdcf7e48f5ff0d14ac0055765516b70caacdf024fca4159b70b054e85f2783c78c9218aefe'
+
'37d1d070c45c85bce8abe3524a3f8d9ac9ed6326a3eec653cd89fffce3630b08eb9b96b11aeb495488230449c99f9b508f73a15e53265d2b159286b0e2dda7cc'
+
'1ecf007b82260710a7bf5048f47dd5d600c168824c02c595af654632326536a6527fbe0738670ee7b921dd85a70425108e0f471ba85a8e1ca47d294ad74b4adb')
+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/drm/intel/-/issues/6851
+ # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20449
+ patch -Np1 -i
../0001-iris-Retry-DRM_IOCTL_I915_GEM_EXECBUFFER2-on-ENOMEM.patch
+ patch -Np1 -i
../0002-Revert-iris-Avoid-abort-if-kernel-can-t-allocate-mem.patch
+
+ # https://gitlab.freedesktop.org/mesa/mesa/-/issues/7110
+ # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20765
+ patch -Np1 -i ../0003-intel-fs-fix-scheduling-of-HALT-instructions.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"
+ export LLVM_CONFIG="llvm-config32"
+
+ # swr driver is broken with some cpu see FS#66972
+
+ arch-meson mesa-$pkgver build \
+ --libdir=/usr/lib32 \
+ -D b_ndebug=true \
+ -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')
+ depends+=('libexpat.so')
+ 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')
+ depends+=('libexpat.so')
+ 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' 'libexpat.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
+}
