merge of 'a153d288427652523d9cf6ef78faccfc723035d5'

     and 'd910c68cbd1dafb9c6b77187abde5e456d8606e9'

57 files changed, 3033 insertions, 398 deletions

diff --git a/packages/alsa/alsa-lib/fix_libmath.patch b/packages/alsa/alsa-lib/fix_libmath.patch
new file mode 100644
index 0000000000..23309ce381
--- /dev/null
+++ b/packages/alsa/alsa-lib/fix_libmath.patch
@@ -0,0 +1,17 @@
+Index: alsa-lib-1.0.15/configure.in
+===================================================================
+--- alsa-lib-1.0.15.orig/configure.in	2007-10-15 10:45:26.000000000 +0200
++++ alsa-lib-1.0.15/configure.in	2008-07-19 15:51:34.177119589 +0200
+@@ -191,9 +191,9 @@
+   AC_MSG_RESULT(no)
+ fi
+ 
+-ALSA_DEPLIBS=""
+-if test "$softfloat" != "yes"; then
+-  ALSA_DEPLIBS="-lm"
++ALSA_DEPLIBS="-lm"
++if test "$softfloat" = "yes"; then
++   AC_CHECK_LIB([m], [floor], , [ALSA_DEPLIBS=""])
+ fi
+ 
+ dnl Check for libdl
diff --git a/packages/alsa/alsa-lib_1.0.15.bb b/packages/alsa/alsa-lib_1.0.15.bb
index 60b44dbc8e..399352f299 100644
--- a/packages/alsa/alsa-lib_1.0.15.bb
+++ b/packages/alsa/alsa-lib_1.0.15.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "Alsa sound library"
 HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "libs/multimedia"
 LICENSE = "GPL"
+PR = "1"
 
 # configure.in sets -D__arm__ on the command line for any arm system
 # (not just those with the ARM instruction set), this should be removed,
@@ -10,14 +11,23 @@ LICENSE = "GPL"
 ARM_INSTRUCTION_SET = "arm"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \
-           file://fix-tstamp-declaration.patch;patch=1"
+           file://fix-tstamp-declaration.patch;patch=1 \
+	   file://fix_libmath.patch;patch=1 \
+	  "
 
 inherit autotools pkgconfig
 
+
+EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes --disable-python"
+
+
 require alsa-fpu.inc
 EXTRA_OECONF += "${@get_alsa_fpu_setting(bb, d)} "
 
-EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes --disable-python"
+
+require alsa-versym.inc
+EXTRA_OECONF += "${@get_alsa_versym_setting(bb, d)} "
+
 
 do_stage () {
 	oe_libinstall -so -C src libasound ${STAGING_LIBDIR}/
diff --git a/packages/alsa/alsa-oss_1.0.15.bb b/packages/alsa/alsa-oss_1.0.15.bb
index b11947e86a..3cfe886d61 100644
--- a/packages/alsa/alsa-oss_1.0.15.bb
+++ b/packages/alsa/alsa-oss_1.0.15.bb
@@ -2,8 +2,11 @@ DESCRIPTION = "Alsa OSS Compatibility Package"
 SECTION = "libs/multimedia"
 LICENSE = "GPL"
 DEPENDS = "alsa-lib"
+PR = "1"
 
-SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2"
+SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \
+	   file://libio.patch;patch=1 \
+	  "
 
 inherit autotools 
 
diff --git a/packages/alsa/alsa-versym.inc b/packages/alsa/alsa-versym.inc
new file mode 100644
index 0000000000..6d585ecf4a
--- /dev/null
+++ b/packages/alsa/alsa-versym.inc
@@ -0,0 +1,21 @@
+
+def get_alsa_versym_setting(bb, d):
+    # Versioned symbols don't work propery with uClibc
+    if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0:
+        return "--with-versioned=no"
+    return ""
+    
+
+def get_alsa_versym_setting(bb, d):
+    # Versioned symbols don't work propery with uClibc
+    if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0:
+        return "--with-versioned=no"
+    return ""
+    
+
+def get_alsa_versym_setting(bb, d):
+    # Versioned symbols don't work propery with uClibc
+    if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0:
+        return "--with-versioned=no"
+    return ""
+    
diff --git a/packages/alsa/files/libio.patch b/packages/alsa/files/libio.patch
new file mode 100644
index 0000000000..83345a98d3
--- /dev/null
+++ b/packages/alsa/files/libio.patch
@@ -0,0 +1,43 @@
+Index: alsa-oss-1.0.15/alsa/stdioemu.c
+===================================================================
+--- alsa-oss-1.0.15.orig/alsa/stdioemu.c	2007-10-15 10:50:40.000000000 +0200
++++ alsa-oss-1.0.15/alsa/stdioemu.c	2008-07-20 22:29:46.767474560 +0200
+@@ -37,7 +37,9 @@
+ #endif
+ 
+ #include <stdio.h>
++#ifdef HAVE_LIBIO_H
+ #include <libio.h>
++#endif
+ 
+ struct fd_cookie {
+ 	int fd;
+@@ -99,7 +101,11 @@
+ 
+ 	if (open_mode && fdc->fd > 0) {
+ 		result = fopencookie (fdc,"w", fns);
++#ifdef HAVE_FILENO
+ 		result->_fileno = fdc->fd;		/* ugly patchy slimy kludgy hack */
++else
++		result->_filedes = fdc->fd;
++#endif
+ 	}
+ 	return result;
+ }
+Index: alsa-oss-1.0.15/configure.in
+===================================================================
+--- alsa-oss-1.0.15.orig/configure.in	2007-10-15 10:50:40.000000000 +0200
++++ alsa-oss-1.0.15/configure.in	2008-07-20 22:49:45.455837502 +0200
+@@ -33,6 +33,12 @@
+   LIBS="$OLD_LIBS"
+ fi
+ 
++AC_CHECK_HEADERS_ONCE([libio.h])
++
++AC_CHECK_MEMBER([struct _IO_FILE._fileno],
++		[AC_DEFINE([HAVE_FILENO], [1],[Define if _fileno exists.])],
++		[],[])
++
+ AC_OUTPUT(Makefile alsa/Makefile alsa/aoss alsa/aoss.old \
+ 	  oss-redir/Makefile test/Makefile \
+           alsa/testaoss test/testaoss)
diff --git a/packages/dfu-util/dfu-util-native_svn.bb b/packages/dfu-util/dfu-util-native_svn.bb
index 6304fad55b..ad0bece8fa 100644
--- a/packages/dfu-util/dfu-util-native_svn.bb
+++ b/packages/dfu-util/dfu-util-native_svn.bb
@@ -7,11 +7,16 @@ DEPENDS = "libusb-native usbpath-native"
 do_stage() {
 	install -d ${STAGING_BINDIR_NATIVE}
 	install -m 0755 src/dfu-util ${STAGING_BINDIR_NATIVE}/dfu-util-${PV}
+	rm -f ${STAGING_BINDIR_NATIVE}/dfu-util
+	ln -sf ./dfu-util-${PV} ${STAGING_BINDIR_NATIVE}/dfu-util
 }
 
 do_deploy() {
 	install -d ${DEPLOY_DIR_TOOLS}
 	install -m 0755 src/dfu-util_static ${DEPLOY_DIR_TOOLS}/dfu-util-${PV}
+	rm -f ${DEPLOY_DIR_TOOLS}/dfu-util
+	ln -sf ./dfu-util-${PV} ${DEPLOY_DIR_TOOLS}/dfu-util
+
 }
 
 addtask deploy before do_package after do_install
diff --git a/packages/dfu-util/dfu-util_svn.bb b/packages/dfu-util/dfu-util_svn.bb
index 2e1afd55b1..5cb95cbac8 100644
--- a/packages/dfu-util/dfu-util_svn.bb
+++ b/packages/dfu-util/dfu-util_svn.bb
@@ -3,7 +3,7 @@ SECTION = "devel"
 AUTHOR = "Harald Welte <laforge@openmoko.org>"
 LICENSE = "GPL"
 PV = "0.1+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
 
 DEPENDS = "libusb usbpath"
 
diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb
index 979da0362e..b0c57288a1 100644
--- a/packages/ffmpeg/ffmpeg_git.bb
+++ b/packages/ffmpeg/ffmpeg_git.bb
@@ -3,7 +3,7 @@ require ffmpeg.inc
 DEPENDS += "libgsm"
 
 PV = "0.4.9+${PR}+gitr${SRCREV}" 
-PR = "r15"
+PR = "r16"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_armv7a = "1"
@@ -12,7 +12,7 @@ FFBRANCH_arm = "arm-neon"
 FFBRANCH ?= "master"
 
 SRCREV = "dee1c2d60a67dc6411ed3fcbe26db5113cb1a371"
-SRCREV_arm = "7137e7907e706300183c120703d4c9b46db93029"
+SRCREV_arm = "699f491ee2d3c3216ef16ea30ec3956f4cb583db"
 SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \
 "
 
diff --git a/packages/ffmpeg/omapfbplay_git.bb b/packages/ffmpeg/omapfbplay_git.bb
index 9494e57d33..dd89b8eae8 100644
--- a/packages/ffmpeg/omapfbplay_git.bb
+++ b/packages/ffmpeg/omapfbplay_git.bb
@@ -2,13 +2,13 @@ DESCRIPTION = "Simple ffmpeg-based player that uses the omapfb overlays"
 DEPENDS = "bzip2 lame ffmpeg virtual/kernel"
 LICENSE = "MIT"
 
-PR = "r5"
+PR = "r6"
 
 inherit module-base
 
 PV = "0.0+${PR}+gitr${SRCREV}"
 
-SRCREV = "5d0a1fd4c9733ef8c57823c368e21688344bbeb4"
+SRCREV = "0e4b69dbdc807da9b51e97fcffd8e26427b57162"
 SRC_URI = "git://git.mansr.com/${PN};protocol=git \
            file://fbplay-static.diff;patch=1 "
 
diff --git a/packages/freesmartphone/frameworkd/a780/.mtn2git_empty b/packages/freesmartphone/frameworkd/a780/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/freesmartphone/frameworkd/a780/.mtn2git_empty
diff --git a/packages/freesmartphone/frameworkd/a780/frameworkd.conf b/packages/freesmartphone/frameworkd/a780/frameworkd.conf
new file mode 100644
index 0000000000..4499acc47e
--- /dev/null
+++ b/packages/freesmartphone/frameworkd/a780/frameworkd.conf
@@ -0,0 +1,15 @@
+[idlenotifier]
+
+[input]
+# keys (copied from Openmoko, need to adjust)
+report1 = AUX,key,169,1
+report2 = POWER,key,116,1
+report3 = CHARGER,key,356,0
+report4 = HEADSET,switch,2,0
+
+[ogsmd]
+# A780 has Freescale Neptune LTE
+modemtype = freescale_neptune
+
+[opreferencesd]
+rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences
diff --git a/packages/freesmartphone/frameworkd/frameworkd.conf b/packages/freesmartphone/frameworkd/frameworkd.conf
index 36b4f5fc8e..3d0bbc3c1c 100644
--- a/packages/freesmartphone/frameworkd/frameworkd.conf
+++ b/packages/freesmartphone/frameworkd/frameworkd.conf
@@ -14,6 +14,7 @@ ignoreinput = 2,3,4
 disable = 0
 
 [ogsmd]
+# specify your modemtype here
 modemtype = ti_calypso
 
 [opreferencesd]
diff --git a/packages/freesmartphone/frameworkd/magician/.mtn2git_empty b/packages/freesmartphone/frameworkd/magician/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/freesmartphone/frameworkd/magician/.mtn2git_empty
diff --git a/packages/freesmartphone/frameworkd/magician/frameworkd.conf b/packages/freesmartphone/frameworkd/magician/frameworkd.conf
new file mode 100644
index 0000000000..cbafb1925f
--- /dev/null
+++ b/packages/freesmartphone/frameworkd/magician/frameworkd.conf
@@ -0,0 +1,17 @@
+[idlenotifier]
+
+[input]
+# magician doesn't have AUX, use the CAMERA key for now
+# (it's in about the same place as AUX on gta01/02)
+report1 = AUX,key,212,1
+report2 = POWER,key,116,1
+# magician doesn't use KEY_POWER2 for the charger, need to fix
+report3 = CHARGER,key,356,0
+report4 = HEADSET,switch,2,0
+
+[ophoned]
+# Magician has TI Calypso
+modemtype = ti_calypso
+
+[opreferencesd]
+rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences
diff --git a/packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf b/packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf
index 15c489156b..64c00a4a92 100644
--- a/packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf
+++ b/packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf
@@ -1,13 +1,14 @@
 [idlenotifier]
 
 [input]
+# Keys
 report1 = AUX,key,169,1
 report2 = POWER,key,116,1
 report3 = CHARGER,key,356,0
 report4 = HEADSET,switch,2,0
 
-[ophoned]
-# GTA02 has TI Calypso
+[ogsmd]
+# GTA01 has TI Calypso
 modemtype = ti_calypso
 
 [opreferencesd]
diff --git a/packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf b/packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf
index cac51ce102..79c06edff2 100644
--- a/packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf
+++ b/packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf
@@ -5,14 +5,20 @@ ignoreinput=2,3
 [input]
 # don't read from accellerometers for GTA02
 ignoreinput=2,3
+# keys
 report1 = AUX,key,169,1
 report2 = POWER,key,116,1
 report3 = CHARGER,key,356,0
 report4 = HEADSET,switch,2,0
 
-[ophoned]
+[ogsmd]
 # GTA02 has TI Calypso
 modemtype = ti_calypso
 
+[ogpsd]
+device = GTA02Device
+channel = SerialChannel
+path = /dev/ttySAC1
+
 [opreferencesd]
 rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences
diff --git a/packages/freesmartphone/frameworkd_git.bb b/packages/freesmartphone/frameworkd_git.bb
index 3a6d280f33..20c655e98d 100644
--- a/packages/freesmartphone/frameworkd_git.bb
+++ b/packages/freesmartphone/frameworkd_git.bb
@@ -5,7 +5,7 @@ SECTION = "console/network"
 DEPENDS = "python-cython-native python-pyrex-native"
 LICENSE = "GPL"
 PV = "0.8.1+gitr${SRCREV}"
-PR = "r7"
+PR = "r9"
 
 inherit distutils update-rc.d
 
diff --git a/packages/iptables/iptables_1.3.3.bb b/packages/iptables/iptables.inc
index 5f19d45317..0f4bacaf14 100644
--- a/packages/iptables/iptables_1.3.3.bb
+++ b/packages/iptables/iptables.inc
@@ -2,20 +2,11 @@ DESCRIPTION = "iptables network filtering tools"
 HOMEPAGE = "http://www.netfilter.org/"
 SECTION = "console/utils"
 LICENSE = "GPL"
-RRECOMMENDS = "kernel-module-ip-tables kernel-module-iptable-filter"
-PR = "r4"
-
-
-
-PACKAGES =+ "${PN}-utils"
-FILES_${PN}-utils = "${sbindir}/iptables-save ${sbindir}/iptables-restore"
-
-SRC_URI = "http://www.netfilter.org/files/iptables-${PV}.tar.bz2 \
-	   file://compile.patch;patch=1"
 
+SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2"
 S = "${WORKDIR}/iptables-${PV}"
 
-PARALLEL_MAKE=""
+PARALLEL_MAKE = ""
 
 export COPT_FLAGS = "${CFLAGS}"
 export KERNEL_DIR = "${STAGING_INCDIR}"
@@ -30,5 +21,12 @@ do_install () {
 	oe_runmake BINDIR=${D}${sbindir} LIBDIR=${D}${libdir} MANDIR=${D}${mandir} install NO_SHARED_LIBS=1
 }
 
+PACKAGES =+ "${PN}-utils"
+FILES_${PN}-utils = "${sbindir}/iptables-save ${sbindir}/iptables-restore"
 FILES_${PN}-doc += "${mandir}"
 
+RRECOMMENDS = "\
+  kernel-module-ip-tables \
+  kernel-module-iptable-nat \
+  kernel-module-iptable-filter \
+"
diff --git a/packages/iptables/iptables_1.2.11.bb b/packages/iptables/iptables_1.2.11.bb
deleted file mode 100644
index 0d6d8ccadf..0000000000
--- a/packages/iptables/iptables_1.2.11.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-DESCRIPTION = "iptables network filtering tools"
-HOMEPAGE = "http://www.netfilter.org/"
-SECTION = "console/utils"
-LICENSE = "GPL"
-PR = "r1"
-
-PACKAGES =+ "${PN}-utils"
-FILES_${PN}-utils = "${bindir}/iptables-save ${bindir}/iptables-restore"
-
-SRC_URI = "http://www.netfilter.org/files/iptables-${PV}.tar.bz2"
-
-S = "${WORKDIR}/iptables-${PV}"
-
-PARALLEL_MAKE=""
-
-export COPT_FLAGS = "${CFLAGS}"
-export KERNEL_DIR = "${STAGING_INCDIR}"
-
-do_compile () {
-	unset CFLAGS
-	oe_runmake BINDIR=${D}${bindir} LIBDIR=${D}${libdir} MANDIR=${D}${mandir} NO_SHARED_LIBS=1
-}
-
-do_install () {
-	oe_runmake BINDIR=${D}${bindir} LIBDIR=${D}${libdir} MANDIR=${D}${mandir} install NO_SHARED_LIBS=1
-}
-
-FILES_${PN}-doc += "${mandir}"
-
diff --git a/packages/iptables/iptables_1.2.9.bb b/packages/iptables/iptables_1.2.9.bb
deleted file mode 100644
index 213802d17f..0000000000
--- a/packages/iptables/iptables_1.2.9.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-SECTION = "console/network"
-DESCRIPTION = "iptables network filtering tools"
-LICENSE = "GPL"
-PR = "r2"
-
-SRC_URI = "http://www.netfilter.org/files/iptables-${PV}.tar.bz2 \
-	   file://compile.patch;patch=1"
-
-S = "${WORKDIR}/iptables-${PV}"
-
-export COPT_FLAGS = "${CFLAGS}"
-export KERNEL_DIR = "${STAGING_INCDIR}"
-
-do_compile () {
-	unset CFLAGS
-	oe_runmake BINDIR=${D}${bindir} LIBDIR=${D}${libdir} MANDIR=${D}/usr/man NO_SHARED_LIBS=1
-}
-
-do_install () {
-#	oe_runmake PREFIX=${prefix} DESTDIR=${D} install
-	oe_runmake BINDIR=${D}${bindir} LIBDIR=${D}${libdir} MANDIR=${D}/usr/man install NO_SHARED_LIBS=1
-}
diff --git a/packages/iptables/iptables_1.3.8.bb b/packages/iptables/iptables_1.3.8.bb
index 8dfb6c7842..4475402df8 100644
--- a/packages/iptables/iptables_1.3.8.bb
+++ b/packages/iptables/iptables_1.3.8.bb
@@ -1,32 +1,8 @@
-DESCRIPTION = "iptables network filtering tools"
-HOMEPAGE = "http://www.netfilter.org/"
-SECTION = "console/utils"
-LICENSE = "GPL"
-RRECOMMENDS = "kernel-module-ip-tables kernel-module-iptable-filter"
-PR = "r2"
-SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \
-          file://getsockopt-failed.patch;patch=1 \
-          file://iptables-use-s6_addr32.patch;patch=1 \
-          "
+require iptables.inc
+PR = "r3"
 
-S = "${WORKDIR}/iptables-${PV}"
-
-PARALLEL_MAKE=""
-
-export COPT_FLAGS = "${CFLAGS}"
-export KERNEL_DIR = "${STAGING_INCDIR}"
-
-do_compile () {
-	unset CFLAGS
-	oe_runmake BINDIR=${D}${sbindir} LIBDIR=${D}${libdir} MANDIR=${D}${mandir} NO_SHARED_LIBS=1
-}
-
-do_install () {
-	unset CFLAGS
-	oe_runmake BINDIR=${D}${sbindir} LIBDIR=${D}${libdir} MANDIR=${D}${mandir} install NO_SHARED_LIBS=1
-}
-
-PACKAGES =+ "${PN}-utils"
-FILES_${PN}-utils = "${sbindir}/iptables-save ${sbindir}/iptables-restore"
-FILES_${PN}-doc += "${mandir}"
+SRC_URI += "\
+  file://getsockopt-failed.patch;patch=1 \
+  file://iptables-use-s6_addr32.patch;patch=1 \
+"
 
diff --git a/packages/libftdi/files/autotools.patch b/packages/libftdi/files/autotools.patch
new file mode 100644
index 0000000000..ab0bb02a85
--- /dev/null
+++ b/packages/libftdi/files/autotools.patch
@@ -0,0 +1,895 @@
+Index: libftdi-0.13/configure.ac
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ libftdi-0.13/configure.ac	2008-07-18 14:35:52.710117546 +0200
+@@ -0,0 +1,53 @@
++#                                               -*- Autoconf -*-
++# Process this file with autoconf to produce a configure script.
++
++AC_PREREQ(2.61)
++AC_INIT([libftdi], [0.13])
++AM_INIT_AU