From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 069F3138247 for ; Thu, 28 Nov 2013 23:51:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 028D2E0BAA; Thu, 28 Nov 2013 23:50:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 62740E0BAA for ; Thu, 28 Nov 2013 23:50:57 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 15E1033F276 for ; Thu, 28 Nov 2013 23:50:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id DDC74E5532 for ; Thu, 28 Nov 2013 23:50:53 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1385679969.3a0d53dd4d40d78e08343d08bbb95191d45ca166.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: media-video/totem/ X-VCS-Repository: proj/gnome X-VCS-Files: media-video/totem/totem-3.10.0.ebuild media-video/totem/totem-9999.ebuild X-VCS-Directories: media-video/totem/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 3a0d53dd4d40d78e08343d08bbb95191d45ca166 X-VCS-Branch: master Date: Thu, 28 Nov 2013 23:50:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1abf05e5-7300-4845-ad53-7a69b5e406c0 X-Archives-Hash: 02a86506b3016ef3a8803812f18af3fc commit: 3a0d53dd4d40d78e08343d08bbb95191d45ca166 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sun Oct 13 22:21:28 2013 +0000 Commit: Gilles Dartiguelongue gentoo 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} }