From: "Alexandre Restovtsev" <tetromino@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:gnome-next commit in: media-video/totem/files/, media-video/totem/
Date: Thu, 4 Aug 2011 04:52:50 +0000 (UTC) [thread overview]
Message-ID: <c27dc5cb6cb8fa4d6be8a96d06e51175406afd0e.tetromino@gentoo> (raw)
commit: c27dc5cb6cb8fa4d6be8a96d06e51175406afd0e
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Aug 3 18:54:44 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Aug 3 20:55:24 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c27dc5cb
media-video/totem: 3.0.1 → 3.1.4
Bump to gnome-3.1.x version with numerous changes. Update dependencies
and plugins. The smclient target patch appears to be no longer needed
(see upstream commit 1a5e4f1b). Commented out intltoolize and
eautoreconf since we aren't changing configure.in any more.
---
.../totem-2.90.0-smclient-target-detection.patch | 39 -------------
.../{totem-3.0.1.ebuild => totem-3.1.4.ebuild} | 51 ++++++++---------
media-video/totem/totem-9999.ebuild | 58 +++++++++++---------
3 files changed, 55 insertions(+), 93 deletions(-)
diff --git a/media-video/totem/files/totem-2.90.0-smclient-target-detection.patch b/media-video/totem/files/totem-2.90.0-smclient-target-detection.patch
deleted file mode 100644
index ad6cc69..0000000
--- a/media-video/totem/files/totem-2.90.0-smclient-target-detection.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -pur totem-2.90.0.orig/configure.in totem-2.90.0/configure.in
---- totem-2.90.0.orig/configure.in 2010-06-19 14:22:16.000000000 -0400
-+++ totem-2.90.0/configure.in 2010-06-25 20:52:05.720211025 -0400
-@@ -153,18 +153,29 @@ GDK_TARGET="$($PKG_CONFIG --variable tar
- SMCLIENT_PKGS=
- AC_MSG_CHECKING([which smclient backend to use])
- AC_ARG_WITH([smclient],
-- [AS_HELP_STRING([--with-smclient],[which smclient backend to use (xsmp/win32/quartz)])],
-+ [AS_HELP_STRING([--with-smclient],[which smclient backend to use @<:@xsmp/win32/quartz/auto@:>@])],
- [],
-- [case "$GDK_TARGET" in
-- x11) with_smclient=xsmp SMCLIENT_PKGS="sm ice" ;;
-+ [$with_smclient=auto])
-+
-+
-+if test "$with_smclient" != "no"; then
-+
-+ if test "$with_smclient" != "auto" -a "$with_smclient" != "yes"; then
-+ GDK_TARGET="$with_smclient"
-+ fi
-+
-+ case "$GDK_TARGET" in
-+ x11|xsmp) with_smclient=xsmp SMCLIENT_PKGS="sm ice" ;;
- win32|quartz) with_smclient=$GDK_TARGET ;;
- *) with_smclient=no ;;
-- esac])
--AC_MSG_RESULT([$with_smclient])
-+ esac
-+
-+ AC_MSG_RESULT([$with_smclient])
-
--if test "$with_smclient" != "no"; then
- PKG_CHECK_MODULES([SMCLIENT],[$SMCLIENT_PKGS])
- AC_DEFINE([WITH_SMCLIENT],[1],[Define if smclient is enabled])
-+else
-+ AC_MSG_RESULT([$with_smclient])
- fi
-
- AM_CONDITIONAL([WITH_SMCLIENT],[test "$with_smclient" != "no"])
diff --git a/media-video/totem/totem-3.0.1.ebuild b/media-video/totem/totem-3.1.4.ebuild
similarity index 79%
rename from media-video/totem/totem-3.0.1.ebuild
rename to media-video/totem/totem-3.1.4.ebuild
index b76b62d..7110154 100644
--- a/media-video/totem/totem-3.0.1.ebuild
+++ b/media-video/totem/totem-3.1.4.ebuild
@@ -3,6 +3,7 @@
# $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"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes" # plugins are dlopened
WANT_AUTOMAKE="1.11"
@@ -10,7 +11,7 @@ PYTHON_DEPEND="python? 2:2.4"
PYTHON_USE_WITH="threads"
PYTHON_USE_WITH_OPT="python"
-inherit autotools eutils gnome2 multilib python
+inherit gnome2 multilib python
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -25,7 +26,7 @@ if [[ ${PV} = 9999 ]]; then
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"
+IUSE="bluetooth doc grilo +introspection iplayer lirc nautilus nsplugin +python +youtube vala zeroconf"
# TODO:
# Cone (VLC) plugin needs someone with the right setup (remi ?)
@@ -38,13 +39,16 @@ 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.4[introspection?]
- >=dev-libs/libpeas-0.7.2[gtk]
+ >=dev-libs/libpeas-1.1.0[gtk]
>=x11-themes/gnome-icon-theme-2.16
x11-libs/cairo
>=dev-libs/libxml2-2.6:2
- >=dev-libs/dbus-glib-0.82
+ >=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
@@ -57,14 +61,16 @@ RDEPEND=">=dev-libs/glib-2.27.92:2
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 )
+ 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? ( >=x11-misc/shared-mime-info-0.22 )
+ 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.27.0[introspection]
@@ -76,8 +82,7 @@ RDEPEND=">=dev-libs/glib-2.27.92:2
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 )
+ vala? ( >=dev-lang/vala-0.12.1:0.12 )
youtube? (
>=dev-libs/libgdata-0.7.0
net-libs/libsoup:2.4
@@ -89,7 +94,6 @@ DEPEND="${RDEPEND}
sys-devel/gettext
x11-proto/xproto
x11-proto/xextproto
- x11-proto/xf86vidmodeproto
app-text/scrollkeeper
>=app-text/gnome-doc-utils-0.20.3
>=dev-util/intltool-0.40
@@ -115,8 +119,7 @@ pkg_setup() {
--disable-schemas-compile
--disable-scrollkeeper
--disable-static
- --with-dbus
- --with-smclient
+ --with-smclient=auto
--enable-easy-codec-installation
$(use_enable introspection)
$(use_enable nautilus)
@@ -126,17 +129,19 @@ pkg_setup() {
$(use_enable vala)
VALAC=$(type -P valac-0.12)
BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
+ #--with-smclient=auto needed to correctly link to libICE and libSM
- # Disabled: coherence_upnp, sample-python, sample-vala, zeitgeist-dp
+ # 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,thumbnail"
+ 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},dbus-service,jamendo,pythonconsole,opensubtitles"
- use tracker && plugins="${plugins},tracker"
+ use python && plugins="${plugins},dbusservice,pythonconsole,opensubtitles"
+ use vala && plugins="${plugins},rotation"
use youtube && plugins="${plugins},youtube"
use zeroconf && plugins="${plugins},publish"
@@ -149,18 +154,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"
-
- if [[ ${PV} != 9999 ]]; then
- intltoolize --force --copy --automake || die "intltoolize failed"
- eautoreconf
- fi
+ #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 3fee120..7110154 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -3,6 +3,7 @@
# $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"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes" # plugins are dlopened
WANT_AUTOMAKE="1.11"
@@ -10,7 +11,7 @@ PYTHON_DEPEND="python? 2:2.4"
PYTHON_USE_WITH="threads"
PYTHON_USE_WITH_OPT="python"
-inherit autotools eutils gnome2 multilib python
+inherit gnome2 multilib python
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -25,7 +26,7 @@ if [[ ${PV} = 9999 ]]; then
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"
+IUSE="bluetooth doc grilo +introspection iplayer lirc nautilus nsplugin +python +youtube vala zeroconf"
# TODO:
# Cone (VLC) plugin needs someone with the right setup (remi ?)
@@ -38,13 +39,16 @@ 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.4[introspection?]
- >=dev-libs/libpeas-0.7.2[gtk]
+ >=dev-libs/libpeas-1.1.0[gtk]
>=x11-themes/gnome-icon-theme-2.16
x11-libs/cairo
>=dev-libs/libxml2-2.6:2
- >=dev-libs/dbus-glib-0.82
+ >=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
@@ -57,14 +61,16 @@ RDEPEND=">=dev-libs/glib-2.27.92:2
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 )
+ 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? ( >=x11-misc/shared-mime-info-0.22 )
+ 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.27.0[introspection]
@@ -76,8 +82,7 @@ RDEPEND=">=dev-libs/glib-2.27.92:2
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 )
+ vala? ( >=dev-lang/vala-0.12.1:0.12 )
youtube? (
>=dev-libs/libgdata-0.7.0
net-libs/libsoup:2.4
@@ -89,7 +94,6 @@ DEPEND="${RDEPEND}
sys-devel/gettext
x11-proto/xproto
x11-proto/xextproto
- x11-proto/xf86vidmodeproto
app-text/scrollkeeper
>=app-text/gnome-doc-utils-0.20.3
>=dev-util/intltool-0.40
@@ -101,6 +105,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
@@ -108,8 +119,7 @@ pkg_setup() {
--disable-schemas-compile
--disable-scrollkeeper
--disable-static
- --with-dbus
- --with-smclient
+ --with-smclient=auto
--enable-easy-codec-installation
$(use_enable introspection)
$(use_enable nautilus)
@@ -119,17 +129,19 @@ pkg_setup() {
$(use_enable vala)
VALAC=$(type -P valac-0.12)
BROWSER_PLUGIN_DIR=/usr/$(get_libdir)/nsbrowser/plugins"
+ #--with-smclient=auto needed to correctly link to libICE and libSM
- # Disabled: coherence_upnp, sample-python, sample-vala, zeitgeist-dp
+ # 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,thumbnail"
+ 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},dbus-service,jamendo,pythonconsole,opensubtitles"
- use tracker && plugins="${plugins},tracker"
+ use python && plugins="${plugins},dbusservice,pythonconsole,opensubtitles"
+ use vala && plugins="${plugins},rotation"
use youtube && plugins="${plugins},youtube"
use zeroconf && plugins="${plugins},publish"
@@ -142,18 +154,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"
-
- if [[ ${PV} != 9999 ]]; then
- intltoolize --force --copy --automake || die "intltoolize failed"
- eautoreconf
- fi
+ #if [[ ${PV} != 9999 ]]; then
+ # intltoolize --force --copy --automake || die "intltoolize failed"
+ # eautoreconf
+ #fi
# disable pyc compiling
mv py-compile py-compile.orig
reply other threads:[~2011-08-04 4:53 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c27dc5cb6cb8fa4d6be8a96d06e51175406afd0e.tetromino@gentoo \
--to=tetromino@gmail.com \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox