subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: media\-video\/subtitlecomposer\/"

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/files/, media-video/subtitlecomposer/

2023-12-25 Thread Andreas Sturmlechner

commit: 5376af3482ea18c50c5fb3bae37ec91141edf304
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Dec 25 15:52:53 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Dec 25 17:03:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5376af34

media-video/subtitlecomposer: drop 0.7.1-r3

Signed-off-by: Andreas Sturmlechner  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..
--- 
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 
-Date: Fri, 17 Jun 2022 21:34:20 +0200
-Subject: [PATCH] Fix deadlock/crash while changing audio stream on
- paused/stopped media #71
-

- src/videoplayer/backend/audiodecoder.cpp | 2 +-
- src/videoplayer/backend/decoder.cpp  | 1 +
- src/videoplayer/backend/ffplayer.cpp | 2 ++
- src/videoplayer/videoplayer.cpp  | 2 ++
- 4 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/videoplayer/backend/audiodecoder.cpp 
b/src/videoplayer/backend/audiodecoder.cpp
-index d3d13e78..9c7ee1fc 100644
 a/src/videoplayer/backend/audiodecoder.cpp
-+++ b/src/videoplayer/backend/audiodecoder.cpp
-@@ -499,7 +499,7 @@ AudioDecoder::run()
-   // bytes needed for 100ms of audio
-   const ALint hwMinBytes = m_vs->audClk.speed() * 
m_fmtTgt.bytesPerSec * .100;
- 
--  while(!m_vs->abortRequested) {
-+  while(!m_vs->abortRequested && 
!isInterruptionRequested()) {
-   ALint hwBufOffset = 0;
-   alGetSourcei(m_alSrc, AL_BYTE_OFFSET, 
);
-   if(!std::isnan(af->pts)) {
-diff --git a/src/videoplayer/backend/decoder.cpp 
b/src/videoplayer/backend/decoder.cpp
-index 79b1ad7a..8a69d918 100644
 a/src/videoplayer/backend/decoder.cpp
-+++ b/src/videoplayer/backend/decoder.cpp
-@@ -155,6 +155,7 @@ Decoder::abort()
-   m_queue->abort();
-   if(m_frameQueue)
-   m_frameQueue->signal();
-+  requestInterruption();
-   wait();
-   m_queue->flush();
- }
-diff --git a/src/videoplayer/backend/ffplayer.cpp 
b/src/videoplayer/backend/ffplayer.cpp
-index 88288285..7b26e4a4 100644
 a/src/videoplayer/backend/ffplayer.cpp
-+++ b/src/videoplayer/backend/ffplayer.cpp
-@@ -288,6 +288,8 @@ FFPlayer::activeAudioStream()
- void
- FFPlayer::activeAudioStream(int streamIndex)
- {
-+  if(!m_vs)
-+  return;
-   streamIndex = streamIndex < 0 ? -1 : 
m_vs->demuxer->absoluteStreamIndex(AVMEDIA_TYPE_AUDIO, streamIndex);
-   m_vs->demuxer->selectStream(AVMEDIA_TYPE_AUDIO, streamIndex);
- }
-diff --git a/src/videoplayer/videoplayer.cpp b/src/videoplayer/videoplayer.cpp
-index 0307ce7d..a42babe5 100644

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/

2023-12-19 Thread Arthur Zamarin

commit: 7c63c8f7058c688b33ba1f33699819c7429febb7
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Dec 20 06:23:52 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Dec 20 06:23:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c63c8f7

media-video/subtitlecomposer: Stabilize 0.8.0 x86, #920342

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-video/subtitlecomposer/subtitlecomposer-0.8.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.8.0.ebuild 
b/media-video/subtitlecomposer/subtitlecomposer-0.8.0.ebuild
index 8690e51ac51b..68d991328aa7 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.8.0.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.8.0.ebuild
@@ -15,7 +15,7 @@ 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"
+   KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/

2023-12-19 Thread Sam James

commit: 07c980dafa1cf6d2ac5d9454f9e0f756be7e0909
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec 20 01:38:59 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 20 01:38:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07c980da

media-video/subtitlecomposer: Stabilize 0.8.0 amd64, #920342

Signed-off-by: Sam James  gentoo.org>

 media-video/subtitlecomposer/subtitlecomposer-0.8.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.8.0.ebuild 
b/media-video/subtitlecomposer/subtitlecomposer-0.8.0.ebuild
index b6ea7b759537..8690e51ac51b 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.8.0.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.8.0.ebuild
@@ -15,7 +15,7 @@ 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"
+   KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/

2023-11-15 Thread Andreas Sturmlechner

commit: 63e6d7e97dee022316010eea6dd4f9332e07c55c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Nov  7 14:06:08 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Nov 15 19:49:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63e6d7e9

media-video/subtitlecomposer: add 0.8.0

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-video/subtitlecomposer/Manifest  |  1 +
 .../subtitlecomposer/subtitlecomposer-0.8.0.ebuild | 63 ++
 2 files changed, 64 insertions(+)

diff --git a/media-video/subtitlecomposer/Manifest 
b/media-video/subtitlecomposer/Manifest
index f8cfd0d22adc..93542c9fcd38 100644
--- a/media-video/subtitlecomposer/Manifest
+++ b/media-video/subtitlecomposer/Manifest
@@ -1,2 +1,3 @@
 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/subtitlecomposer-0.8.0.ebuild 
b/media-video/subtitlecomposer/subtitlecomposer-0.8.0.ebuild
new file mode 100644
index ..b6ea7b759537
--- /dev/null
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.8.0.ebuild
@@ -0,0 +1,63 @@
+# 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/;
+
+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
+)
+
+src_configure() {
+   local mycmakeargs=(
+   -DCMAKE_DISABLE_FIND_PACKAGE_PocketSphinx=ON # bugs 616706, 
610434
+   $(cmake_use_find_package unicode ICU)
+   )
+
+   ecm_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/

2023-11-14 Thread Andreas Sturmlechner

commit: 01ce041ab36e6dc5a8654c15d8e75bc0b277ade9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Nov  7 14:06:08 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Nov 14 22:55:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01ce041a

media-video/subtitlecomposer: add 0.8.0

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-video/subtitlecomposer/Manifest  |  1 +
 .../subtitlecomposer/subtitlecomposer-0.8.0.ebuild | 56 ++
 2 files changed, 57 insertions(+)

diff --git a/media-video/subtitlecomposer/Manifest 
b/media-video/subtitlecomposer/Manifest
index f8cfd0d22adc..93542c9fcd38 100644
--- a/media-video/subtitlecomposer/Manifest
+++ b/media-video/subtitlecomposer/Manifest
@@ -1,2 +1,3 @@
 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/subtitlecomposer-0.8.0.ebuild 
b/media-video/subtitlecomposer/subtitlecomposer-0.8.0.ebuild
new file mode 100644
index ..d3492864a27b
--- /dev/null
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.8.0.ebuild
@@ -0,0 +1,56 @@
+# 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/;
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+   SRC_URI="mirror://kde/stable/${PN}/${P}.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/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
+"
+
+src_configure() {
+   local mycmakeargs=(
+   -DCMAKE_DISABLE_FIND_PACKAGE_PocketSphinx=ON # bugs 616706, 
610434
+   $(cmake_use_find_package unicode ICU)
+   )
+
+   ecm_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/

2023-09-30 Thread Andreas Sturmlechner

commit: 438fffbf7ca755ad243e84656dde33e00d5825ee
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Sep 30 16:21:06 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Sep 30 16:31:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=438fffbf

media-video/subtitlecomposer: drop 0.7.1-r2

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../subtitlecomposer-0.7.1-r2.ebuild   | 62 --
 1 file changed, 62 deletions(-)

diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r2.ebuild 
b/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r2.ebuild
deleted file mode 100644
index 9b293cc77cf3..
--- a/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r2.ebuild
+++ /dev/null
@@ -1,62 +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}-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
-}

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/

2023-09-26 Thread Sam James

commit: 495238a22165f9086ba34ee635097bf15ce6c059
Author: Sam James  gentoo  org>
AuthorDate: Tue Sep 26 21:26:41 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Sep 26 21:26:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=495238a2

media-video/subtitlecomposer: Stabilize 0.7.1-r3 x86, #914762

Signed-off-by: Sam James  gentoo.org>

 media-video/subtitlecomposer/subtitlecomposer-0.7.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r3.ebuild 
b/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r3.ebuild
index bfc077172c92..f9e32eb0bd0d 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r3.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="unicode"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/

2023-09-26 Thread Sam James

commit: 465e60a07f5b12dc62df42ff8bfb01d5f7b55be8
Author: Sam James  gentoo  org>
AuthorDate: Tue Sep 26 20:59:46 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Sep 26 20:59:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=465e60a0

media-video/subtitlecomposer: Stabilize 0.7.1-r3 amd64, #914762

Signed-off-by: Sam James  gentoo.org>

 media-video/subtitlecomposer/subtitlecomposer-0.7.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r3.ebuild 
b/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r3.ebuild
index 6be3556ee1b8..bfc077172c92 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r3.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="unicode"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/, media-video/subtitlecomposer/files/

2023-09-02 Thread Andreas Sturmlechner

commit: a0373a9a7c0cb43da6f772687568065b281c953f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Sep  2 21:04:07 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Sep  2 21:07:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0373a9a

media-video/subtitlecomposer: Backports, fix runtime bug w/ >=ffmpeg-6

Closes: https://bugs.gentoo.org/913475
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...itlecomposer-0.7.1-changingaudio-crashfix.patch | 67 ++
 .../files/subtitlecomposer-0.7.1-ffmpeg6-3.patch   | 32 +++
 .../subtitlecomposer-0.7.1-nullptr-deref.patch | 25 
 .../subtitlecomposer-0.7.1-subtitle-crashfix.patch | 25 
 .../subtitlecomposer-0.7.1-vobsub-crashfix.patch   | 45 +++
 .../subtitlecomposer-0.7.1-r3.ebuild   | 64 +
 6 files changed, 258 insertions(+)

diff --git 
a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-changingaudio-crashfix.patch
 
b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-changingaudio-crashfix.patch
new file mode 100644
index ..be580af101d5
--- /dev/null
+++ 
b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-changingaudio-crashfix.patch
@@ -0,0 +1,67 @@
+From 88a6cf4e4aaa58229b9b07d66c2abd264dfbc2f1 Mon Sep 17 00:00:00 2001
+From: Mladen Milinkovic 
+Date: Fri, 17 Jun 2022 21:34:20 +0200
+Subject: [PATCH] Fix deadlock/crash while changing audio stream on
+ paused/stopped media #71
+
+---
+ src/videoplayer/backend/audiodecoder.cpp | 2 +-
+ src/videoplayer/backend/decoder.cpp  | 1 +
+ src/videoplayer/backend/ffplayer.cpp | 2 ++
+ src/videoplayer/videoplayer.cpp  | 2 ++
+ 4 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/videoplayer/backend/audiodecoder.cpp 
b/src/videoplayer/backend/audiodecoder.cpp
+index d3d13e78..9c7ee1fc 100644
+--- a/src/videoplayer/backend/audiodecoder.cpp
 b/src/videoplayer/backend/audiodecoder.cpp
+@@ -499,7 +499,7 @@ AudioDecoder::run()
+   // bytes needed for 100ms of audio
+   const ALint hwMinBytes = m_vs->audClk.speed() * 
m_fmtTgt.bytesPerSec * .100;
+ 
+-  while(!m_vs->abortRequested) {
++  while(!m_vs->abortRequested && 
!isInterruptionRequested()) {
+   ALint hwBufOffset = 0;
+   alGetSourcei(m_alSrc, AL_BYTE_OFFSET, 
);
+   if(!std::isnan(af->pts)) {
+diff --git a/src/videoplayer/backend/decoder.cpp 
b/src/videoplayer/backend/decoder.cpp
+index 79b1ad7a..8a69d918 100644
+--- a/src/videoplayer/backend/decoder.cpp
 b/src/videoplayer/backend/decoder.cpp
+@@ -155,6 +155,7 @@ Decoder::abort()
+   m_queue->abort();
+   if(m_frameQueue)
+   m_frameQueue->signal();
++  requestInterruption();
+   wait();
+   m_queue->flush();
+ }
+diff --git a/src/videoplayer/backend/ffplayer.cpp 
b/src/videoplayer/backend/ffplayer.cpp
+index 88288285..7b26e4a4 100644
+--- a/src/videoplayer/backend/ffplayer.cpp
 b/src/videoplayer/backend/ffplayer.cpp
+@@ -288,6 +288,8 @@ FFPlayer::activeAudioStream()
+ void
+ FFPlayer::activeAudioStream(int streamIndex)
+ {
++  if(!m_vs)
++  return;
+   streamIndex = streamIndex < 0 ? -1 : 
m_vs->demuxer->absoluteStreamIndex(AVMEDIA_TYPE_AUDIO, streamIndex);
+   m_vs->demuxer->selectStream(AVMEDIA_TYPE_AUDIO, streamIndex);
+ }
+diff --git a/src/videoplayer/videoplayer.cpp b/src/videoplayer/videoplayer.cpp
+index 0307ce7d..a42babe5 100644
+--- a/src/videoplayer/videoplayer.cpp
 b/src/videoplayer/videoplayer.cpp
+@@ -301,6 +301,8 @@ VideoPlayer::setupNotifications()
+ 
+   //connect(m_player, ::videoStreamsChanged, this, [this](const 
QStringList ){});
+   connect(m_player, ::audioStreamsChanged, this, [this](const 
QStringList ){
++  if(m_activeAudioStream >= 0)
++  m_player->activeAudioStream(m_activeAudioStream);
+   emit audioStreamsChanged(m_audioStreams = streams);
+   emit activeAudioStreamChanged(m_activeAudioStream = 
m_player->activeAudioStream());
+   });
+-- 
+GitLab
+

diff --git 
a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg6-3.patch 
b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg6-3.patch
new file mode 100644
index ..2887f179afd1
--- /dev/null
+++ b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg6-3.patch
@@ -0,0 +1,32 @@
+From d8f9797d9c0d45fa9f4402f79c539544b74d2cc7 Mon Sep 17 00:00:00 2001
+From: Mladen Milinkovic 
+Date: Fri, 1 Apr 2022 08:35:17 +0200
+Subject: [PATCH] VideoPlayer: Fix usage of deprecated/removed AVCodec option
+ #68
+
+AVCodecContext.refcounted_frames was useful for deprecated API only
+(avcodec_decode_video2/avcodec_decode_audio4). The new decode APIs

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/

2023-08-25 Thread Andreas Sturmlechner

commit: 6a4a86fa5df0a330b5c50f76b98736446c1862a8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Aug 25 17:52:19 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Aug 25 18:09:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a4a86fa

media-video/subtitlecomposer: drop 0.7.1-r1

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../subtitlecomposer-0.7.1-r1.ebuild   | 62 --
 1 file changed, 62 deletions(-)

diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r1.ebuild 
b/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r1.ebuild
deleted file mode 100644
index 48d6f36bd03d..
--- a/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,62 +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.82.0
-QTMIN=5.15.5
-VIRTUALX_REQUIRED="test"
-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
-)
-
-src_configure() {
-   local mycmakeargs=(
-   -DCMAKE_DISABLE_FIND_PACKAGE_PocketSphinx=ON # bug 616706
-   $(cmake_use_find_package unicode ICU)
-   )
-
-   ecm_src_configure
-}

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/

2023-08-25 Thread Arthur Zamarin

commit: d71eb4a16571b2820c00a854ca99c9c5f463c094
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Aug 25 12:23:56 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Aug 25 12:23:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d71eb4a1

media-video/subtitlecomposer: Stabilize 0.7.1-r2 amd64, #912995

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-video/subtitlecomposer/subtitlecomposer-0.7.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r2.ebuild 
b/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r2.ebuild
index 68c9e0781bf9..9b293cc77cf3 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r2.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="unicode"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/

2023-08-25 Thread Arthur Zamarin

commit: 2f7da1e43e043725b02bfb07ebc7bb236465fdb7
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Aug 25 12:23:55 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Aug 25 12:23:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f7da1e4

media-video/subtitlecomposer: Stabilize 0.7.1-r2 x86, #912995

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-video/subtitlecomposer/subtitlecomposer-0.7.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r2.ebuild 
b/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r2.ebuild
index 84b4fcd68249..68c9e0781bf9 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r2.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="unicode"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/, media-video/subtitlecomposer/files/

2023-07-25 Thread Andreas Sturmlechner

commit: a5539b941812b7f16e54e588eff7dfb7d4305063
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jul 25 12:34:22 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jul 25 12:34:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5539b94

media-video/subtitlecomposer: Fix build and runtime with >=ffmpeg-6

Upstream commits:
12f4d7f49d0b1a7fc02b0836521a285e7b6bac9d
0bb0e6ed99d5a4200cc89fc6e8b3013c70465402

Closes: https://bugs.gentoo.org/910048
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/subtitlecomposer-0.7.1-ffmpeg6-1.patch   | 25 +
 .../files/subtitlecomposer-0.7.1-ffmpeg6-2.patch   | 42 +++
 .../subtitlecomposer-0.7.1-r2.ebuild   | 62 ++
 3 files changed, 129 insertions(+)

diff --git 
a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg6-1.patch 
b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg6-1.patch
new file mode 100644
index ..7e0d873992a5
--- /dev/null
+++ b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg6-1.patch
@@ -0,0 +1,25 @@
+From 12f4d7f49d0b1a7fc02b0836521a285e7b6bac9d Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid 
+Date: Sat, 4 Mar 2023 10:58:04 +0100
+Subject: [PATCH] Use non deprecated ffmpeg api
+
+---
+ src/videoplayer/backend/streamdemuxer.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/videoplayer/backend/streamdemuxer.cpp 
b/src/videoplayer/backend/streamdemuxer.cpp
+index e3bd808a..39222d8c 100644
+--- a/src/videoplayer/backend/streamdemuxer.cpp
 b/src/videoplayer/backend/streamdemuxer.cpp
+@@ -504,7 +504,7 @@ StreamDemuxer::run()
+ 
+   { // find_stream_info
+   const int origNbStreams = ic->nb_streams;
+-  AVDictionary **opts = (AVDictionary 
**)av_mallocz_array(origNbStreams, sizeof(*opts));
++  AVDictionary **opts = (AVDictionary **)av_calloc(origNbStreams, 
sizeof(*opts));
+   if(!opts) {
+   av_log(nullptr, AV_LOG_ERROR, "Could not alloc memory 
for stream options.\n");
+   goto cleanup;
+-- 
+GitLab
+

diff --git 
a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg6-2.patch 
b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg6-2.patch
new file mode 100644
index ..58c3e9d9dfd3
--- /dev/null
+++ b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg6-2.patch
@@ -0,0 +1,42 @@
+From 0bb0e6ed99d5a4200cc89fc6e8b3013c70465402 Mon Sep 17 00:00:00 2001
+From: Mladen Milinkovic 
+Date: Mon, 5 Jun 2023 10:13:15 +0200
+Subject: [PATCH] StreamProcessor: fixed embedded ASS decoding
+
+Seems embeded ASS subtitle format got changed in FFmpeg 6. Haven't found
+any references to it tho, so this might still be borked in some cases.
+---
+ src/streamprocessor/streamprocessor.cpp | 9 -
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/src/streamprocessor/streamprocessor.cpp 
b/src/streamprocessor/streamprocessor.cpp
+index b759b0d3..1e883780 100644
+--- a/src/streamprocessor/streamprocessor.cpp
 b/src/streamprocessor/streamprocessor.cpp
+@@ -537,11 +537,10 @@ StreamProcessor::processText()
+   case SUBTITLE_ASS: {
+ #if 1
+   const char *assText = sub->ass;
+-  if(strncmp("Dialogue", assText, 8) != 0)
+-  break;
+-
++  // FIXME: did ass format change with 
ffmpeg6? can't find any references
++  const int textLocation = 
strncmp("Dialogue", assText, 8) ? 8 : 9;
+   // Dialogue: Marked, Start, End, Style, 
Name, MarginL, MarginR, MarginV, Effect, Text
+-  for(int c = 9; c && *assText; 
assText++) {
++  for(int c = textLocation; c && 
*assText; assText++) {
+   if(*assText == ',')
+   c--;
+   }
+@@ -550,7 +549,7 @@ StreamProcessor::processText()
+   
  "{\\c&}red {\\c&}green {\\c&}blue{\\r}\\n"
+   
  "Another {\\b100}bold\\h{\\i1}bolditalic{\\b0\\i0} some{\\anidfsd} 
unsupported tag";
+ #endif
+-  QString assChunk(assText);
++  QString assChunk = 
QString::fromUtf8(assText);
+ 
+   assChunk
+   
.replace(QStringLiteral("\\N"), QStringLiteral("\n"))
+-- 
+GitLab
+

diff --git

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/

2023-05-06 Thread Andreas Sturmlechner

commit: 347b3a22161831d8cb25f0bfc4eaa7c0c8ee43f7
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat May  6 18:12:20 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat May  6 18:12:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=347b3a22

media-video/subtitlecomposer: drop 0.7.1

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../subtitlecomposer/subtitlecomposer-0.7.1.ebuild | 68 --
 1 file changed, 68 deletions(-)

diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild 
b/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild
deleted file mode 100644
index ad0554f6b897..
--- a/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild
+++ /dev/null
@@ -1,68 +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.82.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-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/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=(
-   "${WORKDIR}/${PATCHSET}/${P}-tests-optional.patch"
-   "${WORKDIR}/${PATCHSET}/${P}-gles-support.patch" # bug 820035
-   "${WORKDIR}/${PATCHSET}/${P}-ffmpeg-5.patch" # bug 834416
-)
-
-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."
-}

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/

2023-05-06 Thread Arthur Zamarin

commit: ea4768f4c7086c2f7a3e4943de48c6d5839ea3b0
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat May  6 09:23:41 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat May  6 09:23:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea4768f4

media-video/subtitlecomposer: Stabilize 0.7.1-r1 amd64, #904869

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-video/subtitlecomposer/subtitlecomposer-0.7.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r1.ebuild 
b/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r1.ebuild
index aa729948e01b..bdd54240628b 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r1.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="unicode"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/

2023-05-06 Thread Arthur Zamarin

commit: 8a162923285a68ef7cac1345054cbc109dd02ff9
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat May  6 09:23:44 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat May  6 09:23:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a162923

media-video/subtitlecomposer: Stabilize 0.7.1-r1 x86, #904869

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-video/subtitlecomposer/subtitlecomposer-0.7.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r1.ebuild 
b/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r1.ebuild
index bdd54240628b..48d6f36bd03d 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r1.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="unicode"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/, media-video/subtitlecomposer/files/

2023-03-29 Thread Andreas Sturmlechner

commit: c0b635cc77e5b73691d5397c22cb638ed5f4eb85
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Mar 29 13:45:38 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Mar 29 13:53:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0b635cc

media-video/subtitlecomposer: Replace Kross with QJSEngine

Upstream commit 4a8df2a16c929f179fe69f1c3e867c03780874c5

Switch to patchset.

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-video/subtitlecomposer/Manifest  |   1 +
 .../files/subtitlecomposer-0.7.1-ffmpeg-5.patch|  65 ---
 .../subtitlecomposer-0.7.1-gles-support.patch  | 122 -
 .../subtitlecomposer-0.7.1-tests-optional.patch|  27 -
 ...7.1.ebuild => subtitlecomposer-0.7.1-r1.ebuild} |  26 ++---
 .../subtitlecomposer/subtitlecomposer-0.7.1.ebuild |  12 +-
 6 files changed, 19 insertions(+), 234 deletions(-)

diff --git a/media-video/subtitlecomposer/Manifest 
b/media-video/subtitlecomposer/Manifest
index f88fc4132ffd..f8cfd0d22adc 100644
--- a/media-video/subtitlecomposer/Manifest
+++ b/media-video/subtitlecomposer/Manifest
@@ -1 +1,2 @@
+DIST subtitlecomposer-0.7.1-patchset-1.tar.xz 6868 BLAKE2B 
59ae09e6807b0c9eeb094556ec381157701a6d3ae66317c175816f2a779ef3db1874146c5ec0d211a07353bf592c1ff7ad8dcf91a1370916d37290204e7e5909
 SHA512 
bd7849ee7e4bb449b7f758bf86a45110f0e647d6a35ec31bbab82b7e8f02ac3b81aed958723848a08830a32f1e252dc2231d9a8a736b738b6c105c1a715aea1b
 DIST subtitlecomposer-0.7.1.tar.xz 636808 BLAKE2B 
4c71277c9646a64d59a0cd6923084b39292916e9edf154c026a051253fe8aabab1bdfb9e10c6fab5eb0d754ba428567c2259c637915e93d8d391b7f247c6dc79
 SHA512 
b486a1be8b414409af4ec2d2ccc86a7e9f34040f114b0efbbf817b5157d85b5f9a37d80272b468a389128f10c12316bf028dd86e2a7434a2b001bfd185208b92

diff --git 
a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg-5.patch 
b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg-5.patch
deleted file mode 100644
index a0314fb06820..
--- a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg-5.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 4f4f560e40ba0b760cf688eb024be3cc734ca347 Mon Sep 17 00:00:00 2001
-From: Mladen Milinkovic 
-Date: Tue, 25 Jan 2022 14:01:56 +0100
-Subject: [PATCH] Fix compilation with ffmpeg5 #63
-

- src/streamprocessor/streamprocessor.cpp   | 2 +-
- src/videoplayer/backend/decoder.h | 1 +
- src/videoplayer/backend/framequeue.h  | 1 +
- src/videoplayer/backend/streamdemuxer.cpp | 2 +-
- 4 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/streamprocessor/streamprocessor.cpp 
b/src/streamprocessor/streamprocessor.cpp
-index b86795e..8faf8a2 100644
 a/src/streamprocessor/streamprocessor.cpp
-+++ b/src/streamprocessor/streamprocessor.cpp
-@@ -195,7 +195,7 @@ StreamProcessor::findStream(int streamType, int 
streamIndex, bool imageSub)
-   int ret;
-   char errorText[1024];
- 
--  AVCodec *dec = 
avcodec_find_decoder(m_avStream->codecpar->codec_id);
-+  const AVCodec *dec = 
avcodec_find_decoder(m_avStream->codecpar->codec_id);
-   if(!dec) {
-   qWarning() << "Failed to find decoder for stream" << i;
-   return false;
-diff --git a/src/videoplayer/backend/decoder.h 
b/src/videoplayer/backend/decoder.h
-index 4ab95b2..fb6840d 100644
 a/src/videoplayer/backend/decoder.h
-+++ b/src/videoplayer/backend/decoder.h
-@@ -11,6 +11,7 @@
- #include 
- 
- extern "C" {
-+#include "libavcodec/avcodec.h"
- #include "libavformat/avformat.h"
- }
- 
-diff --git a/src/videoplayer/backend/framequeue.h 
b/src/videoplayer/backend/framequeue.h
-index dc9b2fa..ece1166 100644
 a/src/videoplayer/backend/framequeue.h
-+++ b/src/videoplayer/backend/framequeue.h
-@@ -9,6 +9,7 @@
- #define FRAMEQUEUE_H
- 
- extern "C" {
-+#include "libavcodec/avcodec.h"
- #include "libavformat/avformat.h"
- }
- 
-diff --git a/src/videoplayer/backend/streamdemuxer.cpp 
b/src/videoplayer/backend/streamdemuxer.cpp
-index 1e339b3..e8320ea 100644
 a/src/videoplayer/backend/streamdemuxer.cpp
-+++ b/src/videoplayer/backend/streamdemuxer.cpp
-@@ -230,7 +230,7 @@ StreamDemuxer::componentOpen(int streamIndex)
- {
-   AVFormatContext *ic = m_vs->fmtContext;
-   AVCodecContext *avCtx;
--  AVCodec *codec;
-+  const AVCodec *codec;
-   AVDictionary *opts = nullptr;
-   AVDictionaryEntry *t = nullptr;
-   int sampleRate, nbChannels;
--- 
-GitLab
-

diff --git 
a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-gles-support.patch 
b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-gles-support.patch
deleted file mode 100644
index 98de494cf306..
--- 
a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-gles-support.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From 167a941f8070f4a9abacb3aa2f61ee6ee00d6cb8 Mon Sep 17 00:00:00 2001
-From: Mladen Milinkovic

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/, media-video/subtitlecomposer/files/

2022-05-18 Thread Andreas Sturmlechner

commit: 46b5fab594719d2d438256d257cae5fddd07f538
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed May 18 12:49:55 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed May 18 12:49:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46b5fab5

media-video/subtitlecomposer: Fix build with >=ffmpeg-5

Upstream commit 4f4f560e40ba0b760cf688eb024be3cc734ca347

Closes: https://bugs.gentoo.org/834416
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/subtitlecomposer-0.7.1-ffmpeg-5.patch| 65 ++
 .../subtitlecomposer/subtitlecomposer-0.7.1.ebuild |  1 +
 2 files changed, 66 insertions(+)

diff --git 
a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg-5.patch 
b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg-5.patch
new file mode 100644
index ..a0314fb06820
--- /dev/null
+++ b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg-5.patch
@@ -0,0 +1,65 @@
+From 4f4f560e40ba0b760cf688eb024be3cc734ca347 Mon Sep 17 00:00:00 2001
+From: Mladen Milinkovic 
+Date: Tue, 25 Jan 2022 14:01:56 +0100
+Subject: [PATCH] Fix compilation with ffmpeg5 #63
+
+---
+ src/streamprocessor/streamprocessor.cpp   | 2 +-
+ src/videoplayer/backend/decoder.h | 1 +
+ src/videoplayer/backend/framequeue.h  | 1 +
+ src/videoplayer/backend/streamdemuxer.cpp | 2 +-
+ 4 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/streamprocessor/streamprocessor.cpp 
b/src/streamprocessor/streamprocessor.cpp
+index b86795e..8faf8a2 100644
+--- a/src/streamprocessor/streamprocessor.cpp
 b/src/streamprocessor/streamprocessor.cpp
+@@ -195,7 +195,7 @@ StreamProcessor::findStream(int streamType, int 
streamIndex, bool imageSub)
+   int ret;
+   char errorText[1024];
+ 
+-  AVCodec *dec = 
avcodec_find_decoder(m_avStream->codecpar->codec_id);
++  const AVCodec *dec = 
avcodec_find_decoder(m_avStream->codecpar->codec_id);
+   if(!dec) {
+   qWarning() << "Failed to find decoder for stream" << i;
+   return false;
+diff --git a/src/videoplayer/backend/decoder.h 
b/src/videoplayer/backend/decoder.h
+index 4ab95b2..fb6840d 100644
+--- a/src/videoplayer/backend/decoder.h
 b/src/videoplayer/backend/decoder.h
+@@ -11,6 +11,7 @@
+ #include 
+ 
+ extern "C" {
++#include "libavcodec/avcodec.h"
+ #include "libavformat/avformat.h"
+ }
+ 
+diff --git a/src/videoplayer/backend/framequeue.h 
b/src/videoplayer/backend/framequeue.h
+index dc9b2fa..ece1166 100644
+--- a/src/videoplayer/backend/framequeue.h
 b/src/videoplayer/backend/framequeue.h
+@@ -9,6 +9,7 @@
+ #define FRAMEQUEUE_H
+ 
+ extern "C" {
++#include "libavcodec/avcodec.h"
+ #include "libavformat/avformat.h"
+ }
+ 
+diff --git a/src/videoplayer/backend/streamdemuxer.cpp 
b/src/videoplayer/backend/streamdemuxer.cpp
+index 1e339b3..e8320ea 100644
+--- a/src/videoplayer/backend/streamdemuxer.cpp
 b/src/videoplayer/backend/streamdemuxer.cpp
+@@ -230,7 +230,7 @@ StreamDemuxer::componentOpen(int streamIndex)
+ {
+   AVFormatContext *ic = m_vs->fmtContext;
+   AVCodecContext *avCtx;
+-  AVCodec *codec;
++  const AVCodec *codec;
+   AVDictionary *opts = nullptr;
+   AVDictionaryEntry *t = nullptr;
+   int sampleRate, nbChannels;
+-- 
+GitLab
+

diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild 
b/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild
index 3ff7e5e962a5..54143eba37a9 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild
@@ -46,6 +46,7 @@ BDEPEND="
 PATCHES=(
"${FILESDIR}/${P}-tests-optional.patch"
"${FILESDIR}/${P}-gles-support.patch" # bug 820035
+   "${FILESDIR}/${P}-ffmpeg-5.patch" # bug 834416
 )
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/, media-video/subtitlecomposer/files/

2022-05-09 Thread Andreas Sturmlechner

commit: a38de3c946c83c6148450c6aa4d9c7152d37b429
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon May  9 06:17:05 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon May  9 21:55:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a38de3c9

media-video/subtitlecomposer: Fix build with dev-qt/qtgui[gles2-only]

Closes: https://bugs.gentoo.org/820035
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../subtitlecomposer-0.7.1-gles-support.patch  | 122 +
 .../subtitlecomposer/subtitlecomposer-0.7.1.ebuild |   7 +-
 2 files changed, 127 insertions(+), 2 deletions(-)

diff --git 
a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-gles-support.patch 
b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-gles-support.patch
new file mode 100644
index ..98de494cf306
--- /dev/null
+++ 
b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-gles-support.patch
@@ -0,0 +1,122 @@
+From 167a941f8070f4a9abacb3aa2f61ee6ee00d6cb8 Mon Sep 17 00:00:00 2001
+From: Mladen Milinkovic 
+Date: Thu, 7 Oct 2021 19:37:23 +0200
+Subject: [PATCH] GLRenderer: added GLES support
+
+---
+ src/videoplayer/backend/glrenderer.cpp | 44 ++
+ 1 file changed, 38 insertions(+), 6 deletions(-)
+
+diff --git a/src/videoplayer/backend/glrenderer.cpp 
b/src/videoplayer/backend/glrenderer.cpp
+index 7c9c38b..5cb985d 100644
+--- a/src/videoplayer/backend/glrenderer.cpp
 b/src/videoplayer/backend/glrenderer.cpp
+@@ -20,6 +20,7 @@ extern "C" {
+ }
+ 
+ #define DEBUG_GL 0
++#define FORCE_GLES 0
+ #define OPENGL_CORE 0
+ #define OPENGL_VER 2,0
+ 
+@@ -33,6 +34,17 @@ extern "C" {
+ #define asGL(glCall) glCall
+ #endif
+ 
++#if defined(GL_ES_VERSION_2_0) || FORCE_GLES
++#define USE_GLES
++#define TEXTURE_RGB_FORMAT GL_RGBA
++// NOTE: we don't currently support more than 8bpp on GLES
++#define TEXTURE_U16_FORMAT GL_R8
++#else
++#undef USE_GLES
++#define TEXTURE_RGB_FORMAT GL_BGRA
++#define TEXTURE_U16_FORMAT GL_R16
++#endif
++
+ using namespace SubtitleComposer;
+ 
+ enum { ID_Y, ID_U, ID_V, ID_OVR, ID_SIZE };
+@@ -82,6 +94,9 @@ void
+ GLRenderer::setupProfile()
+ {
+   QSurfaceFormat format(QSurfaceFormat::defaultFormat());
++#if FORCE_GLES
++  format.setRenderableType(QSurfaceFormat::OpenGLES);
++#endif
+   format.setVersion(OPENGL_VER);
+ #if DEBUG_GL
+   format.setOption(QSurfaceFormat::DebugContext);
+@@ -126,7 +141,7 @@ GLRenderer::setFrameFormat(int width, int height, int 
compBits, int crWidthShift
+   m_crHeight = crHeight;
+ 
+   m_glType = compBytes == 1 ? GL_UNSIGNED_BYTE : GL_UNSIGNED_SHORT;
+-  m_glFormat = compBytes == 1 ? GL_R8 : GL_R16;
++  m_glFormat = compBytes == 1 ? GL_R8 : TEXTURE_U16_FORMAT;
+ 
+   delete[] m_bufYUV;
+   m_bufSize = bufSize;
+@@ -261,7 +276,11 @@ GLRenderer::initShader()
+   delete m_vertShader;
+   m_vertShader = new QOpenGLShader(QOpenGLShader::Vertex, this);
+   bool success = m_vertShader->compileSourceCode(
++#ifdef USE_GLES
++  "#version 100\n"
++#else
+   "#version 120\n"
++#endif
+   "attribute vec4 vPos;"
+   "attribute vec2 vVidTex;"
+   "attribute vec2 vOvrTex;"
+@@ -288,7 +307,13 @@ GLRenderer::initShader()
+   csms.append(QString::number(csm[i], 'g', 10));
+   }
+ 
+-  success = m_fragShader->compileSourceCode(QStringLiteral("#version 
120\n"
++  success = m_fragShader->compileSourceCode(QStringLiteral(
++#ifdef USE_GLES
++  "#version 100\n"
++  "precision mediump float;\n"
++#else
++  "#version 120\n"
++#endif
+   "varying vec2 vfVidTex;"
+   "varying vec2 vfOvrTex;"
+   "uniform sampler2D texY;"
+@@ -348,8 +373,15 @@ GLRenderer::initializeGL()
+   QMutexLocker l(_texMutex);
+ 
+   initializeOpenGLFunctions();
+-  qDebug() << "OpenGL version: " << reinterpret_cast(glGetString(GL_VERSION));
+-  qDebug() << "GLSL version: " << reinterpret_cast(glGetString(GL_SHADING_LANGUAGE_VERSION));
++  qDebug().nospace() << "GL API: OpenGL " << (format().renderableType() 
== QSurfaceFormat::OpenGLES ? "ES" : "Desktop")
++  << ' ' << format().majorVersion() << "." << 
format().minorVersion()
++#ifdef USE_GLES
++  << " (compiled for OpenGL ES)";
++#else
++  << " (compiled for OpenGL Desktop)";
++#endif
++  qDebug() << "OpenGL version:" << reinterpret_cast(glGetString(GL_VERSION));
++  qDebug() << "GLSL version:" << reinterpret_cast(glGetString(GL_SHADING_LANGUAGE_VERSION));
+ 
+   if(m_vao.create())
+   m_vao.bind();
+@@ -453,13 +485,13 @@ GLRenderer::uploadMM(int texWidth, int texHeight, T 
*texBuf, const T *texSrc)
+   if(D == 1) {
+   asGL(glTexImage2D(GL_TEXTURE_2D, level, 
m_glFormat,

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/files/, media-video/subtitlecomposer/

2021-11-08 Thread Andreas Sturmlechner

commit: 183475b839c833a9a072f0ca311cda4002b1d551
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Nov  9 07:16:11 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Nov  9 07:16:11 2021 +
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  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..000
--- 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 
-Date: Mon, 8 Jul 2019 20:19:03 +0200
-Subject: [PATCH] MPV player config options aren't hardcoded anymore.
-

- src/videoplayerplugins/mpv/mpvbackend.cpp |  37 ++-
- src/videoplayerplugins/mpv/mpvbackend.h   |   8 +-
- .../mpv/mpvconfigwidget.cpp   | 102 --
- src/videoplayerplugins/mpv/mpvconfigwidget.h  |   8 ++
- 4 files changed, 139 insertions(+), 16 deletions(-)
-
-diff --git a/src/videoplayerplugins/mpv/mpvbackend.cpp 
b/src/videoplayerplugins/mpv/mpvbackend.cpp
-index d85a56c..9fdcd95 100644
 a/src/videoplayerplugins/mpv/mpvbackend.cpp
-+++ b/src/videoplayerplugins/mpv/mpvbackend.cpp
-@@ -33,8 +33,6 @@
- #include 
- 
- using namespace SubtitleComposer;
--using namespace mpv;
--using namespace mpv::qt;
- 
- MPVBackend::MPVBackend()
-   : PlayerBackend(),
-@@ -218,6 +216,37 @@ MPVBackend::mpvEventHandle(mpv_event *event)
-   }
- }
- 
-+static QVariant
-+node_to_variant(const mpv_node *node)
-+{
-+  switch(node->format) {
-+  case MPV_FORMAT_STRING:
-+  return QVariant(QString::fromUtf8(node->u.string));
-+  case MPV_FORMAT_FLAG:
-+  return QVariant(static_cast(node->u.flag));
-+  case MPV_FORMAT_INT64:
-+  return QVariant(static_cast(node->u.int64));
-+  case MPV_FORMAT_DOUBLE:
-+  return QVariant(node->u.double_);
-+  case MPV_FORMAT_NODE_ARRAY: {
-+  mpv_node_list *list = node->u.list;
-+  QVariantList qlist;
-+  for(int n = 0; n < list->num; n++)
-+  qlist.append(node_to_variant(>values[n]));
-+  return QVariant(qlist);
-+  }
-+  case MPV_FORMAT_NODE_MAP: {
-+  mpv_node_list *list = node->u.list;
-+  QVariantMap qmap;
-+  for(int n = 0; n < list->num; n++)
-+  qmap.insert(QString::fromUtf8(list->keys[n]), 
node_to_variant(>values[n]));
-+  return QVariant(qmap);
-+  }
-+  default: // MPV_FORMAT_NONE, unknown values (e.g. future extensions)
-+  return QVariant();
-+  }
-+}
-+
- void
- MPVBackend::updateTextData(const mpv_event_property *prop)
- {
-@@ -230,7 +259,7 @@ MPVBackend::updateTextData(const mpv_event_property *prop)
-   if(val.format != MPV_FORMAT_NODE_MAP)
-   continue;
- 
--  const QMap  = 
mpv::qt::node_to_variant().toMap();
-+  const QMap  = 
node_to_variant().toMap();
- 
-   if(map[QStringLiteral("type")].toString() != 
QStringLiteral("sub")
-   || map[QStringLiteral("external")].toBool() == 
true)
-@@ -269,7 +298,7 @@ MPVBackend::updateAudioData(const mpv_event_property *prop)
-

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/

2021-11-08 Thread Sam James

commit: fdb3b229f85ac4dce5ae24bfdd5d7f2765c0da99
Author: Sam James  gentoo  org>
AuthorDate: Tue Nov  9 00:46:03 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Nov  9 00:46:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdb3b229

media-video/subtitlecomposer: Stabilize 0.7.1 x86, #822315

Signed-off-by: Sam James  gentoo.org>

 media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild 
b/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild
index 0786d9ab194..aef529fbf60 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="unicode"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/

2021-11-07 Thread Jakov Smolić

commit: dfc4f973a87de5ae3fa5924ae724f249f90b5117
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sun Nov  7 18:04:27 2021 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun Nov  7 18:04:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfc4f973

media-video/subtitlecomposer: Stabilize 0.7.1 amd64, #822315

Signed-off-by: Jakov Smolić  gentoo.org>

 media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild 
b/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild
index 6f8b7b63356..0786d9ab194 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="unicode"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/files/, media-video/subtitlecomposer/

2021-10-06 Thread Andreas Sturmlechner

commit: 1d7b4505bb86fecd77252f1da108825ba02a90af
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Oct  6 17:33:31 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Oct  6 18:50:31 2021 +
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  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 000..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 
+Date: Wed, 6 Oct 2021 20:30:03 +0200
+Subject: [PATCH] Make tests optional
+
+Signed-off-by: Andreas Sturmlechner 
+---
+ 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 000..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."
+}

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/, media-video/subtitlecomposer/files/

2020-12-25 Thread Andreas Sturmlechner

commit: b598cbac8677e292b34b62104620e072fe9acf43
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Dec 25 19:54:21 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Dec 25 19:54:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b598cbac

media-video/subtitlecomposer: Fix build with >=media-video/mpv-0.33

Reported-by: Julien Papasian  gmail.com>
Closes: https://bugs.gentoo.org/760006
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/subtitlecomposer-0.7.0-mpv-0.33.patch| 260 +
 .../subtitlecomposer/subtitlecomposer-0.7.0.ebuild |   1 +
 2 files changed, 261 insertions(+)

diff --git 
a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.0-mpv-0.33.patch 
b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.0-mpv-0.33.patch
new file mode 100644
index 000..a97ab22543b
--- /dev/null
+++ b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.0-mpv-0.33.patch
@@ -0,0 +1,260 @@
+From d09a3cbc60da86f57d06477dea1a57962a11ffb2 Mon Sep 17 00:00:00 2001
+From: Mladen Milinkovic 
+Date: Mon, 8 Jul 2019 20:19:03 +0200
+Subject: [PATCH] MPV player config options aren't hardcoded anymore.
+
+---
+ src/videoplayerplugins/mpv/mpvbackend.cpp |  37 ++-
+ src/videoplayerplugins/mpv/mpvbackend.h   |   8 +-
+ .../mpv/mpvconfigwidget.cpp   | 102 --
+ src/videoplayerplugins/mpv/mpvconfigwidget.h  |   8 ++
+ 4 files changed, 139 insertions(+), 16 deletions(-)
+
+diff --git a/src/videoplayerplugins/mpv/mpvbackend.cpp 
b/src/videoplayerplugins/mpv/mpvbackend.cpp
+index d85a56c..9fdcd95 100644
+--- a/src/videoplayerplugins/mpv/mpvbackend.cpp
 b/src/videoplayerplugins/mpv/mpvbackend.cpp
+@@ -33,8 +33,6 @@
+ #include 
+ 
+ using namespace SubtitleComposer;
+-using namespace mpv;
+-using namespace mpv::qt;
+ 
+ MPVBackend::MPVBackend()
+   : PlayerBackend(),
+@@ -218,6 +216,37 @@ MPVBackend::mpvEventHandle(mpv_event *event)
+   }
+ }
+ 
++static QVariant
++node_to_variant(const mpv_node *node)
++{
++  switch(node->format) {
++  case MPV_FORMAT_STRING:
++  return QVariant(QString::fromUtf8(node->u.string));
++  case MPV_FORMAT_FLAG:
++  return QVariant(static_cast(node->u.flag));
++  case MPV_FORMAT_INT64:
++  return QVariant(static_cast(node->u.int64));
++  case MPV_FORMAT_DOUBLE:
++  return QVariant(node->u.double_);
++  case MPV_FORMAT_NODE_ARRAY: {
++  mpv_node_list *list = node->u.list;
++  QVariantList qlist;
++  for(int n = 0; n < list->num; n++)
++  qlist.append(node_to_variant(>values[n]));
++  return QVariant(qlist);
++  }
++  case MPV_FORMAT_NODE_MAP: {
++  mpv_node_list *list = node->u.list;
++  QVariantMap qmap;
++  for(int n = 0; n < list->num; n++)
++  qmap.insert(QString::fromUtf8(list->keys[n]), 
node_to_variant(>values[n]));
++  return QVariant(qmap);
++  }
++  default: // MPV_FORMAT_NONE, unknown values (e.g. future extensions)
++  return QVariant();
++  }
++}
++
+ void
+ MPVBackend::updateTextData(const mpv_event_property *prop)
+ {
+@@ -230,7 +259,7 @@ MPVBackend::updateTextData(const mpv_event_property *prop)
+   if(val.format != MPV_FORMAT_NODE_MAP)
+   continue;
+ 
+-  const QMap  = 
mpv::qt::node_to_variant().toMap();
++  const QMap  = 
node_to_variant().toMap();
+ 
+   if(map[QStringLiteral("type")].toString() != 
QStringLiteral("sub")
+   || map[QStringLiteral("external")].toBool() == 
true)
+@@ -269,7 +298,7 @@ MPVBackend::updateAudioData(const mpv_event_property *prop)
+   if(val.format != MPV_FORMAT_NODE_MAP)
+   continue;
+ 
+-  const QMap  = 
mpv::qt::node_to_variant().toMap();
++  const QMap  = 
node_to_variant().toMap();
+ 
+   if(map[QStringLiteral("type")].toString() != 
QStringLiteral("audio"))
+   continue;
+diff --git a/src/videoplayerplugins/mpv/mpvbackend.h 
b/src/videoplayerplugins/mpv/mpvbackend.h
+index d0edf2e..5e19fa1 100644
+--- a/src/videoplayerplugins/mpv/mpvbackend.h
 b/src/videoplayerplugins/mpv/mpvbackend.h
+@@ -23,7 +23,7 @@
+ 
+ #include "videoplayer/playerbackend.h"
+ 
+-#include 
++#include 
+ 
+ #include 
+ #include 
+@@ -76,14 +76,10 @@ signals:
+ protected slots:
+   void onMPVEvents();
+ 
+-protected:
+-  void setupProcessArgs(const QString );
+-
++private:
+   void mpvEventHandle(mpv_event *event);
+-
+   static void wakeup(void *ctx);
+

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/files/

2020-09-29 Thread Andreas Sturmlechner

commit: cd8c8656556cb33454678982e729787525310b13
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Sep 29 20:55:47 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Sep 29 20:56:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd8c8656

media-video/subtitlecomposer: Fix .desktop file again

Closes: https://bugs.gentoo.org/745465
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/subtitlecomposer-0.7.0-valid-desktop-file.patch   | 2 +-
 1 file changed, 1 insertion(+), 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
index 0ee0311bcf0..932fc6770f0 100644
--- 
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
@@ -16,6 +16,6 @@ index 4195b076..af8a80af 100644
  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;
++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;

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/, media-video/subtitlecomposer/files/

2020-09-29 Thread Andreas Sturmlechner

commit: fd173d23a57391e6f6827db5d1b23e3d8cd9f383
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Sep 29 15:01:40 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Sep 29 15:02:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd173d23

media-video/subtitlecomposer: Fix .desktop file

Closes: https://bugs.gentoo.org/745429
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../subtitlecomposer-0.7.0-valid-desktop-file.patch | 21 +
 .../subtitlecomposer/subtitlecomposer-0.7.0.ebuild  |  5 -
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git 
a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.0-valid-desktop-file.patch
 
b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.0-valid-desktop-file.patch
new file mode 100644
index 000..0ee0311bcf0
--- /dev/null
+++ 
b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.0-valid-desktop-file.patch
@@ -0,0 +1,21 @@
+From ce2a1a94a6a0802d9a289d701e76b7975d5baa0d Mon Sep 17 00:00:00 2001
+From: Mladen Milinkovic 
+Date: Thu, 9 Apr 2020 12:21:07 +0200
+Subject: [PATCH] Removed invalid subpicture/x-pgs mime - refs #20
+
+---
+ src/subtitlecomposer.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/subtitlecomposer.desktop b/src/subtitlecomposer.desktop
+index 4195b076..af8a80af 100644
+--- a/src/subtitlecomposer.desktop
 b/src/subtitlecomposer.desktop
+@@ -14,6 +14,6 @@
+ Comment[hr]=KDE uređivač podnaslova
+ Icon=subtitlecomposer
+ Exec=subtitlecomposer %f
+-MimeType=text/x-ssa;text/x-ass;text/x-microdvd;text/x-mpsub;application/x-subrip;text/x-subviewer;text/x-mplsub;text/x-tmplayer;text/x-tmplayer+;application/x-vobsub;subpicture/x-pgs;video/mp2t;application/x-vobsub;video/x-matroska;video/mp4;
++MimeType=text/x-ssa;text/x-ass;text/x-microdvd;text/x-mpsub;application/x-subrip;text/x-subviewer;text/x-mplsub;text/x-tmplayer;text/x-tmplayer+;application/x-vobsub;video/mp2t;application/x-vobsub;video/x-matroska;video/mp4;
+ Terminal=false
+ Categories=Qt;KDE;AudioVideo;

diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild 
b/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
index 87743030541..d5fe989dd52 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
@@ -54,7 +54,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-tests-optional.patch" )
+PATCHES=(
+   "${FILESDIR}/${P}-tests-optional.patch"
+   "${FILESDIR}/${P}-valid-desktop-file.patch" # bug 745429
+)
 
 S="${WORKDIR}/SubtitleComposer-${PV}"

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/

2020-09-29 Thread Andreas Sturmlechner

commit: bb1c57dbac2536c9a08892342bbf894c75d3edc2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Sep 28 21:39:49 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Sep 29 13:39:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb1c57db

media-video/subtitlecomposer: Update HOMEPAGE

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild 
b/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
index f61bf8ca94d..87743030541 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
@@ -10,7 +10,7 @@ VIRTUALX_REQUIRED="test"
 inherit ecm
 
 DESCRIPTION="Text-based subtitles editor"
-HOMEPAGE="https://github.com/maxrd2/subtitlecomposer;
+HOMEPAGE="https://subtitlecomposer.kde.org/;
 SRC_URI="https://github.com/maxrd2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/

2020-04-26 Thread Mikle Kolyada

commit: 714d8a4eb8444b8a8506a7701407f15ddf24424f
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Apr 26 10:06:07 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Apr 26 10:06:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=714d8a4e

media-video/subtitlecomposer: migrate from libav

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Mikle Kolyada  gentoo.org>

 media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild 
b/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
index f974a2076cb..f61bf8ca94d 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
@@ -16,7 +16,7 @@ 
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 libav mpv unicode xine"
+IUSE="gstreamer mpv unicode xine"
 
 BDEPEND="
sys-devel/gettext
@@ -43,8 +43,7 @@ DEPEND="
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
)
-   libav? ( media-video/libav:= )
-   !libav? ( media-video/ffmpeg:0= )
+   media-video/ffmpeg:0=
mpv? ( media-video/mpv[libmpv] )
unicode? ( dev-libs/icu:= )
xine? (

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/

2020-01-12 Thread Andreas Sturmlechner

commit: b87dc24348ad3823ae7f793abe8ecb3ad4ebf02c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jan 12 17:19:57 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jan 12 17:45:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b87dc243

media-video/subtitlecomposer: Port to ecm.eclass

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../subtitlecomposer/subtitlecomposer-0.7.0.ebuild | 41 --
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild 
b/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
index 4466c1784b9..f974a2076cb 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
@@ -1,17 +1,20 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KDE_TEST="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit ecm
 
 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"
+SLOT="5"
 KEYWORDS="amd64 x86"
 IUSE="gstreamer libav mpv unicode xine"
 
@@ -20,20 +23,20 @@ BDEPEND="
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)
+   >=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
@@ -66,11 +69,11 @@ src_configure() {
$(cmake_use_find_package xine X11)
)
 
-   kde5_src_configure
+   ecm_src_configure
 }
 
 pkg_postinst() {
-   kde5_pkg_postinst
+   ecm_pkg_postinst
 
elog "Some example scripts provided by ${PN} require dev-lang/ruby"
elog "or dev-lang/python to be installed."

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/, media-video/subtitlecomposer/files/

2019-07-24 Thread Andreas Sturmlechner

commit: 371b6722d9ee08f96151ab2f7623e2b1083cd7b8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jul 24 21:20:29 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jul 24 21:20:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=371b6722

media-video/subtitlecomposer: Drop 0.6.6-r1

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-video/subtitlecomposer/Manifest  |  1 -
 .../files/subtitlecomposer-0.6.6-cmake.patch   | 12 
 .../subtitlecomposer-0.6.6-r1.ebuild   | 79 --
 3 files changed, 92 deletions(-)

diff --git a/media-video/subtitlecomposer/Manifest 
b/media-video/subtitlecomposer/Manifest
index de64ad95ae7..26cef857979 100644
--- a/media-video/subtitlecomposer/Manifest
+++ b/media-video/subtitlecomposer/Manifest
@@ -1,2 +1 @@
-DIST subtitlecomposer-0.6.6.tar.gz 1637272 BLAKE2B 
0a3a7cc7f0301b5ea8cb7affd4600349c8b65bf8a856480e706a3549d8deb7ddc687faad11258d7753e6484783b50fff99ddbd1fc9f68a35fbd0b4346a7a2748
 SHA512 
0f1513d3ff0abcbd0979b370e1ec4cd0b92f7e65adef8c922ddbf37e2dbc73fb4cd821356df6dc1ba3d8832ab8cba25573f68297f4f6be05b5c4d824a663872a
 DIST subtitlecomposer-0.7.0.tar.gz 1649840 BLAKE2B 
a60d3917cc9bd8025d75782e850ba2507ab140ffaeff84e995d58994e848ebe4e103a87824a20dd689132235f67102e7fec39bf0f99d827c78883165e01e9fb7
 SHA512 
b1c71496a2609686946af2377862b86d70e357565646a3de2f158481bc9e397f649d0907499ecd21a193ec07eaf2135b7f5831697e6b20ba6721a743227fbe04

diff --git 
a/media-video/subtitlecomposer/files/subtitlecomposer-0.6.6-cmake.patch 
b/media-video/subtitlecomposer/files/subtitlecomposer-0.6.6-cmake.patch
deleted file mode 100644
index 4c97e15a9e1..000
--- a/media-video/subtitlecomposer/files/subtitlecomposer-0.6.6-cmake.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN subtitlecomposer-0.6.6/CMakeLists.txt 
subtitlecomposer-my/CMakeLists.txt
 subtitlecomposer-0.6.6/CMakeLists.txt  2018-02-11 03:08:46.0 
+0100
-+++ subtitlecomposer-my/CMakeLists.txt 2018-10-13 07:19:22.163074971 +0200
-@@ -12,7 +12,7 @@
- 
- cmake_policy(SET CMP0043 NEW)
- cmake_policy(SET CMP0063 NEW)
--cmake_policy(SET CMP0071 NEW)
-+#cmake_policy(SET CMP0071 NEW) # since cmake-3.10
- 
- include(KDEInstallDirs)
- include(KDECMakeSettings)

diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.6.6-r1.ebuild 
b/media-video/subtitlecomposer/subtitlecomposer-0.6.6-r1.ebuild
deleted file mode 100644
index 9b10563c6fa..000
--- a/media-video/subtitlecomposer/subtitlecomposer-0.6.6-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Text-based subtitles editor"
-HOMEPAGE="https://github.com/maxrd2/subtitlecomposer;
-SRC_URI="https://github.com/maxrd2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="gstreamer libav mpv unicode xine"
-
-COMMON_DEPEND="
-   $(add_frameworks_dep kcodecs)
-   $(add_frameworks_dep kcompletion)
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kconfigwidgets)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kio)
-   $(add_frameworks_dep kross)
-   $(add_frameworks_dep ktextwidgets)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kxmlgui)
-   $(add_frameworks_dep sonnet)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtwidgets)
-   media-libs/phonon[qt5(+)]
-   gstreamer? (
-   dev-libs/glib:2
-   media-libs/gstreamer:1.0
-   media-libs/gst-plugins-base:1.0
-   )
-   libav? ( media-video/libav:= )
-   !libav? ( media-video/ffmpeg:0= )
-   mpv? ( media-video/mpv[libmpv] )
-   unicode? ( dev-libs/icu:= )
-   xine? (
-   media-libs/xine-lib
-   x11-libs/libX11
-   x11-libs/libxcb
-   )
-"
-RDEPEND="${COMMON_DEPEND}
-   !media-video/subtitlecomposer:4
-"
-DEPEND="${COMMON_DEPEND}
-   sys-devel/gettext
-   virtual/pkgconfig
-"
-
-PATCHES=(
-   "${FILESDIR}/${P}-cmake.patch"
-)
-
-src_configure() {
-   local mycmakeargs=(
-   -DCMAKE_DISABLE_FIND_PACKAGE_PocketSphinx=ON # bug 616706
-   $(cmake-utils_use_find_package gstreamer GStreamer)
-   $(cmake-utils_use_find_package mpv MPV)
-   $(cmake-utils_use_find_package unicode ICU)
-   $(cmake-utils_use_find_package xine Xine)
-   $(cmake-utils_use_find_package xine X11)
-   )
-
-   kde5_src_configure
-}
-
-pkg_postinst() {
-   kde5_pkg_postinst
-
-   elog "Some example scripts provided by ${PN} require dev-lang/ruby"
-   elog "or dev-lang/python to be installed."
-}

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/

2019-07-24 Thread Andreas Sturmlechner

commit: 22d6c2c1e1f4fb02b7afe0d94cad7a90de68908b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jul 24 21:19:34 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jul 24 21:19:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22d6c2c1

media-video/subtitlecomposer: 0.7.0 amd64 stable

Closes: https://bugs.gentoo.org/689960
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild 
b/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
index c1624336220..58043f6d38e 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE="gstreamer libav mpv unicode xine"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/

2019-07-24 Thread Thomas Deutschmann

commit: cc53c1e4beaae0021feba9bfb8bb3201a2135b02
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Jul 24 20:30:48 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Jul 24 20:48:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc53c1e4

media-video/subtitlecomposer: x86 stable (bug #689960)

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild 
b/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
index 210696b121d..c1624336220 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="~amd64 x86"
 IUSE="gstreamer libav mpv unicode xine"
 
 BDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/files/, media-video/subtitlecomposer/

2019-07-04 Thread Andreas Sturmlechner

commit: 887447c7391670e54d2b368610050431e9091ced
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jul  4 19:07:43 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jul  4 19:39:34 2019 +
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  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 000..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 000..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."
+}

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/

2018-12-22 Thread Andreas Sturmlechner

commit: 3e292a1367dfde2ec3b965985da1fcbb11b65c4b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Dec 22 12:33:20 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Dec 22 12:33:20 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e292a13

media-video/subtitlecomposer: Add media-video/mpv[libmpv] USE-dep

Closes: https://bugs.gentoo.org/673104
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../{subtitlecomposer-0.6.6.ebuild => subtitlecomposer-0.6.6-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild 
b/media-video/subtitlecomposer/subtitlecomposer-0.6.6-r1.ebuild
similarity index 98%
rename from media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild
rename to media-video/subtitlecomposer/subtitlecomposer-0.6.6-r1.ebuild
index 9a8c7bacd32..9b10563c6fa 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.6.6-r1.ebuild
@@ -38,7 +38,7 @@ COMMON_DEPEND="
)
libav? ( media-video/libav:= )
!libav? ( media-video/ffmpeg:0= )
-   mpv? ( media-video/mpv )
+   mpv? ( media-video/mpv[libmpv] )
unicode? ( dev-libs/icu:= )
xine? (
media-libs/xine-lib

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/

2018-12-13 Thread Andreas Sturmlechner

commit: 0fee35e6fcaf58896838c1df6e584bd807fed536
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Dec 13 23:02:25 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Dec 13 23:02:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fee35e6

media-video/subtitlecomposer: Drop 0.6.4

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-video/subtitlecomposer/Manifest  |  1 -
 .../subtitlecomposer/subtitlecomposer-0.6.4.ebuild | 70 --
 2 files changed, 71 deletions(-)

diff --git a/media-video/subtitlecomposer/Manifest 
b/media-video/subtitlecomposer/Manifest
index e0900c73d7f..65a61b133c3 100644
--- a/media-video/subtitlecomposer/Manifest
+++ b/media-video/subtitlecomposer/Manifest
@@ -1,2 +1 @@
-DIST subtitlecomposer-0.6.4.tar.gz 1638176 BLAKE2B 
b71de34df7f9e98d94a541d029bf5a06aafd6c67ded1b87647c176f0579b3f6e6fe79c797e9f438d850f9aad93cc461704ea43590b31ed855673249f6227f4d0
 SHA512 
585471b7fbcbe21da31fc5f67b7803bac5820ba1dd13135ab17d86121b105926712fd2c726541153e0223ca9a72a717f80229f3a32f526319357ae0ef47af18e
 DIST subtitlecomposer-0.6.6.tar.gz 1637272 BLAKE2B 
0a3a7cc7f0301b5ea8cb7affd4600349c8b65bf8a856480e706a3549d8deb7ddc687faad11258d7753e6484783b50fff99ddbd1fc9f68a35fbd0b4346a7a2748
 SHA512 
0f1513d3ff0abcbd0979b370e1ec4cd0b92f7e65adef8c922ddbf37e2dbc73fb4cd821356df6dc1ba3d8832ab8cba25573f68297f4f6be05b5c4d824a663872a

diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild 
b/media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild
deleted file mode 100644
index 46d66e31217..000
--- a/media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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="mpv unicode xine"
-
-CDEPEND="
-   $(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)
-   dev-libs/glib:2
-   media-libs/gstreamer:1.0
-   media-libs/gst-plugins-base:1.0
-   media-libs/phonon[qt5(+)]
-   mpv? ( media-video/mpv )
-   unicode? ( dev-libs/icu:= )
-   xine? (
-   media-libs/xine-lib
-   x11-libs/libxcb
-   )
-"
-RDEPEND="${CDPEEND}
-   !media-video/subtitlecomposer:4
-"
-DEPEND="${CDEPEND}
-   sys-devel/gettext
-"
-
-src_configure() {
-   local mycmakeargs=(
-   -DCMAKE_DISABLE_FIND_PACKAGE_PocketSphinx=ON # bug 616706
-   $(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 XCB)
-   )
-
-   kde5_src_configure
-}
-
-pkg_postinst() {
-   kde5_pkg_postinst
-
-   echo
-   elog "Some example scripts provided by ${PV} require dev-lang/ruby"
-   elog "or dev-lang/python to be installed."
-   echo
-}

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/

2018-12-13 Thread Mikle Kolyada

commit: 431efde588fef60fc3ead852456f92beedcf8046
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Thu Dec 13 20:46:40 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Thu Dec 13 20:46:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=431efde5

media-video/subtitlecomposer: amd64 stable wrt bug #672266

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild 
b/media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild
index f5280cafc85..9a8c7bacd32 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE="gstreamer libav mpv unicode xine"
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/

2018-12-06 Thread Thomas Deutschmann

commit: f03f2bfb8e0ef1ae1fa9054e6a81f2c4e76ab324
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Dec  7 02:21:18 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Dec  7 02:40:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f03f2bfb

media-video/subtitlecomposer: x86 stable (bug #672266)

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild 
b/media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild
index 55b113a40f8..f5280cafc85 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="~amd64 x86"
 IUSE="gstreamer libav mpv unicode xine"
 
 COMMON_DEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/, media-video/subtitlecomposer/files/

2018-11-01 Thread Maciej Mrozowski

commit: 8e117a171eaff4ef363bce8d656366415662e234
Author: Maciej Mrozowski  gentoo  org>
AuthorDate: Sat Oct 13 05:27:08 2018 +
Commit: Maciej Mrozowski  gentoo  org>
CommitDate: Thu Nov  1 09:43:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e117a17

media-video/subtitlecomposer: patch 0.6.6 to work with CMake 3.3

Package-Manager: Portage-2.3.49, Repoman-2.3.11
Signed-off-by: Maciej Mrozowski  gentoo.org>

 .../files/subtitlecomposer-0.6.6-cmake.patch | 12 
 media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild   |  6 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git 
a/media-video/subtitlecomposer/files/subtitlecomposer-0.6.6-cmake.patch 
b/media-video/subtitlecomposer/files/subtitlecomposer-0.6.6-cmake.patch
new file mode 100644
index 000..4c97e15a9e1
--- /dev/null
+++ b/media-video/subtitlecomposer/files/subtitlecomposer-0.6.6-cmake.patch
@@ -0,0 +1,12 @@
+diff -ruN subtitlecomposer-0.6.6/CMakeLists.txt 
subtitlecomposer-my/CMakeLists.txt
+--- subtitlecomposer-0.6.6/CMakeLists.txt  2018-02-11 03:08:46.0 
+0100
 subtitlecomposer-my/CMakeLists.txt 2018-10-13 07:19:22.163074971 +0200
+@@ -12,7 +12,7 @@
+ 
+ cmake_policy(SET CMP0043 NEW)
+ cmake_policy(SET CMP0063 NEW)
+-cmake_policy(SET CMP0071 NEW)
++#cmake_policy(SET CMP0071 NEW) # since cmake-3.10
+ 
+ include(KDEInstallDirs)
+ include(KDECMakeSettings)

diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild 
b/media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild
index 57cb8983dbf..55b113a40f8 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -54,6 +54,10 @@ DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
 "
 
+PATCHES=(
+   "${FILESDIR}/${P}-cmake.patch"
+)
+
 src_configure() {
local mycmakeargs=(
-DCMAKE_DISABLE_FIND_PACKAGE_PocketSphinx=ON # bug 616706

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/

2018-09-15 Thread Andreas Sturmlechner

commit: 3819f77563c2a0e2e61e4dfeea2a304d4d6a962c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Sep 16 00:37:06 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep 16 00:37:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3819f775

media-video/subtitlecomposer: Fix pkg_postinst typo

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild 
b/media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild
index 4ab2ad9041d..57cb8983dbf 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild
@@ -70,6 +70,6 @@ src_configure() {
 pkg_postinst() {
kde5_pkg_postinst
 
-   elog "Some example scripts provided by ${PV} require dev-lang/ruby"
+   elog "Some example scripts provided by ${PN} require dev-lang/ruby"
elog "or dev-lang/python to be installed."
 }

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/

2018-09-15 Thread Andreas Sturmlechner

commit: f5c2267881780e4b4785695e87616695e0063d1c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Sep 15 23:51:59 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep 16 00:25:10 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5c22678

media-video/subtitlecomposer: 0.6.6 version bump

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 media-video/subtitlecomposer/Manifest  |  1 +
 .../subtitlecomposer/subtitlecomposer-0.6.6.ebuild | 75 ++
 2 files changed, 76 insertions(+)

diff --git a/media-video/subtitlecomposer/Manifest 
b/media-video/subtitlecomposer/Manifest
index b0c310a58d9..e0900c73d7f 100644
--- a/media-video/subtitlecomposer/Manifest
+++ b/media-video/subtitlecomposer/Manifest
@@ -1 +1,2 @@
 DIST subtitlecomposer-0.6.4.tar.gz 1638176 BLAKE2B 
b71de34df7f9e98d94a541d029bf5a06aafd6c67ded1b87647c176f0579b3f6e6fe79c797e9f438d850f9aad93cc461704ea43590b31ed855673249f6227f4d0
 SHA512 
585471b7fbcbe21da31fc5f67b7803bac5820ba1dd13135ab17d86121b105926712fd2c726541153e0223ca9a72a717f80229f3a32f526319357ae0ef47af18e
+DIST subtitlecomposer-0.6.6.tar.gz 1637272 BLAKE2B 
0a3a7cc7f0301b5ea8cb7affd4600349c8b65bf8a856480e706a3549d8deb7ddc687faad11258d7753e6484783b50fff99ddbd1fc9f68a35fbd0b4346a7a2748
 SHA512 
0f1513d3ff0abcbd0979b370e1ec4cd0b92f7e65adef8c922ddbf37e2dbc73fb4cd821356df6dc1ba3d8832ab8cba25573f68297f4f6be05b5c4d824a663872a

diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild 
b/media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild
new file mode 100644
index 000..4ab2ad9041d
--- /dev/null
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.6.6.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 )
+   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
+"
+
+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 ${PV} require dev-lang/ruby"
+   elog "or dev-lang/python to be installed."
+}

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/

2017-10-30 Thread Michael Palimaka

commit: c26184cc23deb3e78dbbfee882320cbd67f988b7
Author: Paolo Pedroni  users  noreply  github  
com>
AuthorDate: Mon Oct 30 10:36:08 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Oct 30 11:41:29 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c26184cc

media-video/subtitlecomposer: virtualx is required for tests

Closes: https://bugs.gentoo.org/613514
Closes: https://github.com/gentoo/gentoo/pull/6081

 media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild 
b/media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild
index 0e0cd925cc0..46d66e31217 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild
@@ -4,6 +4,7 @@
 EAPI=6
 
 KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Text-based subtitles editor"

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/

2017-06-03 Thread Michael Palimaka

commit: 6e5d5b717eda1995b36fde10a2d00b867057a3f7
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Jun  3 15:48:32 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Jun  3 15:49:22 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e5d5b71

media-video/subtitlecomposer: disable broken pocketsphinx plugin

Gentoo-bug: 616706
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild 
b/media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild
index 5bb701711a0..9b75e0e140c 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild
@@ -49,6 +49,7 @@ DEPEND="${CDEPEND}
 
 src_configure() {
local mycmakeargs=(
+   -DCMAKE_DISABLE_FIND_PACKAGE_PocketSphinx=ON # bug 616706
$(cmake-utils_use_find_package mpv MPV)
$(cmake-utils_use_find_package unicode ICU)
$(cmake-utils_use_find_package xine Xine)

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/

2017-01-16 Thread Johannes Huber

commit: adf7a7c395338a0c18022ebfc120922d61ef7421
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Jan 16 19:50:22 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Jan 16 19:50:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adf7a7c3

media-video/subtitlecomposer: Remove 0.5.6

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-video/subtitlecomposer/Manifest  |  1 -
 .../subtitlecomposer/subtitlecomposer-0.5.6.ebuild | 46 --
 2 files changed, 47 deletions(-)

diff --git a/media-video/subtitlecomposer/Manifest 
b/media-video/subtitlecomposer/Manifest
index fc01f4f..7b6eb9d 100644
--- a/media-video/subtitlecomposer/Manifest
+++ b/media-video/subtitlecomposer/Manifest
@@ -1,2 +1 @@
-DIST subtitlecomposer-0.5.6.tar.gz 1489710 SHA256 
f55f3330e72a9a9f19f00674651d7d4c6cd7e19993a14d1deedfa6d34737cf0f SHA512 
f06f25d746870886669a66875d4d772e10d18136b9107c2f7d23f177ff3979785b7f73a7e723139fe1757298ef7b0a791a95f40fe585ab3239c82d71d2ab4db0
 WHIRLPOOL 
0aa86a1a58d7a4f2551774725655223ae2847337ea877db11aff01da55af3be31e941d09fa68468924b47db359b584ee0d9c3d1939e350b7b023a264f9a27010
 DIST subtitlecomposer-0.6.4.tar.gz 1638176 SHA256 
030f3a33dccdc95b890c06de6f2566c4e6ec85264c8bc47430c72c137ce74f91 SHA512 
585471b7fbcbe21da31fc5f67b7803bac5820ba1dd13135ab17d86121b105926712fd2c726541153e0223ca9a72a717f80229f3a32f526319357ae0ef47af18e
 WHIRLPOOL 
dd8d230e010fce0099fff13b421e2df27f3f74799b542dd9f61c0b9cb08ae6973e3aa3f8d8d49a278a85e0e022524ec3bdd7473136a77b5169d0c0e2ab1305cf

diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.5.6.ebuild 
b/media-video/subtitlecomposer/subtitlecomposer-0.5.6.ebuild
deleted file mode 100644
index 1fcf238..
--- a/media-video/subtitlecomposer/subtitlecomposer-0.5.6.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_LINGUAS="bg cs de el es fr hu pl pt_BR ru sr sr@latin uk"
-KDE_LINGUAS_LIVE_OVERRIDE="true"
-inherit kde4-base
-
-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"
-SLOT="4"
-IUSE="debug gstreamer unicode xine"
-
-RDEPEND="
-   media-libs/phonon[qt4]
-   gstreamer? ( media-libs/gstreamer:0.10 )
-   unicode? ( dev-libs/icu:= )
-   xine? ( media-libs/xine-lib )
-"
-DEPEND="${RDEPEND}
-   sys-devel/gettext
-"
-
-src_configure() {
-   mycmakeargs=(
-   $(cmake-utils_use_with gstreamer GStreamer)
-   $(cmake-utils_use_with unicode ICU)
-   $(cmake-utils_use_with xine)
-   )
-   kde4-base_src_configure
-}
-
-pkg_postinst() {
-   kde4-base_pkg_postinst
-
-   echo
-   elog "Some example scripts provided by ${PV} require dev-lang/ruby"
-   elog "or dev-lang/python to be installed."
-   echo
-}

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/

2017-01-16 Thread Agostino Sarubbo

commit: fd3a026d0f1f1f8e6258362b16e32148b41a6bf6
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Jan 16 10:14:29 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Jan 16 10:14:29 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd3a026d

media-video/subtitlecomposer: x86 stable wrt bug #604312

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild 
b/media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild
index de2f9b3..e07fd91 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE="mpv unicode xine"
 
 CDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/

2017-01-05 Thread Aaron Bauman

commit: f8a7f6fd3c30fc88a850445eef014bc2d9ac8e2d
Author: Aaron Bauman  gentoo  org>
AuthorDate: Thu Jan  5 13:20:14 2017 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Thu Jan  5 13:44:17 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8a7f6fd

media-video/subtitlecomposer: amd64 stable wrt bug #604312

 media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild 
b/media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild
index 6e01dce..de2f9b3 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~x86"
 IUSE="mpv unicode xine"
 
 CDEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/

2017-01-01 Thread Johannes Huber

commit: d2f2f748b1673fa700e4fc5df57e7fde1c6713a0
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Jan  1 16:21:34 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun Jan  1 16:32:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2f2f748

media-video/subtitlecomposer: Drop CMAKE_MIN_VERSION

Covered by cmake-utils eclass now.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild 
b/media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild
index 4873d5e..6e01dce 100644
--- a/media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=6
 
-CMAKE_MIN_VERSION="3.3"
 KDE_TEST="forceoptional"
 inherit kde5

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/

2016-07-10 Thread Maciej Mrozowski

commit: 1ebefcab40e2e4375f455633d134db8efee54165
Author: Maciej Mrozowski  gentoo  org>
AuthorDate: Sun Jul 10 23:57:55 2016 +
Commit: Maciej Mrozowski  gentoo  org>
CommitDate: Sun Jul 10 23:58:17 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ebefcab

media-video/subtitlecomposer: Version bump 0.6.4, KF5 compatible release.

Package-Manager: portage-2.2.28

 media-video/subtitlecomposer/Manifest  |  1 +
 media-video/subtitlecomposer/metadata.xml  |  3 +
 .../subtitlecomposer/subtitlecomposer-0.6.4.ebuild | 70 ++
 3 files changed, 74 insertions(+)

diff --git a/media-video/subtitlecomposer/Manifest 
b/media-video/subtitlecomposer/Manifest
index abb9060..fc01f4f 100644
--- a/media-video/subtitlecomposer/Manifest
+++ b/media-video/subtitlecomposer/Manifest
@@ -1 +1,2 @@
 DIST subtitlecomposer-0.5.6.tar.gz 1489710 SHA256 
f55f3330e72a9a9f19f00674651d7d4c6cd7e19993a14d1deedfa6d34737cf0f SHA512 
f06f25d746870886669a66875d4d772e10d18136b9107c2f7d23f177ff3979785b7f73a7e723139fe1757298ef7b0a791a95f40fe585ab3239c82d71d2ab4db0
 WHIRLPOOL 
0aa86a1a58d7a4f2551774725655223ae2847337ea877db11aff01da55af3be31e941d09fa68468924b47db359b584ee0d9c3d1939e350b7b023a264f9a27010
+DIST subtitlecomposer-0.6.4.tar.gz 1638176 SHA256 
030f3a33dccdc95b890c06de6f2566c4e6ec85264c8bc47430c72c137ce74f91 SHA512 
585471b7fbcbe21da31fc5f67b7803bac5820ba1dd13135ab17d86121b105926712fd2c726541153e0223ca9a72a717f80229f3a32f526319357ae0ef47af18e
 WHIRLPOOL 
dd8d230e010fce0099fff13b421e2df27f3f74799b542dd9f61c0b9cb08ae6973e3aa3f8d8d49a278a85e0e022524ec3bdd7473136a77b5169d0c0e2ab1305cf

diff --git a/media-video/subtitlecomposer/metadata.xml 
b/media-video/subtitlecomposer/metadata.xml
index 32f5b1c..bd0879e 100644
--- a/media-video/subtitlecomposer/metadata.xml
+++ b/media-video/subtitlecomposer/metadata.xml
@@ -9,6 +9,9 @@
k...@gentoo.org
Gentoo KDE Project

+   
+   Build mpv backend support
+   

maxrd2/subtitlecomposer


diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild 
b/media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild
new file mode 100644
index 000..4873d5e
--- /dev/null
+++ b/media-video/subtitlecomposer/subtitlecomposer-0.6.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+CMAKE_MIN_VERSION="3.3"
+KDE_TEST="forceoptional"
+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="mpv unicode xine"
+
+CDEPEND="
+   $(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)
+   dev-libs/glib:2
+   media-libs/gstreamer:1.0
+   media-libs/gst-plugins-base:1.0
+   media-libs/phonon[qt5]
+   mpv? ( media-video/mpv )
+   unicode? ( dev-libs/icu:= )
+   xine? (
+   media-libs/xine-lib
+   x11-libs/libxcb
+   )
+"
+RDEPEND="${CDPEEND}
+   !media-video/subtitlecomposer:4
+"
+DEPEND="${CDEPEND}
+   sys-devel/gettext
+"
+
+src_configure() {
+   local mycmakeargs=(
+   $(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 XCB)
+   )
+
+   kde5_src_configure
+}
+
+pkg_postinst() {
+   kde5_pkg_postinst
+
+   echo
+   elog "Some example scripts provided by ${PV} require dev-lang/ruby"
+   elog "or dev-lang/python to be installed."
+   echo
+}

47 matches

Mail list logo