[arch-commits] Commit in mesa/repos/extra-x86_64 (5 files)
Laurent Carlier
lcarlier at archlinux.org
Tue Feb 23 18:07:45 UTC 2021
Date: Tuesday, February 23, 2021 @ 18:07:45
Author: lcarlier
Revision: 408684
archrelease: copy trunk to extra-x86_64
Added:
mesa/repos/extra-x86_64/0001-vulkan-device_select-Stop-using-device-properties-2.patch
(from rev 408683, mesa/trunk/0001-vulkan-device_select-Stop-using-device-properties-2.patch)
mesa/repos/extra-x86_64/LICENSE
(from rev 408683, mesa/trunk/LICENSE)
mesa/repos/extra-x86_64/PKGBUILD
(from rev 408683, mesa/trunk/PKGBUILD)
Deleted:
mesa/repos/extra-x86_64/LICENSE
mesa/repos/extra-x86_64/PKGBUILD
----------------------------------------------------------------+
0001-vulkan-device_select-Stop-using-device-properties-2.patch | 109 ++
LICENSE | 166 +--
PKGBUILD | 434 +++++-----
3 files changed, 415 insertions(+), 294 deletions(-)
Copied: mesa/repos/extra-x86_64/0001-vulkan-device_select-Stop-using-device-properties-2.patch (from rev 408683, mesa/trunk/0001-vulkan-device_select-Stop-using-device-properties-2.patch)
===================================================================
--- 0001-vulkan-device_select-Stop-using-device-properties-2.patch (rev 0)
+++ 0001-vulkan-device_select-Stop-using-device-properties-2.patch 2021-02-23 18:07:45 UTC (rev 408684)
@@ -0,0 +1,109 @@
+From ccacfc317e4fac62052a22e2d092d15541e2877e Mon Sep 17 00:00:00 2001
+From: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
+Date: Mon, 11 Jan 2021 15:20:40 +0100
+Subject: [PATCH] vulkan/device_select: Stop using device properties 2.
+
+We have to choose between:
+1) Stop handling two identical GPUs
+2) Stop having crashes with other layers active.
+3) Fix the Vulkan Loader.
+
+Since nobody seems to want to spend enough effort to do 3 the
+effective choice is between 1 and 2. This is choosing 2, as
+two identical GPUs is pretty uncommon since crossfire doesn't
+work on Linux anyway.
+
+(And it would only work sporadically as the game needs to enable the
+ extension)
+
+CC: mesa-stable
+Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3801
+Reviewed-by: Dave Airlie <airlied at redhat.com>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8414>
+(cherry picked from commit 38ce8d4d00c2b0e567b6dd36876cf171acb1dbc7)
+Signed-off-by: Laurent Carlier <lordheavym at gmail.com>
+---
+ .../device-select-layer/device_select_layer.c | 30 +++++++++++--------
+ 1 file changed, 18 insertions(+), 12 deletions(-)
+
+diff --git a/src/vulkan/device-select-layer/device_select_layer.c b/src/vulkan/device-select-layer/device_select_layer.c
+index c381ac33fd1..134a3bd22dd 100644
+--- a/src/vulkan/device-select-layer/device_select_layer.c
++++ b/src/vulkan/device-select-layer/device_select_layer.c
+@@ -51,8 +51,8 @@ struct instance_info {
+ PFN_GetPhysicalDeviceProcAddr GetPhysicalDeviceProcAddr;
+ PFN_vkEnumerateDeviceExtensionProperties EnumerateDeviceExtensionProperties;
+ PFN_vkGetPhysicalDeviceProperties GetPhysicalDeviceProperties;
+- PFN_vkGetPhysicalDeviceProperties2KHR GetPhysicalDeviceProperties2KHR;
+- bool has_props2, has_pci_bus;
++ PFN_vkGetPhysicalDeviceProperties2 GetPhysicalDeviceProperties2;
++ bool has_pci_bus, has_vulkan11;
+ bool has_wayland, has_xcb;
+ };
+
+@@ -150,8 +150,6 @@ static VkResult device_select_CreateInstance(const VkInstanceCreateInfo *pCreate
+ }
+
+ for (unsigned i = 0; i < pCreateInfo->enabledExtensionCount; i++) {
+- if (!strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME))
+- info->has_props2 = true;
+ #ifdef VK_USE_PLATFORM_WAYLAND_KHR
+ if (!strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME))
+ info->has_wayland = true;
+@@ -162,6 +160,14 @@ static VkResult device_select_CreateInstance(const VkInstanceCreateInfo *pCreate
+ #endif
+ }
+
++ /*
++ * The loader is currently not able to handle GetPhysicalDeviceProperties2KHR calls in
++ * EnumeratePhysicalDevices when there are other layers present. To avoid mysterious crashes
++ * for users just use only the vulkan version for now.
++ */
++ info->has_vulkan11 = pCreateInfo->pApplicationInfo &&
++ pCreateInfo->pApplicationInfo->apiVersion >= VK_MAKE_VERSION(1, 1, 0);
++
+ info->GetPhysicalDeviceProcAddr = (PFN_GetPhysicalDeviceProcAddr)info->GetInstanceProcAddr(*pInstance, "vk_layerGetPhysicalDeviceProcAddr");
+ #define DEVSEL_GET_CB(func) info->func = (PFN_vk##func)info->GetInstanceProcAddr(*pInstance, "vk" #func)
+ DEVSEL_GET_CB(DestroyInstance);
+@@ -169,8 +175,8 @@ static VkResult device_select_CreateInstance(const VkInstanceCreateInfo *pCreate
+ DEVSEL_GET_CB(EnumeratePhysicalDeviceGroups);
+ DEVSEL_GET_CB(GetPhysicalDeviceProperties);
+ DEVSEL_GET_CB(EnumerateDeviceExtensionProperties);
+- if (info->has_props2)
+- DEVSEL_GET_CB(GetPhysicalDeviceProperties2KHR);
++ if (info->has_vulkan11)
++ DEVSEL_GET_CB(GetPhysicalDeviceProperties2);
+ #undef DEVSEL_GET_CB
+
+ device_select_layer_add_instance(*pInstance, info);
+@@ -197,10 +203,10 @@ static void print_gpu(const struct instance_info *info, unsigned index, VkPhysic
+ VkPhysicalDeviceProperties2KHR properties = (VkPhysicalDeviceProperties2KHR){
+ .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2_KHR
+ };
+- if (info->has_props2 && info->has_pci_bus)
++ if (info->has_vulkan11 && info->has_pci_bus)
+ properties.pNext = &ext_pci_properties;
+- if (info->GetPhysicalDeviceProperties2KHR)
+- info->GetPhysicalDeviceProperties2KHR(device, &properties);
++ if (info->GetPhysicalDeviceProperties2)
++ info->GetPhysicalDeviceProperties2(device, &properties);
+ else
+ info->GetPhysicalDeviceProperties(device, &properties.properties);
+
+@@ -243,10 +249,10 @@ static bool fill_drm_device_info(const struct instance_info *info,
+ .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2_KHR
+ };
+
+- if (info->has_props2 && info->has_pci_bus)
++ if (info->has_vulkan11 && info->has_pci_bus)
+ properties.pNext = &ext_pci_properties;
+- if (info->GetPhysicalDeviceProperties2KHR)
+- info->GetPhysicalDeviceProperties2KHR(device, &properties);
++ if (info->GetPhysicalDeviceProperties2)
++ info->GetPhysicalDeviceProperties2(device, &properties);
+ else
+ info->GetPhysicalDeviceProperties(device, &properties.properties);
+
+--
+2.30.1
+
Deleted: LICENSE
===================================================================
--- LICENSE 2021-02-23 18:07:39 UTC (rev 408683)
+++ LICENSE 2021-02-23 18:07:45 UTC (rev 408684)
@@ -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: mesa/repos/extra-x86_64/LICENSE (from rev 408683, mesa/trunk/LICENSE)
===================================================================
--- LICENSE (rev 0)
+++ LICENSE 2021-02-23 18:07:45 UTC (rev 408684)
@@ -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 2021-02-23 18:07:39 UTC (rev 408683)
+++ PKGBUILD 2021-02-23 18:07:45 UTC (rev 408684)
@@ -1,211 +0,0 @@
-# Maintainer: Laurent Carlier <lordheavym at gmail.com>
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Contributor: Andreas Radke <andyrtr at archlinux.org>
-
-pkgbase=mesa
-pkgname=('vulkan-mesa-layers' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-swrast' 'libva-mesa-driver' 'mesa-vdpau' 'mesa')
-pkgdesc="An open-source implementation of the OpenGL specification"
-pkgver=20.3.4
-pkgrel=2
-arch=('x86_64')
-makedepends=('python-mako' 'libxml2' 'libx11' 'xorgproto' 'libdrm' 'libxshmfence' 'libxxf86vm'
- 'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols' 'zstd' 'elfutils' 'llvm'
- 'libomxil-bellagio' 'libclc' 'clang' 'libglvnd' 'libunwind' 'lm_sensors' 'libxrandr'
- 'valgrind' 'glslang' 'vulkan-icd-loader' 'meson')
-url="https://www.mesa3d.org/"
-license=('custom')
-source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
- LICENSE)
-sha512sums=('81c4d032213b4aef842f1594e0e89bc0045f7ca7ce5f267b62a0f8236eb12ab09c1f780d8b3776b3072f37cd0bd8829f8a1330a749ccf462471b262ef8097477'
- 'SKIP'
- 'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7')
-validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov <emil.l.velikov at gmail.com>
- '946D09B5E4C9845E63075FF1D961C596A7203456' # Andres Gomez <tanty at igalia.com>
- 'E3E8F480C52ADD73B278EE78E1ECBE07D7D70895' # Juan Antonio Suárez Romero (Igalia, S.L.) <jasuarez at igalia.com>
- 'A5CC9FEC93F2F837CB044912336909B6B25FADFA' # Juan A. Suarez Romero <jasuarez at igalia.com>
- '71C4B75620BC75708B4BDB254C95FAAB3EB073EC' # Dylan Baker <dylan at pnwbakers.com>
- '57551DE15B968F6341C248F68D8E31AFC32428A6') # Eric Engestrom <eric at engestrom.ch>
-
-build() {
- arch-meson mesa-$pkgver build \
- -D b_lto=true \
- -D b_ndebug=true \
- -D platforms=x11,wayland \
- -D dri-drivers=i915,i965,r100,r200,nouveau \
- -D gallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,swrast,swr,iris,zink \
- -D vulkan-drivers=amd,intel,swrast \
- -D vulkan-overlay-layer=true \
- -D vulkan-device-select-layer=true \
- -D swr-arches=avx,avx2 \
- -D dri3=enabled \
- -D egl=enabled \
- -D gallium-extra-hud=true \
- -D gallium-nine=true \
- -D gallium-omx=bellagio \
- -D gallium-opencl=icd \
- -D gallium-va=enabled \
- -D gallium-vdpau=enabled \
- -D gallium-xa=enabled \
- -D gallium-xvmc=disabled \
- -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=gallium \
- -D shared-glapi=enabled \
- -D valgrind=enabled
-
- # 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_vulkan-mesa-layers() {
- pkgdesc="Mesa's Vulkan layers"
- depends=('libdrm' 'libxcb' 'wayland' 'python')
- conflicts=('vulkan-mesa-layer')
- replaces=('vulkan-mesa-layer')
-
- _install fakeinstall/usr/share/vulkan/explicit_layer.d
- _install fakeinstall/usr/lib/libVkLayer_MESA_overlay.so
- _install fakeinstall/usr/bin/mesa-overlay-control.py
-
- _install fakeinstall/usr/share/vulkan/implicit_layer.d
- _install fakeinstall/usr/lib/libVkLayer_MESA_device_select.so
-
- install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_opencl-mesa() {
- pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers"
- depends=('libdrm' 'libclc' 'clang')
- optdepends=('opencl-headers: headers necessary for OpenCL development')
- provides=('opencl-driver')
-
- _install fakeinstall/etc/OpenCL
- _install fakeinstall/usr/lib/lib*OpenCL*
- _install fakeinstall/usr/lib/gallium-pipe
-
- install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_vulkan-intel() {
- pkgdesc="Intel's Vulkan mesa driver"
- depends=('wayland' 'libx11' 'libxshmfence' 'libdrm' 'zstd')
- optdepends=('vulkan-mesa-layers: additional vulkan layers')
- provides=('vulkan-driver')
-
- _install fakeinstall/usr/share/vulkan/icd.d/intel_icd*.json
- _install fakeinstall/usr/lib/libvulkan_intel.so
- _install fakeinstall/usr/include/vulkan/vulkan_intel.h
-
- install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_vulkan-radeon() {
- pkgdesc="Radeon's Vulkan mesa driver"
- depends=('wayland' 'libx11' 'libxshmfence' 'libelf' 'libdrm' 'llvm-libs')
- optdepends=('vulkan-mesa-layers: additional vulkan layers')
- provides=('vulkan-driver')
-
- _install fakeinstall/usr/share/vulkan/icd.d/radeon_icd*.json
- _install fakeinstall/usr/lib/libvulkan_radeon.so
-
- install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_vulkan-swrast() {
- pkgdesc="Vulkan software rasteriser driver"
- depends=('wayland' 'libx11' 'libxshmfence' 'libdrm' 'zstd' 'llvm-libs')
- optdepends=('vulkan-mesa-layers: additional vulkan layers')
- conflicts=('vulkan-mesa')
- replaces=('vulkan-mesa')
- provides=('vulkan-driver')
-
- _install fakeinstall/usr/share/vulkan/icd.d/lvp_icd*.json
- _install fakeinstall/usr/lib/libvulkan_lvp.so
-
- install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_libva-mesa-driver() {
- pkgdesc="VA-API implementation for gallium"
- depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence')
-
- _install fakeinstall/usr/lib/dri/*_drv_video.so
-
- install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_mesa-vdpau() {
- pkgdesc="Mesa VDPAU drivers"
- depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence')
-
- _install fakeinstall/usr/lib/vdpau
-
- install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_mesa() {
- depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf'
- 'libomxil-bellagio' 'libunwind' 'llvm-libs' 'lm_sensors' 'libglvnd'
- 'zstd' 'vulkan-icd-loader')
- optdepends=('opengl-man-pages: for the OpenGL API man pages'
- 'mesa-vdpau: for accelerated video playback'
- 'libva-mesa-driver: for accelerated video playback')
- provides=('mesa-libgl' 'opengl-driver')
- conflicts=('mesa-libgl')
- replaces=('mesa-libgl')
-
- _install fakeinstall/usr/share/drirc.d/00-mesa-defaults.conf
- _install fakeinstall/usr/share/glvnd/egl_vendor.d/50_mesa.json
-
- # ati-dri, nouveau-dri, intel-dri, svga-dri, swrast, swr
- _install fakeinstall/usr/lib/dri/*_dri.so
-
- _install fakeinstall/usr/lib/bellagio
- _install fakeinstall/usr/lib/d3d
- _install fakeinstall/usr/lib/lib{gbm,glapi}.so*
- _install fakeinstall/usr/lib/libOSMesa.so*
- _install fakeinstall/usr/lib/libxatracker.so*
- _install fakeinstall/usr/lib/libswrAVX*.so*
-
- # in vulkan-headers
- rm -rv fakeinstall/usr/include/vulkan
-
- _install fakeinstall/usr/include
- _install fakeinstall/usr/lib/pkgconfig
-
- # libglvnd support
- _install fakeinstall/usr/lib/libGLX_mesa.so*
- _install fakeinstall/usr/lib/libEGL_mesa.so*
-
- # indirect rendering
- ln -s /usr/lib/libGLX_mesa.so.0 "${pkgdir}/usr/lib/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: mesa/repos/extra-x86_64/PKGBUILD (from rev 408683, mesa/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-02-23 18:07:45 UTC (rev 408684)
@@ -0,0 +1,223 @@
+# Maintainer: Laurent Carlier <lordheavym at gmail.com>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Andreas Radke <andyrtr at archlinux.org>
+
+pkgbase=mesa
+pkgname=('vulkan-mesa-layers' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-swrast' 'libva-mesa-driver' 'mesa-vdpau' 'mesa')
+pkgdesc="An open-source implementation of the OpenGL specification"
+pkgver=20.3.4
+pkgrel=3
+arch=('x86_64')
+makedepends=('python-mako' 'libxml2' 'libx11' 'xorgproto' 'libdrm' 'libxshmfence' 'libxxf86vm'
+ 'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols' 'zstd' 'elfutils' 'llvm'
+ 'libomxil-bellagio' 'libclc' 'clang' 'libglvnd' 'libunwind' 'lm_sensors' 'libxrandr'
+ 'valgrind' 'glslang' 'vulkan-icd-loader' 'meson')
+url="https://www.mesa3d.org/"
+license=('custom')
+source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
+ LICENSE
+ 0001-vulkan-device_select-Stop-using-device-properties-2.patch)
+sha512sums=('81c4d032213b4aef842f1594e0e89bc0045f7ca7ce5f267b62a0f8236eb12ab09c1f780d8b3776b3072f37cd0bd8829f8a1330a749ccf462471b262ef8097477'
+ 'SKIP'
+ 'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7'
+ '73a923dac10616ab46b825cd45f73ca849ddad69432dbf680c1129cc9a92004218affa33bd1a6ee185fa0143ccd3d3622ba40512ec049a160a61cc13fe92da0a')
+validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov <emil.l.velikov at gmail.com>
+ '946D09B5E4C9845E63075FF1D961C596A7203456' # Andres Gomez <tanty at igalia.com>
+ 'E3E8F480C52ADD73B278EE78E1ECBE07D7D70895' # Juan Antonio Suárez Romero (Igalia, S.L.) <jasuarez at igalia.com>
+ 'A5CC9FEC93F2F837CB044912336909B6B25FADFA' # Juan A. Suarez Romero <jasuarez at igalia.com>
+ '71C4B75620BC75708B4BDB254C95FAAB3EB073EC' # Dylan Baker <dylan at pnwbakers.com>
+ '57551DE15B968F6341C248F68D8E31AFC32428A6') # Eric Engestrom <eric at engestrom.ch>
+
+prepare() {
+ cd mesa-$pkgver
+
+ # FS#69744
+ patch -Np1 -i ../0001-vulkan-device_select-Stop-using-device-properties-2.patch
+}
+
+build() {
+ arch-meson mesa-$pkgver build \
+ -D b_lto=true \
+ -D b_ndebug=true \
+ -D platforms=x11,wayland \
+ -D dri-drivers=i915,i965,r100,r200,nouveau \
+ -D gallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,swrast,swr,iris,zink \
+ -D vulkan-drivers=amd,intel,swrast \
+ -D vulkan-overlay-layer=true \
+ -D vulkan-device-select-layer=true \
+ -D swr-arches=avx,avx2 \
+ -D dri3=enabled \
+ -D egl=enabled \
+ -D gallium-extra-hud=true \
+ -D gallium-nine=true \
+ -D gallium-omx=bellagio \
+ -D gallium-opencl=icd \
+ -D gallium-va=enabled \
+ -D gallium-vdpau=enabled \
+ -D gallium-xa=enabled \
+ -D gallium-xvmc=disabled \
+ -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=gallium \
+ -D shared-glapi=enabled \
+ -D valgrind=enabled
+
+ # 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_vulkan-mesa-layers() {
+ pkgdesc="Mesa's Vulkan layers"
+ depends=('libdrm' 'libxcb' 'wayland' 'python')
+ conflicts=('vulkan-mesa-layer')
+ replaces=('vulkan-mesa-layer')
+
+ _install fakeinstall/usr/share/vulkan/explicit_layer.d
+ _install fakeinstall/usr/lib/libVkLayer_MESA_overlay.so
+ _install fakeinstall/usr/bin/mesa-overlay-control.py
+
+ _install fakeinstall/usr/share/vulkan/implicit_layer.d
+ _install fakeinstall/usr/lib/libVkLayer_MESA_device_select.so
+
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
+
+package_opencl-mesa() {
+ pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers"
+ depends=('libdrm' 'libclc' 'clang')
+ optdepends=('opencl-headers: headers necessary for OpenCL development')
+ provides=('opencl-driver')
+
+ _install fakeinstall/etc/OpenCL
+ _install fakeinstall/usr/lib/lib*OpenCL*
+ _install fakeinstall/usr/lib/gallium-pipe
+
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
+
+package_vulkan-intel() {
+ pkgdesc="Intel's Vulkan mesa driver"
+ depends=('wayland' 'libx11' 'libxshmfence' 'libdrm' 'zstd')
+ optdepends=('vulkan-mesa-layers: additional vulkan layers')
+ provides=('vulkan-driver')
+
+ _install fakeinstall/usr/share/vulkan/icd.d/intel_icd*.json
+ _install fakeinstall/usr/lib/libvulkan_intel.so
+ _install fakeinstall/usr/include/vulkan/vulkan_intel.h
+
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
+
+package_vulkan-radeon() {
+ pkgdesc="Radeon's Vulkan mesa driver"
+ depends=('wayland' 'libx11' 'libxshmfence' 'libelf' 'libdrm' 'llvm-libs')
+ optdepends=('vulkan-mesa-layers: additional vulkan layers')
+ provides=('vulkan-driver')
+
+ _install fakeinstall/usr/share/vulkan/icd.d/radeon_icd*.json
+ _install fakeinstall/usr/lib/libvulkan_radeon.so
+
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
+
+package_vulkan-swrast() {
+ pkgdesc="Vulkan software rasteriser driver"
+ depends=('wayland' 'libx11' 'libxshmfence' 'libdrm' 'zstd' 'llvm-libs')
+ optdepends=('vulkan-mesa-layers: additional vulkan layers')
+ conflicts=('vulkan-mesa')
+ replaces=('vulkan-mesa')
+ provides=('vulkan-driver')
+
+ _install fakeinstall/usr/share/vulkan/icd.d/lvp_icd*.json
+ _install fakeinstall/usr/lib/libvulkan_lvp.so
+
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
+
+package_libva-mesa-driver() {
+ pkgdesc="VA-API implementation for gallium"
+ depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence')
+ depends+=('libexpat.so')
+
+ _install fakeinstall/usr/lib/dri/*_drv_video.so
+
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
+
+package_mesa-vdpau() {
+ pkgdesc="Mesa VDPAU drivers"
+ depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence')
+ depends+=('libexpat.so')
+
+ _install fakeinstall/usr/lib/vdpau
+
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
+
+package_mesa() {
+ depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf'
+ 'libomxil-bellagio' 'libunwind' 'llvm-libs' 'lm_sensors' 'libglvnd'
+ 'zstd' 'vulkan-icd-loader')
+ depends+=('libsensors.so' 'libexpat.so' 'libvulkan.so')
+ optdepends=('opengl-man-pages: for the OpenGL API man pages'
+ 'mesa-vdpau: for accelerated video playback'
+ 'libva-mesa-driver: for accelerated video playback')
+ provides=('mesa-libgl' 'opengl-driver')
+ conflicts=('mesa-libgl')
+ replaces=('mesa-libgl')
+
+ _install fakeinstall/usr/share/drirc.d/00-mesa-defaults.conf
+ _install fakeinstall/usr/share/glvnd/egl_vendor.d/50_mesa.json
+
+ # ati-dri, nouveau-dri, intel-dri, svga-dri, swrast, swr
+ _install fakeinstall/usr/lib/dri/*_dri.so
+
+ _install fakeinstall/usr/lib/bellagio
+ _install fakeinstall/usr/lib/d3d
+ _install fakeinstall/usr/lib/lib{gbm,glapi}.so*
+ _install fakeinstall/usr/lib/libOSMesa.so*
+ _install fakeinstall/usr/lib/libxatracker.so*
+ _install fakeinstall/usr/lib/libswrAVX*.so*
+
+ # in vulkan-headers
+ rm -rv fakeinstall/usr/include/vulkan
+
+ _install fakeinstall/usr/include
+ _install fakeinstall/usr/lib/pkgconfig
+
+ # libglvnd support
+ _install fakeinstall/usr/lib/libGLX_mesa.so*
+ _install fakeinstall/usr/lib/libEGL_mesa.so*
+
+ # indirect rendering
+ ln -s /usr/lib/libGLX_mesa.so.0 "${pkgdir}/usr/lib/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
+}
More information about the arch-commits
mailing list