From 578d807f0a7b6fb2e579e076c87a489c7664b702 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 1 Jun 2008 16:11:11 +0000 Subject: libpng12: 1.2.16 -> 1.2.20 git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4566 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../libpng/libpng-1.2.16/makefile_fix.patch | 18 -------- .../libpng/libpng-1.2.20/makefile_fix.patch | 18 ++++++++ meta/packages/libpng/libpng-native_1.2.16.bb | 14 ------ meta/packages/libpng/libpng-native_1.2.20.bb | 14 ++++++ meta/packages/libpng/libpng_1.2.16.bb | 50 ---------------------- meta/packages/libpng/libpng_1.2.20.bb | 50 ++++++++++++++++++++++ 6 files changed, 82 insertions(+), 82 deletions(-) delete mode 100644 meta/packages/libpng/libpng-1.2.16/makefile_fix.patch create mode 100644 meta/packages/libpng/libpng-1.2.20/makefile_fix.patch delete mode 100644 meta/packages/libpng/libpng-native_1.2.16.bb create mode 100644 meta/packages/libpng/libpng-native_1.2.20.bb delete mode 100644 meta/packages/libpng/libpng_1.2.16.bb create mode 100644 meta/packages/libpng/libpng_1.2.20.bb (limited to 'meta/packages') diff --git a/meta/packages/libpng/libpng-1.2.16/makefile_fix.patch b/meta/packages/libpng/libpng-1.2.16/makefile_fix.patch deleted file mode 100644 index 3fa8793ad..000000000 --- a/meta/packages/libpng/libpng-1.2.16/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/makefile_fix.patch b/meta/packages/libpng/libpng-1.2.20/makefile_fix.patch new file mode 100644 index 000000000..3fa8793ad --- /dev/null +++ b/meta/packages/libpng/libpng-1.2.20/makefile_fix.patch @@ -0,0 +1,18 @@ +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-native_1.2.16.bb b/meta/packages/libpng/libpng-native_1.2.16.bb deleted file mode 100644 index 231b95667..000000000 --- a/meta/packages/libpng/libpng-native_1.2.16.bb +++ /dev/null @@ -1,14 +0,0 @@ -require libpng_${PV}.bb -inherit native -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpng-${PV}" -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/meta/packages/libpng/libpng-native_1.2.20.bb b/meta/packages/libpng/libpng-native_1.2.20.bb new file mode 100644 index 000000000..231b95667 --- /dev/null +++ b/meta/packages/libpng/libpng-native_1.2.20.bb @@ -0,0 +1,14 @@ +require libpng_${PV}.bb +inherit native +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpng-${PV}" +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/meta/packages/libpng/libpng_1.2.16.bb b/meta/packages/libpng/libpng_1.2.16.bb deleted file mode 100644 index 0b15018d0..000000000 --- a/meta/packages/libpng/libpng_1.2.16.bb +++ /dev/null @@ -1,50 +0,0 @@ -DESCRIPTION = "PNG Library" -HOMEPAGE = "http://www.libpng.org/" -LICENSE = "libpng" -SECTION = "libs" -PRIORITY = "required" -PR = "r6" - -DEPENDS = "zlib" - -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}" - -SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2 \ - file://makefile_fix.patch;patch=1" -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.20.bb b/meta/packages/libpng/libpng_1.2.20.bb new file mode 100644 index 000000000..842fc04af --- /dev/null +++ b/meta/packages/libpng/libpng_1.2.20.bb @@ -0,0 +1,50 @@ +DESCRIPTION = "PNG Library" +HOMEPAGE = "http://www.libpng.org/" +LICENSE = "libpng" +SECTION = "libs" +DEPENDS = "zlib" +PRIORITY = "required" +PR = "r6" + +SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2 \ + file://makefile_fix.patch;patch=1" +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} + 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}" -- cgit v1.2.3