diff options
Diffstat (limited to 'media-plugins/grilo-plugins/files')
-rw-r--r-- | media-plugins/grilo-plugins/files/0.3.13-meson-goa.patch | 49 | ||||
-rw-r--r-- | media-plugins/grilo-plugins/files/0.3.13-meson-tracker3-test.patch | 29 |
2 files changed, 78 insertions, 0 deletions
diff --git a/media-plugins/grilo-plugins/files/0.3.13-meson-goa.patch b/media-plugins/grilo-plugins/files/0.3.13-meson-goa.patch new file mode 100644 index 000000000000..8122e57db3fd --- /dev/null +++ b/media-plugins/grilo-plugins/files/0.3.13-meson-goa.patch @@ -0,0 +1,49 @@ +https://gitlab.gnome.org/GNOME/grilo-plugins/-/merge_requests/109 + +From 27585cd5bcfba9e75d8ca9bc86dc0b7b3e5a2e59 Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <leio@gentoo.org> +Date: Sat, 16 Feb 2019 14:44:44 +0200 +Subject: [PATCH] build: Support controlling gnome-online-accounts dep + +On Gentoo, some users prefer to disable gnome-online-accounts since it +brings in the large WebKitGTK dependency. +--- + meson.build | 4 ++-- + meson_options.txt | 1 + + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 74a5d2a9..5f8c7cd4 100644 +--- a/meson.build ++++ b/meson.build +@@ -13,7 +13,7 @@ project('grilo-plugins', 'c', + 'warning_level=1' + ], + license: 'LGPL 2.1', +- meson_version: '>= 0.44.0') ++ meson_version: '>= 0.47.0') + + plugin_version = meson.project_version() + version_array = plugin_version.split('.') +@@ -52,7 +52,7 @@ avahi_glib_dep = dependency('avahi-glib', required: false) + avahi_gobject_dep = dependency('avahi-gobject', required: false) + gio_dep = dependency('gio-2.0', required: false) + gio_unix_dep = dependency('gio-unix-2.0', required: false) +-goa_dep = dependency('goa-1.0', version: '>= 3.17.91', required: false) ++goa_dep = dependency('goa-1.0', version: '>= 3.17.91', required: get_option('goa')) + gom_dep = dependency('gom-1.0', version: '>= 0.4', required: false) + grilo_net_dep = dependency('grilo-net-0.3', version: '>= 0.3.0', required: false, + fallback: ['grilo', 'libgrlnet_dep']) +diff --git a/meson_options.txt b/meson_options.txt +index f5132228..1e0ea090 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -21,4 +21,5 @@ option('enable-tmdb', type: 'combo', choices: [ 'auto', 'yes', 'no' ], value: 'a + option('enable-tracker', type: 'combo', choices: [ 'auto', 'yes', 'no' ], value: 'auto', description: 'Enable Tracker plugin (DEPRECATED)') + option('enable-tracker3', type: 'combo', choices: [ 'auto', 'yes', 'no' ], value: 'auto', description: 'Enable Tracker3 plugin') + option('enable-youtube', type: 'combo', choices: [ 'auto', 'yes', 'no' ], value: 'auto', description: 'Enable YouTube plugin') ++option('goa', type: 'feature', value: 'auto', description: 'Enable gnome-online-accounts usage') + option('help', type: 'combo', choices: [ 'yes', 'no' ], value: 'yes', description: 'Build examples developers') +-- +2.26.3 + diff --git a/media-plugins/grilo-plugins/files/0.3.13-meson-tracker3-test.patch b/media-plugins/grilo-plugins/files/0.3.13-meson-tracker3-test.patch new file mode 100644 index 000000000000..0812d7936b6d --- /dev/null +++ b/media-plugins/grilo-plugins/files/0.3.13-meson-tracker3-test.patch @@ -0,0 +1,29 @@ +https://gitlab.gnome.org/GNOME/grilo-plugins/-/merge_requests/110 + +From 62229a03614add0d3cb6e1087f241407f952de12 Mon Sep 17 00:00:00 2001 +From: Matt Turner <mattst88@gmail.com> +Date: Wed, 14 Apr 2021 22:08:13 -0400 +Subject: [PATCH] build: Only run tracker3 test when enabled + +Previously -Denable-tracker3=no would not build the tracker3 plugin but +if the dependency was found on the system the unit test would still be +enabled (and would fail). +--- + tests/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/meson.build b/tests/meson.build +index 97e196db..7ba2236b 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -39,6 +39,6 @@ if local_metadata_enabled and lua_factory_enabled + subdir('local-metadata') + endif + +-if tracker3_dep.found() and tracker3_testutils_dep.found() ++if get_option('enable-tracker3') != 'no' and tracker3_dep.found() and tracker3_testutils_dep.found() + subdir('tracker3') + endif +-- +2.26.3 + |