gentoo auto-resync : 25:07:2023 - 22:29:01

9 files changed, 152 insertions, 17 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 72ce14e0be12..f0d6baceb0ab 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 1e78321bcf6d..b4e20ed70571 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -6,5 +6,5 @@ DIST mpv-0.36.0.tar.gz 3409178 BLAKE2B 7260c265f02918d4caf72d8d8ecc9d4ab9783d66d
 EBUILD mpv-0.35.1-r1.ebuild 7610 BLAKE2B 0e2a9d6c0817f92995d53055357a4b1757b126bb7d4c105d3542630df9410475560f98772fbc021855a6e3acd029d7bbaf3cb50fc2734dd9122a05be50aab5fb SHA512 b04ea9db0876192883f62cf0ede1b2df633b7c0691d482248b1e765dd779a50679a9e11785943b218e73bfc66bdb2c3eb952765077f8e7b3de0774b2cab31f8c
 EBUILD mpv-0.35.1-r2.ebuild 7652 BLAKE2B 7042109178a580d3d88bf7781cc7d1e8c503ba404eaff4512061a1d6526aa4aedb33537e103dedf5d2beec61fd4978b1762dd6de8950b1a31effadd601e5a905 SHA512 594c7b3a433ff96ec7ea84633e5660580fcf5b79d1c3021714d1b79782065e391895762795ccd796c3ad265b4c087ebc75582b07a8a8d6b5b7a66ff3bd9d93bb
 EBUILD mpv-0.36.0.ebuild 7480 BLAKE2B 9bbbd3eba115594e5cad5da49efab8bf352ed3dc0927ee5c5402ee6041db294894f193bc7fbae2b3aab9676b62429b31b9e295011ff8d0e10ba4c592b50e3da5 SHA512 2f24069a31e3fed2ee4d96e10237a832bf401fe4835680fd5f70a44cdc0e950ed34a956eb3135a32e7907068d1474c2ca5c1e74c755d8cb19074bd5ba3c9bf8e
-EBUILD mpv-9999.ebuild 7405 BLAKE2B 924b536727e754a1fbb9ec42c262894790945bf61d1b29f73d5382a00dcf4becfb0516dce0e352b895b7348aca3920916566c64abee97c9f2159793a99d3a869 SHA512 ad68a613ae65daf4735701fb19ca8bb48a1bf87a355c5622916b01e6559ba1990b3290e73a31f6ffd3bd15ed6a27c4bd3561b825a5b0a5d3d8b6b1dd0834d791
+EBUILD mpv-9999.ebuild 7382 BLAKE2B 7df0202158ed38380996a7957ea42e3714f4c0abfb6c4a8df6d0007b3b45713a456da82c7e5d3b9896ed7ff27cec7e88f8c3c2b7892d4da9a759496d8872c86f SHA512 0d0d79eb13f7059b8f23c2e2f038be99554f4bd60d2ee6b6285c6093f27153b13001318395bb8d8c1f750d34e580903e636003785cea1bfb3ef5bca059aa3d34
 MISC metadata.xml 2324 BLAKE2B 6fe57270fef9275f47b0d7f282fbf4ff5c4a76c74e43820a8e0a4d56348eb72dc89dfdb06a9ff9a2b6f73d35102f861200d6c8c6f4dc41cfb4e42ff69d70da8a SHA512 0418e3315b4ded29714099d80075f61f6d1b38d9109bbb3bc372abbaceb14f705d5798eac2c14ef0fd0e1c557785291a4acb5e773dffb46f0b7f7962bf38d041
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index c2718b1e8de1..5984f7637494 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -24,8 +24,9 @@ IUSE="
 	+X +alsa aqua archive bluray cdda +cli coreaudio debug +drm dvb
 	dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca +libmpv
 	+libplacebo +lua mmal nvenc openal opengl pipewire pulseaudio
-	raspberry-pi rubberband sdl selinux sixel sndio test tools +uchardet
-	vaapi vdpau vulkan wayland +xv zimg zlib"
+	raspberry-pi rubberband sdl selinux sixel sndio test tools
+	+uchardet vaapi vdpau vulkan wayland +xv zimg zlib
+"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	|| ( cli libmpv )
@@ -37,13 +38,11 @@ REQUIRED_USE="
 	test? ( cli )
 	tools? ( cli )
 	uchardet? ( iconv )
-	vaapi? (
-		|| ( X egl libplacebo wayland )
-		wayland? ( drm )
-	)
+	vaapi? ( || ( X drm wayland ) )
 	vdpau? ( X )
 	vulkan? ( || ( X wayland ) libplacebo )
-	xv? ( X )"
+	xv? ( X )
+"
 RESTRICT="!test? ( test )"
 
 # raspberry-pi: default to -bin given non-bin is known broken (bug #893422)
@@ -67,8 +66,8 @@ COMMON_DEPEND="
 		dev-libs/libcdio:=
 	)
 	drm? (
-		media-libs/mesa[gbm(+)]
 		x11-libs/libdrm
+		egl? ( media-libs/mesa[gbm(+)] )
 	)
 	dvd? (
 		media-libs/libdvdnav
@@ -116,22 +115,26 @@ COMMON_DEPEND="
 		x11-libs/libxkbcommon
 	)
 	zimg? ( media-libs/zimg )
-	zlib? ( sys-libs/zlib:= )"
+	zlib? ( sys-libs/zlib:= )
+"
 RDEPEND="
 	${COMMON_DEPEND}
 	selinux? ( sec-policy/selinux-mplayer )
-	tools? ( ${PYTHON_DEPS} )"
+	tools? ( ${PYTHON_DEPS} )
+"
 DEPEND="
 	${COMMON_DEPEND}
 	X? ( x11-base/xorg-proto )
 	dvb? ( virtual/linuxtv-dvb-headers )
 	nvenc? ( media-libs/nv-codec-headers )
-	wayland? ( dev-libs/wayland-protocols )"
+	wayland? ( dev-libs/wayland-protocols )
+"
 BDEPEND="
 	${PYTHON_DEPS}
 	virtual/pkgconfig
 	cli? ( dev-python/docutils )
-	wayland? ( dev-util/wayland-scanner )"
+	wayland? ( dev-util/wayland-scanner )
+"
 
 pkg_setup() {
 	use lua && lua-single_pkg_setup
@@ -200,7 +203,6 @@ src_configure() {
 		$(meson_feature X x11)
 		$(meson_feature aqua cocoa)
 		$(meson_feature drm)
-		$(meson_feature drm gbm)
 		$(meson_feature jpeg)
 		$(meson_feature libcaca caca)
 		$(meson_feature libplacebo)
@@ -214,6 +216,7 @@ src_configure() {
 			echo enabled || echo disabled)
 		$(meson_feature egl)
 		$(mpv_feature_multi egl X egl-x11)
+		$(mpv_feature_multi egl drm gbm) # gbm is only used by egl-drm
 		$(mpv_feature_multi egl drm egl-drm)
 		$(mpv_feature_multi egl wayland egl-wayland)
 		$(meson_feature libmpv plain-gl)
@@ -231,7 +234,6 @@ src_configure() {
 		$(meson_feature vaapi)
 		$(mpv_feature_multi vaapi X vaapi-x11)
 		$(mpv_feature_multi vaapi drm vaapi-drm)
-		$(mpv_feature_multi vaapi egl vaapi-egl)
 		$(mpv_feature_multi vaapi wayland vaapi-wayland)
 
 		$(meson_feature vdpau)
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index 1fa20ce1415a..3666db8b847b 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 6571 BLAKE2B ed0bf69685489a43a24b85bcfd369008a43840cd622ca3fec18158f08304440b8978f86b414333a7dd3b50b06d6a9451fb9f36fed2099f7b51162863e1d46709 SHA512 5390cd3e0a531173fcd7440a9ec356a24997d73825aa50ef85a8c8b034616dff44801f1a3c5ab18fd33bb9018bf5b8bea986b7d239b3ab8caad6a54e63fb1e77
+EBUILD obs-studio-9999.ebuild 6595 BLAKE2B 7056875e4ca32e15be987ed81deba3079f439a1f0474f288b542b334df07e1b190d4138d9d1d61ed020a4354b74a115ac8e0bcd7043f8b5b53c02dbe6f0dc0ef SHA512 21ea6ffcd5c9a8bab0a39571e903b52d639da50f831f516171d18df65a8424984517bdfb75b00f6f022e169bb0a1f7b72023dc5b16de320ca7cde0f5545f2bdb
 MISC metadata.xml 1401 BLAKE2B b371b858e192984f9665079f32c81b65a2b957e9ce5a4f3cc19106e38dd19eaceb124716fddf7729c5b0c5b52fc8c1efe5daaa8b5552a215fabeca3fb39b2837 SHA512 9f587057dd9809e0632276669d59a54d25ed367dbe624727fb44d23e93b6a411efb412ca872675fdf2f7e051f87fdc7999ece189c7107856975430a77192f9cf
diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index d6aec2b41846..1e39b314c614 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.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="995ad53cf3b774928a690d9de813fc8cb43175fe"
+OBS_BROWSER_COMMIT="291464d6988083411e7369fc53eba6d5ef07ff67"
 OBS_WEBSOCKET_COMMIT="6fd18a7ef1ecb149e8444154af1daab61d4241a9"
 QR_COMMIT="8518684c0f33d004fa93971be2c6a8eca3167d1e"
 
@@ -80,6 +80,7 @@ DEPEND="
 			>=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
diff --git a/media-video/subtitlecomposer/Manifest b/media-video/subtitlecomposer/Manifest
index 66ee8771d0f4..8aee3fab3c2e 100644
--- a/media-video/subtitlecomposer/Manifest
+++ b/media-video/subtitlecomposer/Manifest
@@ -1,4 +1,7 @@
+AUX subtitlecomposer-0.7.1-ffmpeg6-1.patch 938 BLAKE2B 2b948713b9288770dafce137f4a9127215f6cfc98cc051b09b76b2d03a4aaefedf7b50aa3a95c1620ad252e9a4716809e9f6774a5efd950fbd05e4f719f8d401 SHA512 e79cfd5aadd9117dc3d1c03ddd2f8ce2083cc279868abf63285b7248b0010eef1c7b8b717584750a148c8aee41378a7349ebfe29eaa93438b053fe40eb6e7a87
+AUX subtitlecomposer-0.7.1-ffmpeg6-2.patch 1691 BLAKE2B 8d7e32d7d04314a2b650bde55085936f0cdd63b0d84a562f357a2ac9e49ace1298b019c5786ac540209dee3838d8079ccede01ec44ed6502a26e74f9649ce9ef SHA512 9e3c5beb97cd9b9dd365b0c04e90db3b714f36ad396313e7ea1c43f3aded5342f8fb49ece4b780586fd4e3732ed8bfb82fc184102eb3b0f05e5f14a84c23c7f4
 DIST subtitlecomposer-0.7.1-patchset-1.tar.xz 6868 BLAKE2B 59ae09e6807b0c9eeb094556ec381157701a6d3ae66317c175816f2a779ef3db1874146c5ec0d211a07353bf592c1ff7ad8dcf91a1370916d37290204e7e5909 SHA512 bd7849ee7e4bb449b7f758bf86a45110f0e647d6a35ec31bbab82b7e8f02ac3b81aed958723848a08830a32f1e252dc2231d9a8a736b738b6c105c1a715aea1b
 DIST subtitlecomposer-0.7.1.tar.xz 636808 BLAKE2B 4c71277c9646a64d59a0cd6923084b39292916e9edf154c026a051253fe8aabab1bdfb9e10c6fab5eb0d754ba428567c2259c637915e93d8d391b7f247c6dc79 SHA512 b486a1be8b414409af4ec2d2ccc86a7e9f34040f114b0efbbf817b5157d85b5f9a37d80272b468a389128f10c12316bf028dd86e2a7434a2b001bfd185208b92
 EBUILD subtitlecomposer-0.7.1-r1.ebuild 1596 BLAKE2B d4a97b1102fb1b9a4a00e9fd29288c1e02243fcf90ef62b6ec2260c0648d6f8271748ce612b53300b6601964b00d969db0d2853c52f7284b7737c41f6ba200fd SHA512 baf690c60925a13385f03fe37e4472bd00b0f2a4552ff36dfc944baad756634f16f9d316837f711b75d7130b9121880fec440faa6e3836c8e7e4621c23803c29
+EBUILD subtitlecomposer-0.7.1-r2.ebuild 1627 BLAKE2B 53d2756ce855ba1bd87b6b98ced9e78a16e93ad4f3da6df4e668fb1d64a1e6ce9f091069561a7edbb021a5600b54d61f07a5b0daabe4e1a0228effa679e240c0 SHA512 48f580581cf648d89b3f47755df0b7d81699dcc5de0a57de0d08c3c59e1c92abd9a3f20033df06ef3e6921ebceb524318bfef350289b0d7d8e04b777d051ca34
 MISC metadata.xml 438 BLAKE2B b11cde969ef9af83c7e70ac17615703c8f0b4296113a8ff552a669c3b7bf7b5291106dd1c4ece993fd8195f5af3bcd1b05697b583bd85f4a155fa10351cbbadd SHA512 d32994646bdbfb90e5fde722a905ebf5fa59903de7c36fd8228ce257057ac8523d7219656d1f1a1bdcc3f0eec1ad9f34535d4090078c9e3a6890d58b8e1e3b71
diff --git a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg6-1.patch b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg6-1.patch
new file mode 100644
index 000000000000..7e0d873992a5
--- /dev/null
+++ b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg6-1.patch
@@ -0,0 +1,25 @@
+From 12f4d7f49d0b1a7fc02b0836521a285e7b6bac9d Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Sat, 4 Mar 2023 10:58:04 +0100
+Subject: [PATCH] Use non deprecated ffmpeg api
+
+---
+ src/videoplayer/backend/streamdemuxer.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/videoplayer/backend/streamdemuxer.cpp b/src/videoplayer/backend/streamdemuxer.cpp
+index e3bd808a..39222d8c 100644
+--- a/src/videoplayer/backend/streamdemuxer.cpp
++++ b/src/videoplayer/backend/streamdemuxer.cpp
+@@ -504,7 +504,7 @@ StreamDemuxer::run()
+ 
+ 	{ // find_stream_info
+ 		const int origNbStreams = ic->nb_streams;
+-		AVDictionary **opts = (AVDictionary **)av_mallocz_array(origNbStreams, sizeof(*opts));
++		AVDictionary **opts = (AVDictionary **)av_calloc(origNbStreams, sizeof(*opts));
+ 		if(!opts) {
+ 			av_log(nullptr, AV_LOG_ERROR, "Could not alloc memory for stream options.\n");
+ 			goto cleanup;
+-- 
+GitLab
+
diff --git a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg6-2.patch b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg6-2.patch
new file mode 100644
index 000000000000..58c3e9d9dfd3
--- /dev/null
+++ b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg6-2.patch
@@ -0,0 +1,42 @@
+From 0bb0e6ed99d5a4200cc89fc6e8b3013c70465402 Mon Sep 17 00:00:00 2001
+From: Mladen Milinkovic <maxrd2@smoothware.net>
+Date: Mon, 5 Jun 2023 10:13:15 +0200
+Subject: [PATCH] StreamProcessor: fixed embedded ASS decoding
+
+Seems embeded ASS subtitle format got changed in FFmpeg 6. Haven't found
+any references to it tho, so this might still be borked in some cases.
+---
+ src/streamprocessor/streamprocessor.cpp | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/src/streamprocessor/streamprocessor.cpp b/src/streamprocessor/streamprocessor.cpp
+index b759b0d3..1e883780 100644
+--- a/src/streamprocessor/streamprocessor.cpp
++++ b/src/streamprocessor/streamprocessor.cpp
+@@ -537,11 +537,10 @@ StreamProcessor::processText()
+ 				case SUBTITLE_ASS: {
+ #if 1
+ 					const char *assText = sub->ass;
+-					if(strncmp("Dialogue", assText, 8) != 0)
+-						break;
+-
++					// FIXME: did ass format change with ffmpeg6? can't find any references
++					const int textLocation = strncmp("Dialogue", assText, 8) ? 8 : 9;
+ 					// Dialogue: Marked, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
+-					for(int c = 9; c && *assText; assText++) {
++					for(int c = textLocation; c && *assText; assText++) {
+ 						if(*assText == ',')
+ 							c--;
+ 					}
+@@ -550,7 +549,7 @@ StreamProcessor::processText()
+ 										  "{\\c&H0000ff&}red {\\c&H00ff00&}green {\\c&Hff0000&}blue{\\r}\\n"
+ 										  "Another {\\b100}bold\\h{\\i1}bolditalic{\\b0\\i0} some{\\anidfsd} unsupported tag";
+ #endif
+-					QString assChunk(assText);
++					QString assChunk = QString::fromUtf8(assText);
+ 
+ 					assChunk
+ 							.replace(QStringLiteral("\\N"), QStringLiteral("\n"))
+-- 
+GitLab
+
diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r2.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r2.ebuild
new file mode 100644
index 000000000000..84b4fcd68249
--- /dev/null
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit ecm kde.org
+
+DESCRIPTION="Text-based subtitles editor"
+HOMEPAGE="https://subtitlecomposer.kde.org/"
+PATCHSET="${P}-patchset-1"
+SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz
+	https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="unicode"
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	media-libs/openal
+	media-video/ffmpeg:0=
+	unicode? ( dev-libs/icu:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${WORKDIR}/${PATCHSET}/${P}-tests-optional.patch"
+	"${WORKDIR}/${PATCHSET}/${P}-gles-support.patch" # bug 820035
+	"${WORKDIR}/${PATCHSET}/${P}-ffmpeg-5.patch" # bug 834416
+	"${WORKDIR}/${PATCHSET}/${P}-replace-kross-w-qjsengine.patch" # bug 755956
+	"${FILESDIR}"/${P}-ffmpeg6-{1,2}.patch # bug 910048
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PocketSphinx=ON # bug 616706
+		$(cmake_use_find_package unicode ICU)
+	)
+
+	ecm_src_configure
+}