summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/machine/include/gumstix.inc5
-rw-r--r--packages/alsa/alsa-fpu.inc6
-rw-r--r--packages/alsa/alsa-lib_1.0.14.bb5
-rw-r--r--packages/alsa/alsa-state.bb2
-rw-r--r--packages/alsa/alsa-state/akita/.mtn2git_empty0
-rw-r--r--packages/alsa/alsa-state/akita/asound.state619
-rw-r--r--packages/alsa/alsa-state/c7x0/asound.state27
-rw-r--r--packages/gnome/epiphany_2.19.6.bb14
-rw-r--r--packages/gnome/libwnck_2.10.2.bb9
-rw-r--r--packages/gnome/libwnck_2.12.1.bb10
-rw-r--r--packages/gnome/libwnck_2.13.5.bb7
-rw-r--r--packages/gnome/libwnck_2.8.1.bb11
-rw-r--r--packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb4
-rw-r--r--packages/gtk+/gtk+.inc2
-rw-r--r--packages/gtk+/gtk+_2.12.0.bb4
-rw-r--r--packages/iso-codes/.mtn2git_empty0
-rw-r--r--packages/iso-codes/iso-codes_1.4.bb12
-rw-r--r--packages/linux/linux-ezx_2.6.21.bb3
-rw-r--r--packages/linux/linux-openmoko-devel/printascii.patch12
-rw-r--r--packages/linux/linux-openmoko-devel_svn.bb74
-rw-r--r--packages/linux/linux.inc23
-rw-r--r--packages/matchbox-keyboard/files/matchbox-keyboard-hide-delay.patch99
-rw-r--r--packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb5
-rw-r--r--packages/openmoko2/openmoko-sound-system2_0.1.0.bb4
-rw-r--r--packages/openmoko2/openmoko-sound-theme-standard2_svn.bb4
-rw-r--r--packages/pkgconfig/pkgconfig-0.22/sysroot-support.patch102
-rw-r--r--packages/pkgconfig/pkgconfig.inc3
27 files changed, 993 insertions, 73 deletions
diff --git a/conf/machine/include/gumstix.inc b/conf/machine/include/gumstix.inc
index afcec66c51..4f66f92cf0 100644
--- a/conf/machine/include/gumstix.inc
+++ b/conf/machine/include/gumstix.inc
@@ -12,6 +12,7 @@ module_autoload_pxamci = "pxamci"
module_autoload_mmc_block = "mmc_block"
module_autoload_gumstix_gadget = "gumstix_gadget"
module_autoload_g_ether = "g_ether"
+module_autoload_smc91x = "smc91x"
UBOOT_ENTRYPOINT = "a0008000"
@@ -20,6 +21,10 @@ MACHINE_FEATURES = "kernel26 alsa ext2 bluetooth"
EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --squash"
+# Install all kernel modules
+#MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "kernel-modules"
+
+# Install only selected kernel modules, comment out line above also
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "kernel-module-unix \
kernel-module-rtc-core \
kernel-module-rtc-dev \
diff --git a/packages/alsa/alsa-fpu.inc b/packages/alsa/alsa-fpu.inc
new file mode 100644
index 0000000000..ebd3493e6c
--- /dev/null
+++ b/packages/alsa/alsa-fpu.inc
@@ -0,0 +1,6 @@
+
+def get_alsa_fpu_setting(bb, d):
+ if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
+ return "--with-softfloat"
+ return ""
+
diff --git a/packages/alsa/alsa-lib_1.0.14.bb b/packages/alsa/alsa-lib_1.0.14.bb
index de805b9a4b..ba46342ae7 100644
--- a/packages/alsa/alsa-lib_1.0.14.bb
+++ b/packages/alsa/alsa-lib_1.0.14.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.alsa-project.org"
SECTION = "libs/multimedia"
LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
# 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,
@@ -17,6 +17,9 @@ SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \
inherit autotools pkgconfig
+require alsa-fpu.inc
+EXTRA_OECONF += "${@get_alsa_fpu_setting(bb, d)} "
+
EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes"
do_stage () {
diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb
index 55541872fa..e2a92dcfc8 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 = "r0"
+PR = "r1"
SRC_URI = " \
file://asoundrc \
diff --git a/packages/alsa/alsa-state/akita/.mtn2git_empty b/packages/alsa/alsa-state/akita/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/alsa/alsa-state/akita/.mtn2git_empty
diff --git a/packages/alsa/alsa-state/akita/asound.state b/packages/alsa/alsa-state/akita/asound.state
new file mode 100644
index 0000000000..ee5ef519c3
--- /dev/null
+++ b/packages/alsa/alsa-state/akita/asound.state
@@ -0,0 +1,619 @@
+state.Spitz {
+ control.1 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 63'
+ iface MIXER
+ name 'Capture Volume'
+ value.0 23
+ value.1 23
+ }
+ control.2 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Capture ZC Switch'
+ value.0 false
+ value.1 false
+ }
+ control.3 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Capture Switch'
+ value.0 false
+ value.1 false
+ }
+ control.4 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Headphone Playback ZC Switch'
+ value.0 false
+ value.1 false
+ }
+ control.5 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Speaker Playback ZC Switch'
+ value.0 false
+ value.1 false
+ }
+ control.6 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 None
+ comment.item.1 '32Khz'
+ comment.item.2 '44.1Khz'
+ comment.item.3 '48Khz'
+ iface MIXER
+ name 'Playback De-emphasis'
+ value None
+ }
+ control.7 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Normal
+ comment.item.1 'L Invert'
+ comment.item.2 'R Invert'
+ comment.item.3 'L + R Invert'
+ iface MIXER
+ name 'Capture Polarity'
+ value Normal
+ }
+ control.8 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Playback 6dB Attenuate'
+ value false
+ }
+ control.9 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Capture 6dB Attenuate'
+ value false
+ }
+ control.10 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 255'
+ iface MIXER
+ name 'PCM Volume'
+ value.0 255
+ value.1 255
+ }
+ control.11 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Linear Control'
+ comment.item.1 'Adaptive Boost'
+ iface MIXER
+ name 'Bass Boost'
+ value 'Linear Control'
+ }
+ control.12 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '130Hz @ 48kHz'
+ comment.item.1 '200Hz @ 48kHz'
+ iface MIXER
+ name 'Bass Filter'
+ value '130Hz @ 48kHz'
+ }
+ control.13 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'Bass Volume'
+ value 11
+ }
+ control.14 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'Treble Volume'
+ value 11
+ }
+ control.15 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '8kHz'
+ comment.item.1 '4kHz'
+ iface MIXER
+ name 'Treble Cut-off'
+ value '8kHz'
+ }
+ control.16 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name '3D Switch'
+ value false
+ }
+ control.17 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name '3D Volume'
+ value 9
+ }
+ control.18 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '200Hz'
+ comment.item.1 '500Hz'
+ iface MIXER
+ name '3D Lower Cut-off'
+ value '200Hz'
+ }
+ control.19 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '2.2kHz'
+ comment.item.1 '1.5kHz'
+ iface MIXER
+ name '3D Upper Cut-off'
+ value '2.2kHz'
+ }
+ control.20 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Capture
+ comment.item.1 Playback
+ iface MIXER
+ name '3D Mode'
+ value Playback
+ }
+ control.21 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'ALC Capture Target Volume'
+ value 3
+ }
+ control.22 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'ALC Capture Max Volume'
+ value 7
+ }
+ control.23 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Off
+ comment.item.1 Right
+ comment.item.2 Left
+ comment.item.3 Stereo
+ iface MIXER
+ name 'ALC Capture Function'
+ value Left
+ }
+ control.24 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Capture ZC Switch'
+ value false
+ }
+ control.25 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'ALC Capture Hold Time'
+ value 0
+ }
+ control.26 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'ALC Capture Decay Time'
+ value 3
+ }
+ control.27 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'ALC Capture Attack Time'
+ value 2
+ }
+ control.28 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 31'
+ iface MIXER
+ name 'ALC Capture NG Threshold'
+ value 0
+ }
+ control.29 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '2.2kHz'
+ comment.item.1 '1.5kHz'
+ iface MIXER
+ name 'ALC Capture NG Type'
+ value '2.2kHz'
+ }
+ control.30 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Capture NG Switch'
+ value false
+ }
+ control.31 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 255'
+ iface MIXER
+ name 'Left ADC Capture Volume'
+ value 195
+ }
+ control.32 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 255'
+ iface MIXER
+ name 'Right ADC Capture Volume'
+ value 0
+ }
+ control.33 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ZC Timeout Switch'
+ value false
+ }
+ control.34 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Playback Invert Switch'
+ value false
+ }
+ control.35 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Right Speaker Playback Invert Switch'
+ value true
+ }
+ control.36 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 3'
+ iface MIXER
+ name 'Mic Boost'
+ value.0 0
+ value.1 0
+ }
+ control.37 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Bypass Left Playback Volume'
+ value.0 0
+ value.1 0
+ }
+ control.38 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Bypass Right Playback Volume'
+ value.0 0
+ value.1 0
+ }
+ control.39 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Bypass Mono Playback Volume'
+ value.0 0
+ value.1 0
+ }
+ control.40 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Playback ZC Switch'
+ value false
+ }
+ control.41 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 127'
+ iface MIXER
+ name 'Headphone Playback Volume'
+ value.0 121
+ value.1 121
+ }
+ control.42 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 127'
+ iface MIXER
+ name 'Speaker Playback Volume'
+ value.0 121
+ value.1 121
+ }
+ control.43 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 127'
+ iface MIXER
+ name 'Mono Playback Volume'
+ value 0
+ }
+ control.44 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Stereo
+ comment.item.1 'Mono (Left)'
+ comment.item.2 'Mono (Right)'
+ comment.item.3 'Digital Mono'
+ iface MIXER
+ name 'Right ADC Mux'
+ value 'Mono (Left)'
+ }
+ control.45 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Stereo
+ comment.item.1 'Mono (Left)'
+ comment.item.2 'Mono (Right)'
+ comment.item.3 'Digital Mono'
+ iface MIXER
+ name 'Left ADC Mux'
+ value 'Mono (Left)'
+ }
+ control.46 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Line 1'
+ comment.item.1 'Line 2'
+ iface MIXER
+ name 'Differential Mux'
+ value 'Line 1'
+ }
+ control.47 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 VREF
+ comment.item.1 'ROUT1 + Vol'
+ comment.item.2 MonoOut
+ comment.item.3 ROUT1
+ iface MIXER
+ name 'Out3 Mux'
+ value VREF
+ }
+ control.48 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Line 1'
+ comment.item.1 'Line 2'
+ comment.item.2 'Line 3'
+ comment.item.3 PGA
+ comment.item.4 Differential
+ iface MIXER
+ name 'Right Line Mux'
+ value 'Line 2'
+ }
+ control.49 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Line 1'
+ comment.item.1 'Line 2'
+ comment.item.2 'Line 3'
+ comment.item.3 PGA
+ comment.item.4 Differential
+ iface MIXER
+ name 'Left Line Mux'
+ value 'Line 1'
+ }
+ control.50 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Line 1'
+ comment.item.1 'Line 2'
+ comment.item.2 'Line 3'
+ comment.item.3 Differential
+ iface MIXER
+ name 'Right PGA Mux'
+ value 'Line 2'
+ }
+ control.51 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Line 1'
+ comment.item.1 'Line 2'
+ comment.item.2 'Line 3'
+ comment.item.3 Differential
+ iface MIXER
+ name 'Left PGA Mux'
+ value 'Line 1'
+ }
+ control.52 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Mixer Left Playback Switch'
+ value false
+ }
+ control.53 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Mixer Left Bypass Switch'
+ value false
+ }
+ control.54 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Mixer Right Playback Switc'
+ value false
+ }
+ control.55 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Mixer Right Bypass Switch'
+ value false
+ }
+ control.56 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Right Mixer Left Playback Switc'
+ value false
+ }
+ control.57 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Right Mixer Left Bypass Switch'
+ value false
+ }
+ control.58 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Right Mixer Playback Switch'
+ value true
+ }
+ control.59 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Right Mixer Right Bypass Switch'
+ value false
+ }
+ control.60 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Left Mixer Playback Switch'
+ value true
+ }
+ control.61 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Left Mixer Left Bypass Switch'
+ value false
+ }
+ control.62 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Left Mixer Right Playback Switc'
+ value false
+ }
+ control.63 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Left Mixer Right Bypass Switch'
+ value false
+ }
+ control.64 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Headphone
+ comment.item.1 Mic
+ comment.item.2 Line
+ comment.item.3 Headset
+ comment.item.4 Off
+ iface MIXER
+ name 'Jack Function'
+ value Off
+ }
+ control.65 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 On
+ comment.item.1 Off
+ iface MIXER
+ name 'Speaker Function'
+ value On
+ }
+}
diff --git a/packages/alsa/alsa-state/c7x0/asound.state b/packages/alsa/alsa-state/c7x0/asound.state
index 7fd648fcf6..caef65c120 100644
--- a/packages/alsa/alsa-state/c7x0/asound.state
+++ b/packages/alsa/alsa-state/c7x0/asound.state
@@ -5,16 +5,16 @@ state.Corgi {
comment.count 2
comment.range '0 - 127'
iface MIXER
- name 'Playback Volume'
- value.0 103
- value.1 103
+ name 'Master Playback Volume'
+ value.0 98
+ value.1 98
}
control.2 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 2
iface MIXER
- name 'Playback Switch'
+ name 'Master Playback ZC Switch'
value.0 false
value.1 false
}
@@ -25,15 +25,15 @@ state.Corgi {
comment.range '0 - 31'
iface MIXER
name 'Capture Volume'
- value.0 23
- value.1 23
+ value.0 31
+ value.1 31
}
control.4 {
comment.access 'read write'
comment.type BOOLEAN
comment.count 2
iface MIXER
- name 'Capture Switch'
+ name 'Line Capture Switch'
value.0 false
value.1 false
}
@@ -51,7 +51,7 @@ state.Corgi {
comment.count 1
iface MIXER
name 'Capture Mic Switch'
- value true
+ value false
}
control.7 {
comment.access 'read write'
@@ -106,7 +106,7 @@ state.Corgi {
comment.count 1
iface MIXER
name 'Output Mixer Line Bypass Switch'
- value true
+ value false
}
control.13 {
comment.access 'read write'
@@ -122,7 +122,7 @@ state.Corgi {
comment.count 1
iface MIXER
name 'Output Mixer HiFi Playback Swit'
- value false
+ value true
}
control.15 {
comment.access 'read write'
@@ -141,11 +141,10 @@ state.Corgi {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
- comment.item.0 Auto
- comment.item.1 On
- comment.item.2 Off
+ comment.item.0 On
+ comment.item.1 Off
iface MIXER
name 'Speaker Function'
- value On
+ value Off
}
}
diff --git a/packages/gnome/epiphany_2.19.6.bb b/packages/gnome/epiphany_2.19.6.bb
new file mode 100644
index 0000000000..8d405628ae
--- /dev/null
+++ b/packages/gnome/epiphany_2.19.6.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "GNOME default webbrowser"
+DEPENDS = "gnome-desktop gnome-vfs libgnomeui webkit-gtk"
+RDEPENDS = "gnome-vfs-plugin-http"
+
+PR = "r1"
+
+inherit gnome
+
+EXTRA_OECONF = "--with-engine=webkit"
+
+
+FILES_${PN} += "${datadir}/icons ${datadir}/dbus-1"
+
+
diff --git a/packages/gnome/libwnck_2.10.2.bb b/packages/gnome/libwnck_2.10.2.bb
deleted file mode 100644
index 17f5c673d6..0000000000
--- a/packages/gnome/libwnck_2.10.2.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-LICENSE = "LGPL"
-DESCRIPTION = "Window navigation construction toolkit"
-HOMEPAGE = ""
-
-inherit gnome
-
-do_stage() {
- autotools_stage_all
-}
diff --git a/packages/gnome/libwnck_2.12.1.bb b/packages/gnome/libwnck_2.12.1.bb
deleted file mode 100644
index 1830a7540a..0000000000
--- a/packages/gnome/libwnck_2.12.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-LICENSE = "LGPL"
-DEPENDS = "gtk+"
-DESCRIPTION = "Window navigation construction toolkit"
-HOMEPAGE = ""
-
-inherit gnome
-
-do_stage() {
- autotools_stage_all
-}
diff --git a/packages/gnome/libwnck_2.13.5.bb b/packages/gnome/libwnck_2.13.5.bb
index 5ad3e00cbf..b176493b93 100644
--- a/packages/gnome/libwnck_2.13.5.bb
+++ b/packages/gnome/libwnck_2.13.5.bb
@@ -1,6 +1,7 @@
-LICENSE = "LGPL"
-DEPENDS = "gtk+"
-DESCRIPTION = "Window navigation construction toolkit"
+DESCRIPTION = "Window navigation construction toolkit"
+LICENSE = "LGPL"
+SECTION = "x11/libs"
+DEPENDS = "gtk+ gdk-pixbuf-csource-native"
inherit gnome
diff --git a/packages/gnome/libwnck_2.8.1.bb b/packages/gnome/libwnck_2.8.1.bb
deleted file mode 100644
index 052e20fe32..0000000000
--- a/packages/gnome/libwnck_2.8.1.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-LICENSE = "LGPL"
-DESCRIPTION = "Window navigation construction toolkit"
-HOMEPAGE = ""
-
-inherit gnome
-
-do_stage() {
- autotools_stage_includes
- install -d ${STAGING_LIBDIR}
- install -m 755 libwnck/.libs/libwnck-1.so.4.9.0 ${STAGING_LIBDIR}/libwnck-1.so
-}
diff --git a/packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb b/packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb
index 51fb846ce9..6fbc7d936f 100644
--- a/packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb
+++ b/packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb
@@ -1,6 +1,6 @@
require gtk+_${PV}.bb
inherit native
-DEPENDS = ""
+DEPENDS = "jpeg-native libpng-native"
S = "${WORKDIR}/gtk+-${PV}"
FILESPATH = "${FILE_DIRNAME}/gdk-pixbuf-csource:${FILE_DIRNAME}/gtk+-${PV}:${FILE_DIRNAME}/files"
SRC_URI += "file://reduce-dependencies.patch;patch=1"
@@ -14,6 +14,8 @@ EXTRA_OECONF = "\
--without-x \
--with-gdktarget=linux-fb \
--without-libtiff \
+ --with-libjpeg \
+ --with-libpng \
"
do_compile() {
diff --git a/packages/gtk+/gtk+.inc b/packages/gtk+/gtk+.inc
index 0805b99f39..14b5026cc6 100644
--- a/packages/gtk+/gtk+.inc
+++ b/packages/gtk+/gtk+.inc
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.gtk.org"
SECTION = "libs"
LICENSE = "LGPL"
PRIORITY = "optional"
-DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt"
+DEPENDS = "glib-2.0 tiff pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt"
inherit autotools pkgconfig
diff --git a/packages/gtk+/gtk+_2.12.0.bb b/packages/gtk+/gtk+_2.12.0.bb
index 6b724bab80..57ba24e796 100644
--- a/packages/gtk+/gtk+_2.12.0.bb
+++ b/packages/gtk+/gtk+_2.12.0.bb
@@ -1,5 +1,7 @@
require gtk+.inc
+PR = "r1"
+
DEPENDS += "cairo"
# disable per default - untested and not all patches included.
@@ -22,7 +24,7 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \
# die die die
# file://pangoxft2.10.6.diff;patch=1"
-EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration"
+EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration"
LIBV = "2.10.0"
diff --git a/packages/iso-codes/.mtn2git_empty b/packages/iso-codes/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/iso-codes/.mtn2git_empty
diff --git a/packages/iso-codes/iso-codes_1.4.bb b/packages/iso-codes/iso-codes_1.4.bb
new file mode 100644
index 0000000000..f424701f47
--- /dev/null
+++ b/packages/iso-codes/iso-codes_1.4.bb
@@ -0,0 +1,12 @@
+LICENSE = "LGPL"
+
+SRC_URI = "ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/iso-codes-${PV}.tar.bz2"
+
+inherit autotools pkgconfig
+
+FILES_${PN} += "${datadir}/xml/"
+
+do_stage() {
+ autotools_stage_all
+}
+
diff --git a/packages/linux/linux-ezx_2.6.21.bb b/packages/linux/linux-ezx_2.6.21.bb
index 2e9569f43c..3bdd13b19c 100644
--- a/packages/linux/linux-ezx_2.6.21.bb
+++ b/packages/linux/linux-ezx_2.6.21.bb
@@ -68,7 +68,6 @@ BACKLIGHTPATCH_rokre6 = ""
SRC_URI += "${BACKLIGHTPATCH}"
-
S = "${WORKDIR}/linux-${PV}"
@@ -96,7 +95,7 @@ CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_IP} ${CMDLINE_ROTATE} ${CMDL
# Uncomment to use root-over-nfs-over-usb
#CMDLINE_NFSROOT_USB = "${CMDLINE_CON} ${CMDLINE_NFSROOT} ${CMDLINE_IP} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG} ${CMDLINE_MEM}"
-# 1024x1024 is the maximum kernel size for boot-over-usb
+# 1024x1024 once was the maximum kernel size for boot-over-usb -- is it still?
#KERNEL_IMAGE_MAXSIZE = "1294336"
###############################################################
diff --git a/packages/linux/linux-openmoko-devel/printascii.patch b/packages/linux/linux-openmoko-devel/printascii.patch
new file mode 100644
index 0000000000..13a014db39
--- /dev/null
+++ b/packages/linux/linux-openmoko-devel/printascii.patch
@@ -0,0 +1,12 @@
+Index: linux-2.6.22.5/kernel/printk.c
+===================================================================
+--- linux-2.6.22.5.orig/kernel/printk.c
++++ linux-2.6.22.5/kernel/printk.c
+@@ -535,6 +535,7 @@ asmlinkage int vprintk(const char *fmt,
+
+ /* Emit the output into the temporary buffer */
+ printed_len = vscn