From 2381de3afdefdc2218ef43b77e83e71cc7d2668f Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Thu, 25 Jan 2024 11:00:07 -0800 Subject: [PATCH] main/mesa: increase provider_priority to 100 Make it so that other mesa forks in aports are always lower than this package, so this package is always preferred when building things against mesa. --- main/mesa/APKBUILD | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/main/mesa/APKBUILD b/main/mesa/APKBUILD index 4b814fc1b02..60f4b4122e6 100644 --- a/main/mesa/APKBUILD +++ b/main/mesa/APKBUILD @@ -206,12 +206,14 @@ build() { } package() { + provider_priority=100 DESTDIR="$pkgdir" meson install --no-rebuild -C output } egl() { pkgdesc="Mesa libEGL runtime libraries" depends="mesa=$pkgver-r$pkgrel" + provider_priority=100 amove usr/lib/libEGL.so* } @@ -219,6 +221,7 @@ egl() { gl() { pkgdesc="Mesa libGL runtime libraries" depends="mesa=$pkgver-r$pkgrel" + provider_priority=100 amove usr/lib/libGL.so* } @@ -226,6 +229,7 @@ gl() { glapi() { pkgdesc="Mesa shared glapi" replaces="$pkgname-gles=$pkgver-r$pkgrel" + provider_priority=100 amove usr/lib/libglapi.so.* } @@ -233,6 +237,7 @@ glapi() { gles() { pkgdesc="Mesa libGLESv2 runtime libraries" depends="mesa=$pkgver-r$pkgrel" + provider_priority=100 amove usr/lib/libGLES*.so* } @@ -240,6 +245,7 @@ gles() { xatracker() { pkgdesc="Mesa XA state tracker for vmware" depends="mesa=$pkgver-r$pkgrel" + provider_priority=100 amove usr/lib/libxatracker*.so.* } @@ -247,6 +253,7 @@ xatracker() { osmesa() { pkgdesc="Mesa offscreen rendering libraries" depends="mesa=$pkgver-r$pkgrel" + provider_priority=100 amove usr/lib/libOSMesa.so.* } @@ -254,6 +261,7 @@ osmesa() { gbm() { pkgdesc="Mesa gbm library" depends="mesa=$pkgver-r$pkgrel" + provider_priority=100 amove usr/lib/libgbm.so.* } @@ -261,6 +269,7 @@ gbm() { libd3dadapter9() { pkgdesc="Mesa directx9 adapter" depends="mesa=$pkgver-r$pkgrel" + provider_priority=100 amove usr/lib/d3d/d3dadapter9.so* } @@ -268,6 +277,7 @@ libd3dadapter9() { rusticl() { pkgdesc="Mesa OpenCL driver" depends="mesa=$pkgver-r$pkgrel clang$_llvmver-headers libclc~$_llvmver" + provider_priority=100 amove usr/lib/libRusticlOpenCL.so.* amove etc/OpenCL/vendors/ @@ -298,6 +308,7 @@ _mv_vulkan() { _gallium() { pkgdesc="Mesa gallium DRI drivers" depends="mesa=$pkgver-r$pkgrel" + provider_priority=100 # libgallium_dri.so _mv_links $_dri_driverdir swrast_dri.so @@ -307,6 +318,7 @@ _va() { local n=${subpkgname##*-va-} pkgdesc="Mesa $n VAAPI drivers" depends="mesa=$pkgver-r$pkgrel libva" + provider_priority=100 case $n in gallium) @@ -319,6 +331,7 @@ _vdpau() { local n=${subpkgname##*-vdpau-} pkgdesc="Mesa $n VDPAU drivers" depends="mesa=$pkgver-r$pkgrel libvdpau" + provider_priority=100 case $n in gallium) @@ -331,6 +344,7 @@ _vulkan() { local n=${subpkgname##*-vulkan-} pkgdesc="Mesa Vulkan API driver for $n" depends="mesa=$pkgver-r$pkgrel" + provider_priority=100 case $n in ati) @@ -351,12 +365,14 @@ _vulkan() { _vulkan_layers() { pkgdesc="collection of vulkan layers from mesa" depends="python3" + provider_priority=100 # Remove this after the release of the next stable (3.14) # it originally was claed layer as it only packaged the # overlay one but now it also packages device-select and # intel-nullhw (on x86*) provides="$pkgname-vulkan-layer=$pkgver-r$pkgrel" + provider_priority=100 replaces="$pkgname-vulkan-layer=$pkgver-r$pkgrel" amove usr/share/vulkan/explicit_layer.d