Update to libpng 1.2.6rc1 due to security holes.

BKrev: 41129655GAUcaJhs-MgFaXXkNz9Fpw

diff --git a/libpng/files/libpng-1.2.5-gentoo.diff b/libpng/libpng-native_1.2.5+1.2.6rc1.oe
similarity index 100%
rename from libpng/files/libpng-1.2.5-gentoo.diff
rename to libpng/libpng-native_1.2.5+1.2.6rc1.oe

diff --git a/libpng/libpng-native_1.2.5.oe b/libpng/libpng_1.2.5+1.2.6rc1.oe
similarity index 100%
rename from libpng/libpng-native_1.2.5.oe
rename to libpng/libpng_1.2.5+1.2.6rc1.oe

diff --git a/libpng/libpng_1.2.5.oe b/libpng/libpng_1.2.5.oe
deleted file mode 100644 (file)
index 91b3305..0000000
--- a/libpng/libpng_1.2.5.oe
+++ /dev/null
@@ -1,55 +0,0 @@
-DESCRIPTION = "PNG Library"
-SECTION = "libs"
-PRIORITY = "required"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-DEPENDS = "zlib"
-PR = "r2"
-
-PACKAGES =+ "${PN}12 ${PN}12-dev"
-
-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 \
-               ${datadir}/aclocal ${bindir} ${sbindir}
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/png-mng/libpng-${PV}.tar.bz2 \
-          file://libpng-${PV}-gentoo.diff;patch=1"
-
-inherit pkgconfig
-
-EXTRA_OEMAKE_append = " ZLIBINC=${STAGING_INCDIR} ZLIBLIB=${STAGING_LIBDIR}"
-
-do_compile() {
-       sed < scripts/makefile.linux > makefile -e 's/^ZLIBINC.*//' -e 's/^ZLIBLIB.*//'
-       unset LDFLAGS
-       oe_runmake 'CC=${CC}' 'LD=${LD}' 'CFLAGS=${CFLAGS}' \
-                  'ZLIBINC=${STAGING_INCDIR}' \
-                  'ZLIBLIB=${STAGING_LIBDIR}'
-}
-
-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 oe.data.getVar('DEBIAN_NAMES', d, 1):
-            oe.data.setVar('PKG_${PN}', 'libpng12', d)
-        oe.build.exec_func('package_do_package', d)
-}
-