summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-06-11 16:51:58 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-12 10:54:40 +0100
commit9fbd020124c9d1edb67014d8b846f76b741ac25e (patch)
tree1cc2b314d7ef7b25f447ed2915638f8339b648eb
parente3d0dd9163820b2bcc3ec30118338ad20bf170bf (diff)
downloadpoky-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>
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch50
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-loaders.cache-depend-on-loaders-being-fully-build.patch51
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch8
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch28
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.1.bb (renamed from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.0.bb)6
5 files changed, 55 insertions, 88 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 @@
1From bf71999b6e64d1f1919b0351b27c1c417e2b8856 Mon Sep 17 00:00:00 2001 1From be8a47e0c21e5577d4f5669d339dfec6299b25be Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 14 Feb 2019 18:06:25 +0100 3Date: Thu, 14 Feb 2019 18:06:25 +0100
4Subject: [PATCH] Generate loaders.cache using a native tool when 4Subject: [PATCH] Generate loaders.cache using a native tool when
@@ -10,37 +10,29 @@ Upstream-Status: Pending
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 10Signed-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
16diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build 16diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build
17index 1995ffd..d692cb7 100644 17index 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(
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-loaders.cache-depend-on-loaders-being-fully-build.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-loaders.cache-depend-on-loaders-being-fully-build.patch
deleted file mode 100644
index 2a7751511b..0000000000
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-loaders.cache-depend-on-loaders-being-fully-build.patch
+++ /dev/null
@@ -1,51 +0,0 @@
1From 116bc8f7a6034ce43053876a72a132fcd4e1e472 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 20 Feb 2019 19:53:07 +0100
4Subject: [PATCH] loaders.cache: depend on loaders being fully build
5
6Otherwise, races have been observed:
7https://autobuilder.yoctoproject.org/typhoon/#/builders/61/builds/310/steps/7/logs/step1b
8
9Upstream-Status: Pending
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11
12---
13 gdk-pixbuf/meson.build | 4 ++++
14 1 file changed, 4 insertions(+)
15
16diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build
17index fc3eb33..4e7ed20 100644
18--- a/gdk-pixbuf/meson.build
19+++ b/gdk-pixbuf/meson.build
20@@ -171,6 +171,7 @@ gdkpixbuf_dep = declare_dependency(link_with: gdkpixbuf,
21 # Now check if we are building loaders as installed shared modules
22 # We do this here because shared modules depend on libgdk-pixbuf
23 dynamic_loaders = []
24+dynamic_loaders_dep = []
25
26 foreach l: loaders
27 name = l[0]
28@@ -189,6 +190,7 @@ foreach l: loaders
29
30 # We need the path to build loaders.cache for tests
31 dynamic_loaders += mod.full_path()
32+ dynamic_loaders_dep += mod
33 endif
34 endforeach
35
36@@ -206,6 +208,7 @@ if enable_native_windows_loaders
37 install: true,
38 install_dir: gdk_pixbuf_loaderdir)
39 dynamic_loaders += mod.full_path()
40+ dynamic_loaders_dep += mod
41 endforeach
42 endif
43 endif
44@@ -236,6 +239,7 @@ if not meson.is_cross_build()
45 loaders_cache = custom_target('loaders.cache',
46 output: 'loaders.cache',
47 capture: true,
48+ depends: [ dynamic_loaders_dep ],
49 command: [
50 gdk_pixbuf_query_loaders,
51 dynamic_loaders,
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch
index 928962d230..a9c7600eb3 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch
@@ -1,4 +1,4 @@
1From 6fc7f341399ec49ab06c94426f50dbdca49a2844 Mon Sep 17 00:00:00 2001 1From 2d1b65bd1272ad63b7fbd4babd9a8e8c296d15b5 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 22 Feb 2019 13:22:06 +0100 3Date: Fri, 22 Feb 2019 13:22:06 +0100
4Subject: [PATCH] (target only) Work-around thumbnailer and pixdata 4Subject: [PATCH] (target only) Work-around thumbnailer and pixdata
@@ -15,6 +15,7 @@ The upstream issue is https://bugzilla.gnome.org/show_bug.cgi?id=779057
15 15
16Upstream-Status: Inappropriate [workaround] 16Upstream-Status: Inappropriate [workaround]
17Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 17Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
18
18--- 19---
19 build-aux/gen-thumbnailer.py | 2 -- 20 build-aux/gen-thumbnailer.py | 2 --
20 tests/meson.build | 11 +++++++++-- 21 tests/meson.build | 11 +++++++++--
@@ -35,7 +36,7 @@ index 05ac821..c5b99ab 100644
35 if os.name == 'nt': 36 if os.name == 'nt':
36 gdk_pixbuf_dll_buildpath = os.path.dirname(args.pixdata) 37 gdk_pixbuf_dll_buildpath = os.path.dirname(args.pixdata)
37diff --git a/tests/meson.build b/tests/meson.build 38diff --git a/tests/meson.build b/tests/meson.build
38index 4fa3fbc..eca5166 100644 39index 8ed7cc1..e011b77 100644
39--- a/tests/meson.build 40--- a/tests/meson.build
40+++ b/tests/meson.build 41+++ b/tests/meson.build
41@@ -1,12 +1,19 @@ 42@@ -1,12 +1,19 @@
@@ -91,6 +92,3 @@ index aaafec8..71bd61b 100644
91 ], 92 ],
92 install: true, 93 install: true,
93 install_dir: join_paths(gdk_pixbuf_datadir, 'thumbnailers')) 94 install_dir: join_paths(gdk_pixbuf_datadir, 'thumbnailers'))
94--
952.17.1
96
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch
new file mode 100644
index 0000000000..0fe13a387a
--- /dev/null
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch
@@ -0,0 +1,28 @@
1From 1a532e090c558a830de9503f56e23414e880bb95 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 5 Jun 2019 14:17:55 +0200
4Subject: [PATCH] Build thumbnailer and tests also in cross builds.
5
6Upstream-Status: Inappropriate [relies on oe-core specific hacks]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 meson.build | 6 ++----
10 1 file changed, 2 insertions(+), 4 deletions(-)
11
12diff --git a/meson.build b/meson.build
13index d104cea..7acb88a 100644
14--- a/meson.build
15+++ b/meson.build
16@@ -397,10 +397,8 @@ endif
17 # i18n
18 subdir('po')
19
20-if not meson.is_cross_build()
21- subdir('tests')
22- subdir('thumbnailer')
23-endif
24+subdir('tests')
25+subdir('thumbnailer')
26
27 # Documentation
28 subdir('docs')
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.0.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.1.bb
index 7fef697f3f..3145cc2089 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.0.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.1.bb
@@ -18,8 +18,8 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
18 file://fatal-loader.patch \ 18 file://fatal-loader.patch \
19 file://0001-Work-around-thumbnailer-cross-compile-failure.patch \ 19 file://0001-Work-around-thumbnailer-cross-compile-failure.patch \
20 file://0001-Fix-a-couple-of-decisions-around-cross-compilation.patch \ 20 file://0001-Fix-a-couple-of-decisions-around-cross-compilation.patch \
21 file://0001-loaders.cache-depend-on-loaders-being-fully-build.patch \
22 file://0004-Do-not-run-tests-when-building.patch \ 21 file://0004-Do-not-run-tests-when-building.patch \
22 file://0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch \
23 " 23 "
24 24
25SRC_URI_append_class-target = " \ 25SRC_URI_append_class-target = " \
@@ -29,8 +29,8 @@ SRC_URI_append_class-nativesdk = " \
29 file://0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch \ 29 file://0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch \
30 " 30 "
31 31
32SRC_URI[md5sum] = "77765f24496dc8c90c6e0cbe10fd8f0e" 32SRC_URI[md5sum] = "f6ba2195acd18c5c9555421f30c31cc1"
33SRC_URI[sha256sum] = "dd50973c7757bcde15de6bcd3a6d462a445efd552604ae6435a0532fbbadae47" 33SRC_URI[sha256sum] = "f19ff836ba991031610dcc53774e8ca436160f7d981867c8c3a37acfe493ab3a"
34 34
35inherit meson pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gtk-doc lib_package 35inherit meson pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gtk-doc lib_package
36 36