diff options
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 = vscnprintf(printk_buf, sizeof(printk_buf), fmt, args); ++ printascii(printk_buf); + + /* + * Copy the output into log_buf. If the caller didn't provide diff --git a/packages/linux/linux-openmoko-devel_svn.bb b/packages/linux/linux-openmoko-devel_svn.bb index eca9a337ac..869e4a88b6 100644 --- a/packages/linux/linux-openmoko-devel_svn.bb +++ b/packages/linux/linux-openmoko-devel_svn.bb @@ -1,11 +1,71 @@ DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/ OpenMoko" +VANILLA_VERSION = "2.6.22.5" +PV = "${VANILLA_VERSION}-moko11+svnr${SRCREV}" +PR = "r1" -require linux-openmoko.inc +KERNEL_IMAGETYPE = "uImage" +UBOOT_ENTRYPOINT = "30008000" -SRC_URI += "svn://svn.openmoko.org/trunk/src/target/kernel;module=patches;proto=http" -SRC_URI += "file://fix-EVIOCGRAB-semantics-2.6.22.5.patch;patch=1" +require linux.inc + +############################################################## +# source and patches +# +SRCREV_FORMAT = "patches" + +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \ + svn://svn.openmoko.org/trunk/src/target/kernel;module=patches;proto=http;name=patches \ + file://fix-EVIOCGRAB-semantics-2.6.22.5.patch;patch=1 \ +# file://printascii.patch;patch=1 \ + file://defconfig \ + file://logo_linux_clut224.ppm" +S = "${WORKDIR}/linux-${VANILLA_VERSION}" + +############################################################## +# kernel image resides on a seperate flash partition (for now) +# +FILES_kernel-image = "" +ALLOW_EMPTY = "1" + +COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = 'fic-gta01|fic-gta02' + +CMDLINE = "unused -- bootloader passes ATAG list" + +############################################################### +# module configs specific to this kernel +# + +# usb +module_autoload_ohci-hcd = "ohci-hcd" +module_autoload_hci_usb = "hci_usb" +module_autoload_g_ether = "g_ether" +# audio +module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753" +# sd/mmc +module_autoload_s3cmci = "s3cmci" + +do_prepatch() { + mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av + mv patches patches.openmoko + mv .pc .pc.old +} + +addtask prepatch after do_unpack before do_patch + +############################################################### +# put into deploy directory and append u-boot header +# +do_deploy() { + install -d ${DEPLOY_DIR_IMAGE} + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}.bin + tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${PR}-${MACHINE}.tgz -C ${D} lib + ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin + rm -f linux.bin.gz + gzip -9 linux.bin + ${STAGING_BINDIR_NATIVE}/uboot-mkimage -A arm -O linux -T kernel -C gzip -a 30008000 -e 30008000 -n "OpenMoko Kernel Image Neo1973" \ + -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin + ln -sf ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin ${DEPLOY_DIR_IMAGE}/uImage-${MACHINE}-latest.bin + rm -f linux.bin.gz +} -VANILLA_VERSION = "2.6.22.5" -MOKOR = "moko11+svnr${SRCREV}" -PV = "${VANILLA_VERSION}-${MOKOR}" -PR = "r0" diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc index 4fef1f98ef..7579481005 100644 --- a/packages/linux/linux.inc +++ b/packages/linux/linux.inc @@ -58,20 +58,29 @@ do_configure_prepend() { < '${WORKDIR}/defconfig' >>'${S}/.config' # - # root-over-nfs-over-usbgadget support. Limited, but should cover some cases. - # Note that you need to have a proper CMDLINE_NFSROOT_USB set for this to work. + # root-over-nfs-over-usb-eth support. Limited, but should cover some cases. + # Enable this by setting a proper CMDLINE_NFSROOT_USB. # if [ ! -z "${CMDLINE_NFSROOT_USB}" ]; then - oenote "Configuring the kernel for root-over-nfs-over-usbgadget with CMDLINE ${CMDLINE_NFSROOT_USB}" + oenote "Configuring the kernel for root-over-nfs-over-usb-eth with CMDLINE ${CMDLINE_NFSROOT_USB}" + sed -e '/CONFIG_INET/d' \ + -e '/CONFIG_IP_PNP=/d' \ + -e '/CONFIG_USB_GADGET=/d' \ + -e '/CONFIG_USB_GADGET_SELECTED=/d' \ + -e '/CONFIG_USB_ETH=/d' \ + -e '/CONFIG_NFS_FS=/d' \ + -e '/CONFIG_ROOT_NFS=/d' \ + -e '/CONFIG_CMDLINE=/d' \ + -i ${S}/.config echo "CONFIG_INET=y" >> ${S}/.config echo "CONFIG_IP_PNP=y" >> ${S}/.config echo "CONFIG_USB_GADGET=y" >> ${S}/.config + echo "CONFIG_USB_GADGET_SELECTED=y" >> ${S}/.config echo "CONFIG_USB_ETH=y" >> ${S}/.config echo "CONFIG_NFS_FS=y" >> ${S}/.config echo "CONFIG_ROOT_NFS=y" >> ${S}/.config echo "CONFIG_CMDLINE=\"${CMDLINE_NFSROOT_USB}\"" >> ${S}/.config fi - yes '' | oe_runmake oldconfig } @@ -111,14 +120,14 @@ do_deploy() { ${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin uboot-mkimage -A ${ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin rm -f linux.bin - else - ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin + else + ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin rm -f linux.bin.gz gzip -9 linux.bin uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin rm -f linux.bin.gz fi - fi + fi } do_deploy[dirs] = "${S}" diff --git a/packages/matchbox-keyboard/files/matchbox-keyboard-hide-delay.patch b/packages/matchbox-keyboard/files/matchbox-keyboard-hide-delay.patch new file mode 100644 index 0000000000..c8cb76d99e --- /dev/null +++ b/packages/matchbox-keyboard/files/matchbox-keyboard-hide-delay.patch @@ -0,0 +1,99 @@ +Index: matchbox-keyboard/src/matchbox-keyboard.h +=================================================================== +--- matchbox-keyboard/src/matchbox-keyboard.h (revision 1669) ++++ matchbox-keyboard/src/matchbox-keyboard.h (working copy) +@@ -285,7 +285,7 @@ + void + mb_kbd_remote_init (MBKeyboardUI *ui); + +-void ++int + mb_kbd_remote_process_xevents (MBKeyboardUI *ui, XEvent *xevent); + + /**** Keyboard ****/ +Index: matchbox-keyboard/src/matchbox-keyboard-ui.c +=================================================================== +--- matchbox-keyboard/src/matchbox-keyboard-ui.c (revision 1669) ++++ matchbox-keyboard/src/matchbox-keyboard-ui.c (working copy) +@@ -1096,6 +1096,8 @@ + /* Key repeat - values for standard xorg install ( xset q) */ + int repeat_delay = 100 * 10000; + int repeat_rate = 30 * 1000; ++ int hide_delay = 100 * 1000; ++ int to_hide = 0; + + int press_x = 0, press_y = 0; + +@@ -1182,11 +1184,42 @@ + mb_kbd_xembed_process_xevents (ui, &xev); + + if (ui->is_daemon) +- mb_kbd_remote_process_xevents (ui, &xev); +- ++ { ++ switch (mb_kbd_remote_process_xevents (ui, &xev)) ++ { ++ case 0: ++ if (to_hide == 1) { ++ mb_kbd_ui_hide(ui); ++ } ++ tvt.tv_usec = hide_delay; ++ to_hide = 1; ++ break; ++ case 1: ++ mb_kbd_ui_show(ui); ++ tvt.tv_usec = repeat_delay; ++ to_hide = 0; ++ break; ++ default: ++ if (to_hide == 1) { ++ mb_kbd_ui_hide(ui); ++ tvt.tv_usec = repeat_delay; ++ to_hide = 0; ++ } ++ break; ++ } ++ } + } + else + { ++ /* Hide timed out */ ++ if (to_hide == 1) ++ { ++ DBG("Hide timed out, calling mb_kbd_ui_hide"); ++ mb_kbd_ui_hide(ui); ++ tvt.tv_usec = repeat_delay; ++ to_hide = 0; ++ } ++ + /* Keyrepeat */ + if (mb_kbd_get_held_key(ui->kbd) != NULL) + { +Index: matchbox-keyboard/src/matchbox-keyboard-remote.c +=================================================================== +--- matchbox-keyboard/src/matchbox-keyboard-remote.c (revision 1669) ++++ matchbox-keyboard/src/matchbox-keyboard-remote.c (working copy) +@@ -28,7 +28,7 @@ + "_MB_IM_INVOKER_COMMAND", False); + } + +-void ++int + mb_kbd_remote_process_xevents (MBKeyboardUI *ui, XEvent *xevent) + { + DBG("got a message\n"); +@@ -42,9 +42,12 @@ + DBG("got a message of type _MB_IM_INVOKER_COMMAND, val %i\n", + xevent->xclient.data.l[0]); + if (xevent->xclient.data.l[0] == 1) +- mb_kbd_ui_show (ui); ++ { ++ return 1; ++ } + else +- mb_kbd_ui_hide (ui); ++ return 0; + } + } ++ return -1; + } diff --git a/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb b/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb index b7ef698938..16d5f0e2e6 100644 --- a/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb +++ b/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb @@ -6,11 +6,12 @@ RPROVIDES_${PN} = matchbox-keyboard #DEFAULT_PREFERENCE = "-1" SECTION = "x11" PV = "0.0+svnr${SRCREV}" -PR = "r4" +PR = "r5" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-keyboard;proto=http \ file://matchbox-keyboard-applet.patch;patch=1;pnum=0 \ - file://80matchboxkeyboard" + file://80matchboxkeyboard \ + file://matchbox-keyboard-hide-delay.patch;patch=1" SRC_URI_append_fic-gta01 = " file://fic-gta01-font-size.patch;patch=1" diff --git a/packages/openmoko2/openmoko-sound-system2_0.1.0.bb b/packages/openmoko2/openmoko-sound-system2_0.1.0.bb index 46397afa9b..35bfe66318 100644 --- a/packages/openmoko2/openmoko-sound-system2_0.1.0.bb +++ b/packages/openmoko2/openmoko-sound-system2_0.1.0.bb @@ -10,7 +10,9 @@ RDEPENDS = "\ pulseaudio-module-native-protocol-unix \ pulseaudio-module-cli-protocol-unix \ " -PR = "r0" +RREPLACES = "openmoko-sound-system" +RPROVIDES = "openmoko-sound-system" +PR = "r1" inherit openmoko-base update-rc.d diff --git a/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb b/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb index a8b41ed318..0693b9bb8a 100644 --- a/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb +++ b/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb @@ -1,7 +1,9 @@ DESCRIPTION = "Standard sound theme for the OpenMoko distribution" SECTION = "openmoko/base" +RREPLACES = "openmoko-sound-theme-standard" +RPROVIDES = "openmoko-sound-theme-standard" PV = "0.1+svnr${SRCREV}" -PR = "r0" +PR = "r1" inherit openmoko2 autotools diff --git a/packages/pkgconfig/pkgconfig-0.22/sysroot-support.patch b/packages/pkgconfig/pkgconfig-0.22/sysroot-support.patch new file mode 100644 index 0000000000..2e4f796cc9 --- /dev/null +++ b/packages/pkgconfig/pkgconfig-0.22/sysroot-support.patch @@ -0,0 +1,102 @@ +Add support for PKG_CONFIG_SYSROOT_DIR to pkgconfig + +--- + main.c | 5 ++++- + pkg-config.1 | 9 +++++++++ + pkg.c | 14 +++++++++++++- + pkg.h | 3 +++ + 4 files changed, 29 insertions(+), 2 deletions(-) + +Index: pkg-config-0.22/main.c +=================================================================== +--- pkg-config-0.22.orig/main.c 2007-09-14 10:20:15.000000000 +0100 ++++ pkg-config-0.22/main.c 2007-09-14 10:22:41.000000000 +0100 +@@ -46,6 +46,8 @@ + static int want_debug_spew = 0; + static int want_verbose_errors = 0; + static int want_stdout_errors = 0; ++char *pcsysrootdir = NULL; ++ + + void + debug_spew (const char *format, ...) +@@ -196,7 +198,7 @@ main (int argc, char **argv) + GString *str; + GSList *packages = NULL; + char *search_path; +- char *pcbuilddir; ++ char *pcbuilddir; + const char *pkglibdir; + char **search_dirs; + char **iter; +@@ -345,6 +347,7 @@ main (int argc, char **argv) + } + } + #endif ++ pcsysrootdir = getenv ("PKG_CONFIG_SYSROOT_DIR"); + + pcbuilddir = getenv ("PKG_CONFIG_TOP_BUILD_DIR"); + if (pcbuilddir) +Index: pkg-config-0.22/pkg.c +=================================================================== +--- pkg-config-0.22.orig/pkg.c 2007-09-14 10:20:15.000000000 +0100 ++++ pkg-config-0.22/pkg.c 2007-09-14 10:22:41.000000000 +0100 +@@ -479,11 +479,23 @@ string_list_to_string (GSList *list) + GSList *tmp; + GString *str = g_string_new (""); + char *retval; ++ int offset=0; + + tmp = list; + while (tmp != NULL) + { +- g_string_append (str, tmp->data); ++ if (pcsysrootdir != NULL) ++ { ++ if (!strncmp(tmp->data,"-I",2) || ++ !strncmp(tmp->data,"-L",2)) ++ { ++ offset=2; ++ g_string_append_c (str,((char*)tmp->data)[0]); ++ g_string_append_c (str,((char*)tmp->data)[1]); ++ g_string_append (str,pcsysrootdir); ++ } ++ } ++ g_string_append (str, tmp->data+offset); + g_string_append_c (str, ' '); + + tmp = g_slist_next (tmp); +Index: pkg-config-0.22/pkg-config.1 +=================================================================== +--- pkg-config-0.22.orig/pkg-config.1 2007-09-14 10:20:15.000000000 +0100 ++++ pkg-config-0.22/pkg-config.1 2007-09-14 10:23:08.000000000 +0100 +@@ -260,6 +260,15 @@ Don't strip -I/usr/include out of cflags + Don't strip -L/usr/lib out of libs + + .TP ++.I "PKG_CONFIG_SYSROOT_DIR" ++Modify -I and -L to use the directories located in target sysroot. ++this option is usefull when crosscompiling package that use pkg-config ++to determine CFLAGS anf LDFLAGS. -I and -L are modified to point to ++the new system root. this means that a -I/usr/include/libfoo will ++become -I/var/target/usr/include/libfoo with a PKG_CONFIG_SYSROOT_DIR ++equal to /var/target (same rule apply to -L) ++ ++.TP + .I "PKG_CONFIG_LIBDIR" + Replaces the default \fIpkg-config\fP search directory. + +Index: pkg-config-0.22/pkg.h +=================================================================== +--- pkg-config-0.22.orig/pkg.h 2007-09-14 10:20:15.000000000 +0100 ++++ pkg-config-0.22/pkg.h 2007-09-14 10:22:41.000000000 +0100 +@@ -123,6 +123,9 @@ void disable_private_libs(void); + /* If TRUE, do not automatically prefer uninstalled versions */ + extern gboolean disable_uninstalled; + ++/* string that contain environment */ ++extern char* pcsysrootdir; ++ + #ifdef G_OS_WIN32 + /* If TRUE, do not automatically define "prefix" while + * parsing each .pc file */ diff --git a/packages/pkgconfig/pkgconfig.inc b/packages/pkgconfig/pkgconfig.inc index 47c077a8d3..ed9e7e69af 100644 --- a/packages/pkgconfig/pkgconfig.inc +++ b/packages/pkgconfig/pkgconfig.inc @@ -5,9 +5,10 @@ It replaces the ubiquitous *-config scripts you may have \ seen with a single tool." HOMEPAGE = "http://pkg-config.freedesktop.org/wiki/" LICENSE = "GPL" -PR = "r1" +PR = "r2" SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz \ + file://sysroot-support.patch;patch=1 \ file://glibconfig-sysdefs.h" S = "${WORKDIR}/pkg-config-${PV}/" |