1 |
commit: 8af4730b1baa18b0b6049017d7a27241b4c0e94c |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 17 12:15:55 2019 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 17 12:16:55 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8af4730b |
7 |
|
8 |
app-misc/tracker-miners: fix build with ffmpeg media backend |
9 |
|
10 |
Closes: https://bugs.gentoo.org/678226 |
11 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
12 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
13 |
|
14 |
.../files/2.1.5-libav-build-fix.patch | 29 ++++++++++++++++++++++ |
15 |
.../tracker-miners/tracker-miners-2.1.5.ebuild | 1 + |
16 |
2 files changed, 30 insertions(+) |
17 |
|
18 |
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 |
19 |
new file mode 100644 |
20 |
index 00000000000..580ecb34ba2 |
21 |
--- /dev/null |
22 |
+++ b/app-misc/tracker-miners/files/2.1.5-libav-build-fix.patch |
23 |
@@ -0,0 +1,29 @@ |
24 |
+From b55c22542de4f0f0166c6e5510ef0ec90bc69f18 Mon Sep 17 00:00:00 2001 |
25 |
+From: Carlos Garnacho <carlosg@×××××.org> |
26 |
+Date: Mon, 10 Sep 2018 16:19:20 +0200 |
27 |
+Subject: [PATCH] build: Fix build with libav |
28 |
+ |
29 |
+The extractor rules defined an array inside an array, which configure_file() |
30 |
+wouldn't accept. |
31 |
+ |
32 |
+(cherry picked from commit fff231c16b2ad9a2824f09c5b81f31ee220fba6f) |
33 |
+--- |
34 |
+ src/tracker-extract/meson.build | 2 +- |
35 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
36 |
+ |
37 |
+diff --git a/src/tracker-extract/meson.build b/src/tracker-extract/meson.build |
38 |
+index 9834dc422..bf19f8bac 100644 |
39 |
+--- a/src/tracker-extract/meson.build |
40 |
++++ b/src/tracker-extract/meson.build |
41 |
+@@ -60,7 +60,7 @@ if libjpeg.found() |
42 |
+ endif |
43 |
+ |
44 |
+ if generic_media_handler_name == 'libav' |
45 |
+- rules = ['90-libav-audio-generic.rule', ['90-libav-video-generic.rule']] |
46 |
++ rules = ['90-libav-audio-generic.rule', '90-libav-video-generic.rule'] |
47 |
+ dependencies = [avcodec, avformat, avutil, tracker_miners_common_dep] |
48 |
+ modules += [['extract-libav', 'tracker-extract-libav.c', rules, dependencies]] |
49 |
+ endif |
50 |
+-- |
51 |
+2.17.0 |
52 |
+ |
53 |
|
54 |
diff --git a/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild b/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild |
55 |
index 09bd5e23f90..b04c2c5f8c6 100644 |
56 |
--- a/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild |
57 |
+++ b/app-misc/tracker-miners/tracker-miners-2.1.5.ebuild |
58 |
@@ -71,6 +71,7 @@ PATCHES=( |
59 |
"${FILESDIR}"/${PV}-test-fix.patch # https://gitlab.gnome.org/GNOME/tracker-miners/merge_requests/50 |
60 |
"${FILESDIR}"/${PV}-seccomp.patch # https://gitlab.gnome.org/GNOME/tracker-miners/merge_requests/51 |
61 |
"${FILESDIR}"/${PV}-rss-symlink-fix{1,2}.patch # tracker-2.1 branch, will be included in 2.1.6 |
62 |
+ "${FILESDIR}"/${PV}-libav-build-fix.patch # master branch, fixed in 2.2.0, might be backported to 2.1.6 too |
63 |
) |
64 |
|
65 |
pkg_setup() { |