mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-03-19 13:49:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

gdk-pixbuf: update 2.38.0 -> 2.38.1

Browse Source 
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>
This commit is contained in:
Alexander Kanavin
2019-06-11 16:51:58 +02:00
committed by Richard Purdie
parent e3d0dd9163
commit 9fbd020124
5 changed files with 55 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Fix-a-couple-of-decisions-around-cross-compilation.patch
View File

@@ -1,4 +1,4 @@
From bf71999b6e64d1f1919b0351b27c1c417e2b8856 Mon Sep 17 00:00:00 2001
From be8a47e0c21e5577d4f5669d339dfec6299b25be Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Thu, 14 Feb 2019 18:06:25 +0100
Subject: [PATCH] Generate loaders.cache using a native tool when
@@ -10,37 +10,29 @@ Upstream-Status: Pending
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
gdk-pixbuf/meson.build | 13 +++++++++++++
1 file changed, 13 insertions(+)
gdk-pixbuf/meson.build | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build
index 1995ffd..d692cb7 100644
index 5cddbec..78c8bd3 100644
--- a/gdk-pixbuf/meson.build
+++ b/gdk-pixbuf/meson.build
@@ -291,6 +291,7 @@ foreach bin: gdkpixbuf_bin
set_variable(bin_name.underscorify(), bin)
endforeach
+if not meson.is_cross_build()
# The 'loaders.cache' used for testing, so we don't accidentally
# load the installed cache; we always build it by default
loaders_cache = custom_target('loaders.cache',
@@ -302,6 +303,18 @@ loaders_cache = custom_target('loaders.cache',
],
build_by_default: true)
loaders_dep = declare_dependency(sources: [ loaders_cache ])
+else
+loaders_cache = custom_target('loaders.cache',
+ output: 'loaders.cache',
+ capture: true,
+ depends: [ dynamic_loaders_dep ],
+ command: [
+ 'gdk-pixbuf-query-loaders',
+ dynamic_loaders,
+ ],
+ build_by_default: true)
+loaders_dep = declare_dependency(sources: [ loaders_cache ])
+endif
@@ -324,8 +324,16 @@ if not meson.is_cross_build()
build_by_default: true)
loaders_dep = declare_dependency(sources: [ loaders_cache ])
else
- loaders_cache = []
- loaders_dep = declare_dependency()
+ loaders_cache = custom_target('loaders.cache',
+ output: 'loaders.cache',
+ capture: true,
+ command: [
+ 'gdk-pixbuf-query-loaders',
+ dynamic_loaders,
+ ],
+ depends: dynamic_loaders_dep,
+ build_by_default: true)
+ loaders_dep = declare_dependency(sources: [ loaders_cache ])
endif
pkgconfig = import('pkgconfig')
pkgconfig.generate(

51
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-loaders.cache-depend-on-loaders-being-fully-build.patch
View File

@@ -1,51 +0,0 @@
From 116bc8f7a6034ce43053876a72a132fcd4e1e472 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Wed, 20 Feb 2019 19:53:07 +0100
Subject: [PATCH] loaders.cache: depend on loaders being fully build
Otherwise, races have been observed:
https://autobuilder.yoctoproject.org/typhoon/#/builders/61/builds/310/steps/7/logs/step1b
Upstream-Status: Pending
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
gdk-pixbuf/meson.build | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build
index fc3eb33..4e7ed20 100644
--- a/gdk-pixbuf/meson.build
+++ b/gdk-pixbuf/meson.build
@@ -171,6 +171,7 @@ gdkpixbuf_dep = declare_dependency(link_with: gdkpixbuf,
# Now check if we are building loaders as installed shared modules
# We do this here because shared modules depend on libgdk-pixbuf
dynamic_loaders = []
+dynamic_loaders_dep = []
foreach l: loaders
name = l[0]
@@ -189,6 +190,7 @@ foreach l: loaders
# We need the path to build loaders.cache for tests
dynamic_loaders += mod.full_path()
+ dynamic_loaders_dep += mod
endif
endforeach
@@ -206,6 +208,7 @@ if enable_native_windows_loaders
install: true,
install_dir: gdk_pixbuf_loaderdir)
dynamic_loaders += mod.full_path()
+ dynamic_loaders_dep += mod
endforeach
endif
endif
@@ -236,6 +239,7 @@ if not meson.is_cross_build()
loaders_cache = custom_target('loaders.cache',
output: 'loaders.cache',
capture: true,
+ depends: [ dynamic_loaders_dep ],
command: [
gdk_pixbuf_query_loaders,
dynamic_loaders,

8
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch
View File

@@ -1,4 +1,4 @@
From 6fc7f341399ec49ab06c94426f50dbdca49a2844 Mon Sep 17 00:00:00 2001
From 2d1b65bd1272ad63b7fbd4babd9a8e8c296d15b5 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 22 Feb 2019 13:22:06 +0100
Subject: [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
Upstream-Status: Inappropriate [workaround]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
build-aux/gen-thumbnailer.py | 2 --
tests/meson.build | 11 +++++++++--
@@ -35,7 +36,7 @@ index 05ac821..c5b99ab 100644
if os.name == 'nt':
gdk_pixbuf_dll_buildpath = os.path.dirname(args.pixdata)
diff --git a/tests/meson.build b/tests/meson.build
index 4fa3fbc..eca5166 100644
index 8ed7cc1..e011b77 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,12 +1,19 @@
@@ -91,6 +92,3 @@ index aaafec8..71bd61b 100644
],
install: true,
install_dir: join_paths(gdk_pixbuf_datadir, 'thumbnailers'))
--
2.17.1

28
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch Normal file
View File

@@ -0,0 +1,28 @@
From 1a532e090c558a830de9503f56e23414e880bb95 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Wed, 5 Jun 2019 14:17:55 +0200
Subject: [PATCH] Build thumbnailer and tests also in cross builds.
Upstream-Status: Inappropriate [relies on oe-core specific hacks]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meson.build | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/meson.build b/meson.build
index d104cea..7acb88a 100644
--- a/meson.build
+++ b/meson.build
@@ -397,10 +397,8 @@ endif
# i18n
subdir('po')
-if not meson.is_cross_build()
- subdir('tests')
- subdir('thumbnailer')
-endif
+subdir('tests')
+subdir('thumbnailer')
# Documentation
subdir('docs')

6
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.0.bb → meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.1.bb
View File

@@ -18,8 +18,8 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
file://fatal-loader.patch \
file://0001-Work-around-thumbnailer-cross-compile-failure.patch \
file://0001-Fix-a-couple-of-decisions-around-cross-compilation.patch \
file://0001-loaders.cache-depend-on-loaders-being-fully-build.patch \
file://0004-Do-not-run-tests-when-building.patch \
file://0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch \
"
SRC_URI_append_class-target = " \
@@ -29,8 +29,8 @@ SRC_URI_append_class-nativesdk = " \
file://0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch \
"
SRC_URI[md5sum] = "77765f24496dc8c90c6e0cbe10fd8f0e"
SRC_URI[sha256sum] = "dd50973c7757bcde15de6bcd3a6d462a445efd552604ae6435a0532fbbadae47"
SRC_URI[md5sum] = "f6ba2195acd18c5c9555421f30c31cc1"
SRC_URI[sha256sum] = "f19ff836ba991031610dcc53774e8ca436160f7d981867c8c3a37acfe493ab3a"
inherit meson pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gtk-doc lib_package