summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gdk-pixbuf
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-13 11:25:19 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-13 23:49:28 +0100
commit60651c1eb7c30747840fc42cdd895d3a82a293e1 (patch)
treeddd2b97bcd461e1ea601c14260231910bcecef88 /meta/recipes-gnome/gdk-pixbuf
parentcde94ffbd041da15246e5c7f63c8d211dbe83a76 (diff)
downloadpoky-60651c1eb7c30747840fc42cdd895d3a82a293e1.tar.gz
gdk-pixbuf: Fix libpng determinism issues
We now have libpng 1.6. If we build libpng12 as well as libpng 1.6, the 1.2 version gets preferred which is not desirable and does not give deterministic builds. We really do want to use libpng since the item in DEPENDS will provide this so manipulate the search list so the one we DEPEND on gets chosen. This was the cause of a recent autobuilder failure. (From OE-Core rev: ce1d262ea36da9a9fdeeefc0ddc69833801d4d2d) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gdk-pixbuf')
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/pngversion.patch23
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb1
2 files changed, 24 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/pngversion.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/pngversion.patch
new file mode 100644
index 0000000000..2e7d5afe8f
--- /dev/null
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/pngversion.patch
@@ -0,0 +1,23 @@
1We now have libpng 1.6. If we build libpng12 as well as libpng 1.6, the 1.2 version gets
2preferred which is not desirable and does not give deterministic builds.
3
4We really do want to use libpng since the item in DEPENDS will provide this so
5manipulate the search list so the one we DEPEND on gets chosen.
6
7RP 2013/4/13
8
9Upstream-Status: Pending [worth discussing at least]
10
11Index: gdk-pixbuf-2.26.5/configure.ac
12===================================================================
13--- gdk-pixbuf-2.26.5.orig/configure.ac 2013-03-26 15:45:16.594820303 +0000
14+++ gdk-pixbuf-2.26.5/configure.ac 2013-04-13 10:15:19.241433789 +0000
15@@ -588,7 +588,7 @@
16
17 dnl Test for libpng
18 if test x$with_libpng != xno && test -z "$LIBPNG"; then
19- for l in libpng15 libpng14 libpng12 libpng13 libpng10 libpng ; do
20+ for l in libpng libpng15 libpng14 libpng12 libpng13 libpng10 ; do
21 AC_MSG_CHECKING(for $l)
22 if $PKG_CONFIG --exists $l ; then
23 AC_MSG_RESULT(yes)
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb
index cc2ea50e57..b35f7c666a 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb
@@ -15,6 +15,7 @@ SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.26/gdk-pixbuf-${
15 file://hardcoded_libtool.patch \ 15 file://hardcoded_libtool.patch \
16 file://configure_fix.patch \ 16 file://configure_fix.patch \
17 file://extending-libinstall-dependencies.patch \ 17 file://extending-libinstall-dependencies.patch \
18 file://pngversion.patch \
18 " 19 "
19 20
20SRC_URI[md5sum] = "339329e6d619ee3e1cb93979111b04c0" 21SRC_URI[md5sum] = "339329e6d619ee3e1cb93979111b04c0"