7 files changed, 20 insertions, 47 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 31a0a90460..db4beee5e8 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -16302,6 +16302,10 @@ sha256=cafe6431f9e6d561fb7b396bf94ff73a9cd0f4279f3eea2fc714ab90e345eee6
 md5=29bbd1c3cbe54b04bfc2bda43067ccb5
 sha256=a6197352ad5b79a9a1ce0dd59f5e737cfbf909e0f3c5f64631cf0d93549e4e40
 
+[http://downloads.sourceforge.net/libpng/libpng-1.2.41.tar.bz2]
+md5=2faa7f8d81e6a35beb991cb75edbf056
+sha256=a172c5afe4668a31eb090d14be7fc2811a9fec8568a785badd30280f47a27e00
+
 [http://downloads.sourceforge.net/libpng/libpng-1.2.8.tar.bz2]
 md5=00cea4539bea4bd34cbf8b82ff9589cd
 sha256=9bec729a1e77d8bbc5800b14aa81f09290aa18daa40f344103f2c0d1d681531b
diff --git a/recipes/libpng/libpng-native.inc b/recipes/libpng/libpng-native.inc
index 641688a881..a515346b62 100644
--- a/recipes/libpng/libpng-native.inc
+++ b/recipes/libpng/libpng-native.inc
@@ -3,11 +3,3 @@ inherit native
 DEPENDS = "zlib-native"
 
 INHIBIT_NATIVE_STAGE_INSTALL = "1"
-
-do_stage_append() {
-        cp libpng.pc libpng12.pc
-        install -m 644 png.h ${STAGING_INCDIR}/png.h
-        install -m 644 pngconf.h ${STAGING_INCDIR}/pngconf.h
-        oe_libinstall -so libpng12 ${STAGING_LIBDIR}/
-        ln -sf libpng12.so ${STAGING_LIBDIR}/libpng.so
-}
diff --git a/recipes/libpng/libpng-native_1.2.40.bb b/recipes/libpng/libpng-native_1.2.40.bb
index 52c92e9954..3c36b52138 100644
--- a/recipes/libpng/libpng-native_1.2.40.bb
+++ b/recipes/libpng/libpng-native_1.2.40.bb
@@ -1,4 +1,6 @@
 require libpng_${PV}.bb
 require libpng-native.inc
 
+PR = "r1"
+
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpng-${PV}"
diff --git a/recipes/libpng/libpng-native_1.2.41.bb b/recipes/libpng/libpng-native_1.2.41.bb
new file mode 100644
index 0000000000..3c36b52138
--- /dev/null
+++ b/recipes/libpng/libpng-native_1.2.41.bb
@@ -0,0 +1,6 @@
+require libpng_${PV}.bb
+require libpng-native.inc
+
+PR = "r1"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpng-${PV}"
diff --git a/recipes/libpng/libpng.inc b/recipes/libpng/libpng.inc
index 30a34f2457..c0facfa244 100644
--- a/recipes/libpng/libpng.inc
+++ b/recipes/libpng/libpng.inc
@@ -5,40 +5,13 @@ SECTION = "libs"
 PRIORITY = "required"
 DEPENDS = "zlib"
 
+INC_PR = "r1"
+
 SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2"
 S = "${WORKDIR}/libpng-${PV}"
 
 inherit autotools pkgconfig binconfig
 
-do_stage() {
-	cp libpng.pc libpng12.pc
-	install -m 644 png.h ${STAGING_INCDIR}/png.h
-	install -m 644 pngconf.h ${STAGING_INCDIR}/pngconf.h
-	oe_libinstall -so libpng12 ${STAGING_LIBDIR}/
-	ln -sf libpng12.so ${STAGING_LIBDIR}/libpng.so
-}
-
-do_install() {
-	install -d ${D}${bindir} ${D}${mandir} \
-		   ${D}${libdir} ${D}${includedir}
-	unset LDFLAGS
-	oe_runmake 'prefix=${prefix}' 'DESTDIR=${D}' \
-		   'DB=${D}${bindir}' 'DI=${D}${includedir}' \
-		   'DL=${D}${libdir}' 'DM=${D}${mandir}' \
-		   install
-}
-
-python do_package() {
-        if bb.data.getVar('DEBIAN_NAMES', d, 1):
-            bb.data.setVar('PKG_${PN}', 'libpng12', d)
-        bb.build.exec_func('package_do_package', d)
-}
-
-PACKAGES =+ "${PN}12-dbg ${PN}12 ${PN}12-dev"
-
-FILES_${PN}12-dbg += "${libdir}/libpng12*.dbg"
-FILES_${PN}12 = "${libdir}/libpng12.so.*"
-FILES_${PN}12-dev = "${libdir}/libpng12.* ${includedir}/libpng12 ${libdir}/pkgconfig/libpng12.pc"
 FILES_${PN} = "${libdir}/lib*.so.*"
 FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
 		${libdir}/*.a ${libdir}/pkgconfig \
diff --git a/recipes/libpng/libpng_1.2.40.bb b/recipes/libpng/libpng_1.2.40.bb
index 3ed02a7f17..29cfdc678e 100644
--- a/recipes/libpng/libpng_1.2.40.bb
+++ b/recipes/libpng/libpng_1.2.40.bb
@@ -1,14 +1,5 @@
 require libpng.inc
 
-PR = "r0"
+PR = "${INC_PR}.0"
 
 SRC_URI += "file://makefile_fix.patch;patch=1"
-
-do_stage() {
-	cp libpng.pc libpng12.pc
-	install -m 644 png.h ${STAGING_INCDIR}/png.h
-	install -m 644 pngconf.h ${STAGING_INCDIR}/pngconf.h
-	oe_libinstall -so libpng ${STAGING_LIBDIR}/
-	oe_libinstall -so libpng12 ${STAGING_LIBDIR}/
-	ln -sf libpng12.so ${STAGING_LIBDIR}/libpng.so
-}
diff --git a/recipes/libpng/libpng_1.2.41.bb b/recipes/libpng/libpng_1.2.41.bb
new file mode 100644
index 0000000000..29cfdc678e
--- /dev/null
+++ b/recipes/libpng/libpng_1.2.41.bb
@@ -0,0 +1,5 @@
+require libpng.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://makefile_fix.patch;patch=1"