git: 5b77a1e28d48 - main - multimedia/qt6-multimedia: track X11 dependencies after 230148d80ee0

From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Thu, 27 Jul 2023 17:58:20 UTC
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5b77a1e28d483d01e8c137441c4fe697ec6b5f24

commit 5b77a1e28d483d01e8c137441c4fe697ec6b5f24
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-07-27 17:43:32 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-07-27 17:57:43 +0000

    multimedia/qt6-multimedia: track X11 dependencies after 230148d80ee0
    
    ====> Running Q/A tests (stage-qa)
    Error: /usr/local/lib/qt6/plugins/multimedia/libffmpegmediaplugin.so is linked to /usr/local/lib/libX11.so.6 from x11/libX11 but it is not declared as a dependency
    Warning: you need USE_XORG+=x11
    Error: /usr/local/lib/qt6/plugins/multimedia/libffmpegmediaplugin.so is linked to /usr/local/lib/libXrandr.so.2 from x11/libXrandr but it is not declared as a dependency
    Warning: you need USE_XORG+=xrandr
    Error: /usr/local/lib/qt6/plugins/multimedia/libffmpegmediaplugin.so is linked to /usr/local/lib/libXext.so.6 from x11/libXext but it is not declared as a dependency
    Warning: you need USE_XORG+=xext
    
    PR:             272736
    Reported by:    Florian Walpen
    Regressed by:   https://codereview.qt-project.org/c/qt/qtmultimedia/+/459506
---
 multimedia/qt6-multimedia/Makefile | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/multimedia/qt6-multimedia/Makefile b/multimedia/qt6-multimedia/Makefile
index 3c1f7bb4a121..be19b62592ae 100644
--- a/multimedia/qt6-multimedia/Makefile
+++ b/multimedia/qt6-multimedia/Makefile
@@ -18,8 +18,8 @@ USE_QT=		base declarative shadertools svg
 CXXFLAGS_powerpc64=	-mvsx
 CFLAGS_powerpc=	-DPFFFT_SIMD_DISABLE
 
-OPTIONS_DEFINE=	FFMPEG GSTREAMER Q3D V4L VAAPI
-OPTIONS_DEFAULT=FFMPEG GSTREAMER PULSEAUDIO Q3D V4L VAAPI
+OPTIONS_DEFINE=	FFMPEG GSTREAMER Q3D V4L VAAPI X11
+OPTIONS_DEFAULT=FFMPEG GSTREAMER PULSEAUDIO Q3D V4L VAAPI X11
 OPTIONS_SINGLE=	AUDIO
 OPTIONS_SINGLE_AUDIO=	ALSA PULSEAUDIO
 OPTIONS_SUB=	yes
@@ -52,6 +52,11 @@ VAAPI_USE=		GL=egl
 VAAPI_CMAKE_BOOL=	FEATURE_vaapi
 VAAPI_IMPLIES=		FFMPEG
 
+X11_USES=		xorg
+X11_USE=		XORG=x11,xext,xrandr
+X11_CMAKE_BOOL=		FEATURE_xlib
+X11_IMPLIES=		FFMPEG
+
 .include <bsd.port.options.mk>
 
 post-install: