[Bug 296405] graphics/mesa-libs: build fails on armv7 (Feature gallium-va cannot be enabled)

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=296405

--- Comment #9 from Gleb Popov <[email protected]> ---
What about enabling virgl unconditionally, like upstream does? Please try this:

diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile
index 0a609a5af596..921a74b7ab1c 100644
--- a/graphics/mesa-dri/Makefile
+++ b/graphics/mesa-dri/Makefile
@@ -13,7 +13,7 @@ LIB_DEPENDS+= libgallium-${MESAVERSION}.so:graphics/mesa-libs
\

 USES+=         llvm:lib,noexport

-GALLIUM_DRIVERS=       zink
+GALLIUM_DRIVERS=       virgl zink

 OPTIONS_DEFINE=                ZSTD
 OPTIONS_GROUP=         GALLIUM PLATFORM VULKAN
diff --git a/graphics/mesa-dri/pkg-plist b/graphics/mesa-dri/pkg-plist
index 12b1d77c49ea..564f1d9c8e07 100644
--- a/graphics/mesa-dri/pkg-plist
+++ b/graphics/mesa-dri/pkg-plist
@@ -45,6 +45,8 @@
 %%X11%%lib/dri/sun4i-drm_dri.so
 %%X11%%%%llvmpipe%%lib/dri/swrast_dri.so
 %%X11%%lib/dri/udl_dri.so
+%%X11%%lib/dri/virtio_gpu_dri.so
+lib/dri/virtio_gpu_drv_video.so
 %%X11%%lib/dri/vkms_dri.so
 %%X11%%%%svga%%lib/dri/vmwgfx_dri.so
 %%X11%%lib/dri/zink_dri.so
diff --git a/graphics/mesa-libs/Makefile b/graphics/mesa-libs/Makefile
index 5ccbf75018ce..5d7125ecf7dc 100644
--- a/graphics/mesa-libs/Makefile
+++ b/graphics/mesa-libs/Makefile
@@ -47,13 +47,11 @@ LDFLAGS_i386=       -Wl,-znotext
 # a real gallium driver set so install_megadrivers actually ships the lib;
 # the per-driver lib/dri/*_dri.so shims that fall out of this build are
 # stripped in post-install (they belong to graphics/mesa-dri).
-GALLIUM_DRIVERS=       crocus i915 iris llvmpipe panfrost r300 r600 radeonsi
svga zink
+GALLIUM_DRIVERS=       crocus i915 iris llvmpipe panfrost r300 r600 radeonsi \
+                       svga virgl zink
 .if ${ARCH} != amd64 && ${ARCH} != i386 && ${ARCH} != x86_64
 GALLIUM_DRIVERS:=      ${GALLIUM_DRIVERS:Ncrocus:Ni915:Niris:Nsvga}
 .endif
-.if ${ARCH} == armv7
-GALLIUM_DRIVERS=       llvmpipe
-.endif

 MESON_ARGS+=   -Dgallium-drivers=${GALLIUM_DRIVERS:ts,}
 MESON_ARGS+=   -Dvulkan-drivers=""

-- 
You are receiving this mail because:
You are the assignee for the bug.