* [gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/, media-video/subtitlecomposer/files/
@ 2018-11-01 9:45 Maciej Mrozowski
0 siblings, 0 replies; 10+ messages in thread
From: Maciej Mrozowski @ 2018-11-01 9:45 UTC (permalink / raw
To: gentoo-commits
commit: 8e117a171eaff4ef363bce8d656366415662e234
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 13 05:27:08 2018 +0000
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 1 09:43:29 2018 +0000
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 <reavertm <AT> 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 00000000000..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.000000000 +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
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/, media-video/subtitlecomposer/files/
@ 2019-07-24 21:22 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2019-07-24 21:22 UTC (permalink / raw
To: gentoo-commits
commit: 371b6722d9ee08f96151ab2f7623e2b1083cd7b8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 24 21:20:29 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 24 21:20:29 2019 +0000
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 <asturm <AT> 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..00000000000
--- 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.000000000 +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..00000000000
--- 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."
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/, media-video/subtitlecomposer/files/
@ 2020-09-29 15:02 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2020-09-29 15:02 UTC (permalink / raw
To: gentoo-commits
commit: fd173d23a57391e6f6827db5d1b23e3d8cd9f383
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 29 15:01:40 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 29 15:02:06 2020 +0000
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 <asturm <AT> 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 00000000000..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 <maxrd2@smoothware.net>
+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}"
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/, media-video/subtitlecomposer/files/
@ 2020-12-25 19:54 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2020-12-25 19:54 UTC (permalink / raw
To: gentoo-commits
commit: b598cbac8677e292b34b62104620e072fe9acf43
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 25 19:54:21 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 25 19:54:35 2020 +0000
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 <julien.papasian <AT> gmail.com>
Closes: https://bugs.gentoo.org/760006
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 00000000000..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 <maxrd2@smoothware.net>
+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 <KMessageBox>
+
+ 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<bool>(node->u.flag));
++ case MPV_FORMAT_INT64:
++ return QVariant(static_cast<qlonglong>(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(&list->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(&list->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<QString, QVariant> &map = mpv::qt::node_to_variant(&val).toMap();
++ const QMap<QString, QVariant> &map = node_to_variant(&val).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<QString, QVariant> &map = mpv::qt::node_to_variant(&val).toMap();
++ const QMap<QString, QVariant> &map = node_to_variant(&val).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 <mpv/qthelper.hpp>
++#include <mpv/client.h>
+
+ #include <QWidget>
+ #include <QString>
+@@ -76,14 +76,10 @@ signals:
+ protected slots:
+ void onMPVEvents();
+
+-protected:
+- void setupProcessArgs(const QString &filePath);
+-
++private:
+ void mpvEventHandle(mpv_event *event);
+-
+ static void wakeup(void *ctx);
+
+-private:
+ void updateTextData(const mpv_event_property *prop);
+ void updateAudioData(const mpv_event_property *prop);
+ void updateVideoData();
+diff --git a/src/videoplayerplugins/mpv/mpvconfigwidget.cpp b/src/videoplayerplugins/mpv/mpvconfigwidget.cpp
+index 78458f8..6958141 100644
+--- a/src/videoplayerplugins/mpv/mpvconfigwidget.cpp
++++ b/src/videoplayerplugins/mpv/mpvconfigwidget.cpp
+@@ -20,6 +20,11 @@
+
+ #include "mpvconfigwidget.h"
+
++#include <locale>
++#include <mpv/client.h>
++
++#include "scconfig.h"
++
+ using namespace SubtitleComposer;
+
+ MPVConfigWidget::MPVConfigWidget(QWidget *parent)
+@@ -27,14 +32,99 @@ MPVConfigWidget::MPVConfigWidget(QWidget *parent)
+ {
+ setupUi(this);
+
+- kcfg_mpvVideoOutput->addItems(QString("vdpau vaapi opengl opengl-hq sdl xv wayland x11 null").split(' '));
+- kcfg_mpvVideoOutput->setProperty("kcfg_property", QByteArray("currentText"));
++ // FIXME: libmpv requires LC_NUMERIC category to be set to "C".. is there some nicer way to do this?
++ std::setlocale(LC_NUMERIC, "C");
++ m_mpv = mpv_create();
++ mpv_request_log_messages(m_mpv, "info");
++ if(mpv_initialize(m_mpv) >= 0) {
++ getHelpResponse(); // make sure there are no log messages
++ static QStringList bad = {
++ QStringLiteral("libmpv"),
++ QStringLiteral("null"),
++ QStringLiteral("image"),
++ QStringLiteral("tct"),
++ QStringLiteral("caca"),
++ QStringLiteral("pcm"),
++ };
++
++ mpv_set_property_string(m_mpv, "vo", "help");
++ for(QString row : getHelpResponse()) {
++ int pos = row.indexOf(QChar(' '));
++ if(pos == -1)
++ continue;
++ const QString name = row.left(pos);
++ if(bad.contains(name))
++ continue;
++ row.insert(pos, "\t-");
++ if(SCConfig::mpvVideoOutput() == name)
++ kcfg_mpvVideoOutput->setCurrentIndex(kcfg_mpvHwDecode->count());
++ kcfg_mpvVideoOutput->addItem(row, name);
++ }
++ kcfg_mpvVideoOutput->setProperty("kcfg_property", QByteArray("currentData"));
++
++ mpv_set_property_string(m_mpv, "hwdec", "help");
++ kcfg_mpvHwDecode->addItem(QStringLiteral("auto\t- Choose best HW decoder"), QStringLiteral("auto"));
++ for(QString row : getHelpResponse()) {
++ int pos = row.indexOf(QChar(' '));
++ if(pos == -1)
++ continue;
++ const QString name = row.left(pos);
++ const QString lastName = kcfg_mpvHwDecode->itemData(kcfg_mpvHwDecode->count() - 1).toString();
++ if(lastName == name || bad.contains(name))
++ continue;
++ if(SCConfig::mpvHwDecode() == name)
++ kcfg_mpvHwDecode->setCurrentIndex(kcfg_mpvHwDecode->count());
++ kcfg_mpvHwDecode->addItem(name, name);
++ }
++ kcfg_mpvHwDecode->setProperty("kcfg_property", QByteArray("currentData"));
++
++ mpv_set_property_string(m_mpv, "ao", "help");
++ for(QString row : getHelpResponse()) {
++ int pos = row.indexOf(QChar(' '));
++ if(pos == -1)
++ continue;
++ const QString name = row.left(pos);
++ if(bad.contains(name))
++ continue;
++ row.insert(pos, "\t-");
++ if(SCConfig::mpvAudioOutput() == name)
++ kcfg_mpvAudioOutput->setCurrentIndex(kcfg_mpvHwDecode->count());
++ kcfg_mpvAudioOutput->addItem(row, name);
++ }
++ kcfg_mpvAudioOutput->setProperty("kcfg_property", QByteArray("currentData"));
+
+- kcfg_mpvHwDecode->addItems(QString("auto vdpau vaapi vaapi-copy").split(' '));
+- kcfg_mpvHwDecode->setProperty("kcfg_property", QByteArray("currentText"));
++ mpv_detach_destroy(m_mpv);
++ } else {
++ kcfg_mpvVideoOutput->addItems(QString("vdpau vaapi opengl opengl-hq sdl xv wayland x11 null").split(' '));
++ kcfg_mpvVideoOutput->setProperty("kcfg_property", QByteArray("currentText"));
+
+- kcfg_mpvAudioOutput->addItems(QString("pulse alsa oss portaudio jack null").split(' '));
+- kcfg_mpvAudioOutput->setProperty("kcfg_property", QByteArray("currentText"));
++ kcfg_mpvHwDecode->addItems(QString("auto vdpau vaapi vaapi-copy").split(' '));
++ kcfg_mpvHwDecode->setProperty("kcfg_property", QByteArray("currentText"));
++
++ kcfg_mpvAudioOutput->addItems(QString("pulse alsa oss portaudio jack null").split(' '));
++ kcfg_mpvAudioOutput->setProperty("kcfg_property", QByteArray("currentText"));
++ }
++}
++
++const QStringList
++MPVConfigWidget::getHelpResponse()
++{
++ QStringList res;
++ while(m_mpv) {
++ mpv_event *event = mpv_wait_event(m_mpv, .1);
++ if(event->event_id == MPV_EVENT_LOG_MESSAGE) {
++ mpv_event_log_message *msg = reinterpret_cast<mpv_event_log_message *>(event->data);
++ if(msg->log_level == MPV_LOG_LEVEL_INFO && strcmp(msg->prefix, "cplayer") == 0) {
++ QString row = QString::fromUtf8(msg->text).simplified();
++ if(row.endsWith(QChar(':')))
++ continue;
++ res << row;
++ }
++ } else if(event->event_id == MPV_EVENT_NONE) {
++ break;
++ }
++ }
++ return res;
+ }
+
+ MPVConfigWidget::~MPVConfigWidget()
+diff --git a/src/videoplayerplugins/mpv/mpvconfigwidget.h b/src/videoplayerplugins/mpv/mpvconfigwidget.h
+index f4105d7..775b507 100644
+--- a/src/videoplayerplugins/mpv/mpvconfigwidget.h
++++ b/src/videoplayerplugins/mpv/mpvconfigwidget.h
+@@ -23,6 +23,8 @@
+
+ #include "ui_mpvconfigwidget.h"
+
++#include <mpv/client.h>
++
+ namespace SubtitleComposer {
+ class MPVConfigWidget : public QWidget, private Ui::MPVConfigWidget
+ {
+@@ -31,6 +33,12 @@ class MPVConfigWidget : public QWidget, private Ui::MPVConfigWidget
+ public:
+ explicit MPVConfigWidget(QWidget *parent = 0);
+ virtual ~MPVConfigWidget();
++
++private:
++ const QStringList getHelpResponse();
++
++private:
++ mpv_handle *m_mpv;
+ };
+ }
+
+--
+2.29.2
diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
index d5fe989dd52..6dbfebafa05 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
@@ -57,6 +57,7 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${P}-tests-optional.patch"
"${FILESDIR}/${P}-valid-desktop-file.patch" # bug 745429
+ "${FILESDIR}/${P}-mpv-0.33.patch" # bug 760006
)
S="${WORKDIR}/SubtitleComposer-${PV}"
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/, media-video/subtitlecomposer/files/
@ 2022-05-09 21:56 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2022-05-09 21:56 UTC (permalink / raw
To: gentoo-commits
commit: a38de3c946c83c6148450c6aa4d9c7152d37b429
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 9 06:17:05 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May 9 21:55:13 2022 +0000
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 <asturm <AT> 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 000000000000..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 <maxrd2@smoothware.net>
+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(&m_texMutex);
+
+ initializeOpenGLFunctions();
+- qDebug() << "OpenGL version: " << reinterpret_cast<const char *>(glGetString(GL_VERSION));
+- qDebug() << "GLSL version: " << reinterpret_cast<const char *>(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<const char *>(glGetString(GL_VERSION));
++ qDebug() << "GLSL version:" << reinterpret_cast<const char *>(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, texWidth, texHeight, 0, GL_RED, m_glType, texSrc));
+ } else { // D == 4
+- asGL(glTexImage2D(GL_TEXTURE_2D, level, GL_RGBA8, texWidth, texHeight, 0, GL_BGRA, GL_UNSIGNED_BYTE, texSrc));
++ asGL(glTexImage2D(GL_TEXTURE_2D, level, GL_RGBA8, texWidth, texHeight, 0, TEXTURE_RGB_FORMAT, GL_UNSIGNED_BYTE, texSrc));
+ }
+ } else {
+ if(D == 1) {
+ asGL(glTexSubImage2D(GL_TEXTURE_2D, level, 0, 0, texWidth, texHeight, GL_RED, m_glType, texSrc));
+ } else { // D == 4
+- asGL(glTexSubImage2D(GL_TEXTURE_2D, level, 0, 0, texWidth, texHeight, GL_BGRA, GL_UNSIGNED_BYTE, texSrc));
++ asGL(glTexSubImage2D(GL_TEXTURE_2D, level, 0, 0, texWidth, texHeight, TEXTURE_RGB_FORMAT, GL_UNSIGNED_BYTE, texSrc));
+ }
+ }
+
+--
+GitLab
+
diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild
index aef529fbf604..3ff7e5e962a5 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -43,7 +43,10 @@ BDEPEND="
virtual/pkgconfig
"
-PATCHES=( "${FILESDIR}/${P}-tests-optional.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-tests-optional.patch"
+ "${FILESDIR}/${P}-gles-support.patch" # bug 820035
+)
src_configure() {
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/, media-video/subtitlecomposer/files/
@ 2022-05-18 12:50 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2022-05-18 12:50 UTC (permalink / raw
To: gentoo-commits
commit: 46b5fab594719d2d438256d257cae5fddd07f538
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed May 18 12:49:55 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 18 12:49:55 2022 +0000
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 <asturm <AT> 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 000000000000..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 <maxrd2@smoothware.net>
+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 <QThread>
+
+ 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() {
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/, media-video/subtitlecomposer/files/
@ 2023-03-29 13:53 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2023-03-29 13:53 UTC (permalink / raw
To: gentoo-commits
commit: c0b635cc77e5b73691d5397c22cb638ed5f4eb85
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 13:45:38 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 29 13:53:32 2023 +0000
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 <asturm <AT> 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..000000000000
--- 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 <maxrd2@smoothware.net>
-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 <QThread>
-
- 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..000000000000
--- 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 <maxrd2@smoothware.net>
-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(&m_texMutex);
-
- initializeOpenGLFunctions();
-- qDebug() << "OpenGL version: " << reinterpret_cast<const char *>(glGetString(GL_VERSION));
-- qDebug() << "GLSL version: " << reinterpret_cast<const char *>(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<const char *>(glGetString(GL_VERSION));
-+ qDebug() << "GLSL version:" << reinterpret_cast<const char *>(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, texWidth, texHeight, 0, GL_RED, m_glType, texSrc));
- } else { // D == 4
-- asGL(glTexImage2D(GL_TEXTURE_2D, level, GL_RGBA8, texWidth, texHeight, 0, GL_BGRA, GL_UNSIGNED_BYTE, texSrc));
-+ asGL(glTexImage2D(GL_TEXTURE_2D, level, GL_RGBA8, texWidth, texHeight, 0, TEXTURE_RGB_FORMAT, GL_UNSIGNED_BYTE, texSrc));
- }
- } else {
- if(D == 1) {
- asGL(glTexSubImage2D(GL_TEXTURE_2D, level, 0, 0, texWidth, texHeight, GL_RED, m_glType, texSrc));
- } else { // D == 4
-- asGL(glTexSubImage2D(GL_TEXTURE_2D, level, 0, 0, texWidth, texHeight, GL_BGRA, GL_UNSIGNED_BYTE, texSrc));
-+ asGL(glTexSubImage2D(GL_TEXTURE_2D, level, 0, 0, texWidth, texHeight, TEXTURE_RGB_FORMAT, GL_UNSIGNED_BYTE, texSrc));
- }
- }
-
---
-GitLab
-
diff --git a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-tests-optional.patch b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-tests-optional.patch
deleted file mode 100644
index 75d4f71a2ff7..000000000000
--- a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-tests-optional.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 6e25dd4670f0d14bdc8aff050bdacb050e0327ff Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 6 Oct 2021 20:30:03 +0200
-Subject: [PATCH] Make tests optional
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- src/CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 1cb7098..97d60a3 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -124,7 +124,9 @@ else()
- message(STATUS "ICU Library not found. KEncodingProber fallback will be used for charset detection.")
- endif()
-
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- add_subdirectory(scripting)
-
- add_executable(subtitlecomposer WIN32 main.cpp ${subtitlecomposer_RES_SRC})
---
-2.33.0
-
diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r1.ebuild
similarity index 69%
copy from media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild
copy to media-video/subtitlecomposer/subtitlecomposer-0.7.1-r1.ebuild
index 54143eba37a9..aa729948e01b 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r1.ebuild
@@ -1,24 +1,27 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
ECM_TEST="forceoptional"
KFMIN=5.82.0
-QTMIN=5.15.2
+QTMIN=5.15.5
VIRTUALX_REQUIRED="test"
inherit ecm kde.org
DESCRIPTION="Text-based subtitles editor"
HOMEPAGE="https://subtitlecomposer.kde.org/"
-SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+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"
+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
@@ -28,7 +31,6 @@ DEPEND="
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kross-${KFMIN}:5
>=kde-frameworks/ktextwidgets-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
@@ -44,9 +46,10 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}/${P}-tests-optional.patch"
- "${FILESDIR}/${P}-gles-support.patch" # bug 820035
- "${FILESDIR}/${P}-ffmpeg-5.patch" # bug 834416
+ "${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
)
src_configure() {
@@ -57,10 +60,3 @@ src_configure() {
ecm_src_configure
}
-
-pkg_postinst() {
- ecm_pkg_postinst
-
- elog "Some example scripts provided by ${PN} require dev-lang/ruby"
- elog "or dev-lang/python to be installed."
-}
diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild
index 54143eba37a9..ad0554f6b897 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,7 +11,9 @@ inherit ecm kde.org
DESCRIPTION="Text-based subtitles editor"
HOMEPAGE="https://subtitlecomposer.kde.org/"
-SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+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"
@@ -44,9 +46,9 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}/${P}-tests-optional.patch"
- "${FILESDIR}/${P}-gles-support.patch" # bug 820035
- "${FILESDIR}/${P}-ffmpeg-5.patch" # bug 834416
+ "${WORKDIR}/${PATCHSET}/${P}-tests-optional.patch"
+ "${WORKDIR}/${PATCHSET}/${P}-gles-support.patch" # bug 820035
+ "${WORKDIR}/${PATCHSET}/${P}-ffmpeg-5.patch" # bug 834416
)
src_configure() {
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/, media-video/subtitlecomposer/files/
@ 2023-07-25 12:35 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2023-07-25 12:35 UTC (permalink / raw
To: gentoo-commits
commit: a5539b941812b7f16e54e588eff7dfb7d4305063
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 25 12:34:22 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 25 12:34:22 2023 +0000
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 <asturm <AT> 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 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
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/, media-video/subtitlecomposer/files/
@ 2023-09-02 21:08 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2023-09-02 21:08 UTC (permalink / raw
To: gentoo-commits
commit: a0373a9a7c0cb43da6f772687568065b281c953f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 2 21:04:07 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 2 21:07:50 2023 +0000
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 <asturm <AT> 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 000000000000..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 <maxrd2@smoothware.net>
+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, &hwBufOffset);
+ 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, &FFPlayer::videoStreamsChanged, this, [this](const QStringList &streams){});
+ connect(m_player, &FFPlayer::audioStreamsChanged, this, [this](const QStringList &streams){
++ 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 000000000000..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 <maxrd2@smoothware.net>
+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
+(avcodec_send_packet/avcodec_receive_frame) always work with reference
+counted frames
+
+https://github.com/FFmpeg/FFmpeg/commit/b1cf151c4dfdbd049cd41863b4e0cde927585e17
+---
+ src/videoplayer/backend/streamdemuxer.cpp | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/videoplayer/backend/streamdemuxer.cpp b/src/videoplayer/backend/streamdemuxer.cpp
+index e8320ea0..7173306f 100644
+--- a/src/videoplayer/backend/streamdemuxer.cpp
++++ b/src/videoplayer/backend/streamdemuxer.cpp
+@@ -286,8 +286,6 @@ StreamDemuxer::componentOpen(int streamIndex)
+ av_dict_set(&opts, "threads", "auto", 0);
+ if(stream_lowres)
+ av_dict_set_int(&opts, "lowres", stream_lowres, 0);
+- if(avCtx->codec_type == AVMEDIA_TYPE_VIDEO || avCtx->codec_type == AVMEDIA_TYPE_AUDIO)
+- av_dict_set(&opts, "refcounted_frames", "1", 0);
+ if((ret = avcodec_open2(avCtx, codec, &opts)) < 0) {
+ goto fail;
+ }
+--
+GitLab
+
diff --git a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-nullptr-deref.patch b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-nullptr-deref.patch
new file mode 100644
index 000000000000..d6417179d436
--- /dev/null
+++ b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-nullptr-deref.patch
@@ -0,0 +1,25 @@
+From c94e4dc1362b9ac03cddb9def913ea6728875fe2 Mon Sep 17 00:00:00 2001
+From: Mladen Milinkovic <maxrd2@smoothware.net>
+Date: Sun, 18 Sep 2022 23:09:17 +0200
+Subject: [PATCH] Fixed possible null pointer deref
+
+---
+ 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 d15cf9f4..4ae4171d 100644
+--- a/src/videoplayer/backend/streamdemuxer.cpp
++++ b/src/videoplayer/backend/streamdemuxer.cpp
+@@ -45,7 +45,7 @@ isRealTime(AVFormatContext *s)
+ #else
+ const char *url = s->url;
+ #endif
+- if(s->pb && (!strncmp(url, "rtp:", 4) || !strncmp(url, "udp:", 4)))
++ if(s->pb && url && (!strncmp(url, "rtp:", 4) || !strncmp(url, "udp:", 4)))
+ return 1;
+ return 0;
+ }
+--
+GitLab
+
diff --git a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-subtitle-crashfix.patch b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-subtitle-crashfix.patch
new file mode 100644
index 000000000000..4502d7254f9b
--- /dev/null
+++ b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-subtitle-crashfix.patch
@@ -0,0 +1,25 @@
+From 09e5d80286276d4683c944dfa0cddda3479006c0 Mon Sep 17 00:00:00 2001
+From: Mladen Milinkovic <maxrd2@smoothware.net>
+Date: Thu, 19 Jan 2023 18:39:31 +0100
+Subject: [PATCH] Subtitle: fixed crash in splitLines()
+
+---
+ src/core/subtitle.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/subtitle.cpp b/src/core/subtitle.cpp
+index d3da532d..3359062e 100644
+--- a/src/core/subtitle.cpp
++++ b/src/core/subtitle.cpp
+@@ -541,7 +541,7 @@ Subtitle::splitLines(const RangeList &ranges)
+ c->insertText(QString(QChar::LineFeed));
+ return true;
+ }
+- if(text.at(j) == QChar::Space) {
++ if(j < len && text.at(j) == QChar::Space) {
+ c->movePosition(QTextCursor::Start);
+ c->movePosition(QTextCursor::NextCharacter, QTextCursor::MoveAnchor, j);
+ c->movePosition(QTextCursor::NextCharacter, QTextCursor::KeepAnchor);
+--
+GitLab
+
diff --git a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-vobsub-crashfix.patch b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-vobsub-crashfix.patch
new file mode 100644
index 000000000000..20c5835ba971
--- /dev/null
+++ b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-vobsub-crashfix.patch
@@ -0,0 +1,45 @@
+From 78553af05ba97da0920f7cabd281503bd4ca484a Mon Sep 17 00:00:00 2001
+From: Mladen Milinkovic <maxrd2@smoothware.net>
+Date: Wed, 23 Nov 2022 15:47:56 +0100
+Subject: [PATCH] VobSub: fixed crash when moving to previous image
+
+Do not delete lines on temporary Subtitle that is shown in LinesWidget.
+SubtitleLine is deleted immediately, while LinesWidget wants to repaint
+before line reference is removed from its list model.
+
+https://bugs.kde.org/show_bug.cgi?id=462156
+---
+ src/formats/vobsub/vobsubinputprocessdialog.cpp | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/src/formats/vobsub/vobsubinputprocessdialog.cpp b/src/formats/vobsub/vobsubinputprocessdialog.cpp
+index ac54b552..2ba61550 100644
+--- a/src/formats/vobsub/vobsubinputprocessdialog.cpp
++++ b/src/formats/vobsub/vobsubinputprocessdialog.cpp
+@@ -697,9 +697,12 @@ VobSubInputProcessDialog::processNextPiece()
+ piecePrev = piece;
+ }
+
+- SubtitleLine *l = new SubtitleLine((*m_frameCurrent)->subShowTime, (*m_frameCurrent)->subHideTime);
++ SubtitleLine *l = m_subtitle->line((*m_frameCurrent)->index);
++ if(!l) {
++ l = new SubtitleLine((*m_frameCurrent)->subShowTime, (*m_frameCurrent)->subHideTime);
++ m_subtitle->insertLine(l);
++ }
+ l->primaryDoc()->setPlainText(subText);
+- m_subtitle->insertLine(l);
+
+ ui->grpText->setDisabled(true);
+ ui->grpNavButtons->setDisabled(true);
+@@ -809,8 +812,6 @@ VobSubInputProcessDialog::onPrevImageClicked()
+ return;
+
+ --m_frameCurrent;
+- if(m_subtitle->lastIndex() >= 0)
+- m_subtitle->removeLines(RangeList(Range(m_subtitle->lastIndex())), Both);
+
+ ui->progressBar->setValue((*m_frameCurrent)->index + 1);
+
+--
+GitLab
+
diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r3.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r3.ebuild
new file mode 100644
index 000000000000..6be3556ee1b8
--- /dev/null
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r3.ebuild
@@ -0,0 +1,64 @@
+# 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}-nullptr-deref.patch
+ "${FILESDIR}"/${P}-ffmpeg6-{1,2,3}.patch # bugs 910048, 913475
+ "${FILESDIR}"/${P}-{changingaudio,subtitle,vobsub}-crashfix.patch # KDE-bug 462156
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_PocketSphinx=ON # bugs 616706, 610434
+ $(cmake_use_find_package unicode ICU)
+ )
+
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/, media-video/subtitlecomposer/files/
@ 2024-06-30 21:42 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2024-06-30 21:42 UTC (permalink / raw
To: gentoo-commits
commit: ff81286336884c3d877ea6dc3ac63f8bc4cd7175
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 30 08:01:28 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 30 21:31:47 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff812863
media-video/subtitlecomposer: drop 0.8.0
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-video/subtitlecomposer/Manifest | 1 -
.../files/subtitlecomposer-0.8.0-icu-75.patch | 36 ------------
.../subtitlecomposer/subtitlecomposer-0.8.0.ebuild | 64 ----------------------
3 files changed, 101 deletions(-)
diff --git a/media-video/subtitlecomposer/Manifest b/media-video/subtitlecomposer/Manifest
index bc380895d2fa..f54766dbbeeb 100644
--- a/media-video/subtitlecomposer/Manifest
+++ b/media-video/subtitlecomposer/Manifest
@@ -1,3 +1,2 @@
DIST subtitlecomposer-0.7.1-patchset-1.tar.xz 6868 BLAKE2B 59ae09e6807b0c9eeb094556ec381157701a6d3ae66317c175816f2a779ef3db1874146c5ec0d211a07353bf592c1ff7ad8dcf91a1370916d37290204e7e5909 SHA512 bd7849ee7e4bb449b7f758bf86a45110f0e647d6a35ec31bbab82b7e8f02ac3b81aed958723848a08830a32f1e252dc2231d9a8a736b738b6c105c1a715aea1b
-DIST subtitlecomposer-0.8.0.tar.xz 730800 BLAKE2B f4d89b11f7d0669ee4594739df06f1bac91c1defacc9c27f25bff9709140c0b56a8927b2f4f79544bd35475db558c7fa2e35bff912704dd9d4e5a745a44a373a SHA512 463824631b025c760423244434000c6e7f7d44097fb7a9178ada505daa6329de0649219f563431e98d8e780fce2b1f0a39cbd77a998ece3d131166045ae40dee
DIST subtitlecomposer-0.8.1.tar.xz 763276 BLAKE2B eb5eca2505e5b2c859768f2816fae603be8066d3530802c434b78c7754a379bb4d293f5138416ebbcc4b4e0d95cb71f0e11bc5efc72efcc77c4486b096b5e6fc SHA512 28e83ba2429f17d11252b1eb56d5d9ae018f746a4b211292707847ea54659b80b2829e1d482f9740da6951c614dbfc8fff4b4019cee0f5001687282075205d53
diff --git a/media-video/subtitlecomposer/files/subtitlecomposer-0.8.0-icu-75.patch b/media-video/subtitlecomposer/files/subtitlecomposer-0.8.0-icu-75.patch
deleted file mode 100644
index 89cef9917dec..000000000000
--- a/media-video/subtitlecomposer/files/subtitlecomposer-0.8.0-icu-75.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From fe3cfc6455981cb6c7beae95713d22c431f3439e Mon Sep 17 00:00:00 2001
-From: Mladen Milinkovic <maxrd2@smoothware.net>
-Date: Wed, 22 May 2024 21:35:41 +0200
-Subject: [PATCH] Increased required std to C++17 #100
-
-C++17 is supported since gcc7 and ICU 75 headers require it.
----
- CMakeLists.txt | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e60e910a..fade001b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -7,17 +7,16 @@ if(QT_MAJOR_VERSION EQUAL 6)
- set(QT_MIN_VERSION "6.0.0")
- set(KF_MAJOR_VERSION "6")
- set(KF_MIN_VERSION "5.240.0")
-- set(CMAKE_CXX_STANDARD 17)
- else()
- set(QT_EXTRA_COMPONENTS)
- set(QT_MAJOR_VERSION 5)
- set(QT_MIN_VERSION "5.9.0")
- set(KF_MAJOR_VERSION "5")
- set(KF_MIN_VERSION "5.44.0")
-- set(CMAKE_CXX_STANDARD 11)
- endif()
-
- set(CMAKE_CXX_STANDARD_REQUIRED ON)
-+set(CMAKE_CXX_STANDARD 17)
-
- find_package(ECM REQUIRED NO_MODULE)
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
---
-GitLab
-
diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.8.0.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.8.0.ebuild
deleted file mode 100644
index 662986e1833f..000000000000
--- a/media-video/subtitlecomposer/subtitlecomposer-0.8.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2024 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/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
- PATCHSET="${PN}-0.7.1-patchset-1"
- SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz
- https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz"
- KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="unicode"
-
-DEPEND="
- dev-libs/openssl:=
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${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}/${PN}-0.7.1-tests-optional.patch" # TODO: upstream
- "${FILESDIR}/${P}-icu-75.patch" # git master
-)
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PocketSphinx=ON # bugs 616706, 610434
- $(cmake_use_find_package unicode ICU)
- )
-
- ecm_src_configure
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2024-06-30 21:53 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-30 21:42 [gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/, media-video/subtitlecomposer/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2023-09-02 21:08 Andreas Sturmlechner
2023-07-25 12:35 Andreas Sturmlechner
2023-03-29 13:53 Andreas Sturmlechner
2022-05-18 12:50 Andreas Sturmlechner
2022-05-09 21:56 Andreas Sturmlechner
2020-12-25 19:54 Andreas Sturmlechner
2020-09-29 15:02 Andreas Sturmlechner
2019-07-24 21:22 Andreas Sturmlechner
2018-11-01 9:45 Maciej Mrozowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox