gentoo auto-resync : 18:07:2023 - 00:58:24

3 files changed, 10 insertions, 19 deletions

diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index 37d5f2d05e9c..1fa20ce1415a 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -11,5 +11,5 @@ DIST qr-8518684c0f33d004fa93971be2c6a8eca3167d1e.tar.gz 135863 BLAKE2B fa6fb9c9e
 DIST websocketpp-56123c87598f8b1dd471be83ca841ceae07f95ba.tar.gz 701544 BLAKE2B 61680c31309d8f78b27b82e1bde2c7828eae2777df0629355c557dfd8b0daef6de7d202bbcff372351e135bb62366ffc8eec6c72a99df7c46a9197773c46550c SHA512 f185a66e5a7c783254352a6ef87e2e559f681032b7368765d08393ed12bcae76825abed7dcaea73de09df644320409dad46279701f5f469520542a2c9b6a6163
 EBUILD obs-studio-29.0.2.ebuild 7211 BLAKE2B 61065d6cdd5108c12da200f101a797f35b89f97862cd37b888c1c7f8bf8986e0d447513a2884a2af0dc393c9cefaaec68005d0099e982f5b78ac2e7d5d6a8d4f SHA512 87922eddb86adc668a1952caae44a4ad404ae60811d83a717a6b161c45a428816a352c77101cff91d5c86605894c14a2ea19df08dcc058c0c1bd1b150639ecce
 EBUILD obs-studio-29.1.3.ebuild 6670 BLAKE2B 1e54124ef17b31d4fe5a4322352fccfa87a8ddabbfa622d57fefd6037f0bdf76b125af9d260187a23eb515ecee34d951d6fd1d5e77d94dfcafe878c2a50613b8 SHA512 401149d4ef9f7663c6a7979bf7029b7473b1674ebdad0de116f7fc0c07a240851eba4baf13afc876d056e1e84f571e466265e3e0a020eedfa11c0a45956d00c7
-EBUILD obs-studio-9999.ebuild 6719 BLAKE2B 6b38821ce00995aa2698b22a2900dd0e9deca25ba01998a4c1ef9cfea84619804cfc9297507895e053e889a7be06e547b33fd4bdcd03656000a502b6bba6fd51 SHA512 e090d6b0c79a4de9d35e65a3d9fc1bac9827048e95c3f6e6187846b06d96cbc53dfc3b20f3bc4f5c214ad24479f9e9a23f34250138a6fd4cc2456717f69dee2f
-MISC metadata.xml 1330 BLAKE2B 4df42f330b8a71cce033c42750434f1fdf9147bff19ee612c14be9187a9fd770b1e998d8f631c4e4da9eef7ffcb863f3a398883612cb2f7d49046529ad5e1f09 SHA512 dafece41c313bb983958c380e422f513af6d2716df90e87e74b85c604ce3ce896735fc618e5028289ff37b71d929ae623828de620e8b30fb2f8de84190a47dfd
+EBUILD obs-studio-9999.ebuild 6571 BLAKE2B ed0bf69685489a43a24b85bcfd369008a43840cd622ca3fec18158f08304440b8978f86b414333a7dd3b50b06d6a9451fb9f36fed2099f7b51162863e1d46709 SHA512 5390cd3e0a531173fcd7440a9ec356a24997d73825aa50ef85a8c8b034616dff44801f1a3c5ab18fd33bb9018bf5b8bea986b7d239b3ab8caad6a54e63fb1e77
+MISC metadata.xml 1401 BLAKE2B b371b858e192984f9665079f32c81b65a2b957e9ce5a4f3cc19106e38dd19eaceb124716fddf7729c5b0c5b52fc8c1efe5daaa8b5552a215fabeca3fb39b2837 SHA512 9f587057dd9809e0632276669d59a54d25ed367dbe624727fb44d23e93b6a411efb412ca872675fdf2f7e051f87fdc7999ece189c7107856975430a77192f9cf
diff --git a/media-video/obs-studio/metadata.xml b/media-video/obs-studio/metadata.xml
index 0d746963a49f..9b0f681b3e6d 100644
--- a/media-video/obs-studio/metadata.xml
+++ b/media-video/obs-studio/metadata.xml
@@ -17,6 +17,7 @@
     <flag name="fdk">Build with LibFDK AAC support.</flag>
     <flag name="pipewire">Build with PipeWire support.</flag>
     <flag name="python">Build with scripting support for Python 3.</flag>
+    <flag name="qsv">Build with Intel Quick Sync Video support.</flag>
     <flag name="speex">Build with Speex noise suppression filter support.</flag>
     <flag name="ssl">Build with TLS/SSL support for RTMPS connections.</flag>
     <flag name="vlc">Build with VLC media source support.</flag>
diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index b75f125b04cb..d6aec2b41846 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 qsv 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,7 @@ 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
-	)
+	qsv? ( media-libs/oneVPL )
 	speex? ( media-libs/speexdsp )
 	ssl? ( net-libs/mbedtls:= )
 	truetype? (
@@ -200,6 +190,7 @@ 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)
@@ -209,7 +200,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
 	)