summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-12-10 12:13:36 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-10 17:42:46 +0000
commit8bbd5083d0ebde379509e26c72c591c70791c8ce (patch)
tree16a64a9fc023022116ae4c636dce95c3891b48db /meta
parentc66ff8bb8f4cdd6346a33b37599b67bbc77f1c8c (diff)
downloadpoky-8bbd5083d0ebde379509e26c72c591c70791c8ce.tar.gz
libmatchbox: fix libpng detection
The configure script looks for libpng12 though pkg-config and if that fails falls back to looking for library files directly. The result of this is that the linkage can change between libpng12 or libpng16 depending on what is installed in the sysroot. To resolve this, take a patch from upstream to just link using pkg-config. (From OE-Core rev: 1f17598031059f498e8681cd09c5b0832622d3ac) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/libmatchbox/libmatchbox/libpng.patch69
-rw-r--r--meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb4
2 files changed, 72 insertions, 1 deletions
diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox/libpng.patch b/meta/recipes-graphics/libmatchbox/libmatchbox/libpng.patch
new file mode 100644
index 0000000000..8cd507f799
--- /dev/null
+++ b/meta/recipes-graphics/libmatchbox/libmatchbox/libpng.patch
@@ -0,0 +1,69 @@
1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 19c3d242034748b3c60765683e1ff4e2df970205 Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Tue, 10 Dec 2013 11:37:32 +0000
7Subject: [PATCH] configure: improve libpng detection
8
9Instead of looking for "libpng12" explicitly though pkg-config and then falling
10back to library hunting, just use pkg-config to find "libpng" which is provided
11by both libpng12 and libpng16.
12
13This also makes the libpng detection deterministic.
14
15Signed-off-by: Ross Burton <ross.burton@intel.com>
16---
17 configure.ac | 29 +++++------------------------
18 1 file changed, 5 insertions(+), 24 deletions(-)
19
20diff --git a/configure.ac b/configure.ac
21index 8a28076..65d7c79 100644
22--- a/configure.ac
23+++ b/configure.ac
24@@ -34,7 +34,7 @@ AC_ARG_ENABLE(jpeg,
25 enable_jpeg=$enableval, enable_jpeg=no)
26
27 AC_ARG_ENABLE(png,
28- [ --disable-png disable png support [default=no]],
29+ [ --disable-png disable PNG support [default=enabled]],
30 enable_png=$enableval, enable_png=yes )
31
32 AC_ARG_ENABLE(doxygen-docs,
33@@ -156,29 +156,10 @@ fi
34 dnl ------ Check for PNG ---------------------------------------------------
35
36 if test x$enable_png != xno; then
37- AC_MSG_CHECKING(for libpng12)
38- if test x$PKG_CONFIG != xno && $PKG_CONFIG --exists libpng12; then
39- AC_MSG_RESULT(yes)
40- PNG_LIBS=`$PKG_CONFIG --libs libpng12`
41- PNG_CFLAGS=`$PKG_CONFIG --cflags libpng12`
42- AC_DEFINE(USE_PNG, [1], [Use Png])
43- SUPPORTS_PNG=1
44- PNG_REQUIRED="libpng12"
45- else
46- AC_MSG_RESULT(no)
47- # AC_CHECK_HEADERS(png.h, [ have_png_h="yes" ], [ have_png_h="no" ] )
48- AC_CHECK_LIB([png], [png_create_read_struct], [have_png="yes"], [have_png="no"])
49-
50- if test x$have_png=xyes && test x$have_png_h=xyes; then
51- AC_DEFINE(USE_PNG, [1], [Use Png])
52- SUPPORTS_PNG=1
53- PNG_LIBS="-lpng -lz"
54- MB_EXTRA_LIBS="$MB_EXTRA_LIBS $PNG_LIBS"
55- else
56- AC_MSG_WARN([*** Cannot find PNG, disabling support])
57- enable_png=no
58- fi
59- fi
60+ PKG_CHECK_MODULES(PNG, libpng)
61+ AC_DEFINE(USE_PNG, [1], [Use PNG])
62+ SUPPORTS_PNG=1
63+ PNG_REQUIRED="libpng"
64 fi
65
66
67--
681.8.5
69
diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb b/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb
index d162a78d7d..118c808cfc 100644
--- a/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb
+++ b/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb
@@ -10,7 +10,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \
10 10
11DEPENDS = "virtual/libx11 libxext expat libxft jpeg libpng zlib libxsettings-client startup-notification" 11DEPENDS = "virtual/libx11 libxext expat libxft jpeg libpng zlib libxsettings-client startup-notification"
12 12
13SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/${BPN}/${PV}/${BPN}-${PV}.tar.bz2" 13SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/${BPN}/${PV}/${BPN}-${PV}.tar.bz2 \
14 file://libpng.patch"
15
14SRC_URI[md5sum] = "fc6cc807f55a3e7c752d8013176875d7" 16SRC_URI[md5sum] = "fc6cc807f55a3e7c752d8013176875d7"
15SRC_URI[sha256sum] = "254cab52e304a3512c8df4be59d690cf3921bbb68a28ede7fe26b93534217b53" 17SRC_URI[sha256sum] = "254cab52e304a3512c8df4be59d690cf3921bbb68a28ede7fe26b93534217b53"
16 18