* [gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/files/, media-video/subtitlecomposer/
@ 2019-07-04 19:40 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2019-07-04 19:40 UTC (permalink / raw
To: gentoo-commits
commit: 887447c7391670e54d2b368610050431e9091ced
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 4 19:07:43 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 4 19:39:34 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=887447c7
media-video/subtitlecomposer: 0.7.0 version bump, EAPI-7 bump
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-video/subtitlecomposer/Manifest | 1 +
.../subtitlecomposer-0.7.0-tests-optional.patch | 9 +++
.../subtitlecomposer/subtitlecomposer-0.7.0.ebuild | 77 ++++++++++++++++++++++
3 files changed, 87 insertions(+)
diff --git a/media-video/subtitlecomposer/Manifest b/media-video/subtitlecomposer/Manifest
index 65a61b133c3..de64ad95ae7 100644
--- a/media-video/subtitlecomposer/Manifest
+++ b/media-video/subtitlecomposer/Manifest
@@ -1 +1,2 @@
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.7.0-tests-optional.patch b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.0-tests-optional.patch
new file mode 100644
index 00000000000..b2db3d9975e
--- /dev/null
+++ b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.0-tests-optional.patch
@@ -0,0 +1,9 @@
+--- a/src/core/CMakeLists.txt 2019-07-04 21:15:26.000891815 +0200
++++ b/src/core/CMakeLists.txt 2019-07-04 21:15:26.005891858 +0200
+@@ -13,4 +13,6 @@
+ CACHE INTERNAL EXPORTEDVARIABLE
+ )
+
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
new file mode 100644
index 00000000000..210696b121d
--- /dev/null
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+
+BDEPEND="
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+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="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-tests-optional.patch" )
+
+S="${WORKDIR}/SubtitleComposer-${PV}"
+
+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] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/files/, media-video/subtitlecomposer/
@ 2021-10-06 18:50 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2021-10-06 18:50 UTC (permalink / raw
To: gentoo-commits
commit: 1d7b4505bb86fecd77252f1da108825ba02a90af
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 6 17:33:31 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct 6 18:50:31 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d7b4505
media-video/subtitlecomposer: 0.7.1 version bump
See also:
https://subtitlecomposer.kde.org/2021/10/05/subtitle-composer-0.7.1-released.html
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-video/subtitlecomposer/Manifest | 1 +
.../subtitlecomposer-0.7.1-tests-optional.patch | 27 ++++++++++
.../subtitlecomposer/subtitlecomposer-0.7.1.ebuild | 62 ++++++++++++++++++++++
3 files changed, 90 insertions(+)
diff --git a/media-video/subtitlecomposer/Manifest b/media-video/subtitlecomposer/Manifest
index 26cef857979..1cfc4ac2ee5 100644
--- a/media-video/subtitlecomposer/Manifest
+++ b/media-video/subtitlecomposer/Manifest
@@ -1 +1,2 @@
DIST subtitlecomposer-0.7.0.tar.gz 1649840 BLAKE2B a60d3917cc9bd8025d75782e850ba2507ab140ffaeff84e995d58994e848ebe4e103a87824a20dd689132235f67102e7fec39bf0f99d827c78883165e01e9fb7 SHA512 b1c71496a2609686946af2377862b86d70e357565646a3de2f158481bc9e397f649d0907499ecd21a193ec07eaf2135b7f5831697e6b20ba6721a743227fbe04
+DIST subtitlecomposer-0.7.1.tar.xz 636808 BLAKE2B 4c71277c9646a64d59a0cd6923084b39292916e9edf154c026a051253fe8aabab1bdfb9e10c6fab5eb0d754ba428567c2259c637915e93d8d391b7f247c6dc79 SHA512 b486a1be8b414409af4ec2d2ccc86a7e9f34040f114b0efbbf817b5157d85b5f9a37d80272b468a389128f10c12316bf028dd86e2a7434a2b001bfd185208b92
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
new file mode 100644
index 00000000000..75d4f71a2ff
--- /dev/null
+++ b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-tests-optional.patch
@@ -0,0 +1,27 @@
+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.ebuild
new file mode 100644
index 00000000000..6f8b7b63356
--- /dev/null
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 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
+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"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="unicode"
+
+DEPEND="
+ >=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/kross-${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=( "${FILESDIR}/${P}-tests-optional.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_PocketSphinx=ON # bug 616706
+ $(cmake_use_find_package unicode ICU)
+ )
+
+ 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."
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/files/, media-video/subtitlecomposer/
@ 2021-11-09 7:20 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2021-11-09 7:20 UTC (permalink / raw
To: gentoo-commits
commit: 183475b839c833a9a072f0ca311cda4002b1d551
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 9 07:16:11 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 9 07:16:11 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=183475b8
media-video/subtitlecomposer: Drop 0.7.0
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-video/subtitlecomposer/Manifest | 1 -
.../files/subtitlecomposer-0.7.0-mpv-0.33.patch | 260 ---------------------
.../subtitlecomposer-0.7.0-tests-optional.patch | 9 -
...subtitlecomposer-0.7.0-valid-desktop-file.patch | 21 --
media-video/subtitlecomposer/metadata.xml | 3 -
.../subtitlecomposer/subtitlecomposer-0.7.0.ebuild | 83 -------
6 files changed, 377 deletions(-)
diff --git a/media-video/subtitlecomposer/Manifest b/media-video/subtitlecomposer/Manifest
index 1cfc4ac2ee5..f88fc4132ff 100644
--- a/media-video/subtitlecomposer/Manifest
+++ b/media-video/subtitlecomposer/Manifest
@@ -1,2 +1 @@
-DIST subtitlecomposer-0.7.0.tar.gz 1649840 BLAKE2B a60d3917cc9bd8025d75782e850ba2507ab140ffaeff84e995d58994e848ebe4e103a87824a20dd689132235f67102e7fec39bf0f99d827c78883165e01e9fb7 SHA512 b1c71496a2609686946af2377862b86d70e357565646a3de2f158481bc9e397f649d0907499ecd21a193ec07eaf2135b7f5831697e6b20ba6721a743227fbe04
DIST subtitlecomposer-0.7.1.tar.xz 636808 BLAKE2B 4c71277c9646a64d59a0cd6923084b39292916e9edf154c026a051253fe8aabab1bdfb9e10c6fab5eb0d754ba428567c2259c637915e93d8d391b7f247c6dc79 SHA512 b486a1be8b414409af4ec2d2ccc86a7e9f34040f114b0efbbf817b5157d85b5f9a37d80272b468a389128f10c12316bf028dd86e2a7434a2b001bfd185208b92
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
deleted file mode 100644
index a97ab22543b..00000000000
--- a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.0-mpv-0.33.patch
+++ /dev/null
@@ -1,260 +0,0 @@
-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/files/subtitlecomposer-0.7.0-tests-optional.patch b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.0-tests-optional.patch
deleted file mode 100644
index b2db3d9975e..00000000000
--- a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.0-tests-optional.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/src/core/CMakeLists.txt 2019-07-04 21:15:26.000891815 +0200
-+++ b/src/core/CMakeLists.txt 2019-07-04 21:15:26.005891858 +0200
-@@ -13,4 +13,6 @@
- CACHE INTERNAL EXPORTEDVARIABLE
- )
-
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
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
deleted file mode 100644
index 932fc6770f0..00000000000
--- a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.0-valid-desktop-file.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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+;video/mp2t;application/x-vobsub;video/x-matroska;video/mp4;
- Terminal=false
- Categories=Qt;KDE;AudioVideo;
diff --git a/media-video/subtitlecomposer/metadata.xml b/media-video/subtitlecomposer/metadata.xml
index e0450d427a6..d14e6df997e 100644
--- a/media-video/subtitlecomposer/metadata.xml
+++ b/media-video/subtitlecomposer/metadata.xml
@@ -9,9 +9,6 @@
<email>kde@gentoo.org</email>
<name>Gentoo KDE Project</name>
</maintainer>
- <use>
- <flag name="mpv">Build mpv backend support</flag>
- </use>
<upstream>
<bugs-to>https://bugs.kde.org/</bugs-to>
</upstream>
diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
deleted file mode 100644
index 6dbfebafa05..00000000000
--- a/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm
-
-DESCRIPTION="Text-based subtitles editor"
-HOMEPAGE="https://subtitlecomposer.kde.org/"
-SRC_URI="https://github.com/maxrd2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="amd64 x86"
-IUSE="gstreamer mpv unicode xine"
-
-BDEPEND="
- sys-devel/gettext
- virtual/pkgconfig
-"
-DEPEND="
- >=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/kross-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/sonnet-${KFMIN}:5
- media-libs/phonon[qt5(+)]
- gstreamer? (
- dev-libs/glib:2
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- 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="${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}"
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PocketSphinx=ON # bug 616706
- $(cmake_use_find_package gstreamer GStreamer)
- $(cmake_use_find_package mpv MPV)
- $(cmake_use_find_package unicode ICU)
- $(cmake_use_find_package xine Xine)
- $(cmake_use_find_package xine X11)
- )
-
- 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."
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/files/, media-video/subtitlecomposer/
@ 2023-12-25 17:04 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2023-12-25 17:04 UTC (permalink / raw
To: gentoo-commits
commit: 5376af3482ea18c50c5fb3bae37ec91141edf304
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 15:52:53 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 17:03:52 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5376af34
media-video/subtitlecomposer: drop 0.7.1-r3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-video/subtitlecomposer/Manifest | 1 -
...itlecomposer-0.7.1-changingaudio-crashfix.patch | 67 ----------------------
.../files/subtitlecomposer-0.7.1-ffmpeg6-1.patch | 25 --------
.../files/subtitlecomposer-0.7.1-ffmpeg6-2.patch | 42 --------------
.../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 ---------------------
9 files changed, 326 deletions(-)
diff --git a/media-video/subtitlecomposer/Manifest b/media-video/subtitlecomposer/Manifest
index 93542c9fcd38..4c0e91924bef 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.7.1.tar.xz 636808 BLAKE2B 4c71277c9646a64d59a0cd6923084b39292916e9edf154c026a051253fe8aabab1bdfb9e10c6fab5eb0d754ba428567c2259c637915e93d8d391b7f247c6dc79 SHA512 b486a1be8b414409af4ec2d2ccc86a7e9f34040f114b0efbbf817b5157d85b5f9a37d80272b468a389128f10c12316bf028dd86e2a7434a2b001bfd185208b92
DIST subtitlecomposer-0.8.0.tar.xz 730800 BLAKE2B f4d89b11f7d0669ee4594739df06f1bac91c1defacc9c27f25bff9709140c0b56a8927b2f4f79544bd35475db558c7fa2e35bff912704dd9d4e5a745a44a373a SHA512 463824631b025c760423244434000c6e7f7d44097fb7a9178ada505daa6329de0649219f563431e98d8e780fce2b1f0a39cbd77a998ece3d131166045ae40dee
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
deleted file mode 100644
index be580af101d5..000000000000
--- a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-changingaudio-crashfix.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-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-1.patch b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg6-1.patch
deleted file mode 100644
index 7e0d873992a5..000000000000
--- a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg6-1.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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
deleted file mode 100644
index 58c3e9d9dfd3..000000000000
--- a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg6-2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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/files/subtitlecomposer-0.7.1-ffmpeg6-3.patch b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg6-3.patch
deleted file mode 100644
index 2887f179afd1..000000000000
--- a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg6-3.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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
deleted file mode 100644
index d6417179d436..000000000000
--- a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-nullptr-deref.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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
deleted file mode 100644
index 4502d7254f9b..000000000000
--- a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-subtitle-crashfix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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
deleted file mode 100644
index 20c5835ba971..000000000000
--- a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-vobsub-crashfix.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-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
deleted file mode 100644
index f9e32eb0bd0d..000000000000
--- a/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/files/, media-video/subtitlecomposer/
@ 2024-06-05 18:17 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2024-06-05 18:17 UTC (permalink / raw
To: gentoo-commits
commit: 385167e12770fc12d22dfb873619b54c5292af6a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 5 17:19:24 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 5 18:16:54 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=385167e1
media-video/subtitlecomposer: Fix build w/ ICU-75
See also:
https://invent.kde.org/multimedia/subtitlecomposer/-/issues/100
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/subtitlecomposer-0.8.0-icu-75.patch | 36 ++++++++++++++++++++++
.../subtitlecomposer/subtitlecomposer-0.8.0.ebuild | 3 +-
2 files changed, 38 insertions(+), 1 deletion(-)
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
new file mode 100644
index 000000000000..89cef9917dec
--- /dev/null
+++ b/media-video/subtitlecomposer/files/subtitlecomposer-0.8.0-icu-75.patch
@@ -0,0 +1,36 @@
+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
index 68d991328aa7..662986e1833f 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.8.0.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -51,6 +51,7 @@ BDEPEND="
PATCHES=(
"${WORKDIR}/${PATCHSET}/${PN}-0.7.1-tests-optional.patch" # TODO: upstream
+ "${FILESDIR}/${P}-icu-75.patch" # git master
)
src_configure() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-06-05 18:17 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-25 17:04 [gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/files/, media-video/subtitlecomposer/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-06-05 18:17 Andreas Sturmlechner
2021-11-09 7:20 Andreas Sturmlechner
2021-10-06 18:50 Andreas Sturmlechner
2019-07-04 19:40 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox