Merge branch 'holger/openmoko-merges' into org.openembedded.dev

Conflicts:

	packages/tasks/task-openmoko-feed.bb

72 files changed, 321 insertions, 127 deletions

diff --git a/packages/gnash/gnash-minimal.inc b/packages/gnash/gnash-minimal.inc
index 4f52322467..a8e5229f46 100644
--- a/packages/gnash/gnash-minimal.inc
+++ b/packages/gnash/gnash-minimal.inc
@@ -2,8 +2,8 @@ DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 featu
 HOMEPAGE = "http://www.gnu.org/software/gnash"
 LICENSE = "GPL-2"
 
-DEPENDS = "virtual/libiconv virtual/libintl ffmpeg libtool agg libxml2 zlib boost jpeg pango curl freetype \
-           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}"
+DEPENDS = "virtual/libiconv virtual/libintl libtool agg libxml2 zlib boost jpeg pango curl freetype \
+           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'ffmpeg libmad', d)}"
 RRECOMMENDS_${PN} = "libltdl"
 
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2"
@@ -28,8 +28,9 @@ EXTRA_OECONF="--enable-gui=gtk \
                 --disable-glext \
                 --disable-Xft \
                 --disable-expat \
-                --enable-mad \
+                ${@base_conditional('ENTERPRISE_DISTRO', '1', '', '--enable-mad', d)} \
                 --disable-gstreamer \
+                ${@base_conditional('ENTERPRISE_DISTRO', '1', '', '--enable-media=ffmpeg', d)} \
                 --enable-media=ffmpeg \
                 --disable-plugin \
                 --disable-cygnal \
diff --git a/packages/gnash/gnash-minimal_0.8.2.bb b/packages/gnash/gnash-minimal_0.8.2.bb
index ea99de1e39..81a97e3b7d 100644
--- a/packages/gnash/gnash-minimal_0.8.2.bb
+++ b/packages/gnash/gnash-minimal_0.8.2.bb
@@ -1,3 +1,3 @@
 require gnash-minimal.inc
 
-PR = "r3"
+PR = "r4"
diff --git a/packages/gnash/gnash-minimal_0.8.3.bb b/packages/gnash/gnash-minimal_0.8.3.bb
index 237097b94a..6f78d94c10 100644
--- a/packages/gnash/gnash-minimal_0.8.3.bb
+++ b/packages/gnash/gnash-minimal_0.8.3.bb
@@ -1,6 +1,6 @@
 require gnash-minimal.inc
 
-PR = "r8"
+PR = "r9"
 
 EXTRA_OECONF += " --without-included-ltdl \
                   --with-ltdl-include=${STAGING_INCDIR} \
diff --git a/packages/gnash/gnash-minimal_cvs.bb b/packages/gnash/gnash-minimal_cvs.bb
index 7c36dbafff..e1eff37b88 100644
--- a/packages/gnash/gnash-minimal_cvs.bb
+++ b/packages/gnash/gnash-minimal_cvs.bb
@@ -1,7 +1,7 @@
 require gnash-minimal.inc
 
 
-PR = "r3"
+PR = "r4"
 
 PV = "0.8.3+cvs${SRCDATE}"
 
diff --git a/packages/gnash/gnash.inc b/packages/gnash/gnash.inc
index 59261e3121..f4c7c1338d 100644
--- a/packages/gnash/gnash.inc
+++ b/packages/gnash/gnash.inc
@@ -1,10 +1,10 @@
 DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features"
 HOMEPAGE = "http://www.gnu.org/software/gnash"
 LICENSE = "GPL-2"
-DEPENDS = "libtool ffmpeg gtk+ cairo libxml2 libsdl-mixer zlib boost jpeg pango curl freetype \
-           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}"
+DEPENDS = "libtool gtk+ cairo libxml2 libsdl-mixer zlib boost jpeg pango curl freetype \
+           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'ffmpeg libmad', d)}"
           
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2 \
           "
@@ -13,14 +13,14 @@ inherit autotools pkgconfig
 
 EXTRA_OECONF = "--enable-gui=gtk \
                 --enable-renderer=cairo \
-                --enable-media=ffmpeg \
+                ${@base_conditional('ENTERPRISE_DISTRO', '1', '', '--enable-media=ffmpeg', d)} \
                 --disable-klash \
                 --enable-z \
                 --enable-jpeg \
                 --disable-glext \
                 --enable-Xft \
                 --enable-expat \
-                --enable-mad \
+                ${@base_conditional('ENTERPRISE_DISTRO', '1', '', '--enable-mad', d)} \
                 --enable-cairo \
                 --enable-plugin \
                 --disable-cygnal \
diff --git a/packages/gnash/gnash_0.8.0.bb b/packages/gnash/gnash_0.8.0.bb
index d9dc87a417..e809525606 100644
--- a/packages/gnash/gnash_0.8.0.bb
+++ b/packages/gnash/gnash_0.8.0.bb
@@ -1,3 +1,3 @@
 require gnash.inc
 
-PR = "r1"
+PR = "r2"
diff --git a/packages/gnash/gnash_0.8.1.bb b/packages/gnash/gnash_0.8.1.bb
index d9dc87a417..e809525606 100644
--- a/packages/gnash/gnash_0.8.1.bb
+++ b/packages/gnash/gnash_0.8.1.bb
@@ -1,3 +1,3 @@
 require gnash.inc
 
-PR = "r1"
+PR = "r2"
diff --git a/packages/gnash/gnash_0.8.2.bb b/packages/gnash/gnash_0.8.2.bb
index d9dc87a417..e809525606 100644
--- a/packages/gnash/gnash_0.8.2.bb
+++ b/packages/gnash/gnash_0.8.2.bb
@@ -1,3 +1,3 @@
 require gnash.inc
 
-PR = "r1"
+PR = "r2"
diff --git a/packages/gnash/gnash_0.8.3.bb b/packages/gnash/gnash_0.8.3.bb
index 9afde70d98..1b36f30af0 100644
--- a/packages/gnash/gnash_0.8.3.bb
+++ b/packages/gnash/gnash_0.8.3.bb
@@ -1,6 +1,6 @@
 require gnash.inc
 
-PR = "r4"
+PR = "r5"
 
 EXTRA_OECONF += " --without-included-ltdl \
                   --with-ltdl-include=${STAGING_INCDIR} \
diff --git a/packages/gsm/files/0001-Introduce-ports.patch b/packages/gsm/files/0001-Introduce-ports.patch
index b3ba3cb957..ce96ba5c92 100644
--- a/packages/gsm/files/0001-Introduce-ports.patch
+++ b/packages/gsm/files/0001-Introduce-ports.patch
@@ -505,7 +505,7 @@ index 0000000..22a4a5c
 @@ -0,0 +1,202 @@
 +/* Wrapper for the physical UART in a struct gsmd_port abstraction.
 + *
-+ * Copyright (C) 2007 OpenMoko, Inc.
++ * Copyright (C) 2007 Openmoko, Inc.
 + * Written by Andrzej Zaborowski <andrew@openedhand.com>
 + *
 + * This program is free software; you can redistribute it and/or
diff --git a/packages/images/openmoko-asu-image.bb b/packages/images/openmoko-asu-image.bb
index 2a8896c592..e7307c73d0 100644
--- a/packages/images/openmoko-asu-image.bb
+++ b/packages/images/openmoko-asu-image.bb
@@ -4,4 +4,7 @@
 
 require openmoko-minimal-image.bb
 
-IMAGE_INSTALL += "task-openmoko-asu"
+IMAGE_INSTALL += "\
+                  task-openmoko-asu \
+                  task-openmoko-basic \
+                  "
diff --git a/packages/images/openmoko-base-image.bb b/packages/images/openmoko-base-image.bb
new file mode 100644
index 0000000000..8acb0f5f90
--- /dev/null
+++ b/packages/images/openmoko-base-image.bb
@@ -0,0 +1,7 @@
+#------------------------------------------------------
+# Openmoko Base Image Recipe
+#------------------------------------------------------
+
+require openmoko-minimal-image.bb
+
+IMAGE_INSTALL += "task-openmoko-basic"
diff --git a/packages/libmrss/files/better-parse-url-r0.patch b/packages/libmrss/files/better-parse-url-r0.patch
index b365819008..5909eee173 100644
--- a/packages/libmrss/files/better-parse-url-r0.patch
+++ b/packages/libmrss/files/better-parse-url-r0.patch
@@ -2,7 +2,7 @@ upstream: mailed to bakunin_at_autistici_dot_org by Laibsch
 status: committed in upstream CVS on Feb 26th 2008
 comment: API addition to not manually setup the CURL connection and still
 be able to get the transfered feed and save it to secondary storage. done
-by zecke for the OpenMoko RSS reader.
+by zecke for the Openmoko RSS reader.
 
 
 Index: libmrss-0.17.2/src/mrss.h
diff --git a/packages/mokoko/mokoko_svn.bb b/packages/mokoko/mokoko_svn.bb
new file mode 100644
index 0000000000..081c53ca88
--- /dev/null
+++ b/packages/mokoko/mokoko_svn.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Mokoko - a simple media player"
+HOMEPAGE = "http://code.google.com/p/om-mediaplayer/"
+SECTION = "openmoko/applications"
+LICENSE = "GPL"
+DEPENDS = "gstreamer"
+RDEPENDS = "gstreamer"
+
+PV = "0.1+svnr${SRCPV}"
+PR = "r0"
+
+SRC_URI = "svn://om-mediaplayer.googlecode.com/svn/;module=trunk;proto=http"
+
+S = "${WORKDIR}/trunk/mokoko"
+
+inherit autotools
+
diff --git a/packages/mplayer/mplayer_0.0+1.0rc2.bb b/packages/mplayer/mplayer_0.0+1.0rc2.bb
index 9d32fce12f..481acce475 100644
--- a/packages/mplayer/mplayer_0.0+1.0rc2.bb
+++ b/packages/mplayer/mplayer_0.0+1.0rc2.bb
@@ -45,7 +45,7 @@ ARM_INSTRUCTION_SET = "ARM"
 RCONFLICTS_${PN} = "mplayer-atty"
 RREPLACES_${PN} = "mplayer-atty"
 
-PR = "r10"
+PR = "r12"
 
 PARALLEL_MAKE = ""
 
@@ -121,12 +121,12 @@ EXTRA_OECONF = " \
         --disable-faac \
         --disable-ladspa \
         --disable-libdv \
-        --enable-mad \
+        ${@base_conditional('ENTERPRISE_DISTRO', '1', '--disable-mad', '--enable-mad', d)} \
         --disable-toolame \
         --disable-twolame \
         --disable-xmms \
 	--disable-mp3lib \
-        --enable-libmpeg2 \
+        ${@base_conditional('ENTERPRISE_DISTRO', '1', '--disable-libmpeg2', '--enable-libmpeg2', d)} \
         --disable-musepack \
 	\
         --disable-gl \
diff --git a/packages/openmoko-projects/assassin-thumbnail.bb b/packages/openmoko-projects/assassin-thumbnail.bb
index ece6662b91..b05c65dc1d 100644
--- a/packages/openmoko-projects/assassin-thumbnail.bb
+++ b/packages/openmoko-projects/assassin-thumbnail.bb
@@ -1,10 +1,9 @@
 DESCRIPTION = "Assassin Packages Thumbnails"
 HOMEPAGE = "http://assassin.projects.openmoko.org/"
-PKG_TAGS_${PN} = "group::unknown"
 LICENSE = "GPL"
 RDEPENDS = "assassin"
-PV = "0.1+svnr${SRCPV}"
-PR = "r0"
+PV = "0.1+svnr${SRCREV}"
+PR = "r1"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/target/thumbnails/;module=result;proto=https"
 
diff --git a/packages/openmoko-projects/diversity-radar_svn.bb b/packages/openmoko-projects/diversity-radar_svn.bb
index d7163f1f21..7a98d93afb 100644
--- a/packages/openmoko-projects/diversity-radar_svn.bb
+++ b/packages/openmoko-projects/diversity-radar_svn.bb
@@ -15,4 +15,4 @@ inherit setuptools
 
 FILES_${PN} += "${prefix}/share/*"
 
-PKG_TAGS_${PN} = "group::communication"
+PKG_TAGS_${PN} = "group::communication alias::Diversity_Radar"
diff --git a/packages/openmoko-projects/om-locations_git.bb b/packages/openmoko-projects/om-locations_git.bb
index a25a3e21ba..9207502f2f 100644
--- a/packages/openmoko-projects/om-locations_git.bb
+++ b/packages/openmoko-projects/om-locations_git.bb
@@ -19,4 +19,4 @@ do_configure_prepend() {
        autopoint --force
 }
 
-PKG_TAGS_${PN} = "group::communication"
+PKG_TAGS_${PN} = "group::communication alias::Om_Locations"
diff --git a/packages/openmoko-projects/om-maps-berlin_20080430.bb b/packages/openmoko-projects/om-maps-berlin_20080430.bb
index aaf6e5332c..17bfe725fc 100644
--- a/packages/openmoko-projects/om-maps-berlin_20080430.bb
+++ b/packages/openmoko-projects/om-maps-berlin_20080430.bb
@@ -1,7 +1,7 @@
-PR = "r1"
+PR = "r2"
 
+MAP_NAME = "Berlin"
 require om-maps.inc
 
-MAP_NAME = "Berlin"
 MAP_FN = "om-maps-berlin-${PV}.eet"
 MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-buenos-aires_20080430.bb b/packages/openmoko-projects/om-maps-buenos-aires_20080430.bb
index 81f734f27a..8f2f2a205d 100644
--- a/packages/openmoko-projects/om-maps-buenos-aires_20080430.bb
+++ b/packages/openmoko-projects/om-maps-buenos-aires_20080430.bb
@@ -1,7 +1,7 @@
-PR = "r1"
+PR = "r2"
 
+MAP_NAME = "Buenos Aires"
 require om-maps.inc
 
-MAP_NAME = "Buenos Aires"
 MAP_FN = "om-maps-buenos-aires-${PV}.eet"
 MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps-hong-kong_20080919.bb b/packages/openmoko-projects/om-maps-hong-kong_20080919.bb
index 9aecf64816..9b641778ec 100644
--- a/