summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2009-04-14 10:06:25 +0200
committerMarcin Juszkiewicz <hrw@openembedded.org>2009-04-14 10:06:25 +0200
commit6382819648d3f3d76f886abd821e959283394493 (patch)
treee9ad45862b0d38d63df5668367da355fb5c89b3d
parent3b82e8b272aa03f2cb454b4c8ea171cd7f5c4057 (diff)
parent18ef4a1270454f9f47f03c3692366c863793a6e5 (diff)
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
-rw-r--r--conf/checksums.ini58
-rw-r--r--conf/distro/angstrom-2008.1.conf1
-rw-r--r--conf/machine/include/zaurus-clamshell.inc4
-rw-r--r--recipes/asterisk/asterisk-1.4.23.1/Makefile.patch (renamed from packages/asterisk/asterisk-1.4.23.1/Makefile.patch)0
-rw-r--r--recipes/asterisk/asterisk-1.4.23.1/init (renamed from packages/asterisk/asterisk-1.4.23.1/init)0
-rw-r--r--recipes/asterisk/asterisk-1.4.23.1/logrotate (renamed from packages/asterisk/asterisk-1.4.23.1/logrotate)0
-rw-r--r--recipes/asterisk/asterisk-1.4.23.1/sounds.xml.patch (renamed from packages/asterisk/asterisk-1.4.23.1/sounds.xml.patch)0
-rw-r--r--recipes/asterisk/asterisk-1.4.23.1/volatiles (renamed from packages/asterisk/asterisk-1.4.23.1/volatiles)0
-rw-r--r--recipes/asterisk/asterisk_1.4.23.1.bb (renamed from packages/asterisk/asterisk_1.4.23.1.bb)0
-rw-r--r--recipes/bluez/bluez4_4.35.bb66
-rw-r--r--recipes/bluez/obexd_0.10.bb10
-rw-r--r--recipes/freesmartphone/cornucopia.inc15
-rw-r--r--recipes/freesmartphone/enter_0.0.2.bb10
-rw-r--r--recipes/freesmartphone/fsodeviced_git.bb15
-rw-r--r--recipes/freesmartphone/fsogsmd_git.bb2
-rw-r--r--recipes/freesmartphone/libfsoframework_git.bb16
-rw-r--r--recipes/freesmartphone/pylgrim_svn.bb25
-rw-r--r--recipes/gdbm/gdbm_1.8.3.bb4
-rw-r--r--recipes/gnome/gnome-bluetooth_2.27.1.bb14
-rw-r--r--recipes/gnome/gnome-bluetooth_2.27.3.bb17
-rw-r--r--recipes/gnome/gnome-menus_2.26.0.bb15
-rw-r--r--recipes/gnome/gnome-panel_2.24.0.bb5
-rw-r--r--recipes/gnome/gvfs_1.2.1.bb21
-rw-r--r--recipes/gstreamer/gst-plugins-base_0.10.22.bb4
-rw-r--r--recipes/gtk-webcore/midori.inc1
-rw-r--r--recipes/gtk-webcore/midori_0.1.5.bb2
-rw-r--r--recipes/linux/linux-2.6.28/atngw100/defconfig (renamed from recipes/linux/linux-2.6.28/atngw100/atngw100_defconfig)519
-rw-r--r--recipes/linux/linux_2.6.28.bb2
-rw-r--r--recipes/nautilus/nautilus/no-try-run-strftime.diff28
-rw-r--r--recipes/nautilus/nautilus_2.26.1.bb37
-rw-r--r--recipes/obexftp/obexftp_0.23.bb27
-rw-r--r--recipes/openobex/obex-data-server_0.4.4.bb11
-rw-r--r--recipes/openobex/openobex-1.5/libusb_crosscompile_check.patch11
-rw-r--r--recipes/openobex/openobex_1.5.bb22
-rw-r--r--recipes/packagekit/gnome-packagekit_2.27.1.bb (renamed from recipes/packagekit/gnome-packagekit_0.2.5.bb)2
-rw-r--r--recipes/packagekit/packagekit_0.4.6.bb (renamed from recipes/packagekit/packagekit_0.4.5.bb)7
-rw-r--r--recipes/wxwidgets/wxwidgets-unicode_2.8.10.bb29
-rw-r--r--recipes/wxwidgets/wxwidgets.inc5
-rw-r--r--recipes/wxwidgets/wxwidgets_2.8.10.bb (renamed from recipes/wxwidgets/wxwidgets_2.8.9.bb)0
-rw-r--r--recipes/zope/python-zopeinterface_3.5.1.bb4
40 files changed, 576 insertions, 433 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 3d3005a14d..ea23aa6c24 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -662,6 +662,10 @@ sha256=4d8187c484a28c32f843b929b244bb2da07d74f7fdc2c49f843a555464f75236
md5=a335d299bb7e14d910c600d0975dd375
sha256=84eb13052bf4d41c26bf689f4bf58cb8036b9846f0d1693073b89e3d125793f3
+[http://www.packagekit.org/releases/PackageKit-0.4.6.tar.gz]
+md5=66ef4281047ad51f499ec05420028f11
+sha256=4e44eb7be990cb62e57840f4b01b6c9af06c4655869d0cb565fc45749c20b82e
+
[http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Params-Util-0.20.tar.gz]
md5=33c4466239c97cc3e1063eff0577206c
sha256=29f7e05045a5699b211d2a8332d36113c22f9c2e96174f40939e79dbc356905d
@@ -2706,6 +2710,14 @@ sha256=5a2e6e83062699fb01babfb5b211054e01dde097d3b31767135be5447bb05bde
md5=53a3347a1c38971bee4c4016b45bcf6d
sha256=f6cfceb541a10849805f853b790bc8343309e7b21078a9c18a7a6a8cf2f94e3b
+[http://www.kernel.org/pub/linux/bluetooth/bluez-4.34.tar.gz]
+md5=2435f7a932cdeecce01211e06142795f
+sha256=1c46b6e219aec9bbd3286e9366de7e6dd05f68ed33b7487fbd211397c890fc40
+
+[http://www.kernel.org/pub/linux/bluetooth/bluez-4.35.tar.gz]
+md5=5919d6383cd9446f8b90fdca748dc961
+sha256=e5e592de95f50a1569d3e4a95c8b955a2535e265e24869e3ce30e19b0949b465
+
[http://www.kernel.org/pub/linux/bluetooth/bluez-4.7.tar.gz]
md5=2aa806940d2c841e57a9b2ab7302b750
sha256=ed384dea4f5f21157758fcd7db64db19ce0b410509c26630706e4a3c779287a0
@@ -8014,6 +8026,10 @@ sha256=b3ef17eb05308e35e1627e5ca56b6951e9aea69cf112164ef698cdad6f44ed23
md5=1816a0d21ef99d5b3a8bcd033c88f732
sha256=f19ac5af961be1d6244f9526311af8a67518c7403ef71209dcee94b68f77d58e
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-menus/2.26/gnome-menus-2.26.0.tar.bz2]
+md5=55fd07e67d8334de2e03e4e23c011452
+sha256=84a97b6d74b14e27888a0f54759e570cb701400c5b176471871bc08a6acafb15
+
[http://ftp.gnome.org/pub/GNOME/sources/gnome-mime-data/2.18/gnome-mime-data-2.18.0.tar.bz2]
md5=541858188f80090d12a33b5a7c34d42c
sha256=37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7
@@ -8034,6 +8050,10 @@ sha256=015f415748fa90d51b2bfd2dd41906ee918eb4e5d900d7b6b3ac698e4016e5c0
md5=05b03bd236a5bda56ea85122f356a68f
sha256=ff507ea3421f410ab0faf59b6146f65fa073b01c556f017ce211557b51ba3804
+[http://www.packagekit.org/releases/gnome-packagekit-2.27.1.tar.gz]
+md5=7a38bcdfda3e712365f674c51565e845
+sha256=1d77646aa7291dcf8e5ab78955f5e5755faac982e795fa70f7ecf5aa98da6f9e
+
[http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.10/gnome-panel-2.10.1.tar.bz2]
md5=a2719f5c79a9e48bca086f08a77a6889
sha256=dc60f7f6e9b9ce52ad4e2ce1f7d6dca643590e86e49c749d513d9f8a25068a7a
@@ -9866,6 +9886,10 @@ sha256=67e7dd1dca32a99eb1102a853d2df1bac782d50a4361511409572cfe8ea51147
md5=a41e8b7d99e390cef8312f7ce5f312a5
sha256=17eccded6e096208181e2c7625802526112af23f5b2c7b2a672ab9ccff3a55fd
+[http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.2/gvfs-1.2.1.tar.bz2]
+md5=df8f624587adfabe7009838ce6d8d5fd
+sha256=0e3c3469721ff1d4296bf4af7e1f131201d2dc6a36c772d99e1630f8cce31da2
+
[http://sebdelestaing.free.fr/gweled/Release/gweled-0.5.tar.gz]
md5=238f5ef66317bb24c3d4018a7d1e9ec3
sha256=d5baec578b22407e3fc78cc47393942f9704f1ab7b8d1c012577037d3421f90e
@@ -14866,11 +14890,7 @@ sha256=ae0d97c55efe7fce01273c97f8152af0deff5541e3bbf5b9ad98689112b54380
md5=64921b5ff5cdadbccfcd3820f03be7d8
sha256=58a5ea16d499fe06f90fcbf1d687d1235d2cb9bc28bf979867bd3faadf38fc3f
-[http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.30-rc1.bz2]
-md5=05daeda25430fd13bbdb47b3481f7320
-sha256=5ed217591fefb043f4deb7b66a9b6351195dfb9405c0d2f5ec0f4d43a30aa9b2
-
-[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.9.tar.bz2]
+[http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.9.tar.bz2]
md5=e921200f074ca97184e150ef5a4af825
sha256=f5dba6366e87e91234d1b0069cfea655b0a4cb37ea97f899226f16998e6ab9f1
@@ -16714,6 +16734,10 @@ sha256=48f1d25af102d216fdc2ebcd6396ffce963558c119b88730dc02fb1c158fcc4c
md5=783e5f7be6391d6c46b4725e38af475a
sha256=a793ebe4245656f0ae23d5a87895555182f62943e02e9667303ad20c4e690c1d
+[http://ftp.gnome.org/pub/GNOME/sources/nautilus/2.26/nautilus-2.26.1.tar.bz2]
+md5=5d75f5de2806e9003e36a4613866b8d1
+sha256=86c8839ad5c8a1c5674eb3617bbe15e9c9bb2358a7435a0e2d22cd25ab7718ff
+
[http://ftp.gnome.org/pub/GNOME/sources/nautilus/2.6/nautilus-2.6.1.tar.bz2]
md5=50c5732c0c9736b7026bce1c6b0007dc
sha256=83f1d6623e142af30a9b3fa9135ecf973fbb8c89f1dc36a218de0c0fef6ddf07
@@ -17142,6 +17166,14 @@ sha256=c80d9ea7ebca32b63ea23d2a52ac799cff32f8f30c66b491d2b8f93da05585e4
md5=b79146369fc76a61d6d4056a937c71c8
sha256=b69a259795762881a5384072085bb501d77c6fb974e0b7a16ca573565ffe3629
+[http://tadas.dailyda.com/software/obex-data-server-0.4.4.tar.gz]
+md5=4aad0182812c770dde21246522be9f5e
+sha256=aa567d986c74a4c8b4abb1cc454c099f67ab01b049b4c69aa6e703c7f18b594d
+
+[http://www.kernel.org/pub/linux/bluetooth/obexd-0.10.tar.gz]
+md5=b9fbc1386b24f59b36aeb9d764c11fb5
+sha256=8ed452371010117e183ade4e1e3ae4b489485b792722bf3b97b817cf0ed66ac8
+
[http://downloads.sourceforge.net/openobex/obexftp-0.20.tar.gz]
md5=085b9edc0504c0d79e7479a54e2018c5
sha256=7246fc75257afcd30ff16dc70185057157bcefc12fa9fba111b3b201577cc40e
@@ -17158,6 +17190,10 @@ sha256=09687012d5e016277fa638f22b8c784aea6803056c70d14614e3b75158aae877
md5=d167cfdea244e3a5f973a7b16864419c
sha256=09687012d5e016277fa638f22b8c784aea6803056c70d14614e3b75158aae877
+[http://downloads.sourceforge.net/openobex/obexftp-0.23.tar.bz2]
+md5=f20762061b68bc921e80be4aebc349eb
+sha256=44a74ff288d38c0f75354d6bc2efe7d6dec10112eaff2e7b10e292b0d2105b36
+
[http://www.caside.lancs.ac.uk/bt/obexpush.tar.gz]
md5=edb66ba97fe6c84b6160c670c4bcdea8
sha256=341c6865aa392b6cf056e1bd9cda53d2f31a942460087ad22d6f6dc91bb0bd0e
@@ -17402,6 +17438,10 @@ sha256=3a80ba2524c66a46db3ac17a788a759015a1f79de6a495fcdf3a316e19fe7c23
md5=feaa5dfe5151c0e70e8f868fa4648a43
sha256=3a80ba2524c66a46db3ac17a788a759015a1f79de6a495fcdf3a316e19fe7c23
+[http://www.kernel.org/pub/linux/bluetooth/openobex-1.5.tar.gz]
+md5=0d83dc86445a46a1b9750107ba7ab65c
+sha256=e602047570799a47ecb028420bda8f2cef41310e5a99d084de10aa9422935e65
+
[http://www.openpbx.org/releases/openpbx.org-1.2_rc3.tar.gz]
md5=e270c40626dfa2131cc39dd1352b46f9
sha256=934e1e5438c46927236f1f3254265e94c7e38e7c0e02d92abb7efc4e03ce91e9
@@ -18142,6 +18182,10 @@ sha256=e5ad0ec9b0facaab5982a0d48534292e6d3a6a3e6dca60e798e8b8eeda2f8a8e
md5=26f67d99666834cc579094619821d3c8
sha256=035bbd4c1ac9c5b3a42e58777446e0370ca66d9258dc30a9f4c5ad48ebfacd65
+[http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.30-rc1.bz2]
+md5=05daeda25430fd13bbdb47b3481f7320
+sha256=5ed217591fefb043f4deb7b66a9b6351195dfb9405c0d2f5ec0f4d43a30aa9b2
+
[http://www.muru.com/linux/omap/patches/patch-2.6.9-omap1.bz2]
md5=d6249654087f0bcafaa860ac573316a4
sha256=91806347cb386002a8bfd20ee66e536e4a7dfb01f207dd751341f2971090d9ac
@@ -23794,6 +23838,10 @@ sha256=b31c3bc4e85e7f972db1dfb7b447d213694569e2a5794a84116295c334a11f43
md5=43cbe5c7508f7dc3e141c346a897fbe7
sha256=b31c3bc4e85e7f972db1dfb7b447d213694569e2a5794a84116295c334a11f43
+[http://downloads.sourceforge.net/wxwindows/wxWidgets-2.8.10.tar.gz]
+md5=05b32ca051651f4b1885a90f62969faf
+sha256=4a65573bc12e15b21a4acdce89e7e6b71edbe214817457f90fcf855220bafe66
+
[http://downloads.sourceforge.net/wxwindows/wxWidgets-2.8.9.tar.gz]
md5=3ad40ea2b1728eefa94f60beb9951ff7
sha256=9b4096bb1e273914adf101182c27d457f46fcc44d1b3ea027bae3d34ace8c6f7
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index e3e36d5c59..37cb8f068a 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -163,6 +163,7 @@ PREFERRED_PROVIDER_ntp ?= "ntp"
PREFERRED_PROVIDER_hotplug = "udev"
PREFERRED_PROVIDER_libxss = "libxss"
PREFERRED_PROVIDER_bluez-utils-dbus = "bluez-utils"
+PREFERRED_PROVIDER_bluez-libs = "bluez4"
# we don't ship gtk-directfb by default
PREFERRED_PROVIDER_gtk+ ?= "gtk+"
diff --git a/conf/machine/include/zaurus-clamshell.inc b/conf/machine/include/zaurus-clamshell.inc
index 714380e9aa..cc58c4a48b 100644
--- a/conf/machine/include/zaurus-clamshell.inc
+++ b/conf/machine/include/zaurus-clamshell.inc
@@ -1,7 +1,7 @@
include conf/machine/include/tune-xscale.inc
-UBOOT_ENTRYPOINT = "0x80008000"
-UBOOT_LOADADDRESS = "0x80008000"
+UBOOT_ENTRYPOINT = "0xA0008000"
+UBOOT_LOADADDRESS = "0xA0008000"
EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700"
KEXECBOOT_IMAGEDEPENDS += "sharp-flash-header-c700"
diff --git a/packages/asterisk/asterisk-1.4.23.1/Makefile.patch b/recipes/asterisk/asterisk-1.4.23.1/Makefile.patch
index 98345f4dce..98345f4dce 100644
--- a/packages/asterisk/asterisk-1.4.23.1/Makefile.patch
+++ b/recipes/asterisk/asterisk-1.4.23.1/Makefile.patch
diff --git a/packages/asterisk/asterisk-1.4.23.1/init b/recipes/asterisk/asterisk-1.4.23.1/init
index d53a9a1e5e..d53a9a1e5e 100644
--- a/packages/asterisk/asterisk-1.4.23.1/init
+++ b/recipes/asterisk/asterisk-1.4.23.1/init
diff --git a/packages/asterisk/asterisk-1.4.23.1/logrotate b/recipes/asterisk/asterisk-1.4.23.1/logrotate
index dfd25ee55c..dfd25ee55c 100644
--- a/packages/asterisk/asterisk-1.4.23.1/logrotate
+++ b/recipes/asterisk/asterisk-1.4.23.1/logrotate
diff --git a/packages/asterisk/asterisk-1.4.23.1/sounds.xml.patch b/recipes/asterisk/asterisk-1.4.23.1/sounds.xml.patch
index 2a02bf6b38..2a02bf6b38 100644
--- a/packages/asterisk/asterisk-1.4.23.1/sounds.xml.patch
+++ b/recipes/asterisk/asterisk-1.4.23.1/sounds.xml.patch
diff --git a/packages/asterisk/asterisk-1.4.23.1/volatiles b/recipes/asterisk/asterisk-1.4.23.1/volatiles
index c68e786c90..c68e786c90 100644
--- a/packages/asterisk/asterisk-1.4.23.1/volatiles
+++ b/recipes/asterisk/asterisk-1.4.23.1/volatiles
diff --git a/packages/asterisk/asterisk_1.4.23.1.bb b/recipes/asterisk/asterisk_1.4.23.1.bb
index f9f8399021..f9f8399021 100644
--- a/packages/asterisk/asterisk_1.4.23.1.bb
+++ b/recipes/asterisk/asterisk_1.4.23.1.bb
diff --git a/recipes/bluez/bluez4_4.35.bb b/recipes/bluez/bluez4_4.35.bb
new file mode 100644
index 0000000000..fec1411d00
--- /dev/null
+++ b/recipes/bluez/bluez4_4.35.bb
@@ -0,0 +1,66 @@
+DESCRIPTION = "Linux Bluetooth Stack Userland V4"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "gst-plugins-base alsa-lib libusb-compat dbus-glib"
+HOMEPAGE = "http://www.bluez.org"
+LICENSE = "GPL"
+
+# For angstrom we want this to replace at least bluez-libs
+PROVIDES_append_angstrom = " bluez-libs"
+
+PR = "r1"
+
+SRC_URI = "\
+ http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \
+ file://fix-dfutool-usb-declaration-mismatch.patch;patch=1 \
+ file://sbc-thumb.patch;patch=1 \
+ file://bluetooth.conf \
+"
+S = "${WORKDIR}/bluez-${PV}"
+
+inherit autotools_stage
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+EXTRA_OECONF = "\
+ --enable-gstreamer \
+ --enable-alsa \
+ --enable-usb \
+ --enable-netlink \
+ --enable-tools \
+ --enable-bccmd \
+ --enable-hid2hci \
+ --enable-dfutool \
+ --enable-hidd \
+ --enable-pandd \
+ --enable-dund \
+ --disable-cups \
+ --enable-test \
+ --enable-manpages \
+ --enable-configfiles \
+ --enable-initscripts \
+ --disable-pcmciarules \
+"
+
+do_install_append() {
+ install -m 0644 ${S}/audio/audio.conf ${D}/${sysconfdir}/bluetooth/
+ install -m 0644 ${S}/network/network.conf ${D}/${sysconfdir}/bluetooth/
+ install -m 0644 ${S}/input/input.conf ${D}/${sysconfdir}/bluetooth/
+ # at_console doesn't really work with the current state of OE, so punch some more holes so people can actually use BT
+ install -m 0644 ${WORKDIR}/bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/
+}
+
+PACKAGES =+ "gst-plugin-bluez libasound-module-bluez"
+
+FILES_gst-plugin-bluez = "${libdir}/gstreamer-0.10/lib*.so"
+FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so"
+FILES_${PN} += "${libdir}/bluetooth/plugins/*.so"
+FILES_${PN}-dev += "\
+ ${libdir}/bluetooth/plugins/*.la \
+ ${libdir}/alsa-lib/*.la \
+ ${libdir}/gstreamer-0.10/*.la \
+"
+
+FILES_${PN}-dbg += "\
+ ${libdir}/bluetooth/plugins/.debug \
+ ${libdir}/*/.debug \
+"
diff --git a/recipes/bluez/obexd_0.10.bb b/recipes/bluez/obexd_0.10.bb
new file mode 100644
index 0000000000..e1cc6ce8ff
--- /dev/null
+++ b/recipes/bluez/obexd_0.10.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "OBEX Server and Client"
+DEPENDS = "openobex glib-2.0 dbus bluez4"
+
+LICENSE = "GPLv2"
+
+SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/obexd-${PV}.tar.gz"
+
+inherit autotools_stage
+
+FILES_${PN} += "${datadir}/dbus-1/"
diff --git a/recipes/freesmartphone/cornucopia.inc b/recipes/freesmartphone/cornucopia.inc
new file mode 100644
index 0000000000..c3bf018369
--- /dev/null
+++ b/recipes/freesmartphone/cornucopia.inc
@@ -0,0 +1,15 @@
+DESCRIPTION = "The freesmartphone.org API reference implementation (FSO 2.0)"
+AUTHOR = "Team FSO"
+LICENSE = "LGPL"
+SECTION = "devel"
+DEPENDS = "vala-native glib-2.0 dbus dbus-glib"
+PV = "0.0.0.0+gitr${SRCREV}"
+
+SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia;protocol=git;branch=master"
+S = "${WORKDIR}/git/${PN}"
+
+inherit autotools_stage pkgconfig vala
+
+FILES_${PN} += "${sysconfdir} ${datadir}"
+# ship vapi files
+FILES_${PN}-dev += "${datadir}/vala"
diff --git a/recipes/freesmartphone/enter_0.0.2.bb b/recipes/freesmartphone/enter_0.0.2.bb
deleted file mode 100644
index 2a51af6506..0000000000
--- a/recipes/freesmartphone/enter_0.0.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-DESCRIPTION = "An easy-to-use virtual keyboard for small touchscreen displays"
-SECTION = "openmoko/inputmethods"
-DEPENDS = "ecore evas edje"
-PR = "r0"
-
-inherit autotools
-
-SRC_URI = "http://gstaedtner.net/projects/enter/enter.tar.gz"
-
-FILES_${PN} += "${datadir}"
diff --git a/recipes/freesmartphone/fsodeviced_git.bb b/recipes/freesmartphone/fsodeviced_git.bb
index 4cb61c7c29..cb3e1586db 100644
--- a/recipes/freesmartphone/fsodeviced_git.bb
+++ b/recipes/freesmartphone/fsodeviced_git.bb
@@ -1,13 +1,2 @@
-DESCRIPTION = "Reference implementation of the org.freesmartphone.Device.* APIs"
-SECTION = "console/network"
-DEPENDS = "libfsoframework"
-LICENSE = "GPL"
-PV = "0.0.0.0+gitr${SRCREV}"
-PR = "r0"
-
-SRC_URI = "\
- ${FREESMARTPHONE_GIT}/cornucopia;protocol=git;branch=master \
-"
-S = "${WORKDIR}/git/fsodeviced"
-
-inherit autotools fso-plugin vala
+require cornucopia.inc
+inherit fso-plugin
diff --git a/recipes/freesmartphone/fsogsmd_git.bb b/recipes/freesmartphone/fsogsmd_git.bb
new file mode 100644
index 0000000000..cb3e1586db
--- /dev/null
+++ b/recipes/freesmartphone/fsogsmd_git.bb
@@ -0,0 +1,2 @@
+require cornucopia.inc
+inherit fso-plugin
diff --git a/recipes/freesmartphone/libfsoframework_git.bb b/recipes/freesmartphone/libfsoframework_git.bb
index 7b03e17041..2fb01bfeb2 100644
--- a/recipes/freesmartphone/libfsoframework_git.bb
+++ b/recipes/freesmartphone/libfsoframework_git.bb
@@ -1,17 +1,3 @@
+require cornucopia.inc
DESCRIPTION = "freesmartphone.org support library"
-LICENSE = "GPL"
-SECTION = "devel"
-DEPENDS = "vala-native glib-2.0 dbus dbus-glib"
-PV = "0.0.0.0+gitr${SRCREV}"
-PR = "r0"
-SRC_URI = "\
- ${FREESMARTPHONE_GIT}/cornucopia;protocol=git;branch=master \
-"
-S = "${WORKDIR}/git/libfsoframework"
-
-inherit autotools_stage pkgconfig
-
-FILES_${PN} += "${sysconfdir} ${datadir}"
-# ship vapi files
-FILES_${PN}-dev += "${datadir}/vala"
diff --git a/recipes/freesmartphone/pylgrim_svn.bb b/recipes/freesmartphone/pylgrim_svn.bb
deleted file mode 100644
index beeb44c110..0000000000
--- a/recipes/freesmartphone/pylgrim_svn.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION = "A GPS moving map application featuring OpenStreetMap tiles"
-HOMEPAGE = "http://neo1973-germany.de/wiki/pylgrim"
-AUTHOR = "Josch"
-LICENSE = "GPL"
-SECTION = "x11/navigation"
-DEPENDS = "edje-native"
-RDEPENDS = "task-python-efl python-textutils"
-PV = "0.0+svnr${SRCREV}"
-PE = "1"
-
-SRC_URI = "svn://neo1973-germany.de/svn;module=pylgrim;proto=http"
-S = "${WORKDIR}/pylgrim"
-
-do_compile() {
- edje_cc pylgrim.edc
-}
-
-do_install() {
- install -d ${D}${datadir}/pylgrim
- for i in *.py pylgrim.edj; do
- install -m 0755 $i ${D}${datadir}/pylgrim/
- done
-}
-
-FILES_${PN} += "${datadir}"
diff --git a/recipes/gdbm/gdbm_1.8.3.bb b/recipes/gdbm/gdbm_1.8.3.bb
index f3beb47b41..883022ebfa 100644
--- a/recipes/gdbm/gdbm_1.8.3.bb
+++ b/recipes/gdbm/gdbm_1.8.3.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
PRIORITY = "optional"
LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \
file://makefile.patch;patch=1 \
@@ -12,6 +12,8 @@ SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \
inherit autotools
+TARGET_CC_ARCH += "${LDFLAGS}"
+
do_stage () {
oe_libinstall -so -a libgdbm ${STAGING_LIBDIR}
install -m 0644 ${S}/gdbm.h ${STAGING_INCDIR}/
diff --git a/recipes/gnome/gnome-bluetooth_2.27.1.bb b/recipes/gnome/gnome-bluetooth_2.27.1.bb
deleted file mode 100644
index 9a435c7f9c..0000000000
--- a/recipes/gnome/gnome-bluetooth_2.27.1.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-LICENSE = "GPL"
-SECTION = "x11/gnome"
-
-PR = "r1"
-
-inherit autotools gnome pkgconfig
-
-DEPENDS = "gconf-dbus gtk+ dbus-glib libunique libnotify hal bluez4 gnome-keyring"
-RCONFLICTS_${PN} = "bluez-gnome"
-
-do_configure_prepend() {
- sed -i -e s:docs::g ${S}/Makefile.am
-}
-
diff --git a/recipes/gnome/gnome-bluetooth_2.27.3.bb b/recipes/gnome/gnome-bluetooth_2.27.3.bb
new file mode 100644
index 0000000000..8fd8318a12
--- /dev/null
+++ b/recipes/gnome/gnome-bluetooth_2.27.3.bb
@@ -0,0 +1,17 @@
+LICENSE = "GPL"
+SECTION = "x11/gnome"
+
+inherit autotools gnome pkgconfig
+
+SRC_URI = "svn://svn.gnome.org/svn/${PN};module=tags/GNOMEBT_V_2_27_3;rev=596;proto=http"
+S = "${WORKDIR}/tags/GNOMEBT_V_2_27_3"
+
+DEPENDS = "obexd obex-data-server gconf-dbus gtk+ dbus-glib libunique libnotify hal bluez4 gnome-keyring"
+RRECOMMENDS_${PN} += "obexd obex-data-server"
+RCONFLICTS_${PN} = "bluez-gnome"
+
+do_configure_prepend() {
+ sed -i -e s:docs::g ${S}/Makefile.am
+ echo "EXTRA_DIST = version.xml" > gtk-doc.make
+}
+
diff --git a/recipes/gnome/gnome-menus_2.26.0.bb b/recipes/gnome/gnome-menus_2.26.0.bb
new file mode 100644
index 0000000000..5837e7fed2
--- /dev/null
+++ b/recipes/gnome/gnome-menus_2.26.0.bb
@@ -0,0 +1,15 @@
+DEPENDS = "python gnome-vfs libxml2 gconf popt gtk+"
+LICENSE = "GPL"
+
+inherit gnome pkgconfig
+
+do_stage() {
+autotools_stage_all
+}
+
+PACKAGES += "${PN}-python"
+FILES_${PN} += "${datadir}/desktop-directories/"
+FILES_${PN}-python = "${libdir}/python*"
+FILES_${PN}-dbg += "${libdir}/python*/site-packages/*/.debug \
+ ${libdir}/python*/site-packages/.debug"
+
diff --git a/recipes/gnome/gnome-panel_2.24.0.bb b/recipes/gnome/gnome-panel_2.24.0.bb
index 743e0fafd7..473bea405c 100644
--- a/recipes/gnome/gnome-panel_2.24.0.bb
+++ b/recipes/gnome/gnome-panel_2.24.0.bb
@@ -5,6 +5,8 @@ inherit gnome pkgconfig
SRC_URI += "file://scrollkeeper.patch;patch=1"
+SRC_URI += "file://idl-sysroot.patch;patch=1"
+
do_configure_prepend() {
sed -i -e s:help:: ${S}/Makefile.am
}
@@ -16,7 +18,8 @@ FILES_libpanel-applet = "${libdir}/libpanel-applet-2.so.*"
FILES_${PN} =+ "${datadir}/gnome* \
${datadir}/icons"
-EXTRA_OEMAKE = "ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2"
+export SYSROOT = "${STAGING_DIR_HOST}"
+EXTRA_OEMAKE = "ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2 SYSROOT=${SYSROOT}"
EXTRA_OECONF = "--disable-scrollkeeper"
do_stage() {
diff --git a/recipes/gnome/gvfs_1.2.1.bb b/recipes/gnome/gvfs_1.2.1.bb
new file mode 100644
index 0000000000..399cce67e7
--- /dev/null
+++ b/recipes/gnome/gvfs_1.2.1.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "gvfs is a userspace virtual filesystem"
+LICENSE = "LGPL"
+DEPENDS = "gnome-keyring glib-2.0 obexftp fuse avahi fuse hal gconf-dbus samba gphoto2"
+
+inherit gnome
+
+EXTRA_OECONF = "--enable-samba --with-archive-includes=${STAGING_INCDIR}"
+
+PACKAGES =+ "gvfsd-ftp gvfsd-sftp gvfsd-trash"
+
+FILES_${PN} += "${datadir}/dbus-1/services/* ${libdir}/gio/modules/*.so"
+FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/*"
+FILES_${PN}-dev += "${libdir}/gio/modules/*.la"
+
+FILES_gvfsd-ftp = "${libexecdir}/gvfsd-ftp ${sysconfdir}/gvfs/mounts/ftp.mount"
+FILES_gvfsd-sftp = "${libexecdir}/gvfsd-sftp ${sysconfdir}/gvfs/mounts/sftp.mount"
+FILES_gvfsd-trash = "${libexecdir}/gvfsd-trash ${sysconfdir}/gvfs/mounts/trash.mount"
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/recipes/gstreamer/gst-plugins-base_0.10.22.bb b/recipes/gstreamer/gst-plugins-base_0.10.22.bb
index 92f2f56fa3..3086d93ffd 100644
--- a/recipes/gstreamer/gst-plugins-base_0.10.22.bb
+++ b/recipes/gstreamer/gst-plugins-base_0.10.22.bb
@@ -2,11 +2,11 @@ require gst-plugins.inc
PROVIDES += "gst-plugins"
-PR = "r1"
+PR = "r2"
# gst-plugins-base only builds the alsa plugin
# if alsa has been built and is present. You will
# not get an error if this is not present, just
# a missing alsa plugin
-DEPENDS += "alsa-lib libsm virtual/libx11 freetype gnome-vfs libxv"
+DEPENDS += "libtheora alsa-lib libsm virtual/libx11 freetype gnome-vfs libxv"
diff --git a/recipes/gtk-webcore/midori.inc b/recipes/gtk-webcore/midori.inc
index a241157c58..a7ed936da3 100644
--- a/recipes/gtk-webcore/midori.inc
+++ b/recipes/gtk-webcore/midori.inc
@@ -9,3 +9,4 @@ SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz"
EXTRA_OECONF = " --disable-hildon "
+TARGET_CC_ARCH += "${LDFLAGS}"
diff --git a/recipes/gtk-webcore/midori_0.1.5.bb b/recipes/gtk-webcore/midori_0.1.5.bb
index c1d1f66fe7..61ecb080ff 100644
--- a/recipes/gtk-webcore/midori_0.1.5.bb
+++ b/recipes/gtk-webcore/midori_0.1.5.bb
@@ -1,5 +1,7 @@
require midori.inc
+PR = "r1"
+
DEPENDS += "python-native python-docutils-native"
SRC_URI = "http://goodies.xfce.org/releases/midori/midori-${PV}.tar.bz2 \
diff --git a/recipes/linux/linux-2.6.28/atngw100/atngw100_defconfig b/recipes/linux/linux-2.6.28/atngw100/defconfig
index b4f78d0794..cc40243403 100644
--- a/recipes/linux/linux-2.6.28/atngw100/atngw100_defconfig
+++ b/recipes/linux/linux-2.6.28/atngw100/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.27.10
-# Tue Jan 6 09:24:25 2009
+# Linux kernel version: 2.6.28
+# Sun Apr 12 11:36:16 2009
#
CONFIG_AVR32=y
CONFIG_GENERIC_GPIO=y
@@ -29,22 +29,24 @@ CONFIG_EXPERIMENTAL=y
CONFIG_BROKEN_ON_SMP=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_LOCALVERSION=""
-# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_LOCALVERSION_AUTO=y
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
CONFIG_SYSVIPC_SYSCTL=y
CONFIG_POSIX_MQUEUE=y
CONFIG_BSD_PROCESS_ACCT=y
CONFIG_BSD_PROCESS_ACCT_V3=y
-# CONFIG_TASKSTATS is not set
-# CONFIG_AUDIT is not set
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+# CONFIG_TASK_XACCT is not set
+CONFIG_AUDIT=y
# CONFIG_IKCONFIG is not set
CONFIG_LOG_BUF_SHIFT=14
# CONFIG_CGROUPS is not set
# CONFIG_GROUP_SCHED is not set
CONFIG_SYSFS_DEPRECATED=y
CONFIG_SYSFS_DEPRECATED_V2=y
-# CONFIG_RELAY is not set
+CONFIG_RELAY=y
# CONFIG_NAMESPACES is not set
CONFIG_BLK_DEV_INITRD=y
CONFIG_INITRAMFS_SOURCE=""
@@ -68,25 +70,17 @@ CONFIG_SIGNALFD=y
CONFIG_TIMERFD=y
CONFIG_EVENTFD=y
CONFIG_SHMEM=y
+CONF