* [gentoo-commits] repo/gentoo:master commit in: media-libs/grilo/files/, media-libs/grilo/
@ 2020-01-28 9:39 Mart Raudsepp
0 siblings, 0 replies; 2+ messages in thread
From: Mart Raudsepp @ 2020-01-28 9:39 UTC (permalink / raw
To: gentoo-commits
commit: d5253b238417b3c0215307a66587eb3f678c9cfc
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 28 09:29:00 2020 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Jan 28 09:34:23 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5253b23
media-libs/grilo: remove old
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
media-libs/grilo/Manifest | 1 -
.../grilo/files/grilo-0.3.9-totem-pl-parser.patch | 36 ----------
media-libs/grilo/grilo-0.3.9.ebuild | 81 ----------------------
3 files changed, 118 deletions(-)
diff --git a/media-libs/grilo/Manifest b/media-libs/grilo/Manifest
index b7594e94c48..79d93997816 100644
--- a/media-libs/grilo/Manifest
+++ b/media-libs/grilo/Manifest
@@ -1,2 +1 @@
DIST grilo-0.3.11.tar.xz 233516 BLAKE2B 4f239ae99bbd0fefe501e60bbb1249641a2996a26cc8342d5b8daf0665baaad268de9e295bf52b0b504da5c9a0a1f9174664c1afe1303e5dc8a5b547b2e1d160 SHA512 fd46d035982b14ed19681acce3f4878cc678919babc031ce5eb577a21d14f97b905eb5094b344b7fc732bf317fb504dae940cffb7875de2d577bae431b7f9c36
-DIST grilo-0.3.9.tar.xz 233616 BLAKE2B c22b868d5bcb6731024b212d6bc1502b493950e363127202ded0ed80f3e937bf78062ba6f2803e29f686ff8cfc521147e69b8f4a7b33060d81e30f34a231e37b SHA512 250596f277ea76d8f6a071fb0e48dd7ea735a534f48a4f2e3f69f7c62a2b5b4c995714a8435ffa9107345e86bba5b21fc136cc47b956f461723a00d0e6ede9bf
diff --git a/media-libs/grilo/files/grilo-0.3.9-totem-pl-parser.patch b/media-libs/grilo/files/grilo-0.3.9-totem-pl-parser.patch
deleted file mode 100644
index 66d844f7912..00000000000
--- a/media-libs/grilo/files/grilo-0.3.9-totem-pl-parser.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 60d135ef64f16671bb0ab4079ecbc59bdc32cbc7 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Tue, 12 Nov 2019 19:44:04 +0100
-Subject: [PATCH] pls: Support totem-pl-parser 3.26.4
-
----
- libs/pls/grl-pls.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/libs/pls/grl-pls.c b/libs/pls/grl-pls.c
-index 62c578b..f6121cc 100644
---- a/libs/pls/grl-pls.c
-+++ b/libs/pls/grl-pls.c
-@@ -47,6 +47,10 @@
- #include <totem-pl-parser.h>
- #include <totem-pl-parser-mini.h>
-
-+#ifndef TOTEM_PL_IS_PARSER(x)
-+#define TOTEM_PL_IS_PARSER(x) TOTEM_IS_PL_PARSER(x)
-+#endif /* TOTEM_PL_IS_PARSER */
-+
- /* --------- Constants -------- */
-
- #define GRL_DATA_PRIV_PLS_IS_PLAYLIST "priv:pls:is_playlist"
-@@ -465,7 +469,7 @@ grl_pls_playlist_entry_parsed_cb (TotemPlParser *parser,
- GRL_DEBUG ("%s (parser=%p, uri=\"%s\", metadata=%p, user_data=%p)",
- __FUNCTION__, parser, uri, metadata, user_data);
-
-- g_return_if_fail (TOTEM_IS_PL_PARSER (parser));
-+ g_return_if_fail (TOTEM_PL_IS_PARSER (parser));
- g_return_if_fail (uri);
- g_return_if_fail (metadata);
- g_return_if_fail (user_data);
---
-2.22.2
-
diff --git a/media-libs/grilo/grilo-0.3.9.ebuild b/media-libs/grilo/grilo-0.3.9.ebuild
deleted file mode 100644
index c7a226b799b..00000000000
--- a/media-libs/grilo/grilo-0.3.9.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org meson python-any-r1 vala xdg
-
-DESCRIPTION="A framework for easy media discovery and browsing"
-HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
-
-LICENSE="LGPL-2.1+"
-SLOT="0.3/0" # subslot is libgrilo-0.3 soname suffix
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE="gtk gtk-doc +introspection +network +playlist test vala"
-REQUIRED_USE="vala? ( introspection )"
-RESTRICT="!test? ( test )"
-
-# oauth could be optional if meson is patched - used for flickr oauth in grilo-test-ui tool
-RDEPEND="
- >=dev-libs/glib-2.44:2
- dev-libs/libxml2:2
- network? ( >=net-libs/libsoup-2.41.3:2.4[introspection?] )
- playlist? ( >=dev-libs/totem-pl-parser-3.4.1 )
- introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-
- gtk? (
- net-libs/liboauth
- >=x11-libs/gtk+-3.14:3 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/glib-utils
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- gtk-doc? (
- >=dev-util/gtk-doc-1.10
- app-text/docbook-xml-dtd:4.3 )
- ${PYTHON_DEPS}
- test? ( sys-apps/dbus )
- vala? ( $(vala_depend) )
-"
-
-PATCHES=(
- # Will be fixed in 0.3.11
- # https://gitlab.gnome.org/GNOME/grilo/commit/60d135ef64f16671bb0ab4079ecbc59bdc32cbc7
- "${FILESDIR}"/${PN}-0.3.9-totem-pl-parser.patch
-)
-
-src_prepare() {
- sed -i -e "s:'GETTEXT_PACKAGE', meson.project_name():'GETTEXT_PACKAGE', 'grilo-${SLOT%/*}':" meson.build || die
- sed -i -e "s:meson.project_name():'grilo-${SLOT%/*}':" po/meson.build || die
- sed -i -e "s:'grilo':'grilo-${SLOT%/*}':" doc/grilo/meson.build || die
-
- # Drop explicit unversioned vapigen check
- sed -i -e "/vapigen.*=.*find_program/d" meson.build || die
-
- # Don't build examples; they get embedded in gtk-doc, thus we don't install the sources with USE=examples either
- sed -i -e "/subdir('examples')/d" meson.build || die
-
- xdg_src_prepare
- use vala && vala_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_use network enable-grl-net)
- $(meson_use playlist enable-grl-pls)
- $(meson_use gtk-doc enable-gtk-doc)
- $(meson_use introspection enable-introspection)
- $(meson_use gtk enable-test-ui)
- $(meson_use vala enable-vala)
- )
- meson_src_configure
-}
-
-src_test() {
- dbus-run-session meson test -C "${BUILD_DIR}" || die
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/grilo/files/, media-libs/grilo/
@ 2019-12-16 22:59 Pacho Ramos
0 siblings, 0 replies; 2+ messages in thread
From: Pacho Ramos @ 2019-12-16 22:59 UTC (permalink / raw
To: gentoo-commits
commit: 30f8642dc3d5c1ace50a75a11d597e2573db5a5c
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 16 22:59:13 2019 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Mon Dec 16 22:59:13 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30f8642d
media-libs/grilo: Support totem-pl-parser-3.26.4
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
.../grilo/files/grilo-0.3.9-totem-pl-parser.patch | 36 ++++++++++++++++++++++
media-libs/grilo/grilo-0.3.9.ebuild | 6 ++++
2 files changed, 42 insertions(+)
diff --git a/media-libs/grilo/files/grilo-0.3.9-totem-pl-parser.patch b/media-libs/grilo/files/grilo-0.3.9-totem-pl-parser.patch
new file mode 100644
index 00000000000..66d844f7912
--- /dev/null
+++ b/media-libs/grilo/files/grilo-0.3.9-totem-pl-parser.patch
@@ -0,0 +1,36 @@
+From 60d135ef64f16671bb0ab4079ecbc59bdc32cbc7 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Tue, 12 Nov 2019 19:44:04 +0100
+Subject: [PATCH] pls: Support totem-pl-parser 3.26.4
+
+---
+ libs/pls/grl-pls.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/libs/pls/grl-pls.c b/libs/pls/grl-pls.c
+index 62c578b..f6121cc 100644
+--- a/libs/pls/grl-pls.c
++++ b/libs/pls/grl-pls.c
+@@ -47,6 +47,10 @@
+ #include <totem-pl-parser.h>
+ #include <totem-pl-parser-mini.h>
+
++#ifndef TOTEM_PL_IS_PARSER(x)
++#define TOTEM_PL_IS_PARSER(x) TOTEM_IS_PL_PARSER(x)
++#endif /* TOTEM_PL_IS_PARSER */
++
+ /* --------- Constants -------- */
+
+ #define GRL_DATA_PRIV_PLS_IS_PLAYLIST "priv:pls:is_playlist"
+@@ -465,7 +469,7 @@ grl_pls_playlist_entry_parsed_cb (TotemPlParser *parser,
+ GRL_DEBUG ("%s (parser=%p, uri=\"%s\", metadata=%p, user_data=%p)",
+ __FUNCTION__, parser, uri, metadata, user_data);
+
+- g_return_if_fail (TOTEM_IS_PL_PARSER (parser));
++ g_return_if_fail (TOTEM_PL_IS_PARSER (parser));
+ g_return_if_fail (uri);
+ g_return_if_fail (metadata);
+ g_return_if_fail (user_data);
+--
+2.22.2
+
diff --git a/media-libs/grilo/grilo-0.3.9.ebuild b/media-libs/grilo/grilo-0.3.9.ebuild
index 8cdfd059b11..654e35f9ba6 100644
--- a/media-libs/grilo/grilo-0.3.9.ebuild
+++ b/media-libs/grilo/grilo-0.3.9.ebuild
@@ -43,6 +43,12 @@ BDEPEND="
vala? ( $(vala_depend) )
"
+PATCHES=(
+ # Will be fixed in 0.3.11
+ # https://gitlab.gnome.org/GNOME/grilo/commit/60d135ef64f16671bb0ab4079ecbc59bdc32cbc7
+ "${FILESDIR}"/${PN}-0.3.9-totem-pl-parser.patch
+)
+
src_prepare() {
sed -i -e "s:'GETTEXT_PACKAGE', meson.project_name():'GETTEXT_PACKAGE', 'grilo-${SLOT%/*}':" meson.build || die
sed -i -e "s:meson.project_name():'grilo-${SLOT%/*}':" po/meson.build || die
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-01-28 9:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-28 9:39 [gentoo-commits] repo/gentoo:master commit in: media-libs/grilo/files/, media-libs/grilo/ Mart Raudsepp
-- strict thread matches above, loose matches on Subject: below --
2019-12-16 22:59 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox