From 984e22310853aaa068480fe73eb6b8ba4a739fdd Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Wed, 2 Jan 2008 20:13:29 +0000
Subject: xrestop 0.4: Add DESCRIPTION & SECTION.

---
 packages/xrestop/xrestop_0.4.bb | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'packages')

diff --git a/packages/xrestop/xrestop_0.4.bb b/packages/xrestop/xrestop_0.4.bb
index 40396a2362..0ecf39a84b 100644
--- a/packages/xrestop/xrestop_0.4.bb
+++ b/packages/xrestop/xrestop_0.4.bb
@@ -1,5 +1,8 @@
+DESCRIPTION = "top-like statistics of X11 server resource usage by clients"
+SECTION = "x11/utils"
 HOMEPAGE = "http://www.freedesktop.org/wiki/Software/xrestop"
 LICENSE = "GPL"
+PR = "r1"
 
 DEPENDS = "libxres libxext virtual/libx11"
 
-- 
cgit v1.2.3


From e6456ede2a1737515f82c0acce0f30604c5e013b Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Thu, 3 Jan 2008 10:55:48 +0000
Subject: ntpclient: update to 2007_365 at the authors request

---
 packages/ntpclient/ntpclient_2007_365.bb | 34 ++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 packages/ntpclient/ntpclient_2007_365.bb

(limited to 'packages')

diff --git a/packages/ntpclient/ntpclient_2007_365.bb b/packages/ntpclient/ntpclient_2007_365.bb
new file mode 100644
index 0000000000..b892f384e7
--- /dev/null
+++ b/packages/ntpclient/ntpclient_2007_365.bb
@@ -0,0 +1,34 @@
+DESCRIPTION = "NTP (RFC-1305) client for unix-alike computers"
+HOMEPAGE = "http://doolittle.icarus.com/ntpclient"
+AUTHOR = "Larry Doolittle <larry@doolittle.boa.org>"
+RDEPENDS = "busybox"
+SECTION = "admin"
+LICENSE = "GPLv2"
+PR = "r0"
+# The ntpclient package uses version numbers that include an underscore :(
+PV = "2007_365"
+# ntpclient unpacks into a directory that doesn't include version info :(
+S = "${WORKDIR}/${PN}-2007"
+
+SRC_URI = "http://doolittle.icarus.com/ntpclient/ntpclient_${PV}.tar.gz \
+           file://init"
+
+INITSCRIPT_NAME = "ntpclient"
+INITSCRIPT_PARAMS = "defaults 65"
+inherit update-rc.d
+
+LDFLAGS += " -lrt "
+
+do_compile() {
+    oe_runmake ntpclient
+    oe_runmake adjtimex
+}
+
+do_install () {
+    # Install the binary and tools
+    install -D -m 0755 ${S}/ntpclient ${D}${base_sbindir}/ntpclient
+    install -D -m 0755 ${S}/adjtimex ${D}${base_sbindir}/adjtimex
+    install -D -m 0755 ${S}/rate.awk ${D}${sbindir}/ntpclient-drift-rate.awk
+    install -D -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/ntpclient
+}
+
-- 
cgit v1.2.3


From eb45a68e0a2f0d1a3c0d63f8d8bd2e0d0a432fb5 Mon Sep 17 00:00:00 2001
From: Paul Eggleton <bluelightning@bluelightning.org>
Date: Thu, 3 Jan 2008 11:04:14 +0000
Subject: opie-taskbar 1.2.3: Fix first-run wizard after install path revamp.

---
 packages/opie-taskbar/opie-taskbar/firstuse-path.patch | 11 +++++++++++
 packages/opie-taskbar/opie-taskbar_1.2.3.bb            |  1 +
 packages/opie-taskbar/opie-taskbar_cvs.bb              |  3 ++-
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 packages/opie-taskbar/opie-taskbar/firstuse-path.patch

(limited to 'packages')

diff --git a/packages/opie-taskbar/opie-taskbar/firstuse-path.patch b/packages/opie-taskbar/opie-taskbar/firstuse-path.patch
new file mode 100644
index 0000000000..636eb81675
--- /dev/null
+++ b/packages/opie-taskbar/opie-taskbar/firstuse-path.patch
@@ -0,0 +1,11 @@
+--- launcher/firstuse.cpp	2007-10-14 12:47:55.000000000 +1300
++++ launcher/firstuse.cpp	2007-10-14 13:58:54.000000000 +1300
+@@ -124,7 +124,7 @@
+ #endif
+ 
+     for ( int i = 0; settingsTable[i].app; i++ ) {
+-	QString file = QPEApplication::qpeDir() + "bin/";
++	QString file = OPIE_BINDIR + QString("/");
+ 	file += settingsTable[i].app;
+ 	file += exeSuffix;
+ 	if ( QFile::exists(file) )
diff --git a/packages/opie-taskbar/opie-taskbar_1.2.3.bb b/packages/opie-taskbar/opie-taskbar_1.2.3.bb
index d8a794fc16..c22e3bed5f 100644
--- a/packages/opie-taskbar/opie-taskbar_1.2.3.bb
+++ b/packages/opie-taskbar/opie-taskbar_1.2.3.bb
@@ -13,4 +13,5 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
            file://kbdlocks-runtime.patch;patch=1 \
 	   file://restart-from-bindir.patch;patch=1 \
            file://server.pro \
+	   file://firstuse-path.patch;patch=1 \
           "
diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb
index 3bda5c4f40..e84e35d820 100644
--- a/packages/opie-taskbar/opie-taskbar_cvs.bb
+++ b/packages/opie-taskbar/opie-taskbar_cvs.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 PV = "${OPIE_CVS_PV}"
-PR = "r15"
+PR = "r16"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
            ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \
@@ -14,4 +14,5 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
            file://kbdlocks-runtime.patch;patch=1 \
 	   file://restart-from-bindir.patch;patch=1 \
            file://server.pro \
+	   file://firstuse-path.patch;patch=1 \
           "
-- 
cgit v1.2.3


From 0816f16f207a8f877cee48ac8714f3adae6114a9 Mon Sep 17 00:00:00 2001
From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Thu, 3 Jan 2008 13:05:26 +0000
Subject: gpsd: update to 2.36, drop 2.35.

---
 packages/gpsd/gpsd-2.35/.mtn2git_empty  |  0
 packages/gpsd/gpsd-2.35/gpsd_dbus.patch | 11 -----------
 packages/gpsd/gpsd_2.35.bb              |  8 --------
 packages/gpsd/gpsd_2.36.bb              |  3 +++
 4 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 100644 packages/gpsd/gpsd-2.35/.mtn2git_empty
 delete mode 100644 packages/gpsd/gpsd-2.35/gpsd_dbus.patch
 delete mode 100644 packages/gpsd/gpsd_2.35.bb
 create mode 100644 packages/gpsd/gpsd_2.36.bb

(limited to 'packages')

diff --git a/packages/gpsd/gpsd-2.35/.mtn2git_empty b/packages/gpsd/gpsd-2.35/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/gpsd/gpsd-2.35/gpsd_dbus.patch b/packages/gpsd/gpsd-2.35/gpsd_dbus.patch
deleted file mode 100644
index 215b0ecce9..0000000000
--- a/packages/gpsd/gpsd-2.35/gpsd_dbus.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gpsd-2.35/gpsd_dbus.h.old	2008-01-02 20:54:33.000000000 -0600
-+++ gpsd-2.35/gpsd_dbus.h	2008-01-02 20:55:35.000000000 -0600
-@@ -6,6 +6,8 @@
- 
- #include <dbus/dbus.h>
- 
-+#include "gpsd.h"
-+
- int initialize_dbus_connection (void);
- void send_dbus_fix (struct gps_device_t* channel);
- 
diff --git a/packages/gpsd/gpsd_2.35.bb b/packages/gpsd/gpsd_2.35.bb
deleted file mode 100644
index fcc5c76070..0000000000
--- a/packages/gpsd/gpsd_2.35.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require gpsd.inc
-
-SRC_URI = "http://download.berlios.de/gpsd/gpsd-${PV}.tar.gz \
-           file://gpsd-default \
-           file://gpsd \
-           file://gpsd_dbus.patch;patch=1 "
-
-PR = "r0"
diff --git a/packages/gpsd/gpsd_2.36.bb b/packages/gpsd/gpsd_2.36.bb
new file mode 100644
index 0000000000..58e9ebeee2
--- /dev/null
+++ b/packages/gpsd/gpsd_2.36.bb
@@ -0,0 +1,3 @@
+require gpsd.inc
+
+PR = "r0"
-- 
cgit v1.2.3


From 6540294a6e516730508e4ebbee20f539a984b795 Mon Sep 17 00:00:00 2001
From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Thu, 3 Jan 2008 13:34:49 +0000
Subject: gpsd.inc: fix staging

---
 packages/gpsd/gpsd.inc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'packages')

diff --git a/packages/gpsd/gpsd.inc b/packages/gpsd/gpsd.inc
index d493b2bca7..be593e0744 100644
--- a/packages/gpsd/gpsd.inc
+++ b/packages/gpsd/gpsd.inc
@@ -32,10 +32,9 @@ do_install_prepend() {
 }
 
 do_stage() {
-        oe_libinstall -so -C ${S}/.libs libgps ${STAGING_LIBDIR}
-        install -m 0655 ${S}/libgps.la ${STAGING_LIBDIR}
-        install -m 0655 ${S}/gps.h ${STAGING_INCDIR}
-        install -m 0655 ${S}/gpsd.h ${STAGING_INCDIR}
+        oe_libinstall -so libgps ${STAGING_LIBDIR}
+        install -m 0644 ${S}/gps.h ${STAGING_INCDIR}
+        install -m 0644 ${S}/gpsd.h ${STAGING_INCDIR}
 }
 
 do_install_append() {
-- 
cgit v1.2.3


From acb42bcc7d501026e7a41638645201850cd02dac Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 3 Jan 2008 14:23:43 +0000
Subject: dbus: added 1.1.1 from Poky (non default)

---
 packages/dbus/dbus-1.1.1/.mtn2git_empty           |   0
 packages/dbus/dbus-1.1.1/cross.patch              |  10 ++
 packages/dbus/dbus-1.1.1/dbus-1.init              | 110 ++++++++++++++++++++++
 packages/dbus/dbus-1.1.1/fix-install-daemon.patch |  13 +++
 packages/dbus/dbus-1.1.1/tmpdir.patch             |  30 ++++++
 packages/dbus/dbus-native_1.1.1.bb                |  31 ++++++
 packages/dbus/dbus_1.1.1.bb                       |  63 +++++++++++++
 7 files changed, 257 insertions(+)
 create mode 100644 packages/dbus/dbus-1.1.1/.mtn2git_empty
 create mode 100644 packages/dbus/dbus-1.1.1/cross.patch
 create mode 100644 packages/dbus/dbus-1.1.1/dbus-1.init
 create mode 100644 packages/dbus/dbus-1.1.1/fix-install-daemon.patch
 create mode 100644 packages/dbus/dbus-1.1.1/tmpdir.patch
 create mode 100644 packages/dbus/dbus-native_1.1.1.bb
 create mode 100644 packages/dbus/dbus_1.1.1.bb

(limited to 'packages')

diff --git a/packages/dbus/dbus-1.1.1/.mtn2git_empty b/packages/dbus/dbus-1.1.1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/dbus/dbus-1.1.1/cross.patch b/packages/dbus/dbus-1.1.1/cross.patch
new file mode 100644
index 0000000000..268a3ae3de
--- /dev/null
+++ b/packages/dbus/dbus-1.1.1/cross.patch
@@ -0,0 +1,10 @@
+--- /tmp/configure.in	2006-11-09 21:47:10.000000000 +0100
++++ dbus-0.95/configure.in	2006-11-09 21:48:13.108554000 +0100
+@@ -719,6 +719,7 @@
+     exit (0);
+ ]])],
+               [ac_cv_have_abstract_sockets=yes],
++	      [ac_cv_have_abstract_sockets=no],
+               [ac_cv_have_abstract_sockets=no]
+ )])
+ AC_LANG_POP(C)
diff --git a/packages/dbus/dbus-1.1.1/dbus-1.init b/packages/dbus/dbus-1.1.1/dbus-1.init
new file mode 100644
index 0000000000..0725083c69
--- /dev/null
+++ b/packages/dbus/dbus-1.1.1/dbus-1.init
@@ -0,0 +1,110 @@
+#! /bin/sh
+# -*- coding: utf-8 -*-
+# Debian init.d script for D-BUS
+# Copyright © 2003 Colin Walters <walters@debian.org>
+
+set -e
+
+DAEMON=/usr/bin/dbus-daemon
+NAME=dbus
+DAEMONUSER=messagebus
+PIDDIR=/var/run/dbus
+PIDFILE=$PIDDIR/pid
+UUIDDIR=/var/lib/dbus
+DESC="system message bus"
+EVENTDIR=/etc/dbus-1/event.d
+
+test -x $DAEMON || exit 0
+
+# Source defaults file; edit that file to configure this script.
+ENABLED=1
+PARAMS=""
+if [ -e /etc/default/dbus ]; then
+  . /etc/default/dbus
+fi
+
+test "$ENABLED" != "0" || exit 0
+
+start_it_up()
+{
+  if [ ! -d $PIDDIR ]; then
+    mkdir -p $PIDDIR
+    chown $DAEMONUSER $PIDDIR
+    chgrp $DAEMONUSER $PIDDIR
+  fi
+  if [ -e $PIDFILE ]; then
+    PIDDIR=/proc/$(cat $PIDFILE)
+    if [ -d ${PIDDIR} -a  "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then 
+      echo "$DESC already started; not starting."
+    else
+      echo "Removing stale PID file $PIDFILE."
+      rm -f $PIDFILE
+    fi
+  fi
+
+  if [ ! -d $UUIDDIR ]; then
+    mkdir -p $UUIDDIR
+    chown $DAEMONUSER $UUIDDIR
+    chgrp $DAEMONUSER $UUIDDIR
+  fi
+ 
+  dbus-uuidgen --ensure  
+
+  echo -n "Starting $DESC: "
+  start-stop-daemon --start --quiet --pidfile $PIDFILE \
+    --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS
+  echo "$NAME."
+  if [ -d $EVENTDIR ]; then
+      run-parts --arg=start $EVENTDIR
+  fi
+}
+
+shut_it_down()
+{
+  if [ -d $EVENTDIR ]; then
+      # TODO: --reverse when busybox supports it
+      run-parts --arg=stop $EVENTDIR
+  fi
+  echo -n "Stopping $DESC: "
+  start-stop-daemon --stop  --quiet --pidfile $PIDFILE \
+    --user $DAEMONUSER
+  # We no longer include these arguments so that start-stop-daemon
+  # can do its job even given that we may have been upgraded.
+  # We rely on the pidfile being sanely managed
+  # --exec $DAEMON -- --system $PARAMS
+  echo "$NAME."
+  rm -f $PIDFILE
+}
+
+reload_it()
+{
+  echo -n "Reloading $DESC config: "
+  dbus-send --print-reply --system --type=method_call \
+            --dest=org.freedesktop.DBus \
+            / org.freedesktop.DBus.ReloadConfig > /dev/null
+  # hopefully this is enough time for dbus to reload it's config file.
+  echo "done."
+}
+
+case "$1" in
+  start)
+    start_it_up
+  ;;
+  stop)
+    shut_it_down
+  ;;
+  reload|force-reload)
+    reload_it
+  ;;
+  restart)
+    shut_it_down
+    sleep 1
+    start_it_up
+  ;;
+  *)
+    echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload|force-reload}" >&2
+    exit 1
+  ;;
+esac
+
+exit 0
diff --git a/packages/dbus/dbus-1.1.1/fix-install-daemon.patch b/packages/dbus/dbus-1.1.1/fix-install-daemon.patch
new file mode 100644
index 0000000000..c31786357d
--- /dev/null
+++ b/packages/dbus/dbus-1.1.1/fix-install-daemon.patch
@@ -0,0 +1,13 @@
+Index: dbus-0.94/bus/Makefile.am
+===================================================================
+--- dbus-0.94.orig/bus/Makefile.am	2006-10-01 17:36:18.000000000 +0200
++++ dbus-0.94/bus/Makefile.am	2006-10-14 21:40:05.000000000 +0200
+@@ -110,7 +110,7 @@
+ 		$(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \
+ 		chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \
+ 	fi
+-	$(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
++	$(INSTALL_PROGRAM) .libs/dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
+ 	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
+ 	$(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
+ 	$(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
diff --git a/packages/dbus/dbus-1.1.1/tmpdir.patch b/packages/dbus/dbus-1.1.1/tmpdir.patch
new file mode 100644
index 0000000000..838b903f0a
--- /dev/null
+++ b/packages/dbus/dbus-1.1.1/tmpdir.patch
@@ -0,0 +1,30 @@
+--- dbus-0.22/configure.in.orig	2004-08-13 00:57:16.000000000 +0200
++++ dbus-0.22/configure.in	2004-12-30 21:15:57.000000000 +0100
+@@ -1047,15 +1048,18 @@
+ AC_SUBST(ABSOLUTE_TOP_BUILDDIR)
+ 
+ #### Find socket directories
+-if ! test -z "$TMPDIR" ; then
+-   DEFAULT_SOCKET_DIR=$TMPDIR
+-elif ! test -z "$TEMP" ; then
+-   DEFAULT_SOCKET_DIR=$TEMP
+-elif ! test -z "$TMP" ; then
+-   DEFAULT_SOCKET_DIR=$TMP
+-else
+-   DEFAULT_SOCKET_DIR=/tmp
+-fi
++#if ! test -z "$TMPDIR" ; then
++#   DEFAULT_SOCKET_DIR=$TMPDIR
++#elif ! test -z "$TEMP" ; then
++#   DEFAULT_SOCKET_DIR=$TEMP
++#elif ! test -z "$TMP" ; then
++#   DEFAULT_SOCKET_DIR=$TMP
++#else
++#   DEFAULT_SOCKET_DIR=/tmp
++#fi
++
++# checks disabled to avoid expanding this at build time
++DEFAULT_SOCKET_DIR=/tmp
+ 
+ if ! test -z "$with_test_socket_dir" ; then
+    TEST_SOCKET_DIR="$with_test_socket_dir"
diff --git a/packages/dbus/dbus-native_1.1.1.bb b/packages/dbus/dbus-native_1.1.1.bb
new file mode 100644
index 0000000000..72e2190f78
--- /dev/null
+++ b/packages/dbus/dbus-native_1.1.1.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "message bus system for applications to talk to one another"
+HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
+LICENSE = "GPL"
+SECTION = "base"
+
+PR = "r0"
+
+DEPENDS = "glib-2.0-native libxml2-native expat-native"
+
+DEFAULT_PREFERENCE = "-1"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-1.0.2"
+SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
+	   file://cross.patch;patch=1 \
+	   "
+
+inherit autotools pkgconfig gettext native
+
+S = "${WORKDIR}/dbus-${PV}"
+
+EXTRA_OECONF = " --disable-tests --disable-checks --disable-xml-docs \
+                 --disable-doxygen-docs --with-xml=expat --without-x"
+
+do_stage () {
+	oe_runmake install
+	autotools_stage_all
+
+	# for dbus-glib-native introspection generation
+	install -d ${STAGING_DATADIR}/dbus
+	install -m 0644 bus/session.conf ${STAGING_DATADIR}/dbus/session.conf
+}
diff --git a/packages/dbus/dbus_1.1.1.bb b/packages/dbus/dbus_1.1.1.bb
new file mode 100644
index 0000000000..7bf0a8634d
--- /dev/null
+++ b/packages/dbus/dbus_1.1.1.bb
@@ -0,0 +1,63 @@
+DEFAULT_PREFERENCE = "-1"
+
+SECTION = "base"
+HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
+DESCRIPTION = "message bus system for applications to talk to one another"
+LICENSE = "GPL"
+DEPENDS = "expat glib-2.0 virtual/libintl"
+
+PR = "r3"
+
+SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
+	   file://tmpdir.patch;patch=1 \
+	   file://dbus-1.init \
+	   file://cross.patch;patch=1 \
+	   file://fix-install-daemon.patch;patch=1"
+
+inherit autotools pkgconfig update-rc.d gettext
+
+INITSCRIPT_NAME = "dbus-1"
+INITSCRIPT_PARAMS = "defaults"
+
+CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf"
+
+FILES_${PN} = "${bindir}/dbus-daemon ${bindir}/dbus-launch ${bindir}/dbus-cleanup-sockets ${bindir}/dbus-send ${bindir}/dbus-monitor ${bindir}/dbus-uuidgen ${sysconfdir} ${datadir}/dbus-1/services ${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${libdir}/dbus-1.0/include"
+
+pkg_postinst_dbus() {
+#!/bin/sh
+
+# can't do adduser stuff offline
+if [ "x$D" != "x" ]; then
+  exit 1
+fi
+
+MESSAGEUSER=messagebus
+MESSAGEHOME=/var/run/dbus
+
+mkdir -p $MESSAGEHOME || true
+chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER"
+chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
+}
+
+EXTRA_OECONF = " --disable-tests --disable-checks --disable-xml-docs \
+                 --disable-doxygen-docs --with-xml=expat --without-x"
+
+do_stage () {
+	oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR}
+
+	autotools_stage_includes
+
+	mkdir -p ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
+	install -m 0644 dbus/dbus-arch-deps.h ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
+}
+
+do_install_append () {
+	install -d ${D}${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
+}
+
+python populate_packages_prepend () {
+	if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
+		bb.data.setVar('PKG_dbus', 'dbus-1', d)
+}
-- 
cgit v1.2.3


From e084786aed2d73221570ea9f0199a85890ac231f Mon Sep 17 00:00:00 2001
From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Thu, 3 Jan 2008 15:08:58 +0000
Subject: qpegps: upgrade 0.9.3.1. bump angstrom-preferred * fix DEPENDS and
 libqte-mt linking  close #oebug 3955 thanks to bluelightning * patch 0.9.3.1
 Place.* file name bug * fix .desktop QA issue

---
 packages/qpegps/files/qpegps.desktop | 3 +--
 packages/qpegps/qpegps.inc           | 8 +++++---
 packages/qpegps/qpegps_0.9.3.1.bb    | 6 ++++++
 packages/qpegps/qpegps_0.9.3.bb      | 1 -
 4 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 packages/qpegps/qpegps_0.9.3.1.bb
 delete mode 100644 packages/qpegps/qpegps_0.9.3.bb

(limited to 'packages')

diff --git a/packages/qpegps/files/qpegps.desktop b/packages/qpegps/files/qpegps.desktop
index 16e222b00b..de5a93ccea 100644
--- a/packages/qpegps/files/qpegps.desktop
+++ b/packages/qpegps/files/qpegps.desktop
@@ -1,7 +1,6 @@
 [Desktop Entry]
 Comment=Moving Map
 Exec=qpegps
-Icon=qpegps/qpegps.png
+Icon=qpegps
 Type=Application
 Name=qpeGPS
-
diff --git a/packages/qpegps/qpegps.inc b/packages/qpegps/qpegps.inc
index 2e10bf40a6..b763be896d 100644
--- a/packages/qpegps/qpegps.inc
+++ b/packages/qpegps/qpegps.inc
@@ -4,7 +4,8 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 HOMEPAGE = "http://qpegps.sourceforge.net/"
 
-RRECOMMENDS = "gpsd"
+DEPENDS = "gpsd"
+RDEPENDS = "gpsd"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/qpegps/qpegps_${PV}_src.zip \
            file://qpegps.desktop \
@@ -16,18 +17,19 @@ inherit palmtop
 QMAKE_PROFILES = "qpegps.pro"
 EXTRA_QMAKEVARS_POST = "LIBS=-lqpe LIBS+=-lgps"
 OE_QMAKE_CFLAGS += " -DQWS "
+OE_QMAKE_LIBS_QT = ${QT_LIBRARY}
 
 do_install() {
         install -d ${D}${palmtopdir}/bin \
         	   ${D}${palmtopdir}/apps/Applications \
-        	   ${D}${palmtopdir}/pics/qpegps \
+        	   ${D}${palmtopdir}/pics \
         	   ${D}${palmtopdir}/help/html/qpegps_icons \
         	   ${D}${palmtopdir}/qpegps/maps \
         	   ${D}${palmtopdir}/qpegps/icons \
         	   ${D}${palmtopdir}/qpegps/tracks
         install -m 0755 qpegps ${D}${palmtopdir}/bin/
         install -m 0644 ${WORKDIR}/qpegps.desktop ${D}${palmtopdir}/apps/Applications/
-        install -m 0644 ${WORKDIR}/qpegps.png ${D}${palmtopdir}/pics/qpegps/
+        install -m 0644 ${WORKDIR}/qpegps.png ${D}${palmtopdir}/pics/
         install -m 0644 doc/qpegps.html ${D}${palmtopdir}/help/html/
         install -m 0644 doc/qpegps_icons/*.png ${D}${palmtopdir}/help/html/qpegps_icons/
         install -m 0644 icons/*.xpm ${D}${palmtopdir}/qpegps/icons/
diff --git a/packages/qpegps/qpegps_0.9.3.1.bb b/packages/qpegps/qpegps_0.9.3.1.bb
new file mode 100644
index 0000000000..e43e6a353f
--- /dev/null
+++ b/packages/qpegps/qpegps_0.9.3.1.bb
@@ -0,0 +1,6 @@
+require qpegps.inc
+
+do_configure_prepend() {
+         mv ${S}/Place.cpp ${S}/place.cpp
+         mv ${S}/Place.h ${S}/place.h
+}
diff --git a/packages/qpegps/qpegps_0.9.3.bb b/packages/qpegps/qpegps_0.9.3.bb
deleted file mode 100644
index 4cdb945321..0000000000
--- a/packages/qpegps/qpegps_0.9.3.bb
+++ /dev/null
@@ -1 +0,0 @@
-require qpegps.inc
-- 
cgit v1.2.3


From 7377bcfa7701f0d9b88d5d312b40d356b0f0e018 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 3 Jan 2008 15:23:12 +0000
Subject: base and sanity bbclasses + qemu: move gcc3 availability checking
 into base.bbclass (from Poky)

---
 packages/qemu/qemu-gcc3-check.inc | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

(limited to 'packages')

diff --git a/packages/qemu/qemu-gcc3-check.inc b/packages/qemu/qemu-gcc3-check.inc
index 658e72ffc3..81c3555b48 100644
--- a/packages/qemu/qemu-gcc3-check.inc
+++ b/packages/qemu/qemu-gcc3-check.inc
@@ -4,19 +4,8 @@ python __anonymous() {
     path = data.getVar('PATH', d, 1)
     oldOeConf = data.getVar('EXTRA_OECONF', d, 1)
     if not oldOeConf: oldOeConf = ""
-    if len(which(path, 'gcc-3.4.4')) != 0:
-        data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.4.4", d)
-    elif len(which(path, 'gcc-3.4')) != 0:
-        data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.4", d)
-    elif len(which(path, 'gcc34')) != 0:
-        data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc34", d)
-    elif len(which(path, 'gcc33')) != 0:
-        data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc33", d)
-    elif len(which(path, 'gcc-3.3')) != 0:
-        data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.3", d)
-    elif len(which(path, 'gcc-3.3.6')) != 0:
-        data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.3.6", d)
-    elif len(which(path, 'gcc-3.4.6')) != 0:
-        data.setVar('EXTRA_OECONF', oldOeConf + " --cc=gcc-3.4.6", d)
+    gcc3 = check_gcc3(d)
+    if gcc3:
+	data.setVar('EXTRA_OECONF', oldOeConf + " --cc=" + gcc3, d)
 }
 
-- 
cgit v1.2.3


From bc7aa85e1bf3db6ac7e31fe15fe27ec05526205a Mon Sep 17 00:00:00 2001
From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Thu, 3 Jan 2008 15:30:46 +0000
Subject: add qpegps_svn, close #oebug 2194

---
 packages/qpegps/qpegps_svn.bb | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 packages/qpegps/qpegps_svn.bb

(limited to 'packages')

diff --git a/packages/qpegps/qpegps_svn.bb b/packages/qpegps/qpegps_svn.bb
new file mode 100644
index 0000000000..16233d935c
--- /dev/null
+++ b/packages/qpegps/qpegps_svn.bb
@@ -0,0 +1,15 @@
+require qpegps.inc
+
+PV = "0.0+svn${SRCDATE}"
+PR = "r0"
+
+SRC_URI = "svn://qpegps.svn.sourceforge.net/svnroot/;module=qpegps/trunk/qpegps;proto=https \
+           file://qpegps.desktop \
+           file://qpegps.png "
+
+S = "${WORKDIR}/qpegps/trunk/qpegps"
+
+do_configure_prepend() {
+         mv ${S}/Place.cpp ${S}/place.cpp
+         mv ${S}/Place.h ${S}/place.h
+}
-- 
cgit v1.2.3


From cd06d19972831142dfcdbaf12cb47594a6f682ea Mon Sep 17 00:00:00 2001
From: Matthias Hentges <oe@hentges.net>
Date: Thu, 3 Jan 2008 21:15:00 +0000
Subject: openmoko-gps: Update to latest version and add new icon. mtN:
 ----------------------------------------------------------------------

---
 packages/openmoko-apps/files/openmoko-gps.desktop  |  2 +-
 packages/openmoko-apps/openmoko-gps_0.0.1+svnr4.bb | 32 --------------------
 packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb | 34 ++++++++++++++++++++++
 3 files changed, 35 insertions(+), 33 deletions(-)
 delete mode 100644 packages/openmoko-apps/openmoko-gps_0.0.1+svnr4.bb
 create mode 100644 packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb

(limited to 'packages')

diff --git a/packages/openmoko-apps/files/openmoko-gps.desktop b/packages/openmoko-apps/files/openmoko-gps.desktop
index ed3ec23933..a496745da4 100644
--- a/packages/openmoko-apps/files/openmoko-gps.desktop
+++ b/packages/openmoko-apps/files/openmoko-gps.desktop
@@ -3,7 +3,7 @@ Encoding=UTF-8
 Name=GPS
 Comment=Display GPS coordinates
 Exec=gps_reader.py
-Icon=openmoko-terminal
+Icon=openmoko-gps
 Terminal=false
 Type=Application
 Categories=GTK;Application;Utilities;
diff --git a/packages/openmoko-apps/openmoko-gps_0.0.1+svnr4.bb b/packages/openmoko-apps/openmoko-gps_0.0.1+svnr4.bb
deleted file mode 100644
index a0a0a50942..0000000000
--- a/packages/openmoko-apps/openmoko-gps_0.0.1+svnr4.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2008
-# License: MIT (see http://www.opensource.org/licenses/mit-license.php 
-#               for a copy of the license)
-#
-# Filename: openmoko-gps_svn.bb
-# Date: 20080101 (YMD)
-
-DESCRIPTION = "A tiny GPS output parser for the OpenMoko platform."
-HOMEPAGE = "http://forge.bearstech.com/trac/wiki/OpenMokoGPS"
-SECTION = "base"
-LICENSE = "GPL"
-
-RDEPENDS = "python-pygtk"
-
-PR = "r0" 
-
-######################################################################################
-
-SRC_URI = "svn://forge.bearstech.com/bearforge/openmoko;module=gps;rev=4 \
-	   file://openmoko-gps.desktop"
-
-S = "${WORKDIR}/gps"
-
-do_install() {
-	install -d ${D}/usr/bin
-	install -d ${D}/usr/share/applications/
-	
-	install -m 0755 ${S}/gps_reader.py ${D}/usr/bin
-	install -m 0644 ${WORKDIR}/openmoko-gps.desktop ${D}/usr/share/applications/
-}
diff --git a/packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb b/packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb
new file mode 100644
index 0000000000..1d00b6a78d
--- /dev/null
+++ b/packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb
@@ -0,0 +1,34 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel@hentges.net> (c) 2008
+# License: MIT (see http://www.opensource.org/licenses/mit-license.php 
+#               for a copy of the license)
+#
+# Filename: openmoko-gps_svn.bb
+# Date: 20080101 (YMD)
+
+DESCRIPTION = "A tiny GPS output parser for the OpenMoko platform."
+HOMEPAGE = "http://forge.bearstech.com/trac/wiki/OpenMokoGPS"
+SECTION = "base"
+LICENSE = "GPL"
+
+RDEPENDS = "python-pygtk"
+
+PR = "r0" 
+
+######################################################################################
+
+SRC_URI = "svn://forge.bearstech.com/bearforge/openmoko;module=gps;rev=6 \
+	   file://openmoko-gps.desktop"
+
+S = "${WORKDIR}/gps"
+
+do_install() {
+	install -d ${D}/usr/bin
+	install -d ${D}/usr/share/applications/
+	install -d ${D}/usr/share/pixmaps/
+	
+	install -m 0755 ${S}/gps_reader.py ${D}/usr/bin
+	install -m 0644 ${WORKDIR}/openmoko-gps.desktop ${D}/usr/share/applications/
+	install -m 0644 ${S}/icon.png ${D}/usr/share/pixmaps/openmoko-gps.png
+}
-- 
cgit v1.2.3


From 51e42c17e8a759a080b6767c8a137875cec2b8ac Mon Sep 17 00:00:00 2001
From: Leon Woestenberg <leon.woestenberg@gmail.com>
Date: Thu, 3 Jan 2008 21:21:26 +0000
Subject: util-linux-ng: Install binaries into same locations as util-linux
 does.

---
 packages/util-linux-ng/util-linux-ng.inc | 51 +++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 20 deletions(-)

(limited to 'packages')

diff --git a/packages/util-linux-ng/util-linux-ng.inc b/packages/util-linux-ng/util-linux-ng.inc
index 987b85dc29..c01458d626 100644
--- a/packages/util-linux-ng/util-linux-ng.inc
+++ b/packages/util-linux-ng/util-linux-ng.inc
@@ -6,8 +6,9 @@ DEPENDS = "zlib ncurses e2fsprogs-libs"
 inherit autotools
 
 # I'm finishing this recipe during the 2.13.1 candidate release cycle
-# @todo Remove $RC later. See if patches are needed. File locations.
+# @todo Remove $RC later. See if patches are needed. Move files from /usr/*.
 # --  Leon 'likewise' Woestenberg
+
 RC="-rc2"
 DEFAULT_PREFERENCE = "-1"
 
@@ -36,7 +37,9 @@ FILES_util-linux-readprofile = "/usr/sbin/readprofile"
 RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile "
 RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup"
 
-EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown"
+EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown \
+--enable-kill --enable-last --enable-mesg --enable-raw --enable-login-utils \
+--enable-arch --enable-init"
 
 S = "${WORKDIR}/util-linux-ng-${PV}${RC}"
 
@@ -81,30 +84,38 @@ do_install () {
 	oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= \
 		'OPT=${CFLAGS}' 'CC=${CC}' 'LD=${LD}' \
 		'LDFLAGS=${LDFLAGS}' 'DESTDIR=${D}' install
-        return 0
-	test -f ${D}${base_sbindir}/pivot_root && \
-	mv ${D}${base_sbindir}/pivot_root ${D}${base_sbindir}/pivot_root.${PN}
-	mv ${D}${base_bindir}/dmesg ${D}${base_bindir}/dmesg.${PN}
-	mv ${D}${base_bindir}/kill ${D}${base_bindir}/kill.${PN}
-	mv ${D}${base_bindir}/more ${D}${base_bindir}/more.${PN}
-	mv ${D}${base_sbindir}/hwclock ${D}${base_sbindir}/hwclock.${PN}
-	mv ${D}${base_sbindir}/mkswap ${D}${base_sbindir}/mkswap.${PN}
-	mv ${D}${base_sbindir}/shutdown ${D}${base_sbindir}/shutdown.${PN}
-	mv ${D}${base_sbindir}/sln ${D}${base_sbindir}/sln.${PN}
-	mv ${D}${base_sbindir}/mkfs.minix ${D}${base_sbindir}/mkfs.minix.${PN}
-	mv ${D}${base_sbindir}/fsck.minix ${D}${base_sbindir}/fsck.minix.${PN}
+	mkdir ${D}${base_bindir}
+	mkdir ${D}${base_sbindir}
+	test -f ${D}${sbindir}/pivot_root && \
+	mv ${D}${sbindir}/pivot_root ${D}${base_sbindir}/pivot_root.${PN}
+	mv ${D}${bindir}/dmesg ${D}${base_bindir}/dmesg.${PN}
+	mv ${D}${bindir}/kill ${D}${base_bindir}/kill.${PN}
+	mv ${D}${bindir}/more ${D}${base_bindir}/more.${PN}
+	mv ${D}${sbindir}/hwclock ${D}${base_sbindir}/hwclock.${PN}
+	mv ${D}${sbindir}/mkswap ${D}${base_sbindir}/mkswap.${PN}
+	mv ${D}${sbindir}/shutdown ${D}${base_sbindir}/shutdown.${PN}
+#	mv ${D}${sbindir}/sln ${D}${base_sbindir}/sln.${PN}
+	mv ${D}${sbindir}/mkfs.minix ${D}${base_sbindir}/mkfs.minix.${PN}
+	mv ${D}${sbindir}/fsck.minix ${D}${base_sbindir}/fsck.minix.${PN}
 	mv ${D}${bindir}/hexdump ${D}${bindir}/hexdump.${PN}
 	mv ${D}${bindir}/last ${D}${bindir}/last.${PN}
 	mv ${D}${bindir}/logger ${D}${bindir}/logger.${PN}
 	mv ${D}${bindir}/mesg ${D}${bindir}/mesg.${PN}
 	mv ${D}${bindir}/renice ${D}${bindir}/renice.${PN}
 	mv ${D}${bindir}/wall ${D}${bindir}/wall.${PN}
+        return 0
+
+	mv ${D}${sbindir}/losetup ${D}${base_sbindir}/losetup.${PN}
+	mv ${D}${sbindir}/swapon ${D}${base_sbindir}/swapon.${PN}
+	mv ${D}${bindir}/umount ${D}${base_bindir}/umount.${PN}
+	mv ${D}${bindir}/mount ${D}${base_bindir}/mount.${PN}
+	mv ${D}${sbindir}/fdisk ${D}${base_sbindir}/fdisk.${PN}
+
+	mv ${D}${bindir}/agetty ${D}${base_sbindir}/ 
+	mv ${D}${bindir}/blockdev ${D}${base_sbindir}/
+	mv ${D}${bindir}/cfdisk ${D}${base_sbindir}/
+	mv ${D}${bindir}/ctrlaltdel ${D}${base_sbindir}/
 
-	mv ${D}${base_sbindir}/losetup ${D}${base_sbindir}/losetup.${PN}
-	mv ${D}${base_sbindir}/swapon ${D}${base_sbindir}/swapon.${PN}
-	mv ${D}${base_bindir}/umount ${D}${base_bindir}/umount.${PN}
-	mv ${D}${base_bindir}/mount ${D}${base_bindir}/mount.${PN}
-	mv ${D}${base_sbindir}/fdisk ${D}${base_sbindir}/fdisk.${PN}
 	install -d ${D}${sysconfdir}/default/
 	echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall
 
@@ -132,7 +143,7 @@ pkg_postinst_${PN} () {
 	update-alternatives --install ${bindir}/renice renice renice.${PN} 100
 	update-alternatives --install ${bindir}/wall wall wall.${PN} 100
 	
-	# There seems to be problem, atleast on nslu2, with these, untill they are
+	# There seems to be problem, atleast on nslu2, with these, until they are
 	# fixed the busybox ones have higher priority
 	update-alternatives --install ${base_sbindir}/hwclock hwclock hwclock.${PN} 10
 	update-alternatives --install ${base_sbindir}/shutdown shutdown shutdown.${PN} 10
-- 
cgit v1.2.3


From c5c78c3746fa20932160ff585b3e4c53f4e6c69d Mon Sep 17 00:00:00 2001
From: Matthias Hentges <oe@hentges.net>
Date: Thu, 3 Jan 2008 23:28:27 +0000
Subject: openmoko-apps: openmoko-gps: Fix icon name

---
 packages/openmoko-apps/files/openmoko-gps.desktop  | 2 +-
 packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'packages')

diff --git a/packages/openmoko-apps/files/openmoko-gps.desktop b/packages/openmoko-apps/files/openmoko-gps.desktop
index a496745da4..8273b8183d 100644
--- a/packages/openmoko-apps/files/openmoko-gps.desktop
+++ b/packages/openmoko-apps/files/openmoko-gps.desktop
@@ -3,7 +3,7 @@ Encoding=UTF-8
 Name=GPS
 Comment=Display GPS coordinates
 Exec=gps_reader.py
-Icon=openmoko-gps
+Icon=openmoko-gps2
 Terminal=false
 Type=Application
 Categories=GTK;Application;Utilities;
diff --git a/packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb b/packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb
index 1d00b6a78d..9028393b4e 100644
--- a/packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb
+++ b/packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb
@@ -14,7 +14,7 @@ LICENSE = "GPL"
 
 RDEPENDS = "python-pygtk"
 
-PR = "r0" 
+PR = "r1" 
 
 ######################################################################################
 
@@ -30,5 +30,5 @@ do_install() {
 	
 	install -m 0755 ${S}/gps_reader.py ${D}/usr/bin
 	install -m 0644 ${WORKDIR}/openmoko-gps.desktop ${D}/usr/share/applications/
-	install -m 0644 ${S}/icon.png ${D}/usr/share/pixmaps/openmoko-gps.png
+	install -m 0644 ${S}/icon.png ${D}/usr/share/pixmaps/openmoko-gps2.png
 }
-- 
cgit v1.2.3


From 6118eb7dd8e9c90e153687eb2c9db8072c79693e Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Fri, 4 Jan 2008 00:07:39 +0000
Subject: initramfs-minimal-image: Revamp dependencies.

---
 packages/images/initramfs-minimal-image.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'packages')

diff --git a/packages/images/initramfs-minimal-image.bb b/packages/images/initramfs-minimal-image.bb
index 1aa928b2a9..d696468913 100644
--- a/packages/images/initramfs-minimal-image.bb
+++ b/packages/images/initramfs-minimal-image.bb
@@ -1,7 +1,6 @@
 # Sample initramfs image
 
-#IMAGE_INSTALL = "initramfs-boot busybox kernel-module-uinput uclibc libgcc1"
-IMAGE_INSTALL = "initramfs-nfsboot busybox-static kernel-module-uinput"
+IMAGE_INSTALL = "initramfs-module-nfs busybox-static"
 
 export IMAGE_BASENAME = "initramfs-image"
 IMAGE_LINGUAS = ""
-- 
cgit v1.2.3


From 31634521405243e9933606d4654b3cac8c672fba Mon Sep 17 00:00:00 2001
From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Fri, 4 Jan 2008 04:40:14 +0000
Subject: dotconf: rename to libdotonf, fix packaging * follow debian naming
 and packaging * change dependency in speech-dispatcher

---
 packages/dotconf/.mtn2git_empty                    |  0
 packages/dotconf/dotconf_1.0.13.bb                 | 15 -------------
 packages/dotconf/files/.mtn2git_empty              |  0
 packages/dotconf/files/srcMakefile.am_00.patch     |  9 --------
 packages/libdotconf/.mtn2git_empty                 |  0
 packages/libdotconf/files/.mtn2git_empty           |  0
 packages/libdotconf/files/srcMakefile.am_00.patch  |  9 ++++++++
 packages/libdotconf/libdotconf_1.0.13.bb           | 25 ++++++++++++++++++++++
 .../speech-dispatcher/speech-dispatcher_0.6.5.bb   |  2 +-
 9 files changed, 35 insertions(+), 25 deletions(-)
 delete mode 100644 packages/dotconf/.mtn2git_empty
 delete mode 100644 packages/dotconf/dotconf_1.0.13.bb
 delete mode 100644 packages/dotconf/files/.mtn2git_empty
 delete mode 100644 packages/dotconf/files/srcMakefile.am_00.patch
 create mode 100644 packages/libdotconf/.mtn2git_empty
 create mode 100644 packages/libdotconf/files/.mtn2git_empty
 create mode 100644 packages/libdotconf/files/srcMakefile.am_00.patch
 create mode 100644 packages/libdotconf/libdotconf_1.0.13.bb

(limited to 'packages')

diff --git a/packages/dotconf/.mtn2git_empty b/packages/dotconf/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/dotconf/dotconf_1.0.13.bb b/packages/dotconf/dotconf_1.0.13.bb
deleted file mode 100644
index 332cba9bfa..0000000000
--- a/packages/dotconf/dotconf_1.0.13.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = " dot.conf is an easy to use and powerful configuration file parser library"
-HOMEPAGE = "http://www.azzit.de/dotconf/"
-LICENSE = "LGPLv2"
-
-PR = "r0"
-
-inherit autotools
-
-SRC_URI = "http://www.azzit.de/dotconf/download/v1.0/${PN}-${PV}.tar.gz \
-	  file://srcMakefile.am_00.patch;patch=1"
-
-do_stage () {
-        install -m 0644 ${S}/src/*.h ${STAGING_INCDIR}/
-        oe_libinstall -C src -a -so libdotconf ${STAGING_LIBDIR}/
-}
diff --git a/packages/dotconf/files/.mtn2git_empty b/packages/dotconf/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/dotconf/files/srcMakefile.am_00.patch b/packages/dotconf/files/srcMakefile.am_00.patch
deleted file mode 100644
index 500f1fd2d7..0000000000
--- a/packages/dotconf/files/srcMakefile.am_00.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- dotconf-1.0.13/src/Makefile.am.orig	2008-01-02 11:48:16.000000000 +0000
-+++ dotconf-1.0.13/src/Makefile.am	2008-01-02 11:48:22.000000000 +0000
-@@ -1,5 +1,5 @@
- 
--INCLUDES = -I. -I$(includedir)
-+INCLUDES = -I.
- 
- include_HEADERS = dotconf.h
- noinst_HEADERS = readdir.h
diff --git a/packages/libdotconf/.mtn2git_empty b/packages/libdotconf/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/libdotconf/files/.mtn2git_empty b/packages/libdotconf/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/libdotconf/files/srcMakefile.am_00.patch b/packages/libdotconf/files/srcMakefile.am_00.patch
new file mode 100644
index 0000000000..500f1fd2d7
--- /dev/null
+++ b/packages/libdotconf/files/srcMakefile.am_00.patch
@@ -0,0 +1,9 @@
+--- dotconf-1.0.13/src/Makefile.am.orig	2008-01-02 11:48:16.000000000 +0000
++++ dotconf-1.0.13/src/Makefile.am	2008-01-02 11:48:22.000000000 +0000
+@@ -1,5 +1,5 @@
+ 
+-INCLUDES = -I. -I$(includedir)
++INCLUDES = -I.
+ 
+ include_HEADERS = dotconf.h
+ noinst_HEADERS = readdir.h
diff --git a/packages/libdotconf/libdotconf_1.0.13.bb b/packages/libdotconf/libdotconf_1.0.13.bb
new file mode 100644
index 0000000000..05520519b6
--- /dev/null
+++ b/packages/libdotconf/libdotconf_1.0.13.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = " dot.conf is an easy to use and powerful configuration file parser library"
+HOMEPAGE = "http://www.azzit.de/dotconf/"
+LICENSE = "LGPLv2"
+
+PR = "r0"
+
+inherit autotools
+
+SRC_URI = "http://www.azzit.de/dotconf/download/v1.0/dotconf-${PV}.tar.gz \
+	  file://srcMakefile.am_00.patch;patch=1"
+
+S = "${WORKDIR}/dotconf-${PV}"
+
+do_install() {
+        install -d ${D}${libdir}
+        install -d ${D}${includedir}
+
+        install -m 0644 ${S}/src/dotconf.h  ${D}${includedir}
+        oe_libinstall -C src -so libdotconf ${D}${libdir}
+}
+
+do_stage() {
+        install -m 0644 ${S}/src/dotconf.h ${STAGING_INCDIR}/
+        oe_libinstall -C src -so libdotconf ${STAGING_LIBDIR}/
+}
diff --git a/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb b/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
index 4f70def359..ac001bf1b7 100644
--- a/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
+++ b/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
@@ -2,7 +2,7 @@ DESCRIPTION = " Speech Dispatcher is a high-level device independent layer \
 for speech synthesis through a simple, stable and well documented interface."
 HOMEPAGE = "http://www.freebsoft.org/speechd/"
 LICENSE = "GPLv2"
-DEPENDS = "flite dotconf glib-2.0"
+DEPENDS = "flite libdotconf glib-2.0"
 RPROVIDES += "speechd"
 
 PR = "r0"
-- 
cgit v1.2.3


From 5ef71fe525b1dfe5b307a62dd5fef10a16c854c7 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Fri, 4 Jan 2008 11:40:02 +0000
Subject: e2fsprogs: e2fsprogs wants (virtual/)libiconv for i18n, but let's
 disable i18n to have a nice & small e2fsprogs for rescue filesystems, fixes
 #3604

---
 packages/e2fsprogs/e2fsprogs_1.38.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'packages')

diff --git a/packages/e2fsprogs/e2fsprogs_1.38.bb b/packages/e2fsprogs/e2fsprogs_1.38.bb
index 4f6f62bb12..91a391975f 100644
--- a/packages/e2fsprogs/e2fsprogs_1.38.bb
+++ b/packages/e2fsprogs/e2fsprogs_1.38.bb
@@ -1,10 +1,12 @@
 require e2fsprogs.inc
 
-PR = "r10"
+PR = "r11"
 
 SRC_URI += "file://no-hardlinks.patch;patch=1"
 
-EXTRA_OECONF += " --sbindir=${base_sbindir}"
+EXTRA_OECONF += " --sbindir=${base_sbindir} \
+                  --disable-nls \
+                "
 
 do_compile_prepend () {
 	find ./ -print|xargs chmod u=rwX
-- 
cgit v1.2.3


From 52d4e783c890b4fd3cadd95808ed9aa1197eb252 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Fri, 4 Jan 2008 12:47:58 +0000
Subject: avahi.inc: depend on virtual/libintl and disable nls

---
 packages/avahi/avahi.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages')

diff --git a/packages/avahi/avahi.inc b/packages/avahi/avahi.inc
index e8e9e7c4a8..c357e2d9f9 100644
--- a/packages/avahi/avahi.inc
+++ b/packages/avahi/avahi.inc
@@ -6,7 +6,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 PR = "r5"
 
-DEPENDS = "expat libdaemon dbus glib-2.0"
+DEPENDS = "expat virtual/libintl libdaemon dbus glib-2.0"
 
 # uclibc has no nss
 RRECOMMENDS_avahi-daemon_append_linux = "libnss-mdns"
@@ -22,7 +22,7 @@ inherit autotools pkgconfig update-rc.d
 RDEPENDS_append = ""
 
 # TODO: build and enable all the extra stuff avahi offers
-EXTRA_OECONF = "--with-distro=debian --disable-gdbm ${AVAHI_GTK} --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 ${AVAHI_PYTHON}"
+EXTRA_OECONF = "--with-distro=debian  --disable-nls --disable-gdbm ${AVAHI_GTK} --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 ${AVAHI_PYTHON}"
 AVAHI_PYTHON = "--disable-python"
 AVAHI_GTK = "--disable-gtk"
 
-- 
cgit v1.2.3


From aa96561f14f0193cce46eb5691880fb2905f6593 Mon Sep 17 00:00:00 2001
From: Matthias Hentges <oe@hentges.net>
Date: Fri, 4 Jan 2008 12:56:35 +0000
Subject: gpsd: As discssed on the ML: 	- Add a gpsd-conf package 	-
 gpe-conf installs /etc/defaults/gpsd and /etc/init.d/gps-hardware          
 via update-alternatives 	- A sample machine-specific -conf package for
 fix-gta01 is provided. 	- Constructive comments welcome

---
 packages/gpsd/files/fic-gta01/gps-hardware |  41 +++++++++++
 packages/gpsd/files/fic-gta01/gpsd         | 105 -----------------------------
 packages/gpsd/files/gps-hardware           |   2 +
 packages/gpsd/files/gpsd                   |  11 ++-
 packages/gpsd/gpsd.inc                     |  24 +++++--
 packages/gpsd/gpsd_2.28.bb                 |   2 +-
 packages/gpsd/gpsd_2.34.bb                 |   2 +-
 packages/gpsd/gpsd_2.36.bb                 |   2 +-
 8 files changed, 76 insertions(+), 113 deletions(-)
 create mode 100644 packages/gpsd/files/fic-gta01/gps-hardware
 delete mode 100755 packages/gpsd/files/fic-gta01/gpsd
 create mode 100644 packages/gpsd/files/gps-hardware

(limited to 'packages')

diff --git a/packages/gpsd/files/fic-gta01/gps-hardware b/packages/gpsd/files/fic-gta01/gps-hardware
new file mode 100644
index 0000000000..6490f52c27
--- /dev/null
+++ b/packages/gpsd/files/fic-gta01/gps-hardware
@@ -0,0 +1,41 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel@hentges.net> (c) 2008
+# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
+#
+# Filename: gps-hardware
+# Date: 20080103 (YMD)
+#
+#################################################################################
+#
+# 20080103 - v0.0.1	- Initial release
+
+if ! test -e /home/root/gllin/gllin
+then
+	echo -e "\n\ngllin GPS driver for Neo1973 not found,"
+	echo "please install the gllin package from"
+	echo "http://3rdparty.downloads.openmoko.org/gllin/"
+	echo ""
+	exit 1
+fi
+
+
+do_start() {
+	/home/root/gllin/gllin >/var/log/gllin.log 2>&1 &
+	sleep 1
+}
+
+do_stop() {
+	gllin_PIDs="`ps ax | grep "/home/root/gllin" | grep -v grep | awk '{print $1}'`"	
+	test -n "$gllin_PIDs" && kill $gllin_PIDs
+}
+
+do_status() {
+	ps ax | grep -v grep | grep -q gllin && echo "ready" || echo "unknown"
+}
+
+case "$1" in
+	start)		do_start ;;
+	stop)		do_stop ;;
+	status)		do_status ;;
+esac
diff --git a/packages/gpsd/files/fic-gta01/gpsd b/packages/gpsd/files/fic-gta01/gpsd
deleted file mode 100755
index 113f43dd20..0000000000
--- a/packages/gpsd/files/fic-gta01/gpsd
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/bin/sh
-#
-# gpsd	This shell script starts and stops gpsd.
-#
-# chkconfig: 345 90 40
-# description: Gpsd manages access to a serial- or USB-connected GPS
-# processname: gpsd
-
-# Source function library.
-#. /etc/rc.d/init.d/functions
-
-RETVAL=0
-prog="gpsd"
-
-test -f /etc/default/$prog && . /etc/default/$prog
-
-start() {
-	# Start daemons.
-	echo -n "Starting $prog: "
-	# We don't use the daemon function here because of a known bug
-	# in initlog -- it spuriously returns a nonzero status when 
-	# starting daemons that fork themselves.  See
-	# http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=130629
-	# for discussion.  Fortunately:
-	#
-	# 1. gpsd startup can't fail, or at least not in the absence of
-	# much larger resource-exhaustion problems that would be very obvious.
-	#
-	# 2. We don't need all the logging crud that daemon/initlog sets
-	# up -- gpsd does its own syslog calls.
-	#
-	
-	if test -e /home/root/gllin/gllin
-	then
-		/home/root/gllin/gllin >/var/log/gllin.log 2>&1 &
-	else
-		echo -e "\n\ngllin GPS driver for Neo1973 not found,"
-		echo "please install the gllin package from"
-		echo "http://3rdparty.downloads.openmoko.org/gllin/"
-		echo ""
-		exit 1
-	fi
-	
-	if [ -e "${GPS_DEV}" ]
-	then
-	    gpsd ${GPSD_OPTS} -p ${GPS_DEV}
-	     echo "success"
-	else
-	    # User needs to symlink ${GPS_DEV} to the right thing
-	    echo "No ${GPS_DEV} GPS device, aborting gpsd startup. Check /etc/default/$prog"
-	fi
-	RETVAL=$?
-	echo
-	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/gpsd
-	return $RETVAL
-}
-
-stop() {
-	# Stop daemons.
-	echo -n "Shutting down $prog: "
-
-	gllin_PIDs="`ps ax | grep "/home/root/gllin" | grep -v grep | awk '{print $1}'`"	
-	test -n "$gllin_PIDs" && kill $gllin_PIDs
-
-        killall gpsd
-        killproc gpsd
-	RETVAL=$?
-	echo
-	if [ $RETVAL -eq 0 ]
-	then
-	    rm -f /var/lock/subsys/gpsd;
-	fi
-	return $RETVAL
-}
-
-# See how we were called.
-case "$1" in
-  start)
-	start
-	;;
-  stop)
-	stop
-	;;
-  restart|reload)
-	stop
-	start
-	RETVAL=$?
-	;;
-  condrestart)
-	if [ -f /var/lock/subsys/gpsd ]; then
-	    stop
-	    start
-	    RETVAL=$?
-	fi
-	;;
-  status)
-#	status gpsd
-#	RETVAL=$?
-	;;
-  *)
-	echo "Usage: $0 {start|stop|restart|condrestart|status}"
-	exit 1
-esac
-
-exit $RETVAL
diff --git a/packages/gpsd/files/gps-hardware b/packages/gpsd/files/gps-hardware
new file mode 100644
index 0000000000..ff2ddb3650
--- /dev/null
+++ b/packages/gpsd/files/gps-hardware
@@ -0,0 +1,2 @@
+# This is a dummy file. Some machines use it to bring up integrated GPS
+# devices on demand.
diff --git a/packages/gpsd/files/gpsd b/packages/gpsd/files/gpsd
index 3a14867f8a..e536837e1c 100755
--- a/packages/gpsd/files/gpsd
+++ b/packages/gpsd/files/gpsd
@@ -29,9 +29,18 @@ start() {
 	# 2. We don't need all the logging crud that daemon/initlog sets
 	# up -- gpsd does its own syslog calls.
 	#
+	
+	if test -x /etc/init.d/gps-hardware
+	then
+		if ! ( /etc/init.d/gps-hardware status | grep -q "ready" )
+		then
+			/etc/init.d/gps-hardware start
+		fi
+	fi
+	
 	if [ -e "${GPS_DEV}" ]
 	then
-	    gpsd ${GPSD_OPTS} -p ${GPS_DEV}
+	    gpsd ${GPSD_OPTS} ${GPS_DEV}
 	     echo "success"
 	else
 	    # User needs to symlink ${GPS_DEV} to the right thing
diff --git a/packages/gpsd/gpsd.inc b/packages/gpsd/gpsd.inc
index be593e0744..dac62ec76c 100644
--- a/packages/gpsd/gpsd.inc
+++ b/packages/gpsd/gpsd.inc
@@ -3,6 +3,7 @@ SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "dbus-glib ncurses python"
+RDEPENDS = "gpsd-conf"
 
 EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
                 --x-libraries=${STAGING_LIBDIR} \
@@ -11,6 +12,7 @@ EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
 
 SRC_URI = "http://download.berlios.de/gpsd/gpsd-${PV}.tar.gz \
            file://gpsd-default \
+	   file://gps-hardware \
            file://gpsd"
 
 inherit autotools update-rc.d
@@ -41,15 +43,29 @@ do_install_append() {
         install -d ${D}/${sysconfdir}/init.d
         install -d ${D}/dev
         install -m 0755 ${WORKDIR}/gpsd ${D}/${sysconfdir}/init.d/
+	install -m 0755 ${WORKDIR}/gps-hardware ${D}/${sysconfdir}/init.d/gps-hardware.default
         install -d ${D}/${sysconfdir}/default
-        install -m 0644 ${WORKDIR}/gpsd-default ${D}/${sysconfdir}/default/gpsd
+        install -m 0644 ${WORKDIR}/gpsd-default ${D}/${sysconfdir}/default/gpsd.default
 }
 
-PACKAGES =+ "libgps python-pygps"
+pkg_postinst_${PN}-conf() {
+	update-alternatives --install ${sysconfdir}/default/gpsd gpsd-defaults ${sysconfdir}/default/gpsd.default 10
+	update-alternatives --install ${sysconfdir}/init.d/gps-hardware gps-hardware ${sysconfdir}/init.d/gps-hardware.default 10
+}
+
+pkg_postrm_${PN}-conf() {	
+	update-alternatives --remove gpsd-defaults ${sysconfdir}/default/gpsd.default
+	update-alternatives --remove gps-hardware ${sysconfdir}/init.d/gps-hardware.default		
+}
+
+SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
+
+PACKAGES =+ "libgps python-pygps gpsd-conf"
+
+PACKAGE_ARCH_gpsd-conf = "${MACHINE_ARCH}"
 
-FILES_${PN} += "${sysconfdir}"
 FILES_libgps = "${libdir}/*.so.*"
-CONFFILES_${PN} = "${sysconfdir}/default/gpsd"
+FILES_gpsd-conf = "${sysconfdir}"
 
 DESCRIPTION_python-pygps = "Python bindings to gpsd"
 FILES_python-pygps = "${libdir}/*/site-packages/*"
diff --git a/packages/gpsd/gpsd_2.28.bb b/packages/gpsd/gpsd_2.28.bb
index c16de2e951..ffd7322bf1 100644
--- a/packages/gpsd/gpsd_2.28.bb
+++ b/packages/gpsd/gpsd_2.28.bb
@@ -1,2 +1,2 @@
 require gpsd.inc
-PR = "r4"
+PR = "r5"
diff --git a/packages/gpsd/gpsd_2.34.bb b/packages/gpsd/gpsd_2.34.bb
index 8472eb1c15..969ef1b803 100644
--- a/packages/gpsd/gpsd_2.34.bb
+++ b/packages/gpsd/gpsd_2.34.bb
@@ -1,4 +1,4 @@
 require gpsd.inc
 
-PR = "r6"
+PR = "r7"
 
diff --git a/packages/gpsd/gpsd_2.36.bb b/packages/gpsd/gpsd_2.36.bb
index 58e9ebeee2..885a41dbda 100644
--- a/packages/gpsd/gpsd_2.36.bb
+++ b/packages/gpsd/gpsd_2.36.bb
@@ -1,3 +1,3 @@
 require gpsd.inc
 
-PR = "r0"
+PR = "r1"
-- 
cgit v1.2.3


From 0ba6ce99f696e7ce63801058b841234c3a40bbf4 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Fri, 4 Jan 2008 13:03:12 +0000
Subject: avahi: manually poke -lintl into LDFLAGS of uclibc builds (fixes
 #3603)

---
 packages/avahi/avahi.inc | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'packages')

diff --git a/packages/avahi/avahi.inc b/packages/avahi/avahi.inc
index c357e2d9f9..ae03d00e05 100644
--- a/packages/avahi/avahi.inc
+++ b/packages/avahi/avahi.inc
@@ -26,6 +26,10 @@ EXTRA_OECONF = "--with-distro=debian  --disable-nls --disable-gdbm ${AVAHI_GTK}
 AVAHI_PYTHON = "--disable-python"
 AVAHI_GTK = "--disable-gtk"
 
+LDFLAGS_append_linux-uclibc = " -lintl"
+LDFLAGS_append_linux-uclibcgnueabi = " -lintl "
+LDFLAGS_append_uclinux-uclibc = " -lintl"
+
 PACKAGES =+ "avahi-daemon avahi-discover libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-discover-standalone avahi-autoipd avahi-utils"
 
 FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
-- 
cgit v1.2.3


From f39e16f9378630281f5f6e7d17bddd8c7b82169b Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Fri, 4 Jan 2008 13:28:02 +0000
Subject: gettext: fix packaging

---
 packages/gettext/gettext_0.14.1.bb | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'packages')

diff --git a/packages/gettext/gettext_0.14.1.bb b/packages/gettext/gettext_0.14.1.bb
index 960db30b56..2184b8c863 100644
--- a/packages/gettext/gettext_0.14.1.bb
+++ b/packages/gettext/gettext_0.14.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The GNU internationalization library."
 HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
 SECTION = "libs"
 LICENSE = "GPL"
-PR = "r6"
+PR = "r7"
 PROVIDES = "virtual/libintl"
 
 SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
@@ -28,6 +28,20 @@ do_configure_prepend() {
 	install -m 0644 ${STAGING_DATADIR}/aclocal/libtool.m4 ${S}/config/m4/
 }
 
+# these lack the .x behind the .so, but shouldn't be in the -dev package
+# Otherwise you get the following results:
+# 7.4M    glibc/images/ep93xx/Angstrom-console-image-glibc-ipk-2008.1-test-20080104-ep93xx.rootfs.tar.gz
+# 25M     uclibc/images/ep93xx/Angstrom-console-image-uclibc-ipk-2008.1-test-20080104-ep93xx.rootfs.tar.gz
+# because gettext depends on gettext-dev, which pulls in more -dev packages:
+# 15228   KiB /ep93xx/libstdc++-dev_4.2.2-r2_ep93xx.ipk
+# 1300    KiB /ep93xx/uclibc-dev_0.9.29-r8_ep93xx.ipk
+# 140     KiB /armv4t/gettext-dev_0.14.1-r6_armv4t.ipk
+# 4       KiB /ep93xx/libgcc-s-dev_4.2.2-r2_ep93xx.ipk
+
+PACKAGES =+ "libgettextlib libgettextsrc"
+FILES_libgettextlib = "${libdir}/libgettextlib-*.so*"
+FILES_libgettextsrc = "${libdir}/libgettextsrc-*.so*"
+
 do_stage () {
 	autotools_stage_includes
 	oe_libinstall -so -C gettext-tools/lib libgettextlib ${STAGING_LIBDIR}/
-- 
cgit v1.2.3


From ac5cd102a7b7a2a37c2c228aeb8f43ebd7d617ac Mon Sep 17 00:00:00 2001
From: Matthias Hentges <oe@hentges.net>
Date: Fri, 4 Jan 2008 14:10:09 +0000
Subject: speech-dispatcher: Improve packaging

---
 packages/speech-dispatcher/speech-dispatcher_0.6.5.bb | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'packages')

diff --git a/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb b/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
index ac001bf1b7..68bfd8a347 100644
--- a/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
+++ b/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
@@ -5,12 +5,13 @@ LICENSE = "GPLv2"
 DEPENDS = "flite libdotconf glib-2.0"
 RPROVIDES += "speechd"
 
-PR = "r0"
+PR = "r1"
 
 inherit autotools
 
 SRC_URI = "http://www.freebsoft.org/pub/projects/speechd/${PN}-${PV}.tar.gz \
-           file://srcMakefile.am.patch;patch=1 "
+           file://srcMakefile.am.patch;patch=1 \
+	   file://confSpeechd.conf_00.patch;patch=1"
 
 LEAD_SONAME = "libspeechd.so"
 
@@ -18,15 +19,20 @@ do_install() {
         install -d ${D}${bindir}
         install -d ${D}${includedir}
         install -d ${D}${libdir}/${PN}-modules
+	install -d ${D}${sysconfdir}
+	install -d ${D}${sysconfdir}/modules
 
         oe_libinstall -so -C src/audio libsdaudio ${D}${libdir}
         oe_libinstall -so -C src/c/api libspeechd ${D}${libdir}
         
         install -m 0644 ${S}/src/c/api/libspeechd.h    ${D}${includedir}
-        install -m 0755 ${S}/src/c/clients/say/spd-say ${D}${bindir}
+        install -m 0755 ${S}/src/c/clients/say/.libs/spd-say ${D}${bindir}
         install -m 0755 ${S}/src/c/clients/spdsend/spdsend ${D}${bindir}
-        install -m 0755 ${S}/src/server/speech-dispatcher  ${D}${bindir}
-        install -m 0755 ${S}/src/modules/sd_*   ${D}${libdir}/${PN}-modules/
+        install -m 0755 ${S}/src/server/.libs/speech-dispatcher  ${D}${bindir}
+        install -m 0755 ${S}/src/modules/.libs/sd_*   ${D}${libdir}/${PN}-modules/
+	
+	install -m 0644 ${S}/config/speechd.conf ${D}${sysconfdir}
+	install -m 0644 ${S}/config/modules/*.conf ${D}${sysconfdir}/modules
 }
 
 do_stage() {
-- 
cgit v1.2.3


From c55bd008a7c396088a70227a85f8fe8395aa71b9 Mon Sep 17 00:00:00 2001
From: Matthias Hentges <oe@hentges.net>
Date: Fri, 4 Jan 2008 15:24:54 +0000
Subject: portaudio: Add a working .bb of the V19 API

---
 packages/portaudio/portaudio-v19_20071207.bb | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 packages/portaudio/portaudio-v19_20071207.bb

(limited to 'packages')

diff --git a/packages/portaudio/portaudio-v19_20071207.bb b/packages/portaudio/portaudio-v19_20071207.bb
new file mode 100644
index 0000000000..f8de2d741d
--- /dev/null
+++ b/packages/portaudio/portaudio-v19_20071207.bb
@@ -0,0 +1,27 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel@hentges.net> (c) 2008
+# License: MIT (see http://www.opensource.org/licenses/mit-license.php 
+#               for a copy of the license)
+#
+# Filename: portaudio-v19_20071207.bb
+# Date: 20080104 (YMD)
+
+DESCRIPTION = "portaudio is a portable cross-platform Audio API"
+SECTION = "base"
+LICENSE = "GPL"
+
+PR = "r0"
+
+######################################################################################
+
+SRC_URI = "http://www.portaudio.com/archives/pa_stable_v19_${PV}.tar.gz"
+
+S = "${WORKDIR}/portaudio"
+
+inherit autotools
+
+do_stage() {
+        install -m 0644 ${S}/include/portaudio.h ${STAGING_INCDIR}/
+        oe_libinstall -C lib -so libportaudio ${STAGING_LIBDIR}/
+}
-- 
cgit v1.2.3


From 18bb4e0d01dde69bf7306a33d5eb3e1668a7a1d6 Mon Sep 17 00:00:00 2001
From: Matthias Hentges <oe@hentges.net>
Date: Fri, 4 Jan 2008 15:25:35 +0000
Subject: espeak: Add espeak

---
 packages/espeak/.mtn2git_empty |  0
 packages/espeak/espeak_1.30.bb | 46 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 packages/espeak/.mtn2git_empty
 create mode 100644 packages/espeak/espeak_1.30.bb

(limited to 'packages')

diff --git a/packages/espeak/.mtn2git_empty b/packages/espeak/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/espeak/espeak_1.30.bb b/packages/espeak/espeak_1.30.bb
new file mode 100644
index 0000000000..03290d0aa2
--- /dev/null
+++ b/packages/espeak/espeak_1.30.bb
@@ -0,0 +1,46 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel@hentges.net> (c) 2008
+# License: MIT (see http://www.opensource.org/licenses/mit-license.php 
+#               for a copy of the license)
+#
+# Filename: espeak_1.30.bb
+# Date: 20080104 (YMD)
+
+DESCRIPTION = "eSpeak is a compact open source software speech synthesizer"
+SECTION = "base"
+LICENSE = "GPL"
+
+DEPENDS = "portaudio-v19"
+
+######################################################################################
+
+PR = "r0"
+
+SRC_URI = "http://kent.dl.sourceforge.net/sourceforge/espeak/espeak-${PV}-source.zip"
+
+S = "${WORKDIR}/${PN}-${PV}-source"
+
+FILES_${PN} += " /usr/share/espeak-data/ "
+
+do_configure() {
+	# espeak supports portaudio in APIs V18 and V19
+	cp ${S}/src/portaudio19.h ${S}/src/portaudio.h 
+}
+
+do_compile() {
+	cd src
+	oe_runmake
+}
+
+do_install() {
+        install -d ${D}${bindir}
+	install -d ${D}${libdir}
+        install -d ${D}${includedir}
+	install -d ${D}/usr/share/espeak-data
+	
+	install -m 0755 ${S}/src/espeak ${D}${bindir}
+	oe_libinstall -so -C src libespeak ${D}${libdir}
+	
+	cp -prf ${S}/espeak-data/* ${D}/usr/share/espeak-data
+}
-- 
cgit v1.2.3


From e85beb2ff0c9bcbfe59d9ed8fdb6cb294dd58f0b Mon Sep 17 00:00:00 2001
From: Matthias Hentges <oe@hentges.net>
Date: Fri, 4 Jan 2008 16:37:30 +0000
Subject: speech-dispatcher: Add missing patch

---
 .../files/confSpeechd.conf_00.patch                | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 packages/speech-dispatcher/files/confSpeechd.conf_00.patch

(limited to 'packages')

diff --git a/packages/speech-dispatcher/files/confSpeechd.conf_00.patch b/packages/speech-dispatcher/files/confSpeechd.conf_00.patch
new file mode 100644
index 0000000000..de1a776e3b
--- /dev/null
+++ b/packages/speech-dispatcher/files/confSpeechd.conf_00.patch
@@ -0,0 +1,26 @@
+--- speech-dispatcher-0.6.5/config/speechd.conf.in.orig	2008-01-04 13:45:43.000000000 +0000
++++ speech-dispatcher-0.6.5/config/speechd.conf.in	2008-01-04 13:47:31.000000000 +0000
+@@ -129,10 +129,10 @@
+ #  - configuration is the path to the config file of this module,
+ #    either relative (to etc/speechd/modules/) or absolute
+ 
+-AddModule "espeak"       "sd_espeak"   "espeak.conf"
+-AddModule "festival"     "sd_festival"  "festival.conf"
+-AddModule "flite"        "sd_flite"     "flite.conf"
+-#AddModule "espeak-generic" "sd_generic" "espeak-generic.conf"
++#AddModule "espeak"       "sd_espeak"   "espeak.conf"
++#AddModule "festival"     "sd_festival"  "festival.conf"
++#AddModule "flite"        "sd_flite"     "flite.conf"
++AddModule "espeak-generic" "sd_generic" "espeak-generic.conf"
+ #AddModule "epos-generic" "sd_generic"   "epos-generic.conf"
+ #AddModule "dtk-generic"  "sd_generic"   "dtk-generic.conf"
+ #AddModule "ibmtts"       "sd_ibmtts"    "ibmtts.conf"
+@@ -172,6 +172,6 @@
+ 
+ # There are some sample client settings
+ 
+-Include "clients/emacs.conf"
+-Include "clients/gnome-speech.conf"
++#Include "clients/emacs.conf"
++#Include "clients/gnome-speech.conf"
+ 
-- 
cgit v1.2.3


From b2f5af9a8285c3c960bc1e8618e1c0f349a63cb1 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Fri, 4 Jan 2008 21:05:57 +0000
Subject: gnome-mplayer: Fix segfaults decoding non-utf8 tags in media.

---
 .../files/non-utf8-id3-fallback.patch              | 22 ++++++++++++++++++++++
 .../gnome-mplayer/files/uchar-for-utf8-check.patch | 22 ++++++++++++++++++++++
 packages/gnome-mplayer/gnome-mplayer_0.5.3.bb      |  6 ++++--
 packages/gnome-mplayer/gnome-mplayer_cvs.bb        |  6 ++++--
 4 files changed, 52 insertions(+), 4 deletions(-)
 create mode 100644 packages/gnome-mplayer/files/non-utf8-id3-fallback.patch
 create mode 100644 packages/gnome-mplayer/files/uchar-for-utf8-check.patch

(limited to 'packages')

diff --git a/packages/gnome-mplayer/files/non-utf8-id3-fallback.patch b/packages/gnome-mplayer/files/non-utf8-id3-fallback.patch
new file mode 100644
index 0000000000..3b13bf0015
--- /dev/null
+++ b/packages/gnome-mplayer/files/non-utf8-id3-fallback.patch
@@ -0,0 +1,22 @@
+I found that on ARM/glibc 2.5/glib 2.12.something test in strip_unicode() doesn't
+really catch invalid utf-8 chars. Also, let's tell user where problem lies straight.
+
+Paul Sokolovsky <pmiscml@gmail.com>
+--- a/src/thread.c.org	2007-12-24 00:10:15.000000000 +0200
++++ a/src/thread.c	2008-01-04 22:04:30.000000000 +0200
+@@ -349,13 +349,11 @@
+ 					//g_idle_add(set_media_info, idledata);
+ 					utf8name = g_locale_to_utf8(parse[name],-1, NULL, NULL,NULL);
+ 					if (utf8name == NULL) {
+-						strip_unicode(parse[name],strlen(parse[name]));
+-						utf8name = g_strdup(parse[name]);
++						utf8name = g_strdup("<cannot convert to utf-8>");
+ 					}
+ 					utf8artist = g_locale_to_utf8(parse[artist],-1, NULL, NULL,NULL);
+ 					if (utf8artist == NULL) {
+-						strip_unicode(parse[artist],strlen(parse[artist]));
+-						utf8artist = g_strdup(parse[artist]);
++						utf8artist = g_strdup("<cannot convert to utf-8>");
+ 					}
+ 					
+ 					message = g_markup_printf_escaped(_("<small>\n<b>Title:</b>\t%s\n<b>Artist:</b>\t%s\n<b>File:</b>\t%s\n</small>"),utf8name,utf8artist,idledata->info);
diff --git a/packages/gnome-mplayer/files/uchar-for-utf8-check.patch b/packages/gnome-mplayer/files/uchar-for-utf8-check.patch
new file mode 100644
index 0000000000..f19d20716e
--- /dev/null
+++ b/packages/gnome-mplayer/files/uchar-for-utf8-check.patch
@@ -0,0 +1,22 @@
+--- a/src/support.c.org	2007-12-18 20:39:09.000000000 +0200
++++ a/src/support.c	2008-01-04 22:12:32.000000000 +0200
+@@ -24,7 +24,7 @@
+ 
+ #include "support.h"
+ 
+-void strip_unicode(gchar * data, gsize len)
++void strip_unicode(guchar * data, gsize len)
+ {
+     gsize i = 0;
+ 
+--- a/src/support.h.org	2007-12-17 18:21:46.000000000 +0200
++++ a/src/support.h	2008-01-04 22:24:15.000000000 +0200
+@@ -31,7 +31,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ 
+-void strip_unicode(gchar * data, gsize len);
++void strip_unicode(guchar * data, gsize len);
+ gint play_file(gchar * filename, gint playlist);
+ gint detect_playlist(gchar * filename);
+ gint parse_playlist(gchar * filename);
diff --git a/packages/gnome-mplayer/gnome-mplayer_0.5.3.bb b/packages/gnome-mplayer/gnome-mplayer_0.5.3.bb
index 62533441c7..c01152cfb8 100644
--- a/packages/gnome-mplayer/gnome-mplayer_0.5.3.bb
+++ b/packages/gnome-mplayer/gnome-mplayer_0.5.3.bb
@@ -3,10 +3,12 @@ HOMEPAGE = "http://dekorte.homeip.net/download/gnome-mplayer/"
 LICENSE = "GPL"
 DEPENDS = "gtk+ gconf dbus-glib"
 RDEPENDS = "mplayer"
-PR = "r2"
+PR = "r3"
 
 inherit autotools pkgconfig gconf
 
 SRC_URI = "http://dekorte.homeip.net/download/${PN}/${P}.tar.gz \
     file://ac-gthread.patch;patch=1 \
-    file://1.patch;patch=1" 
+    file://1.patch;patch=1 \
+    file://uchar-for-utf8-check.patch;patch=1 \
+    file://non-utf8-id3-fallback.patch;patch=1"
diff --git a/pac