From 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 3 Mar 2019 13:42:34 +0000 Subject: gentoo resync : 03.03.2019 --- app-misc/tracker-miners/Manifest | 11 +- .../files/2.1.5-libav-build-fix.patch | 29 -- .../tracker-miners/files/2.1.5-meson-fixes.patch | 322 --------------------- .../files/2.1.5-rss-symlink-fix1.patch | 42 --- .../files/2.1.5-rss-symlink-fix2.patch | 39 --- app-misc/tracker-miners/files/2.1.5-seccomp.patch | 42 --- app-misc/tracker-miners/files/2.1.5-test-fix.patch | 50 ---- .../files/2.1.6-cue-meson-fixes.patch | 67 +++++ .../tracker-miners/tracker-miners-2.1.5.ebuild | 142 --------- .../tracker-miners/tracker-miners-2.1.6.ebuild | 146 ++++++++++ 10 files changed, 216 insertions(+), 674 deletions(-) delete mode 100644 app-misc/tracker-miners/files/2.1.5-libav-build-fix.patch delete mode 100644 app-misc/tracker-miners/files/2.1.5-meson-fixes.patch delete mode 100644 app-misc/tracker-miners/files/2.1.5-rss-symlink-fix1.patch delete mode 100644 app-misc/tracker-miners/files/2.1.5-rss-symlink-fix2.patch delete mode 100644 app-misc/tracker-miners/files/2.1.5-seccomp.patch delete mode 100644 app-misc/tracker-miners/files/2.1.5-test-fix.patch create mode 100644 app-misc/tracker-miners/files/2.1.6-cue-meson-fixes.patch delete mode 100644 app-misc/tracker-miners/tracker-miners-2.1.5.ebuild create mode 100644 app-misc/tracker-miners/tracker-miners-2.1.6.ebuild (limited to 'app-misc/tracker-miners') diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest index f84b3e11dab8..5273b313193a 100644 --- a/app-misc/tracker-miners/Manifest +++ b/app-misc/tracker-miners/Manifest @@ -1,9 +1,4 @@ -AUX 2.1.5-libav-build-fix.patch 1054 BLAKE2B 30f0364d7f2f6469f6a2867fbbfb428f2b847b2bdebb766e7fa51faad03b10ee542b17602b69463233973b316d27c0943acc9e3104126cf86df54e07bc6bbdef SHA512 7534b850f30f72c6ef294977c8946f0e57bc6635069de45b66f38ca50aac9d2e745da0f51efc916e60bf70110aae5c39d3d73bea47537d6e0d4326ef219b1c02 -AUX 2.1.5-meson-fixes.patch 16177 BLAKE2B 59c7ddaadb703612eadc500ba2cd60333d65f127e36a9dee4b60c65710b53e0cfdfa5b2829c8b334170e76e5eb37c1cc69c014150b928d7f897522f1141e1514 SHA512 d3bcb47e5e7449f9990d6aee261b72d943f61d610661652f18bda61270532591342a00c11b2de04b74744398b83a95c990271f1c7a7f07bfb5cf9db8f4c4b59a -AUX 2.1.5-rss-symlink-fix1.patch 1815 BLAKE2B 310b5a666fc2c074e07515676f826ba594ef5d672f1493a54ee81f27087f7b9d9107bc7f4f9bba34192d9d7a51482cb2eabc8f5129bc4f9f1f3e5eb8571e3a8d SHA512 7d09dc8e45fe897af3f8a2b91a69aab790f593b3ab16a66a4d3df3a6d694c7e4d709439e4ea8ddcf8dd4f9629634e64a0bba48013a48c628db6674f1d55d01f0 -AUX 2.1.5-rss-symlink-fix2.patch 1699 BLAKE2B 654e60d78af3036e47b8d1e152f24206a36250e2f80e37cd0a04ff1d34d9227a644e48cdbadedd8d620abe514ac1565462075e2d00020f14ab22d7d6d023bf1c SHA512 ced53feae62278acf4e5b35b48ede3b7982c4b2c2b973ca17a40272f93db23824122f2c262ad482901ddbc85bf91839e70a17e90684d36ad21e5af49e28eb68a -AUX 2.1.5-seccomp.patch 1132 BLAKE2B e5f66ae4ab30b80fac96a54b58974a13a89f007e939c004680a163c98bc082dc710133443a7905bebaf71ace6f4138fbaf92586547c73da8da3d87f01d989b48 SHA512 7a5629dfd1854252c12066299bf5e3247524133dc54478fdadeeeb1b5945d2a3486a78f93223a56349be2539148a45046ffa5e6ec770ac3d203977de5a5392e6 -AUX 2.1.5-test-fix.patch 1710 BLAKE2B 4e22251796d78fbfd7b1503bcebb58d4c9361c9c98613575ac9cf560724a83a3d5e5168427b131c2916e5a9727668b83295fffe1a03b7eb503aaf4fcc136bfc9 SHA512 8ff2471fd2781cfa87b4fa08a0e5237e8610235795f773799019dbff59785bb010f167bebdce5545de67acc2c4a69674aa41968854e739bc260916d602754cbf -DIST tracker-miners-2.1.5.tar.xz 3455264 BLAKE2B 1e9149ae0767166fc8e936922e4e02d4391f7af3faf59525e32098fb10cb6c5f6970f13bdb35f675efc9f131672b3feb84cbdcd8d0f01c86d05880919fba463a SHA512 37bf6d44635843037613cfe681cd536a8b33ba34c092183d9d66289713deaaff5322d09028b447484e6bf72a01199c041fb295d6431d2f7cff3498ef8983f605 -EBUILD tracker-miners-2.1.5.ebuild 4502 BLAKE2B ae176fccf4766badd611ac332798300fb9e530a9009541ce55893a20f931923f8fea7fa8c9526af1a038a1f5934e84beed6764882c3a06e1ee9e1b624f075609 SHA512 b7a9a87470333e6b6c69f8e9ee6f4b734203cfce5c22ca0fa94e0b5eeff1a4038b9579d997f28e741adc7e16f9acb38021674a01efa48562894237cb62a05396 +AUX 2.1.6-cue-meson-fixes.patch 2632 BLAKE2B d3d63e27b8d1ff4f3463826399133c2396dbb17fb38e9aae43df8da43aea1c05ccb6c0567235773ecaa8a5741dc75ec1be49ec06d604f6751d79e32fbb3d153a SHA512 3cfda20f1be0c956de2de2b2cc70960373c2d74ddbb895480026faa32e053bcec4db42473d15d8b37d567d2fdd2b8ccb34e8bbdcc9446fb03089eefe2fe8bd4f +DIST tracker-miners-2.1.6.tar.xz 3456848 BLAKE2B 60b4af9ea755b79c2d31150d744468c6b980238eef542b9be382316eaf7310e137c501f9f705319e203ac3fba11e554202f6d1ee8e5a1ebcdf9b0d59aaa5e380 SHA512 3ded014c98f7be2b610fbe76c3a2b006a9ec85b090d2d3ca3e943e89b58b520da291ebfebe9efd579fe330fd49fced8f792eeba3b8e56f91fd2358bdaff4cdf2 +EBUILD tracker-miners-2.1.6.ebuild 4482 BLAKE2B a5d534d8b1feda1dc7cb311cbf1b6dc2483b12121afa0e8317938874c7fbf7139f0f4158d659cac7d440dcf2059e574c81d4cd4377cde74398f72b075b13bb0f SHA512 6b9cc1269db9912eb93daa4a1a2d4f24004383243de683e3e809d2d73cd1243e82d0c9f43ab3dd345a483ec69f0af0d1d04327cd6c4ad5a4b6d6074d28f3b42c MISC metadata.xml 739 BLAKE2B 0ac1d8e892ef4b1caebea7f598b35694bc21956680ccfc16b2693528f913fde9354fb984fc09f20bbf9ad3671af2438818691d05fbfc05a06783cd2aa401ed8c SHA512 e685c1ed8e5029828251ed7a6e8124e8716b365172d976116a29aea67ec01744450892a30e53ce0a3ae4f1fa2b41d9af8fd4429667c31478e83aa3086cc0aa01 diff --git a/app-misc/tracker-miners/files/2.1.5-libav-build-fix.patch b/app-misc/tracker-miners/files/2.1.5-libav-build-fix.patch deleted file mode 100644 index 580ecb34ba22..000000000000 --- a/app-misc/tracker-miners/files/2.1.5-libav-build-fix.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b55c22542de4f0f0166c6e5510ef0ec90bc69f18 Mon Sep 17 00:00:00 2001 -From: Carlos Garnacho -Date: Mon, 10 Sep 2018 16:19:20 +0200 -Subject: [PATCH] build: Fix build with libav - -The extractor rules defined an array inside an array, which configure_file() -wouldn't accept. - -(cherry picked from commit fff231c16b2ad9a2824f09c5b81f31ee220fba6f) ---- - src/tracker-extract/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/tracker-extract/meson.build b/src/tracker-extract/meson.build -index 9834dc422..bf19f8bac 100644 ---- a/src/tracker-extract/meson.build -+++ b/src/tracker-extract/meson.build -@@ -60,7 +60,7 @@ if libjpeg.found() - endif - - if generic_media_handler_name == 'libav' -- rules = ['90-libav-audio-generic.rule', ['90-libav-video-generic.rule']] -+ rules = ['90-libav-audio-generic.rule', '90-libav-video-generic.rule'] - dependencies = [avcodec, avformat, avutil, tracker_miners_common_dep] - modules += [['extract-libav', 'tracker-extract-libav.c', rules, dependencies]] - endif --- -2.17.0 - diff --git a/app-misc/tracker-miners/files/2.1.5-meson-fixes.patch b/app-misc/tracker-miners/files/2.1.5-meson-fixes.patch deleted file mode 100644 index c8a3e6358df8..000000000000 --- a/app-misc/tracker-miners/files/2.1.5-meson-fixes.patch +++ /dev/null @@ -1,322 +0,0 @@ -From 5bb0709044fabe496601277ab5ba11a03500babe Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp -Date: Fri, 15 Feb 2019 00:15:08 +0200 -Subject: [PATCH 1/5] build: Add feature options for all external deps - -Automagic dependencies are bad for distributions. Add feature options -for all of them that didn't have it before. If no options are specified, -the behavior matches with before, but now it's possible to specify -exactly what is linked to and what isn't. - -Fixes: #39 ---- - meson.build | 40 +++++++++++++++++++++------------------- - meson_options.txt | 37 +++++++++++++++++++++++++++++++++++++ - 2 files changed, 58 insertions(+), 19 deletions(-) - -diff --git a/meson.build b/meson.build -index fd536f2e6..4f0e9a968 100644 ---- a/meson.build -+++ b/meson.build -@@ -1,4 +1,6 @@ --project('tracker-miners', 'c', 'vala', version: '2.1.5') -+project('tracker-miners', 'c', 'vala', -+ version: '2.1.5', -+ meson_version: '>=0.47') - - gnome = import('gnome') - i18n = import('i18n') -@@ -57,9 +59,9 @@ avcodec = dependency('libavcodec', version: '>= 0.8.4', required: false) - avformat = dependency('libavformat', version: '>= 0.8.4', required: false) - avutil = dependency('libavutil', version: '>= 0.8.4', required: false) - dbus = dependency('dbus-1', version: '> 1.3.1') --exempi = dependency('exempi-2.0', version: '> 2.1.0', required: false) --flac = dependency('flac', version: '> 1.2.1', required: false) --gexiv2 = dependency('gexiv2', required: false) -+exempi = dependency('exempi-2.0', version: '> 2.1.0', required: get_option('xmp')) -+flac = dependency('flac', version: '> 1.2.1', required: get_option('flac')) -+gexiv2 = dependency('gexiv2', required: get_option('raw')) - gio = dependency('gio-2.0', version: '>' + glib_required) - gio_unix = dependency('gio-unix-2.0', version: '>' + glib_required) - glib = dependency('glib-2.0', version: '>' + glib_required) -@@ -72,25 +74,25 @@ gupnp_dlna = dependency('gupnp-dlna-2.0', version: '> 0.9.4', required: false) - gupnp_dlna_gst = dependency('gupnp-dlna-gst-2.0', version: '> 0.9.4', required: false) - icu_i18n = dependency('icu-i18n', version: '> 4.8.1.1', required: false) - icu_uc = dependency('icu-uc', version: '> 4.8.1.1', required: false) --libcue = dependency('libcue', required: false) --libexif = dependency('libexif', version: '> 0.6', required: false) --libgsf = dependency('libgsf-1', version: '> 1.14.24', required: false) --libgxps = dependency('libgxps', required: false) --libiptcdata = dependency('libiptcdata', required: false) --libjpeg = dependency('libjpeg', required: false) --libosinfo = dependency('libosinfo-1.0', version: '> 0.2.9', required: false) --libpng = dependency('libpng', version: '> 0.89', required: false) -+libcue = dependency('libcue', required: get_option('cue')) -+libexif = dependency('libexif', version: '> 0.6', required: get_option('exif')) -+libgsf = dependency('libgsf-1', version: '> 1.14.24', required: get_option('gsf')) -+libgxps = dependency('libgxps', required: get_option('xps')) -+libiptcdata = dependency('libiptcdata', required: get_option('iptc')) -+libjpeg = dependency('libjpeg', required: get_option('jpeg')) -+libosinfo = dependency('libosinfo-1.0', version: '> 0.2.9', required: get_option('iso')) -+libpng = dependency('libpng', version: '> 0.89', required: get_option('png')) - libseccomp = dependency('libseccomp', version: '>= 2.0', required: false) --libtiff = dependency('libtiff-4', required: false) --libxml2 = dependency('libxml-2.0', version: '> 2.6') --libvorbis = dependency('vorbisfile', version: '> 0.22') --poppler = dependency('poppler-glib', version: '> 0.16.0', required: false) --taglib = dependency('taglib_c', version: '> 1.6', required: false) --totem_plparser = dependency('totem-plparser', required: false) -+libtiff = dependency('libtiff-4', required: get_option('tiff')) -+libxml2 = dependency('libxml-2.0', version: '> 2.6', required: get_option('xml')) -+libvorbis = dependency('vorbisfile', version: '> 0.22', required: get_option('vorbis')) -+poppler = dependency('poppler-glib', version: '> 0.16.0', required: get_option('pdf')) -+taglib = dependency('taglib_c', version: '> 1.6', required: get_option('taglib')) -+totem_plparser = dependency('totem-plparser', required: get_option('playlist')) - upower = dependency('upower-glib', version: '> 0.9.0', required: false) - zlib = dependency('zlib') - --libgif = cc.find_library('gif', required: false) -+libgif = cc.find_library('gif', required: get_option('gif')) - libmath = cc.find_library('m', required: false) - - # FIXME: here we work around a quirk todo with Meson and Vala: the 'uuid' -diff --git a/meson_options.txt b/meson_options.txt -index a91ac6c0f..5fce7a529 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -35,6 +35,43 @@ option('text', type: 'boolean', value: 'true', - option('unzip_ps_gz_files', type: 'boolean', value: 'true', - description: 'Enable extractor for PS.GZ metadata') - -+option('cue', type: 'feature', value: 'auto', -+ description: 'Support cue sheet parsing') -+option('exif', type: 'feature', value: 'auto', -+ description: 'Support EXIF metadata') -+option('flac', type: 'feature', value: 'auto', -+ description: 'Support extracting metadata from Flac audio') -+option('gif', type: 'feature', value: 'auto', -+ description: 'Support extracting metadata from GIF images') -+option('gsf', type: 'feature', value: 'auto', -+ description: 'Support extracting metadata from MS & Open Office documents') -+option('iptc', type: 'feature', value: 'auto', -+ description: 'Support IPTC photo metadata') -+option('iso', type: 'feature', value: 'auto', -+ description: 'Support ISO image parsing') -+option('jpeg', type: 'feature', value: 'auto', -+ description: 'Support extracting metadata from JPEG images') -+option('pdf', type: 'feature', value: 'auto', -+ description: 'Support extracting metadata from PDF documents') -+option('playlist', type: 'feature', value: 'auto', -+ description: 'Support extracting metadata from playlists (w/ Totem)') -+option('png', type: 'feature', value: 'auto', -+ description: 'Support extracting metadata from PNG images') -+option('raw', type: 'feature', value: 'auto', -+ description: 'Support extracting metadata from RAW photos') -+option('taglib', type: 'feature', value: 'auto', -+ description: 'Support writeback for audio files using Taglib') -+option('tiff', type: 'feature', value: 'auto', -+ description: 'Support extracting metadata from TIFF images') -+option('vorbis', type: 'feature', value: 'auto', -+ description: 'Support extracting metadata from Vorbis (ogg/etc) files') -+option('xml', type: 'feature', value: 'auto', -+ description: 'Support extracting metadata from XML and HTML documents') -+option('xmp', type: 'feature', value: 'auto', -+ description: 'Support XMP metadata') -+option('xps', type: 'feature', value: 'auto', -+ description: 'Support extracting metadata from XPS documents') -+ - option('battery_detection', type: 'combo', choices: ['auto', 'hal', 'upower', 'none'], value: 'auto', - description: 'Enable upower or HAL for battery/mains power detection') - option('charset_detection', type: 'combo', choices: ['auto', 'enca', 'icu', 'none'], value: 'auto', --- -2.17.0 - - -From b8c1768696c13275f5896374907fa192140ec922 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp -Date: Fri, 15 Feb 2019 00:18:09 +0200 -Subject: [PATCH 2/5] build: Fix minimum dep checks to allow the specified - version too - -Many of the minimum deps were expressed as "> x.y", but were meant to -allow x.y itself as well. Change all to ">= x.y". This seems to be -what was intended and was the case with autotools. ---- - meson.build | 44 ++++++++++++++++++++++---------------------- - 1 file changed, 22 insertions(+), 22 deletions(-) - -diff --git a/meson.build b/meson.build -index 4f0e9a968..4263faf95 100644 ---- a/meson.build -+++ b/meson.build -@@ -58,38 +58,38 @@ endif - avcodec = dependency('libavcodec', version: '>= 0.8.4', required: false) - avformat = dependency('libavformat', version: '>= 0.8.4', required: false) - avutil = dependency('libavutil', version: '>= 0.8.4', required: false) --dbus = dependency('dbus-1', version: '> 1.3.1') --exempi = dependency('exempi-2.0', version: '> 2.1.0', required: get_option('xmp')) --flac = dependency('flac', version: '> 1.2.1', required: get_option('flac')) -+dbus = dependency('dbus-1', version: '>= 1.3.1') -+exempi = dependency('exempi-2.0', version: '>= 2.1.0', required: get_option('xmp')) -+flac = dependency('flac', version: '>= 1.2.1', required: get_option('flac')) - gexiv2 = dependency('gexiv2', required: get_option('raw')) --gio = dependency('gio-2.0', version: '>' + glib_required) --gio_unix = dependency('gio-unix-2.0', version: '>' + glib_required) --glib = dependency('glib-2.0', version: '>' + glib_required) --gmodule = dependency('gmodule-2.0', version: '>' + glib_required) --gobject = dependency('gobject-2.0', version: '>' + glib_required) -+gio = dependency('gio-2.0', version: '>=' + glib_required) -+gio_unix = dependency('gio-unix-2.0', version: '>=' + glib_required) -+glib = dependency('glib-2.0', version: '>=' + glib_required) -+gmodule = dependency('gmodule-2.0', version: '>=' + glib_required) -+gobject = dependency('gobject-2.0', version: '>=' + glib_required) - gstreamer = dependency('gstreamer-1.0', required: false) - gstreamer_pbutils = dependency('gstreamer-pbutils-1.0', required: false) - gstreamer_tag = dependency('gstreamer-tag-1.0', required: false) --gupnp_dlna = dependency('gupnp-dlna-2.0', version: '> 0.9.4', required: false) --gupnp_dlna_gst = dependency('gupnp-dlna-gst-2.0', version: '> 0.9.4', required: false) --icu_i18n = dependency('icu-i18n', version: '> 4.8.1.1', required: false) --icu_uc = dependency('icu-uc', version: '> 4.8.1.1', required: false) -+gupnp_dlna = dependency('gupnp-dlna-2.0', version: '>= 0.9.4', required: false) -+gupnp_dlna_gst = dependency('gupnp-dlna-gst-2.0', version: '>= 0.9.4', required: false) -+icu_i18n = dependency('icu-i18n', version: '>= 4.8.1.1', required: false) -+icu_uc = dependency('icu-uc', version: '>= 4.8.1.1', required: false) - libcue = dependency('libcue', required: get_option('cue')) --libexif = dependency('libexif', version: '> 0.6', required: get_option('exif')) --libgsf = dependency('libgsf-1', version: '> 1.14.24', required: get_option('gsf')) -+libexif = dependency('libexif', version: '>= 0.6', required: get_option('exif')) -+libgsf = dependency('libgsf-1', version: '>= 1.14.24', required: get_option('gsf')) - libgxps = dependency('libgxps', required: get_option('xps')) - libiptcdata = dependency('libiptcdata', required: get_option('iptc')) - libjpeg = dependency('libjpeg', required: get_option('jpeg')) --libosinfo = dependency('libosinfo-1.0', version: '> 0.2.9', required: get_option('iso')) --libpng = dependency('libpng', version: '> 0.89', required: get_option('png')) -+libosinfo = dependency('libosinfo-1.0', version: '>= 0.2.9', required: get_option('iso')) -+libpng = dependency('libpng', version: '>= 0.89', required: get_option('png')) - libseccomp = dependency('libseccomp', version: '>= 2.0', required: false) - libtiff = dependency('libtiff-4', required: get_option('tiff')) --libxml2 = dependency('libxml-2.0', version: '> 2.6', required: get_option('xml')) --libvorbis = dependency('vorbisfile', version: '> 0.22', required: get_option('vorbis')) --poppler = dependency('poppler-glib', version: '> 0.16.0', required: get_option('pdf')) --taglib = dependency('taglib_c', version: '> 1.6', required: get_option('taglib')) -+libxml2 = dependency('libxml-2.0', version: '>= 2.6', required: get_option('xml')) -+libvorbis = dependency('vorbisfile', version: '>= 0.22', required: get_option('vorbis')) -+poppler = dependency('poppler-glib', version: '>= 0.16.0', required: get_option('pdf')) -+taglib = dependency('taglib_c', version: '>= 1.6', required: get_option('taglib')) - totem_plparser = dependency('totem-plparser', required: get_option('playlist')) --upower = dependency('upower-glib', version: '> 0.9.0', required: false) -+upower = dependency('upower-glib', version: '>= 0.9.0', required: false) - zlib = dependency('zlib') - - libgif = cc.find_library('gif', required: get_option('gif')) -@@ -143,7 +143,7 @@ elif get_option('battery_detection') == 'upower' - endif - - if battery_detection_library_name == '' -- hal = dependency('hal', version: '> 0.5', required: false) -+ hal = dependency('hal', version: '>= 0.5', required: false) - - if hal.found() - battery_detection_library = hal --- -2.17.0 - - -From 6a215b9088abb9df4a837c1b74f281454f286ddf Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp -Date: Fri, 15 Feb 2019 01:11:23 +0200 -Subject: [PATCH 3/5] build: Remove unnecessary vala language dependency - -tracker-miners doesn't use any vala, but due to vala declared as -a used language it does error out if valac isn't found. Remove the -language and unused vapi helper variable. ---- - meson.build | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index 4263faf95..bfd2d624b 100644 ---- a/meson.build -+++ b/meson.build -@@ -1,4 +1,4 @@ --project('tracker-miners', 'c', 'vala', -+project('tracker-miners', 'c', - version: '2.1.5', - meson_version: '>=0.47') - -@@ -385,7 +385,6 @@ tracker_writeback_modules_dir = join_paths(get_option('prefix'), get_option('lib - tracker_uninstalled_extract_rules_dir = join_paths(meson.current_build_dir(), 'src', 'tracker-extract') - - gsettings_schema_dir = join_paths(get_option('prefix'), get_option('datadir'), 'glib-2.0', 'schemas') --vapi_dir = join_paths(get_option('prefix'), get_option('datadir'), 'vala', 'vapi') - - glib_mkenums = find_program('glib-mkenums') - --- -2.17.0 - - -From a163936b590184291c6ac6b8365eb5f7e9bf3474 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp -Date: Fri, 15 Feb 2019 01:12:25 +0200 -Subject: [PATCH 4/5] build: Remove unnecessary uuid util-linux hard dependency - -tracker core might use uuid, but nothing in tracker-miners needs it ---- - meson.build | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/meson.build b/meson.build -index bfd2d624b..8d23a1157 100644 ---- a/meson.build -+++ b/meson.build -@@ -95,14 +95,6 @@ zlib = dependency('zlib') - libgif = cc.find_library('gif', required: get_option('gif')) - libmath = cc.find_library('m', required: false) - --# FIXME: here we work around a quirk todo with Meson and Vala: the 'uuid' --# pkg-config component corresponds to 'libuuid.vapi', but Meson assumes that --# .vapi name always matches pkg-config name, and will add `--pkg uuid` to the --# Vala commandline. By finding 'uuid' using find_library() instead, we get --# a dependency object back that won't cause any `--pkg` arguments to be added --# to the Vala commandline, but still works as expected for C code. --uuid = cc.find_library('uuid') -- - have_tracker_extract = get_option('extract') - have_tracker_miner_apps = get_option('miner_apps') - have_tracker_miner_fs = get_option('miner_fs') --- -2.17.0 - - -From cc87c22592868e700333f31f333bf850c89f0135 Mon Sep 17 00:00:00 2001 -From: Sam Thursfield -Date: Sun, 7 Oct 2018 23:42:28 +0200 -Subject: [PATCH 5/5] build: Fix breakage when libcue isn't found - -Commit 6e281037a5f0abc introduced a regression on systems where libcue -is not available. - -Fixes https://gitlab.gnome.org/GNOME/tracker-miners/issues/33 - -(cherry picked from commit fd0eb3cd98f279591cbe8635eadf42027dd5ddae) ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 8d23a1157..d69588435 100644 ---- a/meson.build -+++ b/meson.build -@@ -303,7 +303,7 @@ conf.set('GSTREAMER_BACKEND_DISCOVERER', gstreamer_backend_name == 'Discoverer') - conf.set('GSTREAMER_BACKEND_GUPNP_DLNA', gstreamer_backend_name == 'GUPnP-DLNA') - conf.set('HAVE_HAL', battery_detection_library_name == 'hal') - conf.set('HAVE_LIBCUE', libcue.found()) --conf.set('HAVE_LIBCUE2', libcue.version() >= '2.0.0') -+conf.set('HAVE_LIBCUE2', libcue.found() and libcue.version().version_compare('>= 2.0.0')) - conf.set('HAVE_LIBICU_CHARSET_DETECTION', charset_library_name == 'icu') - conf.set('HAVE_LIBEXIF', libexif.found()) - conf.set('HAVE_LIBIPTCDATA', libiptcdata.found()) --- -2.17.0 - diff --git a/app-misc/tracker-miners/files/2.1.5-rss-symlink-fix1.patch b/app-misc/tracker-miners/files/2.1.5-rss-symlink-fix1.patch deleted file mode 100644 index 9cccb2e36e9c..000000000000 --- a/app-misc/tracker-miners/files/2.1.5-rss-symlink-fix1.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 0d8b3388c415edebc75268358bab4ec2408d5685 Mon Sep 17 00:00:00 2001 -From: Sam Thursfield -Date: Sun, 18 Nov 2018 20:33:51 +0100 -Subject: [PATCH 1/2] meson: Fix bad string comparisons in - create-miner-symlinks.sh script - -This script creates symlinks from $prefix/share/tracker/miners to the -real D-Bus .service files, which usually live in /usr/share/dbus-1. - -The script was comparing strings incorrectly, leading to misbehaviour. - -See https://gitlab.gnome.org/GNOME/tracker-miners/issues/38 - -(cherry picked from commit 949e7003c7027a9946b751c73e1e030d35c78bd7) ---- - src/create-miner-symlinks.sh | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/create-miner-symlinks.sh b/src/create-miner-symlinks.sh -index 114cc54c8..9d8ded2fb 100644 ---- a/src/create-miner-symlinks.sh -+++ b/src/create-miner-symlinks.sh -@@ -13,13 +13,13 @@ have_tracker_miner_fs="$4" - have_tracker_miner_rss="$5" - - mkdir -p ${DESTDIR}/${tracker_miner_services_dir} --if [[ "$have_tracker_miner_apps" -eq "true" ]]; then -+if [[ "$have_tracker_miner_apps" == "true" ]]; then - ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Applications.service" "${DESTDIR}/${tracker_miner_services_dir}/" - fi - ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Extract.service" "${DESTDIR}/${tracker_miner_services_dir}/" --if [[ "$have_tracker_miner_fs" -eq "true" ]]; then -+if [[ "$have_tracker_miner_fs" == "true" ]]; then - ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Files.service" "${DESTDIR}/${tracker_miner_services_dir}/" - fi --if [[ "$have_tracker_miner_rss" -eq "true" ]]; then -+if [[ "$have_tracker_miner_rss" == "true" ]]; then - ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.RSS.service" "${DESTDIR}/${tracker_miner_services_dir}/" - fi --- -2.17.0 - diff --git a/app-misc/tracker-miners/files/2.1.5-rss-symlink-fix2.patch b/app-misc/tracker-miners/files/2.1.5-rss-symlink-fix2.patch deleted file mode 100644 index 30fef51ca492..000000000000 --- a/app-misc/tracker-miners/files/2.1.5-rss-symlink-fix2.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 191a67bae395eab322f1adc000c95d35b1a60c71 Mon Sep 17 00:00:00 2001 -From: Jeremy Bicha -Date: Sun, 18 Nov 2018 16:42:53 -0500 -Subject: [PATCH 2/2] meson: fix bashism in equality check - -Thanks https://rgeissert.blogspot.com/2012/12/a-bashism-week-testing-for-equality.html - -and checkbashisms from Debian's devscripts - -Closes: https://gitlab.gnome.org/GNOME/tracker-miners/issues/38 -(cherry picked from commit 0304f28a9963bff0c5b029d88dc36f91f53dcf65) ---- - src/create-miner-symlinks.sh | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/create-miner-symlinks.sh b/src/create-miner-symlinks.sh -index 9d8ded2fb..3ed270bca 100644 ---- a/src/create-miner-symlinks.sh -+++ b/src/create-miner-symlinks.sh -@@ -13,13 +13,13 @@ have_tracker_miner_fs="$4" - have_tracker_miner_rss="$5" - - mkdir -p ${DESTDIR}/${tracker_miner_services_dir} --if [[ "$have_tracker_miner_apps" == "true" ]]; then -+if ([ "$have_tracker_miner_apps" = "true" ]); then - ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Applications.service" "${DESTDIR}/${tracker_miner_services_dir}/" - fi - ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Extract.service" "${DESTDIR}/${tracker_miner_services_dir}/" --if [[ "$have_tracker_miner_fs" == "true" ]]; then -+if ([ "$have_tracker_miner_fs" = "true" ]); then - ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Files.service" "${DESTDIR}/${tracker_miner_services_dir}/" - fi --if [[ "$have_tracker_miner_rss" == "true" ]]; then -+if ([ "$have_tracker_miner_rss" = "true" ]); then - ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.RSS.service" "${DESTDIR}/${tracker_miner_services_dir}/" - fi --- -2.17.0 - diff --git a/app-misc/tracker-miners/files/2.1.5-seccomp.patch b/app-misc/tracker-miners/files/2.1.5-seccomp.patch deleted file mode 100644 index f32d698a4873..000000000000 --- a/app-misc/tracker-miners/files/2.1.5-seccomp.patch +++ /dev/null @@ -1,42 +0,0 @@ -From b2d4b05a0c9e34b88aaf55b9f52497b07af8e862 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp -Date: Fri, 15 Feb 2019 21:11:29 +0200 -Subject: [PATCH] build: Only require seccomp when the CPU architecture - supports it - ---- - meson.build | 18 +++++++++++++++++- - 1 file changed, 17 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index ef48e77a6..65ad19cad 100644 ---- a/meson.build -+++ b/meson.build -@@ -261,7 +261,23 @@ endif - # Check for libseccomp - ################################################################## - --if not libseccomp.found() and host_machine.system() == 'linux' -+host_system = host_machine.system() -+host_cpu = host_machine.cpu() -+unsupported_cpus = [ -+ 'alpha', -+ 'ia64', -+ 'm68k', -+ 'parisc', -+ 'parisc64', -+ 'sh4', -+ 'sparc', -+ 'sparc64', -+] -+system_supports_seccomp = host_system == 'linux' -+cpu_supports_seccomp = not unsupported_cpus.contains(host_cpu) -+seccomp_required = system_supports_seccomp and cpu_supports_seccomp -+ -+if not libseccomp.found() and seccomp_required - error('Libseccomp is mandatory for sandboxed metadata extraction') - endif - --- -2.17.0 - diff --git a/app-misc/tracker-miners/files/2.1.5-test-fix.patch b/app-misc/tracker-miners/files/2.1.5-test-fix.patch deleted file mode 100644 index be979e6af057..000000000000 --- a/app-misc/tracker-miners/files/2.1.5-test-fix.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 02a54749117d609d75bad80331024661c2e598ce Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp -Date: Fri, 15 Feb 2019 12:20:39 +0200 -Subject: [PATCH] libtracker-miners-common: improve path_evaluate_name - environment handling - -Under some environments $PWD might not point where we expect, so simply -use g_get_current_dir() instead. -g_getenv() is documented to return a pointer that may get overwritten -by subsequent calls to g_getenv, g_setenv of g_unsetenv. As even after -removing the second g_getenv, there's still g_setenv calls, take a copy. ---- - .../libtracker-miners-common/tracker-file-utils-test.c | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/tests/libtracker-miners-common/tracker-file-utils-test.c b/tests/libtracker-miners-common/tracker-file-utils-test.c -index 93b94472c..3f86a0cdc 100644 ---- a/tests/libtracker-miners-common/tracker-file-utils-test.c -+++ b/tests/libtracker-miners-common/tracker-file-utils-test.c -@@ -134,14 +134,14 @@ test_path_list_filter_duplicates_with_exceptions () - static void - test_path_evaluate_name (void) - { -- gchar *result, *expected; -- -- const gchar *home = g_getenv ("HOME"); -- const gchar *pwd = g_getenv ("PWD"); -+ gchar *result, *expected, *home, *pwd; - - const gchar *test = "/one/two"; - gchar *parent_dir; - -+ home = g_strdup (g_getenv ("HOME")); -+ pwd = g_get_current_dir (); -+ - g_setenv ("TEST_TRACKER_DIR", test, TRUE); - - -@@ -219,6 +219,8 @@ test_path_evaluate_name (void) - result = tracker_path_evaluate_name (tracker_test_helpers_get_nonutf8 ()); - g_assert_cmpstr (result, ==, tracker_test_helpers_get_nonutf8 ()); - -+ g_free (home); -+ g_free (pwd); - g_unsetenv ("TEST_TRACKER_DIR"); - } - --- -2.17.0 - diff --git a/app-misc/tracker-miners/files/2.1.6-cue-meson-fixes.patch b/app-misc/tracker-miners/files/2.1.6-cue-meson-fixes.patch new file mode 100644 index 000000000000..07d6ae9b649f --- /dev/null +++ b/app-misc/tracker-miners/files/2.1.6-cue-meson-fixes.patch @@ -0,0 +1,67 @@ +From 5d24ba00a7735ab3b7b381a102dc5536c12c8133 Mon Sep 17 00:00:00 2001 +From: Ernestas Kulik +Date: Sun, 7 Oct 2018 11:40:41 +0300 +Subject: [PATCH 1/2] build: Fix libcue version comparison +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It currently performs a string comparison, as opposed to using +version_compare(), which leads to results like +“unknown >= 2.0.0 == True” when the dependency was not found. + +Fixes https://gitlab.gnome.org/GNOME/tracker-miners/issues/32 + +(cherry picked from commit 6e281037a5f0abc12e5e8902e445f264200980b0) +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 4273638dd..c30ada4ed 100644 +--- a/meson.build ++++ b/meson.build +@@ -317,7 +317,7 @@ conf.set('GSTREAMER_BACKEND_DISCOVERER', gstreamer_backend_name == 'Discoverer') + conf.set('GSTREAMER_BACKEND_GUPNP_DLNA', gstreamer_backend_name == 'GUPnP-DLNA') + conf.set('HAVE_HAL', battery_detection_library_name == 'hal') + conf.set('HAVE_LIBCUE', libcue.found()) +-conf.set('HAVE_LIBCUE2', libcue.version() >= '2.0.0') ++conf.set('HAVE_LIBCUE2', libcue.version().version_compare('>= 2.0.0')) + conf.set('HAVE_LIBICU_CHARSET_DETECTION', charset_library_name == 'icu') + conf.set('HAVE_LIBEXIF', libexif.found()) + conf.set('HAVE_LIBIPTCDATA', libiptcdata.found()) +-- +2.17.0 + + +From ff6a076330ba1b5a383196795b18e2c069ac54c6 Mon Sep 17 00:00:00 2001 +From: Sam Thursfield +Date: Sun, 7 Oct 2018 23:42:28 +0200 +Subject: [PATCH 2/2] build: Fix breakage when libcue isn't found + +Commit 6e281037a5f0abc introduced a regression on systems where libcue +is not available. + +Fixes https://gitlab.gnome.org/GNOME/tracker-miners/issues/33 + +(cherry picked from commit fd0eb3cd98f279591cbe8635eadf42027dd5ddae) +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index c30ada4ed..28072646a 100644 +--- a/meson.build ++++ b/meson.build +@@ -317,7 +317,7 @@ conf.set('GSTREAMER_BACKEND_DISCOVERER', gstreamer_backend_name == 'Discoverer') + conf.set('GSTREAMER_BACKEND_GUPNP_DLNA', gstreamer_backend_name == 'GUPnP-DLNA') + conf.set('HAVE_HAL', battery_detection_library_name == 'hal') + conf.set('HAVE_LIBCUE', libcue.found()) +-conf.set('HAVE_LIBCUE2', libcue.version().version_compare('>= 2.0.0')) ++conf.set('HAVE_LIBCUE2', libcue.found() and libcue.version().version_compare('>= 2.0.0')) + conf.set('HAVE_LIBICU_CHARSET_DETECTION', charset_library_name == 'icu') + conf.set('HAVE_LIBEXIF', libexif.found()) + conf.set('HAVE_LIBIPTCDATA', libiptcdata.found()) +-- +2.17.0 + diff --git a/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild b/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild deleted file mode 100644 index b04c2c5f8c6f..000000000000 --- a/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} ) - -inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg - -DESCRIPTION="Collection of data extractors for Tracker/Nepomuk" -HOMEPAGE="https://wiki.gnome.org/Projects/Tracker" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0" -IUSE="cue exif ffmpeg flac gif gsf +gstreamer iptc +iso +jpeg libav +pdf +playlist raw +rss seccomp test +taglib +tiff upower +vorbis +xml xmp xps" - -REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg/libav - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -# tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred) -RDEPEND=" - >=dev-libs/glib-2.46:2 - >=app-misc/tracker-2.1.0:= - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 ) - !gstreamer? ( - ffmpeg? ( - libav? ( media-video/libav:0= ) - !libav? ( media-video/ffmpeg:0= ) ) ) - - >=sys-apps/dbus-1.3.1 - xmp? ( >=media-libs/exempi-2.1.0:= ) - flac? ( >=media-libs/flac-1.2.1 ) - raw? ( media-libs/gexiv2 ) - >=dev-libs/icu-4.8.1.2:= - cue? ( media-libs/libcue ) - exif? ( >=media-libs/libexif-0.6 ) - gsf? ( >=gnome-extra/libgsf-1.14.24:= ) - xps? ( app-text/libgxps ) - iptc? ( media-libs/libiptcdata ) - jpeg? ( virtual/jpeg:0 ) - iso? ( >=sys-libs/libosinfo-0.2.10 ) - >=media-libs/libpng-1.2:0= - seccomp? ( >=sys-libs/libseccomp-2.0 ) - tiff? ( media-libs/tiff:0 ) - xml? ( >=dev-libs/libxml2-2.6 ) - vorbis? ( >=media-libs/libvorbis-0.22 ) - pdf? ( >=app-text/poppler-0.16.0[cairo] ) - taglib? ( >=media-libs/taglib-1.6 ) - playlist? ( >=dev-libs/totem-pl-parser-3:= ) - upower? ( >=sys-power/upower-0.9.0 ) - sys-libs/zlib:0 - gif? ( media-libs/giflib:= ) - - rss? ( >=net-libs/libgrss-0.7:0 ) - app-arch/gzip -" -DEPEND="${RDEPEND} - dev-util/glib-utils - - >=dev-util/intltool-0.40.0 - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - test? ( ${PYTHON_DEPS} ) -" -# intltool-merge manually called in meson.build in 2.1.5; might be properly gone by 2.2.0 (MR !29) - -PATCHES=( - "${FILESDIR}"/${PV}-meson-fixes.patch # https://gitlab.gnome.org/GNOME/tracker-miners/merge_requests/49 - "${FILESDIR}"/${PV}-test-fix.patch # https://gitlab.gnome.org/GNOME/tracker-miners/merge_requests/50 - "${FILESDIR}"/${PV}-seccomp.patch # https://gitlab.gnome.org/GNOME/tracker-miners/merge_requests/51 - "${FILESDIR}"/${PV}-rss-symlink-fix{1,2}.patch # tracker-2.1 branch, will be included in 2.1.6 - "${FILESDIR}"/${PV}-libav-build-fix.patch # master branch, fixed in 2.2.0, might be backported to 2.1.6 too -) - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - xdg_src_prepare - gnome2_environment_reset # sets gstreamer safety variables -} - -src_configure() { - local media_extractor="none" - if use gstreamer ; then - media_extractor="gstreamer" - elif use ffmpeg ; then - media_extractor="libav" - fi - - local emesonargs=( - -Dtracker_core=system - - -Ddocs=true - -Dextract=true - $(meson_use test functional_tests) - -Dminer_apps=true - -Dminer_fs=true - $(meson_use rss miner_rss) - -Dwriteback=true - -Dabiword=true - -Ddvi=true - -Dicon=true - -Dmp3=true - -Dps=true - -Dtext=true - -Dunzip_ps_gz_files=true # spawns gunzip - - -Dcue=$(usex cue enabled disabled) - -Dexif=$(usex exif enabled disabled) - -Dflac=$(usex flac enabled disabled) - -Dgif=$(usex gif enabled disabled) - -Dgsf=$(usex gsf enabled disabled) - -Diptc=$(usex iptc enabled disabled) - -Diso=$(usex iso enabled disabled) - -Djpeg=$(usex jpeg enabled disabled) - -Dpdf=$(usex pdf enabled disabled) - -Dplaylist=$(usex playlist enabled disabled) - -Dpng=enabled - -Draw=$(usex raw enabled disabled) - -Dtaglib=$(usex taglib enabled disabled) - -Dtiff=$(usex tiff enabled disabled) - -Dvorbis=$(usex vorbis enabled disabled) - -Dxml=$(usex xml enabled disabled) - -Dxmp=$(usex xmp enabled disabled) - -Dxps=$(usex xps enabled disabled) - - -Dbattery_detection=$(usex upower upower none) - -Dcharset_detection=icu # enca is a possibility, but right now we have tracker core always dep on icu and icu is preferred over enca - -Dgeneric_media_extractor=${media_extractor} - # gupnp gstreamer_backend is in bad state, upstream suggests to use discoverer, which is the default - -Dsystemd_user_services="$(systemd_get_userunitdir)" - ) - meson_src_configure -} - -src_test() { - dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed' -} diff --git a/app-misc/tracker-miners/tracker-miners-2.1.6.ebuild b/app-misc/tracker-miners/tracker-miners-2.1.6.ebuild new file mode 100644 index 000000000000..5153b47c8e87 --- /dev/null +++ b/app-misc/tracker-miners/tracker-miners-2.1.6.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} ) + +inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg + +DESCRIPTION="Collection of data extractors for Tracker/Nepomuk" +HOMEPAGE="https://wiki.gnome.org/Projects/Tracker" + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="0" +IUSE="cue exif ffmpeg flac gif gsf +gstreamer iptc +iso +jpeg libav +pdf +playlist raw +rss seccomp test +taglib +tiff upower +vorbis +xml xmp xps" + +REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg/libav + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +# tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred) +RDEPEND=" + >=dev-libs/glib-2.46:2 + >=app-misc/tracker-2.1.0:= + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 ) + !gstreamer? ( + ffmpeg? ( + libav? ( media-video/libav:0= ) + !libav? ( media-video/ffmpeg:0= ) ) ) + + >=sys-apps/dbus-1.3.1 + xmp? ( >=media-libs/exempi-2.1.0:= ) + flac? ( >=media-libs/flac-1.2.1 ) + raw? ( media-libs/gexiv2 ) + >=dev-libs/icu-4.8.1.2:= + cue? ( media-libs/libcue ) + exif? ( >=media-libs/libexif-0.6 ) + gsf? ( >=gnome-extra/libgsf-1.14.24:= ) + xps? ( app-text/libgxps ) + iptc? ( media-libs/libiptcdata ) + jpeg? ( virtual/jpeg:0 ) + iso? ( >=sys-libs/libosinfo-0.2.10 ) + >=media-libs/libpng-1.2:0= + seccomp? ( >=sys-libs/libseccomp-2.0 ) + tiff? ( media-libs/tiff:0 ) + xml? ( >=dev-libs/libxml2-2.6 ) + vorbis? ( >=media-libs/libvorbis-0.22 ) + pdf? ( >=app-text/poppler-0.16.0[cairo] ) + taglib? ( >=media-libs/taglib-1.6 ) + playlist? ( >=dev-libs/totem-pl-parser-3:= ) + upower? ( >=sys-power/upower-0.9.0 ) + sys-libs/zlib:0 + gif? ( media-libs/giflib:= ) + + rss? ( >=net-libs/libgrss-0.7:0 ) + app-arch/gzip +" +DEPEND="${RDEPEND} + dev-util/glib-utils + + >=dev-util/intltool-0.40.0 + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + test? ( ${PYTHON_DEPS} + gstreamer? ( || ( media-plugins/gst-plugins-libav:1.0 + media-plugins/gst-plugins-openh264:1.0 ) ) ) +" +# intltool-merge manually called in meson.build in 2.1.5; might be properly gone by 2.2.0 (MR !29) + +PATCHES=( + "${FILESDIR}"/${PV}-cue-meson-fixes.patch +) + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + # Avoid gst-inspect calls that may trigger sandbox; instead assume the detection will succeed and add the needed test deps for that + if use gstreamer; then + sed -i -e 's:detect-h264-codec.sh:/bin/true:' tests/functional-tests/meson.build || die + else + sed -i -e 's:detect-h264-codec.sh:/bin/false:' tests/functional-tests/meson.build || die + fi + xdg_src_prepare + gnome2_environment_reset # sets gstreamer safety variables +} + +src_configure() { + local media_extractor="none" + if use gstreamer ; then + media_extractor="gstreamer" + elif use ffmpeg ; then + media_extractor="libav" + fi + + local emesonargs=( + -Dtracker_core=system + + -Ddocs=true + -Dextract=true + $(meson_use test functional_tests) + -Dminer_apps=true + -Dminer_fs=true + $(meson_use rss miner_rss) + -Dwriteback=true + -Dabiword=true + -Ddvi=true + -Dicon=true + -Dmp3=true + -Dps=true + -Dtext=true + -Dunzip_ps_gz_files=true # spawns gunzip + + -Dcue=$(usex cue enabled disabled) + -Dexif=$(usex exif enabled disabled) + -Dflac=$(usex flac enabled disabled) + -Dgif=$(usex gif enabled disabled) + -Dgsf=$(usex gsf enabled disabled) + -Diptc=$(usex iptc enabled disabled) + -Diso=$(usex iso enabled disabled) + -Djpeg=$(usex jpeg enabled disabled) + -Dpdf=$(usex pdf enabled disabled) + -Dplaylist=$(usex playlist enabled disabled) + -Dpng=enabled + -Draw=$(usex raw enabled disabled) + -Dtaglib=$(usex taglib enabled disabled) + -Dtiff=$(usex tiff enabled disabled) + -Dvorbis=$(usex vorbis enabled disabled) + -Dxml=$(usex xml enabled disabled) + -Dxmp=$(usex xmp enabled disabled) + -Dxps=$(usex xps enabled disabled) + + -Dbattery_detection=$(usex upower upower none) + -Dcharset_detection=icu # enca is a possibility, but right now we have tracker core always dep on icu and icu is preferred over enca + -Dgeneric_media_extractor=${media_extractor} + # gupnp gstreamer_backend is in bad state, upstream suggests to use discoverer, which is the default + -Dsystemd_user_services="$(systemd_get_userunitdir)" + ) + meson_src_configure +} + +src_test() { + dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed' +} -- cgit v1.2.3