aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn <me@johnnynator.dev>2025-01-10 21:17:19 +0000
committerJohn Zimmermann <me@johnzimmermann.de>2025-01-11 12:37:40 +0000
commit124a0baea56059208235151661da30e43862a13e (patch)
treeca0d1aef2e67a9397dfa894d5acf54cbbcbc8938
parentaedf01408e3ce3bcf6bdca40d080c261bc5ffbdc (diff)
downloadvoid-packages-124a0baea56059208235151661da30e43862a13e.tar
void-packages-124a0baea56059208235151661da30e43862a13e.tar.gz
void-packages-124a0baea56059208235151661da30e43862a13e.tar.bz2
void-packages-124a0baea56059208235151661da30e43862a13e.tar.lz
void-packages-124a0baea56059208235151661da30e43862a13e.tar.xz
void-packages-124a0baea56059208235151661da30e43862a13e.tar.zst
void-packages-124a0baea56059208235151661da30e43862a13e.zip
mesa: fix softpipe/non llvmpipe build
lavapipe/swrast vk hard depends on llvmpipe and does not work with softpipe
-rw-r--r--srcpkgs/mesa/template16
1 files changed, 12 insertions, 4 deletions
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 85f030b489f..a8538d69cc3 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -35,8 +35,9 @@ build_options_default="wayland"
# especially on big endian it's all kinds of broken, and e.g. on
# 32-bit powerpc it does not work at all, so fall back to softpipe
case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*|aarch64*|ppc64le*|arm*) ;;
- *) configure_args+=" -Ddraw-use-llvm=false" ;;
+ i686*|x86_64*|aarch64*|ppc64le*|arm*|riscv64*)
+ _have_llvmpipe=yes
+ ;;
esac
# Set subpackages manually to set proper rdeps in 32bit pkgs.
@@ -51,8 +52,7 @@ replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2"
# swrast always present
_gallium_drivers=" -Dgallium-drivers=swrast"
-_vulkan_drivers=" -Dvulkan-drivers=swrast"
-subpackages+=" mesa-vulkan-lavapipe"
+_vulkan_drivers=" -Dvulkan-drivers="
# amd and nvidia drivers on all platforms except where it makes no sense
# amd implicitly enables clover opencl, also enable hwdec and virgl too
@@ -79,6 +79,13 @@ case "$XBPS_TARGET_MACHINE" in
;;
esac
+if [ "$_have_llvmpipe" ]; then
+ subpackages+=" mesa-vulkan-lavapipe"
+ _vulkan_drivers+=",swrast"
+else
+ configure_args+=" -Ddraw-use-llvm=false"
+fi
+
if [ "$_have_amd" ]; then
# amd cards can use clover
_have_opencl=yes
@@ -217,6 +224,7 @@ post_install() {
ppc64) oarchs="ppc";;
ppcle) oarchs="ppc64le";;
ppc) oarchs="ppc64";;
+ riscv64) oarchs="riscv64";;
*) ;; # no counterparts
esac
for oarch in $oarchs; do