Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: media-video/subtitlecomposer/
Date: Wed, 11 Mar 2020 15:16:41
Message-Id: 1583939559.6507d7d65a1c56e35d42785e7e42cd10da352abf.asturm@gentoo
1 commit: 6507d7d65a1c56e35d42785e7e42cd10da352abf
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 11 15:09:04 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 11 15:12:39 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=6507d7d6
7
8 media-video/subtitlecomposer: media-libs/qtav replaces all other backends
9
10 Update metadata.
11
12 Upstream commits:
13 3d19be95c6f8d4a1910a2dde3798b67622bc128d
14 3a156a7a904f23a413e3a952eb0ec181a9df3222
15 ef9b56e6b56578550fafe14b45445bf28b28ee4f
16
17 Package-Manager: Portage-2.3.93, Repoman-2.3.20
18 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
19
20 media-video/subtitlecomposer/metadata.xml | 14 ++++----------
21 .../subtitlecomposer/subtitlecomposer-9999.ebuild | 19 ++-----------------
22 2 files changed, 6 insertions(+), 27 deletions(-)
23
24 diff --git a/media-video/subtitlecomposer/metadata.xml b/media-video/subtitlecomposer/metadata.xml
25 index bd0879e135..e68bcea066 100644
26 --- a/media-video/subtitlecomposer/metadata.xml
27 +++ b/media-video/subtitlecomposer/metadata.xml
28 @@ -1,18 +1,12 @@
29 <?xml version="1.0" encoding="UTF-8"?>
30 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
31 <pkgmetadata>
32 - <maintainer type="project">
33 - <email>media-video@g.o</email>
34 - <name>Gentoo Video project</name>
35 - </maintainer>
36 <maintainer type="project">
37 <email>kde@g.o</email>
38 <name>Gentoo KDE Project</name>
39 </maintainer>
40 - <use>
41 - <flag name="mpv">Build mpv backend support</flag>
42 - </use>
43 - <upstream>
44 - <remote-id type="github">maxrd2/subtitlecomposer</remote-id>
45 - </upstream>
46 + <maintainer type="project">
47 + <email>media-video@g.o</email>
48 + <name>Gentoo Video project</name>
49 + </maintainer>
50 </pkgmetadata>
51
52 diff --git a/media-video/subtitlecomposer/subtitlecomposer-9999.ebuild b/media-video/subtitlecomposer/subtitlecomposer-9999.ebuild
53 index 9f1f24682e..d0c54a5d50 100644
54 --- a/media-video/subtitlecomposer/subtitlecomposer-9999.ebuild
55 +++ b/media-video/subtitlecomposer/subtitlecomposer-9999.ebuild
56 @@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/maxrd2/subtitlecomposer"
57 LICENSE="GPL-2"
58 SLOT="5"
59 KEYWORDS=""
60 -IUSE="gstreamer libav mpv unicode xine"
61 +IUSE="libav unicode"
62
63 BDEPEND="
64 sys-devel/gettext
65 @@ -36,32 +36,17 @@ DEPEND="
66 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
67 >=kde-frameworks/kxmlgui-${KFMIN}:5
68 >=kde-frameworks/sonnet-${KFMIN}:5
69 - media-libs/phonon[qt5(+)]
70 - gstreamer? (
71 - dev-libs/glib:2
72 - media-libs/gstreamer:1.0
73 - media-libs/gst-plugins-base:1.0
74 - )
75 + media-libs/qtav:=
76 libav? ( media-video/libav:= )
77 !libav? ( media-video/ffmpeg:0= )
78 - mpv? ( media-video/mpv )
79 unicode? ( dev-libs/icu:= )
80 - xine? (
81 - media-libs/xine-lib
82 - x11-libs/libX11
83 - x11-libs/libxcb
84 - )
85 "
86 RDEPEND="${DEPEND}"
87
88 src_configure() {
89 local mycmakeargs=(
90 -DCMAKE_DISABLE_FIND_PACKAGE_PocketSphinx=ON # bug 616706
91 - $(cmake_use_find_package gstreamer GStreamer)
92 - $(cmake_use_find_package mpv MPV)
93 $(cmake_use_find_package unicode ICU)
94 - $(cmake_use_find_package xine Xine)
95 - $(cmake_use_find_package xine X11)
96 )
97
98 ecm_src_configure