1 |
commit: 3a0d53dd4d40d78e08343d08bbb95191d45ca166 |
2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Oct 13 22:21:28 2013 +0000 |
4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Nov 28 23:06:09 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3a0d53dd |
7 |
|
8 |
media-video/totem: 3.8.2-r1 → 3.10 |
9 |
|
10 |
--- |
11 |
.../{totem-9999.ebuild => totem-3.10.0.ebuild} | 131 ++++++++------------- |
12 |
media-video/totem/totem-9999.ebuild | 107 +++++++++-------- |
13 |
2 files changed, 107 insertions(+), 131 deletions(-) |
14 |
|
15 |
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-3.10.0.ebuild |
16 |
similarity index 54% |
17 |
copy from media-video/totem/totem-9999.ebuild |
18 |
copy to media-video/totem/totem-3.10.0.ebuild |
19 |
index edea640..45eea64 100644 |
20 |
--- a/media-video/totem/totem-9999.ebuild |
21 |
+++ b/media-video/totem/totem-3.10.0.ebuild |
22 |
@@ -1,4 +1,4 @@ |
23 |
-# Copyright 1999-2012 Gentoo Foundation |
24 |
+# Copyright 1999-2013 Gentoo Foundation |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
# $Header: $ |
27 |
|
28 |
@@ -8,11 +8,7 @@ GNOME2_LA_PUNT="yes" # plugins are dlopened |
29 |
PYTHON_COMPAT=( python2_{6,7} ) |
30 |
PYTHON_REQ_USE="threads" |
31 |
|
32 |
-inherit gnome2 multilib python-single-r1 |
33 |
-if [[ ${PV} = 9999 ]]; then |
34 |
- VALA_MIN_API_VERSION="0.14" |
35 |
- inherit gnome2-live vala |
36 |
-fi |
37 |
+inherit autotools eutils gnome2 multilib python-single-r1 |
38 |
|
39 |
DESCRIPTION="Media player for GNOME" |
40 |
HOMEPAGE="http://projects.gnome.org/totem/" |
41 |
@@ -21,17 +17,13 @@ LICENSE="GPL-2+ LGPL-2+" |
42 |
SLOT="0" |
43 |
IUSE="flash grilo +introspection lirc nautilus nsplugin +python test zeitgeist" |
44 |
# see bug #359379 |
45 |
-REQUIRED_USE="flash? ( nsplugin ) |
46 |
- python? ( introspection ) |
47 |
- zeitgeist? ( introspection )" |
48 |
- |
49 |
-if [[ ${PV} = 9999 ]]; then |
50 |
- IUSE+=" doc vala" |
51 |
- REQUIRED_USE+=" zeitgeist? ( vala )" |
52 |
- KEYWORDS="" |
53 |
-else |
54 |
- KEYWORDS="~amd64 ~x86 ~x86-fbsd" |
55 |
-fi |
56 |
+REQUIRED_USE=" |
57 |
+ flash? ( nsplugin ) |
58 |
+ python? ( introspection ${PYTHON_REQUIRED_USE} ) |
59 |
+ zeitgeist? ( introspection ) |
60 |
+" |
61 |
+ |
62 |
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
63 |
|
64 |
# TODO: |
65 |
# Cone (VLC) plugin needs someone with the right setup to test it |
66 |
@@ -42,13 +34,13 @@ fi |
67 |
RDEPEND=" |
68 |
>=dev-libs/glib-2.33:2 |
69 |
>=x11-libs/gdk-pixbuf-2.23.0:2 |
70 |
- >=x11-libs/gtk+-3.5.2:3[introspection?] |
71 |
- >=dev-libs/totem-pl-parser-2.32.4[introspection?] |
72 |
+ >=x11-libs/gtk+-3.7.10:3[introspection?] |
73 |
+ >=dev-libs/totem-pl-parser-3.9.92:0=[introspection?] |
74 |
>=dev-libs/libpeas-1.1.0[gtk] |
75 |
>=x11-themes/gnome-icon-theme-2.16 |
76 |
x11-libs/cairo |
77 |
>=dev-libs/libxml2-2.6:2 |
78 |
- >=media-libs/clutter-1.6.8:1.0 |
79 |
+ >=media-libs/clutter-1.10:1.0 |
80 |
>=media-libs/clutter-gst-1.5.5:2.0 |
81 |
>=media-libs/clutter-gtk-1.0.2:1.0 |
82 |
x11-libs/mx:1.0 |
83 |
@@ -69,7 +61,9 @@ RDEPEND=" |
84 |
x11-themes/gnome-icon-theme-symbolic |
85 |
|
86 |
flash? ( dev-libs/totem-pl-parser[quvi] ) |
87 |
- grilo? ( media-libs/grilo:0.2 ) |
88 |
+ grilo? ( |
89 |
+ media-libs/grilo:0.2 |
90 |
+ media-plugins/grilo-plugins:0.2 ) |
91 |
introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) |
92 |
lirc? ( app-misc/lirc ) |
93 |
nautilus? ( >=gnome-base/nautilus-2.91.3 ) |
94 |
@@ -81,12 +75,11 @@ RDEPEND=" |
95 |
>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}] |
96 |
dev-python/pyxdg[${PYTHON_USEDEP}] |
97 |
dev-python/dbus-python[${PYTHON_USEDEP}] |
98 |
- >=x11-libs/gtk+-2.91.7:3[introspection] ) |
99 |
- zeitgeist? ( dev-libs/libzeitgeist ) |
100 |
+ >=x11-libs/gtk+-3.5.2:3[introspection] ) |
101 |
+ zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12 ) |
102 |
" |
103 |
DEPEND="${RDEPEND} |
104 |
app-text/docbook-xml-dtd:4.5 |
105 |
- >=app-text/gnome-doc-utils-0.20.3 |
106 |
app-text/scrollkeeper |
107 |
>=dev-util/gtk-doc-am-1.14 |
108 |
>=dev-util/intltool-0.40 |
109 |
@@ -94,80 +87,58 @@ DEPEND="${RDEPEND} |
110 |
x11-proto/xextproto |
111 |
x11-proto/xproto |
112 |
virtual/pkgconfig |
113 |
- test? ( python? ( dev-python/pylint ) ) |
114 |
" |
115 |
# docbook-xml-dtd is needed for user doc |
116 |
-# Only needed when regenerating C sources from Vala files |
117 |
-if [[ ${PV} = 9999 ]]; then |
118 |
- DEPEND+=" vala? ( $(vala_depend) ) |
119 |
- doc? ( >=dev-util/gtk-doc-1.14 )" |
120 |
-fi |
121 |
+# Prevent dev-python/pylint dep, bug #482538 |
122 |
+pkg_setup() { |
123 |
+ use python && python-single-r1_pkg_setup |
124 |
+} |
125 |
|
126 |
src_prepare() { |
127 |
- # AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails |
128 |
- mkdir -p m4 |
129 |
+ # Prevent pylint usage by tests, bug #482538 |
130 |
+ sed -i -e 's/ check-pylint//' src/plugins/Makefile.plugins || die |
131 |
|
132 |
- if [[ ${PV} = 9999 ]]; then |
133 |
- # Only needed when regenerating C sources from Vala files |
134 |
- use vala && vala_src_prepare |
135 |
- fi |
136 |
+ eautoreconf |
137 |
gnome2_src_prepare |
138 |
+ |
139 |
+ # FIXME: upstream should provide a way to set GST_INSPECT, bug #358755 & co. |
140 |
+ # gst-inspect causes sandbox violations when a plugin needs write access to |
141 |
+ # /dev/dri/card* in its init phase. |
142 |
+ sed -e "s|\(gst10_inspect=\).*|\1$(type -P true)|" \ |
143 |
+ -i configure || die |
144 |
} |
145 |
|
146 |
src_configure() { |
147 |
- DOCS="AUTHORS ChangeLog NEWS README TODO" |
148 |
use nsplugin && DOCS="${DOCS} browser-plugin/README.browser-plugin" |
149 |
|
150 |
- #--with-smclient=auto needed to correctly link to libICE and libSM |
151 |
- G2CONF="${G2CONF} |
152 |
- --disable-run-in-source-tree |
153 |
- --disable-static |
154 |
- --with-smclient=auto |
155 |
- --enable-easy-codec-installation |
156 |
- $(use_enable flash vegas-plugin) |
157 |
- $(use_enable introspection) |
158 |
- $(use_enable nautilus) |
159 |
- $(use_enable nsplugin browser-plugins) |
160 |
- $(use_enable python) |
161 |
- BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins" |
162 |
- |
163 |
- # XXX: always set to true otherwise tests fails due to pylint not |
164 |
- # respecting EPYTHON (wait for python-r1) |
165 |
- # pylint is checked unconditionally, but is only used for make check |
166 |
- G2CONF="${G2CONF} PYLINT=$(type -P true)" |
167 |
- |
168 |
# Disabled: sample-python, sample-vala |
169 |
local plugins="apple-trailers,autoload-subtitles,brasero-disc-recorder" |
170 |
plugins+=",chapters,im-status,gromit,media-player-keys,ontop" |
171 |
- plugins+=",properties,recent,screensaver,screenshot,sidebar-test" |
172 |
- plugins+=",skipto" |
173 |
+ plugins+=",properties,recent,rotation,screensaver,screenshot" |
174 |
+ plugins+=",sidebar-test,skipto,vimeo" |
175 |
use grilo && plugins+=",grilo" |
176 |
use lirc && plugins+=",lirc" |
177 |
use nautilus && plugins+=",save-file" |
178 |
use python && plugins+=",dbusservice,pythonconsole,opensubtitles" |
179 |
- if [[ ${PV} = 9999 ]]; then |
180 |
- # Only needed when regenerating C sources from Vala files |
181 |
- G2CONF="${G2CONF} $(use_enable vala)" |
182 |
- use vala && plugins+=",rotation" |
183 |
- else |
184 |
- G2CONF="${G2CONF} --enable-vala VALAC=$(type -P true)" |
185 |
- plugins+=",rotation" |
186 |
- fi |
187 |
use zeitgeist && plugins+=",zeitgeist-dp" |
188 |
|
189 |
- G2CONF="${G2CONF} --with-plugins=${plugins}" |
190 |
- |
191 |
- # Work around sandbox violations when FEATURES=-userpriv caused by |
192 |
- # gst-inspect-1.0(bug #358755) |
193 |
- unset DISPLAY |
194 |
- gnome2_src_configure |
195 |
-} |
196 |
- |
197 |
-pkg_postinst() { |
198 |
- gnome2_pkg_postinst |
199 |
- |
200 |
- ewarn |
201 |
- ewarn "If totem doesn't play some video format, please check your" |
202 |
- ewarn "USE flags on media-plugins/gst-plugins-meta" |
203 |
- ewarn |
204 |
+ #--with-smclient=auto needed to correctly link to libICE and libSM |
205 |
+ # XXX: always set to true otherwise tests fails due to pylint not |
206 |
+ # respecting EPYTHON (wait for python-r1) |
207 |
+ # pylint is checked unconditionally, but is only used for make check |
208 |
+ gnome2_src_configure \ |
209 |
+ --disable-run-in-source-tree \ |
210 |
+ --disable-static \ |
211 |
+ --with-smclient=auto \ |
212 |
+ --enable-easy-codec-installation \ |
213 |
+ --enable-vala \ |
214 |
+ $(use_enable flash vegas-plugin) \ |
215 |
+ $(use_enable introspection) \ |
216 |
+ $(use_enable nautilus) \ |
217 |
+ $(use_enable nsplugin browser-plugins) \ |
218 |
+ $(use_enable python) \ |
219 |
+ PYLINT=$(type -P true) \ |
220 |
+ VALAC=$(type -P true) \ |
221 |
+ BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins \ |
222 |
+ --with-plugins=${plugins} |
223 |
} |
224 |
|
225 |
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild |
226 |
index edea640..ab6bf90 100644 |
227 |
--- a/media-video/totem/totem-9999.ebuild |
228 |
+++ b/media-video/totem/totem-9999.ebuild |
229 |
@@ -1,4 +1,4 @@ |
230 |
-# Copyright 1999-2012 Gentoo Foundation |
231 |
+# Copyright 1999-2013 Gentoo Foundation |
232 |
# Distributed under the terms of the GNU General Public License v2 |
233 |
# $Header: $ |
234 |
|
235 |
@@ -8,7 +8,7 @@ GNOME2_LA_PUNT="yes" # plugins are dlopened |
236 |
PYTHON_COMPAT=( python2_{6,7} ) |
237 |
PYTHON_REQ_USE="threads" |
238 |
|
239 |
-inherit gnome2 multilib python-single-r1 |
240 |
+inherit autotools eutils gnome2 multilib python-single-r1 |
241 |
if [[ ${PV} = 9999 ]]; then |
242 |
VALA_MIN_API_VERSION="0.14" |
243 |
inherit gnome2-live vala |
244 |
@@ -21,16 +21,18 @@ LICENSE="GPL-2+ LGPL-2+" |
245 |
SLOT="0" |
246 |
IUSE="flash grilo +introspection lirc nautilus nsplugin +python test zeitgeist" |
247 |
# see bug #359379 |
248 |
-REQUIRED_USE="flash? ( nsplugin ) |
249 |
- python? ( introspection ) |
250 |
- zeitgeist? ( introspection )" |
251 |
+REQUIRED_USE=" |
252 |
+ flash? ( nsplugin ) |
253 |
+ python? ( introspection ${PYTHON_REQUIRED_USE} ) |
254 |
+ zeitgeist? ( introspection ) |
255 |
+" |
256 |
|
257 |
if [[ ${PV} = 9999 ]]; then |
258 |
IUSE+=" doc vala" |
259 |
REQUIRED_USE+=" zeitgeist? ( vala )" |
260 |
KEYWORDS="" |
261 |
else |
262 |
- KEYWORDS="~amd64 ~x86 ~x86-fbsd" |
263 |
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
264 |
fi |
265 |
|
266 |
# TODO: |
267 |
@@ -42,13 +44,13 @@ fi |
268 |
RDEPEND=" |
269 |
>=dev-libs/glib-2.33:2 |
270 |
>=x11-libs/gdk-pixbuf-2.23.0:2 |
271 |
- >=x11-libs/gtk+-3.5.2:3[introspection?] |
272 |
- >=dev-libs/totem-pl-parser-2.32.4[introspection?] |
273 |
+ >=x11-libs/gtk+-3.7.10:3[introspection?] |
274 |
+ >=dev-libs/totem-pl-parser-3.9.92:0=[introspection?] |
275 |
>=dev-libs/libpeas-1.1.0[gtk] |
276 |
>=x11-themes/gnome-icon-theme-2.16 |
277 |
x11-libs/cairo |
278 |
>=dev-libs/libxml2-2.6:2 |
279 |
- >=media-libs/clutter-1.6.8:1.0 |
280 |
+ >=media-libs/clutter-1.10:1.0 |
281 |
>=media-libs/clutter-gst-1.5.5:2.0 |
282 |
>=media-libs/clutter-gtk-1.0.2:1.0 |
283 |
x11-libs/mx:1.0 |
284 |
@@ -69,7 +71,9 @@ RDEPEND=" |
285 |
x11-themes/gnome-icon-theme-symbolic |
286 |
|
287 |
flash? ( dev-libs/totem-pl-parser[quvi] ) |
288 |
- grilo? ( media-libs/grilo:0.2 ) |
289 |
+ grilo? ( |
290 |
+ media-libs/grilo:0.2 |
291 |
+ media-plugins/grilo-plugins:0.2 ) |
292 |
introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) |
293 |
lirc? ( app-misc/lirc ) |
294 |
nautilus? ( >=gnome-base/nautilus-2.91.3 ) |
295 |
@@ -81,12 +85,11 @@ RDEPEND=" |
296 |
>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}] |
297 |
dev-python/pyxdg[${PYTHON_USEDEP}] |
298 |
dev-python/dbus-python[${PYTHON_USEDEP}] |
299 |
- >=x11-libs/gtk+-2.91.7:3[introspection] ) |
300 |
- zeitgeist? ( dev-libs/libzeitgeist ) |
301 |
+ >=x11-libs/gtk+-3.5.2:3[introspection] ) |
302 |
+ zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12 ) |
303 |
" |
304 |
DEPEND="${RDEPEND} |
305 |
app-text/docbook-xml-dtd:4.5 |
306 |
- >=app-text/gnome-doc-utils-0.20.3 |
307 |
app-text/scrollkeeper |
308 |
>=dev-util/gtk-doc-am-1.14 |
309 |
>=dev-util/intltool-0.40 |
310 |
@@ -97,77 +100,79 @@ DEPEND="${RDEPEND} |
311 |
test? ( python? ( dev-python/pylint ) ) |
312 |
" |
313 |
# docbook-xml-dtd is needed for user doc |
314 |
+# Prevent dev-python/pylint dep, bug #482538 |
315 |
# Only needed when regenerating C sources from Vala files |
316 |
if [[ ${PV} = 9999 ]]; then |
317 |
DEPEND+=" vala? ( $(vala_depend) ) |
318 |
+ app-text/yelp-tools |
319 |
doc? ( >=dev-util/gtk-doc-1.14 )" |
320 |
fi |
321 |
|
322 |
+pkg_setup() { |
323 |
+ use python && python-single-r1_pkg_setup |
324 |
+} |
325 |
+ |
326 |
src_prepare() { |
327 |
# AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails |
328 |
mkdir -p m4 |
329 |
|
330 |
+ # Prevent pylint usage by tests, bug #482538 |
331 |
+ sed -i -e 's/ check-pylint//' src/plugins/Makefile.plugins || die |
332 |
+ |
333 |
if [[ ${PV} = 9999 ]]; then |
334 |
# Only needed when regenerating C sources from Vala files |
335 |
use vala && vala_src_prepare |
336 |
fi |
337 |
gnome2_src_prepare |
338 |
+ |
339 |
+ # FIXME: upstream should provide a way to set GST_INSPECT, bug #358755 & co. |
340 |
+ # gst-inspect causes sandbox violations when a plugin needs write access to |
341 |
+ # /dev/dri/card* in its init phase. |
342 |
+ sed -e "s|\(gst10_inspect=\).*|\1$(type -P true)|" \ |
343 |
+ -i configure || die |
344 |
} |
345 |
|
346 |
src_configure() { |
347 |
- DOCS="AUTHORS ChangeLog NEWS README TODO" |
348 |
+ local myconf="" |
349 |
use nsplugin && DOCS="${DOCS} browser-plugin/README.browser-plugin" |
350 |
|
351 |
- #--with-smclient=auto needed to correctly link to libICE and libSM |
352 |
- G2CONF="${G2CONF} |
353 |
- --disable-run-in-source-tree |
354 |
- --disable-static |
355 |
- --with-smclient=auto |
356 |
- --enable-easy-codec-installation |
357 |
- $(use_enable flash vegas-plugin) |
358 |
- $(use_enable introspection) |
359 |
- $(use_enable nautilus) |
360 |
- $(use_enable nsplugin browser-plugins) |
361 |
- $(use_enable python) |
362 |
- BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins" |
363 |
- |
364 |
- # XXX: always set to true otherwise tests fails due to pylint not |
365 |
- # respecting EPYTHON (wait for python-r1) |
366 |
- # pylint is checked unconditionally, but is only used for make check |
367 |
- G2CONF="${G2CONF} PYLINT=$(type -P true)" |
368 |
- |
369 |
# Disabled: sample-python, sample-vala |
370 |
local plugins="apple-trailers,autoload-subtitles,brasero-disc-recorder" |
371 |
plugins+=",chapters,im-status,gromit,media-player-keys,ontop" |
372 |
- plugins+=",properties,recent,screensaver,screenshot,sidebar-test" |
373 |
- plugins+=",skipto" |
374 |
+ plugins+=",properties,recent,rotation,screensaver,screenshot" |
375 |
+ plugins+=",sidebar-test,skipto,vimeo" |
376 |
use grilo && plugins+=",grilo" |
377 |
use lirc && plugins+=",lirc" |
378 |
use nautilus && plugins+=",save-file" |
379 |
use python && plugins+=",dbusservice,pythonconsole,opensubtitles" |
380 |
if [[ ${PV} = 9999 ]]; then |
381 |
# Only needed when regenerating C sources from Vala files |
382 |
- G2CONF="${G2CONF} $(use_enable vala)" |
383 |
+ myconf="${myconf} $(use_enable vala)" |
384 |
use vala && plugins+=",rotation" |
385 |
else |
386 |
- G2CONF="${G2CONF} --enable-vala VALAC=$(type -P true)" |
387 |
+ myconf="${myconf} --enable-vala VALAC=$(type -P true)" |
388 |
plugins+=",rotation" |
389 |
fi |
390 |
use zeitgeist && plugins+=",zeitgeist-dp" |
391 |
|
392 |
- G2CONF="${G2CONF} --with-plugins=${plugins}" |
393 |
- |
394 |
- # Work around sandbox violations when FEATURES=-userpriv caused by |
395 |
- # gst-inspect-1.0(bug #358755) |
396 |
- unset DISPLAY |
397 |
- gnome2_src_configure |
398 |
-} |
399 |
- |
400 |
-pkg_postinst() { |
401 |
- gnome2_pkg_postinst |
402 |
- |
403 |
- ewarn |
404 |
- ewarn "If totem doesn't play some video format, please check your" |
405 |
- ewarn "USE flags on media-plugins/gst-plugins-meta" |
406 |
- ewarn |
407 |
+ #--with-smclient=auto needed to correctly link to libICE and libSM |
408 |
+ # XXX: always set to true otherwise tests fails due to pylint not |
409 |
+ # respecting EPYTHON (wait for python-r1) |
410 |
+ # pylint is checked unconditionally, but is only used for make check |
411 |
+ gnome2_src_configure \ |
412 |
+ --disable-run-in-source-tree \ |
413 |
+ --disable-static \ |
414 |
+ --with-smclient=auto \ |
415 |
+ --enable-easy-codec-installation \ |
416 |
+ --enable-vala \ |
417 |
+ $(use_enable flash vegas-plugin) \ |
418 |
+ $(use_enable introspection) \ |
419 |
+ $(use_enable nautilus) \ |
420 |
+ $(use_enable nsplugin browser-plugins) \ |
421 |
+ $(use_enable python) \ |
422 |
+ PYLINT=$(type -P true) \ |
423 |
+ VALAC=$(type -P true) \ |
424 |
+ BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins \ |
425 |
+ --with-plugins=${plugins} \ |
426 |
+ ${myconf} |
427 |
} |