Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/31 14:38:06-08:00 (none)!ggilbert
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into olddog.(none):/home/ggilbert/oe/openembedded

2004/12/31 14:37:57-08:00 (none)!ggilbert
Many files:
  More licenses

2004/12/31 21:40:58+00:00 nexus.co.uk!pb
banish audiofile-config and other stuff from /usr/bin to separate packages

2004/12/31 21:38:39+00:00 nexus.co.uk!pb
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe

2004/12/31 21:38:10+00:00 nexus.co.uk!pb
update glib-2.0 (and -native) to 2.6.0


BKrev: 41d5d547IMV0BSOCNaouK2zsnwHytg

15 files changed, 288 insertions, 0 deletions

diff --git a/packages/audiofile/audiofile_0.2.6.bb b/packages/audiofile/audiofile_0.2.6.bb
index e69de29bb2..0d08c2fd37 100644
--- a/packages/audiofile/audiofile_0.2.6.bb
+++ b/packages/audiofile/audiofile_0.2.6.bb
@@ -0,0 +1,22 @@
+PR = "r3"
+SECTION = "libs"
+LICENSE = "LGPL GPL"
+DESCRIPTION = "The Audio File Library provides a uniform and elegant \
+API for accessing a variety of audio file formats, such as AIFF/AIFF-C, \
+WAVE, NeXT/Sun .snd/.au, Berkeley/IRCAM/CARL Sound File, Audio Visual \
+Research, Amiga IFF/8SVX, and NIST SPHERE." 
+
+PACKAGES += "${PN}-bin"
+FILES_${PN} = "${libdir}/libaudiofile*.so.*"
+FILES_${PN}-dev += "${bindir}/*-config"
+FILES_${PN}-bin += "${bindir}"
+
+SRC_URI = "http://www.68k.org/~michael/audiofile/audiofile-${PV}.tar.gz"
+
+inherit autotools pkgconfig binconfig
+
+do_stage () {
+	install -m 0644 libaudiofile/audiofile.h libaudiofile/aupvlist.h libaudiofile/af_vfs.h ${STAGING_INCDIR}/
+	oe_libinstall -C libaudiofile libaudiofile ${STAGING_LIBDIR}
+	install -m 0644 audiofile.m4 ${STAGING_DATADIR}/aclocal/
+}
diff --git a/packages/glib-2.0/glib-2.0-native_2.6.0.bb b/packages/glib-2.0/glib-2.0-native_2.6.0.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/glib-2.0/glib-2.0-native_2.6.0.bb
diff --git a/packages/glib-2.0/glib-2.0_2.6.0.bb b/packages/glib-2.0/glib-2.0_2.6.0.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/glib-2.0/glib-2.0_2.6.0.bb
diff --git a/packages/iputils/iputils_20020927.bb b/packages/iputils/iputils_20020927.bb
index e69de29bb2..874013268b 100644
--- a/packages/iputils/iputils_20020927.bb
+++ b/packages/iputils/iputils_20020927.bb
@@ -0,0 +1,30 @@
+SECTION = "console/utils"
+BROKEN = "1"
+DEPENDS = "docbook-utils-native"
+DESCRIPTION = "Utilities for the IP protocol."
+LICENSE ="BSD"
+SRC_URI = "http://www.tux.org/pub/people/alexey-kuznetsov/ip-routing/iputils-ss020927.tar.gz"
+S = "${WORKDIR}/iputils"
+
+EXTRA_OEMAKE = ""
+
+do_compile () {
+	oe_runmake 'CC=${CC}' \
+		   KERNEL_INCLUDE="${STAGING_INCDIR}" \
+		   LIBC_INCLUDE="${STAGING_INCDIR}"
+	oe_runmake -C doc 'CC=${CC}' \
+		   KERNEL_INCLUDE="${STAGING_INCDIR}" \
+		   LIBC_INCLUDE="${STAGING_INCDIR}"
+}
+
+do_install () {
+	install -d ${D}/bin ${D}${sbindir} \
+		   ${D}/${mandir}/man8 ${D}/${datadir}/doc/${P}
+	install -m 0755 ping ${D}/bin/
+	for f in ipg tracepath clockdiff rdisc arping \
+		tftpd rarpd tracepath6 traceroute6 ping6; do
+		install -m 0755 $f ${D}/${sbindir}/
+	done
+	install -m 0644 doc/*.8 ${D}/${mandir}/man8/
+	install -m 0644 doc/*.html ${D}/${datadir}/doc/${P}/
+}
diff --git a/packages/joe/joe_3.1.bb b/packages/joe/joe_3.1.bb
index e69de29bb2..dcf664808c 100644
--- a/packages/joe/joe_3.1.bb
+++ b/packages/joe/joe_3.1.bb
@@ -0,0 +1,7 @@
+SECTION = "console/utils"
+DESCRIPTION = "Joe's own editor."
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE ="GPL"
+SRC_URI = "${SOURCEFORGE_MIRROR}/joe-editor/joe-${PV}.tar.gz"
+
+inherit autotools
diff --git a/packages/jpeg/jpeg_6b.bb b/packages/jpeg/jpeg_6b.bb
index e69de29bb2..30429b6031 100644
--- a/packages/jpeg/jpeg_6b.bb
+++ b/packages/jpeg/jpeg_6b.bb
@@ -0,0 +1,35 @@
+SECTION = "libs"
+PRIORITY = "required"
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+DEPENDS = "libtool-cross"
+DESCRIPTION = "libjpeg is a library for handling the JPEG (JFIF) image format."
+PACKAGES =+ "jpeg-tools "
+FILES_jpeg-tools = "${bindir}"
+LICENSE ="jpeg"
+SRC_URI = "http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \
+	   file://debian.patch;patch=1 \
+	   file://ldflags.patch;patch=1 \
+	   file://paths.patch;patch=1"
+S = "${WORKDIR}/jpeg-${PV}"
+
+inherit autotools 
+
+EXTRA_OECONF="--enable-static --enable-shared"
+EXTRA_OEMAKE='"LIBTOOL=${STAGING_BINDIR}/${HOST_SYS}-libtool"'
+
+CFLAGS_append = " -D_REENTRANT"
+
+do_stage() {
+	install -m 644 jconfig.h ${STAGING_INCDIR}/jconfig.h
+	install -m 644 jpeglib.h ${STAGING_INCDIR}/jpeglib.h
+	install -m 644 jmorecfg.h ${STAGING_INCDIR}/jmorecfg.h
+	install -m 644 jerror.h ${STAGING_INCDIR}/jerror.h
+	install -m 644 jpegint.h ${STAGING_INCDIR}/jpegint.h
+	oe_libinstall -so libjpeg ${STAGING_LIBDIR}
+}
+
+do_install() {
+	install -d ${D}/${bindir} ${D}/${includedir} \
+		   ${D}/${mandir}/man1 ${D}/${libdir}
+	oe_runmake 'DESTDIR=${D}' install
+}
diff --git a/packages/kbdd/kbdd_20040904.bb b/packages/kbdd/kbdd_20040904.bb
index e69de29bb2..cb827cab80 100644
--- a/packages/kbdd/kbdd_20040904.bb
+++ b/packages/kbdd/kbdd_20040904.bb
@@ -0,0 +1,15 @@
+SECTION = "unknown"
+SRC_URI = "${HANDHELDS_CVS};module=apps/kbdd;date=${PV}"
+
+S = "${WORKDIR}/kbdd"
+LICENSE = "GPL"
+do_compile() {
+	oe_runmake
+}
+
+do_install() {
+	install -d ${D}/${bindir}
+	install -d ${D}/${docdir}/kbdd/
+	install -m 0755 kbdd ${D}/${bindir}/
+	install -m 0644 README ${D}/${docdir}/kbdd/
+}
diff --git a/packages/keylaunch/keylaunch_2.0.7.bb b/packages/keylaunch/keylaunch_2.0.7.bb
index e69de29bb2..a4011e13ed 100644
--- a/packages/keylaunch/keylaunch_2.0.7.bb
+++ b/packages/keylaunch/keylaunch_2.0.7.bb
@@ -0,0 +1,15 @@
+inherit gpe
+
+DEPENDS = "virtual/xserver xtst xau"
+SECTION = "gpe"
+LICENSE = "GPL"
+DESCRIPTION = "A small utility for binding commands to a hot key.\
+ Keylaunch is a minimal utility for associating commands with hot keys. This\
+ GPE version is intended for use with the special keys found on most handheld\
+ computers. You can connect each key to a program of your choice; if the\
+ program is already running, keylaunch can bring its window to the front\
+ rather than just running another copy."
+
+SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz"
+
+export CVSBUILD=no
diff --git a/packages/klibc/klibc_0.157.bb b/packages/klibc/klibc_0.157.bb
index e69de29bb2..d40c4963c5 100644
--- a/packages/klibc/klibc_0.157.bb
+++ b/packages/klibc/klibc_0.157.bb
@@ -0,0 +1,34 @@
+SECTION = "libs"
+DESCRIPTION = "klibc is intended to be a minimalistic libc subset for \
+use with initramfs.  It is deliberately written for small size, \
+minimal entaglement, and portability, not speed."
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+LICENSE ="BSD-ADV"
+SRC_URI = "http://www.kernel.org/pub/linux/libs/klibc/Stable/klibc-${PV}.tar.bz2"
+S = "${WORKDIR}/klibc-${PV}"
+
+# FIXME: This package fails to compile at the moment, and is missing a do_install()
+BROKEN = "1"
+
+EXTRA_OEMAKE = "'ARCH=${KLIBC_ARCH}' \
+		'CROSS=${TARGET_PREFIX}' \
+		'CC=${CC}' \
+		'LD=${LD}' \
+		'AR=${AR}' \
+		'RANLIB=${RANLIB}' \
+		'NM=${TARGET_PREFIX}nm' \
+		'STRIP=echo' \
+		'SHLIBDIR=/lib' \
+		'HOST_CC=${BUILD_CC}' \
+		'HOST_CFLAGS=${BUILD_CFLAGS}' \
+		'HOST_LDFLAGS=${BUILD_LDFLAGS}' \
+		'HOST_LIBS=' \
+		'LDFLAGS=${LDFLAGS}' \
+		'WARNFLAGS=${CFLAGS}' \
+		'OPTFLAGS='"
+
+KLIBC_ARCH := '${TARGET_ARCH}'
+KLIBC_ARCH_armeb = 'arm'
+KLIBC_ARCH_mipsel = 'mips'
+
+CFLAGS := "${@oe_filter_out('-I\S+', '${CFLAGS}', d)} -I${STAGING_KERNEL_DIR}/include"
diff --git a/packages/lcdproc/lcdproc_0.4.5.bb b/packages/lcdproc/lcdproc_0.4.5.bb
index e69de29bb2..6c170ecf3e 100644
--- a/packages/lcdproc/lcdproc_0.4.5.bb
+++ b/packages/lcdproc/lcdproc_0.4.5.bb
@@ -0,0 +1,51 @@
+SECTION = "base"
+DESCRIPTION = "LCDproc is a client/Server suite to drive all kinds of LCD (-like) devices. The client \
+shipped with this package can be used to acquire various kinds of system stats."
+HOMEPAGE = "http://lcdproc.org"
+PRIORITY = "optional"
+MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
+DEPENDS = "${@((bb.data.getVar('LCDPROC_DRIVERS',d) or 'curses,text').find('curses') != -1) and 'ncurses' or ''}"
+LICENSE ="GPL"
+SRC_URI = "${SOURCEFORGE_MIRROR}/lcdproc/lcdproc-${PV}.tar.gz"
+
+inherit autotools
+
+EXTRA_OECONF = "${@'--enable-drivers=' + (bb.data.getVar('LCDPROC_DRIVERS',d) or 'curses,text')}"
+
+do_install () {
+	# binaries
+	install -D -m 0755 server/LCDd ${D}/${sbindir}/LCDd
+	install -D -m 0755 clients/lcdproc/lcdproc ${D}/${bindir}/lcdproc
+
+	# init scripts
+	install -D -m 0755 scripts/init-LCDd.debian ${D}/${sysconfdir}/init.d/lcdd
+	# prevent lcdproc from starting if no SCREENS are set.
+	# will be fixed in next upstream release
+	cat scripts/init-lcdproc.debian | sed -e 's/C X//' | sed -e 's/case/[ -n $SCREENS ] || exit 0
+
+case/' > ${D}/${sysconfdir}/init.d/lcdproc
+	chmod 0755 ${D}/${sysconfdir}/init.d/lcdproc
+
+	# configuration files
+	install -D -m 0644 LCDd.conf ${D}/${sysconfdir}/LCDd.conf
+	# don't start lcdproc by default
+	# will be fixed in next upstream release
+	cat scripts/lcdproc.conf | sed -e 's/C X//' > ${D}/${sysconfdir}/lcdproc.conf
+	chmod 0644 ${D}/${sysconfdir}/lcdproc.conf
+}
+
+pkg_postinst () {
+	if test -n "${D}"; then
+		D="-r $D"
+	fi
+	update-rc.d $D lcdd defaults 70 21
+	update-rc.d $D lcdproc defaults 71 20
+}
+
+pkg_prerm () {
+	if test -n "${D}"; then
+		D="-r $D"
+	fi
+	update-rc.d $D lcdproc remove
+	update-rc.d $D lcdd remove
+}
diff --git a/packages/lcms/lcms_1.13.bb b/packages/lcms/lcms_1.13.bb
index e69de29bb2..b2a2f960aa 100644
--- a/packages/lcms/lcms_1.13.bb
+++ b/packages/lcms/lcms_1.13.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Little cms is a small-footprint, speed optimized color management engine."
+SECTION = "libs"
+LICENSE = "LGPL"
+SRC_URI = "http://www.littlecms.com/lcms-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	oe_libinstall -a -so -C src/.libs/ liblcms ${STAGING_LIBDIR}
+}
diff --git a/packages/less/less_381.bb b/packages/less/less_381.bb
index e69de29bb2..6702292423 100644
--- a/packages/less/less_381.bb
+++ b/packages/less/less_381.bb
@@ -0,0 +1,14 @@
+SECTION = "console/utils"
+DEPENDS = "ncurses"
+DESCRIPTION = "Less is a program similar to more, i.e. a terminal \
+based program for viewing text files and the output from other \
+programs. Less offers many features beyond those that more does."
+LICENSE = "GPL"
+SRC_URI = "${GNU_MIRROR}/less/less-${PV}.tar.gz \
+	   file://configure.patch;patch=1"
+
+inherit autotools
+
+do_install () {
+	oe_runmake 'bindir=${D}${bindir}' 'mandir=${D}${mandir}' install
+}
diff --git a/packages/libdaemon/libdaemon_0.3.bb b/packages/libdaemon/libdaemon_0.3.bb
index e69de29bb2..0d0b563de6 100644
--- a/packages/libdaemon/libdaemon_0.3.bb
+++ b/packages/libdaemon/libdaemon_0.3.bb
@@ -0,0 +1,16 @@
+SECTION = "libs"
+DESCRIPTION = "libdaemon is a lightweight C library which eases the writing of UNIX daemons."
+LICENSE ="GPL"
+SRC_URI = "http://0pointer.de/lennart/projects/libdaemon/libdaemon-${PV}.tar.gz"
+
+inherit autotools 
+
+EXTRA_OECONF = "--disable-lynx"
+
+do_stage () {
+	oe_libinstall -a -so -C src libdaemon ${STAGING_LIBDIR}
+	install -d ${STAGING_INCDIR}/libdaemon
+	for i in dlog.h dfork.h dsignal.h dnonblock.h dpid.h; do
+		install -m 0644 ${S}/src/$i ${STAGING_INCDIR}/libdaemon/
+	done
+}
diff --git a/packages/libdes/libdes_4.01.bb b/packages/libdes/libdes_4.01.bb
index e69de29bb2..4e81ff9fb6 100644
--- a/packages/libdes/libdes_4.01.bb
+++ b/packages/libdes/libdes_4.01.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "A DES encryption library"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "libdes"
+SRC_URI = "http://www.agentpp.com/libdes-l-${PV}.tar.gz \
+           file://cross-compile.patch;patch=1"
+S = "${WORKDIR}/libdes"
+
+do_compile() {
+	oe_runmake libdes.a
+}
+
+do_stage() {
+	oe_libinstall -a libdes ${STAGING_LIBDIR}
+	install -m 0644 ${S}/des.h ${STAGING_INCDIR}/
+}
diff --git a/packages/libdotdesktop/libdotdesktop_0.11.bb b/packages/libdotdesktop/libdotdesktop_0.11.bb
index e69de29bb2..d7014ce441 100644
--- a/packages/libdotdesktop/libdotdesktop_0.11.bb
+++ b/packages/libdotdesktop/libdotdesktop_0.11.bb
@@ -0,0 +1,23 @@
+SECTION = "libs"
+DESCRIPTION = "library for extracting mime data from .desktop files."
+DEPENDS = "glib-2.0"
+LICENSE = "GPL"
+inherit pkgconfig
+
+SRC_URI = "${GPE_MIRROR}/libdotdesktop-${PV}.tar.gz \
+	file://make_build_var.patch;patch=1"
+
+headers = "dotdesktop.h"
+
+do_stage () {
+	oe_libinstall -so libdotdesktop ${STAGING_LIBDIR}
+        mkdir -p ${STAGING_INCDIR}/gpe
+        for h in ${headers}; do
+                install -m 0644 ${S}/$h ${STAGING_INCDIR}/gpe/$h
+        done
+}
+
+do_install () {
+	oe_runmake PREFIX=${prefix} DESTDIR=${D} install-program
+        oe_runmake PREFIX=${prefix} DESTDIR=${D} install-devel
+}