diff --git a/meta/packages/libpng/libpng-1.2.20/makefile_fix.patch b/meta/packages/libpng/libpng-1.2.20/makefile_fix.patch deleted file mode 100644 index 3fa8793add..0000000000 --- a/meta/packages/libpng/libpng-1.2.20/makefile_fix.patch +++ /dev/null @@ -1,18 +0,0 @@ -Old versions of libtool (1.5.10) used to set ECHO as a side effect. With -libtool 2.2.2 we need to do this manually - -RP - 14/4/08 - -Index: libpng-1.2.16/Makefile.am -=================================================================== ---- libpng-1.2.16.orig/Makefile.am 2008-04-14 14:47:21.000000000 +0100 -+++ libpng-1.2.16/Makefile.am 2008-04-14 14:47:47.000000000 +0100 -@@ -102,6 +102,8 @@ - >$@.new - mv $@.new $@ - -+ECHO=echo -+ - libpng.vers: libpng.sym - rm -f $@ $@.new - $(ECHO) PNG@PNGLIB_MAJOR@@PNGLIB_MINOR@_0 '{global:' > $@.new diff --git a/meta/packages/libpng/libpng_1.2.20.bb b/meta/packages/libpng/libpng_1.2.20.bb deleted file mode 100644 index c6f9d2f649..0000000000 --- a/meta/packages/libpng/libpng_1.2.20.bb +++ /dev/null @@ -1,42 +0,0 @@ -DESCRIPTION = "PNG Library" -HOMEPAGE = "http://www.libpng.org/" -SECTION = "libs" -LICENSE = "libpng" -DEPENDS = "zlib" -PRIORITY = "required" -PR = "r9" - -SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2 \ - file://makefile_fix.patch" - -inherit autotools binconfig pkgconfig pkgconfig_stage - -do_install() { - install -d ${D}${bindir} - install -d ${D}${mandir} - install -d ${D}${libdir} - install -d ${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${SOLIBS}" -FILES_${PN}12-dev = "${libdir}/libpng12.* ${includedir}/libpng12 ${libdir}/pkgconfig/libpng12.pc" -FILES_${PN} = "${libdir}/lib*${SOLIBS}" -FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \ - ${libdir}/*.a ${libdir}/pkgconfig \ - ${datadir}/aclocal ${bindir} ${sbindir}" - -BBCLASSEXTEND = "native" diff --git a/meta/packages/libpng/libpng_1.2.44.bb b/meta/packages/libpng/libpng_1.2.44.bb new file mode 100644 index 0000000000..318bb7436d --- /dev/null +++ b/meta/packages/libpng/libpng_1.2.44.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "PNG Library" +HOMEPAGE = "http://www.libpng.org/" +SECTION = "libs" +PRIORITY = "required" +LICENSE = "libpng" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a294a2bb08b7f25558119edbfd6b2e92 \ + file://png.h;startline=172;endline=261;md5=3253923f0093658f470e52a06ddcf4e7" +DEPENDS = "zlib" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2" + +inherit autotools binconfig pkgconfig + +PACKAGES =+ "${PN}12-dbg ${PN}12 ${PN}12-dev" + +FILES_${PN}12-dbg = "${libdir}/.debug/libpng12*" +FILES_${PN}12 = "${libdir}/libpng12${SOLIBS}" +FILES_${PN}12-dev = "${libdir}/libpng12.* ${includedir}/libpng12 ${libdir}/pkgconfig/libpng12.pc" +FILES_${PN} = "${libdir}/lib*${SOLIBS}" +FILES_${PN}-dev += " ${bindir} ${sbindir}" + +BBCLASSEXTEND = "native"