From c127c626a223d6abc01f4dbd4374db599f8d70bb Mon Sep 17 00:00:00 2001 From: zlice Date: Wed, 5 Mar 2025 21:08:18 -0500 Subject: [PATCH 1/5] mesa: update to 25.1.3 - libglapi moved into gallium https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32789 - distfiles changed to https://mesa3d.org/archive - 25.1.0 removes deprecated libOSMesa - 25.1.0 removes deprecated gallium 'swrast' (note: still in vulkan_drivers) - build mesa-asahi in mesa proper --- srcpkgs/libglapi | 1 - srcpkgs/mesa/template | 50 ++++++++++--------------------- srcpkgs/removed-packages/template | 1 + 3 files changed, 16 insertions(+), 36 deletions(-) delete mode 120000 srcpkgs/libglapi diff --git a/srcpkgs/libglapi b/srcpkgs/libglapi deleted file mode 120000 index 1ad1bbec7ab303..00000000000000 --- a/srcpkgs/libglapi +++ /dev/null @@ -1 +0,0 @@ -mesa \ No newline at end of file diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template index e6e830b46229c5..72a40093eab7a2 100644 --- a/srcpkgs/mesa/template +++ b/srcpkgs/mesa/template @@ -1,16 +1,16 @@ # Template file for 'mesa' pkgname=mesa -version=24.3.4 -revision=2 +version=25.1.3 +revision=1 build_style=meson _llvmver=19 #Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911 -configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled - -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri +configure_args="-Dglvnd=true -Dgbm=enabled -Degl=enabled + -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland) -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17" hostmakedepends="gettext flex pkg-config python3-Mako glslang llvm${_llvmver} - $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml" + $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml" makedepends="elfutils-devel expat-devel libXdamage-devel libXxf86vm-devel libdrm-devel libffi-devel libva-devel libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel @@ -23,8 +23,8 @@ maintainer="Orphaned " license="MIT, LGPL-2.1-or-later" homepage="https://www.mesa3d.org/" changelog="https://docs.mesa3d.org/relnotes.html" -distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" -checksum=e641ae27191d387599219694560d221b7feaa91c900bcec46bf444218ed66025 +distfiles="https://mesa3d.org/archive/mesa-${version}.tar.xz" +checksum=ffcb6cadb5fd356d56008e6308641dfe4b2929f30139f6585436ca6e3cddba7f build_helper="qemu" build_options="wayland" @@ -40,7 +40,7 @@ case "$XBPS_TARGET_MACHINE" in esac # Set subpackages manually to set proper rdeps in 32bit pkgs. -subpackages="mesa-libgallium libglapi libgbm libgbm-devel libOSMesa" +subpackages="mesa-libgallium libgbm libgbm-devel" # Replace old mesa pkgs, superseded by libglvnd. replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2" @@ -49,8 +49,8 @@ replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2" # Check for correctness on major mesa version updates # Particularly, check if any new worthwhile drivers were added -# swrast always present -_gallium_drivers=" -Dgallium-drivers=swrast" +# softpipe always present +_gallium_drivers=" -Dgallium-drivers=softpipe" _vulkan_drivers=" -Dvulkan-drivers=" # amd and nvidia drivers on all platforms except where it makes no sense @@ -81,6 +81,7 @@ esac if [ "$_have_llvmpipe" ]; then subpackages+=" mesa-vulkan-lavapipe" _vulkan_drivers+=",swrast" + # note: swrast IS valid for vulkan drivers still, not gallium else configure_args+=" -Ddraw-use-llvm=false" fi @@ -119,8 +120,9 @@ fi if [ "$_have_arm" ]; then _have_vulkan=yes - _gallium_drivers+=",v3d,vc4,freedreno,etnaviv,lima,panfrost" - _vulkan_drivers+=",broadcom,freedreno" + _have_opencl=yes + _gallium_drivers+=",v3d,vc4,freedreno,etnaviv,lima,panfrost,asahi" + _vulkan_drivers+=",broadcom,freedreno,asahi" subpackages+=" mesa-vulkan-broadcom mesa-vulkan-freedreno" # transitional dummy packages subpackages+=" mesa-kmsro-dri mesa-v3d-dri mesa-vc4-dri" @@ -241,18 +243,6 @@ mesa-libgallium_package() { } } -libglapi_package() { - # this dependency is wrong, it was added as a hack to allow updating - # systems with libglapi-32bit after the switch to glvnd - # see 927f17347f9c646047c65312c8e8ce1ad88b7832 - # it can be removed when glibc multilib (with *-32bit packages) is removed - depends="libglvnd" - short_desc="Free implementation of the GL API - shared library" - pkg_install() { - vmove "usr/lib/libglapi.so.*" - } -} - libgbm_package() { short_desc="Mesa Generic buffer management API - runtime" pkg_install() { @@ -270,16 +260,8 @@ libgbm-devel_package() { } } -libOSMesa_package() { - short_desc="Mesa Off-Screen interface library" - pkg_install() { - vmove "usr/lib/libOSMesa.so.*" - } -} - MesaLib-devel_package() { - depends="mesa>=${version}_${revision} libOSMesa>=${version}_${revision} - libgbm-devel>=${version}_${revision}" + depends="mesa>=${version}_${revision} libgbm-devel>=${version}_${revision}" if [ "$_have_vmware" ]; then depends+=" libxatracker>=${version}_${revision}" fi @@ -293,8 +275,6 @@ MesaLib-devel_package() { vmove usr/lib/pkgconfig vmove usr/lib/libEGL_mesa.so vmove usr/lib/libGLX_mesa.so - vmove usr/lib/libOSMesa.so - vmove usr/lib/libglapi.so if [ "$_have_vmware" ]; then vmove usr/lib/libxatracker.so fi diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index fce62e07bbce1c..351762552b400c 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -405,6 +405,7 @@ replaces=" libglade<=2.6.4_12 libglademm-devel<=2.6.7_6 libglademm<=2.6.7_6 + libglapi<=24.3.4_2 libglib-static<=2.58.3_5 libgnome-keyring-devel<=3.12.0_5 libgnome-keyring<=3.12.0_5 From 69f0ad841489c3fd6c0debc535b00fdf9e05e3d1 Mon Sep 17 00:00:00 2001 From: zlice Date: Tue, 20 May 2025 16:20:20 -0400 Subject: [PATCH 2/5] libOSMesa: remove package --- common/shlibs | 1 - srcpkgs/libOSMesa | 1 - srcpkgs/removed-packages/template | 1 + 3 files changed, 1 insertion(+), 2 deletions(-) delete mode 120000 srcpkgs/libOSMesa diff --git a/common/shlibs b/common/shlibs index 38b118ac3c81e9..5dfbc6f18e4e39 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1235,7 +1235,6 @@ libbluray.so.2 libbluray-1.0.0_1 libnfs.so.14 libnfs-5.0.1_1 libzip.so.5 libzip-1.7.3_2 libluajit-5.1.so.2 LuaJIT-2.0.0_1 -libOSMesa.so.8 libOSMesa-9.1_1 libaa.so.1 aalib-1.4rc4_2 libbsd.so.0 libbsd-0.4.2_1 libwiringPi.so libwiringPi-0.0.20200408_1 diff --git a/srcpkgs/libOSMesa b/srcpkgs/libOSMesa deleted file mode 120000 index 1ad1bbec7ab303..00000000000000 --- a/srcpkgs/libOSMesa +++ /dev/null @@ -1 +0,0 @@ -mesa \ No newline at end of file diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 351762552b400c..ed0ef16aa627d0 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -353,6 +353,7 @@ replaces=" libArcus<=4.13.1_8 libCharon<=4.13.0_3 libOSMesa-asahi<=25.1.0+20250221_1 + libOSMesa<=24.3.4_2 libSavitar-devel<=4.13.1_3 libSavitar-python3<=4.13.1_3 libSavitar<=4.13.1_3 From 2339e069c3a7f53e4ae19a8c260cf35d625f0d57 Mon Sep 17 00:00:00 2001 From: zlice Date: Tue, 20 May 2025 16:19:53 -0400 Subject: [PATCH 3/5] mesa-demos: revbump for libOSMesa removal - distfiles changed to https://archive.mesa3d.org/demos/mesa-demos-${version}.tar.xz - move new 'identity' binary to 'mesa-identity' it conflicts with the 'identity' package --- srcpkgs/mesa-demos/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mesa-demos/template b/srcpkgs/mesa-demos/template index 9b680f62cb5022..badd029d82cd20 100644 --- a/srcpkgs/mesa-demos/template +++ b/srcpkgs/mesa-demos/template @@ -1,7 +1,7 @@ # Template file for 'mesa-demos' pkgname=mesa-demos version=9.0.0 -revision=1 +revision=2 build_style=meson configure_args="-Dwith-system-data-files=true" hostmakedepends="pkg-config glslang wayland-devel" @@ -12,11 +12,12 @@ short_desc="Mesa 3D demos and tools" maintainer="John " license="MIT" homepage="https://gitlab.freedesktop.org/mesa/demos" -distfiles="https://mesa.freedesktop.org/archive/demos/mesa-demos-${version}.tar.xz" +distfiles="https://archive.mesa3d.org/demos/mesa-demos-${version}.tar.xz" checksum=3046a3d26a7b051af7ebdd257a5f23bfeb160cad6ed952329cdff1e9f1ed496b post_install() { sed -n '2,20p' src/vulkan/vkgears.c > LICENSE.MIT + mv ${DESTDIR}/usr/bin/identity ${DESTDIR}/usr/bin/mesa-identity vlicense LICENSE.MIT } From 2928fc5249ead83b626feb5edcfa348340049fd4 Mon Sep 17 00:00:00 2001 From: zlice Date: Sat, 24 May 2025 10:49:54 -0400 Subject: [PATCH 4/5] wine: revbump for libOSMesa remove --- srcpkgs/wine/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template index bb2c9989411f1f..da6508aeb22ca0 100644 --- a/srcpkgs/wine/template +++ b/srcpkgs/wine/template @@ -1,7 +1,7 @@ # Template file for 'wine' pkgname=wine version=10.9 -revision=1 +revision=2 _pkgver=${version/r/-r} create_wrksrc=yes build_wrksrc=wine-${_pkgver} @@ -56,11 +56,11 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel libpcap-devel cups-devel ocl-icd-devel vulkan-loader-devel gst-plugins-base1-devel SDL2-devel" -depends="libXi libXinerama libXcomposite libXcursor libOSMesa +depends="libXi libXinerama libXcomposite libXcursor desktop-file-utils hicolor-icon-theme liberation-fonts-ttf gnutls SDL2 wine-common>=${version}_${revision}" lib32depends="libXi-32bit>=0 libXinerama-32bit>=0 libXcomposite-32bit>=0 - libXcursor-32bit>=0 libOSMesa-32bit>=0 desktop-file-utils>=0 hicolor-icon-theme>=0 + libXcursor-32bit>=0 desktop-file-utils>=0 hicolor-icon-theme>=0 liberation-fonts-ttf>=0 gnutls-32bit>=0 SDL2-32bit>=0 wine-common>=${version}_${revision}" replaces="libwine>=0" From 5b8b36e9b0c5d32e298ba719b35952e835ac2a1f Mon Sep 17 00:00:00 2001 From: zlice Date: Mon, 26 May 2025 11:32:49 -0400 Subject: [PATCH 5/5] mesa-asahi: transitional dummy package for mesa --- srcpkgs/mesa-asahi/patches/musl-endian.patch | 19 --- .../mesa-asahi/patches/musl-stacksize.patch | 37 ----- srcpkgs/mesa-asahi/patches/musl.patch | 40 ----- srcpkgs/mesa-asahi/template | 146 +++--------------- srcpkgs/mesa-asahi/update | 1 - 5 files changed, 21 insertions(+), 222 deletions(-) delete mode 100644 srcpkgs/mesa-asahi/patches/musl-endian.patch delete mode 100644 srcpkgs/mesa-asahi/patches/musl-stacksize.patch delete mode 100644 srcpkgs/mesa-asahi/patches/musl.patch delete mode 100644 srcpkgs/mesa-asahi/update diff --git a/srcpkgs/mesa-asahi/patches/musl-endian.patch b/srcpkgs/mesa-asahi/patches/musl-endian.patch deleted file mode 100644 index 57b3cc3d09f8ee..00000000000000 --- a/srcpkgs/mesa-asahi/patches/musl-endian.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/src/util/u_endian.h 2017-12-21 18:31:22.000000000 +0100 -+++ b/src/util/u_endian.h 2017-12-26 09:22:52.597199480 +0100 -@@ -68,6 +68,16 @@ - - #define PIPE_ARCH_LITTLE_ENDIAN - -+#else -+/* Musl libc */ -+#include -+ -+#if __BYTE_ORDER == __LITTLE_ENDIAN -+# define PIPE_ARCH_LITTLE_ENDIAN -+#elif __BYTE_ORDER == __BIG_ENDIAN -+# define PIPE_ARCH_BIG_ENDIAN -+#endif -+ - #endif - - #endif diff --git a/srcpkgs/mesa-asahi/patches/musl-stacksize.patch b/srcpkgs/mesa-asahi/patches/musl-stacksize.patch deleted file mode 100644 index cf5b2cd1fb914f..00000000000000 --- a/srcpkgs/mesa-asahi/patches/musl-stacksize.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/src/c11/impl/threads_posix.c 2022-10-04 16:30:04.564345425 -0400 -+++ b/src/c11/impl/threads_posix.c 2022-10-04 16:43:51.794135619 -0400 -@@ -255,18 +255,33 @@ - thrd_create(thrd_t *thr, thrd_start_t func, void *arg) - { - struct impl_thrd_param *pack; -+#ifdef __GLIBC__ -+ pthread_attr_t *attrp = NULL; -+#else -+ pthread_attr_t attr = { 0 }; -+ pthread_attr_init(&attr); -+ pthread_attr_setstacksize(&attr, 8388608); -+ pthread_attr_t *attrp = &attr; -+#endif - assert(thr != NULL); - pack = (struct impl_thrd_param *)malloc(sizeof(struct impl_thrd_param)); - if (!pack) return thrd_nomem; - pack->func = func; - pack->arg = arg; -- if (pthread_create(thr, NULL, impl_thrd_routine, pack) != 0) { -+ if (pthread_create(thr, attrp, impl_thrd_routine, pack) != 0) { -+#ifndef __GLIBC__ -+ pthread_attr_destroy(&attr); -+#endif - free(pack); - return thrd_error; - } -+#ifndef __GLIBC__ -+ pthread_attr_destroy(&attr); -+#endif - return thrd_success; - } - -+ - // 7.25.5.2 - thrd_t - thrd_current(void) diff --git a/srcpkgs/mesa-asahi/patches/musl.patch b/srcpkgs/mesa-asahi/patches/musl.patch deleted file mode 100644 index d50221dee72a34..00000000000000 --- a/srcpkgs/mesa-asahi/patches/musl.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/src/util/rand_xor.c 2020-10-03 12:27:48.489024729 +0200 -+++ b/src/util/rand_xor.c 2020-10-03 12:31:05.927113521 +0200 -@@ -28,6 +28,7 @@ - #if defined(HAVE_GETRANDOM) - #include - #endif -+#include /* size_t, ssize_t */ - #include - #include - #endif ---- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h -+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h -@@ -30,6 +30,7 @@ - - #include - #include -+#include - #include "util/list.h" - #include "util/rwlock.h" - #include "ac_gpu_info.h" ---- a/src/gallium/frontends/nine/nine_debug.c 2020-03-06 07:46:48.278918421 +0100 -+++ b/src/gallium/frontends/nine/nine_debug.c 2020-03-06 07:51:32.919964119 +0100 -@@ -65,7 +65,7 @@ _nine_debug_printf( unsigned long flag, - { - static boolean first = TRUE; - static unsigned long dbg_flags = DBG_ERROR | DBG_WARN; -- unsigned long tid = 0; -+ pthread_t tid = 0; - - if (first) { - first = FALSE; -@@ -74,7 +74,7 @@ _nine_debug_printf( unsigned long flag, - - #if defined(HAVE_PTHREAD) - if (dbg_flags & DBG_TID) -- tid = (unsigned long)pthread_self(); -+ tid = pthread_self(); - #endif - - if (dbg_flags & flag) { diff --git a/srcpkgs/mesa-asahi/template b/srcpkgs/mesa-asahi/template index 676dcf8dd32035..0c773f4c6e838e 100644 --- a/srcpkgs/mesa-asahi/template +++ b/srcpkgs/mesa-asahi/template @@ -1,168 +1,64 @@ # Template file for 'mesa-asahi' pkgname=mesa-asahi -version=25.1.0+20250425 +version=25.1.1 revision=1 -_llvmver=19 -_mesaver=${version%+*} -archs="aarch64*" -build_style=meson -build_helper="qemu" -#Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911 -configure_args="-Dglvnd=enabled -Dgbm=enabled -Degl=enabled - -Dgles1=enabled -Dgles2=enabled -Dglx=dri - -Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland) - -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17 - -Dgallium-vdpau=enabled -Dgallium-va=enabled - -Dvulkan-drivers=swrast,virtio,asahi -Dvulkan-layers=device-select,overlay - -Dgallium-drivers=asahi,virgl,zink,llvmpipe - -Dgallium-rusticl=true -Drust_std=2021" -hostmakedepends="gettext flex pkg-config python3-Mako glslang llvm${_llvmver} - $(vopt_if wayland 'wayland-protocols wayland-devel') python3-pycparser python3-yaml - clang${_llvmver} rust rust-bindgen" -makedepends="elfutils-devel expat-devel libXdamage-devel - libXxf86vm-devel libdrm-devel libffi-devel libva-devel - libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel - $(vopt_if wayland 'wayland-devel wayland-protocols') llvm${_llvmver}-devel libsensors-devel - libXrandr-devel libglvnd-devel libzstd-devel libxml2-devel lua53-devel - libarchive-devel vulkan-loader clang${_llvmver} libclc${_llvmver} rust - SPIRV-LLVM-Translator${_llvmver}-devel SPIRV-Tools-devel" -depends="libglvnd" -short_desc="Open source implementation of OpenGL and Vulkan - Asahi" +depends="mesa>=${version}_1" +short_desc="Mesa - Asahi (transitional dummy package)" maintainer="dkwo " -license="MIT, LGPL-2.1-or-later" +license="Public Domain" homepage="https://www.mesa3d.org/" changelog="https://docs.mesa3d.org/relnotes.html" -distfiles="https://gitlab.freedesktop.org/asahi/mesa/-/archive/asahi-${version#*+}/mesa-asahi-${version#*+}.tar.gz" -checksum=1008a7a245276203a39021d914b4ecc386f33ff50cd872817955c14550a928da -replaces="mesa>=0 mesa-libgallium>=0 libglapi>=0" -provides="mesa-${_mesaver}_${revision} mesa-libgallium-${_mesaver}_${revision} libglapi-${_mesaver}_${revision}" -shlib_provides="libglapi.so libgallium-${_mesaver}-devel.so" +metapackage=yes # alphabetical order is not good subpackages="libgbm-asahi libgbm-asahi-devel MesaLib-asahi-devel mesa-asahi-opencl mesa-asahi-vaapi mesa-asahi-vdpau mesa-asahi-vulkan-overlay-layer mesa-asahi-dri" -build_options="wayland" -build_options_default="wayland" - -# Replace old mesa pkgs, superseded by libglvnd. -replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2" - -post_configure() { - if [ "$CROSS_BUILD" ]; then - find -iname "*.ninja" -exec sed -i "{}" \ - -e "/rustc/s; --sysroot ${XBPS_CROSS_BASE}/usr;;g" \ - -e "s|-isystem/usr/include||g" \ - \; - fi -} - -post_install() { - vlicense docs/license.rst - - # ensure that each eligible architecture ships its multilib icd files - # in some cases, multiple counterpart architectures may exist (aarch64) - # this allows us to not have to ship these files in the current *-32bit packages - local arch=${XBPS_TARGET_MACHINE%-*} - local oarchs - local olibdir="/usr/lib32/" - if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then - olibdir="/usr/lib64/" - fi - oarchs="armv6l armv7l" - for oarch in $oarchs; do - for icd in ${DESTDIR}/usr/share/vulkan/icd.d/*_icd.${arch}.json; do - sed "s#/usr/lib${XBPS_TARGET_WORDSIZE}/#${olibdir}#g" \ - ${icd} > ${icd/.${arch}/.${oarch}} - done - done -} - libgbm-asahi_package() { + metapackage=yes + depends="libgbm" short_desc="Mesa Generic buffer management API - runtime" - replaces="libgbm>=0" - provides="libgbm-${_mesaver}_${revision}" - pkg_install() { - vmove "usr/lib/libgbm.so.*" - } } libgbm-asahi-devel_package() { + metapackage=yes + depends="libgbm-devel" short_desc="Mesa Generic buffer management API - development files" - depends="libgbm-asahi>=${version}_${revision}" - replaces="libgbm-devel>=0" - provides="libgbm-devel-${_mesaver}_${revision}" - pkg_install() { - vmove usr/include/gbm.h - vmove usr/lib/libgbm.so - vmove usr/lib/pkgconfig/gbm.pc - } } MesaLib-asahi-devel_package() { - depends="mesa-asahi>=${version}_${revision} - libgbm-asahi-devel>=${version}_${revision} libdrm-devel libglvnd-devel" - replaces="MesaLib-devel>=0" - provides="MesaLib-devel-${_mesaver}_${revision}" + metapackage=yes + depends="MesaLib-devel" short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove usr/lib/libEGL_mesa.so - vmove usr/lib/libGLX_mesa.so - } } mesa-asahi-dri_package() { + metapackage=yes + depends="mesa-dri" short_desc="Mesa DRI drivers" - depends="mesa-asahi-${version}_${revision}" - replaces="mesa-dri>=0" - provides="mesa-dri-${_mesaver}_${revision}" - shlib_provides="libgallium_dri.so" # workaround for mesa-dri-32bit - pkg_install() { - vmove usr/lib/dri - } } mesa-asahi-opencl_package() { + metapackage=yes + depends="mesa-opencl" short_desc="Mesa implementation of OpenCL (r600+ only)" - depends="libclc${_llvmver}" - replaces="mesa-opencl>=0" - provides="mesa-opencl-${_mesaver}_${revision}" - pkg_install() { - vmove etc/OpenCL - vmove "usr/lib/libRusticlOpenCL.so.*" - } } mesa-asahi-vaapi_package() { + metapackage=yes + depends="mesa-vaapi" short_desc="Mesa VA-API drivers" - replaces="mesa-vaapi>=0" - provides="mesa-vaapi-${_mesaver}_${revision}" - shlib_provides="libgallium_drv_video.so" # workaround for mesa-vaapi-32bit - pkg_install() { - vmove "usr/lib/dri/*_drv_video.so" - } } mesa-asahi-vdpau_package() { + metapackage=yes + depends="mesa-vdpau" short_desc="Mesa VDPAU drivers" - replaces="mesa-vdpau>=0" - provides="mesa-vdpau-${_mesaver}_${revision}" - pkg_install() { - vmove "usr/lib/vdpau/libvdpau_*" - } } mesa-asahi-vulkan-overlay-layer_package() { + metapackage=yes + depends="mesa-vulkan-overlay-layer" short_desc="Vulkan layer to display information about the running application" - replaces="mesa-vulkan-overlay-layer>=0" - provides="mesa-vulkan-overlay-layer-${_mesaver}_${revision}" - pkg_install() { - vmove "usr/share/vulkan/explicit_layer.d/VkLayer_*.json" - vmove "usr/share/vulkan/implicit_layer.d/VkLayer_*.json" - vmove "usr/bin/mesa-overlay-control.py" - vmove "usr/lib/libVkLayer_*.so" - } } diff --git a/srcpkgs/mesa-asahi/update b/srcpkgs/mesa-asahi/update deleted file mode 100644 index de8448d05b2b90..00000000000000 --- a/srcpkgs/mesa-asahi/update +++ /dev/null @@ -1 +0,0 @@ -version=${version#*+}