Commit e539472f authored by Gleb Popov's avatar Gleb Popov
Browse files

graphics/mesa-gallium-v{a,dpau}: Merge into graphics/mesa-dri

parent b91b541f

MOVED

+2 −0
Original line number Diff line number Diff line
@@ -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

graphics/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -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

graphics/mesa-dri/Makefile

+13 −2
Original line number Diff line number Diff line
@@ -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

graphics/mesa-dri/pkg-plist

+10 −0
Original line number Diff line number Diff line
@@ -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

graphics/mesa-gallium-va/Makefile

deleted100644 → 0
+0 −91
Original line number Diff line number Diff line 
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>