git: e539472f26f0 - main - graphics/mesa-gallium-v{a,dpau}: Merge into graphics/mesa-dri
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 15 Jun 2026 15:56:23 UTC
The branch main has been updated by arrowd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=e539472f26f048d9604a17186a8f443d7fef58e2
commit e539472f26f048d9604a17186a8f443d7fef58e2
Author: Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2026-05-15 14:58:57 +0000
Commit: Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2026-06-15 15:54:32 +0000
graphics/mesa-gallium-v{a,dpau}: Merge into graphics/mesa-dri
---
MOVED | 2 +
graphics/Makefile | 2 -
graphics/mesa-dri/Makefile | 15 +++++-
graphics/mesa-dri/pkg-plist | 10 ++++
graphics/mesa-gallium-va/Makefile | 91 -----------------------------------
graphics/mesa-gallium-va/pkg-descr | 7 ---
graphics/mesa-gallium-va/pkg-plist | 23 ---------
graphics/mesa-gallium-vdpau/Makefile | 76 -----------------------------
graphics/mesa-gallium-vdpau/pkg-descr | 7 ---
graphics/mesa-gallium-vdpau/pkg-plist | 32 ------------
10 files changed, 25 insertions(+), 240 deletions(-)
diff --git a/MOVED b/MOVED
index 1857b7f5534a..6691dbefa092 100644
--- a/MOVED
+++ b/MOVED
@@ -5345,3 +5345,5 @@ audio/freebsd-13-mixer||2026-06-13|Discontinued
java/openjdk24||2026-06-14|Has expired: No longer supported by upstream
devel/simian||2026-06-14|Has expired: does not fetch
net/pecl-oauth2|net/php-oauth|2026-06-14|Renamed to avoid confusion between implemented protocol and library version. Also, pecl repository is deprecated
+graphics/mesa-gallium-va|graphics/mesa-dri|2026-06-15|Merged into graphics/mesa-dri
+graphics/mesa-gallium-vdpau|graphics/mesa-dri|2026-06-15|Merged into graphics/mesa-dri
diff --git a/graphics/Makefile b/graphics/Makefile
index 4f32e196ae73..f9080887fbdf 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -602,8 +602,6 @@
SUBDIR += mesa-demos
SUBDIR += mesa-devel
SUBDIR += mesa-dri
- SUBDIR += mesa-gallium-va
- SUBDIR += mesa-gallium-vdpau
SUBDIR += mesa-gallium-xa
SUBDIR += mesa-libs
SUBDIR += metacam
diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile
index fe3e236e72a4..0cb50722fb12 100644
--- a/graphics/mesa-dri/Makefile
+++ b/graphics/mesa-dri/Makefile
@@ -42,7 +42,15 @@ llvmpipe_DESC= Software Rasterizer
panfrost_DESC= ARM Midgard and Bifrost
r300_DESC= AMD/ATI R300, R400 and R500
r600_DESC= AMD/ATI R600, R700, Evergreen, Northern Islands
+r600_BUILD_DEPENDS= libva>=0:multimedia/libva \
+ libvdpau>=0:multimedia/libvdpau
+r600_MESON_ON= -Dgallium-va=enabled \
+ -Dgallium-vdpau=enabled
radeonsi_DESC= AMD/ATI Southern Islands and newer
+radeonsi_BUILD_DEPENDS= libva>=0:multimedia/libva \
+ libvdpau>=0:multimedia/libvdpau
+radeonsi_MESON_ON= -Dgallium-va=enabled \
+ -Dgallium-vdpau=enabled
svga_DESC= VMWare Virtual GPU
zink_DESC= OpenGL on top of Khronos’ Vulkan API
@@ -100,8 +108,6 @@ MESON_ARGS+= -Dvideo-codecs="vc1dec,h264dec,h264enc,h265dec,h265enc,av1dec,av1en
# Disable some options
MESON_ARGS+= -Dandroid-libbacktrace=disabled \
- -Dgallium-vdpau=disabled \
- -Dgallium-va=disabled \
-Dgles1=enabled \
-Dgles2=enabled \
-Dglvnd=disabled \
@@ -111,6 +117,11 @@ MESON_ARGS+= -Dandroid-libbacktrace=disabled \
-Dmicrosoft-clc=disabled \
-Dvalgrind=disabled
+.if !${PORT_OPTIONS:Mr600} && !${PORT_OPTIONS:Mradeonsi}
+MESON_ARGS+= -Dgallium-va=disabled \
+ -Dgallium-vdpau=disabled
+.endif
+
.if ${ARCH} != amd64
MESON_ARGS+= -Dintel-rt=disabled # https://gitlab.freedesktop.org/mesa/mesa/-/issues/10629
.endif
diff --git a/graphics/mesa-dri/pkg-plist b/graphics/mesa-dri/pkg-plist
index 6288ae10fb87..b5c8b5667342 100644
--- a/graphics/mesa-dri/pkg-plist
+++ b/graphics/mesa-dri/pkg-plist
@@ -6,7 +6,9 @@ lib/dri/libdril_dri.so
%%panfrost%%lib/dri/rockchip_dri.so
%%r300%%lib/dri/r300_dri.so
%%r600%%lib/dri/r600_dri.so
+%%r600%%lib/dri/r600_drv_video.so
%%radeonsi%%lib/dri/radeonsi_dri.so
+%%radeonsi%%lib/dri/radeonsi_drv_video.so
%%svga%%lib/dri/vmwgfx_dri.so
%%llvmpipe%%lib/dri/kms_swrast_dri.so
%%llvmpipe%%lib/dri/swrast_dri.so
@@ -26,6 +28,14 @@ lib/dri/libdril_dri.so
%%anv%%lib/libvulkan_intel.so
%%radv%%lib/libvulkan_radeon.so
%%swrast_vk%%lib/libvulkan_lvp.so
+%%r600%%lib/vdpau/libvdpau_r600.so
+%%r600%%lib/vdpau/libvdpau_r600.so.1
+%%r600%%lib/vdpau/libvdpau_r600.so.1.0
+%%r600%%lib/vdpau/libvdpau_r600.so.1.0.0
+%%radeonsi%%lib/vdpau/libvdpau_radeonsi.so
+%%radeonsi%%lib/vdpau/libvdpau_radeonsi.so.1
+%%radeonsi%%lib/vdpau/libvdpau_radeonsi.so.1.0
+%%radeonsi%%lib/vdpau/libvdpau_radeonsi.so.1.0.0
share/drirc.d/00-mesa-defaults.conf
%%radv%%share/drirc.d/00-radv-defaults.conf
share/drirc.d/01-freebsd.conf
diff --git a/graphics/mesa-gallium-va/Makefile b/graphics/mesa-gallium-va/Makefile
deleted file mode 100644
index c9f47f2d85de..000000000000
--- a/graphics/mesa-gallium-va/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-PORTNAME= mesa-gallium-va
-PORTVERSION= ${MESAVERSION}
-CATEGORIES= graphics
-
-COMMENT= Mesa Gallium VAAPI drivers
-WWW= https://www.mesa3d.org/
-
-LICENSE= MIT
-LICENSE_FILE= ${WRKSRC}/docs/license.rst
-
-ONLY_FOR_ARCHS= aarch64 i386 amd64 powerpc64 powerpc64le
-ONLY_FOR_ARCHS_REASON= used only by AMD/Radeon hardware
-
-BUILD_DEPENDS= libva>=0:multimedia/libva
-LIB_DEPENDS= libzstd.so:archivers/zstd \
- libgallium-${MESAVERSION}.so:graphics/mesa-libs
-
-USES= llvm:lib,noexport
-
-OPTIONS_DEFINE= X11
-OPTIONS_GROUP= GALLIUM
-OPTIONS_DEFAULT= X11
-OPTIONS_SUB= yes
-
-X11_DESC= Enable X11 support
-X11_USES= xorg
-X11_USE= xorg=xorgproto,x11,xcb,xdamage,xext,xfixes,xshmfence,xxf86vm,xrandr
-
-OPTIONS_GROUP_GALLIUM= radeonsi r600
-GALLIUM_DESC= Gallium Video Drivers
-radeonsi_DESC= AMD/ATI Southern Islands and newer
-r600_DESC= AMD/ATI R600, R700, Evergreen, Northern Islands
-OPTIONS_EXCLUDE+= ${ARCH:Mi386:C/.+/radeonsi/}
-
-MESON_ARGS+= -Dgallium-drivers=${GALLIUM_DRIVERS:ts,}
-. for _gd in ${OPTIONS_GROUP_GALLIUM}
-OPTIONS_DEFAULT+= ${_gd}
-${_gd}_VARS+= GALLIUM_DRIVERS+=${_gd}
-. endfor
-
-.include <bsd.port.options.mk>
-.include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common"
-
-MESON_ARGS+= -Dvideo-codecs="vc1dec,h264dec,h264enc,h265dec,h265enc,av1dec,av1enc,vp9dec" \
- -Dvulkan-drivers="" \
- -Dandroid-libbacktrace=disabled \
- -Dgallium-vdpau=disabled \
- -Dgbm=disabled \
- -Dgles1=disabled \
- -Dgles2=disabled \
- -Dglvnd=disabled \
- -Dlmsensors=disabled \
- -Dmicrosoft-clc=disabled \
- -Dvalgrind=disabled \
- -Dglx=disabled
-
-LDFLAGS_i386= -Wl,-znotext
-
-MESON_ARGS+= -Dgallium-va=enabled
-
-.if ${ARCH} != amd64
-MESON_ARGS+= -Dintel-rt=disabled # https://gitlab.freedesktop.org/mesa/mesa/-/issues/10629
-.endif
-
-.for _gd in ${OPTIONS_GROUP_GALLIUM}
-. if defined(GALLIUM_DRIVERS) && ${GALLIUM_DRIVERS:M${_gd}}
-PLIST_SUB+= ${_gd}=""
-. else
-PLIST_SUB+= ${_gd}="@comment "
-. endif
-.endfor
-
-.if ${PORT_OPTIONS:MX11}
-MESON_ARGS+= -Dplatforms="x11"
-.else
-MESON_ARGS+= -Dglx=disabled \
- -Degl=disabled \
- -Dopengl=false \
- -Dshared-glapi=disabled \
- -Dxlib-lease=disabled \
- -Dplatforms=""
-.endif
-
-post-install:
-# Mesa 25: libgallium-${MESAVERSION}.so is owned by graphics/mesa-libs.
- ${RM} -f ${STAGEDIR}${PREFIX}/lib/libgallium-${MESAVERSION}.so
- ${RM} -f ${STAGEDIR}${PREFIX}/lib/dri/r300_dri.so
- ${RM} -f ${STAGEDIR}${PREFIX}/lib/dri/r600_dri.so
- ${RM} -f ${STAGEDIR}${PREFIX}/lib/dri/radeonsi_dri.so
-
-.include <bsd.port.post.mk>
diff --git a/graphics/mesa-gallium-va/pkg-descr b/graphics/mesa-gallium-va/pkg-descr
deleted file mode 100644
index 1ba60cda87bb..000000000000
--- a/graphics/mesa-gallium-va/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Mesa is a 3-D graphics library with an API which is very similar to that
-of OpenGL*. To the extent that Mesa utilizes the OpenGL command syntax or
-state machine, it is being used with authorization from Silicon Graphics,
-Inc. However, the author makes no claim that Mesa is in any way a
-compatible replacement for OpenGL or associated with Silicon Graphics, Inc.
-
-VA is a Gallium driver for video decoding on AMD hardware.
diff --git a/graphics/mesa-gallium-va/pkg-plist b/graphics/mesa-gallium-va/pkg-plist
deleted file mode 100644
index 1d4632cf7d73..000000000000
--- a/graphics/mesa-gallium-va/pkg-plist
+++ /dev/null
@@ -1,23 +0,0 @@
-@comment include/EGL/egl.h
-@comment include/EGL/eglext.h
-@comment include/EGL/eglext_angle.h
-@comment include/EGL/eglmesaext.h
-@comment include/EGL/eglplatform.h
-@comment include/GL/gl.h
-@comment include/GL/glcorearb.h
-@comment include/GL/glext.h
-@comment include/GL/internal/dri_interface.h
-@comment include/KHR/khrplatform.h
-@comment lib/dri/r600_dri.so
-%%r600%%lib/dri/r600_drv_video.so
-@comment lib/dri/radeonsi_dri.so
-%%radeonsi%%lib/dri/radeonsi_drv_video.so
-@comment lib/libEGL.so
-@comment lib/libEGL.so.1
-@comment lib/libEGL.so.1.0.0
-@comment lib/libglapi.so
-@comment lib/libglapi.so.0
-@comment lib/libglapi.so.0.0.0
-@comment libdata/pkgconfig/dri.pc
-@comment libdata/pkgconfig/egl.pc
-@comment share/drirc.d/00-mesa-defaults.conf
diff --git a/graphics/mesa-gallium-vdpau/Makefile b/graphics/mesa-gallium-vdpau/Makefile
deleted file mode 100644
index 33ddf93dc2d7..000000000000
--- a/graphics/mesa-gallium-vdpau/Makefile
+++ /dev/null
@@ -1,76 +0,0 @@
-PORTNAME= mesa-gallium-vdpau
-PORTVERSION= ${MESAVERSION}
-CATEGORIES= graphics
-
-COMMENT= Mesa Gallium VDPAU drivers
-WWW= https://www.mesa3d.org/
-
-LICENSE= MIT
-LICENSE_FILE= ${WRKSRC}/docs/license.rst
-
-ONLY_FOR_ARCHS= aarch64 i386 amd64 powerpc64 powerpc64le
-ONLY_FOR_ARCHS_REASON= used only by AMD/Radeon hardware
-
-BUILD_DEPENDS= libvdpau>=0:multimedia/libvdpau
-LIB_DEPENDS= libzstd.so:archivers/zstd \
- libgallium-${MESAVERSION}.so:graphics/mesa-libs
-
-USES= llvm:lib,noexport xorg
-
-USE_XORG= xorgproto x11 xcb xdamage xext xfixes xshmfence xxf86vm xrandr
-
-OPTIONS_GROUP= GALLIUM
-OPTIONS_SUB= yes
-
-OPTIONS_GROUP_GALLIUM= radeonsi r600
-GALLIUM_DESC= Gallium Video Drivers
-radeonsi_DESC= AMD/ATI Southern Islands and newer
-r600_DESC= AMD/ATI R600, R700, Evergreen, Northern Islands
-OPTIONS_EXCLUDE+= ${ARCH:Mi386:C/.+/radeonsi/}
-
-MESON_ARGS+= -Dgallium-drivers=${GALLIUM_DRIVERS:ts,}
-. for _gd in ${OPTIONS_GROUP_GALLIUM}
-OPTIONS_DEFAULT+= ${_gd}
-${_gd}_VARS+= GALLIUM_DRIVERS+=${_gd}
-. endfor
-
-.include <bsd.port.options.mk>
-.include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common"
-
-MESON_ARGS+= -Dvulkan-drivers="" \
- -Dandroid-libbacktrace=disabled \
- -Dgallium-va=disabled \
- -Dgbm=disabled \
- -Dgles1=disabled \
- -Dgles2=disabled \
- -Dglvnd=disabled \
- -Dlmsensors=disabled \
- -Dmicrosoft-clc=disabled \
- -Dvalgrind=disabled \
- -Dglx=disabled
-
-LDFLAGS_i386= -Wl,-znotext
-
-MESON_ARGS+= -Dplatforms="x11" \
- -Dgallium-vdpau=enabled
-
-.if ${ARCH} != amd64
-MESON_ARGS+= -Dintel-rt=disabled # https://gitlab.freedesktop.org/mesa/mesa/-/issues/10629
-.endif
-
-.for _gd in ${OPTIONS_GROUP_GALLIUM}
-. if defined(GALLIUM_DRIVERS) && ${GALLIUM_DRIVERS:M${_gd}}
-PLIST_SUB+= ${_gd}=""
-. else
-PLIST_SUB+= ${_gd}="@comment "
-. endif
-.endfor
-
-post-install:
-# Mesa 25: libgallium-${MESAVERSION}.so is owned by graphics/mesa-libs.
- ${RM} -f ${STAGEDIR}${PREFIX}/lib/libgallium-${MESAVERSION}.so
- ${RM} -f ${STAGEDIR}${PREFIX}/lib/dri/r300_dri.so
- ${RM} -f ${STAGEDIR}${PREFIX}/lib/dri/r600_dri.so
- ${RM} -f ${STAGEDIR}${PREFIX}/lib/dri/radeonsi_dri.so
-
-.include <bsd.port.post.mk>
diff --git a/graphics/mesa-gallium-vdpau/pkg-descr b/graphics/mesa-gallium-vdpau/pkg-descr
deleted file mode 100644
index 51e93e2c6244..000000000000
--- a/graphics/mesa-gallium-vdpau/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Mesa is a 3-D graphics library with an API which is very similar to that
-of OpenGL*. To the extent that Mesa utilizes the OpenGL command syntax or
-state machine, it is being used with authorization from Silicon Graphics,
-Inc. However, the author makes no claim that Mesa is in any way a
-compatible replacement for OpenGL or associated with Silicon Graphics, Inc.
-
-VDPAU is a Gallium driver for video decoding on AMD hardware.
diff --git a/graphics/mesa-gallium-vdpau/pkg-plist b/graphics/mesa-gallium-vdpau/pkg-plist
deleted file mode 100644
index 8d03b4978739..000000000000
--- a/graphics/mesa-gallium-vdpau/pkg-plist
+++ /dev/null
@@ -1,32 +0,0 @@
-@comment include/EGL/egl.h
-@comment include/EGL/eglext.h
-@comment include/EGL/eglext_angle.h
-@comment include/EGL/eglmesaext.h
-@comment include/EGL/eglplatform.h
-@comment include/GL/gl.h
-@comment include/GL/glcorearb.h
-@comment include/GL/glext.h
-@comment include/GL/internal/dri_interface.h
-@comment include/KHR/khrplatform.h
-@comment lib/dri/r300_dri.so
-@comment lib/dri/r600_dri.so
-@comment lib/dri/r600_drv_video.so
-@comment lib/dri/radeonsi_dri.so
-@comment lib/dri/radeonsi_drv_video.so
-@comment lib/libEGL.so
-@comment lib/libEGL.so.1
-@comment lib/libEGL.so.1.0.0
-@comment lib/libglapi.so
-@comment lib/libglapi.so.0
-@comment lib/libglapi.so.0.0.0
-%%r600%%lib/vdpau/libvdpau_r600.so
-%%r600%%lib/vdpau/libvdpau_r600.so.1
-%%r600%%lib/vdpau/libvdpau_r600.so.1.0
-%%r600%%lib/vdpau/libvdpau_r600.so.1.0.0
-%%radeonsi%%lib/vdpau/libvdpau_radeonsi.so
-%%radeonsi%%lib/vdpau/libvdpau_radeonsi.so.1
-%%radeonsi%%lib/vdpau/libvdpau_radeonsi.so.1.0
-%%radeonsi%%lib/vdpau/libvdpau_radeonsi.so.1.0.0
-@comment libdata/pkgconfig/dri.pc
-@comment libdata/pkgconfig/egl.pc
-@comment share/drirc.d/00-mesa-defaults.conf