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

8 files changed, 16 insertions, 25 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index a6c85a7f3b11..a6cef8c8b2f9 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index b2d8fc521add..7ec268856b32 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -21,7 +21,7 @@ DIST ffmpeg-6.0.tar.xz 10234012 BLAKE2B c70884911f3a3e40fe87473f241a2a56b303f5ab
 DIST ffmpeg-6.0.tar.xz.asc 520 BLAKE2B be294d375108b57bca3c687620ce2517c54c99012d82dc7aa1a83d5fe6d5453bd3c8620fdfb743df780cf588983a06a66a458c4e3e454dbe535cbba9da30c48c SHA512 a64cd0f8578fcea4537f5a38634c930d66c8ba4abd3e8e9dcffaeb95c3ad2e754d7bc4fbb5272409d4d32abf8180ef83f7204c6a570b52a37e635efd96cb94ed
 EBUILD ffmpeg-4.2.9.ebuild 17833 BLAKE2B 9c54f0f4be49eb443b49e1a203a638aae07e0a5cba537fdb4ff6765c931670f478c301ef935aa0b72dc8e4a241f17da891eafc6b539495de9725f6bded71da28 SHA512 f5785206f871d89c469aab33bad04c6f35651a70644c08f502fab4d6d1cf131ec6b9a9a26b340f2b33be947bc82bc183dfe4115c4775110f69ca2144f6c91013
 EBUILD ffmpeg-4.4.4-r2.ebuild 19722 BLAKE2B 28ced02686a1d6a140da6c60d6ebf0e446436b2ac0629420759d817ec80b006e9e9a052e374770ad944678da5ddc7ac86ffe73e57c65323f4ad75207dacb1555 SHA512 307341e26c1bb44b47538d748f038b7ab78afc4a7c544ec26a6e143a93a15b808e054e9da3c3d747777db6800f3d4eb3661be1d272d8e0718aa7df8be2cc985d
-EBUILD ffmpeg-5.1.3-r1.ebuild 19784 BLAKE2B 19b3dc67c741f1125bb9437314104e9a13f6f988e47d6e4f798ec483bbb7a5c1478d716cac47975f3972caacf45d4ab25de60f592fdcd48e29bfad0681c02c67 SHA512 fa268df5b17075b4786fe3247c18756c467a7347d1482857ba116944dcbd202beaa0c66c680861c6974496429eb9ce8bf2cb9b983955b3dc5fea5e00ba2459e3
-EBUILD ffmpeg-6.0-r1.ebuild 19734 BLAKE2B 1db305caf3821befe5e15a04831a3f7a4126340c07bdbb7eac3de2f9927ae8a4505e1d473247551463cb84196e960a222fc83cf0bd2bdf659be72883004ca638 SHA512 38b52b33bc2c5214c4ed90eaad4864aa908bd113f6b56932fc9c641f74312f2bdf8c9f1a468cf04d250d7a19b2b877e43f1024d5be6f88e3d4753a9870aeae16
-EBUILD ffmpeg-9999.ebuild 19619 BLAKE2B 2c56aaaf9275b31c73feb8c4bf78559fe21f2e744ead5b08d6737ce8afb0e8b9fe207981dc09b3c9b132cd6b8fc8b49f56a5336cd5018e51629530ff3d037fa5 SHA512 756cf0bcb96c027afd5b7610df017d04ffd3e12190f151716c85221b9359e0e82124f2fdcd9e20d1b3e2ddeb8906eb607196022b3efa6064fa7d1d5a5b7c2051
+EBUILD ffmpeg-5.1.3-r2.ebuild 19786 BLAKE2B febbb7478c689999d4c58787adb685bb29fadfd7e768844bb2131d8293de52687c0d7f9bc4598e911d8a55b09e20148bc017d33973ffa60f4e3218f4bdf6b3f6 SHA512 826128e75cac2cf3fa251c636012a8d5ece1ef0f3abe542d2db2df9caac390842425b4c63a5a98e2df3f949556795f191a0b1425a5b5ac66353ac86dba8e1991
+EBUILD ffmpeg-6.0-r2.ebuild 19736 BLAKE2B 68dfc156c7a92bc62a26d01c841512ae1972314c41b3a416fe985c6a964f9ed3c374639dcb4d0794b10d9f8ff2ae44e6a4466e989424337b295e8f87bcd17a44 SHA512 0e8bb3b78f400a8cb3c03a0c77841f73dab184af4f99faffd5d1b6bcef706638cbdbeb283c8f3d855e1fcfe23799f5588004881b51389a3ecc6734cdf08df55e
+EBUILD ffmpeg-9999.ebuild 19621 BLAKE2B f2626bdc5c5c3d08a1b84271499bac4ae28ec93438fdfb6df21bfe2847120d408d80337ef92b98e0995f8b4cab4a2db57f4cc1962df2470b5b8b5e25291b9aa1 SHA512 0cebfd2d88262810ba4d497e79dd130de6093bd8eec429f7007580e08ee123b44f03672e78e63e0d2ba1f34ccd54f5580d6caf384752134182190e2bc4e5a953
 MISC metadata.xml 7426 BLAKE2B 68fd0b4c5ff7cd08635421bab3b3257f06ad139212d44055f60e7f9e69c36d4e24e8d29ebf1662235269caefd388576d05c798ee67cf4b2871fab54362c405ba SHA512 c4bc329ce8903649a4eaeae01b7c0083a192e09701194c5867b651cc0650260bb12df740b68ffa85e49aadea133458a279070d320aa28195a9f71a99de4eaca8
diff --git a/media-video/ffmpeg/ffmpeg-5.1.3-r1.ebuild b/media-video/ffmpeg/ffmpeg-5.1.3-r2.ebuild
index 7672b75496fd..f55c39bea2fb 100644
--- a/media-video/ffmpeg/ffmpeg-5.1.3-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-5.1.3-r2.ebuild
@@ -238,7 +238,7 @@ RDEPEND="
 	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
 	libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
 	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
-	libplacebo? ( >=media-libs/libplacebo-4.192.0[$MULTILIB_USEDEP] )
+	libplacebo? ( >=media-libs/libplacebo-4.192.0:=[$MULTILIB_USEDEP] )
 	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
 	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
 	libtesseract? ( >=app-text/tesseract-4.1.0-r1[${MULTILIB_USEDEP}] )
diff --git a/media-video/ffmpeg/ffmpeg-6.0-r1.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r2.ebuild
index d5afdd06935e..b872b34e5a38 100644
--- a/media-video/ffmpeg/ffmpeg-6.0-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.0-r2.ebuild
@@ -238,7 +238,7 @@ RDEPEND="
 	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
 	libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
 	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
-	libplacebo? ( >=media-libs/libplacebo-4.192.0[$MULTILIB_USEDEP] )
+	libplacebo? ( >=media-libs/libplacebo-4.192.0:=[$MULTILIB_USEDEP] )
 	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
 	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
 	libtesseract? ( >=app-text/tesseract-4.1.0-r1[${MULTILIB_USEDEP}] )
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index f5b2b8abaa9c..29d9e2cfbfa6 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -238,7 +238,7 @@ RDEPEND="
 	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
 	libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] )
 	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
-	libplacebo? ( >=media-libs/libplacebo-4.192.0[$MULTILIB_USEDEP] )
+	libplacebo? ( >=media-libs/libplacebo-4.192.0:=[$MULTILIB_USEDEP] )
 	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
 	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
 	libtesseract? ( >=app-text/tesseract-4.1.0-r1[${MULTILIB_USEDEP}] )
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
 	)