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

diff --git a/packages/libpng/libpng-1.2.20/.mtn2git_empty b/packages/libpng/files/.mtn2git_empty
similarity index 100%
rename from packages/libpng/libpng-1.2.20/.mtn2git_empty
rename to packages/libpng/files/.mtn2git_empty

diff --git a/packages/libpng/libpng-1.2.20/makefile_fix.patch b/packages/libpng/files/makefile_fix.patch
similarity index 100%
rename from packages/libpng/libpng-1.2.20/makefile_fix.patch
rename to packages/libpng/files/makefile_fix.patch

diff --git a/packages/libpng/libpng-native_1.2.8.bb b/packages/libpng/libpng-native.inc
similarity index 78%
rename from packages/libpng/libpng-native_1.2.8.bb
rename to packages/libpng/libpng-native.inc
index 231b956..641688a 100644 (file)
--- a/packages/libpng/libpng-native_1.2.8.bb
+++ b/packages/libpng/libpng-native.inc
@@ -1,6 +1,5 @@
-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"

diff --git a/packages/libpng/libpng-native_1.2.12.bb b/packages/libpng/libpng-native_1.2.12.bb
index 231b956..52c92e9 100644 (file)
--- 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 231b956..52c92e9 100644 (file)
--- 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 (file)
index 0000000..52c92e9
--- /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_1.2.8.bb b/packages/libpng/libpng.inc
similarity index 79%
rename from packages/libpng/libpng_1.2.8.bb
rename to packages/libpng/libpng.inc
index cddc400..30a34f2 100644 (file)
--- a/packages/libpng/libpng_1.2.8.bb
+++ b/packages/libpng/libpng.inc
@@ -3,33 +3,12 @@ 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}'
-}
+inherit autotools pkgconfig binconfig
 
 do_stage() {
        cp libpng.pc libpng12.pc
@@ -55,3 +34,12 @@ python do_package() {
         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 b05bc84..ac0fd43 100644 (file)
--- 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 41bd6ec..aee9ff1 100644 (file)
--- 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 (file)
index 0000000..aee9ff1
--- /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
+}