Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-plugins/grilo-plugins/files/, media-plugins/grilo-plugins/
Date: Sat, 16 Feb 2019 16:00:18
Message-Id: 1550332661.1a1c945a4a2221f91a2f9a9e13bf8d4687563995.leio@gentoo
1 commit: 1a1c945a4a2221f91a2f9a9e13bf8d4687563995
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 16 15:57:09 2019 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 16 15:57:41 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a1c945a
7
8 media-plugins/grilo-plugins: bump to 0.3.8
9
10 Instead of gmime, totem-pl-parser is now used for that, moving
11 the non-optional dep to that. Due to that, various optional
12 plugins are now just always built, as they only had pl-parser
13 missing. libsoup is also more widely needed (by a plugin that
14 wasn't optional before); just hard depend on that too, making
15 some more plugins always built, as option would be redundant.
16
17 Help files are installed with slot suffix now, instead of
18 messing with the XML filenames. It doesn't look like they are
19 properly usable in yelp either way (only seems to work if
20 opened up with full path).
21
22 Package-Manager: Portage-2.3.52, Repoman-2.3.12
23 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
24
25 media-plugins/grilo-plugins/Manifest | 1 +
26 .../grilo-plugins/files/0.3.8-meson-goa.patch | 44 +++++++++
27 .../grilo-plugins/grilo-plugins-0.3.8.ebuild | 104 +++++++++++++++++++++
28 3 files changed, 149 insertions(+)
29
30 diff --git a/media-plugins/grilo-plugins/Manifest b/media-plugins/grilo-plugins/Manifest
31 index 39fe541c6b5..29c073c6bbd 100644
32 --- a/media-plugins/grilo-plugins/Manifest
33 +++ b/media-plugins/grilo-plugins/Manifest
34 @@ -1 +1,2 @@
35 DIST grilo-plugins-0.3.7.tar.xz 1892848 BLAKE2B 9894a01dc555f20c3119208e2ee875898c918f8d81e36571a777f7f1776c284d5fa5b4ac9126a352dc812b0f5ba9c15e0e81a2381ef9cb636afb66e272a77cec SHA512 9e69835b3b8f6e2974d799480e2c8c55a084d2089ead6b37112a8c3c79b6bd2142b8fd66952493b7118e09eb5070789408b59bd28784bd9f6bf5ea5a7bc5695d
36 +DIST grilo-plugins-0.3.8.tar.xz 1408952 BLAKE2B 3375275189a25289406b5d9fd6dd42b6c0ad92779b081ce2f480b464929302af7b52fc758f2f6277c94fad38a2b0bbfc8fe9fd668ff98fc0ac7fbeda69a5ac42 SHA512 c5a0a80fd7c871ce69a06bdcab2b3d8986708e4e6b9c9020d7e938d4450655f962db7f84da0b40ed38ba197f65fc2a561e06a92cdca593620d66c2b153eb4879
37
38 diff --git a/media-plugins/grilo-plugins/files/0.3.8-meson-goa.patch b/media-plugins/grilo-plugins/files/0.3.8-meson-goa.patch
39 new file mode 100644
40 index 00000000000..fc3241085ac
41 --- /dev/null
42 +++ b/media-plugins/grilo-plugins/files/0.3.8-meson-goa.patch
43 @@ -0,0 +1,44 @@
44 +From ecee1d8099447b2639d9c38acc344428877d4799 Mon Sep 17 00:00:00 2001
45 +From: Mart Raudsepp <leio@g.o>
46 +Date: Sat, 16 Feb 2019 14:44:44 +0200
47 +Subject: [PATCH] build: Support controlling gnome-online-accounts dependency
48 +
49 +---
50 + meson.build | 4 ++--
51 + meson_options.txt | 1 +
52 + 2 files changed, 3 insertions(+), 2 deletions(-)
53 +
54 +diff --git a/meson.build b/meson.build
55 +index 83a83a0..e79e84f 100644
56 +--- a/meson.build
57 ++++ b/meson.build
58 +@@ -13,7 +13,7 @@ project('grilo-plugins', 'c',
59 + 'warning_level=1'
60 + ],
61 + license: 'LGPL 2.1',
62 +- meson_version: '>= 0.37.0')
63 ++ meson_version: '>= 0.47.0')
64 +
65 + plugin_version = meson.project_version()
66 + version_array = plugin_version.split('.')
67 +@@ -51,7 +51,7 @@ avahi_glib_dep = dependency('avahi-glib', required: false)
68 + avahi_gobject_dep = dependency('avahi-gobject', required: false)
69 + gio_dep = dependency('gio-2.0', required: false)
70 + gio_unix_dep = dependency('gio-unix-2.0', required: false)
71 +-goa_dep = dependency('goa-1.0', version: '>= 3.17.91', required: false)
72 ++goa_dep = dependency('goa-1.0', version: '>= 3.17.91', required: get_option('goa'))
73 + gom_dep = dependency('gom-1.0', version: '>= 0.3.2', required: false)
74 + grilo_net_dep = dependency('grilo-net-0.3', version: '>= 0.3.0', required: false)
75 + grilo_pls_dep = dependency('grilo-pls-0.3', version: '>= 0.3.0', required: false)
76 +diff --git a/meson_options.txt b/meson_options.txt
77 +index 7d96a74..32b51d2 100644
78 +--- a/meson_options.txt
79 ++++ b/meson_options.txt
80 +@@ -21,3 +21,4 @@ option('enable-tmdb', type: 'combo', choices: [ 'auto', 'yes', 'no' ], value: 'a
81 + option('enable-tracker', type: 'combo', choices: [ 'auto', 'yes', 'no' ], value: 'auto', description: 'Enable Tracker plugin')
82 + option('enable-vimeo', type: 'combo', choices: [ 'auto', 'yes', 'no' ], value: 'auto', description: 'Enable Vimeo plugin')
83 + option('enable-youtube', type: 'combo', choices: [ 'auto', 'yes', 'no' ], value: 'auto', description: 'Enable YouTube plugin')
84 ++option('goa', type: 'feature', value: 'auto', description: 'Enable gnome-online-accounts usage')
85 +--
86 +2.17.0
87 +
88
89 diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.3.8.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.3.8.ebuild
90 new file mode 100644
91 index 00000000000..79aa402290f
92 --- /dev/null
93 +++ b/media-plugins/grilo-plugins/grilo-plugins-0.3.8.ebuild
94 @@ -0,0 +1,104 @@
95 +# Copyright 1999-2019 Gentoo Authors
96 +# Distributed under the terms of the GNU General Public License v2
97 +
98 +EAPI=6
99 +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
100 +
101 +inherit gnome.org meson xdg
102 +
103 +DESCRIPTION="A collection of plugins for the Grilo framework"
104 +HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
105 +
106 +LICENSE="LGPL-2.1+"
107 +SLOT="0.3"
108 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
109 +IUSE="daap chromaprint flickr freebox gnome-online-accounts lua test thetvdb tracker upnp-av +youtube"
110 +
111 +# GOA is only optionally used by flickr and lua-factory plugins (checked at v0.3.8)
112 +# json-glib used by tmdb and lua; tmdb currently non-optional
113 +# TODO: validate upnp-av dleyna deps
114 +RDEPEND="
115 + >=dev-libs/glib-2.44:2
116 + >=media-libs/grilo-0.3.6:${SLOT}=[network,playlist]
117 + freebox? (
118 + net-dns/avahi )
119 + >=dev-libs/gom-0.3.2
120 + chromaprint? (
121 + media-libs/gstreamer:1.0
122 + media-libs/gst-plugins-base:1.0
123 + media-plugins/gst-plugins-chromaprint:1.0 )
124 + dev-libs/json-glib
125 + daap? (
126 + >=net-libs/libdmapsharing-2.9.12:3.0 )
127 + media-libs/libmediaart:2.0
128 + net-libs/libsoup:2.4
129 + dev-libs/libxml2:2
130 + flickr? (
131 + net-libs/liboauth )
132 + dev-db/sqlite:3
133 + >=dev-libs/totem-pl-parser-3.4.1
134 + tracker? (
135 + >=app-misc/tracker-0.10.5:= )
136 + upnp-av? (
137 + net-libs/dleyna-connector-dbus
138 + net-misc/dleyna-server )
139 + lua? (
140 + >=dev-lang/lua-5.3
141 + app-arch/libarchive
142 + dev-libs/libxml2:2 )
143 + thetvdb? (
144 + app-arch/libarchive )
145 + youtube? (
146 + >=dev-libs/libgdata-0.9.1:= )
147 +
148 + gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.91:= )
149 +"
150 +DEPEND="${RDEPEND}
151 + app-text/docbook-xml-dtd:4.5
152 + dev-util/itstool
153 + >=sys-devel/gettext-0.19.8
154 + upnp-av? ( >=dev-util/gdbus-codegen-2.44 )
155 + virtual/pkgconfig
156 + lua? ( dev-util/gperf )
157 +"
158 +
159 +PATCHES=(
160 + "${FILESDIR}"/${PV}-meson-goa.patch # Support controlling g-o-a dep via 'goa' meson_options
161 +)
162 +
163 +src_prepare() {
164 + xdg_src_prepare
165 + sed -i -e "s:'GETTEXT_PACKAGE', meson.project_name():'GETTEXT_PACKAGE', 'grilo-plugins-${SLOT%/*}':" meson.build || die
166 + sed -i -e "s:meson.project_name():'grilo-plugins-${SLOT%/*}':" po/meson.build || die
167 + sed -i -e "s:meson.project_name():'grilo-plugins-${SLOT%/*}':" help/meson.build || die
168 +}
169 +
170 +src_configure() {
171 + local emesonargs=(
172 + -Denable-bookmarks=yes
173 + -Denable-chromaprint=$(usex chromaprint yes no)
174 + -Denable-dleyna=$(usex upnp-av yes no)
175 + -Denable-dmap=$(usex daap yes no)
176 + -Denable-filesystem=yes
177 + -Denable-flickr=$(usex flickr yes no)
178 + -Denable-freebox=$(usex freebox yes no)
179 + -Denable-gravatar=yes
180 + -Denable-jamendo=yes
181 + -Denable-local-metadata=yes
182 + -Denable-lua-factory=$(usex lua yes no)
183 + -Denable-magnatune=yes
184 + -Denable-metadata-store=yes
185 + -Denable-opensubtitles=yes
186 + -Denable-optical-media=yes
187 + -Denable-podcasts=yes
188 + -Denable-raitv=yes
189 + -Denable-shoutcast=yes
190 + -Denable-thetvdb=$(usex thetvdb yes no)
191 + -Denable-tmdb=yes
192 + -Denable-tracker=$(usex tracker yes no)
193 + -Denable-vimeo=yes
194 + -Denable-youtube=$(usex youtube yes no)
195 + -Dgoa=$(usex gnome-online-accounts enabled disabled)
196 + )
197 + meson_src_configure
198 +}