libpng: Update libpng-native 1.2.12 -> 1.2.16, convert to use SOLIBS variables

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3775 311d38ba-8fff-0310-9ca6-ca027cbcb966

3 files changed, 3 insertions, 52 deletions

diff --git a/meta/packages/libpng/libpng-native_1.2.12.bb b/meta/packages/libpng/libpng-native_1.2.16.bb
index 231b956678..231b956678 100644
--- a/meta/packages/libpng/libpng-native_1.2.12.bb
+++ b/meta/packages/libpng/libpng-native_1.2.16.bb
diff --git a/meta/packages/libpng/libpng_1.2.12.bb b/meta/packages/libpng/libpng_1.2.12.bb
deleted file mode 100644
index c26d5e5d87..0000000000
--- a/meta/packages/libpng/libpng_1.2.12.bb
+++ /dev/null
@@ -1,49 +0,0 @@
-DESCRIPTION = "PNG Library"
-HOMEPAGE = "http://www.libpng.org/"
-LICENSE = "libpng"
-SECTION = "libs"
-PRIORITY = "required"
-PR = "r5"
-
-DEPENDS = "zlib"
-
-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 \
-                ${datadir}/aclocal ${bindir} ${sbindir}"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2"
-S = "${WORKDIR}/libpng-${PV}"
-
-inherit autotools binconfig pkgconfig
-
-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
-}
-
-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/meta/packages/libpng/libpng_1.2.16.bb b/meta/packages/libpng/libpng_1.2.16.bb
index c26d5e5d87..3395bc857e 100644
--- a/meta/packages/libpng/libpng_1.2.16.bb
+++ b/meta/packages/libpng/libpng_1.2.16.bb
@@ -10,10 +10,10 @@ DEPENDS = "zlib"
 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 = "${libdir}/libpng12${SOLIBS}"
 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 \
+FILES_${PN} = "${libdir}/lib*${SOLIBS}"
+FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
                 ${libdir}/*.a ${libdir}/pkgconfig \
                 ${datadir}/aclocal ${bindir} ${sbindir}"