diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-06-11 16:51:58 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-12 10:54:40 +0100 |
commit | 9fbd020124c9d1edb67014d8b846f76b741ac25e (patch) | |
tree | 1cc2b314d7ef7b25f447ed2915638f8339b648eb /meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch | |
parent | e3d0dd9163820b2bcc3ec30118338ad20bf170bf (diff) | |
download | poky-9fbd020124c9d1edb67014d8b846f76b741ac25e.tar.gz |
gdk-pixbuf: update 2.38.0 -> 2.38.1
Remove 0001-loaders.cache-depend-on-loaders-being-fully-build.patch
as upstream has fixed the issue.
Add a patch to revert upstream's decision to not cross-compile
thumbnailer or tests.
(From OE-Core rev: 0598f66aa823ec4355284a0a40c3d125d6c5e0c9)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch')
-rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch | 50 |
1 files changed, 21 insertions, 29 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch index e638fd3b6f..e461404918 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From bf71999b6e64d1f1919b0351b27c1c417e2b8856 Mon Sep 17 00:00:00 2001 | 1 | From be8a47e0c21e5577d4f5669d339dfec6299b25be Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Thu, 14 Feb 2019 18:06:25 +0100 | 3 | Date: Thu, 14 Feb 2019 18:06:25 +0100 |
4 | Subject: [PATCH] Generate loaders.cache using a native tool when | 4 | Subject: [PATCH] Generate loaders.cache using a native tool when |
@@ -10,37 +10,29 @@ Upstream-Status: Pending | |||
10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
11 | 11 | ||
12 | --- | 12 | --- |
13 | gdk-pixbuf/meson.build | 13 +++++++++++++ | 13 | gdk-pixbuf/meson.build | 12 ++++++++++-- |
14 | 1 file changed, 13 insertions(+) | 14 | 1 file changed, 10 insertions(+), 2 deletions(-) |
15 | 15 | ||
16 | diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build | 16 | diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build |
17 | index 1995ffd..d692cb7 100644 | 17 | index 5cddbec..78c8bd3 100644 |
18 | --- a/gdk-pixbuf/meson.build | 18 | --- a/gdk-pixbuf/meson.build |
19 | +++ b/gdk-pixbuf/meson.build | 19 | +++ b/gdk-pixbuf/meson.build |
20 | @@ -291,6 +291,7 @@ foreach bin: gdkpixbuf_bin | 20 | @@ -324,8 +324,16 @@ if not meson.is_cross_build() |
21 | set_variable(bin_name.underscorify(), bin) | 21 | build_by_default: true) |
22 | endforeach | 22 | loaders_dep = declare_dependency(sources: [ loaders_cache ]) |
23 | 23 | else | |
24 | +if not meson.is_cross_build() | 24 | - loaders_cache = [] |
25 | # The 'loaders.cache' used for testing, so we don't accidentally | 25 | - loaders_dep = declare_dependency() |
26 | # load the installed cache; we always build it by default | 26 | + loaders_cache = custom_target('loaders.cache', |
27 | loaders_cache = custom_target('loaders.cache', | 27 | + output: 'loaders.cache', |
28 | @@ -302,6 +303,18 @@ loaders_cache = custom_target('loaders.cache', | 28 | + capture: true, |
29 | ], | 29 | + command: [ |
30 | build_by_default: true) | 30 | + 'gdk-pixbuf-query-loaders', |
31 | loaders_dep = declare_dependency(sources: [ loaders_cache ]) | 31 | + dynamic_loaders, |
32 | +else | 32 | + ], |
33 | +loaders_cache = custom_target('loaders.cache', | 33 | + depends: dynamic_loaders_dep, |
34 | + output: 'loaders.cache', | 34 | + build_by_default: true) |
35 | + capture: true, | 35 | + loaders_dep = declare_dependency(sources: [ loaders_cache ]) |
36 | + depends: [ dynamic_loaders_dep ], | 36 | endif |
37 | + command: [ | ||
38 | + 'gdk-pixbuf-query-loaders', | ||
39 | + dynamic_loaders, | ||
40 | + ], | ||
41 | + build_by_default: true) | ||
42 | +loaders_dep = declare_dependency(sources: [ loaders_cache ]) | ||
43 | +endif | ||
44 | 37 | ||
45 | pkgconfig = import('pkgconfig') | 38 | pkgconfig = import('pkgconfig') |
46 | pkgconfig.generate( | ||