* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2012-04-02 9:45 Alexandre Restovtsev
0 siblings, 0 replies; 40+ messages in thread
From: Alexandre Restovtsev @ 2012-04-02 9:45 UTC (permalink / raw
To: gentoo-commits
commit: 13c538be39e18ab7fbeb9e171de757ac07bc4daf
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 2 09:37:13 2012 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Apr 2 09:44:49 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=13c538be
media-video/totem: 3.3.92 → 3.4.0 + flash plugin fix
Build the Vegas browser plugin for playing flash videos only if
USE=flash. We do not want to enable it by default because it attempts to
handle all .swf files, including non-video ones.
---
.../{totem-3.3.92.ebuild => totem-3.4.0.ebuild} | 10 ++++++----
media-video/totem/totem-9999.ebuild | 10 ++++++----
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/media-video/totem/totem-3.3.92.ebuild b/media-video/totem/totem-3.4.0.ebuild
similarity index 94%
rename from media-video/totem/totem-3.3.92.ebuild
rename to media-video/totem/totem-3.4.0.ebuild
index f30d37e..2c6b497 100644
--- a/media-video/totem/totem-3.3.92.ebuild
+++ b/media-video/totem/totem-3.4.0.ebuild
@@ -20,8 +20,7 @@ HOMEPAGE="http://projects.gnome.org/totem/"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
-IUSE="doc grilo +introspection iplayer lirc nautilus nsplugin +python test vala
-zeitgeist zeroconf"
+IUSE="doc flash grilo +introspection iplayer lirc nautilus nsplugin +python test vala zeitgeist zeroconf"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
@@ -63,6 +62,7 @@ RDEPEND=">=dev-libs/glib-2.27.92:2
>=x11-libs/libXxf86vm-1.0.1
x11-themes/gnome-icon-theme-symbolic
+ flash? ( dev-libs/totem-pl-parser[quvi] )
grilo? ( >=media-libs/grilo-0.1.16 )
introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
lirc? ( app-misc/lirc )
@@ -102,7 +102,8 @@ DEPEND="${RDEPEND}
# docbook-xml-dtd is needed for user doc
# see bug #359379
-REQUIRED_USE="python? ( introspection )
+REQUIRED_USE="flash? ( nsplugin )
+ python? ( introspection )
zeitgeist? ( vala )"
# XXX: pylint checks fail because of bad code
@@ -110,6 +111,7 @@ RESTRICT="test"
pkg_setup() {
DOCS="AUTHORS ChangeLog NEWS README TODO"
+ use nsplugin && DOCS="${DOCS} browser-plugin/README.browser-plugin"
G2CONF="${G2CONF}
--disable-run-in-source-tree
--disable-schemas-compile
@@ -117,10 +119,10 @@ pkg_setup() {
--disable-static
--with-smclient=auto
--enable-easy-codec-installation
+ $(use_enable flash vegas-plugin)
$(use_enable introspection)
$(use_enable nautilus)
$(use_enable nsplugin browser-plugins)
- $(use_enable nsplugin vegas-plugin)
$(use_enable python)
$(use_enable python introspection)
$(use_enable vala)
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index f30d37e..2c6b497 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -20,8 +20,7 @@ HOMEPAGE="http://projects.gnome.org/totem/"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
-IUSE="doc grilo +introspection iplayer lirc nautilus nsplugin +python test vala
-zeitgeist zeroconf"
+IUSE="doc flash grilo +introspection iplayer lirc nautilus nsplugin +python test vala zeitgeist zeroconf"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
@@ -63,6 +62,7 @@ RDEPEND=">=dev-libs/glib-2.27.92:2
>=x11-libs/libXxf86vm-1.0.1
x11-themes/gnome-icon-theme-symbolic
+ flash? ( dev-libs/totem-pl-parser[quvi] )
grilo? ( >=media-libs/grilo-0.1.16 )
introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
lirc? ( app-misc/lirc )
@@ -102,7 +102,8 @@ DEPEND="${RDEPEND}
# docbook-xml-dtd is needed for user doc
# see bug #359379
-REQUIRED_USE="python? ( introspection )
+REQUIRED_USE="flash? ( nsplugin )
+ python? ( introspection )
zeitgeist? ( vala )"
# XXX: pylint checks fail because of bad code
@@ -110,6 +111,7 @@ RESTRICT="test"
pkg_setup() {
DOCS="AUTHORS ChangeLog NEWS README TODO"
+ use nsplugin && DOCS="${DOCS} browser-plugin/README.browser-plugin"
G2CONF="${G2CONF}
--disable-run-in-source-tree
--disable-schemas-compile
@@ -117,10 +119,10 @@ pkg_setup() {
--disable-static
--with-smclient=auto
--enable-easy-codec-installation
+ $(use_enable flash vegas-plugin)
$(use_enable introspection)
$(use_enable nautilus)
$(use_enable nsplugin browser-plugins)
- $(use_enable nsplugin vegas-plugin)
$(use_enable python)
$(use_enable python introspection)
$(use_enable vala)
^ permalink raw reply related [flat|nested] 40+ messages in thread* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2019-02-16 23:03 Mart Raudsepp
0 siblings, 0 replies; 40+ messages in thread
From: Mart Raudsepp @ 2019-02-16 23:03 UTC (permalink / raw
To: gentoo-commits
commit: 6dacf7bba40b53763cc7a442e4c59d3bb0573fcd
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 16 23:03:39 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Feb 16 23:03:39 2019 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=6dacf7bb
media-video/totem: remove 3.26, 3.30.0 available in ::gentoo
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
media-video/totem/totem-3.26.0.ebuild | 139 ----------------------------------
1 file changed, 139 deletions(-)
diff --git a/media-video/totem/totem-3.26.0.ebuild b/media-video/totem/totem-3.26.0.ebuild
deleted file mode 100644
index 8ab39a4f..00000000
--- a/media-video/totem/totem-3.26.0.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-PYTHON_REQ_USE="threads"
-
-inherit gnome-meson python-single-r1 vala
-
-DESCRIPTION="Media player for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Videos"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="cdr +introspection lirc nautilus +python test vala"
-# see bug #359379
-REQUIRED_USE="
- python? ( introspection ${PYTHON_REQUIRED_USE} )
-"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-
-# FIXME:
-# Runtime dependency on gnome-session-2.91
-COMMON_DEPEND="
- >=dev-libs/glib-2.43.4:2[dbus]
- >=dev-libs/libpeas-1.1[gtk]
- >=dev-libs/totem-pl-parser-3.10.1:0=[introspection?]
- >=media-libs/clutter-1.17.3:1.0[gtk]
- >=media-libs/clutter-gst-2.99.2:3.0
- >=media-libs/clutter-gtk-1.8.1:1.0
- >=x11-libs/cairo-1.14
- >=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.19.4:3[introspection?]
-
- >=media-libs/grilo-0.3.0:0.3[playlist]
- >=media-libs/gstreamer-1.6.0:1.0
- >=media-libs/gst-plugins-base-1.6.0:1.0[X,introspection?,pango]
- media-libs/gst-plugins-good:1.0
-
- x11-libs/libX11
-
- gnome-base/gnome-desktop:3=
- gnome-base/gsettings-desktop-schemas
-
- cdr? (
- >=dev-libs/libxml2-2.6:2
- >=x11-libs/gtk+-3.19.4:3[X]
- )
- introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
- lirc? ( app-misc/lirc )
- nautilus? ( >=gnome-base/nautilus-2.91.3 )
- python? (
- ${PYTHON_DEPS}
- >=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
- media-plugins/grilo-plugins:0.3
- media-plugins/gst-plugins-meta:1.0
- media-plugins/gst-plugins-taglib:1.0
- x11-themes/adwaita-icon-theme
- python? (
- >=dev-libs/libpeas-1.1.0[python,${PYTHON_USEDEP}]
- dev-python/pyxdg[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
- >=x11-libs/gtk+-3.5.2:3[introspection] )
-"
-# libxml2+gdk-pixbuf required for glib-compile-resources
-DEPEND="${COMMON_DEPEND}
- app-text/docbook-xml-dtd:4.5
- app-text/yelp-tools
- >=dev-libs/libxml2-2.6:2
- >=dev-util/meson-0.44
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- x11-base/xorg-proto
- vala? ( $(vala_depend) )
-"
-# docbook-xml-dtd is needed for user doc
-# Prevent dev-python/pylint dep, bug #482538
-
-PATCHES=(
- # Fix some typos in meson.build files
- "${FILESDIR}"/3.26-meson-fixes.patch
- # Do not force all plugins
- "${FILESDIR}"/3.26-control-plugins.patch
- # Do not force pylint with USE=python
- "${FILESDIR}"/3.26-skip-pylint-check.patch
- # Allow disabling calls to gst-inspect (sandbox issue)
- "${FILESDIR}"/3.26-gst-inspect-sandbox.patch
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- vala_src_prepare
- gnome-meson_src_prepare
-}
-
-src_configure() {
- # Disabled: sample-python, sample-vala, zeitgeist-dp
- # brasero-disc-recorder and gromit depend on GTK+ X11 backend and could be made optional
- # if totem itself didn't depend on it
- local plugins="apple-trailers,autoload-subtitles"
- plugins+=",im-status,media-player-keys,ontop"
- plugins+=",properties,recent,screensaver,screenshot"
- plugins+=",skipto,variable-rate,vimeo"
- use cdr && plugins+=",brasero-disc-recorder"
- use lirc && plugins+=",lirc"
- use nautilus && plugins+=",save-file"
- use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
- use vala && plugins+=",rotation"
- plugins+=",gromit"
-
- # pylint is checked unconditionally, but is only used for make check
- # appstream-util overriding necessary until upstream fixes their macro
- # to respect configure switch
- gnome-meson_src_configure \
- -Denable-easy-codec-installation=yes \
- -Denable-gtk-doc=false \
- -Denable-introspection=$(usex introspection yes no) \
- -Denable-nautilus=$(usex nautilus yes no) \
- -Denable-python=$(usex python yes no) \
- -Denable-vala=$(usex vala yes no) \
- -Dgst-inspect=false \
- -Dwith-plugins=${plugins}
-}
-
-src_install() {
- gnome-meson_src_install
- if use python ; then
- local plugin
- for plugin in dbusservice pythonconsole opensubtitles ; do
- python_optimize "${ED}"usr/$(get_libdir)/totem/plugins/${plugin}
- done
- fi
-}
^ permalink raw reply related [flat|nested] 40+ messages in thread* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2018-06-07 22:23 Gilles Dartiguelongue
0 siblings, 0 replies; 40+ messages in thread
From: Gilles Dartiguelongue @ 2018-06-07 22:23 UTC (permalink / raw
To: gentoo-commits
commit: 5e07234bc0e818ff88479a40a5509fff0e6a33fd
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 7 22:18:13 2018 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu Jun 7 22:23:30 2018 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=5e07234b
media-video/totem: sync live ebuild
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Manifest-Sign-Key: 0x5A56C8CD0C13248A
media-video/totem/metadata.xml | 1 -
media-video/totem/totem-9999.ebuild | 156 +++++++++++++++++-------------------
2 files changed, 73 insertions(+), 84 deletions(-)
diff --git a/media-video/totem/metadata.xml b/media-video/totem/metadata.xml
index 317e469b..8a1eb150 100644
--- a/media-video/totem/metadata.xml
+++ b/media-video/totem/metadata.xml
@@ -21,6 +21,5 @@ Totem is movie player for the GNOME desktop. It features a playlist, fullscreen
using <pkg>app-misc/lirc</pkg></flag>
<flag name="nautilus">Enable the nautilus extension</flag>
<flag name="python">Build support for <pkg>dev-lang/python</pkg> plugins</flag>
- <flag name="zeitgeist">Build the plugin to inject events to <pkg>gnome-extra/zeitgeist</pkg></flag>
</use>
</pkgmetadata>
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index 787a0e19..011291c7 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -1,17 +1,15 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python2_7 )
+EAPI=6
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
PYTHON_REQ_USE="threads"
-inherit eutils gnome2 multilib python-single-r1
+inherit gnome-meson python-single-r1 vala
if [[ ${PV} = 9999 ]]; then
- VALA_MIN_API_VERSION="0.14"
- inherit gnome2-live vala
+ SRC_URI=""
+ EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/totem.git"
+ inherit git-r3
fi
DESCRIPTION="Media player for GNOME"
@@ -19,141 +17,133 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Videos"
LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
-IUSE="+introspection lirc nautilus +python test zeitgeist"
+IUSE="cdr +introspection lirc nautilus +python test vala"
# see bug #359379
REQUIRED_USE="
python? ( introspection ${PYTHON_REQUIRED_USE} )
- zeitgeist? ( introspection )
"
if [[ ${PV} = 9999 ]]; then
- IUSE+=" doc vala"
- REQUIRED_USE+=" zeitgeist? ( vala )"
KEYWORDS=""
else
- KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
fi
# FIXME:
# Runtime dependency on gnome-session-2.91
-RDEPEND="
- >=dev-libs/glib-2.35:2[dbus]
+COMMON_DEPEND="
+ >=dev-libs/glib-2.43.4:2[dbus]
>=dev-libs/libpeas-1.1[gtk]
- >=dev-libs/libxml2-2.6:2
>=dev-libs/totem-pl-parser-3.10.1:0=[introspection?]
>=media-libs/clutter-1.17.3:1.0[gtk]
>=media-libs/clutter-gst-2.99.2:3.0
- >=media-libs/clutter-gtk-1.5.5:1.0
+ >=media-libs/clutter-gtk-1.8.1:1.0
>=x11-libs/cairo-1.14
>=x11-libs/gdk-pixbuf-2.23.0:2
>=x11-libs/gtk+-3.19.4:3[introspection?]
>=media-libs/grilo-0.3.0:0.3[playlist]
- media-plugins/grilo-plugins:0.3
>=media-libs/gstreamer-1.6.0:1.0
>=media-libs/gst-plugins-base-1.6.0:1.0[X,introspection?,pango]
media-libs/gst-plugins-good:1.0
- media-plugins/gst-plugins-meta:1.0
- media-plugins/gst-plugins-taglib:1.0
x11-libs/libX11
gnome-base/gnome-desktop:3=
gnome-base/gsettings-desktop-schemas
- x11-themes/gnome-icon-theme-symbolic
+ cdr? (
+ >=dev-libs/libxml2-2.6:2
+ >=x11-libs/gtk+-3.19.4:3[X]
+ )
introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
lirc? ( app-misc/lirc )
nautilus? ( >=gnome-base/nautilus-2.91.3 )
python? (
${PYTHON_DEPS}
- >=dev-libs/libpeas-1.1.0[${PYTHON_USEDEP}]
- >=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
+ >=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+ media-plugins/grilo-plugins:0.3
+ media-plugins/gst-plugins-meta:1.0
+ media-plugins/gst-plugins-taglib:1.0
+ x11-themes/adwaita-icon-theme
+ python? (
+ >=dev-libs/libpeas-1.1.0[python,${PYTHON_USEDEP}]
dev-python/pyxdg[${PYTHON_USEDEP}]
dev-python/dbus-python[${PYTHON_USEDEP}]
>=x11-libs/gtk+-3.5.2:3[introspection] )
- zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12 )
"
-DEPEND="${RDEPEND}
+# libxml2+gdk-pixbuf required for glib-compile-resources
+DEPEND="${COMMON_DEPEND}
app-text/docbook-xml-dtd:4.5
app-text/yelp-tools
- dev-libs/appstream-glib
- >=dev-util/gtk-doc-am-1.14
+ >=dev-libs/libxml2-2.6:2
+ >=dev-util/meson-0.44
>=dev-util/intltool-0.50.1
- sys-devel/gettext
+ >=sys-devel/gettext-0.19.8
virtual/pkgconfig
x11-base/xorg-proto
-
- dev-libs/gobject-introspection-common
- gnome-base/gnome-common
+ vala? ( $(vala_depend) )
"
-# eautoreconf needs:
-# app-text/yelp-tools
-# dev-libs/gobject-introspection-common
-# gnome-base/gnome-common
# docbook-xml-dtd is needed for user doc
# Prevent dev-python/pylint dep, bug #482538
-# Only needed when regenerating C sources from Vala files
-if [[ ${PV} = 9999 ]]; then
- DEPEND+=" vala? ( $(vala_depend) )
- app-text/yelp-tools
- doc? ( >=dev-util/gtk-doc-1.14 )"
-fi
+
+PATCHES=(
+ # Fix some typos in meson.build files
+ "${FILESDIR}"/3.26-meson-fixes.patch
+ # Do not force all plugins
+ "${FILESDIR}"/3.26-control-plugins.patch
+ # Do not force pylint with USE=python
+ "${FILESDIR}"/3.26-skip-pylint-check.patch
+ # Allow disabling calls to gst-inspect (sandbox issue)
+ "${FILESDIR}"/3.26-gst-inspect-sandbox.patch
+)
pkg_setup() {
use python && python-single-r1_pkg_setup
}
src_prepare() {
- # Prevent pylint usage by tests, bug #482538
- sed -i -e 's/ check-pylint//' src/plugins/Makefile.plugins || die
-
- if [[ ${PV} = 9999 ]]; then
- # Only needed when regenerating C sources from Vala files
- use vala && vala_src_prepare
- fi
- gnome2_src_prepare
-
- # FIXME: upstream should provide a way to set GST_INSPECT, bug #358755 & co.
- # gst-inspect causes sandbox violations when a plugin needs write access to
- # /dev/dri/card* in its init phase.
- sed -e "s|\(gst10_inspect=\).*|\1$(type -P true)|" \
- -i configure || die
+ vala_src_prepare
+ gnome-meson_src_prepare
}
src_configure() {
- # Disabled: sample-python, sample-vala
- local plugins="apple-trailers,autoload-subtitles,brasero-disc-recorder"
- plugins+=",im-status,gromit,media-player-keys,ontop"
- plugins+=",properties,recent,rotation,screensaver,screenshot"
- plugins+=",skipto,vimeo"
+ # Disabled: sample-python, sample-vala, zeitgeist-dp
+ # brasero-disc-recorder and gromit depend on GTK+ X11 backend and could be made optional
+ # if totem itself didn't depend on it
+ local plugins="apple-trailers,autoload-subtitles"
+ plugins+=",im-status,media-player-keys,ontop"
+ plugins+=",properties,recent,screensaver,screenshot"
+ plugins+=",skipto,variable-rate,vimeo"
+ use cdr && plugins+=",brasero-disc-recorder"
use lirc && plugins+=",lirc"
use nautilus && plugins+=",save-file"
use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
- if [[ ${PV} = 9999 ]]; then
- # Only needed when regenerating C sources from Vala files
- myconf="${myconf} $(use_enable vala)"
- use vala && plugins+=",rotation"
- else
- myconf="${myconf} --enable-vala VALAC=$(type -P true)"
- plugins+=",rotation"
- fi
- use zeitgeist && plugins+=",zeitgeist-dp"
+ use vala && plugins+=",rotation"
+ plugins+=",gromit"
# pylint is checked unconditionally, but is only used for make check
# appstream-util overriding necessary until upstream fixes their macro
# to respect configure switch
- gnome2_src_configure \
- --disable-run-in-source-tree \
- --disable-static \
- --enable-easy-codec-installation \
- --enable-vala \
- $(use_enable introspection) \
- $(use_enable nautilus) \
- $(use_enable python) \
- PYLINT=$(type -P true) \
- VALAC=$(type -P true) \
- APPSTREAM_UTIL=$(type -P true) \
- --with-plugins=${plugins} \
- ${myconf}
+ gnome-meson_src_configure \
+ -Denable-easy-codec-installation=yes \
+ -Denable-gtk-doc=false \
+ -Denable-introspection=$(usex introspection yes no) \
+ -Denable-nautilus=$(usex nautilus yes no) \
+ -Denable-python=$(usex python yes no) \
+ -Denable-vala=$(usex vala yes no) \
+ -Dgst-inspect=false \
+ -Dwith-plugins=${plugins}
+}
+
+src_install() {
+ gnome-meson_src_install
+ if use python ; then
+ local plugin
+ for plugin in dbusservice pythonconsole opensubtitles ; do
+ python_optimize "${ED}"usr/$(get_libdir)/totem/plugins/${plugin}
+ done
+ fi
}
^ permalink raw reply related [flat|nested] 40+ messages in thread* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2018-06-07 22:21 Gilles Dartiguelongue
0 siblings, 0 replies; 40+ messages in thread
From: Gilles Dartiguelongue @ 2018-06-07 22:21 UTC (permalink / raw
To: gentoo-commits
commit: ab9ba14bbf0e47f029dc6816e191b050dd2e2c14
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 7 22:18:13 2018 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu Jun 7 22:20:57 2018 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=ab9ba14b
media-video/totem: sync live ebuild
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Manifest-Sign-Key: 0x5A56C8CD0C13248A
media-video/totem/metadata.xml | 1 -
media-video/totem/totem-9999.ebuild | 164 +++++++++++++++++-------------------
2 files changed, 77 insertions(+), 88 deletions(-)
diff --git a/media-video/totem/metadata.xml b/media-video/totem/metadata.xml
index 317e469b..8a1eb150 100644
--- a/media-video/totem/metadata.xml
+++ b/media-video/totem/metadata.xml
@@ -21,6 +21,5 @@ Totem is movie player for the GNOME desktop. It features a playlist, fullscreen
using <pkg>app-misc/lirc</pkg></flag>
<flag name="nautilus">Enable the nautilus extension</flag>
<flag name="python">Build support for <pkg>dev-lang/python</pkg> plugins</flag>
- <flag name="zeitgeist">Build the plugin to inject events to <pkg>gnome-extra/zeitgeist</pkg></flag>
</use>
</pkgmetadata>
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index 787a0e19..bb6718a6 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -1,17 +1,15 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python2_7 )
+EAPI=6
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
PYTHON_REQ_USE="threads"
-inherit eutils gnome2 multilib python-single-r1
+inherit gnome-meson python-single-r1 vala
if [[ ${PV} = 9999 ]]; then
- VALA_MIN_API_VERSION="0.14"
- inherit gnome2-live vala
+ SRC_URI=""
+ EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/totem.git"
+ inherit git-r3
fi
DESCRIPTION="Media player for GNOME"
@@ -19,141 +17,133 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Videos"
LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
-IUSE="+introspection lirc nautilus +python test zeitgeist"
+IUSE="cdr +introspection lirc nautilus +python test vala"
# see bug #359379
REQUIRED_USE="
python? ( introspection ${PYTHON_REQUIRED_USE} )
- zeitgeist? ( introspection )
"
-if [[ ${PV} = 9999 ]]; then
- IUSE+=" doc vala"
- REQUIRED_USE+=" zeitgeist? ( vala )"
- KEYWORDS=""
-else
- KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-fi
+#if [[ ${PV} = 9999 ]]; then
+# KEYWORDS=""
+#else
+ KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+#fi
# FIXME:
# Runtime dependency on gnome-session-2.91
-RDEPEND="
- >=dev-libs/glib-2.35:2[dbus]
+COMMON_DEPEND="
+ >=dev-libs/glib-2.43.4:2[dbus]
>=dev-libs/libpeas-1.1[gtk]
- >=dev-libs/libxml2-2.6:2
>=dev-libs/totem-pl-parser-3.10.1:0=[introspection?]
>=media-libs/clutter-1.17.3:1.0[gtk]
>=media-libs/clutter-gst-2.99.2:3.0
- >=media-libs/clutter-gtk-1.5.5:1.0
+ >=media-libs/clutter-gtk-1.8.1:1.0
>=x11-libs/cairo-1.14
>=x11-libs/gdk-pixbuf-2.23.0:2
>=x11-libs/gtk+-3.19.4:3[introspection?]
>=media-libs/grilo-0.3.0:0.3[playlist]
- media-plugins/grilo-plugins:0.3
>=media-libs/gstreamer-1.6.0:1.0
>=media-libs/gst-plugins-base-1.6.0:1.0[X,introspection?,pango]
media-libs/gst-plugins-good:1.0
- media-plugins/gst-plugins-meta:1.0
- media-plugins/gst-plugins-taglib:1.0
x11-libs/libX11
gnome-base/gnome-desktop:3=
gnome-base/gsettings-desktop-schemas
- x11-themes/gnome-icon-theme-symbolic
+ cdr? (
+ >=dev-libs/libxml2-2.6:2
+ >=x11-libs/gtk+-3.19.4:3[X]
+ )
introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
lirc? ( app-misc/lirc )
nautilus? ( >=gnome-base/nautilus-2.91.3 )
python? (
${PYTHON_DEPS}
- >=dev-libs/libpeas-1.1.0[${PYTHON_USEDEP}]
- >=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
+ >=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+ media-plugins/grilo-plugins:0.3
+ media-plugins/gst-plugins-meta:1.0
+ media-plugins/gst-plugins-taglib:1.0
+ x11-themes/adwaita-icon-theme
+ python? (
+ >=dev-libs/libpeas-1.1.0[python,${PYTHON_USEDEP}]
dev-python/pyxdg[${PYTHON_USEDEP}]
dev-python/dbus-python[${PYTHON_USEDEP}]
>=x11-libs/gtk+-3.5.2:3[introspection] )
- zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12 )
"
-DEPEND="${RDEPEND}
+# libxml2+gdk-pixbuf required for glib-compile-resources
+DEPEND="${COMMON_DEPEND}
app-text/docbook-xml-dtd:4.5
app-text/yelp-tools
- dev-libs/appstream-glib
- >=dev-util/gtk-doc-am-1.14
+ >=dev-libs/libxml2-2.6:2
+ >=dev-util/meson-0.44
>=dev-util/intltool-0.50.1
- sys-devel/gettext
+ >=sys-devel/gettext-0.19.8
virtual/pkgconfig
x11-base/xorg-proto
-
- dev-libs/gobject-introspection-common
- gnome-base/gnome-common
+ vala? ( $(vala_depend) )
"
-# eautoreconf needs:
-# app-text/yelp-tools
-# dev-libs/gobject-introspection-common
-# gnome-base/gnome-common
# docbook-xml-dtd is needed for user doc
# Prevent dev-python/pylint dep, bug #482538
-# Only needed when regenerating C sources from Vala files
-if [[ ${PV} = 9999 ]]; then
- DEPEND+=" vala? ( $(vala_depend) )
- app-text/yelp-tools
- doc? ( >=dev-util/gtk-doc-1.14 )"
-fi
+
+PATCHES=(
+ # Fix some typos in meson.build files
+ "${FILESDIR}"/3.26-meson-fixes.patch
+ # Do not force all plugins
+ "${FILESDIR}"/3.26-control-plugins.patch
+ # Do not force pylint with USE=python
+ "${FILESDIR}"/3.26-skip-pylint-check.patch
+ # Allow disabling calls to gst-inspect (sandbox issue)
+ "${FILESDIR}"/3.26-gst-inspect-sandbox.patch
+)
pkg_setup() {
use python && python-single-r1_pkg_setup
}
src_prepare() {
- # Prevent pylint usage by tests, bug #482538
- sed -i -e 's/ check-pylint//' src/plugins/Makefile.plugins || die
-
- if [[ ${PV} = 9999 ]]; then
- # Only needed when regenerating C sources from Vala files
- use vala && vala_src_prepare
- fi
- gnome2_src_prepare
-
- # FIXME: upstream should provide a way to set GST_INSPECT, bug #358755 & co.
- # gst-inspect causes sandbox violations when a plugin needs write access to
- # /dev/dri/card* in its init phase.
- sed -e "s|\(gst10_inspect=\).*|\1$(type -P true)|" \
- -i configure || die
+ vala_src_prepare
+ gnome-meson_src_prepare
}
src_configure() {
- # Disabled: sample-python, sample-vala
- local plugins="apple-trailers,autoload-subtitles,brasero-disc-recorder"
- plugins+=",im-status,gromit,media-player-keys,ontop"
- plugins+=",properties,recent,rotation,screensaver,screenshot"
- plugins+=",skipto,vimeo"
+ # Disabled: sample-python, sample-vala, zeitgeist-dp
+ # brasero-disc-recorder and gromit depend on GTK+ X11 backend and could be made optional
+ # if totem itself didn't depend on it
+ local plugins="apple-trailers,autoload-subtitles"
+ plugins+=",im-status,media-player-keys,ontop"
+ plugins+=",properties,recent,screensaver,screenshot"
+ plugins+=",skipto,variable-rate,vimeo"
+ use cdr && plugins+=",brasero-disc-recorder"
use lirc && plugins+=",lirc"
use nautilus && plugins+=",save-file"
use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
- if [[ ${PV} = 9999 ]]; then
- # Only needed when regenerating C sources from Vala files
- myconf="${myconf} $(use_enable vala)"
- use vala && plugins+=",rotation"
- else
- myconf="${myconf} --enable-vala VALAC=$(type -P true)"
- plugins+=",rotation"
- fi
- use zeitgeist && plugins+=",zeitgeist-dp"
+ use vala && plugins+=",rotation"
+ plugins+=",gromit"
# pylint is checked unconditionally, but is only used for make check
# appstream-util overriding necessary until upstream fixes their macro
# to respect configure switch
- gnome2_src_configure \
- --disable-run-in-source-tree \
- --disable-static \
- --enable-easy-codec-installation \
- --enable-vala \
- $(use_enable introspection) \
- $(use_enable nautilus) \
- $(use_enable python) \
- PYLINT=$(type -P true) \
- VALAC=$(type -P true) \
- APPSTREAM_UTIL=$(type -P true) \
- --with-plugins=${plugins} \
- ${myconf}
+ gnome-meson_src_configure \
+ -Denable-easy-codec-installation=yes \
+ -Denable-gtk-doc=false \
+ -Denable-introspection=$(usex introspection yes no) \
+ -Denable-nautilus=$(usex nautilus yes no) \
+ -Denable-python=$(usex python yes no) \
+ -Denable-vala=$(usex vala yes no) \
+ -Dgst-inspect=false \
+ -Dwith-plugins=${plugins}
+}
+
+src_install() {
+ gnome-meson_src_install
+ if use python ; then
+ local plugin
+ for plugin in dbusservice pythonconsole opensubtitles ; do
+ python_optimize "${ED}"usr/$(get_libdir)/totem/plugins/${plugin}
+ done
+ fi
}
^ permalink raw reply related [flat|nested] 40+ messages in thread* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2018-01-12 14:23 Dennis Lamm
0 siblings, 0 replies; 40+ messages in thread
From: Dennis Lamm @ 2018-01-12 14:23 UTC (permalink / raw
To: gentoo-commits
commit: b34dcf8e0d22f0c89d3989806afec8b9502e2c5e
Author: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 12 14:23:48 2018 +0000
Commit: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
CommitDate: Fri Jan 12 14:23:48 2018 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=b34dcf8e
media-video/totem: drop old
Package-Manager: Portage-2.3.13, Repoman-2.3.3
media-video/totem/totem-3.20.0.ebuild | 132 ----------------------------------
1 file changed, 132 deletions(-)
diff --git a/media-video/totem/totem-3.20.0.ebuild b/media-video/totem/totem-3.20.0.ebuild
deleted file mode 100644
index 56208663..00000000
--- a/media-video/totem/totem-3.20.0.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit autotools eutils gnome2 multilib python-single-r1
-
-DESCRIPTION="Media player for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Videos"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+introspection lirc nautilus +python test zeitgeist"
-# see bug #359379
-REQUIRED_USE="
- python? ( introspection ${PYTHON_REQUIRED_USE} )
- zeitgeist? ( introspection )
-"
-
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-
-# FIXME:
-# Runtime dependency on gnome-session-2.91
-RDEPEND="
- >=dev-libs/glib-2.35:2[dbus]
- >=dev-libs/libpeas-1.1[gtk]
- >=dev-libs/libxml2-2.6:2
- >=dev-libs/totem-pl-parser-3.10.1:0=[introspection?]
- >=media-libs/clutter-1.17.3:1.0[gtk]
- >=media-libs/clutter-gst-2.99.2:3.0
- >=media-libs/clutter-gtk-1.5.5:1.0
- >=x11-libs/cairo-1.14
- >=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.19.4:3[introspection?]
-
- >=media-libs/grilo-0.3.0:0.3[playlist]
- media-plugins/grilo-plugins:0.3
- >=media-libs/gstreamer-1.6.0:1.0
- >=media-libs/gst-plugins-base-1.6.0:1.0[X,introspection?,pango]
- media-libs/gst-plugins-good:1.0
- media-plugins/gst-plugins-meta:1.0
- media-plugins/gst-plugins-taglib:1.0
-
- x11-libs/libX11
-
- gnome-base/gnome-desktop:3=
- gnome-base/gsettings-desktop-schemas
- x11-themes/gnome-icon-theme-symbolic
-
- introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
- lirc? ( app-misc/lirc )
- nautilus? ( >=gnome-base/nautilus-2.91.3 )
- python? (
- ${PYTHON_DEPS}
- >=dev-libs/libpeas-1.1.0[${PYTHON_USEDEP}]
- >=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
- dev-python/pyxdg[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
- >=x11-libs/gtk+-3.5.2:3[introspection] )
- zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12 )
-"
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.5
- app-text/yelp-tools
- dev-libs/appstream-glib
- >=dev-util/gtk-doc-am-1.14
- >=dev-util/intltool-0.50.1
- sys-devel/gettext
- virtual/pkgconfig
- x11-proto/xextproto
- x11-proto/xproto
-
- dev-libs/gobject-introspection-common
- gnome-base/gnome-common
-"
-# eautoreconf needs:
-# app-text/yelp-tools
-# dev-libs/gobject-introspection-common
-# gnome-base/gnome-common
-# docbook-xml-dtd is needed for user doc
-# Prevent dev-python/pylint dep, bug #482538
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Prevent pylint usage by tests, bug #482538
- sed -i -e 's/ check-pylint//' src/plugins/Makefile.plugins || die
-
- eautoreconf
- gnome2_src_prepare
-
- # FIXME: upstream should provide a way to set GST_INSPECT, bug #358755 & co.
- # gst-inspect causes sandbox violations when a plugin needs write access to
- # /dev/dri/card* in its init phase.
- sed -e "s|\(gst10_inspect=\).*|\1$(type -P true)|" \
- -i configure || die
-}
-
-src_configure() {
- # Disabled: sample-python, sample-vala
- local plugins="apple-trailers,autoload-subtitles,brasero-disc-recorder"
- plugins+=",im-status,gromit,media-player-keys,ontop"
- plugins+=",properties,recent,rotation,screensaver,screenshot"
- plugins+=",skipto,vimeo"
- use lirc && plugins+=",lirc"
- use nautilus && plugins+=",save-file"
- use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
- use zeitgeist && plugins+=",zeitgeist-dp"
-
- # pylint is checked unconditionally, but is only used for make check
- # appstream-util overriding necessary until upstream fixes their macro
- # to respect configure switch
- gnome2_src_configure \
- --disable-run-in-source-tree \
- --disable-static \
- --enable-easy-codec-installation \
- --enable-vala \
- $(use_enable introspection) \
- $(use_enable nautilus) \
- $(use_enable python) \
- PYLINT=$(type -P true) \
- VALAC=$(type -P true) \
- APPSTREAM_UTIL=$(type -P true) \
- --with-plugins=${plugins}
-}
^ permalink raw reply related [flat|nested] 40+ messages in thread* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2016-03-27 21:24 Ole Reifschneider
0 siblings, 0 replies; 40+ messages in thread
From: Ole Reifschneider @ 2016-03-27 21:24 UTC (permalink / raw
To: gentoo-commits
commit: 49be2fee2e5b86b39030eef664498f17fc6b1f18
Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 27 21:05:32 2016 +0000
Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 21:05:58 2016 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=49be2fee
media-video/totem: Bump version to 3.20.0
Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="amd64"
Manifest-Sign-Key: 0xE9E568677E8B4D42
.../{totem-9999.ebuild => totem-3.20.0.ebuild} | 64 ++++++----------------
media-video/totem/totem-9999.ebuild | 28 +++++-----
2 files changed, 30 insertions(+), 62 deletions(-)
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-3.20.0.ebuild
similarity index 68%
copy from media-video/totem/totem-9999.ebuild
copy to media-video/totem/totem-3.20.0.ebuild
index e5dde0f..5620866 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-3.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -8,11 +8,7 @@ GNOME2_LA_PUNT="yes" # plugins are dlopened
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="threads"
-inherit eutils gnome2 multilib python-single-r1
-if [[ ${PV} = 9999 ]]; then
- VALA_MIN_API_VERSION="0.14"
- inherit gnome2-live vala
-fi
+inherit autotools eutils gnome2 multilib python-single-r1
DESCRIPTION="Media player for GNOME"
HOMEPAGE="https://wiki.gnome.org/Apps/Videos"
@@ -26,18 +22,12 @@ REQUIRED_USE="
zeitgeist? ( introspection )
"
-if [[ ${PV} = 9999 ]]; then
- IUSE+=" doc vala"
- REQUIRED_USE+=" zeitgeist? ( vala )"
- KEYWORDS=""
-else
- KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-fi
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
# FIXME:
# Runtime dependency on gnome-session-2.91
RDEPEND="
- >=dev-libs/glib-2.35:2
+ >=dev-libs/glib-2.35:2[dbus]
>=dev-libs/libpeas-1.1[gtk]
>=dev-libs/libxml2-2.6:2
>=dev-libs/totem-pl-parser-3.10.1:0=[introspection?]
@@ -46,23 +36,23 @@ RDEPEND="
>=media-libs/clutter-gtk-1.5.5:1.0
>=x11-libs/cairo-1.14
>=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.16:3[introspection?]
+ >=x11-libs/gtk+-3.19.4:3[introspection?]
- >=media-libs/grilo-0.2.12:0.2[playlist]
- media-plugins/grilo-plugins:0.2
- >=media-libs/gstreamer-1.3.1:1.0
- >=media-libs/gst-plugins-base-1.4.2:1.0[X,introspection?,pango]
+ >=media-libs/grilo-0.3.0:0.3[playlist]
+ media-plugins/grilo-plugins:0.3
+ >=media-libs/gstreamer-1.6.0:1.0
+ >=media-libs/gst-plugins-base-1.6.0:1.0[X,introspection?,pango]
media-libs/gst-plugins-good:1.0
media-plugins/gst-plugins-meta:1.0
media-plugins/gst-plugins-taglib:1.0
x11-libs/libX11
- gnome-base/gnome-desktop:3
+ gnome-base/gnome-desktop:3=
gnome-base/gsettings-desktop-schemas
x11-themes/gnome-icon-theme-symbolic
- introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
+ introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
lirc? ( app-misc/lirc )
nautilus? ( >=gnome-base/nautilus-2.91.3 )
python? (
@@ -76,7 +66,6 @@ RDEPEND="
"
DEPEND="${RDEPEND}
app-text/docbook-xml-dtd:4.5
- app-text/scrollkeeper
app-text/yelp-tools
dev-libs/appstream-glib
>=dev-util/gtk-doc-am-1.14
@@ -89,30 +78,22 @@ DEPEND="${RDEPEND}
dev-libs/gobject-introspection-common
gnome-base/gnome-common
"
+# eautoreconf needs:
+# app-text/yelp-tools
+# dev-libs/gobject-introspection-common
+# gnome-base/gnome-common
# docbook-xml-dtd is needed for user doc
# Prevent dev-python/pylint dep, bug #482538
-# Only needed when regenerating C sources from Vala files
-if [[ ${PV} = 9999 ]]; then
- DEPEND+=" vala? ( $(vala_depend) )
- app-text/yelp-tools
- doc? ( >=dev-util/gtk-doc-1.14 )"
-fi
pkg_setup() {
use python && python-single-r1_pkg_setup
}
src_prepare() {
- # AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails
- mkdir -p m4
-
# Prevent pylint usage by tests, bug #482538
sed -i -e 's/ check-pylint//' src/plugins/Makefile.plugins || die
- if [[ ${PV} = 9999 ]]; then
- # Only needed when regenerating C sources from Vala files
- use vala && vala_src_prepare
- fi
+ eautoreconf
gnome2_src_prepare
# FIXME: upstream should provide a way to set GST_INSPECT, bug #358755 & co.
@@ -131,18 +112,8 @@ src_configure() {
use lirc && plugins+=",lirc"
use nautilus && plugins+=",save-file"
use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
- if [[ ${PV} = 9999 ]]; then
- # Only needed when regenerating C sources from Vala files
- myconf="${myconf} $(use_enable vala)"
- use vala && plugins+=",rotation"
- else
- myconf="${myconf} --enable-vala VALAC=$(type -P true)"
- plugins+=",rotation"
- fi
use zeitgeist && plugins+=",zeitgeist-dp"
- # XXX: always set to true otherwise tests fails due to pylint not
- # respecting EPYTHON (wait for python-r1)
# pylint is checked unconditionally, but is only used for make check
# appstream-util overriding necessary until upstream fixes their macro
# to respect configure switch
@@ -157,6 +128,5 @@ src_configure() {
PYLINT=$(type -P true) \
VALAC=$(type -P true) \
APPSTREAM_UTIL=$(type -P true) \
- --with-plugins=${plugins} \
- ${myconf}
+ --with-plugins=${plugins}
}
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index e5dde0f..a6682d8 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -37,7 +37,7 @@ fi
# FIXME:
# Runtime dependency on gnome-session-2.91
RDEPEND="
- >=dev-libs/glib-2.35:2
+ >=dev-libs/glib-2.35:2[dbus]
>=dev-libs/libpeas-1.1[gtk]
>=dev-libs/libxml2-2.6:2
>=dev-libs/totem-pl-parser-3.10.1:0=[introspection?]
@@ -46,23 +46,23 @@ RDEPEND="
>=media-libs/clutter-gtk-1.5.5:1.0
>=x11-libs/cairo-1.14
>=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.16:3[introspection?]
+ >=x11-libs/gtk+-3.19.4:3[introspection?]
- >=media-libs/grilo-0.2.12:0.2[playlist]
- media-plugins/grilo-plugins:0.2
- >=media-libs/gstreamer-1.3.1:1.0
- >=media-libs/gst-plugins-base-1.4.2:1.0[X,introspection?,pango]
+ >=media-libs/grilo-0.3.0:0.3[playlist]
+ media-plugins/grilo-plugins:0.3
+ >=media-libs/gstreamer-1.6.0:1.0
+ >=media-libs/gst-plugins-base-1.6.0:1.0[X,introspection?,pango]
media-libs/gst-plugins-good:1.0
media-plugins/gst-plugins-meta:1.0
media-plugins/gst-plugins-taglib:1.0
x11-libs/libX11
- gnome-base/gnome-desktop:3
+ gnome-base/gnome-desktop:3=
gnome-base/gsettings-desktop-schemas
x11-themes/gnome-icon-theme-symbolic
- introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
+ introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
lirc? ( app-misc/lirc )
nautilus? ( >=gnome-base/nautilus-2.91.3 )
python? (
@@ -76,7 +76,6 @@ RDEPEND="
"
DEPEND="${RDEPEND}
app-text/docbook-xml-dtd:4.5
- app-text/scrollkeeper
app-text/yelp-tools
dev-libs/appstream-glib
>=dev-util/gtk-doc-am-1.14
@@ -89,6 +88,10 @@ DEPEND="${RDEPEND}
dev-libs/gobject-introspection-common
gnome-base/gnome-common
"
+# eautoreconf needs:
+# app-text/yelp-tools
+# dev-libs/gobject-introspection-common
+# gnome-base/gnome-common
# docbook-xml-dtd is needed for user doc
# Prevent dev-python/pylint dep, bug #482538
# Only needed when regenerating C sources from Vala files
@@ -103,9 +106,6 @@ pkg_setup() {
}
src_prepare() {
- # AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails
- mkdir -p m4
-
# Prevent pylint usage by tests, bug #482538
sed -i -e 's/ check-pylint//' src/plugins/Makefile.plugins || die
@@ -141,8 +141,6 @@ src_configure() {
fi
use zeitgeist && plugins+=",zeitgeist-dp"
- # XXX: always set to true otherwise tests fails due to pylint not
- # respecting EPYTHON (wait for python-r1)
# pylint is checked unconditionally, but is only used for make check
# appstream-util overriding necessary until upstream fixes their macro
# to respect configure switch
^ permalink raw reply related [flat|nested] 40+ messages in thread* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2015-06-10 10:37 Gilles Dartiguelongue
0 siblings, 0 replies; 40+ messages in thread
From: Gilles Dartiguelongue @ 2015-06-10 10:37 UTC (permalink / raw
To: gentoo-commits
commit: 5399d8b49dec03184c9ffdaabb8e1d5af12581dd
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 9 22:43:30 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Jun 9 22:43:30 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=5399d8b4
media-video/totem: moved to gentoo-x86
media-video/totem/totem-3.16.1.ebuild | 133 ----------------------------------
1 file changed, 133 deletions(-)
diff --git a/media-video/totem/totem-3.16.1.ebuild b/media-video/totem/totem-3.16.1.ebuild
deleted file mode 100644
index 1f181a5..0000000
--- a/media-video/totem/totem-3.16.1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit autotools eutils gnome2 multilib python-single-r1
-
-DESCRIPTION="Media player for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Videos"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+introspection lirc nautilus +python test zeitgeist"
-# see bug #359379
-REQUIRED_USE="
- python? ( introspection ${PYTHON_REQUIRED_USE} )
- zeitgeist? ( introspection )
-"
-
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-
-# FIXME:
-# Runtime dependency on gnome-session-2.91
-RDEPEND="
- >=dev-libs/glib-2.35:2
- >=dev-libs/libpeas-1.1[gtk]
- >=dev-libs/libxml2-2.6:2
- >=dev-libs/totem-pl-parser-3.10.1:0=[introspection?]
- >=media-libs/clutter-1.17.3:1.0[gtk]
- >=media-libs/clutter-gst-2.99.2:3.0
- >=media-libs/clutter-gtk-1.5.5:1.0
- >=x11-libs/cairo-1.14
- >=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.16:3[introspection?]
-
- >=media-libs/grilo-0.2.12:0.2[playlist]
- media-plugins/grilo-plugins:0.2
- >=media-libs/gstreamer-1.3.1:1.0
- >=media-libs/gst-plugins-base-1.4.2:1.0[X,introspection?,pango]
- media-libs/gst-plugins-good:1.0
- media-plugins/gst-plugins-meta:1.0
- media-plugins/gst-plugins-taglib:1.0
-
- x11-libs/libX11
-
- gnome-base/gnome-desktop:3
- gnome-base/gsettings-desktop-schemas
- x11-themes/gnome-icon-theme-symbolic
-
- introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
- lirc? ( app-misc/lirc )
- nautilus? ( >=gnome-base/nautilus-2.91.3 )
- python? (
- ${PYTHON_DEPS}
- >=dev-libs/libpeas-1.1.0[${PYTHON_USEDEP}]
- >=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
- dev-python/pyxdg[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
- >=x11-libs/gtk+-3.5.2:3[introspection] )
- zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12 )
-"
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.5
- app-text/scrollkeeper
- app-text/yelp-tools
- dev-libs/appstream-glib
- >=dev-util/gtk-doc-am-1.14
- >=dev-util/intltool-0.50.1
- sys-devel/gettext
- virtual/pkgconfig
- x11-proto/xextproto
- x11-proto/xproto
-
- dev-libs/gobject-introspection-common
- gnome-base/gnome-common
-"
-# eautoreconf needs:
-# app-text/yelp-tools
-# dev-libs/gobject-introspection-common
-# gnome-base/gnome-common
-# docbook-xml-dtd is needed for user doc
-# Prevent dev-python/pylint dep, bug #482538
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Prevent pylint usage by tests, bug #482538
- sed -i -e 's/ check-pylint//' src/plugins/Makefile.plugins || die
-
- eautoreconf
- gnome2_src_prepare
-
- # FIXME: upstream should provide a way to set GST_INSPECT, bug #358755 & co.
- # gst-inspect causes sandbox violations when a plugin needs write access to
- # /dev/dri/card* in its init phase.
- sed -e "s|\(gst10_inspect=\).*|\1$(type -P true)|" \
- -i configure || die
-}
-
-src_configure() {
- # Disabled: sample-python, sample-vala
- local plugins="apple-trailers,autoload-subtitles,brasero-disc-recorder"
- plugins+=",im-status,gromit,media-player-keys,ontop"
- plugins+=",properties,recent,rotation,screensaver,screenshot"
- plugins+=",skipto,vimeo"
- use lirc && plugins+=",lirc"
- use nautilus && plugins+=",save-file"
- use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
- use zeitgeist && plugins+=",zeitgeist-dp"
-
- # pylint is checked unconditionally, but is only used for make check
- # appstream-util overriding necessary until upstream fixes their macro
- # to respect configure switch
- gnome2_src_configure \
- --disable-run-in-source-tree \
- --disable-static \
- --enable-easy-codec-installation \
- --enable-vala \
- $(use_enable introspection) \
- $(use_enable nautilus) \
- $(use_enable python) \
- PYLINT=$(type -P true) \
- VALAC=$(type -P true) \
- APPSTREAM_UTIL=$(type -P true) \
- --with-plugins=${plugins}
-}
^ permalink raw reply related [flat|nested] 40+ messages in thread* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2015-05-14 22:50 Gilles Dartiguelongue
0 siblings, 0 replies; 40+ messages in thread
From: Gilles Dartiguelongue @ 2015-05-14 22:50 UTC (permalink / raw
To: gentoo-commits
commit: e8874b6d5a372d356b0cbd32b1ecb8018a73e129
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu May 14 21:48:55 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu May 14 21:48:55 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=e8874b6d
media-video/totem: fix repoman warnings
media-video/totem/metadata.xml | 4 ----
media-video/totem/totem-9999.ebuild | 2 +-
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/media-video/totem/metadata.xml b/media-video/totem/metadata.xml
index fa17f24..ef889ba 100644
--- a/media-video/totem/metadata.xml
+++ b/media-video/totem/metadata.xml
@@ -8,10 +8,6 @@
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.
</longdescription>
<use>
- <flag name="flash">Install browser plugin for playing embedded Adobe Flash
- videos. Warning: breaks non-video Flash objects on many websites.</flag>
- <flag name="grilo">Use <pkg>media-libs/grilo</pkg> to browse media content
- from various sources</flag>
<flag name="lirc">Enable support for controlling Totem with a remote control
using <pkg>app-misc/lirc</pkg></flag>
<flag name="nautilus">Enable the nautilus extension</flag>
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index 20351bd..1ea340e 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -8,7 +8,7 @@ GNOME2_LA_PUNT="yes" # plugins are dlopened
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="threads"
-inherit autotools eutils gnome2 multilib python-single-r1
+inherit eutils gnome2 multilib python-single-r1
if [[ ${PV} = 9999 ]]; then
VALA_MIN_API_VERSION="0.14"
inherit gnome2-live vala
^ permalink raw reply related [flat|nested] 40+ messages in thread* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2014-12-26 21:53 Gilles Dartiguelongue
0 siblings, 0 replies; 40+ messages in thread
From: Gilles Dartiguelongue @ 2014-12-26 21:53 UTC (permalink / raw
To: gentoo-commits
commit: bf1d1d06a54a7fc9f18639eeb6ec4ce0a373b370
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 26 21:52:59 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Fri Dec 26 21:52:59 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=bf1d1d06
media-video/totem: moved to gentoo-x86
---
media-video/totem/totem-3.14.1.ebuild | 141 ----------------------------------
1 file changed, 141 deletions(-)
diff --git a/media-video/totem/totem-3.14.1.ebuild b/media-video/totem/totem-3.14.1.ebuild
deleted file mode 100644
index 9e19952..0000000
--- a/media-video/totem/totem-3.14.1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit autotools eutils gnome2 multilib python-single-r1
-
-DESCRIPTION="Media player for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Videos"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+introspection lirc nautilus +python test zeitgeist"
-# see bug #359379
-REQUIRED_USE="
- python? ( introspection ${PYTHON_REQUIRED_USE} )
- zeitgeist? ( introspection )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-# TODO:
-# Cone (VLC) plugin needs someone with the right setup to test it
-#
-# FIXME:
-# Automagic tracker-0.9.0
-# Runtime dependency on gnome-session-2.91
-RDEPEND="
- >=dev-libs/glib-2.35:2
- >=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.11.5:3[introspection?]
- >=dev-libs/totem-pl-parser-3.10.1:0=[introspection?]
- >=dev-libs/libpeas-1.1.0[gtk]
- x11-libs/cairo
- >=dev-libs/libxml2-2.6:2
- >=media-libs/clutter-1.17.3:1.0[gtk]
- >=media-libs/clutter-gst-1.5.5:2.0
- >=media-libs/clutter-gtk-1.5.5:1.0
- x11-libs/mx:1.0
-
- >=media-libs/grilo-0.2.10:0.2[playlist]
- media-plugins/grilo-plugins:0.2
- >=media-libs/gstreamer-1.3.1:1.0
- >=media-libs/gst-plugins-base-1.4.2:1.0[X,introspection?,pango]
- media-libs/gst-plugins-good:1.0
- media-plugins/gst-plugins-taglib:1.0
- media-plugins/gst-plugins-meta:1.0
-
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- >=x11-libs/libXxf86vm-1.0.1
-
- gnome-base/gnome-desktop:3
- gnome-base/gsettings-desktop-schemas
- x11-themes/gnome-icon-theme-symbolic
-
- introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
- lirc? ( app-misc/lirc )
- nautilus? ( >=gnome-base/nautilus-2.91.3 )
- python? (
- ${PYTHON_DEPS}
- >=dev-libs/libpeas-1.1.0[${PYTHON_USEDEP}]
- >=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
- dev-python/pyxdg[${PYTHON_USEDEP}]
- dev-python/dbus-python[${PYTHON_USEDEP}]
- >=x11-libs/gtk+-3.5.2:3[introspection] )
- zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12 )
-"
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.5
- app-text/scrollkeeper
- app-text/yelp-tools
- dev-libs/appstream-glib
- >=dev-util/gtk-doc-am-1.14
- >=dev-util/intltool-0.40
- sys-devel/gettext
- x11-proto/xextproto
- x11-proto/xproto
- virtual/pkgconfig
-
- dev-libs/gobject-introspection-common
- gnome-base/gnome-common
-"
-# eautoreconf needs:
-# app-text/yelp-tools
-# dev-libs/gobject-introspection-common
-# gnome-base/gnome-common
-# docbook-xml-dtd is needed for user doc
-# Prevent dev-python/pylint dep, bug #482538
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Prevent pylint usage by tests, bug #482538
- sed -i -e 's/ check-pylint//' src/plugins/Makefile.plugins || die
-
- eautoreconf
- gnome2_src_prepare
-
- # FIXME: upstream should provide a way to set GST_INSPECT, bug #358755 & co.
- # gst-inspect causes sandbox violations when a plugin needs write access to
- # /dev/dri/card* in its init phase.
- sed -e "s|\(gst10_inspect=\).*|\1$(type -P true)|" \
- -i configure || die
-}
-
-src_configure() {
- # Disabled: sample-python, sample-vala
- local plugins="apple-trailers,autoload-subtitles,brasero-disc-recorder"
- plugins+=",chapters,im-status,gromit,media-player-keys,ontop"
- plugins+=",properties,recent,rotation,screensaver,screenshot"
- plugins+=",skipto,vimeo"
- use lirc && plugins+=",lirc"
- use nautilus && plugins+=",save-file"
- use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
- use zeitgeist && plugins+=",zeitgeist-dp"
-
- #--with-smclient=auto needed to correctly link to libICE and libSM
- # XXX: always set to true otherwise tests fails due to pylint not
- # respecting EPYTHON (wait for python-r1)
- # pylint is checked unconditionally, but is only used for make check
- gnome2_src_configure \
- --disable-run-in-source-tree \
- --disable-static \
- --enable-easy-codec-installation \
- --enable-vala \
- $(use_enable introspection) \
- $(use_enable nautilus) \
- $(use_enable python) \
- PYLINT=$(type -P true) \
- VALAC=$(type -P true) \
- --with-plugins=${plugins}
-}
^ permalink raw reply related [flat|nested] 40+ messages in thread* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2014-12-01 14:02 Michał Górny
0 siblings, 0 replies; 40+ messages in thread
From: Michał Górny @ 2014-12-01 14:02 UTC (permalink / raw
To: gentoo-commits
commit: 72c679b4c26a9591ee20a803ee3fdd0aff7c745f
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 1 14:02:43 2014 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Dec 1 14:02:43 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=72c679b4
media-video/totem: add missing PYTHON_USEDEPs on libpeas
Package-Manager: portage-2.2.14
RepoMan-Options: --force
Manifest-Sign-Key: EFB4464E!
---
media-video/totem/totem-3.14.1.ebuild | 1 +
media-video/totem/totem-9999.ebuild | 1 +
2 files changed, 2 insertions(+)
diff --git a/media-video/totem/totem-3.14.1.ebuild b/media-video/totem/totem-3.14.1.ebuild
index ffc63e0..9e19952 100644
--- a/media-video/totem/totem-3.14.1.ebuild
+++ b/media-video/totem/totem-3.14.1.ebuild
@@ -65,6 +65,7 @@ RDEPEND="
nautilus? ( >=gnome-base/nautilus-2.91.3 )
python? (
${PYTHON_DEPS}
+ >=dev-libs/libpeas-1.1.0[${PYTHON_USEDEP}]
>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
dev-python/pyxdg[${PYTHON_USEDEP}]
dev-python/dbus-python[${PYTHON_USEDEP}]
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index 9583857..698bc70 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -75,6 +75,7 @@ RDEPEND="
nautilus? ( >=gnome-base/nautilus-2.91.3 )
python? (
${PYTHON_DEPS}
+ >=dev-libs/libpeas-1.1.0[${PYTHON_USEDEP}]
>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
dev-python/pyxdg[${PYTHON_USEDEP}]
dev-python/dbus-python[${PYTHON_USEDEP}]
^ permalink raw reply related [flat|nested] 40+ messages in thread* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2014-11-23 19:37 Gilles Dartiguelongue
0 siblings, 0 replies; 40+ messages in thread
From: Gilles Dartiguelongue @ 2014-11-23 19:37 UTC (permalink / raw
To: gentoo-commits
commit: 4df9632282b45319c9a99a41b6463c614c019322
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 23 19:01:46 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Nov 23 19:01:46 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4df96322
media-video/totem: 3.14.0 → 3.14.1
---
media-video/totem/{totem-3.14.0.ebuild => totem-3.14.1.ebuild} | 2 +-
media-video/totem/totem-9999.ebuild | 10 +++-------
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/media-video/totem/totem-3.14.0.ebuild b/media-video/totem/totem-3.14.1.ebuild
similarity index 99%
rename from media-video/totem/totem-3.14.0.ebuild
rename to media-video/totem/totem-3.14.1.ebuild
index 82eb920..ffc63e0 100644
--- a/media-video/totem/totem-3.14.0.ebuild
+++ b/media-video/totem/totem-3.14.1.ebuild
@@ -75,7 +75,7 @@ DEPEND="${RDEPEND}
app-text/docbook-xml-dtd:4.5
app-text/scrollkeeper
app-text/yelp-tools
- dev-util/appdata-tools
+ dev-libs/appstream-glib
>=dev-util/gtk-doc-am-1.14
>=dev-util/intltool-0.40
sys-devel/gettext
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index cb569d3..9583857 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -22,7 +22,6 @@ SLOT="0"
IUSE="+introspection lirc nautilus +python test zeitgeist"
# see bug #359379
REQUIRED_USE="
- flash? ( nsplugin )
python? ( introspection ${PYTHON_REQUIRED_USE} )
zeitgeist? ( introspection )
"
@@ -47,7 +46,6 @@ RDEPEND="
>=x11-libs/gtk+-3.11.5:3[introspection?]
>=dev-libs/totem-pl-parser-3.10.1:0=[introspection?]
>=dev-libs/libpeas-1.1.0[gtk]
- >=x11-themes/gnome-icon-theme-2.16
x11-libs/cairo
>=dev-libs/libxml2-2.6:2
>=media-libs/clutter-1.17.3:1.0[gtk]
@@ -87,7 +85,7 @@ DEPEND="${RDEPEND}
app-text/docbook-xml-dtd:4.5
app-text/scrollkeeper
app-text/yelp-tools
- dev-util/appdata-tools
+ dev-libs/appstream-glib
>=dev-util/gtk-doc-am-1.14
>=dev-util/intltool-0.40
sys-devel/gettext
@@ -95,7 +93,8 @@ DEPEND="${RDEPEND}
x11-proto/xproto
virtual/pkgconfig
- test? ( python? ( dev-python/pylint ) )
+ dev-libs/gobject-introspection-common
+ gnome-base/gnome-common
"
# docbook-xml-dtd is needed for user doc
# Prevent dev-python/pylint dep, bug #482538
@@ -131,9 +130,6 @@ src_prepare() {
}
src_configure() {
- local myconf=""
- use nsplugin && DOCS="${DOCS} browser-plugin/README.browser-plugin"
-
# Disabled: sample-python, sample-vala
local plugins="apple-trailers,autoload-subtitles,brasero-disc-recorder"
plugins+=",chapters,im-status,gromit,media-player-keys,ontop"
^ permalink raw reply related [flat|nested] 40+ messages in thread* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2014-04-20 18:17 Gilles Dartiguelongue
0 siblings, 0 replies; 40+ messages in thread
From: Gilles Dartiguelongue @ 2014-04-20 18:17 UTC (permalink / raw
To: gentoo-commits
commit: 0670e86033365cf41f689fbd1f24e6cbe83f79e5
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 6 21:01:52 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Apr 20 18:16:32 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=0670e860
media-video/totem: 3.10.1 → 3.12.0
---
.../{totem-9999.ebuild => totem-3.12.0.ebuild} | 69 +++++-----------------
media-video/totem/totem-9999.ebuild | 27 ++++-----
2 files changed, 27 insertions(+), 69 deletions(-)
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-3.12.0.ebuild
similarity index 69%
copy from media-video/totem/totem-9999.ebuild
copy to media-video/totem/totem-3.12.0.ebuild
index ab6bf90..2151d50 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-3.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -9,17 +9,13 @@ PYTHON_COMPAT=( python2_{6,7} )
PYTHON_REQ_USE="threads"
inherit autotools eutils gnome2 multilib python-single-r1
-if [[ ${PV} = 9999 ]]; then
- VALA_MIN_API_VERSION="0.14"
- inherit gnome2-live vala
-fi
DESCRIPTION="Media player for GNOME"
-HOMEPAGE="http://projects.gnome.org/totem/"
+HOMEPAGE="https://wiki.gnome.org/Apps/Videos"
LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
-IUSE="flash grilo +introspection lirc nautilus nsplugin +python test zeitgeist"
+IUSE="flash +introspection lirc nautilus nsplugin +python test zeitgeist"
# see bug #359379
REQUIRED_USE="
flash? ( nsplugin )
@@ -27,13 +23,7 @@ REQUIRED_USE="
zeitgeist? ( introspection )
"
-if [[ ${PV} = 9999 ]]; then
- IUSE+=" doc vala"
- REQUIRED_USE+=" zeitgeist? ( vala )"
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
# TODO:
# Cone (VLC) plugin needs someone with the right setup to test it
@@ -42,22 +32,23 @@ fi
# Automagic tracker-0.9.0
# Runtime dependency on gnome-session-2.91
RDEPEND="
- >=dev-libs/glib-2.33:2
+ >=dev-libs/glib-2.35:2
>=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.7.10:3[introspection?]
- >=dev-libs/totem-pl-parser-3.9.92:0=[introspection?]
+ >=x11-libs/gtk+-3.11.5:3[introspection?]
+ >=dev-libs/totem-pl-parser-3.10.1:0=[introspection?]
>=dev-libs/libpeas-1.1.0[gtk]
>=x11-themes/gnome-icon-theme-2.16
x11-libs/cairo
>=dev-libs/libxml2-2.6:2
- >=media-libs/clutter-1.10:1.0
+ >=media-libs/clutter-1.17.3:1.0
>=media-libs/clutter-gst-1.5.5:2.0
>=media-libs/clutter-gtk-1.0.2:1.0
x11-libs/mx:1.0
+ >=media-libs/grilo-0.2.10:0.2[playlist]
+ media-plugins/grilo-plugins:0.2
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0[X,introspection?,pango]
- >=media-libs/gst-plugins-bad-1.0.2:1.0
media-libs/gst-plugins-good:1.0
media-plugins/gst-plugins-taglib:1.0
media-plugins/gst-plugins-meta:1.0
@@ -71,15 +62,10 @@ RDEPEND="
x11-themes/gnome-icon-theme-symbolic
flash? ( dev-libs/totem-pl-parser[quvi] )
- grilo? (
- media-libs/grilo:0.2
- media-plugins/grilo-plugins:0.2 )
introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
lirc? ( app-misc/lirc )
nautilus? ( >=gnome-base/nautilus-2.91.3 )
- nsplugin? (
- >=dev-libs/dbus-glib-0.82
- >=x11-misc/shared-mime-info-0.22 )
+ nsplugin? ( >=x11-misc/shared-mime-info-0.22 )
python? (
${PYTHON_DEPS}
>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
@@ -91,38 +77,26 @@ RDEPEND="
DEPEND="${RDEPEND}
app-text/docbook-xml-dtd:4.5
app-text/scrollkeeper
+ app-text/yelp-tools
+ dev-util/appdata-tools
>=dev-util/gtk-doc-am-1.14
>=dev-util/intltool-0.40
sys-devel/gettext
x11-proto/xextproto
x11-proto/xproto
virtual/pkgconfig
- test? ( python? ( dev-python/pylint ) )
"
# docbook-xml-dtd is needed for user doc
# Prevent dev-python/pylint dep, bug #482538
-# Only needed when regenerating C sources from Vala files
-if [[ ${PV} = 9999 ]]; then
- DEPEND+=" vala? ( $(vala_depend) )
- app-text/yelp-tools
- doc? ( >=dev-util/gtk-doc-1.14 )"
-fi
-
pkg_setup() {
use python && python-single-r1_pkg_setup
}
src_prepare() {
- # AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails
- mkdir -p m4
-
# Prevent pylint usage by tests, bug #482538
sed -i -e 's/ check-pylint//' src/plugins/Makefile.plugins || die
- if [[ ${PV} = 9999 ]]; then
- # Only needed when regenerating C sources from Vala files
- use vala && vala_src_prepare
- fi
+ eautoreconf
gnome2_src_prepare
# FIXME: upstream should provide a way to set GST_INSPECT, bug #358755 & co.
@@ -133,26 +107,16 @@ src_prepare() {
}
src_configure() {
- local myconf=""
use nsplugin && DOCS="${DOCS} browser-plugin/README.browser-plugin"
# Disabled: sample-python, sample-vala
local plugins="apple-trailers,autoload-subtitles,brasero-disc-recorder"
plugins+=",chapters,im-status,gromit,media-player-keys,ontop"
plugins+=",properties,recent,rotation,screensaver,screenshot"
- plugins+=",sidebar-test,skipto,vimeo"
- use grilo && plugins+=",grilo"
+ plugins+=",skipto,vimeo"
use lirc && plugins+=",lirc"
use nautilus && plugins+=",save-file"
use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
- if [[ ${PV} = 9999 ]]; then
- # Only needed when regenerating C sources from Vala files
- myconf="${myconf} $(use_enable vala)"
- use vala && plugins+=",rotation"
- else
- myconf="${myconf} --enable-vala VALAC=$(type -P true)"
- plugins+=",rotation"
- fi
use zeitgeist && plugins+=",zeitgeist-dp"
#--with-smclient=auto needed to correctly link to libICE and libSM
@@ -173,6 +137,5 @@ src_configure() {
PYLINT=$(type -P true) \
VALAC=$(type -P true) \
BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins \
- --with-plugins=${plugins} \
- ${myconf}
+ --with-plugins=${plugins}
}
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index ab6bf90..2ef9f04 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -15,11 +15,11 @@ if [[ ${PV} = 9999 ]]; then
fi
DESCRIPTION="Media player for GNOME"
-HOMEPAGE="http://projects.gnome.org/totem/"
+HOMEPAGE="https://wiki.gnome.org/Apps/Videos"
LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
-IUSE="flash grilo +introspection lirc nautilus nsplugin +python test zeitgeist"
+IUSE="flash +introspection lirc nautilus nsplugin +python test zeitgeist"
# see bug #359379
REQUIRED_USE="
flash? ( nsplugin )
@@ -42,22 +42,23 @@ fi
# Automagic tracker-0.9.0
# Runtime dependency on gnome-session-2.91
RDEPEND="
- >=dev-libs/glib-2.33:2
+ >=dev-libs/glib-2.35:2
>=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.7.10:3[introspection?]
- >=dev-libs/totem-pl-parser-3.9.92:0=[introspection?]
+ >=x11-libs/gtk+-3.11.5:3[introspection?]
+ >=dev-libs/totem-pl-parser-3.10.1:0=[introspection?]
>=dev-libs/libpeas-1.1.0[gtk]
>=x11-themes/gnome-icon-theme-2.16
x11-libs/cairo
>=dev-libs/libxml2-2.6:2
- >=media-libs/clutter-1.10:1.0
+ >=media-libs/clutter-1.17.3:1.0
>=media-libs/clutter-gst-1.5.5:2.0
>=media-libs/clutter-gtk-1.0.2:1.0
x11-libs/mx:1.0
+ >=media-libs/grilo-0.2.9:0.2[playlist]
+ media-plugins/grilo-plugins:0.2
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0[X,introspection?,pango]
- >=media-libs/gst-plugins-bad-1.0.2:1.0
media-libs/gst-plugins-good:1.0
media-plugins/gst-plugins-taglib:1.0
media-plugins/gst-plugins-meta:1.0
@@ -71,15 +72,10 @@ RDEPEND="
x11-themes/gnome-icon-theme-symbolic
flash? ( dev-libs/totem-pl-parser[quvi] )
- grilo? (
- media-libs/grilo:0.2
- media-plugins/grilo-plugins:0.2 )
introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
lirc? ( app-misc/lirc )
nautilus? ( >=gnome-base/nautilus-2.91.3 )
- nsplugin? (
- >=dev-libs/dbus-glib-0.82
- >=x11-misc/shared-mime-info-0.22 )
+ nsplugin? ( >=x11-misc/shared-mime-info-0.22 )
python? (
${PYTHON_DEPS}
>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
@@ -140,8 +136,7 @@ src_configure() {
local plugins="apple-trailers,autoload-subtitles,brasero-disc-recorder"
plugins+=",chapters,im-status,gromit,media-player-keys,ontop"
plugins+=",properties,recent,rotation,screensaver,screenshot"
- plugins+=",sidebar-test,skipto,vimeo"
- use grilo && plugins+=",grilo"
+ plugins+=",skipto,vimeo"
use lirc && plugins+=",lirc"
use nautilus && plugins+=",save-file"
use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
^ permalink raw reply related [flat|nested] 40+ messages in thread* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2013-12-12 23:20 Gilles Dartiguelongue
0 siblings, 0 replies; 40+ messages in thread
From: Gilles Dartiguelongue @ 2013-12-12 23:20 UTC (permalink / raw
To: gentoo-commits
commit: 558706e75487eae06a08e06496691829683cddf8
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 12 22:49:01 2013 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu Dec 12 23:20:46 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=558706e7
media-video/totem: 3.10.0 → 3.10.1
---
media-video/totem/{totem-3.10.0.ebuild => totem-3.10.1.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/media-video/totem/totem-3.10.0.ebuild b/media-video/totem/totem-3.10.1.ebuild
similarity index 100%
rename from media-video/totem/totem-3.10.0.ebuild
rename to media-video/totem/totem-3.10.1.ebuild
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2013-11-28 23:50 Gilles Dartiguelongue
0 siblings, 0 replies; 40+ messages in thread
From: Gilles Dartiguelongue @ 2013-11-28 23:50 UTC (permalink / raw
To: gentoo-commits
commit: 3a0d53dd4d40d78e08343d08bbb95191d45ca166
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 22:21:28 2013 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu Nov 28 23:06:09 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3a0d53dd
media-video/totem: 3.8.2-r1 → 3.10
---
.../{totem-9999.ebuild => totem-3.10.0.ebuild} | 131 ++++++++-------------
media-video/totem/totem-9999.ebuild | 107 +++++++++--------
2 files changed, 107 insertions(+), 131 deletions(-)
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-3.10.0.ebuild
similarity index 54%
copy from media-video/totem/totem-9999.ebuild
copy to media-video/totem/totem-3.10.0.ebuild
index edea640..45eea64 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-3.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -8,11 +8,7 @@ GNOME2_LA_PUNT="yes" # plugins are dlopened
PYTHON_COMPAT=( python2_{6,7} )
PYTHON_REQ_USE="threads"
-inherit gnome2 multilib python-single-r1
-if [[ ${PV} = 9999 ]]; then
- VALA_MIN_API_VERSION="0.14"
- inherit gnome2-live vala
-fi
+inherit autotools eutils gnome2 multilib python-single-r1
DESCRIPTION="Media player for GNOME"
HOMEPAGE="http://projects.gnome.org/totem/"
@@ -21,17 +17,13 @@ LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
IUSE="flash grilo +introspection lirc nautilus nsplugin +python test zeitgeist"
# see bug #359379
-REQUIRED_USE="flash? ( nsplugin )
- python? ( introspection )
- zeitgeist? ( introspection )"
-
-if [[ ${PV} = 9999 ]]; then
- IUSE+=" doc vala"
- REQUIRED_USE+=" zeitgeist? ( vala )"
- KEYWORDS=""
-else
- KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-fi
+REQUIRED_USE="
+ flash? ( nsplugin )
+ python? ( introspection ${PYTHON_REQUIRED_USE} )
+ zeitgeist? ( introspection )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
# TODO:
# Cone (VLC) plugin needs someone with the right setup to test it
@@ -42,13 +34,13 @@ fi
RDEPEND="
>=dev-libs/glib-2.33:2
>=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.5.2:3[introspection?]
- >=dev-libs/totem-pl-parser-2.32.4[introspection?]
+ >=x11-libs/gtk+-3.7.10:3[introspection?]
+ >=dev-libs/totem-pl-parser-3.9.92:0=[introspection?]
>=dev-libs/libpeas-1.1.0[gtk]
>=x11-themes/gnome-icon-theme-2.16
x11-libs/cairo
>=dev-libs/libxml2-2.6:2
- >=media-libs/clutter-1.6.8:1.0
+ >=media-libs/clutter-1.10:1.0
>=media-libs/clutter-gst-1.5.5:2.0
>=media-libs/clutter-gtk-1.0.2:1.0
x11-libs/mx:1.0
@@ -69,7 +61,9 @@ RDEPEND="
x11-themes/gnome-icon-theme-symbolic
flash? ( dev-libs/totem-pl-parser[quvi] )
- grilo? ( media-libs/grilo:0.2 )
+ grilo? (
+ media-libs/grilo:0.2
+ media-plugins/grilo-plugins:0.2 )
introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
lirc? ( app-misc/lirc )
nautilus? ( >=gnome-base/nautilus-2.91.3 )
@@ -81,12 +75,11 @@ RDEPEND="
>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
dev-python/pyxdg[${PYTHON_USEDEP}]
dev-python/dbus-python[${PYTHON_USEDEP}]
- >=x11-libs/gtk+-2.91.7:3[introspection] )
- zeitgeist? ( dev-libs/libzeitgeist )
+ >=x11-libs/gtk+-3.5.2:3[introspection] )
+ zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12 )
"
DEPEND="${RDEPEND}
app-text/docbook-xml-dtd:4.5
- >=app-text/gnome-doc-utils-0.20.3
app-text/scrollkeeper
>=dev-util/gtk-doc-am-1.14
>=dev-util/intltool-0.40
@@ -94,80 +87,58 @@ DEPEND="${RDEPEND}
x11-proto/xextproto
x11-proto/xproto
virtual/pkgconfig
- test? ( python? ( dev-python/pylint ) )
"
# docbook-xml-dtd is needed for user doc
-# Only needed when regenerating C sources from Vala files
-if [[ ${PV} = 9999 ]]; then
- DEPEND+=" vala? ( $(vala_depend) )
- doc? ( >=dev-util/gtk-doc-1.14 )"
-fi
+# Prevent dev-python/pylint dep, bug #482538
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
src_prepare() {
- # AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails
- mkdir -p m4
+ # Prevent pylint usage by tests, bug #482538
+ sed -i -e 's/ check-pylint//' src/plugins/Makefile.plugins || die
- if [[ ${PV} = 9999 ]]; then
- # Only needed when regenerating C sources from Vala files
- use vala && vala_src_prepare
- fi
+ eautoreconf
gnome2_src_prepare
+
+ # FIXME: upstream should provide a way to set GST_INSPECT, bug #358755 & co.
+ # gst-inspect causes sandbox violations when a plugin needs write access to
+ # /dev/dri/card* in its init phase.
+ sed -e "s|\(gst10_inspect=\).*|\1$(type -P true)|" \
+ -i configure || die
}
src_configure() {
- DOCS="AUTHORS ChangeLog NEWS README TODO"
use nsplugin && DOCS="${DOCS} browser-plugin/README.browser-plugin"
- #--with-smclient=auto needed to correctly link to libICE and libSM
- G2CONF="${G2CONF}
- --disable-run-in-source-tree
- --disable-static
- --with-smclient=auto
- --enable-easy-codec-installation
- $(use_enable flash vegas-plugin)
- $(use_enable introspection)
- $(use_enable nautilus)
- $(use_enable nsplugin browser-plugins)
- $(use_enable python)
- BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
-
- # XXX: always set to true otherwise tests fails due to pylint not
- # respecting EPYTHON (wait for python-r1)
- # pylint is checked unconditionally, but is only used for make check
- G2CONF="${G2CONF} PYLINT=$(type -P true)"
-
# Disabled: sample-python, sample-vala
local plugins="apple-trailers,autoload-subtitles,brasero-disc-recorder"
plugins+=",chapters,im-status,gromit,media-player-keys,ontop"
- plugins+=",properties,recent,screensaver,screenshot,sidebar-test"
- plugins+=",skipto"
+ plugins+=",properties,recent,rotation,screensaver,screenshot"
+ plugins+=",sidebar-test,skipto,vimeo"
use grilo && plugins+=",grilo"
use lirc && plugins+=",lirc"
use nautilus && plugins+=",save-file"
use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
- if [[ ${PV} = 9999 ]]; then
- # Only needed when regenerating C sources from Vala files
- G2CONF="${G2CONF} $(use_enable vala)"
- use vala && plugins+=",rotation"
- else
- G2CONF="${G2CONF} --enable-vala VALAC=$(type -P true)"
- plugins+=",rotation"
- fi
use zeitgeist && plugins+=",zeitgeist-dp"
- G2CONF="${G2CONF} --with-plugins=${plugins}"
-
- # Work around sandbox violations when FEATURES=-userpriv caused by
- # gst-inspect-1.0(bug #358755)
- unset DISPLAY
- gnome2_src_configure
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- ewarn
- ewarn "If totem doesn't play some video format, please check your"
- ewarn "USE flags on media-plugins/gst-plugins-meta"
- ewarn
+ #--with-smclient=auto needed to correctly link to libICE and libSM
+ # XXX: always set to true otherwise tests fails due to pylint not
+ # respecting EPYTHON (wait for python-r1)
+ # pylint is checked unconditionally, but is only used for make check
+ gnome2_src_configure \
+ --disable-run-in-source-tree \
+ --disable-static \
+ --with-smclient=auto \
+ --enable-easy-codec-installation \
+ --enable-vala \
+ $(use_enable flash vegas-plugin) \
+ $(use_enable introspection) \
+ $(use_enable nautilus) \
+ $(use_enable nsplugin browser-plugins) \
+ $(use_enable python) \
+ PYLINT=$(type -P true) \
+ VALAC=$(type -P true) \
+ BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins \
+ --with-plugins=${plugins}
}
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index edea640..ab6bf90 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -8,7 +8,7 @@ GNOME2_LA_PUNT="yes" # plugins are dlopened
PYTHON_COMPAT=( python2_{6,7} )
PYTHON_REQ_USE="threads"
-inherit gnome2 multilib python-single-r1
+inherit autotools eutils gnome2 multilib python-single-r1
if [[ ${PV} = 9999 ]]; then
VALA_MIN_API_VERSION="0.14"
inherit gnome2-live vala
@@ -21,16 +21,18 @@ LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
IUSE="flash grilo +introspection lirc nautilus nsplugin +python test zeitgeist"
# see bug #359379
-REQUIRED_USE="flash? ( nsplugin )
- python? ( introspection )
- zeitgeist? ( introspection )"
+REQUIRED_USE="
+ flash? ( nsplugin )
+ python? ( introspection ${PYTHON_REQUIRED_USE} )
+ zeitgeist? ( introspection )
+"
if [[ ${PV} = 9999 ]]; then
IUSE+=" doc vala"
REQUIRED_USE+=" zeitgeist? ( vala )"
KEYWORDS=""
else
- KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
fi
# TODO:
@@ -42,13 +44,13 @@ fi
RDEPEND="
>=dev-libs/glib-2.33:2
>=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.5.2:3[introspection?]
- >=dev-libs/totem-pl-parser-2.32.4[introspection?]
+ >=x11-libs/gtk+-3.7.10:3[introspection?]
+ >=dev-libs/totem-pl-parser-3.9.92:0=[introspection?]
>=dev-libs/libpeas-1.1.0[gtk]
>=x11-themes/gnome-icon-theme-2.16
x11-libs/cairo
>=dev-libs/libxml2-2.6:2
- >=media-libs/clutter-1.6.8:1.0
+ >=media-libs/clutter-1.10:1.0
>=media-libs/clutter-gst-1.5.5:2.0
>=media-libs/clutter-gtk-1.0.2:1.0
x11-libs/mx:1.0
@@ -69,7 +71,9 @@ RDEPEND="
x11-themes/gnome-icon-theme-symbolic
flash? ( dev-libs/totem-pl-parser[quvi] )
- grilo? ( media-libs/grilo:0.2 )
+ grilo? (
+ media-libs/grilo:0.2
+ media-plugins/grilo-plugins:0.2 )
introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
lirc? ( app-misc/lirc )
nautilus? ( >=gnome-base/nautilus-2.91.3 )
@@ -81,12 +85,11 @@ RDEPEND="
>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
dev-python/pyxdg[${PYTHON_USEDEP}]
dev-python/dbus-python[${PYTHON_USEDEP}]
- >=x11-libs/gtk+-2.91.7:3[introspection] )
- zeitgeist? ( dev-libs/libzeitgeist )
+ >=x11-libs/gtk+-3.5.2:3[introspection] )
+ zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12 )
"
DEPEND="${RDEPEND}
app-text/docbook-xml-dtd:4.5
- >=app-text/gnome-doc-utils-0.20.3
app-text/scrollkeeper
>=dev-util/gtk-doc-am-1.14
>=dev-util/intltool-0.40
@@ -97,77 +100,79 @@ DEPEND="${RDEPEND}
test? ( python? ( dev-python/pylint ) )
"
# docbook-xml-dtd is needed for user doc
+# Prevent dev-python/pylint dep, bug #482538
# Only needed when regenerating C sources from Vala files
if [[ ${PV} = 9999 ]]; then
DEPEND+=" vala? ( $(vala_depend) )
+ app-text/yelp-tools
doc? ( >=dev-util/gtk-doc-1.14 )"
fi
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
src_prepare() {
# AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails
mkdir -p m4
+ # Prevent pylint usage by tests, bug #482538
+ sed -i -e 's/ check-pylint//' src/plugins/Makefile.plugins || die
+
if [[ ${PV} = 9999 ]]; then
# Only needed when regenerating C sources from Vala files
use vala && vala_src_prepare
fi
gnome2_src_prepare
+
+ # FIXME: upstream should provide a way to set GST_INSPECT, bug #358755 & co.
+ # gst-inspect causes sandbox violations when a plugin needs write access to
+ # /dev/dri/card* in its init phase.
+ sed -e "s|\(gst10_inspect=\).*|\1$(type -P true)|" \
+ -i configure || die
}
src_configure() {
- DOCS="AUTHORS ChangeLog NEWS README TODO"
+ local myconf=""
use nsplugin && DOCS="${DOCS} browser-plugin/README.browser-plugin"
- #--with-smclient=auto needed to correctly link to libICE and libSM
- G2CONF="${G2CONF}
- --disable-run-in-source-tree
- --disable-static
- --with-smclient=auto
- --enable-easy-codec-installation
- $(use_enable flash vegas-plugin)
- $(use_enable introspection)
- $(use_enable nautilus)
- $(use_enable nsplugin browser-plugins)
- $(use_enable python)
- BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
-
- # XXX: always set to true otherwise tests fails due to pylint not
- # respecting EPYTHON (wait for python-r1)
- # pylint is checked unconditionally, but is only used for make check
- G2CONF="${G2CONF} PYLINT=$(type -P true)"
-
# Disabled: sample-python, sample-vala
local plugins="apple-trailers,autoload-subtitles,brasero-disc-recorder"
plugins+=",chapters,im-status,gromit,media-player-keys,ontop"
- plugins+=",properties,recent,screensaver,screenshot,sidebar-test"
- plugins+=",skipto"
+ plugins+=",properties,recent,rotation,screensaver,screenshot"
+ plugins+=",sidebar-test,skipto,vimeo"
use grilo && plugins+=",grilo"
use lirc && plugins+=",lirc"
use nautilus && plugins+=",save-file"
use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
if [[ ${PV} = 9999 ]]; then
# Only needed when regenerating C sources from Vala files
- G2CONF="${G2CONF} $(use_enable vala)"
+ myconf="${myconf} $(use_enable vala)"
use vala && plugins+=",rotation"
else
- G2CONF="${G2CONF} --enable-vala VALAC=$(type -P true)"
+ myconf="${myconf} --enable-vala VALAC=$(type -P true)"
plugins+=",rotation"
fi
use zeitgeist && plugins+=",zeitgeist-dp"
- G2CONF="${G2CONF} --with-plugins=${plugins}"
-
- # Work around sandbox violations when FEATURES=-userpriv caused by
- # gst-inspect-1.0(bug #358755)
- unset DISPLAY
- gnome2_src_configure
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- ewarn
- ewarn "If totem doesn't play some video format, please check your"
- ewarn "USE flags on media-plugins/gst-plugins-meta"
- ewarn
+ #--with-smclient=auto needed to correctly link to libICE and libSM
+ # XXX: always set to true otherwise tests fails due to pylint not
+ # respecting EPYTHON (wait for python-r1)
+ # pylint is checked unconditionally, but is only used for make check
+ gnome2_src_configure \
+ --disable-run-in-source-tree \
+ --disable-static \
+ --with-smclient=auto \
+ --enable-easy-codec-installation \
+ --enable-vala \
+ $(use_enable flash vegas-plugin) \
+ $(use_enable introspection) \
+ $(use_enable nautilus) \
+ $(use_enable nsplugin browser-plugins) \
+ $(use_enable python) \
+ PYLINT=$(type -P true) \
+ VALAC=$(type -P true) \
+ BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins \
+ --with-plugins=${plugins} \
+ ${myconf}
}
^ permalink raw reply related [flat|nested] 40+ messages in thread* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2013-11-14 22:52 Gilles Dartiguelongue
0 siblings, 0 replies; 40+ messages in thread
From: Gilles Dartiguelongue @ 2013-11-14 22:52 UTC (permalink / raw
To: gentoo-commits
commit: 92e8d28f845dc7d0f5d61cb3a53ef75fee4cc19f
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 22:21:28 2013 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Fri Nov 15 00:39:12 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=92e8d28f
media-video/totem: 3.8.2-r1 → 3.10
---
.../{totem-9999.ebuild => totem-3.10.0.ebuild} | 131 ++++++++-------------
media-video/totem/totem-9999.ebuild | 107 +++++++++--------
2 files changed, 107 insertions(+), 131 deletions(-)
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-3.10.0.ebuild
similarity index 54%
copy from media-video/totem/totem-9999.ebuild
copy to media-video/totem/totem-3.10.0.ebuild
index edea640..7d79b35 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-3.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -8,11 +8,7 @@ GNOME2_LA_PUNT="yes" # plugins are dlopened
PYTHON_COMPAT=( python2_{6,7} )
PYTHON_REQ_USE="threads"
-inherit gnome2 multilib python-single-r1
-if [[ ${PV} = 9999 ]]; then
- VALA_MIN_API_VERSION="0.14"
- inherit gnome2-live vala
-fi
+inherit autotools eutils gnome2 multilib python-single-r1
DESCRIPTION="Media player for GNOME"
HOMEPAGE="http://projects.gnome.org/totem/"
@@ -21,17 +17,13 @@ LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
IUSE="flash grilo +introspection lirc nautilus nsplugin +python test zeitgeist"
# see bug #359379
-REQUIRED_USE="flash? ( nsplugin )
- python? ( introspection )
- zeitgeist? ( introspection )"
-
-if [[ ${PV} = 9999 ]]; then
- IUSE+=" doc vala"
- REQUIRED_USE+=" zeitgeist? ( vala )"
- KEYWORDS=""
-else
- KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-fi
+REQUIRED_USE="
+ flash? ( nsplugin )
+ python? ( introspection ${PYTHON_REQUIRED_USE} )
+ zeitgeist? ( introspection )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
# TODO:
# Cone (VLC) plugin needs someone with the right setup to test it
@@ -42,13 +34,13 @@ fi
RDEPEND="
>=dev-libs/glib-2.33:2
>=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.5.2:3[introspection?]
- >=dev-libs/totem-pl-parser-2.32.4[introspection?]
+ >=x11-libs/gtk+-3.7.10:3[introspection?]
+ >=dev-libs/totem-pl-parser-3.9.92[introspection?]
>=dev-libs/libpeas-1.1.0[gtk]
>=x11-themes/gnome-icon-theme-2.16
x11-libs/cairo
>=dev-libs/libxml2-2.6:2
- >=media-libs/clutter-1.6.8:1.0
+ >=media-libs/clutter-1.10:1.0
>=media-libs/clutter-gst-1.5.5:2.0
>=media-libs/clutter-gtk-1.0.2:1.0
x11-libs/mx:1.0
@@ -69,7 +61,9 @@ RDEPEND="
x11-themes/gnome-icon-theme-symbolic
flash? ( dev-libs/totem-pl-parser[quvi] )
- grilo? ( media-libs/grilo:0.2 )
+ grilo? (
+ media-libs/grilo:0.2
+ media-plugins/grilo-plugins:0.2 )
introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
lirc? ( app-misc/lirc )
nautilus? ( >=gnome-base/nautilus-2.91.3 )
@@ -81,12 +75,11 @@ RDEPEND="
>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
dev-python/pyxdg[${PYTHON_USEDEP}]
dev-python/dbus-python[${PYTHON_USEDEP}]
- >=x11-libs/gtk+-2.91.7:3[introspection] )
- zeitgeist? ( dev-libs/libzeitgeist )
+ >=x11-libs/gtk+-3.5.2:3[introspection] )
+ zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12 )
"
DEPEND="${RDEPEND}
app-text/docbook-xml-dtd:4.5
- >=app-text/gnome-doc-utils-0.20.3
app-text/scrollkeeper
>=dev-util/gtk-doc-am-1.14
>=dev-util/intltool-0.40
@@ -94,80 +87,58 @@ DEPEND="${RDEPEND}
x11-proto/xextproto
x11-proto/xproto
virtual/pkgconfig
- test? ( python? ( dev-python/pylint ) )
"
# docbook-xml-dtd is needed for user doc
-# Only needed when regenerating C sources from Vala files
-if [[ ${PV} = 9999 ]]; then
- DEPEND+=" vala? ( $(vala_depend) )
- doc? ( >=dev-util/gtk-doc-1.14 )"
-fi
+# Prevent dev-python/pylint dep, bug #482538
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
src_prepare() {
- # AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails
- mkdir -p m4
+ # Prevent pylint usage by tests, bug #482538
+ sed -i -e 's/ check-pylint//' src/plugins/Makefile.plugins || die
- if [[ ${PV} = 9999 ]]; then
- # Only needed when regenerating C sources from Vala files
- use vala && vala_src_prepare
- fi
+ eautoreconf
gnome2_src_prepare
+
+ # FIXME: upstream should provide a way to set GST_INSPECT, bug #358755 & co.
+ # gst-inspect causes sandbox violations when a plugin needs write access to
+ # /dev/dri/card* in its init phase.
+ sed -e "s|\(gst10_inspect=\).*|\1$(type -P true)|" \
+ -i configure || die
}
src_configure() {
- DOCS="AUTHORS ChangeLog NEWS README TODO"
use nsplugin && DOCS="${DOCS} browser-plugin/README.browser-plugin"
- #--with-smclient=auto needed to correctly link to libICE and libSM
- G2CONF="${G2CONF}
- --disable-run-in-source-tree
- --disable-static
- --with-smclient=auto
- --enable-easy-codec-installation
- $(use_enable flash vegas-plugin)
- $(use_enable introspection)
- $(use_enable nautilus)
- $(use_enable nsplugin browser-plugins)
- $(use_enable python)
- BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
-
- # XXX: always set to true otherwise tests fails due to pylint not
- # respecting EPYTHON (wait for python-r1)
- # pylint is checked unconditionally, but is only used for make check
- G2CONF="${G2CONF} PYLINT=$(type -P true)"
-
# Disabled: sample-python, sample-vala
local plugins="apple-trailers,autoload-subtitles,brasero-disc-recorder"
plugins+=",chapters,im-status,gromit,media-player-keys,ontop"
- plugins+=",properties,recent,screensaver,screenshot,sidebar-test"
- plugins+=",skipto"
+ plugins+=",properties,recent,rotation,screensaver,screenshot"
+ plugins+=",sidebar-test,skipto,vimeo"
use grilo && plugins+=",grilo"
use lirc && plugins+=",lirc"
use nautilus && plugins+=",save-file"
use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
- if [[ ${PV} = 9999 ]]; then
- # Only needed when regenerating C sources from Vala files
- G2CONF="${G2CONF} $(use_enable vala)"
- use vala && plugins+=",rotation"
- else
- G2CONF="${G2CONF} --enable-vala VALAC=$(type -P true)"
- plugins+=",rotation"
- fi
use zeitgeist && plugins+=",zeitgeist-dp"
- G2CONF="${G2CONF} --with-plugins=${plugins}"
-
- # Work around sandbox violations when FEATURES=-userpriv caused by
- # gst-inspect-1.0(bug #358755)
- unset DISPLAY
- gnome2_src_configure
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- ewarn
- ewarn "If totem doesn't play some video format, please check your"
- ewarn "USE flags on media-plugins/gst-plugins-meta"
- ewarn
+ #--with-smclient=auto needed to correctly link to libICE and libSM
+ # XXX: always set to true otherwise tests fails due to pylint not
+ # respecting EPYTHON (wait for python-r1)
+ # pylint is checked unconditionally, but is only used for make check
+ gnome2_src_configure \
+ --disable-run-in-source-tree \
+ --disable-static \
+ --with-smclient=auto \
+ --enable-easy-codec-installation \
+ --enable-vala \
+ $(use_enable flash vegas-plugin) \
+ $(use_enable introspection) \
+ $(use_enable nautilus) \
+ $(use_enable nsplugin browser-plugins) \
+ $(use_enable python) \
+ PYLINT=$(type -P true) \
+ VALAC=$(type -P true) \
+ BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins \
+ --with-plugins=${plugins}
}
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index edea640..46d373f 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -8,7 +8,7 @@ GNOME2_LA_PUNT="yes" # plugins are dlopened
PYTHON_COMPAT=( python2_{6,7} )
PYTHON_REQ_USE="threads"
-inherit gnome2 multilib python-single-r1
+inherit autotools eutils gnome2 multilib python-single-r1
if [[ ${PV} = 9999 ]]; then
VALA_MIN_API_VERSION="0.14"
inherit gnome2-live vala
@@ -21,16 +21,18 @@ LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
IUSE="flash grilo +introspection lirc nautilus nsplugin +python test zeitgeist"
# see bug #359379
-REQUIRED_USE="flash? ( nsplugin )
- python? ( introspection )
- zeitgeist? ( introspection )"
+REQUIRED_USE="
+ flash? ( nsplugin )
+ python? ( introspection ${PYTHON_REQUIRED_USE} )
+ zeitgeist? ( introspection )
+"
if [[ ${PV} = 9999 ]]; then
IUSE+=" doc vala"
REQUIRED_USE+=" zeitgeist? ( vala )"
KEYWORDS=""
else
- KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
fi
# TODO:
@@ -42,13 +44,13 @@ fi
RDEPEND="
>=dev-libs/glib-2.33:2
>=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.5.2:3[introspection?]
- >=dev-libs/totem-pl-parser-2.32.4[introspection?]
+ >=x11-libs/gtk+-3.7.10:3[introspection?]
+ >=dev-libs/totem-pl-parser-3.9.92[introspection?]
>=dev-libs/libpeas-1.1.0[gtk]
>=x11-themes/gnome-icon-theme-2.16
x11-libs/cairo
>=dev-libs/libxml2-2.6:2
- >=media-libs/clutter-1.6.8:1.0
+ >=media-libs/clutter-1.10:1.0
>=media-libs/clutter-gst-1.5.5:2.0
>=media-libs/clutter-gtk-1.0.2:1.0
x11-libs/mx:1.0
@@ -69,7 +71,9 @@ RDEPEND="
x11-themes/gnome-icon-theme-symbolic
flash? ( dev-libs/totem-pl-parser[quvi] )
- grilo? ( media-libs/grilo:0.2 )
+ grilo? (
+ media-libs/grilo:0.2
+ media-plugins/grilo-plugins:0.2 )
introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
lirc? ( app-misc/lirc )
nautilus? ( >=gnome-base/nautilus-2.91.3 )
@@ -81,12 +85,11 @@ RDEPEND="
>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
dev-python/pyxdg[${PYTHON_USEDEP}]
dev-python/dbus-python[${PYTHON_USEDEP}]
- >=x11-libs/gtk+-2.91.7:3[introspection] )
- zeitgeist? ( dev-libs/libzeitgeist )
+ >=x11-libs/gtk+-3.5.2:3[introspection] )
+ zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12 )
"
DEPEND="${RDEPEND}
app-text/docbook-xml-dtd:4.5
- >=app-text/gnome-doc-utils-0.20.3
app-text/scrollkeeper
>=dev-util/gtk-doc-am-1.14
>=dev-util/intltool-0.40
@@ -97,77 +100,79 @@ DEPEND="${RDEPEND}
test? ( python? ( dev-python/pylint ) )
"
# docbook-xml-dtd is needed for user doc
+# Prevent dev-python/pylint dep, bug #482538
# Only needed when regenerating C sources from Vala files
if [[ ${PV} = 9999 ]]; then
DEPEND+=" vala? ( $(vala_depend) )
+ app-text/yelp-tools
doc? ( >=dev-util/gtk-doc-1.14 )"
fi
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
src_prepare() {
# AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails
mkdir -p m4
+ # Prevent pylint usage by tests, bug #482538
+ sed -i -e 's/ check-pylint//' src/plugins/Makefile.plugins || die
+
if [[ ${PV} = 9999 ]]; then
# Only needed when regenerating C sources from Vala files
use vala && vala_src_prepare
fi
gnome2_src_prepare
+
+ # FIXME: upstream should provide a way to set GST_INSPECT, bug #358755 & co.
+ # gst-inspect causes sandbox violations when a plugin needs write access to
+ # /dev/dri/card* in its init phase.
+ sed -e "s|\(gst10_inspect=\).*|\1$(type -P true)|" \
+ -i configure || die
}
src_configure() {
- DOCS="AUTHORS ChangeLog NEWS README TODO"
+ local myconf=""
use nsplugin && DOCS="${DOCS} browser-plugin/README.browser-plugin"
- #--with-smclient=auto needed to correctly link to libICE and libSM
- G2CONF="${G2CONF}
- --disable-run-in-source-tree
- --disable-static
- --with-smclient=auto
- --enable-easy-codec-installation
- $(use_enable flash vegas-plugin)
- $(use_enable introspection)
- $(use_enable nautilus)
- $(use_enable nsplugin browser-plugins)
- $(use_enable python)
- BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
-
- # XXX: always set to true otherwise tests fails due to pylint not
- # respecting EPYTHON (wait for python-r1)
- # pylint is checked unconditionally, but is only used for make check
- G2CONF="${G2CONF} PYLINT=$(type -P true)"
-
# Disabled: sample-python, sample-vala
local plugins="apple-trailers,autoload-subtitles,brasero-disc-recorder"
plugins+=",chapters,im-status,gromit,media-player-keys,ontop"
- plugins+=",properties,recent,screensaver,screenshot,sidebar-test"
- plugins+=",skipto"
+ plugins+=",properties,recent,rotation,screensaver,screenshot"
+ plugins+=",sidebar-test,skipto,vimeo"
use grilo && plugins+=",grilo"
use lirc && plugins+=",lirc"
use nautilus && plugins+=",save-file"
use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
if [[ ${PV} = 9999 ]]; then
# Only needed when regenerating C sources from Vala files
- G2CONF="${G2CONF} $(use_enable vala)"
+ myconf="${myconf} $(use_enable vala)"
use vala && plugins+=",rotation"
else
- G2CONF="${G2CONF} --enable-vala VALAC=$(type -P true)"
+ myconf="${myconf} --enable-vala VALAC=$(type -P true)"
plugins+=",rotation"
fi
use zeitgeist && plugins+=",zeitgeist-dp"
- G2CONF="${G2CONF} --with-plugins=${plugins}"
-
- # Work around sandbox violations when FEATURES=-userpriv caused by
- # gst-inspect-1.0(bug #358755)
- unset DISPLAY
- gnome2_src_configure
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- ewarn
- ewarn "If totem doesn't play some video format, please check your"
- ewarn "USE flags on media-plugins/gst-plugins-meta"
- ewarn
+ #--with-smclient=auto needed to correctly link to libICE and libSM
+ # XXX: always set to true otherwise tests fails due to pylint not
+ # respecting EPYTHON (wait for python-r1)
+ # pylint is checked unconditionally, but is only used for make check
+ gnome2_src_configure \
+ --disable-run-in-source-tree \
+ --disable-static \
+ --with-smclient=auto \
+ --enable-easy-codec-installation \
+ --enable-vala \
+ $(use_enable flash vegas-plugin) \
+ $(use_enable introspection) \
+ $(use_enable nautilus) \
+ $(use_enable nsplugin browser-plugins) \
+ $(use_enable python) \
+ PYLINT=$(type -P true) \
+ VALAC=$(type -P true) \
+ BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins \
+ --with-plugins=${plugins} \
+ ${myconf}
}
^ permalink raw reply related [flat|nested] 40+ messages in thread* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2012-12-24 12:46 Gilles Dartiguelongue
0 siblings, 0 replies; 40+ messages in thread
From: Gilles Dartiguelongue @ 2012-12-24 12:46 UTC (permalink / raw
To: gentoo-commits
commit: d14446bf19c4b06f73fd2c98e035de3efcfa959c
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 24 12:46:05 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Dec 24 12:46:05 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d14446bf
media-video/totem: moved to gx86
* Sync live ebuild with gx86 changes.
* USE=introspection is now global.
---
media-video/totem/metadata.xml | 4 +-
media-video/totem/totem-3.6.3.ebuild | 188 ----------------------------------
media-video/totem/totem-9999.ebuild | 81 +++++----------
3 files changed, 30 insertions(+), 243 deletions(-)
diff --git a/media-video/totem/metadata.xml b/media-video/totem/metadata.xml
index 509d84e..fa17f24 100644
--- a/media-video/totem/metadata.xml
+++ b/media-video/totem/metadata.xml
@@ -6,14 +6,12 @@
<herd>gstreamer</herd>
<longdescription>
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.
-</longdescription>
+ </longdescription>
<use>
<flag name="flash">Install browser plugin for playing embedded Adobe Flash
videos. Warning: breaks non-video Flash objects on many websites.</flag>
<flag name="grilo">Use <pkg>media-libs/grilo</pkg> to browse media content
from various sources</flag>
- <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
- for introspection</flag>
<flag name="lirc">Enable support for controlling Totem with a remote control
using <pkg>app-misc/lirc</pkg></flag>
<flag name="nautilus">Enable the nautilus extension</flag>
diff --git a/media-video/totem/totem-3.6.3.ebuild b/media-video/totem/totem-3.6.3.ebuild
deleted file mode 100644
index 8035880..0000000
--- a/media-video/totem/totem-3.6.3.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # plugins are dlopened
-
-PYTHON_DEPEND="python? 2:2.5"
-PYTHON_USE_WITH="threads"
-PYTHON_USE_WITH_OPT="python"
-
-inherit gnome2 multilib python
-if [[ ${PV} = 9999 ]]; then
- VALA_MIN_API_VERSION="0.14"
- inherit gnome2-live vala
-fi
-
-DESCRIPTION="Media player for GNOME"
-HOMEPAGE="http://projects.gnome.org/totem/"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="doc flash grilo +introspection lirc nautilus nsplugin +python test zeitgeist"
-# see bug #359379
-REQUIRED_USE="flash? ( nsplugin )
- python? ( introspection )
- zeitgeist? ( introspection )"
-
-if [[ ${PV} = 9999 ]]; then
- IUSE+=" vala"
- REQUIRED_USE+=" zeitgeist? ( vala )"
- KEYWORDS=""
-else
- KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-fi
-
-# TODO:
-# Cone (VLC) plugin needs someone with the right setup (remi ?)
-# coherence plugin broken upstream
-#
-# FIXME: Automagic tracker-0.9.0
-# Runtime dependency on gnome-session-2.91
-# FIXME: does not exist yet: media-plugins/gst-plugins-meta:1.0
-RDEPEND="
- >=dev-libs/glib-2.33:2
- >=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.5.2:3[introspection?]
- >=dev-libs/totem-pl-parser-2.32.4[introspection?]
- >=dev-libs/libpeas-1.1.0[gtk]
- >=x11-themes/gnome-icon-theme-2.16
- x11-libs/cairo
- >=dev-libs/libxml2-2.6:2
- >=media-libs/clutter-1.6.8:1.0
- >=media-libs/clutter-gst-1.5.5:2.0
- >=media-libs/clutter-gtk-1.0.2:1.0
- x11-libs/mx:1.0
-
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0[X,introspection?,pango]
- media-libs/gst-plugins-bad:1.0
- media-libs/gst-plugins-good:1.0
- media-plugins/gst-plugins-taglib:1.0
-
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- >=x11-libs/libXxf86vm-1.0.1
-
- gnome-base/gsettings-desktop-schemas
- x11-themes/gnome-icon-theme-symbolic
-
- flash? ( dev-libs/totem-pl-parser[quvi] )
- grilo? ( media-libs/grilo:0.2 )
- introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
- lirc? ( app-misc/lirc )
- nautilus? ( >=gnome-base/nautilus-2.91.3 )
- nsplugin? (
- >=dev-libs/dbus-glib-0.82
- >=x11-misc/shared-mime-info-0.22 )
- python? (
- >=dev-libs/gobject-introspection-0.6.7
- >=dev-python/pygobject-2.90.3:3
- >=x11-libs/gtk+-2.91.7:3[introspection]
- dev-python/pyxdg
- dev-python/dbus-python )
- zeitgeist? ( dev-libs/libzeitgeist )
-"
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.5
- >=app-text/gnome-doc-utils-0.20.3
- app-text/scrollkeeper
- >=dev-util/intltool-0.40
- >=dev-util/gtk-doc-am-1.14
- sys-devel/gettext
- x11-proto/xextproto
- x11-proto/xproto
- virtual/pkgconfig
- test? ( python? ( dev-python/pylint ) )
-"
-# docbook-xml-dtd is needed for user do
-# Only needed when regenerating C sources from Vala files
-[[ ${PV} = 9999 ]] && DEPEND+=" vala? ( $(vala_depend) )"
-
-# XXX: pylint checks fail because of bad code
-RESTRICT="test"
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- use python && python_clean_py-compile_files
- if [[ ${PV} = 9999 ]]; then
- # Only needed when regenerating C sources from Vala files
- use vala && vala_src_prepare
- fi
- gnome2_src_prepare
-}
-
-src_configure() {
- DOCS="AUTHORS ChangeLog NEWS README TODO"
- use nsplugin && DOCS="${DOCS} browser-plugin/README.browser-plugin"
- G2CONF="${G2CONF}
- --disable-run-in-source-tree
- --disable-schemas-compile
- --disable-static
- --with-smclient=auto
- --enable-easy-codec-installation
- $(use_enable flash vegas-plugin)
- $(use_enable introspection)
- $(use_enable nautilus)
- $(use_enable nsplugin browser-plugins)
- $(use_enable python)
- BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
-
- if ! use test; then
- # pylint is checked unconditionally, but is only used for make check
- G2CONF="${G2CONF} PYLINT=$(type -P true)"
- fi
- #--with-smclient=auto needed to correctly link to libICE and libSM
-
- # Disabled: sample-python, sample-vala
- # apple-trailers, autoload-subtitles, recent
- local plugins="apple-trailers,autoload-subtitles,brasero-disc-recorder"
- plugins+=",chapters,im-status,gromit,media-player-keys,ontop"
- plugins+=",properties,recent,screensaver,screenshot,sidebar-test"
- plugins+=",skipto"
- use grilo && plugins+=",grilo"
- use lirc && plugins+=",lirc"
- use nautilus && plugins+=",save-file"
- use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
- if [[ ${PV} = 9999 ]]; then
- # Only needed when regenerating C sources from Vala files
- G2CONF="${G2CONF} $(use_enable vala)"
- use vala && plugins+=",rotation"
- else
- G2CONF="${G2CONF} --enable-vala VALAC=$(type -P true)"
- plugins+=",rotation"
- fi
- use zeitgeist && plugins+=",zeitgeist-dp"
-
- G2CONF="${G2CONF} --with-plugins=${plugins}"
-
- # Work around sandbox violations when FEATURES=-userpriv caused by
- # gst-inspect-0.10 (bug #358755)
- unset DISPLAY
- gnome2_src_configure
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- if use python; then
- python_need_rebuild
- python_mod_optimize /usr/$(get_libdir)/totem/plugins
- fi
-
- ewarn
- ewarn "If totem doesn't play some video format, please check your"
- ewarn "USE flags on media-plugins/gst-plugins-meta"
- ewarn
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
- use python && python_mod_cleanup /usr/$(get_libdir)/totem/plugins
-}
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index 9fc75a3..edea640 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -2,15 +2,13 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="4"
+EAPI="5"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes" # plugins are dlopened
+PYTHON_COMPAT=( python2_{6,7} )
+PYTHON_REQ_USE="threads"
-PYTHON_DEPEND="python? 2:2.5"
-PYTHON_USE_WITH="threads"
-PYTHON_USE_WITH_OPT="python"
-
-inherit gnome2 multilib python
+inherit gnome2 multilib python-single-r1
if [[ ${PV} = 9999 ]]; then
VALA_MIN_API_VERSION="0.14"
inherit gnome2-live vala
@@ -21,14 +19,14 @@ HOMEPAGE="http://projects.gnome.org/totem/"
LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
-IUSE="doc flash grilo +introspection lirc nautilus nsplugin +python test zeitgeist"
+IUSE="flash grilo +introspection lirc nautilus nsplugin +python test zeitgeist"
# see bug #359379
REQUIRED_USE="flash? ( nsplugin )
python? ( introspection )
zeitgeist? ( introspection )"
if [[ ${PV} = 9999 ]]; then
- IUSE+=" vala"
+ IUSE+=" doc vala"
REQUIRED_USE+=" zeitgeist? ( vala )"
KEYWORDS=""
else
@@ -36,12 +34,11 @@ else
fi
# TODO:
-# Cone (VLC) plugin needs someone with the right setup (remi ?)
-# coherence plugin broken upstream
+# Cone (VLC) plugin needs someone with the right setup to test it
#
-# FIXME: Automagic tracker-0.9.0
+# FIXME:
+# Automagic tracker-0.9.0
# Runtime dependency on gnome-session-2.91
-# FIXME: does not exist yet: media-plugins/gst-plugins-meta:1.0
RDEPEND="
>=dev-libs/glib-2.33:2
>=x11-libs/gdk-pixbuf-2.23.0:2
@@ -58,9 +55,10 @@ RDEPEND="
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0[X,introspection?,pango]
- media-libs/gst-plugins-bad:1.0
+ >=media-libs/gst-plugins-bad-1.0.2:1.0
media-libs/gst-plugins-good:1.0
media-plugins/gst-plugins-taglib:1.0
+ media-plugins/gst-plugins-meta:1.0
x11-libs/libICE
x11-libs/libSM
@@ -79,47 +77,36 @@ RDEPEND="
>=dev-libs/dbus-glib-0.82
>=x11-misc/shared-mime-info-0.22 )
python? (
- >=dev-libs/gobject-introspection-0.6.7
- >=dev-python/pygobject-2.90.3:3
- >=x11-libs/gtk+-2.91.7:3[introspection]
- dev-python/pyxdg
- dev-python/dbus-python )
+ ${PYTHON_DEPS}
+ >=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
+ dev-python/pyxdg[${PYTHON_USEDEP}]
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ >=x11-libs/gtk+-2.91.7:3[introspection] )
zeitgeist? ( dev-libs/libzeitgeist )
"
DEPEND="${RDEPEND}
app-text/docbook-xml-dtd:4.5
>=app-text/gnome-doc-utils-0.20.3
app-text/scrollkeeper
- >=dev-util/intltool-0.40
>=dev-util/gtk-doc-am-1.14
+ >=dev-util/intltool-0.40
sys-devel/gettext
x11-proto/xextproto
x11-proto/xproto
virtual/pkgconfig
test? ( python? ( dev-python/pylint ) )
"
-# docbook-xml-dtd is needed for user do
+# docbook-xml-dtd is needed for user doc
# Only needed when regenerating C sources from Vala files
-[[ ${PV} = 9999 ]] && DEPEND+=" vala? ( $(vala_depend) )"
-
-# XXX: pylint checks fail because of bad code
-RESTRICT="test"
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
+if [[ ${PV} = 9999 ]]; then
+ DEPEND+=" vala? ( $(vala_depend) )
+ doc? ( >=dev-util/gtk-doc-1.14 )"
+fi
src_prepare() {
# AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails
mkdir -p m4
- #if [[ ${PV} != 9999 ]]; then
- # intltoolize --force --copy --automake || die "intltoolize failed"
- # eautoreconf
- #fi
-
- use python && python_clean_py-compile_files
if [[ ${PV} = 9999 ]]; then
# Only needed when regenerating C sources from Vala files
use vala && vala_src_prepare
@@ -130,9 +117,10 @@ src_prepare() {
src_configure() {
DOCS="AUTHORS ChangeLog NEWS README TODO"
use nsplugin && DOCS="${DOCS} browser-plugin/README.browser-plugin"
+
+ #--with-smclient=auto needed to correctly link to libICE and libSM
G2CONF="${G2CONF}
--disable-run-in-source-tree
- --disable-schemas-compile
--disable-static
--with-smclient=auto
--enable-easy-codec-installation
@@ -143,14 +131,12 @@ src_configure() {
$(use_enable python)
BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
- if ! use test; then
- # pylint is checked unconditionally, but is only used for make check
- G2CONF="${G2CONF} PYLINT=$(type -P true)"
- fi
- #--with-smclient=auto needed to correctly link to libICE and libSM
+ # XXX: always set to true otherwise tests fails due to pylint not
+ # respecting EPYTHON (wait for python-r1)
+ # pylint is checked unconditionally, but is only used for make check
+ G2CONF="${G2CONF} PYLINT=$(type -P true)"
# Disabled: sample-python, sample-vala
- # apple-trailers, autoload-subtitles, recent
local plugins="apple-trailers,autoload-subtitles,brasero-disc-recorder"
plugins+=",chapters,im-status,gromit,media-player-keys,ontop"
plugins+=",properties,recent,screensaver,screenshot,sidebar-test"
@@ -172,25 +158,16 @@ src_configure() {
G2CONF="${G2CONF} --with-plugins=${plugins}"
# Work around sandbox violations when FEATURES=-userpriv caused by
- # gst-inspect-0.10 (bug #358755)
+ # gst-inspect-1.0(bug #358755)
unset DISPLAY
gnome2_src_configure
}
pkg_postinst() {
gnome2_pkg_postinst
- if use python; then
- python_need_rebuild
- python_mod_optimize /usr/$(get_libdir)/totem/plugins
- fi
ewarn
ewarn "If totem doesn't play some video format, please check your"
ewarn "USE flags on media-plugins/gst-plugins-meta"
ewarn
}
-
-pkg_postrm() {
- gnome2_pkg_postrm
- use python && python_mod_cleanup /usr/$(get_libdir)/totem/plugins
-}
^ permalink raw reply related [flat|nested] 40+ messages in thread* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2012-11-09 4:46 Arun Raghavan
0 siblings, 0 replies; 40+ messages in thread
From: Arun Raghavan @ 2012-11-09 4:46 UTC (permalink / raw
To: gentoo-commits
commit: 644e69e77c8f3d4b0b67a261e069ef4379278435
Author: Arun Raghavan <ford_prefect <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 9 04:46:25 2012 +0000
Commit: Arun Raghavan <ford_prefect <AT> gentoo <DOT> org>
CommitDate: Fri Nov 9 04:46:25 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=644e69e7
Revert "media-video/totem; Add gst-plugins-soundtouch dep"
This reverts commit 8445c36b98d5ed9280abf5cc28b28c45942485a2.
This was already fixed properly.
---
media-video/totem/totem-3.6.3.ebuild | 1 -
media-video/totem/totem-9999.ebuild | 1 -
2 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/media-video/totem/totem-3.6.3.ebuild b/media-video/totem/totem-3.6.3.ebuild
index fea87fc..8035880 100644
--- a/media-video/totem/totem-3.6.3.ebuild
+++ b/media-video/totem/totem-3.6.3.ebuild
@@ -61,7 +61,6 @@ RDEPEND="
media-libs/gst-plugins-bad:1.0
media-libs/gst-plugins-good:1.0
media-plugins/gst-plugins-taglib:1.0
- media-plugins/gst-plugins-soundtouch:1.0
x11-libs/libICE
x11-libs/libSM
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index 758000c..9fc75a3 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -61,7 +61,6 @@ RDEPEND="
media-libs/gst-plugins-bad:1.0
media-libs/gst-plugins-good:1.0
media-plugins/gst-plugins-taglib:1.0
- media-plugins/gst-plugins-soundtouch:1.0
x11-libs/libICE
x11-libs/libSM
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2012-11-09 4:20 Arun Raghavan
0 siblings, 0 replies; 40+ messages in thread
From: Arun Raghavan @ 2012-11-09 4:20 UTC (permalink / raw
To: gentoo-commits
commit: 8445c36b98d5ed9280abf5cc28b28c45942485a2
Author: Arun Raghavan <ford_prefect <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 9 04:20:11 2012 +0000
Commit: Arun Raghavan <ford_prefect <AT> gentoo <DOT> org>
CommitDate: Fri Nov 9 04:20:11 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8445c36b
media-video/totem; Add gst-plugins-soundtouch dep
This is needed for the pitch plugin which Totem uses.
---
media-video/totem/totem-3.6.3.ebuild | 1 +
media-video/totem/totem-9999.ebuild | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/media-video/totem/totem-3.6.3.ebuild b/media-video/totem/totem-3.6.3.ebuild
index 8035880..fea87fc 100644
--- a/media-video/totem/totem-3.6.3.ebuild
+++ b/media-video/totem/totem-3.6.3.ebuild
@@ -61,6 +61,7 @@ RDEPEND="
media-libs/gst-plugins-bad:1.0
media-libs/gst-plugins-good:1.0
media-plugins/gst-plugins-taglib:1.0
+ media-plugins/gst-plugins-soundtouch:1.0
x11-libs/libICE
x11-libs/libSM
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index 9fc75a3..758000c 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -61,6 +61,7 @@ RDEPEND="
media-libs/gst-plugins-bad:1.0
media-libs/gst-plugins-good:1.0
media-plugins/gst-plugins-taglib:1.0
+ media-plugins/gst-plugins-soundtouch:1.0
x11-libs/libICE
x11-libs/libSM
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2012-11-02 0:13 Gilles Dartiguelongue
0 siblings, 0 replies; 40+ messages in thread
From: Gilles Dartiguelongue @ 2012-11-02 0:13 UTC (permalink / raw
To: gentoo-commits
commit: f5da1deab39fb52f8d14679a55a941ffeede2e74
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 2 00:12:56 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Fri Nov 2 00:12:56 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f5da1dea
media-video/totem: 3.4.3 → 3.6.2
---
media-video/totem/metadata.xml | 24 +++++
.../{totem-9999.ebuild => totem-3.6.2.ebuild} | 108 +++++++++-----------
media-video/totem/totem-9999.ebuild | 110 +++++++++----------
3 files changed, 124 insertions(+), 118 deletions(-)
diff --git a/media-video/totem/metadata.xml b/media-video/totem/metadata.xml
new file mode 100644
index 0000000..509d84e
--- /dev/null
+++ b/media-video/totem/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <herd>video</herd>
+ <herd>gstreamer</herd>
+ <longdescription>
+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.
+</longdescription>
+ <use>
+ <flag name="flash">Install browser plugin for playing embedded Adobe Flash
+ videos. Warning: breaks non-video Flash objects on many websites.</flag>
+ <flag name="grilo">Use <pkg>media-libs/grilo</pkg> to browse media content
+ from various sources</flag>
+ <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
+ for introspection</flag>
+ <flag name="lirc">Enable support for controlling Totem with a remote control
+ using <pkg>app-misc/lirc</pkg></flag>
+ <flag name="nautilus">Enable the nautilus extension</flag>
+ <flag name="python">Build support for <pkg>dev-lang/python</pkg> plugins</flag>
+ <flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
+ <flag name="zeitgeist">Build the plugin to inject events to <pkg>gnome-extra/zeitgeist</pkg></flag>
+ </use>
+</pkgmetadata>
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-3.6.2.ebuild
similarity index 65%
copy from media-video/totem/totem-9999.ebuild
copy to media-video/totem/totem-3.6.2.ebuild
index 66472a8..46b766d 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-3.6.2.ebuild
@@ -5,10 +5,11 @@
EAPI="4"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes" # plugins are dlopened
-WANT_AUTOMAKE="1.11"
+
PYTHON_DEPEND="python? 2:2.5"
PYTHON_USE_WITH="threads"
PYTHON_USE_WITH_OPT="python"
+VALA_MIN_API_VERSION="0.14"
inherit gnome2 multilib python
if [[ ${PV} = 9999 ]]; then
@@ -20,7 +21,7 @@ HOMEPAGE="http://projects.gnome.org/totem/"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
-IUSE="doc flash grilo +introspection iplayer lirc nautilus nsplugin +python test vala zeitgeist zeroconf"
+IUSE="doc flash grilo +introspection lirc nautilus nsplugin +python test vala zeitgeist"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
@@ -33,39 +34,37 @@ fi
#
# FIXME: Automagic tracker-0.9.0
# Runtime dependency on gnome-session-2.91
-RDEPEND=">=dev-libs/glib-2.27.92:2
+# FIXME: does not exist yet: media-plugins/gst-plugins-meta:1.0
+RDEPEND="
+ >=dev-libs/glib-2.33:2
>=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.3.6:3[introspection?]
+ >=x11-libs/gtk+-3.5.2:3[introspection?]
>=dev-libs/totem-pl-parser-2.32.4[introspection?]
>=dev-libs/libpeas-1.1.0[gtk]
>=x11-themes/gnome-icon-theme-2.16
x11-libs/cairo
>=dev-libs/libxml2-2.6:2
>=media-libs/clutter-1.6.8:1.0
- >=media-libs/clutter-gst-1.3.9:1.0
+ >=media-libs/clutter-gst-1.5.5:2.0
>=media-libs/clutter-gtk-1.0.2:1.0
- >=media-libs/gstreamer-0.10.30:0.10
- >=media-libs/gst-plugins-base-0.10.30:0.10
x11-libs/mx:1.0
- media-libs/gst-plugins-good:0.10
- media-plugins/gst-plugins-taglib:0.10
- media-plugins/gst-plugins-gio:0.10
- media-plugins/gst-plugins-pango:0.10
- media-plugins/gst-plugins-x:0.10
- media-plugins/gst-plugins-meta:0.10
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0[X,introspection?,pango]
+ media-libs/gst-plugins-bad:1.0
+ media-libs/gst-plugins-good:1.0
+ media-plugins/gst-plugins-taglib:1.0
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
- x11-libs/libXtst
>=x11-libs/libXxf86vm-1.0.1
gnome-base/gsettings-desktop-schemas
x11-themes/gnome-icon-theme-symbolic
flash? ( dev-libs/totem-pl-parser[quvi] )
- grilo? ( >=media-libs/grilo-0.2.0:0.2 )
+ grilo? ( media-libs/grilo:0.2 )
introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
lirc? ( app-misc/lirc )
nautilus? ( >=gnome-base/nautilus-2.91.3 )
@@ -77,28 +76,23 @@ RDEPEND=">=dev-libs/glib-2.27.92:2
>=dev-python/pygobject-2.90.3:3
>=x11-libs/gtk+-2.91.7:3[introspection]
dev-python/pyxdg
- dev-python/gst-python:0.10
- dev-python/dbus-python
- iplayer? (
- dev-python/httplib2
- dev-python/feedparser
- dev-python/beautifulsoup ) )
- vala? ( >=dev-lang/vala-0.14.2-r1:0.14 )
+ dev-python/dbus-python )
zeitgeist? ( dev-libs/libzeitgeist )
- zeroconf? ( >net-libs/libepc-0.4.0 )"
-# XXX: zeroconf requires unreleased version of libepc
-
+"
DEPEND="${RDEPEND}
app-text/docbook-xml-dtd:4.5
>=app-text/gnome-doc-utils-0.20.3
app-text/scrollkeeper
>=dev-util/intltool-0.40
+ >=dev-util/gtk-doc-am-1.14
sys-devel/gettext
x11-proto/xextproto
x11-proto/xproto
virtual/pkgconfig
- doc? ( >=dev-util/gtk-doc-1.14 )
- test? ( python? ( dev-python/pylint ) )"
+ test? ( python? ( dev-python/pylint ) )
+"
+# Only needed when regenerating C sources from Vala files
+# vala? ( $(vala_depend) )"
# docbook-xml-dtd is needed for user doc
# see bug #359379
@@ -110,12 +104,23 @@ REQUIRED_USE="flash? ( nsplugin )
RESTRICT="test"
pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
+ use python && python_clean_py-compile_files
+ # Only needed when regenerating C sources from Vala files
+ #use vala && vala_src_prepare
+ gnome2_src_prepare
+}
+
+src_configure() {
DOCS="AUTHORS ChangeLog NEWS README TODO"
use nsplugin && DOCS="${DOCS} browser-plugin/README.browser-plugin"
G2CONF="${G2CONF}
--disable-run-in-source-tree
--disable-schemas-compile
- --disable-scrollkeeper
--disable-static
--with-smclient=auto
--enable-easy-codec-installation
@@ -125,8 +130,10 @@ pkg_setup() {
$(use_enable nsplugin browser-plugins)
$(use_enable python)
$(use_enable vala)
- VALAC=$(type -P valac-0.14)
+ VALAC=$(type -P true)
BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
+ # Only needed when regenerating C sources from Vala files
+ #VALAC=$(type -P valac-$(vala_best_api_version))
if ! use test; then
# pylint is checked unconditionally, but is only used for make check
@@ -134,40 +141,21 @@ pkg_setup() {
fi
#--with-smclient=auto needed to correctly link to libICE and libSM
- # Disabled: sample-python, sample-vala, zeitgeist-dp
- local plugins="brasero-disc-recorder,chapters,im-status,gromit"
- plugins="${plugins},media-player-keys,ontop,properties,screensaver"
- plugins="${plugins},screenshot,sidebar-test,skipto"
- use grilo && plugins="${plugins},grilo"
- use iplayer && plugins="${plugins},iplayer"
- use lirc && plugins="${plugins},lirc"
- use nautilus && plugins="${plugins},save-file"
- use python && plugins="${plugins},dbusservice,pythonconsole,opensubtitles"
- use vala && plugins="${plugins},rotation"
- use zeitgeist && plugins="${plugins},zeitgeist-dp"
- use zeroconf && plugins="${plugins},publish"
+ # Disabled: sample-python, sample-vala
+ # apple-trailers, autoload-subtitles, recent
+ local plugins="apple-trailers,autoload-subtitles,brasero-disc-recorder"
+ plugins+=",chapters,im-status,gromit,media-player-keys,ontop"
+ plugins+=",properties,recent,screensaver,screenshot,sidebar-test"
+ plugins+=",skipto"
+ use grilo && plugins+=",grilo"
+ use lirc && plugins+=",lirc"
+ use nautilus && plugins+=",save-file"
+ use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
+ use vala && plugins+=",rotation"
+ use zeitgeist && plugins+=",zeitgeist-dp"
G2CONF="${G2CONF} --with-plugins=${plugins}"
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- # AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails
- mkdir -p m4
-
- #if [[ ${PV} != 9999 ]]; then
- # intltoolize --force --copy --automake || die "intltoolize failed"
- # eautoreconf
- #fi
-
- use python && python_clean_py-compile_files
-
- gnome2_src_prepare
-}
-
-src_configure() {
# Work around sandbox violations when FEATURES=-userpriv caused by
# gst-inspect-0.10 (bug #358755)
unset DISPLAY
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index 66472a8..d187586 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -5,7 +5,7 @@
EAPI="4"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes" # plugins are dlopened
-WANT_AUTOMAKE="1.11"
+
PYTHON_DEPEND="python? 2:2.5"
PYTHON_USE_WITH="threads"
PYTHON_USE_WITH_OPT="python"
@@ -20,7 +20,7 @@ HOMEPAGE="http://projects.gnome.org/totem/"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
-IUSE="doc flash grilo +introspection iplayer lirc nautilus nsplugin +python test vala zeitgeist zeroconf"
+IUSE="doc flash grilo +introspection lirc nautilus nsplugin +python test vala zeitgeist"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
@@ -33,39 +33,37 @@ fi
#
# FIXME: Automagic tracker-0.9.0
# Runtime dependency on gnome-session-2.91
-RDEPEND=">=dev-libs/glib-2.27.92:2
+# FIXME: does not exist yet: media-plugins/gst-plugins-meta:1.0
+RDEPEND="
+ >=dev-libs/glib-2.33:2
>=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.3.6:3[introspection?]
+ >=x11-libs/gtk+-3.5.2:3[introspection?]
>=dev-libs/totem-pl-parser-2.32.4[introspection?]
>=dev-libs/libpeas-1.1.0[gtk]
>=x11-themes/gnome-icon-theme-2.16
x11-libs/cairo
>=dev-libs/libxml2-2.6:2
>=media-libs/clutter-1.6.8:1.0
- >=media-libs/clutter-gst-1.3.9:1.0
+ >=media-libs/clutter-gst-1.5.5:2.0
>=media-libs/clutter-gtk-1.0.2:1.0
- >=media-libs/gstreamer-0.10.30:0.10
- >=media-libs/gst-plugins-base-0.10.30:0.10
x11-libs/mx:1.0
- media-libs/gst-plugins-good:0.10
- media-plugins/gst-plugins-taglib:0.10
- media-plugins/gst-plugins-gio:0.10
- media-plugins/gst-plugins-pango:0.10
- media-plugins/gst-plugins-x:0.10
- media-plugins/gst-plugins-meta:0.10
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0[X,introspection,pango]
+ media-libs/gst-plugins-bad:1.0
+ media-libs/gst-plugins-good:1.0
+ media-plugins/gst-plugins-taglib:1.0
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
- x11-libs/libXtst
>=x11-libs/libXxf86vm-1.0.1
gnome-base/gsettings-desktop-schemas
x11-themes/gnome-icon-theme-symbolic
flash? ( dev-libs/totem-pl-parser[quvi] )
- grilo? ( >=media-libs/grilo-0.2.0:0.2 )
+ grilo? ( media-libs/grilo:0.2 )
introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
lirc? ( app-misc/lirc )
nautilus? ( >=gnome-base/nautilus-2.91.3 )
@@ -77,28 +75,22 @@ RDEPEND=">=dev-libs/glib-2.27.92:2
>=dev-python/pygobject-2.90.3:3
>=x11-libs/gtk+-2.91.7:3[introspection]
dev-python/pyxdg
- dev-python/gst-python:0.10
- dev-python/dbus-python
- iplayer? (
- dev-python/httplib2
- dev-python/feedparser
- dev-python/beautifulsoup ) )
- vala? ( >=dev-lang/vala-0.14.2-r1:0.14 )
+ dev-python/dbus-python )
zeitgeist? ( dev-libs/libzeitgeist )
- zeroconf? ( >net-libs/libepc-0.4.0 )"
-# XXX: zeroconf requires unreleased version of libepc
-
+"
DEPEND="${RDEPEND}
app-text/docbook-xml-dtd:4.5
>=app-text/gnome-doc-utils-0.20.3
app-text/scrollkeeper
>=dev-util/intltool-0.40
+ >=dev-util/gtk-doc-am-1.14
sys-devel/gettext
x11-proto/xextproto
x11-proto/xproto
virtual/pkgconfig
doc? ( >=dev-util/gtk-doc-1.14 )
- test? ( python? ( dev-python/pylint ) )"
+ test? ( python? ( dev-python/pylint ) )
+"
# docbook-xml-dtd is needed for user doc
# see bug #359379
@@ -110,12 +102,31 @@ REQUIRED_USE="flash? ( nsplugin )
RESTRICT="test"
pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
+ # AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails
+ mkdir -p m4
+
+ #if [[ ${PV} != 9999 ]]; then
+ # intltoolize --force --copy --automake || die "intltoolize failed"
+ # eautoreconf
+ #fi
+
+ use python && python_clean_py-compile_files
+ # Only needed when regenerating C sources from Vala files
+ #use vala && vala_src_prepare
+ gnome2_src_prepare
+}
+
+src_configure() {
DOCS="AUTHORS ChangeLog NEWS README TODO"
use nsplugin && DOCS="${DOCS} browser-plugin/README.browser-plugin"
G2CONF="${G2CONF}
--disable-run-in-source-tree
--disable-schemas-compile
- --disable-scrollkeeper
--disable-static
--with-smclient=auto
--enable-easy-codec-installation
@@ -127,6 +138,8 @@ pkg_setup() {
$(use_enable vala)
VALAC=$(type -P valac-0.14)
BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
+ # Only needed when regenerating C sources from Vala files
+ #VALAC=$(type -P valac-$(vala_best_api_version))
if ! use test; then
# pylint is checked unconditionally, but is only used for make check
@@ -134,40 +147,21 @@ pkg_setup() {
fi
#--with-smclient=auto needed to correctly link to libICE and libSM
- # Disabled: sample-python, sample-vala, zeitgeist-dp
- local plugins="brasero-disc-recorder,chapters,im-status,gromit"
- plugins="${plugins},media-player-keys,ontop,properties,screensaver"
- plugins="${plugins},screenshot,sidebar-test,skipto"
- use grilo && plugins="${plugins},grilo"
- use iplayer && plugins="${plugins},iplayer"
- use lirc && plugins="${plugins},lirc"
- use nautilus && plugins="${plugins},save-file"
- use python && plugins="${plugins},dbusservice,pythonconsole,opensubtitles"
- use vala && plugins="${plugins},rotation"
- use zeitgeist && plugins="${plugins},zeitgeist-dp"
- use zeroconf && plugins="${plugins},publish"
+ # Disabled: sample-python, sample-vala
+ # apple-trailers, autoload-subtitles, recent
+ local plugins="apple-trailers,autoload-subtitles,brasero-disc-recorder"
+ plugins+=",chapters,im-status,gromit,media-player-keys,ontop"
+ plugins+=",properties,recent,screensaver,screenshot,sidebar-test"
+ plugins+=",skipto"
+ use grilo && plugins+=",grilo"
+ use lirc && plugins+=",lirc"
+ use nautilus && plugins+=",save-file"
+ use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
+ use vala && plugins+=",rotation"
+ use zeitgeist && plugins+=",zeitgeist-dp"
G2CONF="${G2CONF} --with-plugins=${plugins}"
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- # AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails
- mkdir -p m4
-
- #if [[ ${PV} != 9999 ]]; then
- # intltoolize --force --copy --automake || die "intltoolize failed"
- # eautoreconf
- #fi
-
- use python && python_clean_py-compile_files
-
- gnome2_src_prepare
-}
-
-src_configure() {
# Work around sandbox violations when FEATURES=-userpriv caused by
# gst-inspect-0.10 (bug #358755)
unset DISPLAY
^ permalink raw reply related [flat|nested] 40+ messages in thread* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2012-09-10 17:19 Alexandre Rostovtsev
0 siblings, 0 replies; 40+ messages in thread
From: Alexandre Rostovtsev @ 2012-09-10 17:19 UTC (permalink / raw
To: gentoo-commits
commit: f696db7aea64b4637f04e7f3d860e34f18215aa2
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 10 17:19:24 2012 +0000
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Mon Sep 10 17:19:24 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f696db7a
media-video/totem: missing schemas dep (bug #434498)
Thanks to Andre Reinke.
---
media-video/totem/totem-9999.ebuild | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index 733b646..a44612a 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -60,6 +60,8 @@ RDEPEND=">=dev-libs/glib-2.27.92:2
x11-libs/libX11
x11-libs/libXtst
>=x11-libs/libXxf86vm-1.0.1
+
+ gnome-base/gsettings-desktop-schemas
x11-themes/gnome-icon-theme-symbolic
flash? ( dev-libs/totem-pl-parser[quvi] )
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2012-05-24 9:12 Alexandre Restovtsev
0 siblings, 0 replies; 40+ messages in thread
From: Alexandre Restovtsev @ 2012-05-24 9:12 UTC (permalink / raw
To: gentoo-commits
commit: adef2b850ffac2e4e592f0fbbc020f8175d6970b
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Thu May 24 09:01:22 2012 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu May 24 09:01:22 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=adef2b85
media-video/totem: moved to gx86; update live ebuild
---
media-video/totem/totem-3.4.0.ebuild | 194 ----------------------------------
media-video/totem/totem-9999.ebuild | 15 +--
2 files changed, 6 insertions(+), 203 deletions(-)
diff --git a/media-video/totem/totem-3.4.0.ebuild b/media-video/totem/totem-3.4.0.ebuild
deleted file mode 100644
index 20cba57..0000000
--- a/media-video/totem/totem-3.4.0.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.2.2.ebuild,v 1.2 2012/02/20 08:18:35 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # plugins are dlopened
-WANT_AUTOMAKE="1.11"
-PYTHON_DEPEND="python? 2:2.5"
-PYTHON_USE_WITH="threads"
-PYTHON_USE_WITH_OPT="python"
-
-inherit gnome2 multilib python
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
-
-DESCRIPTION="Media player for GNOME"
-HOMEPAGE="http://projects.gnome.org/totem/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-IUSE="doc flash grilo +introspection iplayer lirc nautilus nsplugin +python test vala zeitgeist zeroconf"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-fi
-
-# TODO:
-# Cone (VLC) plugin needs someone with the right setup (remi ?)
-# coherence plugin broken upstream
-#
-# FIXME: Automagic tracker-0.9.0
-# Runtime dependency on gnome-session-2.91
-RDEPEND=">=dev-libs/glib-2.27.92:2
- >=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.3.6:3[introspection?]
- >=dev-libs/totem-pl-parser-2.32.4[introspection?]
- >=dev-libs/libpeas-1.1.0[gtk]
- >=x11-themes/gnome-icon-theme-2.16
- x11-libs/cairo
- >=dev-libs/libxml2-2.6:2
- >=media-libs/clutter-1.6.8:1.0
- >=media-libs/clutter-gst-1.3.9:1.0
- >=media-libs/clutter-gtk-1.0.2:1.0
- >=media-libs/gstreamer-0.10.30:0.10
- >=media-libs/gst-plugins-base-0.10.30:0.10
- x11-libs/mx:1.0
-
- media-libs/gst-plugins-good:0.10
- media-plugins/gst-plugins-taglib:0.10
- media-plugins/gst-plugins-gio:0.10
- media-plugins/gst-plugins-pango:0.10
- media-plugins/gst-plugins-x:0.10
- media-plugins/gst-plugins-meta:0.10
-
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXtst
- >=x11-libs/libXxf86vm-1.0.1
- x11-themes/gnome-icon-theme-symbolic
-
- flash? ( dev-libs/totem-pl-parser[quvi] )
- grilo? ( >=media-libs/grilo-0.1.16 )
- introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
- lirc? ( app-misc/lirc )
- nautilus? ( >=gnome-base/nautilus-2.91.3 )
- nsplugin? (
- >=dev-libs/dbus-glib-0.82
- >=x11-misc/shared-mime-info-0.22 )
- python? (
- >=dev-libs/gobject-introspection-0.6.7
- >=dev-python/pygobject-2.90.3:3
- >=x11-libs/gtk+-2.91.7:3[introspection]
- dev-python/pyxdg
- dev-python/gst-python:0.10
- dev-python/dbus-python
- iplayer? (
- dev-python/httplib2
- dev-python/feedparser
- dev-python/beautifulsoup ) )
- vala? ( >=dev-lang/vala-0.14.2-r1:0.14 )
- zeitgeist? ( dev-libs/libzeitgeist )
- zeroconf? ( >net-libs/libepc-0.4.0 )"
-# XXX: zeroconf requires unreleased version of libepc
-
-DEPEND="${RDEPEND}
- sys-devel/gettext
- x11-proto/xproto
- x11-proto/xextproto
- app-text/scrollkeeper
- >=app-text/gnome-doc-utils-0.20.3
- >=dev-util/intltool-0.40
- virtual/pkgconfig
- app-text/docbook-xml-dtd:4.5
- gnome-base/gnome-common
- dev-util/gtk-doc-am
- doc? ( >=dev-util/gtk-doc-1.14 )
- test? ( python? ( dev-python/pylint ) )"
-# docbook-xml-dtd is needed for user doc
-
-# see bug #359379
-REQUIRED_USE="flash? ( nsplugin )
- python? ( introspection )
- zeitgeist? ( introspection vala )"
-
-# XXX: pylint checks fail because of bad code
-RESTRICT="test"
-
-pkg_setup() {
- DOCS="AUTHORS ChangeLog NEWS README TODO"
- use nsplugin && DOCS="${DOCS} browser-plugin/README.browser-plugin"
- G2CONF="${G2CONF}
- --disable-run-in-source-tree
- --disable-schemas-compile
- --disable-scrollkeeper
- --disable-static
- --with-smclient=auto
- --enable-easy-codec-installation
- $(use_enable flash vegas-plugin)
- $(use_enable introspection)
- $(use_enable nautilus)
- $(use_enable nsplugin browser-plugins)
- $(use_enable python)
- $(use_enable python introspection)
- $(use_enable vala)
- VALAC=$(type -P valac-0.14)
- BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
-
- if ! use test; then
- # pylint is checked unconditionally, but is only used for make check
- G2CONF="${G2CONF} PYLINT=$(type -P true)"
- fi
- #--with-smclient=auto needed to correctly link to libICE and libSM
-
- # Disabled: sample-python, sample-vala, zeitgeist-dp
- local plugins="brasero-disc-recorder,chapters,im-status,gromit"
- plugins="${plugins},media-player-keys,ontop,properties,screensaver"
- plugins="${plugins},screenshot,sidebar-test,skipto"
- use grilo && plugins="${plugins},grilo"
- use iplayer && plugins="${plugins},iplayer"
- use lirc && plugins="${plugins},lirc"
- use nautilus && plugins="${plugins},save-file"
- use python && plugins="${plugins},dbusservice,pythonconsole,opensubtitles"
- use vala && plugins="${plugins},rotation"
- use zeitgeist && plugins="${plugins},zeitgeist-dp"
- use zeroconf && plugins="${plugins},publish"
-
- G2CONF="${G2CONF} --with-plugins=${plugins}"
-
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- # AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails
- mkdir -p m4
-
- #if [[ ${PV} != 9999 ]]; then
- # intltoolize --force --copy --automake || die "intltoolize failed"
- # eautoreconf
- #fi
-
- use python && python_clean_py-compile_files
-
- gnome2_src_prepare
-}
-
-src_configure() {
- # Work around sandbox violations when FEATURES=-userpriv caused by
- # gst-inspect-0.10 (bug #358755)
- unset DISPLAY
- gnome2_src_configure
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- if use python; then
- python_need_rebuild
- python_mod_optimize /usr/$(get_libdir)/totem/plugins
- fi
-
- ewarn
- ewarn "If totem doesn't play some video format, please check your"
- ewarn "USE flags on media-plugins/gst-plugins-meta"
- ewarn
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
- use python && python_mod_cleanup /usr/$(get_libdir)/totem/plugins
-}
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index 20cba57..733b646 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.2.2.ebuild,v 1.2 2012/02/20 08:18:35 tetromino Exp $
+# $Header: $
EAPI="4"
GCONF_DEBUG="yes"
@@ -87,16 +87,14 @@ RDEPEND=">=dev-libs/glib-2.27.92:2
# XXX: zeroconf requires unreleased version of libepc
DEPEND="${RDEPEND}
- sys-devel/gettext
- x11-proto/xproto
- x11-proto/xextproto
- app-text/scrollkeeper
+ app-text/docbook-xml-dtd:4.5
>=app-text/gnome-doc-utils-0.20.3
+ app-text/scrollkeeper
>=dev-util/intltool-0.40
+ sys-devel/gettext
+ x11-proto/xextproto
+ x11-proto/xproto
virtual/pkgconfig
- app-text/docbook-xml-dtd:4.5
- gnome-base/gnome-common
- dev-util/gtk-doc-am
doc? ( >=dev-util/gtk-doc-1.14 )
test? ( python? ( dev-python/pylint ) )"
# docbook-xml-dtd is needed for user doc
@@ -124,7 +122,6 @@ pkg_setup() {
$(use_enable nautilus)
$(use_enable nsplugin browser-plugins)
$(use_enable python)
- $(use_enable python introspection)
$(use_enable vala)
VALAC=$(type -P valac-0.14)
BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
^ permalink raw reply related [flat|nested] 40+ messages in thread* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2012-04-10 21:25 Alexandre Restovtsev
0 siblings, 0 replies; 40+ messages in thread
From: Alexandre Restovtsev @ 2012-04-10 21:25 UTC (permalink / raw
To: gentoo-commits
commit: 5292ff33f313c0a36ad88c81a24019c049e54531
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 10 21:22:38 2012 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Apr 10 21:23:45 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5292ff33
media-video/totem: better fix for #358755
Suggested by Gilles Dartiguelongue on irc.
---
media-video/totem/totem-3.4.0.ebuild | 12 ++++++++----
media-video/totem/totem-9999.ebuild | 12 ++++++++----
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/media-video/totem/totem-3.4.0.ebuild b/media-video/totem/totem-3.4.0.ebuild
index 5c18f8f..1d744ae 100644
--- a/media-video/totem/totem-3.4.0.ebuild
+++ b/media-video/totem/totem-3.4.0.ebuild
@@ -127,10 +127,7 @@ pkg_setup() {
$(use_enable python introspection)
$(use_enable vala)
VALAC=$(type -P valac-0.14)
- BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins
- DISPLAY=999invalid"
- # Fake DISPLAY to work around sandbox violations when FEATURES=-userpriv
- # caused by gst-inspect-0.10 (bug #358755)
+ BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
if ! use test; then
# pylint is checked unconditionally, but is only used for make check
@@ -171,6 +168,13 @@ src_prepare() {
gnome2_src_prepare
}
+src_configure() {
+ # Work around sandbox violations when FEATURES=-userpriv caused by
+ # gst-inspect-0.10 (bug #358755)
+ unset DISPLAY
+ gnome2_src_configure
+}
+
pkg_postinst() {
gnome2_pkg_postinst
if use python; then
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index 5c18f8f..1d744ae 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -127,10 +127,7 @@ pkg_setup() {
$(use_enable python introspection)
$(use_enable vala)
VALAC=$(type -P valac-0.14)
- BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins
- DISPLAY=999invalid"
- # Fake DISPLAY to work around sandbox violations when FEATURES=-userpriv
- # caused by gst-inspect-0.10 (bug #358755)
+ BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
if ! use test; then
# pylint is checked unconditionally, but is only used for make check
@@ -171,6 +168,13 @@ src_prepare() {
gnome2_src_prepare
}
+src_configure() {
+ # Work around sandbox violations when FEATURES=-userpriv caused by
+ # gst-inspect-0.10 (bug #358755)
+ unset DISPLAY
+ gnome2_src_configure
+}
+
pkg_postinst() {
gnome2_pkg_postinst
if use python; then
^ permalink raw reply related [flat|nested] 40+ messages in thread* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2012-04-09 5:48 Alexandre Restovtsev
0 siblings, 0 replies; 40+ messages in thread
From: Alexandre Restovtsev @ 2012-04-09 5:48 UTC (permalink / raw
To: gentoo-commits
commit: cfac5b17755188fb1a298c5230def26d10d39465
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 9 05:48:09 2012 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Apr 9 05:48:09 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=cfac5b17
media-video/totem: fix bug # in comment
Thanks to Priit Laes for pointing it out.
---
media-video/totem/totem-3.4.0.ebuild | 2 +-
media-video/totem/totem-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/totem/totem-3.4.0.ebuild b/media-video/totem/totem-3.4.0.ebuild
index f7847bb..5c18f8f 100644
--- a/media-video/totem/totem-3.4.0.ebuild
+++ b/media-video/totem/totem-3.4.0.ebuild
@@ -130,7 +130,7 @@ pkg_setup() {
BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins
DISPLAY=999invalid"
# Fake DISPLAY to work around sandbox violations when FEATURES=-userpriv
- # caused by gst-inspect-0.10 (bug #385917)
+ # caused by gst-inspect-0.10 (bug #358755)
if ! use test; then
# pylint is checked unconditionally, but is only used for make check
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index f7847bb..5c18f8f 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -130,7 +130,7 @@ pkg_setup() {
BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins
DISPLAY=999invalid"
# Fake DISPLAY to work around sandbox violations when FEATURES=-userpriv
- # caused by gst-inspect-0.10 (bug #385917)
+ # caused by gst-inspect-0.10 (bug #358755)
if ! use test; then
# pylint is checked unconditionally, but is only used for make check
^ permalink raw reply related [flat|nested] 40+ messages in thread* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2012-04-08 16:06 Alexandre Restovtsev
0 siblings, 0 replies; 40+ messages in thread
From: Alexandre Restovtsev @ 2012-04-08 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 2c3a968d90674165c8b874b65e59d1604dd947e1
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 8 16:04:32 2012 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sun Apr 8 16:04:32 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2c3a968d
media-video/totem: fix sandbox violations
When FEATURES=-userpriv, gst-inspect-0.10 (run by configure) causes
sandbox violations, see bug #358755 comment #14 by Priit Laes. Work
around the problem by passing a dummy DISPLAY value to configure.
---
media-video/totem/totem-3.4.0.ebuild | 5 ++++-
media-video/totem/totem-9999.ebuild | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/media-video/totem/totem-3.4.0.ebuild b/media-video/totem/totem-3.4.0.ebuild
index b954542..f7847bb 100644
--- a/media-video/totem/totem-3.4.0.ebuild
+++ b/media-video/totem/totem-3.4.0.ebuild
@@ -127,7 +127,10 @@ pkg_setup() {
$(use_enable python introspection)
$(use_enable vala)
VALAC=$(type -P valac-0.14)
- BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
+ BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins
+ DISPLAY=999invalid"
+ # Fake DISPLAY to work around sandbox violations when FEATURES=-userpriv
+ # caused by gst-inspect-0.10 (bug #385917)
if ! use test; then
# pylint is checked unconditionally, but is only used for make check
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index b954542..f7847bb 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -127,7 +127,10 @@ pkg_setup() {
$(use_enable python introspection)
$(use_enable vala)
VALAC=$(type -P valac-0.14)
- BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
+ BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins
+ DISPLAY=999invalid"
+ # Fake DISPLAY to work around sandbox violations when FEATURES=-userpriv
+ # caused by gst-inspect-0.10 (bug #385917)
if ! use test; then
# pylint is checked unconditionally, but is only used for make check
^ permalink raw reply related [flat|nested] 40+ messages in thread* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2012-04-02 9:49 Alexandre Restovtsev
0 siblings, 0 replies; 40+ messages in thread
From: Alexandre Restovtsev @ 2012-04-02 9:49 UTC (permalink / raw
To: gentoo-commits
commit: aa1fe72cdec7d1b82c0d8d1c8c45dd3bfa16a6c2
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 2 09:49:31 2012 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Apr 2 09:49:31 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=aa1fe72c
media-video/totem: zeitgeist needs introspection
---
media-video/totem/totem-3.4.0.ebuild | 2 +-
media-video/totem/totem-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/totem/totem-3.4.0.ebuild b/media-video/totem/totem-3.4.0.ebuild
index 2c6b497..b954542 100644
--- a/media-video/totem/totem-3.4.0.ebuild
+++ b/media-video/totem/totem-3.4.0.ebuild
@@ -104,7 +104,7 @@ DEPEND="${RDEPEND}
# see bug #359379
REQUIRED_USE="flash? ( nsplugin )
python? ( introspection )
- zeitgeist? ( vala )"
+ zeitgeist? ( introspection vala )"
# XXX: pylint checks fail because of bad code
RESTRICT="test"
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index 2c6b497..b954542 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -104,7 +104,7 @@ DEPEND="${RDEPEND}
# see bug #359379
REQUIRED_USE="flash? ( nsplugin )
python? ( introspection )
- zeitgeist? ( vala )"
+ zeitgeist? ( introspection vala )"
# XXX: pylint checks fail because of bad code
RESTRICT="test"
^ permalink raw reply related [flat|nested] 40+ messages in thread* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2012-03-26 8:20 Nirbheek Chauhan
0 siblings, 0 replies; 40+ messages in thread
From: Nirbheek Chauhan @ 2012-03-26 8:20 UTC (permalink / raw
To: gentoo-commits
commit: 4876bc6549c7bb8ee379c32b74310cd30ca95eca
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 26 07:06:45 2012 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Mar 26 08:19:39 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4876bc65
Add media-video/totem-3.3.92
---
.../{totem-9999.ebuild => totem-3.3.92.ebuild} | 53 ++++++++++---------
media-video/totem/totem-9999.ebuild | 53 ++++++++++---------
2 files changed, 56 insertions(+), 50 deletions(-)
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-3.3.92.ebuild
similarity index 78%
copy from media-video/totem/totem-9999.ebuild
copy to media-video/totem/totem-3.3.92.ebuild
index cb30a79..f30d37e 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-3.3.92.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.30.0-r1.ebuild,v 1.1 2010/06/13 20:36:55 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.2.2.ebuild,v 1.2 2012/02/20 08:18:35 tetromino Exp $
EAPI="4"
GCONF_DEBUG="yes"
@@ -20,23 +20,23 @@ HOMEPAGE="http://projects.gnome.org/totem/"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
+IUSE="doc grilo +introspection iplayer lirc nautilus nsplugin +python test vala
+zeitgeist zeroconf"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+ KEYWORDS="~amd64 ~x86 ~x86-fbsd"
fi
-IUSE="bluetooth doc grilo +introspection iplayer lirc nautilus nsplugin +python +youtube vala" # zeroconf
# TODO:
# Cone (VLC) plugin needs someone with the right setup (remi ?)
# coherence plugin broken upstream
#
# FIXME: Automagic tracker-0.9.0
-# XXX: Add Zeitgeist support when it gets added to GNOME 3 (3.2?)
# Runtime dependency on gnome-session-2.91
RDEPEND=">=dev-libs/glib-2.27.92:2
>=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-2.99.3:3[introspection?]
+ >=x11-libs/gtk+-3.3.6:3[introspection?]
>=dev-libs/totem-pl-parser-2.32.4[introspection?]
>=dev-libs/libpeas-1.1.0[gtk]
>=x11-themes/gnome-icon-theme-2.16
@@ -61,8 +61,8 @@ RDEPEND=">=dev-libs/glib-2.27.92:2
x11-libs/libX11
x11-libs/libXtst
>=x11-libs/libXxf86vm-1.0.1
+ x11-themes/gnome-icon-theme-symbolic
- bluetooth? ( net-wireless/bluez )
grilo? ( >=media-libs/grilo-0.1.16 )
introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
lirc? ( app-misc/lirc )
@@ -81,13 +81,9 @@ RDEPEND=">=dev-libs/glib-2.27.92:2
dev-python/httplib2
dev-python/feedparser
dev-python/beautifulsoup ) )
- vala? ( >=dev-lang/vala-0.12.1:0.12 )
- youtube? (
- >=dev-libs/libgdata-0.7.0
- net-libs/libsoup:2.4
- media-plugins/gst-plugins-soup:0.10
- >=dev-libs/totem-pl-parser-2.32.4[quvi] )"
-# zeroconf? ( >=net-libs/libepc-0.5.0 )
+ vala? ( >=dev-lang/vala-0.14.2-r1:0.14 )
+ zeitgeist? ( dev-libs/libzeitgeist )
+ zeroconf? ( >net-libs/libepc-0.4.0 )"
# XXX: zeroconf requires unreleased version of libepc
DEPEND="${RDEPEND}
@@ -101,11 +97,16 @@ DEPEND="${RDEPEND}
app-text/docbook-xml-dtd:4.5
gnome-base/gnome-common
dev-util/gtk-doc-am
- doc? ( >=dev-util/gtk-doc-1.14 )"
+ doc? ( >=dev-util/gtk-doc-1.14 )
+ test? ( python? ( dev-python/pylint ) )"
# docbook-xml-dtd is needed for user doc
# see bug #359379
-REQUIRED_USE="python? ( introspection )"
+REQUIRED_USE="python? ( introspection )
+ zeitgeist? ( vala )"
+
+# XXX: pylint checks fail because of bad code
+RESTRICT="test"
pkg_setup() {
DOCS="AUTHORS ChangeLog NEWS README TODO"
@@ -119,27 +120,31 @@ pkg_setup() {
$(use_enable introspection)
$(use_enable nautilus)
$(use_enable nsplugin browser-plugins)
+ $(use_enable nsplugin vegas-plugin)
$(use_enable python)
$(use_enable python introspection)
$(use_enable vala)
- VALAC=$(type -P valac-0.12)
+ VALAC=$(type -P valac-0.14)
BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
+
+ if ! use test; then
+ # pylint is checked unconditionally, but is only used for make check
+ G2CONF="${G2CONF} PYLINT=$(type -P true)"
+ fi
#--with-smclient=auto needed to correctly link to libICE and libSM
# Disabled: sample-python, sample-vala, zeitgeist-dp
local plugins="brasero-disc-recorder,chapters,im-status,gromit"
plugins="${plugins},media-player-keys,ontop,properties,screensaver"
plugins="${plugins},screenshot,sidebar-test,skipto"
- use bluetooth && plugins="${plugins},bemused"
use grilo && plugins="${plugins},grilo"
use iplayer && plugins="${plugins},iplayer"
use lirc && plugins="${plugins},lirc"
use nautilus && plugins="${plugins},save-file"
use python && plugins="${plugins},dbusservice,pythonconsole,opensubtitles"
use vala && plugins="${plugins},rotation"
- use youtube && plugins="${plugins},youtube"
- # XXX: zeroconf requires unreleased version of libepc
- # use zeroconf && plugins="${plugins},publish"
+ use zeitgeist && plugins="${plugins},zeitgeist-dp"
+ use zeroconf && plugins="${plugins},publish"
G2CONF="${G2CONF} --with-plugins=${plugins}"
@@ -156,9 +161,7 @@ src_prepare() {
# eautoreconf
#fi
- # disable pyc compiling
- mv py-compile py-compile.orig
- ln -s $(type -P true) py-compile
+ use python && python_clean_py-compile_files
gnome2_src_prepare
}
@@ -178,5 +181,5 @@ pkg_postinst() {
pkg_postrm() {
gnome2_pkg_postrm
- python_mod_cleanup /usr/$(get_libdir)/totem/plugins
+ use python && python_mod_cleanup /usr/$(get_libdir)/totem/plugins
}
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index cb30a79..f30d37e 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.30.0-r1.ebuild,v 1.1 2010/06/13 20:36:55 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.2.2.ebuild,v 1.2 2012/02/20 08:18:35 tetromino Exp $
EAPI="4"
GCONF_DEBUG="yes"
@@ -20,23 +20,23 @@ HOMEPAGE="http://projects.gnome.org/totem/"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
+IUSE="doc grilo +introspection iplayer lirc nautilus nsplugin +python test vala
+zeitgeist zeroconf"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+ KEYWORDS="~amd64 ~x86 ~x86-fbsd"
fi
-IUSE="bluetooth doc grilo +introspection iplayer lirc nautilus nsplugin +python +youtube vala" # zeroconf
# TODO:
# Cone (VLC) plugin needs someone with the right setup (remi ?)
# coherence plugin broken upstream
#
# FIXME: Automagic tracker-0.9.0
-# XXX: Add Zeitgeist support when it gets added to GNOME 3 (3.2?)
# Runtime dependency on gnome-session-2.91
RDEPEND=">=dev-libs/glib-2.27.92:2
>=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-2.99.3:3[introspection?]
+ >=x11-libs/gtk+-3.3.6:3[introspection?]
>=dev-libs/totem-pl-parser-2.32.4[introspection?]
>=dev-libs/libpeas-1.1.0[gtk]
>=x11-themes/gnome-icon-theme-2.16
@@ -61,8 +61,8 @@ RDEPEND=">=dev-libs/glib-2.27.92:2
x11-libs/libX11
x11-libs/libXtst
>=x11-libs/libXxf86vm-1.0.1
+ x11-themes/gnome-icon-theme-symbolic
- bluetooth? ( net-wireless/bluez )
grilo? ( >=media-libs/grilo-0.1.16 )
introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
lirc? ( app-misc/lirc )
@@ -81,13 +81,9 @@ RDEPEND=">=dev-libs/glib-2.27.92:2
dev-python/httplib2
dev-python/feedparser
dev-python/beautifulsoup ) )
- vala? ( >=dev-lang/vala-0.12.1:0.12 )
- youtube? (
- >=dev-libs/libgdata-0.7.0
- net-libs/libsoup:2.4
- media-plugins/gst-plugins-soup:0.10
- >=dev-libs/totem-pl-parser-2.32.4[quvi] )"
-# zeroconf? ( >=net-libs/libepc-0.5.0 )
+ vala? ( >=dev-lang/vala-0.14.2-r1:0.14 )
+ zeitgeist? ( dev-libs/libzeitgeist )
+ zeroconf? ( >net-libs/libepc-0.4.0 )"
# XXX: zeroconf requires unreleased version of libepc
DEPEND="${RDEPEND}
@@ -101,11 +97,16 @@ DEPEND="${RDEPEND}
app-text/docbook-xml-dtd:4.5
gnome-base/gnome-common
dev-util/gtk-doc-am
- doc? ( >=dev-util/gtk-doc-1.14 )"
+ doc? ( >=dev-util/gtk-doc-1.14 )
+ test? ( python? ( dev-python/pylint ) )"
# docbook-xml-dtd is needed for user doc
# see bug #359379
-REQUIRED_USE="python? ( introspection )"
+REQUIRED_USE="python? ( introspection )
+ zeitgeist? ( vala )"
+
+# XXX: pylint checks fail because of bad code
+RESTRICT="test"
pkg_setup() {
DOCS="AUTHORS ChangeLog NEWS README TODO"
@@ -119,27 +120,31 @@ pkg_setup() {
$(use_enable introspection)
$(use_enable nautilus)
$(use_enable nsplugin browser-plugins)
+ $(use_enable nsplugin vegas-plugin)
$(use_enable python)
$(use_enable python introspection)
$(use_enable vala)
- VALAC=$(type -P valac-0.12)
+ VALAC=$(type -P valac-0.14)
BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
+
+ if ! use test; then
+ # pylint is checked unconditionally, but is only used for make check
+ G2CONF="${G2CONF} PYLINT=$(type -P true)"
+ fi
#--with-smclient=auto needed to correctly link to libICE and libSM
# Disabled: sample-python, sample-vala, zeitgeist-dp
local plugins="brasero-disc-recorder,chapters,im-status,gromit"
plugins="${plugins},media-player-keys,ontop,properties,screensaver"
plugins="${plugins},screenshot,sidebar-test,skipto"
- use bluetooth && plugins="${plugins},bemused"
use grilo && plugins="${plugins},grilo"
use iplayer && plugins="${plugins},iplayer"
use lirc && plugins="${plugins},lirc"
use nautilus && plugins="${plugins},save-file"
use python && plugins="${plugins},dbusservice,pythonconsole,opensubtitles"
use vala && plugins="${plugins},rotation"
- use youtube && plugins="${plugins},youtube"
- # XXX: zeroconf requires unreleased version of libepc
- # use zeroconf && plugins="${plugins},publish"
+ use zeitgeist && plugins="${plugins},zeitgeist-dp"
+ use zeroconf && plugins="${plugins},publish"
G2CONF="${G2CONF} --with-plugins=${plugins}"
@@ -156,9 +161,7 @@ src_prepare() {
# eautoreconf
#fi
- # disable pyc compiling
- mv py-compile py-compile.orig
- ln -s $(type -P true) py-compile
+ use python && python_clean_py-compile_files
gnome2_src_prepare
}
@@ -178,5 +181,5 @@ pkg_postinst() {
pkg_postrm() {
gnome2_pkg_postrm
- python_mod_cleanup /usr/$(get_libdir)/totem/plugins
+ use python && python_mod_cleanup /usr/$(get_libdir)/totem/plugins
}
^ permalink raw reply related [flat|nested] 40+ messages in thread* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2011-11-03 6:13 Alexandre Restovtsev
0 siblings, 0 replies; 40+ messages in thread
From: Alexandre Restovtsev @ 2011-11-03 6:13 UTC (permalink / raw
To: gentoo-commits
commit: efe125ba34e1d967baa3c0ed2381a32978fa57f3
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 3 05:52:02 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu Nov 3 05:52:02 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=efe125ba
media-video/totem: port to EAPI4
Also, let the eclass take care of maintainer mode.
---
media-video/totem/totem-3.2.1.ebuild | 15 +++++----------
media-video/totem/totem-9999.ebuild | 15 +++++----------
2 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/media-video/totem/totem-3.2.1.ebuild b/media-video/totem/totem-3.2.1.ebuild
index 3d089bc..fcc4c51 100644
--- a/media-video/totem/totem-3.2.1.ebuild
+++ b/media-video/totem/totem-3.2.1.ebuild
@@ -2,8 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.30.0-r1.ebuild,v 1.1 2010/06/13 20:36:55 pacho Exp $
-EAPI="3"
-GNOME_TARBALL_SUFFIX="xz"
+EAPI="4"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes" # plugins are dlopened
WANT_AUTOMAKE="1.11"
@@ -105,17 +104,12 @@ DEPEND="${RDEPEND}
doc? ( >=dev-util/gtk-doc-1.14 )"
# docbook-xml-dtd is needed for user doc
-pkg_setup() {
- # To remove when python eclass supports EAPI=4
- # see bug #359379
- if use python && ! use introspection; then
- eerror "USE=python requires USE=introspection"
- die "USE=python requires USE=introspection"
- fi
+# see bug #359379
+REQUIRED_USE="python? ( introspection )"
+pkg_setup() {
DOCS="AUTHORS ChangeLog NEWS README TODO"
G2CONF="${G2CONF}
- --disable-maintainer-mode
--disable-run-in-source-tree
--disable-schemas-compile
--disable-scrollkeeper
@@ -150,6 +144,7 @@ pkg_setup() {
G2CONF="${G2CONF} --with-plugins=${plugins}"
python_set_active_version 2
+ python_pkg_setup
}
src_prepare() {
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index 3d089bc..fcc4c51 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -2,8 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.30.0-r1.ebuild,v 1.1 2010/06/13 20:36:55 pacho Exp $
-EAPI="3"
-GNOME_TARBALL_SUFFIX="xz"
+EAPI="4"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes" # plugins are dlopened
WANT_AUTOMAKE="1.11"
@@ -105,17 +104,12 @@ DEPEND="${RDEPEND}
doc? ( >=dev-util/gtk-doc-1.14 )"
# docbook-xml-dtd is needed for user doc
-pkg_setup() {
- # To remove when python eclass supports EAPI=4
- # see bug #359379
- if use python && ! use introspection; then
- eerror "USE=python requires USE=introspection"
- die "USE=python requires USE=introspection"
- fi
+# see bug #359379
+REQUIRED_USE="python? ( introspection )"
+pkg_setup() {
DOCS="AUTHORS ChangeLog NEWS README TODO"
G2CONF="${G2CONF}
- --disable-maintainer-mode
--disable-run-in-source-tree
--disable-schemas-compile
--disable-scrollkeeper
@@ -150,6 +144,7 @@ pkg_setup() {
G2CONF="${G2CONF} --with-plugins=${plugins}"
python_set_active_version 2
+ python_pkg_setup
}
src_prepare() {
^ permalink raw reply related [flat|nested] 40+ messages in thread* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2011-10-18 7:37 Alexandre Restovtsev
0 siblings, 0 replies; 40+ messages in thread
From: Alexandre Restovtsev @ 2011-10-18 7:37 UTC (permalink / raw
To: gentoo-commits
commit: e74474d7d95da922027b8961b16418245949062c
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Oct 18 06:29:27 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Oct 18 06:29:27 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e74474d7
media-video/totem: 3.2.0 → 3.2.1
Bump, fixes a crash in framerate display.
---
.../{totem-3.2.0.ebuild => totem-3.2.1.ebuild} | 0
1 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/media-video/totem/totem-3.2.0.ebuild b/media-video/totem/totem-3.2.1.ebuild
similarity index 100%
rename from media-video/totem/totem-3.2.0.ebuild
rename to media-video/totem/totem-3.2.1.ebuild
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2011-05-08 18:02 Gilles Dartiguelongue
0 siblings, 0 replies; 40+ messages in thread
From: Gilles Dartiguelongue @ 2011-05-08 18:02 UTC (permalink / raw
To: gentoo-commits
commit: 6b8a943ce7a79c7d56988405a5c933ae5cb3ac98
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun May 8 18:01:41 2011 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun May 8 18:01:41 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6b8a943c
media-video/totem: die when invalid setup detected, bug #359379
---
media-video/totem/totem-3.0.1.ebuild | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/media-video/totem/totem-3.0.1.ebuild b/media-video/totem/totem-3.0.1.ebuild
index 3fee120..b76b62d 100644
--- a/media-video/totem/totem-3.0.1.ebuild
+++ b/media-video/totem/totem-3.0.1.ebuild
@@ -101,6 +101,13 @@ DEPEND="${RDEPEND}
# docbook-xml-dtd is needed for user doc
pkg_setup() {
+ # To remove when python eclass supports EAPI=4
+ # see bug #359379
+ if use python && ! use introspection; then
+ eerror "USE=python requires USE=introspection"
+ die "USE=python requires USE=introspection"
+ fi
+
DOCS="AUTHORS ChangeLog NEWS README TODO"
G2CONF="${G2CONF}
--disable-maintainer-mode
^ permalink raw reply related [flat|nested] 40+ messages in thread* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2011-05-03 16:20 Nirbheek Chauhan
0 siblings, 0 replies; 40+ messages in thread
From: Nirbheek Chauhan @ 2011-05-03 16:20 UTC (permalink / raw
To: gentoo-commits
commit: 50d3b44a26705269e80f5aa7636680d5134a2530
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue May 3 16:11:56 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue May 3 16:12:00 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=50d3b44a
media-video/totem: work around bug 358755
* Access violations
---
media-video/totem/totem-3.0.1.ebuild | 4 ++++
media-video/totem/totem-9999.ebuild | 4 ++++
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/media-video/totem/totem-3.0.1.ebuild b/media-video/totem/totem-3.0.1.ebuild
index cc352c8..3fee120 100644
--- a/media-video/totem/totem-3.0.1.ebuild
+++ b/media-video/totem/totem-3.0.1.ebuild
@@ -142,6 +142,10 @@ src_prepare() {
# AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails
mkdir -p m4
+ # Don't check for gconf sinks, causes access violations that we can't fix.
+ # See bug 358755
+ sed -ri -e 's/gconf[a-z]+sink //g' configure* || die "gconf sed failed"
+
# Fix broken smclient option passing
# FIXME: File a bug for this
epatch "${FILESDIR}/${PN}-2.90.0-smclient-target-detection.patch"
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index cc352c8..3fee120 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -142,6 +142,10 @@ src_prepare() {
# AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails
mkdir -p m4
+ # Don't check for gconf sinks, causes access violations that we can't fix.
+ # See bug 358755
+ sed -ri -e 's/gconf[a-z]+sink //g' configure* || die "gconf sed failed"
+
# Fix broken smclient option passing
# FIXME: File a bug for this
epatch "${FILESDIR}/${PN}-2.90.0-smclient-target-detection.patch"
^ permalink raw reply related [flat|nested] 40+ messages in thread* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2011-04-27 22:22 Gilles Dartiguelongue
0 siblings, 0 replies; 40+ messages in thread
From: Gilles Dartiguelongue @ 2011-04-27 22:22 UTC (permalink / raw
To: gentoo-commits
commit: 209561be49fe6eed3b5e297fb99622700de9a950
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 27 21:32:52 2011 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 21:32:52 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=209561be
media-video/totem: 3.0.0 → 3.0.1
---
.../{totem-3.0.0.ebuild => totem-3.0.1.ebuild} | 0
1 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/media-video/totem/totem-3.0.0.ebuild b/media-video/totem/totem-3.0.1.ebuild
similarity index 100%
rename from media-video/totem/totem-3.0.0.ebuild
rename to media-video/totem/totem-3.0.1.ebuild
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2011-04-10 18:04 Gilles Dartiguelongue
0 siblings, 0 replies; 40+ messages in thread
From: Gilles Dartiguelongue @ 2011-04-10 18:04 UTC (permalink / raw
To: gentoo-commits
commit: a2e3524adb07350efc9fbd24127c385a0194993f
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 9 15:43:58 2011 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 18:03:27 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a2e3524a
media-video/totem: QAed
* Sync with gentoo-x86 changes
(Portage version: 2.2.0_alpha29/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key C6085806)
---
media-video/totem/totem-3.0.0.ebuild | 54 ++++++++++++++++-----------------
media-video/totem/totem-9999.ebuild | 54 ++++++++++++++++-----------------
2 files changed, 52 insertions(+), 56 deletions(-)
diff --git a/media-video/totem/totem-3.0.0.ebuild b/media-video/totem/totem-3.0.0.ebuild
index 3907ae8..cc352c8 100644
--- a/media-video/totem/totem-3.0.0.ebuild
+++ b/media-video/totem/totem-3.0.0.ebuild
@@ -2,33 +2,33 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.30.0-r1.ebuild,v 1.1 2010/06/13 20:36:55 pacho Exp $
-EAPI="2"
+EAPI="3"
+GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes" # plugins are dlopened
WANT_AUTOMAKE="1.11"
PYTHON_DEPEND="python? 2:2.4"
PYTHON_USE_WITH="threads"
PYTHON_USE_WITH_OPT="python"
+
inherit autotools eutils gnome2 multilib python
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
DESCRIPTION="Media player for GNOME"
-HOMEPAGE="http://gnome.org/projects/totem/"
+HOMEPAGE="http://projects.gnome.org/totem/"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
-IUSE="bluetooth debug doc lirc +introspection iplayer nautilus nsplugin
-+python tracker +youtube vala zeroconf"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
fi
+IUSE="bluetooth doc +introspection iplayer lirc nautilus nsplugin +python tracker +youtube vala zeroconf"
# TODO:
# Cone (VLC) plugin needs someone with the right setup (remi ?)
-# check gmyth requirement ? -> waiting for updates in tree
# coherence plugin broken upstream
#
# FIXME: Automagic tracker-0.9.0
@@ -53,37 +53,36 @@ RDEPEND=">=dev-libs/glib-2.27.92:2
media-plugins/gst-plugins-x:0.10
media-plugins/gst-plugins-meta:0.10
+ x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
x11-libs/libXtst
>=x11-libs/libXrandr-1.1.1
>=x11-libs/libXxf86vm-1.0.1
+ bluetooth? ( net-wireless/bluez )
introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
- nsplugin? ( >=x11-misc/shared-mime-info-0.22 )
-
- bluetooth? ( || (
- net-wireless/bluez
- net-wireless/bluez-libs ) )
lirc? ( app-misc/lirc )
nautilus? ( >=gnome-base/nautilus-2.91.3 )
- tracker? ( >=app-misc/tracker-0.9.34 )
- youtube? (
- >=dev-libs/libgdata-0.7.0
- net-libs/libsoup:2.4
- media-plugins/gst-plugins-soup )
-
+ nsplugin? ( >=x11-misc/shared-mime-info-0.22 )
python? (
+ >=dev-libs/gobject-introspection-0.6.7
>=dev-python/pygobject-2.27.0[introspection]
>=x11-libs/gtk+-2.91.7:3[introspection]
dev-python/pyxdg
- dev-python/gst-python
+ dev-python/gst-python:0.10
dev-python/dbus-python
iplayer? (
dev-python/httplib2
dev-python/feedparser
dev-python/beautifulsoup ) )
+ tracker? ( >=app-misc/tracker-0.9.34 )
vala? ( >=dev-lang/vala-0.11.1:0.12 )
+ youtube? (
+ >=dev-libs/libgdata-0.7.0
+ net-libs/libsoup:2.4
+ media-plugins/gst-plugins-soup:0.10
+ >=dev-libs/totem-pl-parser-2.32.4[quvi] )
zeroconf? ( >=net-libs/libepc-0.3 )"
DEPEND="${RDEPEND}
@@ -92,20 +91,17 @@ DEPEND="${RDEPEND}
x11-proto/xextproto
x11-proto/xf86vidmodeproto
app-text/scrollkeeper
- gnome-base/gnome-common
>=app-text/gnome-doc-utils-0.20.3
>=dev-util/intltool-0.40
>=dev-util/pkgconfig-0.20
+ app-text/docbook-xml-dtd:4.5
+ gnome-base/gnome-common
dev-util/gtk-doc-am
- doc? ( >=dev-util/gtk-doc-1.14 )
- app-text/docbook-xml-dtd:4.5"
+ doc? ( >=dev-util/gtk-doc-1.14 )"
# docbook-xml-dtd is needed for user doc
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
pkg_setup() {
- python_set_active_version 2
-
+ DOCS="AUTHORS ChangeLog NEWS README TODO"
G2CONF="${G2CONF}
--disable-maintainer-mode
--disable-run-in-source-tree
@@ -113,9 +109,8 @@ pkg_setup() {
--disable-scrollkeeper
--disable-static
--with-dbus
- --with-smclient=xsmp
+ --with-smclient
--enable-easy-codec-installation
- $(use_enable debug)
$(use_enable introspection)
$(use_enable nautilus)
$(use_enable nsplugin browser-plugins)
@@ -125,7 +120,7 @@ pkg_setup() {
VALAC=$(type -P valac-0.12)
BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
- # Disabled: coherence_upnp, sample-python, zeitgeist-dp
+ # Disabled: coherence_upnp, sample-python, sample-vala, zeitgeist-dp
local plugins="brasero-disc-recorder,chapters,im-status,gromit"
plugins="${plugins},media-player-keys,ontop,properties,screensaver"
plugins="${plugins},screenshot,sidebar-test,skipto,thumbnail"
@@ -139,12 +134,13 @@ pkg_setup() {
use zeroconf && plugins="${plugins},publish"
G2CONF="${G2CONF} --with-plugins=${plugins}"
+
+ python_set_active_version 2
}
src_prepare() {
# AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails
mkdir -p m4
- gnome2_src_prepare
# Fix broken smclient option passing
# FIXME: File a bug for this
@@ -158,6 +154,8 @@ src_prepare() {
# disable pyc compiling
mv py-compile py-compile.orig
ln -s $(type -P true) py-compile
+
+ gnome2_src_prepare
}
pkg_postinst() {
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index 3907ae8..cc352c8 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -2,33 +2,33 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.30.0-r1.ebuild,v 1.1 2010/06/13 20:36:55 pacho Exp $
-EAPI="2"
+EAPI="3"
+GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes" # plugins are dlopened
WANT_AUTOMAKE="1.11"
PYTHON_DEPEND="python? 2:2.4"
PYTHON_USE_WITH="threads"
PYTHON_USE_WITH_OPT="python"
+
inherit autotools eutils gnome2 multilib python
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
DESCRIPTION="Media player for GNOME"
-HOMEPAGE="http://gnome.org/projects/totem/"
+HOMEPAGE="http://projects.gnome.org/totem/"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
-IUSE="bluetooth debug doc lirc +introspection iplayer nautilus nsplugin
-+python tracker +youtube vala zeroconf"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
fi
+IUSE="bluetooth doc +introspection iplayer lirc nautilus nsplugin +python tracker +youtube vala zeroconf"
# TODO:
# Cone (VLC) plugin needs someone with the right setup (remi ?)
-# check gmyth requirement ? -> waiting for updates in tree
# coherence plugin broken upstream
#
# FIXME: Automagic tracker-0.9.0
@@ -53,37 +53,36 @@ RDEPEND=">=dev-libs/glib-2.27.92:2
media-plugins/gst-plugins-x:0.10
media-plugins/gst-plugins-meta:0.10
+ x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
x11-libs/libXtst
>=x11-libs/libXrandr-1.1.1
>=x11-libs/libXxf86vm-1.0.1
+ bluetooth? ( net-wireless/bluez )
introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
- nsplugin? ( >=x11-misc/shared-mime-info-0.22 )
-
- bluetooth? ( || (
- net-wireless/bluez
- net-wireless/bluez-libs ) )
lirc? ( app-misc/lirc )
nautilus? ( >=gnome-base/nautilus-2.91.3 )
- tracker? ( >=app-misc/tracker-0.9.34 )
- youtube? (
- >=dev-libs/libgdata-0.7.0
- net-libs/libsoup:2.4
- media-plugins/gst-plugins-soup )
-
+ nsplugin? ( >=x11-misc/shared-mime-info-0.22 )
python? (
+ >=dev-libs/gobject-introspection-0.6.7
>=dev-python/pygobject-2.27.0[introspection]
>=x11-libs/gtk+-2.91.7:3[introspection]
dev-python/pyxdg
- dev-python/gst-python
+ dev-python/gst-python:0.10
dev-python/dbus-python
iplayer? (
dev-python/httplib2
dev-python/feedparser
dev-python/beautifulsoup ) )
+ tracker? ( >=app-misc/tracker-0.9.34 )
vala? ( >=dev-lang/vala-0.11.1:0.12 )
+ youtube? (
+ >=dev-libs/libgdata-0.7.0
+ net-libs/libsoup:2.4
+ media-plugins/gst-plugins-soup:0.10
+ >=dev-libs/totem-pl-parser-2.32.4[quvi] )
zeroconf? ( >=net-libs/libepc-0.3 )"
DEPEND="${RDEPEND}
@@ -92,20 +91,17 @@ DEPEND="${RDEPEND}
x11-proto/xextproto
x11-proto/xf86vidmodeproto
app-text/scrollkeeper
- gnome-base/gnome-common
>=app-text/gnome-doc-utils-0.20.3
>=dev-util/intltool-0.40
>=dev-util/pkgconfig-0.20
+ app-text/docbook-xml-dtd:4.5
+ gnome-base/gnome-common
dev-util/gtk-doc-am
- doc? ( >=dev-util/gtk-doc-1.14 )
- app-text/docbook-xml-dtd:4.5"
+ doc? ( >=dev-util/gtk-doc-1.14 )"
# docbook-xml-dtd is needed for user doc
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
pkg_setup() {
- python_set_active_version 2
-
+ DOCS="AUTHORS ChangeLog NEWS README TODO"
G2CONF="${G2CONF}
--disable-maintainer-mode
--disable-run-in-source-tree
@@ -113,9 +109,8 @@ pkg_setup() {
--disable-scrollkeeper
--disable-static
--with-dbus
- --with-smclient=xsmp
+ --with-smclient
--enable-easy-codec-installation
- $(use_enable debug)
$(use_enable introspection)
$(use_enable nautilus)
$(use_enable nsplugin browser-plugins)
@@ -125,7 +120,7 @@ pkg_setup() {
VALAC=$(type -P valac-0.12)
BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
- # Disabled: coherence_upnp, sample-python, zeitgeist-dp
+ # Disabled: coherence_upnp, sample-python, sample-vala, zeitgeist-dp
local plugins="brasero-disc-recorder,chapters,im-status,gromit"
plugins="${plugins},media-player-keys,ontop,properties,screensaver"
plugins="${plugins},screenshot,sidebar-test,skipto,thumbnail"
@@ -139,12 +134,13 @@ pkg_setup() {
use zeroconf && plugins="${plugins},publish"
G2CONF="${G2CONF} --with-plugins=${plugins}"
+
+ python_set_active_version 2
}
src_prepare() {
# AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails
mkdir -p m4
- gnome2_src_prepare
# Fix broken smclient option passing
# FIXME: File a bug for this
@@ -158,6 +154,8 @@ src_prepare() {
# disable pyc compiling
mv py-compile py-compile.orig
ln -s $(type -P true) py-compile
+
+ gnome2_src_prepare
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 40+ messages in thread* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2011-04-05 0:57 Nirbheek Chauhan
0 siblings, 0 replies; 40+ messages in thread
From: Nirbheek Chauhan @ 2011-04-05 0:57 UTC (permalink / raw
To: gentoo-commits
commit: 39c5cac958c2c4528af3d392027f0af686663a5e
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 4 16:20:31 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Apr 4 16:20:31 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=39c5cac9
media-video/totem: 2.91.93 → 3.0.0
---
.../{totem-2.91.93.ebuild => totem-3.0.0.ebuild} | 0
1 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/media-video/totem/totem-2.91.93.ebuild b/media-video/totem/totem-3.0.0.ebuild
similarity index 100%
rename from media-video/totem/totem-2.91.93.ebuild
rename to media-video/totem/totem-3.0.0.ebuild
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2011-03-29 8:35 Nirbheek Chauhan
0 siblings, 0 replies; 40+ messages in thread
From: Nirbheek Chauhan @ 2011-03-29 8:35 UTC (permalink / raw
To: gentoo-commits
commit: 901c2c9a6a1a48c5f670be51c5ee403dfa215359
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 29 07:38:15 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Mar 29 08:35:25 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=901c2c9a
media-video/totem: 2.91.92-r1 → 2.91.93
---
...otem-2.91.92-r1.ebuild => totem-2.91.93.ebuild} | 0
1 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/media-video/totem/totem-2.91.92-r1.ebuild b/media-video/totem/totem-2.91.93.ebuild
similarity index 100%
rename from media-video/totem/totem-2.91.92-r1.ebuild
rename to media-video/totem/totem-2.91.93.ebuild
^ permalink raw reply [flat|nested] 40+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2011-03-27 4:02 Nirbheek Chauhan
0 siblings, 0 replies; 40+ messages in thread
From: Nirbheek Chauhan @ 2011-03-27 4:02 UTC (permalink / raw
To: gentoo-commits
commit: e6e6d030e90ed9620b3ed2c3f8dd8de8e2fde142
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 27 04:01:38 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 04:02:11 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e6e6d030
media-video/totem: build screensaver plugin too
* It was missed from configure when it was added
---
...otem-2.91.92.ebuild => totem-2.91.92-r1.ebuild} | 5 ++++-
media-video/totem/totem-9999.ebuild | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/media-video/totem/totem-2.91.92.ebuild b/media-video/totem/totem-2.91.92-r1.ebuild
similarity index 94%
rename from media-video/totem/totem-2.91.92.ebuild
rename to media-video/totem/totem-2.91.92-r1.ebuild
index 6f8afd9..52e1e9f 100644
--- a/media-video/totem/totem-2.91.92.ebuild
+++ b/media-video/totem/totem-2.91.92-r1.ebuild
@@ -123,7 +123,10 @@ pkg_setup() {
VALAC=$(type -P valac-0.12)
BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
- local plugins="brasero-disc-recorder,chapters,im-status,gromit,media-player-keys,ontop,properties,sidebar-test,skipto,screenshot,thumbnail"
+ # Disabled: coherence_upnp, sample-python, zeitgeist-dp
+ local plugins="brasero-disc-recorder,chapters,im-status,gromit"
+ plugins="${plugins},media-player-keys,ontop,properties,screensaver"
+ plugins="${plugins},screenshot,sidebar-test,skipto,thumbnail"
use bluetooth && plugins="${plugins},bemused"
use iplayer && plugins="${plugins},iplayer"
use lirc && plugins="${plugins},lirc"
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index 6f8afd9..52e1e9f 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -123,7 +123,10 @@ pkg_setup() {
VALAC=$(type -P valac-0.12)
BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
- local plugins="brasero-disc-recorder,chapters,im-status,gromit,media-player-keys,ontop,properties,sidebar-test,skipto,screenshot,thumbnail"
+ # Disabled: coherence_upnp, sample-python, zeitgeist-dp
+ local plugins="brasero-disc-recorder,chapters,im-status,gromit"
+ plugins="${plugins},media-player-keys,ontop,properties,screensaver"
+ plugins="${plugins},screenshot,sidebar-test,skipto,thumbnail"
use bluetooth && plugins="${plugins},bemused"
use iplayer && plugins="${plugins},iplayer"
use lirc && plugins="${plugins},lirc"
^ permalink raw reply related [flat|nested] 40+ messages in thread* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2011-03-22 1:18 Nirbheek Chauhan
0 siblings, 0 replies; 40+ messages in thread
From: Nirbheek Chauhan @ 2011-03-22 1:18 UTC (permalink / raw
To: gentoo-commits
commit: c6727c45c1896ad561b65c06e2ee2622ca616208
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 01:04:47 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 01:05:24 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c6727c45
media-video/totem: 2.91.91 → 2.91.92
---
.../{totem-2.91.91.ebuild => totem-2.91.92.ebuild} | 8 ++++----
media-video/totem/totem-9999.ebuild | 16 ++++++++--------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/media-video/totem/totem-2.91.91.ebuild b/media-video/totem/totem-2.91.92.ebuild
similarity index 97%
rename from media-video/totem/totem-2.91.91.ebuild
rename to media-video/totem/totem-2.91.92.ebuild
index 322a347..6f8afd9 100644
--- a/media-video/totem/totem-2.91.91.ebuild
+++ b/media-video/totem/totem-2.91.92.ebuild
@@ -32,14 +32,14 @@ fi
# FIXME: Automagic tracker-0.9.0
# XXX: Add Zeitgeist support when it gets added to GNOME 3 (3.2?)
# Runtime dependency on gnome-session-2.91
-RDEPEND=">=dev-libs/glib-2.27.92
- >=x11-libs/gdk-pixbuf-2.23.0
+RDEPEND=">=dev-libs/glib-2.27.92:2
+ >=x11-libs/gdk-pixbuf-2.23.0:2
>=x11-libs/gtk+-2.99.3:3[introspection?]
- >=dev-libs/totem-pl-parser-2.32.2[introspection?]
+ >=dev-libs/totem-pl-parser-2.32.4[introspection?]
>=dev-libs/libpeas-0.7.2[gtk]
>=x11-themes/gnome-icon-theme-2.16
x11-libs/cairo
- >=dev-libs/libxml2-2.6
+ >=dev-libs/libxml2-2.6:2
>=dev-libs/dbus-glib-0.82
>=media-libs/gstreamer-0.10.30:0.10
>=media-libs/gst-plugins-base-0.10.30:0.10
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index 187dfcd..6f8afd9 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -32,14 +32,14 @@ fi
# FIXME: Automagic tracker-0.9.0
# XXX: Add Zeitgeist support when it gets added to GNOME 3 (3.2?)
# Runtime dependency on gnome-session-2.91
-RDEPEND=">=dev-libs/glib-2.27.92
- >=x11-libs/gdk-pixbuf-2.23.0
+RDEPEND=">=dev-libs/glib-2.27.92:2
+ >=x11-libs/gdk-pixbuf-2.23.0:2
>=x11-libs/gtk+-2.99.3:3[introspection?]
- >=dev-libs/totem-pl-parser-2.32.2[introspection?]
+ >=dev-libs/totem-pl-parser-2.32.4[introspection?]
>=dev-libs/libpeas-0.7.2[gtk]
>=x11-themes/gnome-icon-theme-2.16
x11-libs/cairo
- >=dev-libs/libxml2-2.6
+ >=dev-libs/libxml2-2.6:2
>=dev-libs/dbus-glib-0.82
>=media-libs/gstreamer-0.10.30:0.10
>=media-libs/gst-plugins-base-0.10.30:0.10
@@ -137,6 +137,10 @@ pkg_setup() {
}
src_prepare() {
+ # AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails
+ mkdir -p m4
+ gnome2_src_prepare
+
# Fix broken smclient option passing
# FIXME: File a bug for this
epatch "${FILESDIR}/${PN}-2.90.0-smclient-target-detection.patch"
@@ -146,10 +150,6 @@ src_prepare() {
eautoreconf
fi
- # AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails
- mkdir -p m4
- gnome2_src_prepare
-
# disable pyc compiling
mv py-compile py-compile.orig
ln -s $(type -P true) py-compile
^ permalink raw reply related [flat|nested] 40+ messages in thread* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2011-03-12 1:15 Nirbheek Chauhan
0 siblings, 0 replies; 40+ messages in thread
From: Nirbheek Chauhan @ 2011-03-12 1:15 UTC (permalink / raw
To: gentoo-commits
commit: 31e93a5e4bd88716480973ee5d8053bb4a010d2f
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 12 01:06:41 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sat Mar 12 01:06:41 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=31e93a5e
media-video/totem: eautoreconf after epatch
---
media-video/totem/totem-9999.ebuild | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index 322a347..187dfcd 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -137,10 +137,6 @@ pkg_setup() {
}
src_prepare() {
- # AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails
- mkdir -p m4
- gnome2_src_prepare
-
# Fix broken smclient option passing
# FIXME: File a bug for this
epatch "${FILESDIR}/${PN}-2.90.0-smclient-target-detection.patch"
@@ -150,6 +146,10 @@ src_prepare() {
eautoreconf
fi
+ # AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails
+ mkdir -p m4
+ gnome2_src_prepare
+
# disable pyc compiling
mv py-compile py-compile.orig
ln -s $(type -P true) py-compile
^ permalink raw reply related [flat|nested] 40+ messages in thread* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2011-03-12 1:15 Nirbheek Chauhan
0 siblings, 0 replies; 40+ messages in thread
From: Nirbheek Chauhan @ 2011-03-12 1:15 UTC (permalink / raw
To: gentoo-commits
commit: f99e0e78c4725d80f0e8d76c628af756fb93e9ee
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 10 15:44:50 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Thu Mar 10 15:44:50 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f99e0e78
media-video/totem: 2.91.7 → 2.91.91
---
.../{totem-2.91.7.ebuild => totem-2.91.91.ebuild} | 7 +++----
media-video/totem/totem-9999.ebuild | 7 +++----
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/media-video/totem/totem-2.91.7.ebuild b/media-video/totem/totem-2.91.91.ebuild
similarity index 94%
rename from media-video/totem/totem-2.91.7.ebuild
rename to media-video/totem/totem-2.91.91.ebuild
index 9402b09..322a347 100644
--- a/media-video/totem/totem-2.91.7.ebuild
+++ b/media-video/totem/totem-2.91.91.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://gnome.org/projects/totem/"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
-IUSE="bluetooth debug doc galago lirc +introspection iplayer nautilus nsplugin
+IUSE="bluetooth debug doc lirc +introspection iplayer nautilus nsplugin
+python tracker +youtube vala zeroconf"
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
@@ -31,6 +31,7 @@ fi
#
# FIXME: Automagic tracker-0.9.0
# XXX: Add Zeitgeist support when it gets added to GNOME 3 (3.2?)
+# Runtime dependency on gnome-session-2.91
RDEPEND=">=dev-libs/glib-2.27.92
>=x11-libs/gdk-pixbuf-2.23.0
>=x11-libs/gtk+-2.99.3:3[introspection?]
@@ -62,7 +63,6 @@ RDEPEND=">=dev-libs/glib-2.27.92
bluetooth? ( || (
net-wireless/bluez
net-wireless/bluez-libs ) )
- galago? ( >=dev-libs/libgalago-0.5.2 )
lirc? ( app-misc/lirc )
nautilus? ( >=gnome-base/nautilus-2.91.3 )
tracker? ( >=app-misc/tracker-0.9.34 )
@@ -123,9 +123,8 @@ pkg_setup() {
VALAC=$(type -P valac-0.12)
BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
- local plugins="brasero-disc-recorder,chapters,gromit,media-player-keys,ontop,properties,sidebar-test,skipto,screenshot,thumbnail"
+ local plugins="brasero-disc-recorder,chapters,im-status,gromit,media-player-keys,ontop,properties,sidebar-test,skipto,screenshot,thumbnail"
use bluetooth && plugins="${plugins},bemused"
- use galago && plugins="${plugins},galago"
use iplayer && plugins="${plugins},iplayer"
use lirc && plugins="${plugins},lirc"
use nautilus && plugins="${plugins},save-file"
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index 9402b09..322a347 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://gnome.org/projects/totem/"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
-IUSE="bluetooth debug doc galago lirc +introspection iplayer nautilus nsplugin
+IUSE="bluetooth debug doc lirc +introspection iplayer nautilus nsplugin
+python tracker +youtube vala zeroconf"
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
@@ -31,6 +31,7 @@ fi
#
# FIXME: Automagic tracker-0.9.0
# XXX: Add Zeitgeist support when it gets added to GNOME 3 (3.2?)
+# Runtime dependency on gnome-session-2.91
RDEPEND=">=dev-libs/glib-2.27.92
>=x11-libs/gdk-pixbuf-2.23.0
>=x11-libs/gtk+-2.99.3:3[introspection?]
@@ -62,7 +63,6 @@ RDEPEND=">=dev-libs/glib-2.27.92
bluetooth? ( || (
net-wireless/bluez
net-wireless/bluez-libs ) )
- galago? ( >=dev-libs/libgalago-0.5.2 )
lirc? ( app-misc/lirc )
nautilus? ( >=gnome-base/nautilus-2.91.3 )
tracker? ( >=app-misc/tracker-0.9.34 )
@@ -123,9 +123,8 @@ pkg_setup() {
VALAC=$(type -P valac-0.12)
BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
- local plugins="brasero-disc-recorder,chapters,gromit,media-player-keys,ontop,properties,sidebar-test,skipto,screenshot,thumbnail"
+ local plugins="brasero-disc-recorder,chapters,im-status,gromit,media-player-keys,ontop,properties,sidebar-test,skipto,screenshot,thumbnail"
use bluetooth && plugins="${plugins},bemused"
- use galago && plugins="${plugins},galago"
use iplayer && plugins="${plugins},iplayer"
use lirc && plugins="${plugins},lirc"
use nautilus && plugins="${plugins},save-file"
^ permalink raw reply related [flat|nested] 40+ messages in thread* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2011-02-21 22:35 Nirbheek Chauhan
0 siblings, 0 replies; 40+ messages in thread
From: Nirbheek Chauhan @ 2011-02-21 22:35 UTC (permalink / raw
To: gentoo-commits
commit: 32601dacd094df16780140b044c8a6f349e69851
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 21 22:07:48 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Feb 21 22:07:48 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=32601dac
media-video/totem: update live ebuild
---
media-video/totem/totem-9999.ebuild | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index 2066308..9402b09 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -30,6 +30,7 @@ fi
# coherence plugin broken upstream
#
# FIXME: Automagic tracker-0.9.0
+# XXX: Add Zeitgeist support when it gets added to GNOME 3 (3.2?)
RDEPEND=">=dev-libs/glib-2.27.92
>=x11-libs/gdk-pixbuf-2.23.0
>=x11-libs/gtk+-2.99.3:3[introspection?]
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: media-video/totem/
@ 2011-02-08 9:25 Nirbheek Chauhan
0 siblings, 0 replies; 40+ messages in thread
From: Nirbheek Chauhan @ 2011-02-08 9:25 UTC (permalink / raw
To: gentoo-commits
commit: 4ccb2f294f5ec68cf4bd599930279eba31bb9b3c
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 8 09:25:01 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Feb 8 09:25:01 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4ccb2f29
media-video/totem: 2.91.5 -> 2.91.6
* Build fixes with latest gtk+:3
---
.../{totem-2.91.5.ebuild => totem-2.91.6.ebuild} | 10 +++++++---
media-video/totem/totem-9999.ebuild | 10 +++++++---
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/media-video/totem/totem-2.91.5.ebuild b/media-video/totem/totem-2.91.6.ebuild
similarity index 95%
rename from media-video/totem/totem-2.91.5.ebuild
rename to media-video/totem/totem-2.91.6.ebuild
index e03cb6e..f84d8f9 100644
--- a/media-video/totem/totem-2.91.5.ebuild
+++ b/media-video/totem/totem-2.91.6.ebuild
@@ -32,7 +32,7 @@ fi
# FIXME: Automagic tracker-0.9.0
RDEPEND=">=dev-libs/glib-2.27.92
>=x11-libs/gdk-pixbuf-2.23.0
- >=x11-libs/gtk+-2.99.2:3[introspection?]
+ >=x11-libs/gtk+-2.99.3:3[introspection?]
>=dev-libs/totem-pl-parser-2.32.2[introspection?]
>=dev-libs/libpeas-0.7.1[gtk]
>=x11-themes/gnome-icon-theme-2.16
@@ -137,14 +137,18 @@ pkg_setup() {
}
src_prepare() {
+ # AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails
+ mkdir -p m4
gnome2_src_prepare
# Fix broken smclient option passing
# FIXME: File a bug for this
epatch "${FILESDIR}/${PN}-2.90.0-smclient-target-detection.patch"
- intltoolize --force --copy --automake || die "intltoolize failed"
- eautoreconf
+ if [[ ${PV} != 9999 ]]; then
+ intltoolize --force --copy --automake || die "intltoolize failed"
+ eautoreconf
+ fi
# disable pyc compiling
mv py-compile py-compile.orig
diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index e03cb6e..f84d8f9 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -32,7 +32,7 @@ fi
# FIXME: Automagic tracker-0.9.0
RDEPEND=">=dev-libs/glib-2.27.92
>=x11-libs/gdk-pixbuf-2.23.0
- >=x11-libs/gtk+-2.99.2:3[introspection?]
+ >=x11-libs/gtk+-2.99.3:3[introspection?]
>=dev-libs/totem-pl-parser-2.32.2[introspection?]
>=dev-libs/libpeas-0.7.1[gtk]
>=x11-themes/gnome-icon-theme-2.16
@@ -137,14 +137,18 @@ pkg_setup() {
}
src_prepare() {
+ # AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails
+ mkdir -p m4
gnome2_src_prepare
# Fix broken smclient option passing
# FIXME: File a bug for this
epatch "${FILESDIR}/${PN}-2.90.0-smclient-target-detection.patch"
- intltoolize --force --copy --automake || die "intltoolize failed"
- eautoreconf
+ if [[ ${PV} != 9999 ]]; then
+ intltoolize --force --copy --automake || die "intltoolize failed"
+ eautoreconf
+ fi
# disable pyc compiling
mv py-compile py-compile.orig
^ permalink raw reply related [flat|nested] 40+ messages in thread
end of thread, other threads:[~2019-02-16 23:03 UTC | newest]
Thread overview: 40+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-02 9:45 [gentoo-commits] proj/gnome:master commit in: media-video/totem/ Alexandre Restovtsev
-- strict thread matches above, loose matches on Subject: below --
2019-02-16 23:03 Mart Raudsepp
2018-06-07 22:23 Gilles Dartiguelongue
2018-06-07 22:21 Gilles Dartiguelongue
2018-01-12 14:23 Dennis Lamm
2016-03-27 21:24 Ole Reifschneider
2015-06-10 10:37 Gilles Dartiguelongue
2015-05-14 22:50 Gilles Dartiguelongue
2014-12-26 21:53 Gilles Dartiguelongue
2014-12-01 14:02 Michał Górny
2014-11-23 19:37 Gilles Dartiguelongue
2014-04-20 18:17 Gilles Dartiguelongue
2013-12-12 23:20 Gilles Dartiguelongue
2013-11-28 23:50 Gilles Dartiguelongue
2013-11-14 22:52 Gilles Dartiguelongue
2012-12-24 12:46 Gilles Dartiguelongue
2012-11-09 4:46 Arun Raghavan
2012-11-09 4:20 Arun Raghavan
2012-11-02 0:13 Gilles Dartiguelongue
2012-09-10 17:19 Alexandre Rostovtsev
2012-05-24 9:12 Alexandre Restovtsev
2012-04-10 21:25 Alexandre Restovtsev
2012-04-09 5:48 Alexandre Restovtsev
2012-04-08 16:06 Alexandre Restovtsev
2012-04-02 9:49 Alexandre Restovtsev
2012-03-26 8:20 Nirbheek Chauhan
2011-11-03 6:13 Alexandre Restovtsev
2011-10-18 7:37 Alexandre Restovtsev
2011-05-08 18:02 Gilles Dartiguelongue
2011-05-03 16:20 Nirbheek Chauhan
2011-04-27 22:22 Gilles Dartiguelongue
2011-04-10 18:04 Gilles Dartiguelongue
2011-04-05 0:57 Nirbheek Chauhan
2011-03-29 8:35 Nirbheek Chauhan
2011-03-27 4:02 Nirbheek Chauhan
2011-03-22 1:18 Nirbheek Chauhan
2011-03-12 1:15 Nirbheek Chauhan
2011-03-12 1:15 Nirbheek Chauhan
2011-02-21 22:35 Nirbheek Chauhan
2011-02-08 9:25 Nirbheek Chauhan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox