From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0EF91138334 for ; Thu, 7 Jun 2018 22:21:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A8C00E0CB9; Thu, 7 Jun 2018 22:21:26 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4A567E0CB9 for ; Thu, 7 Jun 2018 22:21:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8500C335CBB for ; Thu, 7 Jun 2018 22:21:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3FE852C7 for ; Thu, 7 Jun 2018 22:21:22 +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: <1528410057.ab9ba14bbf0e47f029dc6816e191b050dd2e2c14.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: media-video/totem/ X-VCS-Repository: proj/gnome X-VCS-Files: media-video/totem/metadata.xml 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: ab9ba14bbf0e47f029dc6816e191b050dd2e2c14 X-VCS-Branch: master Date: Thu, 7 Jun 2018 22:21:22 +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: a63ca928-b34b-4af2-9891-7b0bb3fbc474 X-Archives-Hash: 497780ad43ac479c0cc881f9f6c74f64 commit: ab9ba14bbf0e47f029dc6816e191b050dd2e2c14 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Thu Jun 7 22:18:13 2018 +0000 Commit: Gilles Dartiguelongue gentoo 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 app-misc/lirc Enable the nautilus extension Build support for dev-lang/python plugins - Build the plugin to inject events to gnome-extra/zeitgeist 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 }