Gentoo Archives: gentoo-commits

From: Gilles Dartiguelongue <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: media-video/totem/
Date: Fri, 02 Nov 2012 00:13:24
Message-Id: 1351815176.f5da1deab39fb52f8d14679a55a941ffeede2e74.eva@gentoo
1 commit: f5da1deab39fb52f8d14679a55a941ffeede2e74
2 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
3 AuthorDate: Fri Nov 2 00:12:56 2012 +0000
4 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
5 CommitDate: Fri Nov 2 00:12:56 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f5da1dea
7
8 media-video/totem: 3.4.3 → 3.6.2
9
10 ---
11 media-video/totem/metadata.xml | 24 +++++
12 .../{totem-9999.ebuild => totem-3.6.2.ebuild} | 108 +++++++++-----------
13 media-video/totem/totem-9999.ebuild | 110 +++++++++----------
14 3 files changed, 124 insertions(+), 118 deletions(-)
15
16 diff --git a/media-video/totem/metadata.xml b/media-video/totem/metadata.xml
17 new file mode 100644
18 index 0000000..509d84e
19 --- /dev/null
20 +++ b/media-video/totem/metadata.xml
21 @@ -0,0 +1,24 @@
22 +<?xml version="1.0" encoding="UTF-8"?>
23 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
24 +<pkgmetadata>
25 + <herd>gnome</herd>
26 + <herd>video</herd>
27 + <herd>gstreamer</herd>
28 + <longdescription>
29 +Totem is movie player for the GNOME desktop. It features a playlist, fullscreen mode, seek and volume controls, as well as a pretty complete keyboard navigation. It comes with added functionality such as a video thumbnailer for Nautilus, Nautilus properties tab and a webcam utility.
30 +</longdescription>
31 + <use>
32 + <flag name="flash">Install browser plugin for playing embedded Adobe Flash
33 + videos. Warning: breaks non-video Flash objects on many websites.</flag>
34 + <flag name="grilo">Use <pkg>media-libs/grilo</pkg> to browse media content
35 + from various sources</flag>
36 + <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
37 + for introspection</flag>
38 + <flag name="lirc">Enable support for controlling Totem with a remote control
39 + using <pkg>app-misc/lirc</pkg></flag>
40 + <flag name="nautilus">Enable the nautilus extension</flag>
41 + <flag name="python">Build support for <pkg>dev-lang/python</pkg> plugins</flag>
42 + <flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
43 + <flag name="zeitgeist">Build the plugin to inject events to <pkg>gnome-extra/zeitgeist</pkg></flag>
44 + </use>
45 +</pkgmetadata>
46
47 diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-3.6.2.ebuild
48 similarity index 65%
49 copy from media-video/totem/totem-9999.ebuild
50 copy to media-video/totem/totem-3.6.2.ebuild
51 index 66472a8..46b766d 100644
52 --- a/media-video/totem/totem-9999.ebuild
53 +++ b/media-video/totem/totem-3.6.2.ebuild
54 @@ -5,10 +5,11 @@
55 EAPI="4"
56 GCONF_DEBUG="yes"
57 GNOME2_LA_PUNT="yes" # plugins are dlopened
58 -WANT_AUTOMAKE="1.11"
59 +
60 PYTHON_DEPEND="python? 2:2.5"
61 PYTHON_USE_WITH="threads"
62 PYTHON_USE_WITH_OPT="python"
63 +VALA_MIN_API_VERSION="0.14"
64
65 inherit gnome2 multilib python
66 if [[ ${PV} = 9999 ]]; then
67 @@ -20,7 +21,7 @@ HOMEPAGE="http://projects.gnome.org/totem/"
68
69 LICENSE="GPL-2 LGPL-2"
70 SLOT="0"
71 -IUSE="doc flash grilo +introspection iplayer lirc nautilus nsplugin +python test vala zeitgeist zeroconf"
72 +IUSE="doc flash grilo +introspection lirc nautilus nsplugin +python test vala zeitgeist"
73 if [[ ${PV} = 9999 ]]; then
74 KEYWORDS=""
75 else
76 @@ -33,39 +34,37 @@ fi
77 #
78 # FIXME: Automagic tracker-0.9.0
79 # Runtime dependency on gnome-session-2.91
80 -RDEPEND=">=dev-libs/glib-2.27.92:2
81 +# FIXME: does not exist yet: media-plugins/gst-plugins-meta:1.0
82 +RDEPEND="
83 + >=dev-libs/glib-2.33:2
84 >=x11-libs/gdk-pixbuf-2.23.0:2
85 - >=x11-libs/gtk+-3.3.6:3[introspection?]
86 + >=x11-libs/gtk+-3.5.2:3[introspection?]
87 >=dev-libs/totem-pl-parser-2.32.4[introspection?]
88 >=dev-libs/libpeas-1.1.0[gtk]
89 >=x11-themes/gnome-icon-theme-2.16
90 x11-libs/cairo
91 >=dev-libs/libxml2-2.6:2
92 >=media-libs/clutter-1.6.8:1.0
93 - >=media-libs/clutter-gst-1.3.9:1.0
94 + >=media-libs/clutter-gst-1.5.5:2.0
95 >=media-libs/clutter-gtk-1.0.2:1.0
96 - >=media-libs/gstreamer-0.10.30:0.10
97 - >=media-libs/gst-plugins-base-0.10.30:0.10
98 x11-libs/mx:1.0
99
100 - media-libs/gst-plugins-good:0.10
101 - media-plugins/gst-plugins-taglib:0.10
102 - media-plugins/gst-plugins-gio:0.10
103 - media-plugins/gst-plugins-pango:0.10
104 - media-plugins/gst-plugins-x:0.10
105 - media-plugins/gst-plugins-meta:0.10
106 + media-libs/gstreamer:1.0
107 + media-libs/gst-plugins-base:1.0[X,introspection?,pango]
108 + media-libs/gst-plugins-bad:1.0
109 + media-libs/gst-plugins-good:1.0
110 + media-plugins/gst-plugins-taglib:1.0
111
112 x11-libs/libICE
113 x11-libs/libSM
114 x11-libs/libX11
115 - x11-libs/libXtst
116 >=x11-libs/libXxf86vm-1.0.1
117
118 gnome-base/gsettings-desktop-schemas
119 x11-themes/gnome-icon-theme-symbolic
120
121 flash? ( dev-libs/totem-pl-parser[quvi] )
122 - grilo? ( >=media-libs/grilo-0.2.0:0.2 )
123 + grilo? ( media-libs/grilo:0.2 )
124 introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
125 lirc? ( app-misc/lirc )
126 nautilus? ( >=gnome-base/nautilus-2.91.3 )
127 @@ -77,28 +76,23 @@ RDEPEND=">=dev-libs/glib-2.27.92:2
128 >=dev-python/pygobject-2.90.3:3
129 >=x11-libs/gtk+-2.91.7:3[introspection]
130 dev-python/pyxdg
131 - dev-python/gst-python:0.10
132 - dev-python/dbus-python
133 - iplayer? (
134 - dev-python/httplib2
135 - dev-python/feedparser
136 - dev-python/beautifulsoup ) )
137 - vala? ( >=dev-lang/vala-0.14.2-r1:0.14 )
138 + dev-python/dbus-python )
139 zeitgeist? ( dev-libs/libzeitgeist )
140 - zeroconf? ( >net-libs/libepc-0.4.0 )"
141 -# XXX: zeroconf requires unreleased version of libepc
142 -
143 +"
144 DEPEND="${RDEPEND}
145 app-text/docbook-xml-dtd:4.5
146 >=app-text/gnome-doc-utils-0.20.3
147 app-text/scrollkeeper
148 >=dev-util/intltool-0.40
149 + >=dev-util/gtk-doc-am-1.14
150 sys-devel/gettext
151 x11-proto/xextproto
152 x11-proto/xproto
153 virtual/pkgconfig
154 - doc? ( >=dev-util/gtk-doc-1.14 )
155 - test? ( python? ( dev-python/pylint ) )"
156 + test? ( python? ( dev-python/pylint ) )
157 +"
158 +# Only needed when regenerating C sources from Vala files
159 +# vala? ( $(vala_depend) )"
160 # docbook-xml-dtd is needed for user doc
161
162 # see bug #359379
163 @@ -110,12 +104,23 @@ REQUIRED_USE="flash? ( nsplugin )
164 RESTRICT="test"
165
166 pkg_setup() {
167 + python_set_active_version 2
168 + python_pkg_setup
169 +}
170 +
171 +src_prepare() {
172 + use python && python_clean_py-compile_files
173 + # Only needed when regenerating C sources from Vala files
174 + #use vala && vala_src_prepare
175 + gnome2_src_prepare
176 +}
177 +
178 +src_configure() {
179 DOCS="AUTHORS ChangeLog NEWS README TODO"
180 use nsplugin && DOCS="${DOCS} browser-plugin/README.browser-plugin"
181 G2CONF="${G2CONF}
182 --disable-run-in-source-tree
183 --disable-schemas-compile
184 - --disable-scrollkeeper
185 --disable-static
186 --with-smclient=auto
187 --enable-easy-codec-installation
188 @@ -125,8 +130,10 @@ pkg_setup() {
189 $(use_enable nsplugin browser-plugins)
190 $(use_enable python)
191 $(use_enable vala)
192 - VALAC=$(type -P valac-0.14)
193 + VALAC=$(type -P true)
194 BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
195 + # Only needed when regenerating C sources from Vala files
196 + #VALAC=$(type -P valac-$(vala_best_api_version))
197
198 if ! use test; then
199 # pylint is checked unconditionally, but is only used for make check
200 @@ -134,40 +141,21 @@ pkg_setup() {
201 fi
202 #--with-smclient=auto needed to correctly link to libICE and libSM
203
204 - # Disabled: sample-python, sample-vala, zeitgeist-dp
205 - local plugins="brasero-disc-recorder,chapters,im-status,gromit"
206 - plugins="${plugins},media-player-keys,ontop,properties,screensaver"
207 - plugins="${plugins},screenshot,sidebar-test,skipto"
208 - use grilo && plugins="${plugins},grilo"
209 - use iplayer && plugins="${plugins},iplayer"
210 - use lirc && plugins="${plugins},lirc"
211 - use nautilus && plugins="${plugins},save-file"
212 - use python && plugins="${plugins},dbusservice,pythonconsole,opensubtitles"
213 - use vala && plugins="${plugins},rotation"
214 - use zeitgeist && plugins="${plugins},zeitgeist-dp"
215 - use zeroconf && plugins="${plugins},publish"
216 + # Disabled: sample-python, sample-vala
217 + # apple-trailers, autoload-subtitles, recent
218 + local plugins="apple-trailers,autoload-subtitles,brasero-disc-recorder"
219 + plugins+=",chapters,im-status,gromit,media-player-keys,ontop"
220 + plugins+=",properties,recent,screensaver,screenshot,sidebar-test"
221 + plugins+=",skipto"
222 + use grilo && plugins+=",grilo"
223 + use lirc && plugins+=",lirc"
224 + use nautilus && plugins+=",save-file"
225 + use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
226 + use vala && plugins+=",rotation"
227 + use zeitgeist && plugins+=",zeitgeist-dp"
228
229 G2CONF="${G2CONF} --with-plugins=${plugins}"
230
231 - python_set_active_version 2
232 - python_pkg_setup
233 -}
234 -
235 -src_prepare() {
236 - # AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails
237 - mkdir -p m4
238 -
239 - #if [[ ${PV} != 9999 ]]; then
240 - # intltoolize --force --copy --automake || die "intltoolize failed"
241 - # eautoreconf
242 - #fi
243 -
244 - use python && python_clean_py-compile_files
245 -
246 - gnome2_src_prepare
247 -}
248 -
249 -src_configure() {
250 # Work around sandbox violations when FEATURES=-userpriv caused by
251 # gst-inspect-0.10 (bug #358755)
252 unset DISPLAY
253
254 diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
255 index 66472a8..d187586 100644
256 --- a/media-video/totem/totem-9999.ebuild
257 +++ b/media-video/totem/totem-9999.ebuild
258 @@ -5,7 +5,7 @@
259 EAPI="4"
260 GCONF_DEBUG="yes"
261 GNOME2_LA_PUNT="yes" # plugins are dlopened
262 -WANT_AUTOMAKE="1.11"
263 +
264 PYTHON_DEPEND="python? 2:2.5"
265 PYTHON_USE_WITH="threads"
266 PYTHON_USE_WITH_OPT="python"
267 @@ -20,7 +20,7 @@ HOMEPAGE="http://projects.gnome.org/totem/"
268
269 LICENSE="GPL-2 LGPL-2"
270 SLOT="0"
271 -IUSE="doc flash grilo +introspection iplayer lirc nautilus nsplugin +python test vala zeitgeist zeroconf"
272 +IUSE="doc flash grilo +introspection lirc nautilus nsplugin +python test vala zeitgeist"
273 if [[ ${PV} = 9999 ]]; then
274 KEYWORDS=""
275 else
276 @@ -33,39 +33,37 @@ fi
277 #
278 # FIXME: Automagic tracker-0.9.0
279 # Runtime dependency on gnome-session-2.91
280 -RDEPEND=">=dev-libs/glib-2.27.92:2
281 +# FIXME: does not exist yet: media-plugins/gst-plugins-meta:1.0
282 +RDEPEND="
283 + >=dev-libs/glib-2.33:2
284 >=x11-libs/gdk-pixbuf-2.23.0:2
285 - >=x11-libs/gtk+-3.3.6:3[introspection?]
286 + >=x11-libs/gtk+-3.5.2:3[introspection?]
287 >=dev-libs/totem-pl-parser-2.32.4[introspection?]
288 >=dev-libs/libpeas-1.1.0[gtk]
289 >=x11-themes/gnome-icon-theme-2.16
290 x11-libs/cairo
291 >=dev-libs/libxml2-2.6:2
292 >=media-libs/clutter-1.6.8:1.0
293 - >=media-libs/clutter-gst-1.3.9:1.0
294 + >=media-libs/clutter-gst-1.5.5:2.0
295 >=media-libs/clutter-gtk-1.0.2:1.0
296 - >=media-libs/gstreamer-0.10.30:0.10
297 - >=media-libs/gst-plugins-base-0.10.30:0.10
298 x11-libs/mx:1.0
299
300 - media-libs/gst-plugins-good:0.10
301 - media-plugins/gst-plugins-taglib:0.10
302 - media-plugins/gst-plugins-gio:0.10
303 - media-plugins/gst-plugins-pango:0.10
304 - media-plugins/gst-plugins-x:0.10
305 - media-plugins/gst-plugins-meta:0.10
306 + media-libs/gstreamer:1.0
307 + media-libs/gst-plugins-base:1.0[X,introspection,pango]
308 + media-libs/gst-plugins-bad:1.0
309 + media-libs/gst-plugins-good:1.0
310 + media-plugins/gst-plugins-taglib:1.0
311
312 x11-libs/libICE
313 x11-libs/libSM
314 x11-libs/libX11
315 - x11-libs/libXtst
316 >=x11-libs/libXxf86vm-1.0.1
317
318 gnome-base/gsettings-desktop-schemas
319 x11-themes/gnome-icon-theme-symbolic
320
321 flash? ( dev-libs/totem-pl-parser[quvi] )
322 - grilo? ( >=media-libs/grilo-0.2.0:0.2 )
323 + grilo? ( media-libs/grilo:0.2 )
324 introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
325 lirc? ( app-misc/lirc )
326 nautilus? ( >=gnome-base/nautilus-2.91.3 )
327 @@ -77,28 +75,22 @@ RDEPEND=">=dev-libs/glib-2.27.92:2
328 >=dev-python/pygobject-2.90.3:3
329 >=x11-libs/gtk+-2.91.7:3[introspection]
330 dev-python/pyxdg
331 - dev-python/gst-python:0.10
332 - dev-python/dbus-python
333 - iplayer? (
334 - dev-python/httplib2
335 - dev-python/feedparser
336 - dev-python/beautifulsoup ) )
337 - vala? ( >=dev-lang/vala-0.14.2-r1:0.14 )
338 + dev-python/dbus-python )
339 zeitgeist? ( dev-libs/libzeitgeist )
340 - zeroconf? ( >net-libs/libepc-0.4.0 )"
341 -# XXX: zeroconf requires unreleased version of libepc
342 -
343 +"
344 DEPEND="${RDEPEND}
345 app-text/docbook-xml-dtd:4.5
346 >=app-text/gnome-doc-utils-0.20.3
347 app-text/scrollkeeper
348 >=dev-util/intltool-0.40
349 + >=dev-util/gtk-doc-am-1.14
350 sys-devel/gettext
351 x11-proto/xextproto
352 x11-proto/xproto
353 virtual/pkgconfig
354 doc? ( >=dev-util/gtk-doc-1.14 )
355 - test? ( python? ( dev-python/pylint ) )"
356 + test? ( python? ( dev-python/pylint ) )
357 +"
358 # docbook-xml-dtd is needed for user doc
359
360 # see bug #359379
361 @@ -110,12 +102,31 @@ REQUIRED_USE="flash? ( nsplugin )
362 RESTRICT="test"
363
364 pkg_setup() {
365 + python_set_active_version 2
366 + python_pkg_setup
367 +}
368 +
369 +src_prepare() {
370 + # AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails
371 + mkdir -p m4
372 +
373 + #if [[ ${PV} != 9999 ]]; then
374 + # intltoolize --force --copy --automake || die "intltoolize failed"
375 + # eautoreconf
376 + #fi
377 +
378 + use python && python_clean_py-compile_files
379 + # Only needed when regenerating C sources from Vala files
380 + #use vala && vala_src_prepare
381 + gnome2_src_prepare
382 +}
383 +
384 +src_configure() {
385 DOCS="AUTHORS ChangeLog NEWS README TODO"
386 use nsplugin && DOCS="${DOCS} browser-plugin/README.browser-plugin"
387 G2CONF="${G2CONF}
388 --disable-run-in-source-tree
389 --disable-schemas-compile
390 - --disable-scrollkeeper
391 --disable-static
392 --with-smclient=auto
393 --enable-easy-codec-installation
394 @@ -127,6 +138,8 @@ pkg_setup() {
395 $(use_enable vala)
396 VALAC=$(type -P valac-0.14)
397 BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
398 + # Only needed when regenerating C sources from Vala files
399 + #VALAC=$(type -P valac-$(vala_best_api_version))
400
401 if ! use test; then
402 # pylint is checked unconditionally, but is only used for make check
403 @@ -134,40 +147,21 @@ pkg_setup() {
404 fi
405 #--with-smclient=auto needed to correctly link to libICE and libSM
406
407 - # Disabled: sample-python, sample-vala, zeitgeist-dp
408 - local plugins="brasero-disc-recorder,chapters,im-status,gromit"
409 - plugins="${plugins},media-player-keys,ontop,properties,screensaver"
410 - plugins="${plugins},screenshot,sidebar-test,skipto"
411 - use grilo && plugins="${plugins},grilo"
412 - use iplayer && plugins="${plugins},iplayer"
413 - use lirc && plugins="${plugins},lirc"
414 - use nautilus && plugins="${plugins},save-file"
415 - use python && plugins="${plugins},dbusservice,pythonconsole,opensubtitles"
416 - use vala && plugins="${plugins},rotation"
417 - use zeitgeist && plugins="${plugins},zeitgeist-dp"
418 - use zeroconf && plugins="${plugins},publish"
419 + # Disabled: sample-python, sample-vala
420 + # apple-trailers, autoload-subtitles, recent
421 + local plugins="apple-trailers,autoload-subtitles,brasero-disc-recorder"
422 + plugins+=",chapters,im-status,gromit,media-player-keys,ontop"
423 + plugins+=",properties,recent,screensaver,screenshot,sidebar-test"
424 + plugins+=",skipto"
425 + use grilo && plugins+=",grilo"
426 + use lirc && plugins+=",lirc"
427 + use nautilus && plugins+=",save-file"
428 + use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
429 + use vala && plugins+=",rotation"
430 + use zeitgeist && plugins+=",zeitgeist-dp"
431
432 G2CONF="${G2CONF} --with-plugins=${plugins}"
433
434 - python_set_active_version 2
435 - python_pkg_setup
436 -}
437 -
438 -src_prepare() {
439 - # AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails
440 - mkdir -p m4
441 -
442 - #if [[ ${PV} != 9999 ]]; then
443 - # intltoolize --force --copy --automake || die "intltoolize failed"
444 - # eautoreconf
445 - #fi
446 -
447 - use python && python_clean_py-compile_files
448 -
449 - gnome2_src_prepare
450 -}
451 -
452 -src_configure() {
453 # Work around sandbox violations when FEATURES=-userpriv caused by
454 # gst-inspect-0.10 (bug #358755)
455 unset DISPLAY