Merge oe-devel@oe-devel.bkbits.net:packages.bb

into handhelds.org:/home/kergoth/code/packages.bb

2004/12/07 04:58:25-06:00 ti.com!kergoth
More updates per the core rename.

2004/12/07 04:46:51-06:00 ti.com!kergoth
Update soundtracker per the core rename.

2004/12/07 04:44:14-06:00 ti.com!kergoth
Merge

2004/12/07 04:42:38-06:00 ti.com!kergoth
Updates per the recent rename of the oe core from 'oe' to 'bitbake'.

BKrev: 41b6293b91LRHSxMOt6WnrZVAdLbFw

8 files changed, 0 insertions, 121 deletions

diff --git a/libpng/libpng-native_1.2.5+1.2.6rc5.bb b/libpng/libpng-native_1.2.5+1.2.6rc5.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/libpng/libpng-native_1.2.5+1.2.6rc5.bb
diff --git a/libpng/libpng-native_1.2.5+1.2.6rc5.oe b/libpng/libpng-native_1.2.5+1.2.6rc5.oe
deleted file mode 100644
index 58fd1abc78..0000000000
--- a/libpng/libpng-native_1.2.5+1.2.6rc5.oe
+++ /dev/null
@@ -1,5 +0,0 @@
-SECTION = "libs"
-include libpng_${PV}.oe
-inherit native
-FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/libpng-${PV}"
-DEPENDS = "zlib-native"
diff --git a/libpng/libpng-native_1.2.7.bb b/libpng/libpng-native_1.2.7.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/libpng/libpng-native_1.2.7.bb
diff --git a/libpng/libpng-native_1.2.7.oe b/libpng/libpng-native_1.2.7.oe
deleted file mode 100644
index 58fd1abc78..0000000000
--- a/libpng/libpng-native_1.2.7.oe
+++ /dev/null
@@ -1,5 +0,0 @@
-SECTION = "libs"
-include libpng_${PV}.oe
-inherit native
-FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/libpng-${PV}"
-DEPENDS = "zlib-native"
diff --git a/libpng/libpng_1.2.5+1.2.6rc5.bb b/libpng/libpng_1.2.5+1.2.6rc5.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/libpng/libpng_1.2.5+1.2.6rc5.bb
diff --git a/libpng/libpng_1.2.5+1.2.6rc5.oe b/libpng/libpng_1.2.5+1.2.6rc5.oe
deleted file mode 100644
index a765d9e08e..0000000000
--- a/libpng/libpng_1.2.5+1.2.6rc5.oe
+++ /dev/null
@@ -1,54 +0,0 @@
-DESCRIPTION = "PNG Library"
-SECTION = "libs"
-PRIORITY = "required"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-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-1.2.6rc5.tar.bz2"
-S = "${WORKDIR}/libpng-1.2.6rc5"
-
-inherit pkgconfig
-
-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 oe.data.getVar('DEBIAN_NAMES', d, 1):
-            oe.data.setVar('PKG_${PN}', 'libpng12', d)
-        oe.build.exec_func('package_do_package', d)
-}
-
diff --git a/libpng/libpng_1.2.7.bb b/libpng/libpng_1.2.7.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/libpng/libpng_1.2.7.bb
diff --git a/libpng/libpng_1.2.7.oe b/libpng/libpng_1.2.7.oe
deleted file mode 100644
index 06c69dfcdb..0000000000
--- a/libpng/libpng_1.2.7.oe
+++ /dev/null
@@ -1,57 +0,0 @@
-DESCRIPTION = "PNG Library"
-HOMEPAGE = "http://www.libpng.org/"
-LICENSE = "libpng"
-SECTION = "libs"
-PRIORITY = "required"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-
-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
-
-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 oe.data.getVar('DEBIAN_NAMES', d, 1):
-            oe.data.setVar('PKG_${PN}', 'libpng12', d)
-        oe.build.exec_func('package_do_package', d)
-}
-