| 1 |
commit: 13c538be39e18ab7fbeb9e171de757ac07bc4daf |
| 2 |
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Apr 2 09:37:13 2012 +0000 |
| 4 |
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com> |
| 5 |
CommitDate: Mon Apr 2 09:44:49 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=13c538be |
| 7 |
|
| 8 |
media-video/totem: 3.3.92 → 3.4.0 + flash plugin fix |
| 9 |
|
| 10 |
Build the Vegas browser plugin for playing flash videos only if |
| 11 |
USE=flash. We do not want to enable it by default because it attempts to |
| 12 |
handle all .swf files, including non-video ones. |
| 13 |
|
| 14 |
--- |
| 15 |
.../{totem-3.3.92.ebuild => totem-3.4.0.ebuild} | 10 ++++++---- |
| 16 |
media-video/totem/totem-9999.ebuild | 10 ++++++---- |
| 17 |
2 files changed, 12 insertions(+), 8 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-video/totem/totem-3.3.92.ebuild b/media-video/totem/totem-3.4.0.ebuild |
| 20 |
similarity index 94% |
| 21 |
rename from media-video/totem/totem-3.3.92.ebuild |
| 22 |
rename to media-video/totem/totem-3.4.0.ebuild |
| 23 |
index f30d37e..2c6b497 100644 |
| 24 |
--- a/media-video/totem/totem-3.3.92.ebuild |
| 25 |
+++ b/media-video/totem/totem-3.4.0.ebuild |
| 26 |
@@ -20,8 +20,7 @@ HOMEPAGE="http://projects.gnome.org/totem/" |
| 27 |
|
| 28 |
LICENSE="GPL-2 LGPL-2" |
| 29 |
SLOT="0" |
| 30 |
-IUSE="doc grilo +introspection iplayer lirc nautilus nsplugin +python test vala |
| 31 |
-zeitgeist zeroconf" |
| 32 |
+IUSE="doc flash grilo +introspection iplayer lirc nautilus nsplugin +python test vala zeitgeist zeroconf" |
| 33 |
if [[ ${PV} = 9999 ]]; then |
| 34 |
KEYWORDS="" |
| 35 |
else |
| 36 |
@@ -63,6 +62,7 @@ RDEPEND=">=dev-libs/glib-2.27.92:2 |
| 37 |
>=x11-libs/libXxf86vm-1.0.1 |
| 38 |
x11-themes/gnome-icon-theme-symbolic |
| 39 |
|
| 40 |
+ flash? ( dev-libs/totem-pl-parser[quvi] ) |
| 41 |
grilo? ( >=media-libs/grilo-0.1.16 ) |
| 42 |
introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) |
| 43 |
lirc? ( app-misc/lirc ) |
| 44 |
@@ -102,7 +102,8 @@ DEPEND="${RDEPEND} |
| 45 |
# docbook-xml-dtd is needed for user doc |
| 46 |
|
| 47 |
# see bug #359379 |
| 48 |
-REQUIRED_USE="python? ( introspection ) |
| 49 |
+REQUIRED_USE="flash? ( nsplugin ) |
| 50 |
+ python? ( introspection ) |
| 51 |
zeitgeist? ( vala )" |
| 52 |
|
| 53 |
# XXX: pylint checks fail because of bad code |
| 54 |
@@ -110,6 +111,7 @@ RESTRICT="test" |
| 55 |
|
| 56 |
pkg_setup() { |
| 57 |
DOCS="AUTHORS ChangeLog NEWS README TODO" |
| 58 |
+ use nsplugin && DOCS="${DOCS} browser-plugin/README.browser-plugin" |
| 59 |
G2CONF="${G2CONF} |
| 60 |
--disable-run-in-source-tree |
| 61 |
--disable-schemas-compile |
| 62 |
@@ -117,10 +119,10 @@ pkg_setup() { |
| 63 |
--disable-static |
| 64 |
--with-smclient=auto |
| 65 |
--enable-easy-codec-installation |
| 66 |
+ $(use_enable flash vegas-plugin) |
| 67 |
$(use_enable introspection) |
| 68 |
$(use_enable nautilus) |
| 69 |
$(use_enable nsplugin browser-plugins) |
| 70 |
- $(use_enable nsplugin vegas-plugin) |
| 71 |
$(use_enable python) |
| 72 |
$(use_enable python introspection) |
| 73 |
$(use_enable vala) |
| 74 |
|
| 75 |
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild |
| 76 |
index f30d37e..2c6b497 100644 |
| 77 |
--- a/media-video/totem/totem-9999.ebuild |
| 78 |
+++ b/media-video/totem/totem-9999.ebuild |
| 79 |
@@ -20,8 +20,7 @@ HOMEPAGE="http://projects.gnome.org/totem/" |
| 80 |
|
| 81 |
LICENSE="GPL-2 LGPL-2" |
| 82 |
SLOT="0" |
| 83 |
-IUSE="doc grilo +introspection iplayer lirc nautilus nsplugin +python test vala |
| 84 |
-zeitgeist zeroconf" |
| 85 |
+IUSE="doc flash grilo +introspection iplayer lirc nautilus nsplugin +python test vala zeitgeist zeroconf" |
| 86 |
if [[ ${PV} = 9999 ]]; then |
| 87 |
KEYWORDS="" |
| 88 |
else |
| 89 |
@@ -63,6 +62,7 @@ RDEPEND=">=dev-libs/glib-2.27.92:2 |
| 90 |
>=x11-libs/libXxf86vm-1.0.1 |
| 91 |
x11-themes/gnome-icon-theme-symbolic |
| 92 |
|
| 93 |
+ flash? ( dev-libs/totem-pl-parser[quvi] ) |
| 94 |
grilo? ( >=media-libs/grilo-0.1.16 ) |
| 95 |
introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) |
| 96 |
lirc? ( app-misc/lirc ) |
| 97 |
@@ -102,7 +102,8 @@ DEPEND="${RDEPEND} |
| 98 |
# docbook-xml-dtd is needed for user doc |
| 99 |
|
| 100 |
# see bug #359379 |
| 101 |
-REQUIRED_USE="python? ( introspection ) |
| 102 |
+REQUIRED_USE="flash? ( nsplugin ) |
| 103 |
+ python? ( introspection ) |
| 104 |
zeitgeist? ( vala )" |
| 105 |
|
| 106 |
# XXX: pylint checks fail because of bad code |
| 107 |
@@ -110,6 +111,7 @@ RESTRICT="test" |
| 108 |
|
| 109 |
pkg_setup() { |
| 110 |
DOCS="AUTHORS ChangeLog NEWS README TODO" |
| 111 |
+ use nsplugin && DOCS="${DOCS} browser-plugin/README.browser-plugin" |
| 112 |
G2CONF="${G2CONF} |
| 113 |
--disable-run-in-source-tree |
| 114 |
--disable-schemas-compile |
| 115 |
@@ -117,10 +119,10 @@ pkg_setup() { |
| 116 |
--disable-static |
| 117 |
--with-smclient=auto |
| 118 |
--enable-easy-codec-installation |
| 119 |
+ $(use_enable flash vegas-plugin) |
| 120 |
$(use_enable introspection) |
| 121 |
$(use_enable nautilus) |
| 122 |
$(use_enable nsplugin browser-plugins) |
| 123 |
- $(use_enable nsplugin vegas-plugin) |
| 124 |
$(use_enable python) |
| 125 |
$(use_enable python introspection) |
| 126 |
$(use_enable vala) |
Archives