From 62497eba6d7c31943cad3fe2a26132089f6760ef Mon Sep 17 00:00:00 2001
From: Kang Kai <kai.kang@windriver.com>
Date: Tue, 26 Mar 2013 13:58:34 +0800
Subject: [PATCH] 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>
---
 meta/conf/distro/include/default-versions.inc |  3 +++
 meta/recipes-lsb4/libpng/libpng_1.2.50.bb     | 21 +++++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 meta/recipes-lsb4/libpng/libpng_1.2.50.bb

diff --git a/meta/conf/distro/include/default-versions.inc b/meta/conf/distro/include/default-versions.inc
index 53ec2e7..0a5b2f4 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"
 
 # Force the older version of liberation-fonts until we fix the fontforge issue
 PREFERRED_VERSION_liberation-fonts ?= "1.04"
+
+# Set libpng default version for linuxstdbase
+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 0000000..8fdc41b
--- /dev/null
+++ b/meta/recipes-lsb4/libpng/libpng_1.2.50.bb
@@ -0,0 +1,21 @@
+SUMMARY = "PNG Library"
+DESCRIPTION = "PNG Library"
+HOMEPAGE = "http://www.libpng.org/"
+SECTION = "libs"
+LICENSE = "Libpng"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=c3d807a85c09ebdff087f18b4969ff96 \
+                    file://png.h;beginline=310;endline=424;md5=b87b5e9252a3e14808a27b92912d268d"
+DEPENDS = "zlib"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng12/${PV}/libpng-${PV}.tar.xz"
+
+SRC_URI[md5sum] = "a3e00fccbfe356174ab515b5c00641c7"
+SRC_URI[sha256sum] = "4724f81f8c92ac7f360ad1fbf173396ea7c535923424db9fbaff07bfd9d8e8e7"
+
+inherit autotools binconfig pkgconfig
+
+PACKAGES =+ "${PN}12"
+
+FILES_${PN}12 = "${libdir}/libpng12${SOLIBS}"
+RPROVIDES_${PN}-dev += "${PN}12-dev"
-- 
2.7.4