diff options
| author |   Ross Burton <ross.burton@intel.com> | 2013-12-10 12:13:36 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-10 17:42:46 +0000 |
| commit | 8bbd5083d0ebde379509e26c72c591c70791c8ce (patch) | |
| tree | 16a64a9fc023022116ae4c636dce95c3891b48db /meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb | |
| parent | c66ff8bb8f4cdd6346a33b37599b67bbc77f1c8c (diff) | |
| download | openembedded-core-contrib-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/recipes-graphics/libmatchbox/libmatchbox_1.11.bb')
| -rw-r--r-- | meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb | 4 |
1 files changed, 3 insertions, 1 deletions
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 \ DEPENDS = "virtual/libx11 libxext expat libxft jpeg libpng zlib libxsettings-client startup-notification" -SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/${BPN}/${PV}/${BPN}-${PV}.tar.bz2" +SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/${BPN}/${PV}/${BPN}-${PV}.tar.bz2 \ + file://libpng.patch" + SRC_URI[md5sum] = "fc6cc807f55a3e7c752d8013176875d7" SRC_URI[sha256sum] = "254cab52e304a3512c8df4be59d690cf3921bbb68a28ede7fe26b93534217b53" |