merge of '5f0840d886de3702b9da184050476e21ca104094'

     and 'ec78a24debd2c3f06ca663b06355fc91c2bd291f'

9 files changed, 133 insertions, 125 deletions

diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 28934a7233..7fb0bc28e0 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -2,12 +2,13 @@ PREFERRED_VERSION_asterisk = "1.4.17"
 PREFERRED_VERSION_busybox = "1.9.1"
 PREFERRED_VERSION_dbus = "1.1.20"
 PREFERRED_VERSION_dbus-glib = "0.74"
-PREFERRED_VERSION_gnash = "0.8.1"
+PREFERRED_VERSION_gnash = "0.8.2"
 PREFERRED_VERSION_gpsdrive = "2.10pre4"
 PREFERRED_VERSION_gst-pulse = "0.9.7"
 PREFERRED_VERSION_intltool = "0.35.5"
 PREFERRED_VERSION_intltool-native = "0.35.5"
 PREFERRED_VERSION_libtool = "1.5.24"
+PREFERRED_VERSION_midori = "0.0.17"
 PREFERRED_VERSION_pulseaudio = "0.9.9"
 PREFERRED_VERSION_udev = "118"
 PREFERRED_VERSION_vte = "0.16.10"
diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb
index 3d12b5d3cd..16fee583d4 100644
--- a/packages/alsa/alsa-state.bb
+++ b/packages/alsa/alsa-state.bb
@@ -8,7 +8,7 @@ DESCRIPTION = "Default ALSA configuration"
 LICENSE = "GPL"
 RRECOMMENDS_alsa-state = "alsa-states"
 PV = "0.1.0"
-PR = "r12"
+PR = "r13"
 
 SRC_URI = " \
   file://asoundrc \
diff --git a/packages/alsa/alsa-state/fic-gta02/gsmhandset.state b/packages/alsa/alsa-state/fic-gta02/gsmhandset.state
index cc0d32a7c7..722ce88425 100644
--- a/packages/alsa/alsa-state/fic-gta02/gsmhandset.state
+++ b/packages/alsa/alsa-state/fic-gta02/gsmhandset.state
@@ -26,8 +26,8 @@ state.neo1973gta02 {
 		comment.range '0 - 127'
 		iface MIXER
 		name 'Headphone Playback Volume'
-		value.0 121
-		value.1 121
+		value.0 0
+		value.1 0
 	}
 	control.4 {
 		comment.access 'read write'
@@ -46,7 +46,7 @@ state.neo1973gta02 {
 		comment.range '0 - 127'
 		iface MIXER
 		name 'Mono Playback Volume'
-		value 115
+		value 121
 	}
 	control.6 {
 		comment.access 'read write'
@@ -85,7 +85,7 @@ state.neo1973gta02 {
 		iface MIXER
 		name 'Headphone Playback ZC Switch'
 		value.0 false
-		value.1 true
+		value.1 false
 	}
 	control.10 {
 		comment.access 'read write'
@@ -94,7 +94,7 @@ state.neo1973gta02 {
 		iface MIXER
 		name 'Speaker Playback ZC Switch'
 		value.0 false
-		value.1 true
+		value.1 false
 	}
 	control.11 {
 		comment.access 'read write'
@@ -103,7 +103,7 @@ state.neo1973gta02 {
 		comment.range '0 - 7'
 		iface MIXER
 		name 'Mono Bypass Playback Volume'
-		value 3
+		value 2
 	}
 	control.12 {
 		comment.access 'read write'
@@ -112,7 +112,7 @@ state.neo1973gta02 {
 		comment.range '0 - 7'
 		iface MIXER
 		name 'Mono Sidetone Playback Volume'
-		value 1
+		value 2
 	}
 	control.13 {
 		comment.access 'read write'
@@ -121,7 +121,7 @@ state.neo1973gta02 {
 		comment.range '0 - 7'
 		iface MIXER
 		name 'Mono Voice Playback Volume'
-		value 1
+		value 2
 	}
 	control.14 {
 		comment.access 'read write'
@@ -171,7 +171,7 @@ state.neo1973gta02 {
 		comment.range '0 - 15'
 		iface MIXER
 		name 'Treble Volume'
-		value 7
+		value 0
 	}
 	control.19 {
 		comment.access 'read write'
@@ -209,8 +209,8 @@ state.neo1973gta02 {
 		comment.range '0 - 63'
 		iface MIXER
 		name 'Capture Volume'
-		value.0 24
-		value.1 24
+		value.0 23
+		value.1 23
 	}
 	control.23 {
 		comment.access 'read write'
@@ -276,7 +276,7 @@ state.neo1973gta02 {
 		comment.range '0 - 7'
 		iface MIXER
 		name 'ALC Capture Max Volume'
-		value 1
+		value 7
 	}
 	control.30 {
 		comment.access 'read write'
@@ -288,7 +288,7 @@ state.neo1973gta02 {
 		comment.item.3 Stereo
 		iface MIXER
 		name 'ALC Capture Function'
-		value Stereo
+		value Left
 	}
 	control.31 {
 		comment.access 'read write'
@@ -305,7 +305,7 @@ state.neo1973gta02 {
 		comment.range '0 - 15'
 		iface MIXER
 		name 'ALC Capture Hold Time'
-		value 7
+		value 15
 	}
 	control.33 {
 		comment.access 'read write'
@@ -495,6 +495,16 @@ state.neo1973gta02 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
+		comment.item.0 'Non Inverted'
+		comment.item.1 Inverted
+		iface MIXER
+		name 'ROUT2 Phase'
+		value Inverted
+	}
+	control.53 {
+		comment.access 'read write'
+		comment.type ENUMERATED
+		comment.count 1
 		comment.item.0 'Mic 1'
 		comment.item.1 'Mic 2'
 		comment.item.2 'Mic 3'
@@ -502,7 +512,7 @@ state.neo1973gta02 {
 		name 'Mic Selection Mux'
 		value 'Mic 1'
 	}
-	control.53 {
+	control.54 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -514,7 +524,7 @@ state.neo1973gta02 {
 		name 'Rx Mixer'
 		value 'RXP - RXN'
 	}
-	control.54 {
+	control.55 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -526,7 +536,7 @@ state.neo1973gta02 {
 		name 'Line Mixer'
 		value 'Line 1 + 2'
 	}
-	control.55 {
+	control.56 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -536,7 +546,7 @@ state.neo1973gta02 {
 		name 'Line Mono Mux'
 		value 'Line Mix'
 	}
-	control.56 {
+	control.57 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -546,7 +556,7 @@ state.neo1973gta02 {
 		name 'Line Right Mux'
 		value 'Rx Mix'
 	}
-	control.57 {
+	control.58 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -556,7 +566,7 @@ state.neo1973gta02 {
 		name 'Line Left Mux'
 		value 'Rx Mix'
 	}
-	control.58 {
+	control.59 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -564,7 +574,7 @@ state.neo1973gta02 {
 		name 'ALC Mixer Line Capture Switch'
 		value false
 	}
-	control.59 {
+	control.60 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -572,7 +582,7 @@ state.neo1973gta02 {
 		name 'ALC Mixer Mic2 Capture Switch'
 		value true
 	}
-	control.60 {
+	control.61 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -580,7 +590,7 @@ state.neo1973gta02 {
 		name 'ALC Mixer Mic1 Capture Switch'
 		value false
 	}
-	control.61 {
+	control.62 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -588,7 +598,7 @@ state.neo1973gta02 {
 		name 'ALC Mixer Rx Capture Switch'
 		value false
 	}
-	control.62 {
+	control.63 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -600,7 +610,7 @@ state.neo1973gta02 {
 		name 'Mic Sidetone Mux'
 		value 'Left PGA'
 	}
-	control.63 {
+	control.64 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -611,7 +621,7 @@ state.neo1973gta02 {
 		name 'Capture Right Mux'
 		value PGA
 	}
-	control.64 {
+	control.65 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -622,7 +632,7 @@ state.neo1973gta02 {
 		name 'Capture Left Mux'
 		value PGA
 	}
-	control.65 {
+	control.66 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -634,7 +644,7 @@ state.neo1973gta02 {
 		name 'Capture Right Mixer'
 		value Stereo
 	}
-	control.66 {
+	control.67 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -646,7 +656,7 @@ state.neo1973gta02 {
 		name 'Capture Left Mixer'
 		value Stereo
 	}
-	control.67 {
+	control.68 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -654,7 +664,7 @@ state.neo1973gta02 {
 		name 'Playback Mixer Voice Capture Sw'
 		value false
 	}
-	control.68 {
+	control.69 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -662,7 +672,7 @@ state.neo1973gta02 {
 		name 'Playback Mixer Left Capture Swi'
 		value false
 	}
-	control.69 {
+	control.70 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -670,7 +680,7 @@ state.neo1973gta02 {
 		name 'Playback Mixer Right Capture Sw'
 		value false
 	}
-	control.70 {
+	control.71 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -681,7 +691,7 @@ state.neo1973gta02 {
 		name 'Out4 Mux'
 		value VREF
 	}
-	control.71 {
+	control.72 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -692,7 +702,7 @@ state.neo1973gta02 {
 		name 'Out3 Mux'
 		value VREF
 	}
-	control.72 {
+	control.73 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -704,7 +714,7 @@ state.neo1973gta02 {
 		name 'Mono 2 Mux'
 		value 'Inverted Mono 1'
 	}
-	control.73 {
+	control.74 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -712,7 +722,7 @@ state.neo1973gta02 {
 		name 'Mono Mixer Left Playback Switch'
 		value false
 	}
-	control.74 {
+	control.75 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -720,7 +730,7 @@ state.neo1973gta02 {
 		name 'Mono Mixer Right Playback Switc'
 		value false
 	}
-	control.75 {
+	control.76 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -728,7 +738,7 @@ state.neo1973gta02 {
 		name 'Mono Mixer Voice Playback Switc'
 		value false
 	}
-	control.76 {
+	control.77 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -736,7 +746,7 @@ state.neo1973gta02 {
 		name 'Mono Mixer Sidetone Playback Sw'
 		value true
 	}
-	control.77 {
+	control.78 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -744,7 +754,7 @@ state.neo1973gta02 {
 		name 'Mono Mixer Bypass Playback Swit'
 		value false
 	}
-	control.78 {
+	control.79 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -752,31 +762,31 @@ state.neo1973gta02 {
 		name 'Right Mixer Voice Playback Swit'
 		value false
 	}
-	control.79 {
+	control.80 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
 		iface MIXER
 		name 'Right Mixer Sidetone Playback S'
-		value true
+		value false
 	}
-	control.80 {
+	control.81 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
 		iface MIXER
 		name 'Right Mixer Right Playback Swit'
-		value false
+		value true
 	}
-	control.81 {
+	control.82 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
 		iface MIXER
 		name 'Right Mixer Bypass Playback Swi'
-		value false
+		value true
 	}
-	control.82 {
+	control.83 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -784,7 +794,7 @@ state.neo1973gta02 {
 		name 'Left Mixer Voice Playback Switc'
 		value false
 	}
-	control.83 {
+	control.84 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -792,15 +802,15 @@ state.neo1973gta02 {
 		name 'Left Mixer Sidetone Playback Sw'
 		value false
 	}
-	control.84 {
+	control.85 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
 		iface MIXER
 		name 'Left Mixer Left Playback Switch'
-		value false
+		value true
 	}
-	control.85 {
+	control.86 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -808,15 +818,15 @@ state.neo1973gta02 {
 		name 'Left Mixer Bypass Playback Swit'
 		value true
 	}
-	control.86 {
+	control.87 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
 		iface MIXER
 		name 'DAPM Stereo Out Switch'
-		value true
+		value false
 	}
-	control.87 {
+	control.88 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -824,7 +834,7 @@ state.neo1973gta02 {
 		name 'DAPM GSM Line Out Switch'
 		value true
 	}
-	control.88 {
+	control.89 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -832,7 +842,7 @@ state.neo1973gta02 {
 		name 'DAPM GSM Line In Switch'
 		value false
 	}
-	control.89 {
+	control.90 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -840,7 +850,7 @@ state.neo1973gta02 {
 		name 'DAPM Headset Mic Switch'
 		value false
 	}
-	control.90 {
+	control.91 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -848,7 +858,7 @@ state.neo1973gta02 {
 		name 'DAPM Handset Mic Switch'
 		value true
 	}
-	control.91 {
+	control.92 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -856,4 +866,20 @@ state.neo1973gta02 {
 		name 'DAPM Handset Spk Switch'
 		value true
 	}
+	control.93 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Amp State Switch'
+		value false
+	}
+	control.94 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Amp Spk Switch'
+		value false
+	}
 }
diff --git a/packages/gnash/gnash.inc b/packages/gnash/gnash.inc
index 2168de48c2..113422596a 100644
--- a/packages/gnash/gnash.inc
+++ b/packages/gnash/gnash.inc
@@ -1,67 +1,29 @@
 DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features"
-
-LICENSE = "GPL-2"
 HOMEPAGE = "http://www.gnu.org/software/gnash"
+LICENSE = "GPL-2"
+DEPENDS = "gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl freetype"
+PR = "r1"
 
-DEPENDS = "gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl"
-
-SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2"
+SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2 \
+          "
 
+inherit autotools pkgconfig
 
 EXTRA_OECONF = "--enable-gui=gtk \
                 --enable-renderer=cairo \
-		--enable-media=none \
+                --enable-media=none \
                 --disable-klash \
-		--enable-z \
-		--enable-jpeg \
-		--disable-glext \
-		--enable-Xft \
-		--enable-expat \
-		--enable-mad \
-		--enable-cairo \
-		--disable-plugin \
-		--disable-cygnal \
-		--with-boost-incl=${STAGING_INCDIR} \
-		--with-boost-lib=${STAGING_LIBDIR} \
-		--with-libxml-incl=${STAGING_INCDIR}/libxml2 \
-		--with-libxml-lib=${STAGING_LIBDIR} \
-		--with-glib-incl=${STAGING_INCDIR}/glib-2.0 \
-#		--with-glib-lib=${STAGING_LIBDIR} \
-		--with-gtk2-incl=${STAGING_INCDIR}/gtk-2.0 \
-		--with-pango-incl=${STAGING_INCDIR}/pango-1.0 \
-#		--with-pango-lib=${STAGING_LIBDIR} \
-		--with-sdl-incl=${STAGING_INCDIR}/SDL \
-		--with-atk-incl=${STAGING_INCDIR}/atk-1.0 \
-		--with-Xft-incl=${STAGING_INCDIR}/X11 \
-		--with-expat-incl=${STAGING_INCDIR} \
-		--with-mad-incl=${STAGING_INCDIR} \
-		--with-cairo-incl=${STAGING_INCDIR}/cairo \
-		--with-curl-incl=${STAGING_INCDIR} \
-		--with-curl-lib=${STAGING_LIBDIR} \
-		" 
-
-inherit autotools pkgconfig
-
-LDFLAGS += " -L${STAGING_LIBDIR} -lcurl  -lboost_date_time -lboost_filesystem -lboost_iostreams -lboost_signals -lboost_thread-mt "
-CFLAGS += " -I${STAGING_INCDIR} -I${STAGING_LIBDIR}/gtk-2.0/include/ "
-
-do_configure_append() {
-        for i in `find . -name Makefile` ; do
-		sed -i s:I/usr/include:I${STAGING_INCDIR}:g $i
-	done
-}
-
-
-PARALLEL_MAKE = ""
-
-do_compile() {
-        oe_runmake 'CC=${CC}' 'LD=${LD}' 'CFLAGS=${CFLAGS}' \
-                   'ZLIB_INCLUDE=${STAGING_INCDIR}' \
-                   'ZLIB_LIBS=${STAGING_LIBDIR}' \
-		   'PNG_INCLUDE=${STAGING_INCDIR}' \	
-		   'PNG_LIBS=${STAGING_LIBDIR}'
-}
-
+                --enable-z \
+                --enable-jpeg \
+                --disable-glext \
+                --enable-Xft \
+                --enable-expat \
+                --enable-mad \
+                --enable-cairo \
+                --disable-plugin \
+                --disable-cygnal \
+                --with-top-level=${STAGING_DIR_HOST}/usr \
+                "
 
 PACKAGES =+ " libgnashamf libgnashbackend libgnashbase libgnashgeo libgnashgui libgnashplayer libgnashserver "
 
@@ -73,7 +35,4 @@ FILES_libgnashgui = "${libdir}/libgnashgui-${PV}.so"
 FILES_libgnashplayer = "${libdir}/libgnashplayer-${PV}.so"
 FILES_libgnashserver = "${libdir}/libgnashserver-${PV}.so"
 
-#do_stage() {
-#        autotools_stage_all
-#}
-
+PARALLEL_MAKE = ""
diff --git a/packages/gnash/gnash_0.8.2.bb b/packages/gnash/gnash_0.8.2.bb
new file mode 100644
index 0000000000..da4b281e94
--- /dev/null
+++ b/packages/gnash/gnash_0.8.2.bb
@@ -0,0 +1 @@
+require gnash.inc
diff --git a/packages/gtk-webcore/midori_0.0.17.bb b/packages/gtk-webcore/midori_0.0.17.bb
new file mode 100644
index 0000000000..19cc686566
--- /dev/null
+++ b/packages/gtk-webcore/midori_0.0.17.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Midori is a lightweight web browser."
+LICENSE = "GPLv2"
+
+DEPENDS = "webkit-gtk libsexy" 
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz \
+           file://webkit-update.patch;patch=1"
+
+
diff --git a/packages/gypsy/gypsy.inc b/packages/gypsy/gypsy.inc
index e3a682bae4..57f88dc3bd 100644
--- a/packages/gypsy/gypsy.inc
+++ b/packages/gypsy/gypsy.inc
@@ -5,10 +5,6 @@ DEPENDS = "glib-2.0 dbus bluez-libs"
 
 inherit autotools pkgconfig
 
-do_stage () {
-	autotools_stage_all
-}
-
 do_configure_prepend () {
 	touch ${S}/gtk-doc.make
 }
diff --git a/packages/python/python-pygtk/nodocs.patch b/packages/python/python-pygtk/nodocs.patch
new file mode 100644
index 0000000000..9b2387e959
--- /dev/null
+++ b/packages/python/python-pygtk/nodocs.patch
@@ -0,0 +1,13 @@
+Index: pygtk-2.10.4/Makefile.am
+===================================================================
+--- pygtk-2.10.4.orig/Makefile.am
++++ pygtk-2.10.4/Makefile.am
+@@ -4,7 +4,7 @@ if BUILD_GTK
+   GTK_SUBDIR = gtk
+ endif
+ 
+-SUBDIRS = codegen . $(GTK_SUBDIR) examples tests docs
++SUBDIRS = codegen . $(GTK_SUBDIR) examples tests
+ 
+ PLATFORM_VERSION = 2.0
+ 
diff --git a/packages/python/python-pygtk_2.10.4.bb b/packages/python/python-pygtk_2.10.4.bb
index 1af2093556..57dc48aa77 100644
--- a/packages/python/python-pygtk_2.10.4.bb
+++ b/packages/python/python-pygtk_2.10.4.bb
@@ -6,10 +6,11 @@ RDEPENDS = "python-shell python-pycairo python-pygobject"
 PROVIDES = "python-pygtk2"
 SRCNAME = "pygtk"
 LICENSE = "LGPL"
-PR = "ml5"
+PR = "ml6"
 
 SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.10/${SRCNAME}-${PV}.tar.bz2 \
            file://fix-gtkunixprint.patch;patch=1 \
+           file://nodocs.patch;patch=1 \
            file://acinclude.m4"
 S = "${WORKDIR}/${SRCNAME}-${PV}"