1 |
commit: 9dd5ed38a1e7779b4c8b7b5ae1f339206722cda0 |
2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Apr 25 17:28:42 2016 +0000 |
4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Apr 25 17:30:13 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dd5ed38 |
7 |
|
8 |
media-video/smplayer: revision bump with several changes |
9 |
|
10 |
o Apply patch by Navid Zamani <navid.zamani <AT> gmail.com> to prevent smplayer |
11 |
from hanging when adding an audio file to the playlist. Fixes bug 554986. |
12 |
Patch already sent upstream and merged. |
13 |
o Use only one USE flag to choose between qt4 and qt5, per Qt team policy. |
14 |
o Various ebuild cleanups. |
15 |
|
16 |
Package-Manager: portage-2.2.28 |
17 |
|
18 |
.../smplayer/files/smplayer-16.4.0-frames-0.patch | 16 ++++ |
19 |
...-16.4.0-r1.ebuild => smplayer-16.4.0-r2.ebuild} | 92 +++++++++++----------- |
20 |
2 files changed, 63 insertions(+), 45 deletions(-) |
21 |
|
22 |
diff --git a/media-video/smplayer/files/smplayer-16.4.0-frames-0.patch b/media-video/smplayer/files/smplayer-16.4.0-frames-0.patch |
23 |
new file mode 100644 |
24 |
index 0000000..a65d6ec |
25 |
--- /dev/null |
26 |
+++ b/media-video/smplayer/files/smplayer-16.4.0-frames-0.patch |
27 |
@@ -0,0 +1,16 @@ |
28 |
+Index: src/infoprovider.cpp |
29 |
+=================================================================== |
30 |
+diff --git a/src/infoprovider.cpp b/src/infoprovider.cpp |
31 |
+--- a/src/infoprovider.cpp (revision 7728) |
32 |
++++ b/src/infoprovider.cpp (revision 7729) |
33 |
+@@ -35,7 +35,9 @@ |
34 |
+ |
35 |
+ proc->setExecutable(mplayer_bin); |
36 |
+ proc->setFixedOptions(); |
37 |
+- proc->setOption("frames", "1"); |
38 |
++ QString nframes = "1"; |
39 |
++ if (proc->isMPlayer()) nframes = "0"; |
40 |
++ proc->setOption("frames", nframes); |
41 |
+ proc->setOption("vo", "null"); |
42 |
+ proc->setOption("ao", "null"); |
43 |
+ #ifdef Q_OS_WIN |
44 |
|
45 |
diff --git a/media-video/smplayer/smplayer-16.4.0-r1.ebuild b/media-video/smplayer/smplayer-16.4.0-r2.ebuild |
46 |
similarity index 52% |
47 |
rename from media-video/smplayer/smplayer-16.4.0-r1.ebuild |
48 |
rename to media-video/smplayer/smplayer-16.4.0-r2.ebuild |
49 |
index f658ecc..acb68c0 100644 |
50 |
--- a/media-video/smplayer/smplayer-16.4.0-r1.ebuild |
51 |
+++ b/media-video/smplayer/smplayer-16.4.0-r2.ebuild |
52 |
@@ -4,10 +4,11 @@ |
53 |
|
54 |
EAPI=6 |
55 |
|
56 |
-PLOCALES="ar ar_SY bg ca cs da de el_GR en_GB en_US es et eu fi fr gl he_IL hr |
57 |
-hu id it ja ka ko ku lt mk ms_MY nl nn_NO pl pt pt_BR ro_RO ru_RU sk sl_SI sq_AL |
58 |
-sr sv th tr uk_UA uz vi_VN zh_CN zh_TW" |
59 |
+PLOCALES="am ar ar_SY bg ca cs da de el_GR en_GB 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 pt_BR 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 |
65 |
|
66 |
DESCRIPTION="Great Qt GUI front-end for mplayer/mpv" |
67 |
@@ -17,25 +18,26 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" |
68 |
LICENSE="GPL-2+ BSD-2" |
69 |
SLOT="0" |
70 |
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux" |
71 |
-IUSE="autoshutdown bidi debug mpris +qt4 qt5 streaming" |
72 |
- |
73 |
-REQUIRED_USE="^^ ( qt4 qt5 )" |
74 |
+IUSE="autoshutdown bidi debug mpris qt5 streaming" |
75 |
|
76 |
COMMON_DEPEND=" |
77 |
sys-libs/zlib |
78 |
- qt4? ( |
79 |
+ !qt5? ( |
80 |
dev-qt/qtcore:4 |
81 |
dev-qt/qtgui:4 |
82 |
dev-qt/qtsingleapplication[X,qt4] |
83 |
autoshutdown? ( dev-qt/qtdbus:4 ) |
84 |
mpris? ( dev-qt/qtdbus:4 ) |
85 |
- streaming? ( dev-qt/qtcore:4[ssl] ) |
86 |
+ streaming? ( |
87 |
+ dev-qt/qtcore:4[ssl] |
88 |
+ dev-qt/qtscript:4 |
89 |
+ ) |
90 |
) |
91 |
qt5? ( |
92 |
dev-qt/qtcore:5 |
93 |
dev-qt/qtgui:5 |
94 |
dev-qt/qtnetwork:5 |
95 |
- >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5] |
96 |
+ dev-qt/qtsingleapplication[X,qt5] |
97 |
dev-qt/qtwidgets:5 |
98 |
dev-qt/qtxml:5 |
99 |
autoshutdown? ( dev-qt/qtdbus:5 ) |
100 |
@@ -61,86 +63,86 @@ RDEPEND="${COMMON_DEPEND} |
101 |
|
102 |
PATCHES=( |
103 |
"${FILESDIR}/${PN}-14.9.0.6966-unbundle-qtsingleapplication.patch" # bug 487544 |
104 |
+ "${FILESDIR}/${PN}-16.4.0-frames-0.patch" # bug 554986 |
105 |
) |
106 |
|
107 |
src_prepare() { |
108 |
default |
109 |
|
110 |
- use bidi || eapply "${FILESDIR}/${PN}-16.4.0-zero-bidi.patch" |
111 |
+ use bidi || eapply "${FILESDIR}"/${PN}-16.4.0-zero-bidi.patch |
112 |
|
113 |
# Upstream Makefile sucks |
114 |
- sed -i -e "/^PREFIX=/s:${EPREFIX}/usr/local:${EPREFIX}/usr:" \ |
115 |
- -e "/^DOC_PATH=/s:packages/smplayer:${PF}:" \ |
116 |
+ sed -i -e "/^PREFIX=/ s:/usr/local:${EPREFIX}/usr:" \ |
117 |
+ -e "/^DOC_PATH=/ s:packages/smplayer:${PF}:" \ |
118 |
-e '/\.\/get_svn_revision\.sh/,+2c\ |
119 |
cd src && $(DEFS) $(MAKE)' \ |
120 |
- "${S}"/Makefile || die "sed failed" |
121 |
+ Makefile || die |
122 |
+ |
123 |
+ # Turn off online update checker, bug #479902 |
124 |
+ sed -e 's:DEFINES += UPDATE_CHECKER:#&:' \ |
125 |
+ -e 's:DEFINES += CHECK_UPGRADED:#&:' \ |
126 |
+ -i src/smplayer.pro || die |
127 |
+ |
128 |
+ # Turn off intrusive share widget |
129 |
+ sed -e 's:DEFINES += SHARE_WIDGET:#&:' \ |
130 |
+ -i src/smplayer.pro || die |
131 |
|
132 |
# Toggle autoshutdown option which pulls in dbus, bug #524392 |
133 |
if ! use autoshutdown ; then |
134 |
- sed -e 's:DEFINES += AUTO_SHUTDOWN_PC:#DEFINES += AUTO_SHUTDOWN_PC:' \ |
135 |
- -i "${S}"/src/smplayer.pro || die "sed failed" |
136 |
+ sed -e 's:DEFINES += AUTO_SHUTDOWN_PC:#&:' \ |
137 |
+ -i src/smplayer.pro || die |
138 |
fi |
139 |
|
140 |
# Turn debug message flooding off |
141 |
if ! use debug ; then |
142 |
- sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' \ |
143 |
- "${S}"/src/smplayer.pro || die "sed failed" |
144 |
+ sed -e 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' \ |
145 |
+ -i src/smplayer.pro || die |
146 |
fi |
147 |
|
148 |
# MPRIS2 pulls in dbus, bug #553710 |
149 |
if ! use mpris ; then |
150 |
- sed -e 's:DEFINES += MPRIS2:#DEFINES += MPRIS2:' \ |
151 |
- -i "${S}"/src/smplayer.pro || die "sed failed" |
152 |
+ sed -e 's:DEFINES += MPRIS2:#&:' \ |
153 |
+ -i src/smplayer.pro || die |
154 |
fi |
155 |
|
156 |
- # Turn off online update checker, bug #479902 |
157 |
- sed -e 's:DEFINES += UPDATE_CHECKER:#DEFINES += UPDATE_CHECKER:' \ |
158 |
- -e 's:DEFINES += CHECK_UPGRADED:#DEFINES += CHECK_UPGRADED:' \ |
159 |
- -i "${S}"/src/smplayer.pro || die "sed failed" |
160 |
- |
161 |
- # Turn off intrusive share widget |
162 |
- sed -e 's:DEFINES += SHARE_WIDGET:#DEFINES += SHARE_WIDGET:' \ |
163 |
- -i "${S}"/src/smplayer.pro || die "sed failed" |
164 |
- |
165 |
# Turn off youtube support (which pulls in extra dependencies) if unwanted |
166 |
if ! use streaming ; then |
167 |
- sed -e 's:DEFINES += YOUTUBE_SUPPORT:#DEFINES += YOUTUBE_SUPPORT:' \ |
168 |
- -i "${S}"/src/smplayer.pro || die "sed failed" |
169 |
+ sed -e 's:DEFINES += YOUTUBE_SUPPORT:#&:' \ |
170 |
+ -i src/smplayer.pro || die |
171 |
fi |
172 |
|
173 |
- l10n_find_plocales_changes "${S}/src/translations" "${PN}_" '.ts' |
174 |
+ # Commented out because it gives false positives |
175 |
+ #l10n_find_plocales_changes "${S}"/src/translations ${PN}_ .ts |
176 |
} |
177 |
|
178 |
src_configure() { |
179 |
- pushd src > /dev/null || die |
180 |
- use qt4 && eqmake4 |
181 |
- use qt5 && eqmake5 |
182 |
- popd > /dev/null || die |
183 |
+ cd src || die |
184 |
+ use qt5 && eqmake5 || eqmake4 |
185 |
} |
186 |
|
187 |
gen_translation() { |
188 |
- local mydir |
189 |
- if use qt4; then |
190 |
- mydir="$(qt4_get_bindir)" |
191 |
- elif use qt5; then |
192 |
+ local mydir="$(qt4_get_bindir)" |
193 |
+ if use qt5; then |
194 |
mydir="$(qt5_get_bindir)" |
195 |
fi |
196 |
+ |
197 |
ebegin "Generating $1 translation" |
198 |
"${mydir}"/lrelease ${PN}_${1}.ts |
199 |
eend $? || die "failed to generate $1 translation" |
200 |
} |
201 |
|
202 |
src_compile() { |
203 |
- emake |
204 |
+ default |
205 |
|
206 |
- cd "${S}"/src/translations |
207 |
+ cd src/translations || die |
208 |
l10n_for_each_locale_do gen_translation |
209 |
} |
210 |
|
211 |
src_install() { |
212 |
- # remove unneeded copies of licenses |
213 |
- rm Copying* docs/*/gpl.html || die |
214 |
- rm -r docs/{de,es,fr,nl,ro} || die |
215 |
+ # remove unneeded copies of the GPL |
216 |
+ rm -f Copying* docs/*/gpl.html || die |
217 |
+ # don't install empty dirs |
218 |
+ rmdir --ignore-fail-on-non-empty docs/* || die |
219 |
|
220 |
- emake DESTDIR="${D}" install |
221 |
+ default |
222 |
} |