commit: 8af4730b1baa18b0b6049017d7a27241b4c0e94c Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Sun Feb 17 12:15:55 2019 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Sun Feb 17 12:16:55 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8af4730b
app-misc/tracker-miners: fix build with ffmpeg media backend Closes: https://bugs.gentoo.org/678226 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> .../files/2.1.5-libav-build-fix.patch | 29 ++++++++++++++++++++++ .../tracker-miners/tracker-miners-2.1.5.ebuild | 1 + 2 files changed, 30 insertions(+) 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 new file mode 100644 index 00000000000..580ecb34ba2 --- /dev/null +++ b/app-misc/tracker-miners/files/2.1.5-libav-build-fix.patch @@ -0,0 +1,29 @@ +From b55c22542de4f0f0166c6e5510ef0ec90bc69f18 Mon Sep 17 00:00:00 2001 +From: Carlos Garnacho <[email protected]> +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/tracker-miners-2.1.5.ebuild b/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild index 09bd5e23f90..b04c2c5f8c6 100644 --- a/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild +++ b/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild @@ -71,6 +71,7 @@ PATCHES=( "${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() {
