[gentoo-commits] repo/gentoo:master commit in: media-video/obs-studio/

["Jimi Huotari" <chiitoo@gentoo.org>]

commit:     a429beb18c0b6dbeba35f9a8037ae9cad039ab4c
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 26 16:58:46 2023 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Wed Jul 26 17:40:41 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a429beb1

media-video/obs-studio: add ffmpeg[opus] dependency

With USE="-opus" and without '--disable-encoder=opus' on ffmpeg,
obs-studio still offers to use the Opus encoder and the audio
that is recorded will be mixed with different kinds of noise,
depending somewhat on the bitrate being used.

Closes: https://bugs.gentoo.org/909566
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>

 ...dio-9999.ebuild => obs-studio-29.1.3-r1.ebuild} | 31 ++++++++++++++--------
 media-video/obs-studio/obs-studio-9999.ebuild      |  3 ++-
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-29.1.3-r1.ebuild
similarity index 92%
copy from media-video/obs-studio/obs-studio-9999.ebuild
copy to media-video/obs-studio/obs-studio-29.1.3-r1.ebuild
index 1e39b314c614..49443e5e5190 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-29.1.3-r1.ebuild
@@ -10,7 +10,7 @@ PYTHON_COMPAT=( python3_{9..12} )
 inherit cmake lua-single optfeature python-single-r1 xdg
 
 CEF_DIR="cef_binary_5060_linux64"
-OBS_BROWSER_COMMIT="291464d6988083411e7369fc53eba6d5ef07ff67"
+OBS_BROWSER_COMMIT="594115a27d40f0916e55db97cb61f7c7130cbe28"
 OBS_WEBSOCKET_COMMIT="6fd18a7ef1ecb149e8444154af1daab61d4241a9"
 QR_COMMIT="8518684c0f33d004fa93971be2c6a8eca3167d1e"
 
@@ -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 qsv speex +ssl truetype v4l vlc wayland websocket
+	python qt6 speex +ssl truetype v4l vlc wayland websocket
 "
 REQUIRED_USE="
 	browser? ( || ( alsa pulseaudio ) )
@@ -55,32 +55,29 @@ BDEPEND="
 	lua? ( dev-lang/swig )
 	python? ( dev-lang/swig )
 "
+# media-video/ffmpeg[opus] required due to bug 909566
 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:=
-	media-video/ffmpeg:=[nvenc?,x264]
+	media-video/ffmpeg:=[nvenc?,opus,x264]
 	net-misc/curl
 	sys-apps/dbus
 	sys-apps/pciutils
 	sys-apps/util-linux
 	sys-libs/zlib:=
 	x11-libs/libX11
-	x11-libs/libxcb:=
 	x11-libs/libXcomposite
 	x11-libs/libXfixes
-	x11-libs/libxkbcommon
+	x11-libs/libxcb:=
 	alsa? ( media-libs/alsa-lib )
 	browser? (
 		|| (
 			>=app-accessibility/at-spi2-core-2.46.0:2
 			( app-accessibility/at-spi2-atk dev-libs/atk )
 		)
-		dev-cpp/nlohmann_json
 		dev-libs/expat
 		dev-libs/glib
 		dev-libs/nspr
@@ -110,7 +107,20 @@ DEPEND="
 	pipewire? ( media-video/pipewire:= )
 	pulseaudio? ( media-libs/libpulse )
 	python? ( ${PYTHON_DEPS} )
-	qsv? ( media-libs/oneVPL )
+	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? (
@@ -191,16 +201,15 @@ src_configure() {
 		-DENABLE_NEW_MPEGTS_OUTPUT=OFF # Requires librist and libsrt.
 		-DENABLE_PIPEWIRE=$(usex pipewire)
 		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-		-DENABLE_QSV11=$(usex qsv)
 		-DENABLE_RTMPS=$(usex ssl ON OFF) # Needed for bug 880861
 		-DENABLE_SPEEXDSP=$(usex speex)
 		-DENABLE_V4L2=$(usex v4l)
 		-DENABLE_VLC=$(usex vlc)
 		-DENABLE_VST=ON
 		-DENABLE_WAYLAND=$(usex wayland)
-		-DENABLE_WEBRTC=OFF # Requires libdatachannel.
 		-DENABLE_WEBSOCKET=$(usex websocket)
 		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
+		-DQT_VERSION=$(usex qt6 6 5)
 		-DUNIX_STRUCTURE=1
 	)
 

diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index 1e39b314c614..96ad2ebc7090 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -55,6 +55,7 @@ BDEPEND="
 	lua? ( dev-lang/swig )
 	python? ( dev-lang/swig )
 "
+# media-video/ffmpeg[opus] required due to bug 909566
 DEPEND="
 	dev-libs/glib:2
 	dev-libs/jansson:=
@@ -63,7 +64,7 @@ DEPEND="
 	media-libs/libglvnd
 	media-libs/libva
 	media-libs/x264:=
-	media-video/ffmpeg:=[nvenc?,x264]
+	media-video/ffmpeg:=[nvenc?,opus,x264]
 	net-misc/curl
 	sys-apps/dbus
 	sys-apps/pciutils