libpng also uses the binconfig scheme

drop some older libpng versions

diff --git a/packages/libpng/libpng-native_1.2.5+1.2.6rc5.bb b/packages/libpng/libpng-native_1.2.5+1.2.6rc5.bb
deleted file mode 100644 (file)
index 5415774..0000000
--- a/packages/libpng/libpng-native_1.2.5+1.2.6rc5.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-SECTION = "libs"
-include libpng_${PV}.bb
-inherit native
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpng-${PV}"
-DEPENDS = "zlib-native"

diff --git a/packages/libpng/libpng-native_1.2.7.bb b/packages/libpng/libpng-native_1.2.7.bb
deleted file mode 100644 (file)
index 5415774..0000000
--- a/packages/libpng/libpng-native_1.2.7.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-SECTION = "libs"
-include libpng_${PV}.bb
-inherit native
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpng-${PV}"
-DEPENDS = "zlib-native"

diff --git a/packages/libpng/libpng-native_1.2.8.bb b/packages/libpng/libpng-native_1.2.8.bb
index 7e611bf..b03056f 100644 (file)
--- a/packages/libpng/libpng-native_1.2.8.bb
+++ b/packages/libpng/libpng-native_1.2.8.bb
@@ -3,7 +3,9 @@ inherit native
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpng-${PV}"
 DEPENDS = "zlib-native"
 
-do_stage() {
+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

diff --git a/packages/libpng/libpng_1.2.5+1.2.6rc5.bb b/packages/libpng/libpng_1.2.5+1.2.6rc5.bb
deleted file mode 100644 (file)
index 216657c..0000000
--- a/packages/libpng/libpng_1.2.5+1.2.6rc5.bb
+++ /dev/null
@@ -1,54 +0,0 @@
-DESCRIPTION = "PNG Library"
-SECTION = "libs"
-PRIORITY = "required"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-DEPENDS = "zlib"
-LICENSE = "PNG"
-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}/libpng/libpng-1.2.6rc5.tar.bz2"
-S = "${WORKDIR}/libpng-1.2.6rc5"
-
-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 bb.data.getVar('DEBIAN_NAMES', d, 1):
-            bb.data.setVar('PKG_${PN}', 'libpng12', d)
-        bb.build.exec_func('package_do_package', d)
-}
-

diff --git a/packages/libpng/libpng_1.2.7.bb b/packages/libpng/libpng_1.2.7.bb
deleted file mode 100644 (file)
index a93587c..0000000
--- a/packages/libpng/libpng_1.2.7.bb
+++ /dev/null
@@ -1,57 +0,0 @@
-DESCRIPTION = "PNG Library"
-HOMEPAGE = "http://www.libpng.org/"
-LICENSE = "libpng"
-SECTION = "libs"
-PRIORITY = "required"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-
-DEPENDS = "zlib"
-
-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}/libpng/libpng-${PV}.tar.bz2"
-S = "${WORKDIR}/libpng-${PV}"
-
-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 bb.data.getVar('DEBIAN_NAMES', d, 1):
-            bb.data.setVar('PKG_${PN}', 'libpng12', d)
-        bb.build.exec_func('package_do_package', d)
-}
-

diff --git a/packages/libpng/libpng_1.2.8.bb b/packages/libpng/libpng_1.2.8.bb
index 05f6815..81274dc 100644 (file)
--- a/packages/libpng/libpng_1.2.8.bb
+++ b/packages/libpng/libpng_1.2.8.bb
@@ -19,7 +19,7 @@ FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \
 SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2"
 S = "${WORKDIR}/libpng-${PV}"
 
-inherit pkgconfig
+inherit pkgconfig binconfig
 
 EXTRA_OEMAKE_append = " ZLIBINC=${STAGING_INCDIR} ZLIBLIB=${STAGING_LIBDIR}"