diff options
author | Kang Kai <kai.kang@windriver.com> | 2013-03-26 13:58:34 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-29 10:40:55 +0000 |
commit | 0051c32eab52b0938385d763bb487ff0b9a7c3f8 (patch) | |
tree | 0eb9c49947feefa7b6c5213073669a8f091f913f | |
parent | e0da5099738807ab7779838d73103106aa101620 (diff) | |
download | poky-0051c32eab52b0938385d763bb487ff0b9a7c3f8.tar.gz |
libpng: add version 1.2 back
Current LSB 4.1 test suite still check libpng12.so, so add libpng 1.2.x
back, and set it as default verison for linuxstdbase image.
[YOCTO #4015]
(From OE-Core rev: f2463ce26706b971dad0116e8b92f9d55e945137)
Signed-off-by: Kang Kai <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/conf/distro/include/default-versions.inc | 3 | ||||
-rw-r--r-- | meta/recipes-lsb4/libpng/libpng_1.2.50.bb | 21 |
2 files changed, 24 insertions, 0 deletions
diff --git a/meta/conf/distro/include/default-versions.inc b/meta/conf/distro/include/default-versions.inc index 53ec2e7caf..0a5b2f45f9 100644 --- a/meta/conf/distro/include/default-versions.inc +++ b/meta/conf/distro/include/default-versions.inc | |||
@@ -9,3 +9,6 @@ PREFERRED_VERSION_python-native ?= "2.7.3" | |||
9 | 9 | ||
10 | # Force the older version of liberation-fonts until we fix the fontforge issue | 10 | # Force the older version of liberation-fonts until we fix the fontforge issue |
11 | PREFERRED_VERSION_liberation-fonts ?= "1.04" | 11 | PREFERRED_VERSION_liberation-fonts ?= "1.04" |
12 | |||
13 | # Set libpng default version for linuxstdbase | ||
14 | PREFERRED_VERSION_libpng_linuxstdbase ?= "1.2.50" | ||
diff --git a/meta/recipes-lsb4/libpng/libpng_1.2.50.bb b/meta/recipes-lsb4/libpng/libpng_1.2.50.bb new file mode 100644 index 0000000000..8fdc41ba19 --- /dev/null +++ b/meta/recipes-lsb4/libpng/libpng_1.2.50.bb | |||
@@ -0,0 +1,21 @@ | |||
1 | SUMMARY = "PNG Library" | ||
2 | DESCRIPTION = "PNG Library" | ||
3 | HOMEPAGE = "http://www.libpng.org/" | ||
4 | SECTION = "libs" | ||
5 | LICENSE = "Libpng" | ||
6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c3d807a85c09ebdff087f18b4969ff96 \ | ||
7 | file://png.h;beginline=310;endline=424;md5=b87b5e9252a3e14808a27b92912d268d" | ||
8 | DEPENDS = "zlib" | ||
9 | PR = "r0" | ||
10 | |||
11 | SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng12/${PV}/libpng-${PV}.tar.xz" | ||
12 | |||
13 | SRC_URI[md5sum] = "a3e00fccbfe356174ab515b5c00641c7" | ||
14 | SRC_URI[sha256sum] = "4724f81f8c92ac7f360ad1fbf173396ea7c535923424db9fbaff07bfd9d8e8e7" | ||
15 | |||
16 | inherit autotools binconfig pkgconfig | ||
17 | |||
18 | PACKAGES =+ "${PN}12" | ||
19 | |||
20 | FILES_${PN}12 = "${libdir}/libpng12${SOLIBS}" | ||
21 | RPROVIDES_${PN}-dev += "${PN}12-dev" | ||