Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/smplayer/, media-video/smplayer/files/
Date: Mon, 28 Oct 2019 10:26:47
Message-Id: 1572258395.b92f4c1468dd127fdf8424719f46e8a895e7eb96.polynomial-c@gentoo
1 commit: b92f4c1468dd127fdf8424719f46e8a895e7eb96
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 28 10:13:39 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 28 10:26:35 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b92f4c14
7
8 media-video/smplayer: Revbump to fix control issue with mpv-0.30.0
9
10 Thanks-to: Mike Lothian <mike <AT> fireburn.co.uk>
11 Closes: https://bugs.gentoo.org/698738
12 Package-Manager: Portage-2.3.78, Repoman-2.3.17
13 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
14
15 .../files/smplayer-19.5.0-mpv-0.30.0.patch | 22 ++++
16 media-video/smplayer/smplayer-19.5.0-r1.ebuild | 135 +++++++++++++++++++++
17 2 files changed, 157 insertions(+)
18
19 diff --git a/media-video/smplayer/files/smplayer-19.5.0-mpv-0.30.0.patch b/media-video/smplayer/files/smplayer-19.5.0-mpv-0.30.0.patch
20 new file mode 100644
21 index 00000000000..fd2bdc8ed9c
22 --- /dev/null
23 +++ b/media-video/smplayer/files/smplayer-19.5.0-mpv-0.30.0.patch
24 @@ -0,0 +1,22 @@
25 +Index: smplayer/src/mpvprocess.cpp
26 +===================================================================
27 +--- smplayer/src/mpvprocess.cpp (revision 9231)
28 ++++ smplayer/src/mpvprocess.cpp (revision 9232)
29 +@@ -122,7 +122,7 @@
30 +
31 + void MPVProcess::initializeRX() {
32 + #ifdef CUSTOM_STATUS
33 +- rx_av.setPattern("^STATUS: ([0-9\\.-]+) / ([0-9\\.-]+) P: (yes|no) B: (yes|no) I: (yes|no) VB: ([0-9\\.-]+) AB: ([0-9\\.-]+)");
34 ++ rx_av.setPattern("STATUS: ([0-9\\.-]+) / ([0-9\\.-]+) P: (yes|no) B: (yes|no) I: (yes|no) VB: ([0-9\\.-]+) AB: ([0-9\\.-]+)");
35 + #else
36 + rx_av.setPattern("^(\\((.*)\\) |)(AV|V|A): ([0-9]+):([0-9]+):([0-9]+) / ([0-9]+):([0-9]+):([0-9]+)"); //AV: 00:02:15 / 00:09:56
37 + #endif
38 +@@ -197,7 +197,7 @@
39 + static double last_sec = -1;
40 +
41 + // Parse A: V: line
42 +- //qDebug("MPVProcess::parseLine: %s", line.toUtf8().data());
43 ++ //qDebug() << "MPVProcess::parseLine:" << line;
44 + if (rx_av.indexIn(line) > -1) {
45 + #ifdef CUSTOM_STATUS
46 + double sec = rx_av.cap(1).toDouble();
47
48 diff --git a/media-video/smplayer/smplayer-19.5.0-r1.ebuild b/media-video/smplayer/smplayer-19.5.0-r1.ebuild
49 new file mode 100644
50 index 00000000000..28b157da097
51 --- /dev/null
52 +++ b/media-video/smplayer/smplayer-19.5.0-r1.ebuild
53 @@ -0,0 +1,135 @@
54 +# Copyright 2007-2019 Gentoo Authors
55 +# Distributed under the terms of the GNU General Public License v2
56 +
57 +EAPI=7
58 +
59 +PLOCALES="am ar_SY ar bg ca cs da de el en_GB en en_US es et eu fa fi fr gl
60 +he_IL hr hu id it ja ka ko ku lt mk ms_MY nl nn_NO pl pt_BR pt ro_RO ru_RU
61 +sk sl_SI sq_AL sr sv th tr uk_UA uz vi_VN zh_CN zh_TW"
62 +PLOCALE_BACKUP="en_US"
63 +
64 +inherit l10n qmake-utils toolchain-funcs xdg
65 +
66 +DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
67 +HOMEPAGE="https://www.smplayer.eu/"
68 +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
69 +
70 +LICENSE="GPL-2+ BSD-2"
71 +SLOT="0"
72 +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
73 +IUSE="autoshutdown bidi debug mpris"
74 +
75 +BDEPEND="dev-qt/linguist-tools:5"
76 +DEPEND="
77 + dev-qt/qtcore:5
78 + dev-qt/qtgui:5=
79 + dev-qt/qtnetwork:5[ssl]
80 + dev-qt/qtscript:5
81 + dev-qt/qtsingleapplication[X,qt5(+)]
82 + dev-qt/qtwidgets:5
83 + dev-qt/qtxml:5
84 + sys-libs/zlib
85 + autoshutdown? ( dev-qt/qtdbus:5 )
86 + mpris? ( dev-qt/qtdbus:5 )
87 +"
88 +RDEPEND="${DEPEND}
89 + || (
90 + media-video/mpv[libass,X]
91 + media-video/mplayer[bidi?,libass,png,X]
92 + )
93 +"
94 +
95 +PATCHES=(
96 + "${FILESDIR}/${PN}-14.9.0.6966-unbundle-qtsingleapplication.patch" # bug 487544
97 + "${FILESDIR}/${PN}-17.1.0-advertisement_crap.patch"
98 + "${FILESDIR}/${PN}-18.2.0-jobserver.patch"
99 + "${FILESDIR}/${PN}-18.3.0-disable-werror.patch"
100 + "${FILESDIR}/${P}-mpv-0.30.0.patch" #698738
101 +)
102 +
103 +src_prepare() {
104 + use bidi || PATCHES+=( "${FILESDIR}"/${PN}-16.4.0-zero-bidi.patch )
105 +
106 + default
107 +
108 + # Upstream Makefile sucks
109 + sed -i -e "/^PREFIX=/ s:/usr/local:${EPREFIX}/usr:" \
110 + -e "/^DOC_PATH=/ s:packages/smplayer:${PF}:" \
111 + -e '/\.\/get_svn_revision\.sh/,+2c\
112 + cd src && $(DEFS) $(MAKE)' \
113 + Makefile || die
114 +
115 + # Turn off online update checker, bug #479902
116 + sed -e 's:DEFINES += UPDATE_CHECKER:#&:' \
117 + -e 's:DEFINES += CHECK_UPGRADED:#&:' \
118 + -i src/smplayer.pro || die
119 +
120 + # Turn off intrusive share widget
121 + sed -e 's:DEFINES += SHARE_WIDGET:#&:' \
122 + -i src/smplayer.pro || die
123 +
124 + # Toggle autoshutdown option which pulls in dbus, bug #524392
125 + if ! use autoshutdown ; then
126 + sed -e 's:DEFINES += AUTO_SHUTDOWN_PC:#&:' \
127 + -i src/smplayer.pro || die
128 + fi
129 +
130 + # Turn debug message flooding off
131 + if ! use debug ; then
132 + sed -e 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' \
133 + -i src/smplayer.pro || die
134 + fi
135 +
136 + # MPRIS2 pulls in dbus, bug #553710
137 + if ! use mpris ; then
138 + sed -e 's:DEFINES += MPRIS2:#&:' \
139 + -i src/smplayer.pro || die
140 + fi
141 +
142 + # Commented out because it gives false positives
143 + #l10n_find_plocales_changes "${S}"/src/translations ${PN}_ .ts
144 +}
145 +
146 +src_configure() {
147 + cd src || die
148 + eqmake5
149 +}
150 +
151 +gen_translation() {
152 + local mydir="$(qt5_get_bindir)"
153 +
154 + ebegin "Generating $1 translation"
155 + "${mydir}"/lrelease ${PN}_${1}.ts
156 + eend $? || die "failed to generate $1 translation"
157 +}
158 +
159 +src_compile() {
160 + emake CC="$(tc-getCC)"
161 +
162 + cd src/translations || die
163 + l10n_for_each_locale_do gen_translation
164 +}
165 +
166 +src_install() {
167 + # remove unneeded copies of the GPL
168 + rm -f Copying* docs/*/gpl.html || die
169 + # don't install empty dirs
170 + rmdir --ignore-fail-on-non-empty docs/* || die
171 +
172 + default
173 +}
174 +
175 +pkg_preinst() {
176 + xdg_pkg_preinst
177 +}
178 +
179 +pkg_postinst() {
180 + xdg_pkg_postinst
181 +
182 + elog "If you want URL support with media-video/mpv, please install"
183 + elog "net-misc/youtube-dl."
184 +}
185 +
186 +pkg_postrm() {
187 + xdg_pkg_postrm
188 +}