From 6f5035a9ccda297b0059f464b2fd98a016b86466 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Tue, 21 Nov 2006 10:39:29 +0000
Subject: libpng: 1.2.8 -> 1.2.12

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@909 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/libpng/libpng-native_1.2.12.bb | 14 +++++++
 meta/packages/libpng/libpng-native_1.2.8.bb  | 14 -------
 meta/packages/libpng/libpng_1.2.12.bb        | 49 ++++++++++++++++++++++++
 meta/packages/libpng/libpng_1.2.8.bb         | 56 ----------------------------
 4 files changed, 63 insertions(+), 70 deletions(-)
 create mode 100644 meta/packages/libpng/libpng-native_1.2.12.bb
 delete mode 100644 meta/packages/libpng/libpng-native_1.2.8.bb
 create mode 100644 meta/packages/libpng/libpng_1.2.12.bb
 delete mode 100644 meta/packages/libpng/libpng_1.2.8.bb

diff --git a/meta/packages/libpng/libpng-native_1.2.12.bb b/meta/packages/libpng/libpng-native_1.2.12.bb
new file mode 100644
index 000000000..231b95667
--- /dev/null
+++ b/meta/packages/libpng/libpng-native_1.2.12.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-native_1.2.8.bb b/meta/packages/libpng/libpng-native_1.2.8.bb
deleted file mode 100644
index 231b95667..000000000
--- a/meta/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/meta/packages/libpng/libpng_1.2.12.bb b/meta/packages/libpng/libpng_1.2.12.bb
new file mode 100644
index 000000000..c26d5e5d8
--- /dev/null
+++ b/meta/packages/libpng/libpng_1.2.12.bb
@@ -0,0 +1,49 @@
+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.8.bb b/meta/packages/libpng/libpng_1.2.8.bb
deleted file mode 100644
index 52d8818f8..000000000
--- a/meta/packages/libpng/libpng_1.2.8.bb
+++ /dev/null
@@ -1,56 +0,0 @@
-DESCRIPTION = "PNG Library"
-HOMEPAGE = "http://www.libpng.org/"
-LICENSE = "libpng"
-SECTION = "libs"
-PRIORITY = "required"
-
-DEPENDS = "zlib"
-
-PACKAGES =+ "${PN}12 ${PN}12-dev"
-
-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