[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/, media-video/subtitlecomposer/files/
commit: a0373a9a7c0cb43da6f772687568065b281c953f
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Sep 2 21:04:07 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Sep 2 21:07:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0373a9a
media-video/subtitlecomposer: Backports, fix runtime bug w/ >=ffmpeg-6
Closes: https://bugs.gentoo.org/913475
Signed-off-by: Andreas Sturmlechner gentoo.org>
...itlecomposer-0.7.1-changingaudio-crashfix.patch | 67 ++
.../files/subtitlecomposer-0.7.1-ffmpeg6-3.patch | 32 +++
.../subtitlecomposer-0.7.1-nullptr-deref.patch | 25
.../subtitlecomposer-0.7.1-subtitle-crashfix.patch | 25
.../subtitlecomposer-0.7.1-vobsub-crashfix.patch | 45 +++
.../subtitlecomposer-0.7.1-r3.ebuild | 64 +
6 files changed, 258 insertions(+)
diff --git
a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-changingaudio-crashfix.patch
b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-changingaudio-crashfix.patch
new file mode 100644
index ..be580af101d5
--- /dev/null
+++
b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-changingaudio-crashfix.patch
@@ -0,0 +1,67 @@
+From 88a6cf4e4aaa58229b9b07d66c2abd264dfbc2f1 Mon Sep 17 00:00:00 2001
+From: Mladen Milinkovic
+Date: Fri, 17 Jun 2022 21:34:20 +0200
+Subject: [PATCH] Fix deadlock/crash while changing audio stream on
+ paused/stopped media #71
+
+---
+ src/videoplayer/backend/audiodecoder.cpp | 2 +-
+ src/videoplayer/backend/decoder.cpp | 1 +
+ src/videoplayer/backend/ffplayer.cpp | 2 ++
+ src/videoplayer/videoplayer.cpp | 2 ++
+ 4 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/videoplayer/backend/audiodecoder.cpp
b/src/videoplayer/backend/audiodecoder.cpp
+index d3d13e78..9c7ee1fc 100644
+--- a/src/videoplayer/backend/audiodecoder.cpp
b/src/videoplayer/backend/audiodecoder.cpp
+@@ -499,7 +499,7 @@ AudioDecoder::run()
+ // bytes needed for 100ms of audio
+ const ALint hwMinBytes = m_vs->audClk.speed() *
m_fmtTgt.bytesPerSec * .100;
+
+- while(!m_vs->abortRequested) {
++ while(!m_vs->abortRequested &&
!isInterruptionRequested()) {
+ ALint hwBufOffset = 0;
+ alGetSourcei(m_alSrc, AL_BYTE_OFFSET,
);
+ if(!std::isnan(af->pts)) {
+diff --git a/src/videoplayer/backend/decoder.cpp
b/src/videoplayer/backend/decoder.cpp
+index 79b1ad7a..8a69d918 100644
+--- a/src/videoplayer/backend/decoder.cpp
b/src/videoplayer/backend/decoder.cpp
+@@ -155,6 +155,7 @@ Decoder::abort()
+ m_queue->abort();
+ if(m_frameQueue)
+ m_frameQueue->signal();
++ requestInterruption();
+ wait();
+ m_queue->flush();
+ }
+diff --git a/src/videoplayer/backend/ffplayer.cpp
b/src/videoplayer/backend/ffplayer.cpp
+index 88288285..7b26e4a4 100644
+--- a/src/videoplayer/backend/ffplayer.cpp
b/src/videoplayer/backend/ffplayer.cpp
+@@ -288,6 +288,8 @@ FFPlayer::activeAudioStream()
+ void
+ FFPlayer::activeAudioStream(int streamIndex)
+ {
++ if(!m_vs)
++ return;
+ streamIndex = streamIndex < 0 ? -1 :
m_vs->demuxer->absoluteStreamIndex(AVMEDIA_TYPE_AUDIO, streamIndex);
+ m_vs->demuxer->selectStream(AVMEDIA_TYPE_AUDIO, streamIndex);
+ }
+diff --git a/src/videoplayer/videoplayer.cpp b/src/videoplayer/videoplayer.cpp
+index 0307ce7d..a42babe5 100644
+--- a/src/videoplayer/videoplayer.cpp
b/src/videoplayer/videoplayer.cpp
+@@ -301,6 +301,8 @@ VideoPlayer::setupNotifications()
+
+ //connect(m_player, ::videoStreamsChanged, this, [this](const
QStringList ){});
+ connect(m_player, ::audioStreamsChanged, this, [this](const
QStringList ){
++ if(m_activeAudioStream >= 0)
++ m_player->activeAudioStream(m_activeAudioStream);
+ emit audioStreamsChanged(m_audioStreams = streams);
+ emit activeAudioStreamChanged(m_activeAudioStream =
m_player->activeAudioStream());
+ });
+--
+GitLab
+
diff --git
a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg6-3.patch
b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg6-3.patch
new file mode 100644
index ..2887f179afd1
--- /dev/null
+++ b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg6-3.patch
@@ -0,0 +1,32 @@
+From d8f9797d9c0d45fa9f4402f79c539544b74d2cc7 Mon Sep 17 00:00:00 2001
+From: Mladen Milinkovic
+Date: Fri, 1 Apr 2022 08:35:17 +0200
+Subject: [PATCH] VideoPlayer: Fix usage of deprecated/removed AVCodec option
+ #68
+
+AVCodecContext.refcounted_frames was useful for deprecated API only
+(avcodec_decode_video2/avcodec_decode_audio4). The new decode APIs
[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/, media-video/subtitlecomposer/files/
commit: a5539b941812b7f16e54e588eff7dfb7d4305063
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Jul 25 12:34:22 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Jul 25 12:34:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5539b94
media-video/subtitlecomposer: Fix build and runtime with >=ffmpeg-6
Upstream commits:
12f4d7f49d0b1a7fc02b0836521a285e7b6bac9d
0bb0e6ed99d5a4200cc89fc6e8b3013c70465402
Closes: https://bugs.gentoo.org/910048
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/subtitlecomposer-0.7.1-ffmpeg6-1.patch | 25 +
.../files/subtitlecomposer-0.7.1-ffmpeg6-2.patch | 42 +++
.../subtitlecomposer-0.7.1-r2.ebuild | 62 ++
3 files changed, 129 insertions(+)
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 ..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
+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 ..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
+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&}red {\\c&}green {\\c&}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
[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/, media-video/subtitlecomposer/files/
commit: c0b635cc77e5b73691d5397c22cb638ed5f4eb85
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Mar 29 13:45:38 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Mar 29 13:53:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0b635cc
media-video/subtitlecomposer: Replace Kross with QJSEngine
Upstream commit 4a8df2a16c929f179fe69f1c3e867c03780874c5
Switch to patchset.
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-video/subtitlecomposer/Manifest | 1 +
.../files/subtitlecomposer-0.7.1-ffmpeg-5.patch| 65 ---
.../subtitlecomposer-0.7.1-gles-support.patch | 122 -
.../subtitlecomposer-0.7.1-tests-optional.patch| 27 -
...7.1.ebuild => subtitlecomposer-0.7.1-r1.ebuild} | 26 ++---
.../subtitlecomposer/subtitlecomposer-0.7.1.ebuild | 12 +-
6 files changed, 19 insertions(+), 234 deletions(-)
diff --git a/media-video/subtitlecomposer/Manifest
b/media-video/subtitlecomposer/Manifest
index f88fc4132ffd..f8cfd0d22adc 100644
--- a/media-video/subtitlecomposer/Manifest
+++ b/media-video/subtitlecomposer/Manifest
@@ -1 +1,2 @@
+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
diff --git
a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg-5.patch
b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg-5.patch
deleted file mode 100644
index a0314fb06820..
--- a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg-5.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 4f4f560e40ba0b760cf688eb024be3cc734ca347 Mon Sep 17 00:00:00 2001
-From: Mladen Milinkovic
-Date: Tue, 25 Jan 2022 14:01:56 +0100
-Subject: [PATCH] Fix compilation with ffmpeg5 #63
-
- src/streamprocessor/streamprocessor.cpp | 2 +-
- src/videoplayer/backend/decoder.h | 1 +
- src/videoplayer/backend/framequeue.h | 1 +
- src/videoplayer/backend/streamdemuxer.cpp | 2 +-
- 4 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/streamprocessor/streamprocessor.cpp
b/src/streamprocessor/streamprocessor.cpp
-index b86795e..8faf8a2 100644
a/src/streamprocessor/streamprocessor.cpp
-+++ b/src/streamprocessor/streamprocessor.cpp
-@@ -195,7 +195,7 @@ StreamProcessor::findStream(int streamType, int
streamIndex, bool imageSub)
- int ret;
- char errorText[1024];
-
-- AVCodec *dec =
avcodec_find_decoder(m_avStream->codecpar->codec_id);
-+ const AVCodec *dec =
avcodec_find_decoder(m_avStream->codecpar->codec_id);
- if(!dec) {
- qWarning() << "Failed to find decoder for stream" << i;
- return false;
-diff --git a/src/videoplayer/backend/decoder.h
b/src/videoplayer/backend/decoder.h
-index 4ab95b2..fb6840d 100644
a/src/videoplayer/backend/decoder.h
-+++ b/src/videoplayer/backend/decoder.h
-@@ -11,6 +11,7 @@
- #include
-
- extern "C" {
-+#include "libavcodec/avcodec.h"
- #include "libavformat/avformat.h"
- }
-
-diff --git a/src/videoplayer/backend/framequeue.h
b/src/videoplayer/backend/framequeue.h
-index dc9b2fa..ece1166 100644
a/src/videoplayer/backend/framequeue.h
-+++ b/src/videoplayer/backend/framequeue.h
-@@ -9,6 +9,7 @@
- #define FRAMEQUEUE_H
-
- extern "C" {
-+#include "libavcodec/avcodec.h"
- #include "libavformat/avformat.h"
- }
-
-diff --git a/src/videoplayer/backend/streamdemuxer.cpp
b/src/videoplayer/backend/streamdemuxer.cpp
-index 1e339b3..e8320ea 100644
a/src/videoplayer/backend/streamdemuxer.cpp
-+++ b/src/videoplayer/backend/streamdemuxer.cpp
-@@ -230,7 +230,7 @@ StreamDemuxer::componentOpen(int streamIndex)
- {
- AVFormatContext *ic = m_vs->fmtContext;
- AVCodecContext *avCtx;
-- AVCodec *codec;
-+ const AVCodec *codec;
- AVDictionary *opts = nullptr;
- AVDictionaryEntry *t = nullptr;
- int sampleRate, nbChannels;
---
-GitLab
-
diff --git
a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-gles-support.patch
b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-gles-support.patch
deleted file mode 100644
index 98de494cf306..
---
a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-gles-support.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From 167a941f8070f4a9abacb3aa2f61ee6ee00d6cb8 Mon Sep 17 00:00:00 2001
-From: Mladen Milinkovic
[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/, media-video/subtitlecomposer/files/
commit: 46b5fab594719d2d438256d257cae5fddd07f538
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed May 18 12:49:55 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed May 18 12:49:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46b5fab5
media-video/subtitlecomposer: Fix build with >=ffmpeg-5
Upstream commit 4f4f560e40ba0b760cf688eb024be3cc734ca347
Closes: https://bugs.gentoo.org/834416
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/subtitlecomposer-0.7.1-ffmpeg-5.patch| 65 ++
.../subtitlecomposer/subtitlecomposer-0.7.1.ebuild | 1 +
2 files changed, 66 insertions(+)
diff --git
a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg-5.patch
b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg-5.patch
new file mode 100644
index ..a0314fb06820
--- /dev/null
+++ b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg-5.patch
@@ -0,0 +1,65 @@
+From 4f4f560e40ba0b760cf688eb024be3cc734ca347 Mon Sep 17 00:00:00 2001
+From: Mladen Milinkovic
+Date: Tue, 25 Jan 2022 14:01:56 +0100
+Subject: [PATCH] Fix compilation with ffmpeg5 #63
+
+---
+ src/streamprocessor/streamprocessor.cpp | 2 +-
+ src/videoplayer/backend/decoder.h | 1 +
+ src/videoplayer/backend/framequeue.h | 1 +
+ src/videoplayer/backend/streamdemuxer.cpp | 2 +-
+ 4 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/streamprocessor/streamprocessor.cpp
b/src/streamprocessor/streamprocessor.cpp
+index b86795e..8faf8a2 100644
+--- a/src/streamprocessor/streamprocessor.cpp
b/src/streamprocessor/streamprocessor.cpp
+@@ -195,7 +195,7 @@ StreamProcessor::findStream(int streamType, int
streamIndex, bool imageSub)
+ int ret;
+ char errorText[1024];
+
+- AVCodec *dec =
avcodec_find_decoder(m_avStream->codecpar->codec_id);
++ const AVCodec *dec =
avcodec_find_decoder(m_avStream->codecpar->codec_id);
+ if(!dec) {
+ qWarning() << "Failed to find decoder for stream" << i;
+ return false;
+diff --git a/src/videoplayer/backend/decoder.h
b/src/videoplayer/backend/decoder.h
+index 4ab95b2..fb6840d 100644
+--- a/src/videoplayer/backend/decoder.h
b/src/videoplayer/backend/decoder.h
+@@ -11,6 +11,7 @@
+ #include
+
+ extern "C" {
++#include "libavcodec/avcodec.h"
+ #include "libavformat/avformat.h"
+ }
+
+diff --git a/src/videoplayer/backend/framequeue.h
b/src/videoplayer/backend/framequeue.h
+index dc9b2fa..ece1166 100644
+--- a/src/videoplayer/backend/framequeue.h
b/src/videoplayer/backend/framequeue.h
+@@ -9,6 +9,7 @@
+ #define FRAMEQUEUE_H
+
+ extern "C" {
++#include "libavcodec/avcodec.h"
+ #include "libavformat/avformat.h"
+ }
+
+diff --git a/src/videoplayer/backend/streamdemuxer.cpp
b/src/videoplayer/backend/streamdemuxer.cpp
+index 1e339b3..e8320ea 100644
+--- a/src/videoplayer/backend/streamdemuxer.cpp
b/src/videoplayer/backend/streamdemuxer.cpp
+@@ -230,7 +230,7 @@ StreamDemuxer::componentOpen(int streamIndex)
+ {
+ AVFormatContext *ic = m_vs->fmtContext;
+ AVCodecContext *avCtx;
+- AVCodec *codec;
++ const AVCodec *codec;
+ AVDictionary *opts = nullptr;
+ AVDictionaryEntry *t = nullptr;
+ int sampleRate, nbChannels;
+--
+GitLab
+
diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild
b/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild
index 3ff7e5e962a5..54143eba37a9 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild
@@ -46,6 +46,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/${P}-tests-optional.patch"
"${FILESDIR}/${P}-gles-support.patch" # bug 820035
+ "${FILESDIR}/${P}-ffmpeg-5.patch" # bug 834416
)
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/, media-video/subtitlecomposer/files/
commit: a38de3c946c83c6148450c6aa4d9c7152d37b429
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon May 9 06:17:05 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon May 9 21:55:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a38de3c9
media-video/subtitlecomposer: Fix build with dev-qt/qtgui[gles2-only]
Closes: https://bugs.gentoo.org/820035
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../subtitlecomposer-0.7.1-gles-support.patch | 122 +
.../subtitlecomposer/subtitlecomposer-0.7.1.ebuild | 7 +-
2 files changed, 127 insertions(+), 2 deletions(-)
diff --git
a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-gles-support.patch
b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-gles-support.patch
new file mode 100644
index ..98de494cf306
--- /dev/null
+++
b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-gles-support.patch
@@ -0,0 +1,122 @@
+From 167a941f8070f4a9abacb3aa2f61ee6ee00d6cb8 Mon Sep 17 00:00:00 2001
+From: Mladen Milinkovic
+Date: Thu, 7 Oct 2021 19:37:23 +0200
+Subject: [PATCH] GLRenderer: added GLES support
+
+---
+ src/videoplayer/backend/glrenderer.cpp | 44 ++
+ 1 file changed, 38 insertions(+), 6 deletions(-)
+
+diff --git a/src/videoplayer/backend/glrenderer.cpp
b/src/videoplayer/backend/glrenderer.cpp
+index 7c9c38b..5cb985d 100644
+--- a/src/videoplayer/backend/glrenderer.cpp
b/src/videoplayer/backend/glrenderer.cpp
+@@ -20,6 +20,7 @@ extern "C" {
+ }
+
+ #define DEBUG_GL 0
++#define FORCE_GLES 0
+ #define OPENGL_CORE 0
+ #define OPENGL_VER 2,0
+
+@@ -33,6 +34,17 @@ extern "C" {
+ #define asGL(glCall) glCall
+ #endif
+
++#if defined(GL_ES_VERSION_2_0) || FORCE_GLES
++#define USE_GLES
++#define TEXTURE_RGB_FORMAT GL_RGBA
++// NOTE: we don't currently support more than 8bpp on GLES
++#define TEXTURE_U16_FORMAT GL_R8
++#else
++#undef USE_GLES
++#define TEXTURE_RGB_FORMAT GL_BGRA
++#define TEXTURE_U16_FORMAT GL_R16
++#endif
++
+ using namespace SubtitleComposer;
+
+ enum { ID_Y, ID_U, ID_V, ID_OVR, ID_SIZE };
+@@ -82,6 +94,9 @@ void
+ GLRenderer::setupProfile()
+ {
+ QSurfaceFormat format(QSurfaceFormat::defaultFormat());
++#if FORCE_GLES
++ format.setRenderableType(QSurfaceFormat::OpenGLES);
++#endif
+ format.setVersion(OPENGL_VER);
+ #if DEBUG_GL
+ format.setOption(QSurfaceFormat::DebugContext);
+@@ -126,7 +141,7 @@ GLRenderer::setFrameFormat(int width, int height, int
compBits, int crWidthShift
+ m_crHeight = crHeight;
+
+ m_glType = compBytes == 1 ? GL_UNSIGNED_BYTE : GL_UNSIGNED_SHORT;
+- m_glFormat = compBytes == 1 ? GL_R8 : GL_R16;
++ m_glFormat = compBytes == 1 ? GL_R8 : TEXTURE_U16_FORMAT;
+
+ delete[] m_bufYUV;
+ m_bufSize = bufSize;
+@@ -261,7 +276,11 @@ GLRenderer::initShader()
+ delete m_vertShader;
+ m_vertShader = new QOpenGLShader(QOpenGLShader::Vertex, this);
+ bool success = m_vertShader->compileSourceCode(
++#ifdef USE_GLES
++ "#version 100\n"
++#else
+ "#version 120\n"
++#endif
+ "attribute vec4 vPos;"
+ "attribute vec2 vVidTex;"
+ "attribute vec2 vOvrTex;"
+@@ -288,7 +307,13 @@ GLRenderer::initShader()
+ csms.append(QString::number(csm[i], 'g', 10));
+ }
+
+- success = m_fragShader->compileSourceCode(QStringLiteral("#version
120\n"
++ success = m_fragShader->compileSourceCode(QStringLiteral(
++#ifdef USE_GLES
++ "#version 100\n"
++ "precision mediump float;\n"
++#else
++ "#version 120\n"
++#endif
+ "varying vec2 vfVidTex;"
+ "varying vec2 vfOvrTex;"
+ "uniform sampler2D texY;"
+@@ -348,8 +373,15 @@ GLRenderer::initializeGL()
+ QMutexLocker l(_texMutex);
+
+ initializeOpenGLFunctions();
+- qDebug() << "OpenGL version: " << reinterpret_cast(glGetString(GL_VERSION));
+- qDebug() << "GLSL version: " << reinterpret_cast(glGetString(GL_SHADING_LANGUAGE_VERSION));
++ qDebug().nospace() << "GL API: OpenGL " << (format().renderableType()
== QSurfaceFormat::OpenGLES ? "ES" : "Desktop")
++ << ' ' << format().majorVersion() << "." <<
format().minorVersion()
++#ifdef USE_GLES
++ << " (compiled for OpenGL ES)";
++#else
++ << " (compiled for OpenGL Desktop)";
++#endif
++ qDebug() << "OpenGL version:" << reinterpret_cast(glGetString(GL_VERSION));
++ qDebug() << "GLSL version:" << reinterpret_cast(glGetString(GL_SHADING_LANGUAGE_VERSION));
+
+ if(m_vao.create())
+ m_vao.bind();
+@@ -453,13 +485,13 @@ GLRenderer::uploadMM(int texWidth, int texHeight, T
*texBuf, const T *texSrc)
+ if(D == 1) {
+ asGL(glTexImage2D(GL_TEXTURE_2D, level,
m_glFormat,
[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/, media-video/subtitlecomposer/files/
commit: b598cbac8677e292b34b62104620e072fe9acf43
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Dec 25 19:54:21 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Dec 25 19:54:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b598cbac
media-video/subtitlecomposer: Fix build with >=media-video/mpv-0.33
Reported-by: Julien Papasian gmail.com>
Closes: https://bugs.gentoo.org/760006
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/subtitlecomposer-0.7.0-mpv-0.33.patch| 260 +
.../subtitlecomposer/subtitlecomposer-0.7.0.ebuild | 1 +
2 files changed, 261 insertions(+)
diff --git
a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.0-mpv-0.33.patch
b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.0-mpv-0.33.patch
new file mode 100644
index 000..a97ab22543b
--- /dev/null
+++ b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.0-mpv-0.33.patch
@@ -0,0 +1,260 @@
+From d09a3cbc60da86f57d06477dea1a57962a11ffb2 Mon Sep 17 00:00:00 2001
+From: Mladen Milinkovic
+Date: Mon, 8 Jul 2019 20:19:03 +0200
+Subject: [PATCH] MPV player config options aren't hardcoded anymore.
+
+---
+ src/videoplayerplugins/mpv/mpvbackend.cpp | 37 ++-
+ src/videoplayerplugins/mpv/mpvbackend.h | 8 +-
+ .../mpv/mpvconfigwidget.cpp | 102 --
+ src/videoplayerplugins/mpv/mpvconfigwidget.h | 8 ++
+ 4 files changed, 139 insertions(+), 16 deletions(-)
+
+diff --git a/src/videoplayerplugins/mpv/mpvbackend.cpp
b/src/videoplayerplugins/mpv/mpvbackend.cpp
+index d85a56c..9fdcd95 100644
+--- a/src/videoplayerplugins/mpv/mpvbackend.cpp
b/src/videoplayerplugins/mpv/mpvbackend.cpp
+@@ -33,8 +33,6 @@
+ #include
+
+ using namespace SubtitleComposer;
+-using namespace mpv;
+-using namespace mpv::qt;
+
+ MPVBackend::MPVBackend()
+ : PlayerBackend(),
+@@ -218,6 +216,37 @@ MPVBackend::mpvEventHandle(mpv_event *event)
+ }
+ }
+
++static QVariant
++node_to_variant(const mpv_node *node)
++{
++ switch(node->format) {
++ case MPV_FORMAT_STRING:
++ return QVariant(QString::fromUtf8(node->u.string));
++ case MPV_FORMAT_FLAG:
++ return QVariant(static_cast(node->u.flag));
++ case MPV_FORMAT_INT64:
++ return QVariant(static_cast(node->u.int64));
++ case MPV_FORMAT_DOUBLE:
++ return QVariant(node->u.double_);
++ case MPV_FORMAT_NODE_ARRAY: {
++ mpv_node_list *list = node->u.list;
++ QVariantList qlist;
++ for(int n = 0; n < list->num; n++)
++ qlist.append(node_to_variant(>values[n]));
++ return QVariant(qlist);
++ }
++ case MPV_FORMAT_NODE_MAP: {
++ mpv_node_list *list = node->u.list;
++ QVariantMap qmap;
++ for(int n = 0; n < list->num; n++)
++ qmap.insert(QString::fromUtf8(list->keys[n]),
node_to_variant(>values[n]));
++ return QVariant(qmap);
++ }
++ default: // MPV_FORMAT_NONE, unknown values (e.g. future extensions)
++ return QVariant();
++ }
++}
++
+ void
+ MPVBackend::updateTextData(const mpv_event_property *prop)
+ {
+@@ -230,7 +259,7 @@ MPVBackend::updateTextData(const mpv_event_property *prop)
+ if(val.format != MPV_FORMAT_NODE_MAP)
+ continue;
+
+- const QMap =
mpv::qt::node_to_variant().toMap();
++ const QMap =
node_to_variant().toMap();
+
+ if(map[QStringLiteral("type")].toString() !=
QStringLiteral("sub")
+ || map[QStringLiteral("external")].toBool() ==
true)
+@@ -269,7 +298,7 @@ MPVBackend::updateAudioData(const mpv_event_property *prop)
+ if(val.format != MPV_FORMAT_NODE_MAP)
+ continue;
+
+- const QMap =
mpv::qt::node_to_variant().toMap();
++ const QMap =
node_to_variant().toMap();
+
+ if(map[QStringLiteral("type")].toString() !=
QStringLiteral("audio"))
+ continue;
+diff --git a/src/videoplayerplugins/mpv/mpvbackend.h
b/src/videoplayerplugins/mpv/mpvbackend.h
+index d0edf2e..5e19fa1 100644
+--- a/src/videoplayerplugins/mpv/mpvbackend.h
b/src/videoplayerplugins/mpv/mpvbackend.h
+@@ -23,7 +23,7 @@
+
+ #include "videoplayer/playerbackend.h"
+
+-#include
++#include
+
+ #include
+ #include
+@@ -76,14 +76,10 @@ signals:
+ protected slots:
+ void onMPVEvents();
+
+-protected:
+- void setupProcessArgs(const QString );
+-
++private:
+ void mpvEventHandle(mpv_event *event);
+-
+ static void wakeup(void *ctx);
+
[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/, media-video/subtitlecomposer/files/
commit: fd173d23a57391e6f6827db5d1b23e3d8cd9f383
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Sep 29 15:01:40 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Sep 29 15:02:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd173d23
media-video/subtitlecomposer: Fix .desktop file
Closes: https://bugs.gentoo.org/745429
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../subtitlecomposer-0.7.0-valid-desktop-file.patch | 21 +
.../subtitlecomposer/subtitlecomposer-0.7.0.ebuild | 5 -
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git
a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.0-valid-desktop-file.patch
b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.0-valid-desktop-file.patch
new file mode 100644
index 000..0ee0311bcf0
--- /dev/null
+++
b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.0-valid-desktop-file.patch
@@ -0,0 +1,21 @@
+From ce2a1a94a6a0802d9a289d701e76b7975d5baa0d Mon Sep 17 00:00:00 2001
+From: Mladen Milinkovic
+Date: Thu, 9 Apr 2020 12:21:07 +0200
+Subject: [PATCH] Removed invalid subpicture/x-pgs mime - refs #20
+
+---
+ src/subtitlecomposer.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/subtitlecomposer.desktop b/src/subtitlecomposer.desktop
+index 4195b076..af8a80af 100644
+--- a/src/subtitlecomposer.desktop
b/src/subtitlecomposer.desktop
+@@ -14,6 +14,6 @@
+ Comment[hr]=KDE uređivač podnaslova
+ Icon=subtitlecomposer
+ Exec=subtitlecomposer %f
+-MimeType=text/x-ssa;text/x-ass;text/x-microdvd;text/x-mpsub;application/x-subrip;text/x-subviewer;text/x-mplsub;text/x-tmplayer;text/x-tmplayer+;application/x-vobsub;subpicture/x-pgs;video/mp2t;application/x-vobsub;video/x-matroska;video/mp4;
++MimeType=text/x-ssa;text/x-ass;text/x-microdvd;text/x-mpsub;application/x-subrip;text/x-subviewer;text/x-mplsub;text/x-tmplayer;text/x-tmplayer+;application/x-vobsub;video/mp2t;application/x-vobsub;video/x-matroska;video/mp4;
+ Terminal=false
+ Categories=Qt;KDE;AudioVideo;
diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
b/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
index 87743030541..d5fe989dd52 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
@@ -54,7 +54,10 @@ DEPEND="
"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${P}-tests-optional.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-tests-optional.patch"
+ "${FILESDIR}/${P}-valid-desktop-file.patch" # bug 745429
+)
S="${WORKDIR}/SubtitleComposer-${PV}"
[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/, media-video/subtitlecomposer/files/
commit: 371b6722d9ee08f96151ab2f7623e2b1083cd7b8
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Jul 24 21:20:29 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Jul 24 21:20:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=371b6722
media-video/subtitlecomposer: Drop 0.6.6-r1
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-video/subtitlecomposer/Manifest | 1 -
.../files/subtitlecomposer-0.6.6-cmake.patch | 12
.../subtitlecomposer-0.6.6-r1.ebuild | 79 --
3 files changed, 92 deletions(-)
diff --git a/media-video/subtitlecomposer/Manifest
b/media-video/subtitlecomposer/Manifest
index de64ad95ae7..26cef857979 100644
--- a/media-video/subtitlecomposer/Manifest
+++ b/media-video/subtitlecomposer/Manifest
@@ -1,2 +1 @@
-DIST subtitlecomposer-0.6.6.tar.gz 1637272 BLAKE2B
0a3a7cc7f0301b5ea8cb7affd4600349c8b65bf8a856480e706a3549d8deb7ddc687faad11258d7753e6484783b50fff99ddbd1fc9f68a35fbd0b4346a7a2748
SHA512
0f1513d3ff0abcbd0979b370e1ec4cd0b92f7e65adef8c922ddbf37e2dbc73fb4cd821356df6dc1ba3d8832ab8cba25573f68297f4f6be05b5c4d824a663872a
DIST subtitlecomposer-0.7.0.tar.gz 1649840 BLAKE2B
a60d3917cc9bd8025d75782e850ba2507ab140ffaeff84e995d58994e848ebe4e103a87824a20dd689132235f67102e7fec39bf0f99d827c78883165e01e9fb7
SHA512
b1c71496a2609686946af2377862b86d70e357565646a3de2f158481bc9e397f649d0907499ecd21a193ec07eaf2135b7f5831697e6b20ba6721a743227fbe04
diff --git
a/media-video/subtitlecomposer/files/subtitlecomposer-0.6.6-cmake.patch
b/media-video/subtitlecomposer/files/subtitlecomposer-0.6.6-cmake.patch
deleted file mode 100644
index 4c97e15a9e1..000
--- a/media-video/subtitlecomposer/files/subtitlecomposer-0.6.6-cmake.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN subtitlecomposer-0.6.6/CMakeLists.txt
subtitlecomposer-my/CMakeLists.txt
subtitlecomposer-0.6.6/CMakeLists.txt 2018-02-11 03:08:46.0
+0100
-+++ subtitlecomposer-my/CMakeLists.txt 2018-10-13 07:19:22.163074971 +0200
-@@ -12,7 +12,7 @@
-
- cmake_policy(SET CMP0043 NEW)
- cmake_policy(SET CMP0063 NEW)
--cmake_policy(SET CMP0071 NEW)
-+#cmake_policy(SET CMP0071 NEW) # since cmake-3.10
-
- include(KDEInstallDirs)
- include(KDECMakeSettings)
diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.6.6-r1.ebuild
b/media-video/subtitlecomposer/subtitlecomposer-0.6.6-r1.ebuild
deleted file mode 100644
index 9b10563c6fa..000
--- a/media-video/subtitlecomposer/subtitlecomposer-0.6.6-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Text-based subtitles editor"
-HOMEPAGE="https://github.com/maxrd2/subtitlecomposer;
-SRC_URI="https://github.com/maxrd2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="gstreamer libav mpv unicode xine"
-
-COMMON_DEPEND="
- $(add_frameworks_dep kcodecs)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kross)
- $(add_frameworks_dep ktextwidgets)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- $(add_frameworks_dep sonnet)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtwidgets)
- media-libs/phonon[qt5(+)]
- gstreamer? (
- dev-libs/glib:2
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- libav? ( media-video/libav:= )
- !libav? ( media-video/ffmpeg:0= )
- mpv? ( media-video/mpv[libmpv] )
- unicode? ( dev-libs/icu:= )
- xine? (
- media-libs/xine-lib
- x11-libs/libX11
- x11-libs/libxcb
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !media-video/subtitlecomposer:4
-"
-DEPEND="${COMMON_DEPEND}
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-cmake.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PocketSphinx=ON # bug 616706
- $(cmake-utils_use_find_package gstreamer GStreamer)
- $(cmake-utils_use_find_package mpv MPV)
- $(cmake-utils_use_find_package unicode ICU)
- $(cmake-utils_use_find_package xine Xine)
- $(cmake-utils_use_find_package xine X11)
- )
-
- kde5_src_configure
-}
-
-pkg_postinst() {
- kde5_pkg_postinst
-
- elog "Some example scripts provided by ${PN} require dev-lang/ruby"
- elog "or dev-lang/python to be installed."
-}
[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/, media-video/subtitlecomposer/files/
commit: 8e117a171eaff4ef363bce8d656366415662e234
Author: Maciej Mrozowski gentoo org>
AuthorDate: Sat Oct 13 05:27:08 2018 +
Commit: Maciej Mrozowski gentoo org>
CommitDate: Thu Nov 1 09:43:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e117a17
media-video/subtitlecomposer: patch 0.6.6 to work with CMake 3.3
Package-Manager: Portage-2.3.49, Repoman-2.3.11
Signed-off-by: Maciej Mrozowski gentoo.org>
.../files/subtitlecomposer-0.6.6-cmake.patch | 12
media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild | 6 +-
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git
a/media-video/subtitlecomposer/files/subtitlecomposer-0.6.6-cmake.patch
b/media-video/subtitlecomposer/files/subtitlecomposer-0.6.6-cmake.patch
new file mode 100644
index 000..4c97e15a9e1
--- /dev/null
+++ b/media-video/subtitlecomposer/files/subtitlecomposer-0.6.6-cmake.patch
@@ -0,0 +1,12 @@
+diff -ruN subtitlecomposer-0.6.6/CMakeLists.txt
subtitlecomposer-my/CMakeLists.txt
+--- subtitlecomposer-0.6.6/CMakeLists.txt 2018-02-11 03:08:46.0
+0100
subtitlecomposer-my/CMakeLists.txt 2018-10-13 07:19:22.163074971 +0200
+@@ -12,7 +12,7 @@
+
+ cmake_policy(SET CMP0043 NEW)
+ cmake_policy(SET CMP0063 NEW)
+-cmake_policy(SET CMP0071 NEW)
++#cmake_policy(SET CMP0071 NEW) # since cmake-3.10
+
+ include(KDEInstallDirs)
+ include(KDECMakeSettings)
diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild
b/media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild
index 57cb8983dbf..55b113a40f8 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -54,6 +54,10 @@ DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}/${P}-cmake.patch"
+)
+
src_configure() {
local mycmakeargs=(
-DCMAKE_DISABLE_FIND_PACKAGE_PocketSphinx=ON # bug 616706
