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

4 files changed, 132 insertions, 0 deletions

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
+}