From 35adb93043fde981b9fed0aff9c6bb1be69d525b Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Tue, 16 Sep 2008 09:14:58 +0000 Subject: libpng: bump to 1.2.31. close oebug#4538. unify # drop broken 1.2.8 * add make-file patch to 1.2.12 * recommend dropping 1.2.12 and 1.2.20 due to security holes --- packages/libpng/files/.mtn2git_empty | 0 packages/libpng/files/makefile_fix.patch | 18 ++++++++ packages/libpng/libpng-1.2.20/.mtn2git_empty | 0 packages/libpng/libpng-1.2.20/makefile_fix.patch | 18 -------- packages/libpng/libpng-native.inc | 13 ++++++ packages/libpng/libpng-native_1.2.12.bb | 14 +----- packages/libpng/libpng-native_1.2.20.bb | 14 +----- packages/libpng/libpng-native_1.2.31.bb | 4 ++ packages/libpng/libpng-native_1.2.8.bb | 14 ------ packages/libpng/libpng.inc | 45 +++++++++++++++++++ packages/libpng/libpng_1.2.12.bb | 41 ++--------------- packages/libpng/libpng_1.2.20.bb | 43 ++---------------- packages/libpng/libpng_1.2.31.bb | 14 ++++++ packages/libpng/libpng_1.2.8.bb | 57 ------------------------ 14 files changed, 104 insertions(+), 191 deletions(-) create mode 100644 packages/libpng/files/.mtn2git_empty create mode 100644 packages/libpng/files/makefile_fix.patch delete mode 100644 packages/libpng/libpng-1.2.20/.mtn2git_empty delete mode 100644 packages/libpng/libpng-1.2.20/makefile_fix.patch create mode 100644 packages/libpng/libpng-native.inc create mode 100644 packages/libpng/libpng-native_1.2.31.bb delete mode 100644 packages/libpng/libpng-native_1.2.8.bb create mode 100644 packages/libpng/libpng.inc create mode 100644 packages/libpng/libpng_1.2.31.bb delete mode 100644 packages/libpng/libpng_1.2.8.bb (limited to 'packages') diff --git a/packages/libpng/files/.mtn2git_empty b/packages/libpng/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/libpng/files/makefile_fix.patch b/packages/libpng/files/makefile_fix.patch new file mode 100644 index 0000000000..3fa8793add --- /dev/null +++ b/packages/libpng/files/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/packages/libpng/libpng-1.2.20/.mtn2git_empty b/packages/libpng/libpng-1.2.20/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/libpng/libpng-1.2.20/makefile_fix.patch b/packages/libpng/libpng-1.2.20/makefile_fix.patch deleted file mode 100644 index 3fa8793add..0000000000 --- a/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/packages/libpng/libpng-native.inc b/packages/libpng/libpng-native.inc new file mode 100644 index 0000000000..641688a881 --- /dev/null +++ b/packages/libpng/libpng-native.inc @@ -0,0 +1,13 @@ +inherit native + +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/packages/libpng/libpng-native_1.2.12.bb b/packages/libpng/libpng-native_1.2.12.bb index 231b956678..52c92e9954 100644 --- a/packages/libpng/libpng-native_1.2.12.bb +++ b/packages/libpng/libpng-native_1.2.12.bb @@ -1,14 +1,4 @@ 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" +require libpng-native.inc -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 -} +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpng-${PV}" diff --git a/packages/libpng/libpng-native_1.2.20.bb b/packages/libpng/libpng-native_1.2.20.bb index 231b956678..52c92e9954 100644 --- a/packages/libpng/libpng-native_1.2.20.bb +++ b/packages/libpng/libpng-native_1.2.20.bb @@ -1,14 +1,4 @@ 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" +require libpng-native.inc -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 -} +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpng-${PV}" diff --git a/packages/libpng/libpng-native_1.2.31.bb b/packages/libpng/libpng-native_1.2.31.bb new file mode 100644 index 0000000000..52c92e9954 --- /dev/null +++ b/packages/libpng/libpng-native_1.2.31.bb @@ -0,0 +1,4 @@ +require libpng_${PV}.bb +require libpng-native.inc + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpng-${PV}" diff --git a/packages/libpng/libpng-native_1.2.8.bb b/packages/libpng/libpng-native_1.2.8.bb deleted file mode 100644 index 231b956678..0000000000 --- a/packages/libpng/libpng-native_1.2.8.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/packages/libpng/libpng.inc b/packages/libpng/libpng.inc new file mode 100644 index 0000000000..30a34f2457 --- /dev/null +++ b/packages/libpng/libpng.inc @@ -0,0 +1,45 @@ +DESCRIPTION = "PNG Library" +HOMEPAGE = "http://www.libpng.org/" +LICENSE = "libpng" +SECTION = "libs" +PRIORITY = "required" +DEPENDS = "zlib" + +SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2" +S = "${WORKDIR}/libpng-${PV}" + +inherit autotools pkgconfig binconfig + +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) +} + +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}" diff --git a/packages/libpng/libpng_1.2.12.bb b/packages/libpng/libpng_1.2.12.bb index b05bc84856..ac0fd43379 100644 --- a/packages/libpng/libpng_1.2.12.bb +++ b/packages/libpng/libpng_1.2.12.bb @@ -1,26 +1,8 @@ -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" +require libpng.inc -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}" +PR = "r5" -inherit autotools binconfig pkgconfig +SRC_URI += "file://makefile_fix.patch;patch=1" do_stage() { cp libpng.pc libpng12.pc @@ -30,20 +12,3 @@ do_stage() { 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.20.bb b/packages/libpng/libpng_1.2.20.bb index 41bd6ec3f7..aee9ff14ec 100644 --- a/packages/libpng/libpng_1.2.20.bb +++ b/packages/libpng/libpng_1.2.20.bb @@ -1,16 +1,8 @@ -DESCRIPTION = "PNG Library" -HOMEPAGE = "http://www.libpng.org/" -LICENSE = "libpng" -SECTION = "libs" -DEPENDS = "zlib" -PRIORITY = "required" -PR = "r6" +require libpng.inc -SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2 \ - file://makefile_fix.patch;patch=1" -S = "${WORKDIR}/libpng-${PV}" +PR = "r6" -inherit autotools binconfig pkgconfig +SRC_URI += "file://makefile_fix.patch;patch=1" do_stage() { cp libpng.pc libpng12.pc @@ -20,32 +12,3 @@ do_stage() { 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.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}" - diff --git a/packages/libpng/libpng_1.2.31.bb b/packages/libpng/libpng_1.2.31.bb new file mode 100644 index 0000000000..aee9ff14ec --- /dev/null +++ b/packages/libpng/libpng_1.2.31.bb @@ -0,0 +1,14 @@ +require libpng.inc + +PR = "r6" + +SRC_URI += "file://makefile_fix.patch;patch=1" + +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 +} diff --git a/packages/libpng/libpng_1.2.8.bb b/packages/libpng/libpng_1.2.8.bb deleted file mode 100644 index cddc400375..0000000000 --- a/packages/libpng/libpng_1.2.8.bb +++ /dev/null @@ -1,57 +0,0 @@ -DESCRIPTION = "PNG Library" -HOMEPAGE = "http://www.libpng.org/" -LICENSE = "libpng" -SECTION = "libs" -PRIORITY = "required" - -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 pkgconfig binconfig - -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) -} - -- cgit v1.2.3