From 0860f56890e6ff1076c451d5ffd148ebcd5eaaa0 Mon Sep 17 00:00:00 2001 From: Jimi Huotari Date: Tue, 18 Jul 2023 00:17:30 +0300 Subject: [PATCH] media-video/obs-studio: remove qt5 support Upstream no longer supports compiling against qt5. Closes: https://bugs.gentoo.org/910307 Signed-off-by: Jimi Huotari --- media-video/obs-studio/obs-studio-9999.ebuild | 22 +++++-------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild index b75f125b04cb6..2ece905bf7428 100644 --- a/media-video/obs-studio/obs-studio-9999.ebuild +++ b/media-video/obs-studio/obs-studio-9999.ebuild @@ -43,7 +43,7 @@ LICENSE="Boost-1.0 GPL-2+ MIT Unlicense" SLOT="0" IUSE=" +alsa browser decklink fdk jack lua nvenc pipewire pulseaudio - python qt6 speex +ssl truetype v4l vlc wayland websocket + python speex +ssl truetype v4l vlc wayland websocket " REQUIRED_USE=" browser? ( || ( alsa pulseaudio ) ) @@ -58,6 +58,8 @@ BDEPEND=" DEPEND=" dev-libs/glib:2 dev-libs/jansson:= + dev-qt/qtbase:6[network,widgets,xml(+)] + dev-qt/qtsvg:6 media-libs/libglvnd media-libs/libva media-libs/x264:= @@ -68,9 +70,10 @@ DEPEND=" sys-apps/util-linux sys-libs/zlib:= x11-libs/libX11 + x11-libs/libxcb:= x11-libs/libXcomposite x11-libs/libXfixes - x11-libs/libxcb:= + x11-libs/libxkbcommon alsa? ( media-libs/alsa-lib ) browser? ( || ( @@ -106,20 +109,6 @@ DEPEND=" pipewire? ( media-video/pipewire:= ) pulseaudio? ( media-libs/libpulse ) python? ( ${PYTHON_DEPS} ) - qt6? ( - dev-qt/qtbase:6[network,widgets,xml(+)] - dev-qt/qtsvg:6 - x11-libs/libxkbcommon - ) - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5[wayland?] - dev-qt/qtnetwork:5 - dev-qt/qtquickcontrols:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - ) speex? ( media-libs/speexdsp ) ssl? ( net-libs/mbedtls:= ) truetype? ( @@ -209,7 +198,6 @@ src_configure() { -DENABLE_WEBRTC=OFF # Requires libdatachannel. -DENABLE_WEBSOCKET=$(usex websocket) -DOBS_MULTIARCH_SUFFIX=${libdir#lib} - -DQT_VERSION=$(usex qt6 6 5) -DUNIX_STRUCTURE=1 )