Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev

3 files changed, 95 insertions, 2 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 2dcb04380d..a8df27ced0 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -3538,6 +3538,10 @@ sha256=827acee89ba3e8e762fbb23165cf8d455e7d95e1e50984e6882b2070a7f3abae
 md5=5d862facfbd0098c9bae618b61f7c8e6
 sha256=a137ccd4a6cde6c9e9553966534702d2e7f6f44c755dfe128d9fb26ed2697fe7
 
+[http://cairographics.org/releases/cairomm-1.8.2.tar.gz]
+md5=24aa46a4f92bdb2af7cd80e6b335f07f
+sha256=9bf111528227dd414926ecc51e4a7a155a1c8640b919d41950beea5e0a9563af
+
 [http://gpephone.linuxtogo.org/download/gpephone/calendar-1.0/calendar-1.0.tar.gz]
 md5=eb7be3b85955a1bbe7a0154cbf2f70f9
 sha256=7e6425b688a2d4bbeef0904cac52737b232d03fdc4d35866fd03359f2d5f1794
@@ -6618,6 +6622,10 @@ sha256=a24640d8ca9c485d7611880193f18e5ae62af07e3b9464904f3602277f1d4097
 md5=414181781fb0923f884a38503e8e56da
 sha256=270e2e423a0b8e90091fd6f38422c488b67a23494d671764b9ed2e17ca802e16
 
+[http://pypi.python.org/packages/source/f/flup/flup-1.0.2.tar.gz]
+md5=24dad7edc5ada31dddd49456ee8d5254
+sha256=4bad317a5fc1ce3d4fe5e9b6d846ec38a8023e16876785d4f88102f2c8097dd9
+
 [http://pypi.python.org/packages/source/f/flup/flup-1.0.tar.gz]
 md5=530801fe835fd9a680457e443eb95578
 sha256=dd943b9746997bb6e49820187998dd26a58b2d0f886a45c166209e6d7d35aa32
@@ -8382,6 +8390,10 @@ sha256=ca6c46b87748cabd61e7d5ef892f09f433eaea324e63637f7de1f0217465cd31
 md5=3d0f763e408a71700090fff4d3dd110c
 sha256=5fb1f4f68625811a70fb580b945c2f93925569591af5444eb074aed6956366ca
 
+[ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/2.22/glibmm-2.22.1.tar.bz2]
+md5=1a96c7fde75ddbb421bc23fb4aa7adba
+sha256=f105ff4afdcdf7da7f310affdbe698058958f01e94ab65ac1c35e46e20ecb6c0
+
 [ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/2.8/glibmm-2.8.4.tar.bz2]
 md5=952cdde2d6aef201c528d431036d71e1
 sha256=7ff592b6687caefa367b33d8cb8f66f3c0273fa86d4b688c0758d0d9fee7a2cb
@@ -8750,6 +8762,10 @@ sha256=8823fe08890b287684c3c16fe06d1be4a3c299bd8bcd9a5ca49063ce8a88a9ef
 md5=02d01f1cca7ff3af511c59198f3c35a7
 sha256=4cefb2afa08d8e75c1273980e2cad0e13f4b872e2f90019f1ac0d75ec9fa41b7
 
+[http://gnome-mplayer.googlecode.com/files/gnome-mplayer-0.9.8.tar.gz]
+md5=540630654db044198c435f32c04b1b53
+sha256=b275bae3f75e95e5b4e8b7596a7a362ba0ff9e5028e715540e4215bc8781af60
+
 [http://www.packagekit.org/releases/gnome-packagekit-0.2.3.tar.gz]
 md5=eb12e6eea8413d35c033aedee61b89ee
 sha256=015f415748fa90d51b2bfd2dd41906ee918eb4e5d900d7b6b3ac698e4016e5c0
@@ -10630,6 +10646,10 @@ sha256=4e58c9ad827759a2375b3c0d39952b5b2983111ab16ee329b10a34792fb1d9eb
 md5=0209b424987a74c956ea6b70fddaaa37
 sha256=f8675340d929346333b5a58cd4d05482dd8b76cf8606fed85b526022bf9c5e47
 
+[http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.18/gtkmm-2.18.1.tar.bz2]
+md5=7b36f7ea10f183d14b20cad8c1f70daa
+sha256=142fdf93ba3daa344517807e0270aed6ef57f8248556195ff18e2913cf33a625
+
 [http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.4/gtkmm-2.4.8.tar.bz2]
 md5=c2aee4c259a75fa0dc766d402bef253b
 sha256=218420f1c091846fa5f860e5f12c57650d8719f6cf9b922e7c6a69e0505aac32
@@ -12306,6 +12326,10 @@ sha256=a758c8f9b55d8288e2484dd1a2dcbd9c4ca3ca3052864a45cb104f613b7f712d
 md5=b4f7ffcc294d41a6a4c40d6e44b7734d
 sha256=280b34fefa12c3d7a3e432c3730fe5d0d56e8d169c28b695cce9ba6d8dbe6e38
 
+[http://www.kernel.org/pub/linux/kernel/people/horms/kexec-tools/kexec-tools-2.0.0.tar.gz]
+md5=bf87c53f36b4454ad3cc50aa9c72faf3
+sha256=f8244b8c4691faf0c9765ec3acba730a5620c8077f9bed667b9ac835dd959ba2
+
 [http://www.kernel.org/pub/linux/kernel/people/horms/kexec-tools/kexec-tools-2.0.1.tar.gz]
 md5=a7710a89fb0096002bccc57ab202a874
 sha256=95f352870df977271d912b6093f034bd3345e47a157493db96d1047b7654564d
@@ -18818,6 +18842,10 @@ sha256=09ffe451256fafdd74d4dc35ed153b93c81328c397d36872cca1f0104877caca
 md5=d894c176818a33d34a04b21386798c4f
 sha256=b1fb3bad0c8581b82f0da9c69673f43ad9aed7868a7e4f2a68c6c72ed656237b
 
+[http://downloads.sourceforge.net/opalvoip/opal-3.6.6.tar.bz2]
+md5=43b363c860780e7f1a0361cfee8f9f4a
+sha256=60c9d75703bedfeca7140cb76b23fae7179ce1f86e7e8b0026b72d66acd75c82
+
 [http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz]
 md5=641cf53761f35ee979f3e888614797a0
 sha256=723e2c57c3cdffa7ff11f9b6b5478d6cb4af017e5a1ee7a56032969c39c1c2fe
@@ -19462,6 +19490,10 @@ sha256=97cc77b93ce65e4f138e284f799c9ae7153b6f81720553c3c120b7317692b537
 md5=85be0a654ed521e5594f64efdb3fa7d8
 sha256=211a0092cfd50923eaad75c20630c0a1818e56605d4b6fbc10702d5a34ea7107
 
+[ftp://ftp.gnome.org/pub/GNOME/sources/pangomm/2.26/pangomm-2.26.0.tar.bz2]
+md5=37f54dc8e6cb73ed923b22f313352156
+sha256=bf26ebe42c12c81e5c32ceca80ff226a01c8d80d4db2a4cc3463d5bf241b095e
+
 [http://xlibs.freedesktop.org/release/panoramixext-1.1.tar.bz2]
 md5=129f8623dc4f70188a015e3cbd7eae82
 sha256=74188aff5f2e5b77515a8cf3979199a598d58da8e4f573462b59cbf94cf1c99d
@@ -20666,6 +20698,10 @@ sha256=941ead5179f5bab8dd6e81806b6e52120dc5b98c6ced8128df24639af1eabedd
 md5=bcc8e2d5bb6be7e3fea857ce2f7fce5c
 sha256=22eae4f6c72247f8ac79c57ce4469797ad3df67614758c5096b7ce9290bd10b4
 
+[http://downloads.sourceforge.net/opalvoip/ptlib-2.6.5.tar.bz2]
+md5=db7fd581b66998cd76d96f8b7c3f22a1
+sha256=78e290d3cf78d4dc15c7397b0edd138b4d29cf2ad0a7311bfc1c4dfb88f2a400
+
 [http://pypi.python.org/packages/source/p/ptrace/ptrace-0.3.2.tar.gz]
 md5=8108c2474bef16d126e956dce3c5073b
 sha256=634fe75e195179adafb6218040724f38252bd0fc8f796bb3e3e9bdba065890c5
@@ -24434,6 +24470,10 @@ sha256=3bc5bf49ed02a3d93b4b9b71c7814960e972c1bde4e9fb83b2cd500c83ae4a9a
 md5=9c1b5d84fb9ddbbd50b5776c1cd6daa4
 sha256=edd775e06e66dc775ca8272bbd2e47ac4fef6fcb884ccc1001589343fd9d0866
 
+[http://mirrors.m0k.org/transmission/files/transmission-1.75.tar.bz2]
+md5=ec09b76ca941f5c389d8dd4f469f1fa6
+sha256=a01bcf7718876d96eeb423a58247b89158bf0bc5d2bed414009e5fb83ff76c9e
+
 [http://xorg.freedesktop.org/releases/individual/proto/trapproto-3.4.3.tar.bz2]
 md5=3b713239e5e6b269b31cb665563358df
 sha256=ff32a0d3bc696cadc3457be9c85e9818af2b6daa2f159188bb01aad7e932a0e1
@@ -25842,6 +25882,10 @@ sha256=fd21224ec09ca5294ba0627433e4d2cb726d389c7818d162f152374e6d693342
 md5=25fcaa86a53333d416d5e837fb47ba7d
 sha256=18b38aff8e019f35bfee810831535685e69dcf91283e50bc62efa82e3a8dbc21
 
+[http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20090928-2245.tar.bz2]
+md5=99870531113dafd01026c01a96c5fcbb
+sha256=8b435c02ed0a09d039c0a89c8ddc5470e1885630a5dcedfe3d8bc60a6d63ab69
+
 [http://archive.apache.org/dist/xml/xalan-j/xalan-j_2_7_1-src.tar.gz]
 md5=fc805051f0fe505c7a4b1b5c8db9b9e3
 sha256=fa52aa629bb882335d45d67401d270c3f21b5131aaea005ac0d4590f2ce8b043
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 03e5c8ec23..83cf820f9b 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -8,11 +8,11 @@ PREFERRED_VERSION_dropbear      = "0.51"
 PREFERRED_VERSION_fontconfig	= "2.6.0"
 PREFERRED_VERSION_glib-2.0 	= "2.22.0"
 PREFERRED_VERSION_glib-2.0-native = "2.22.0"
-PREFERRED_VERSION_glibmm = "2.18.0"
+PREFERRED_VERSION_glibmm = "2.22.1"
 PREFERRED_VERSION_glproto	= "1.4.9"
 PREFERRED_VERSION_gst-pulse 	= "0.9.7"
 PREFERRED_VERSION_gtk+		= "2.18.0"
-PREFERRED_VERSION_gtkmm		= "2.14.1"
+PREFERRED_VERSION_gtkmm		= "2.18.1"
 PREFERRED_VERSION_hal		= "0.5.13"
 PREFERRED_VERSION_libgemwidget	= "1.0"
 PREFERRED_VERSION_libgpephone	= "0.4"
diff --git a/conf/machine/omap4430-sdp.conf b/conf/machine/omap4430-sdp.conf
new file mode 100644
index 0000000000..efa9c814bb
--- /dev/null
+++ b/conf/machine/omap4430-sdp.conf
@@ -0,0 +1,49 @@
+#@TYPE: Machine
+#@NAME: OMAP4430 SDP
+#@DESCRIPTION: Machine configuration for the OMAP4430 SDP
+TARGET_ARCH = "arm"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+XSERVER = "xserver-xorg \
+           xf86-input-evdev \
+           xf86-input-mouse \
+           xf86-input-tslib \
+           xf86-video-fbdev \
+           xf86-input-keyboard"
+
+# Only has DVI connector for external screen
+GUI_MACHINE_CLASS = "bigscreen"
+
+# Use omap3 include for the time being
+require conf/machine/include/omap3.inc
+
+IMAGE_FSTYPES += "tar.bz2"
+EXTRA_IMAGECMD_jffs2 = "-lnp "
+
+# Guesswork
+SERIAL_CONSOLE = "115200 ttyS2"
+
+UBOOT_MACHINE = "omap3_beagle_config"
+
+# Copied from beagle config, needs checking:
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# From dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: logical eraseblock size:    129024 bytes
+# from ubiattach stdout:
+# UBI device number 0, total 1996 LEBs
+MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996"
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# from dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: physical eraseblock size:   131072 bytes (128 KiB)
+# UBI: sub-page size:              512
+UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
+
+
+PREFERRED_VERSION_u-boot = "git"
+
+# and sdio
+MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa"