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

7 files changed, 52 insertions, 7 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 6d025702e2..c735e690d7 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -2946,6 +2946,10 @@ sha256=4999d3054a04e6cf4847a72316e32e9e98e6152b1fd72adc87d15e305f990f27
 md5=32b0df93b285ee094e053552d9301cb6
 sha256=eb9f4b4b5973f444d16920201dfea217fb30542fea23107cf80a1f189408b321
 
+[http://install.tarball.in.source.dir/codec_engine_2_21.tar.gz]
+md5=6cacb7db6eb61c64395be4ddc737095d
+sha256=d391829686eb002ace3ffbfed75c35e877b42c1884c9359791634b5b57126797
+
 [http://install.tarball.in.source.dir/codec_engine_2_21_00_06.tar.gz]
 md5=d8f3bbfbcc337d9776991d9561f451f3
 sha256=773ce12045ce98c3be4b1845547435f1b7798996fa3170dea72c7c15aa5ca79d
@@ -4414,6 +4418,10 @@ sha256=4dcbdbd253b1978dcd70452780d7804ade912f4ede90f122f30d5322f53c5c3e
 md5=4e353edd6481f67ee534a40d4b7f3b8c
 sha256=c424e6dd5cc0d998a311f5c49835de9803da4dbcb74ca7fbda29c1b953bf6d6b
 
+[http://ftp.gnome.org/pub/GNOME/sources/evince/2.24/evince-2.24.1.tar.bz2]
+md5=ad0e463ab1fe596fc52c03403a9b9f1e
+sha256=d8803313e2a0b3fa3fe20fe613ac3ec85ec6848d5d446dd02e9cc5be8194f65c
+
 [http://enlightenment.freedesktop.org/files/ewl-0.0.4.007.tar.gz]
 md5=29bc8aec80b53480c2ea53aea1796e15
 sha256=0a0dba00517013082b8e094b4b7753162cf5fb71a170eb54cbc2eaa35717d5f6
@@ -6502,6 +6510,10 @@ sha256=af2ebf32fe93817e06333b94d3fabcf72fa5675f402c1bbdb7bed3be0b3b3a3e
 md5=23bf4e795725a74ebb37daacda784adb
 sha256=3105dfb490c187adbe1c14582daa5a134ec672c396af3dd4e0e29cc9fbb4a6ea
 
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-games/2.25/gnome-games-2.25.1.tar.bz2]
+md5=886ab09752d3b420b744865342f07eb0
+sha256=a29eca01be141a9208ef2be3dc497d05faf4d2c0ca3e3d9edeec611ca3388b28
+
 [http://ftp.gnome.org/pub/GNOME/sources/gnome-games/2.6/gnome-games-2.6.1.tar.bz2]
 md5=6ea145547bfd8aa828b22cbbe34cbedf
 sha256=d7a823601f569589437d671d12b1b12f53abc08aeb7d25280bb3242299353086
@@ -19992,10 +20004,6 @@ sha256=b8e200ae66c20897c9aaa80b0044e638a0016d3bdb6e67560fd61f1ef162f305
 
 [http://downloads.sourceforge.net/wesnoth/wesnoth-1.4.5.tar.bz2]
 md5=09b7b76d4a4eedf502f38df9d551d827
-sha256=
-
-[http://heanet.dl.sourceforge.net/wesnoth/wesnoth-1.4.5.tar.bz2]
-md5=09b7b76d4a4eedf502f38df9d551d827
 sha256=ce4b00b85fd26cbb7b7362b405648f422d3c228df4236eac8ce2f464182cf750
 
 [ftp://ftp.gnu.org/gnu/wget/wget-1.9.1.tar.gz]
@@ -22594,6 +22602,10 @@ sha256=9a0687812eaceaccc21d55dead47f1fbecf8300a28604bd2c08aae6ff7874cd0
 md5=d16f5a033f001c9069b4141194614da2
 sha256=2f36880bffaee0a5b2b704376a02b22066b6842445e1d77da698854e5973eb21
 
+[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.5.3.tar.bz2]
+md5=308971036e25250e7fe3cccfd5a120f8
+sha256=a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/xserver/xorg-server-X11R7.0-1.0.1.tar.bz2]
 md5=0e7527480fb845a3c2e333bd0f47ff50
 sha256=0419124e1bab473f8f9e2d7de1dba8bae2ed1375b72d55cdfb9471dac357ed47
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index cf668e9e0f..cc5be470d2 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -105,8 +105,8 @@ ANGSTROM_GCC_VERSION_avr32		?= "4.2.2"
 
 #Everybody else can just use this: 
 ANGSTROM_GCC_VERSION 			?= "4.2.4"
-PREFERRED_VERSION_binutils-cross 	?= "2.19"
-PREFERRED_VERSION_binutils-cross-sdk 	?= "2.19"
+PREFERRED_VERSION_binutils-cross 	?= "2.18.50.0.7"
+PREFERRED_VERSION_binutils-cross-sdk 	?= "2.18.50.0.7"
 
 PREFERRED_VERSION_gcc                    ?= "${ANGSTROM_GCC_VERSION}"
 PREFERRED_VERSION_gcc-cross              ?= "${ANGSTROM_GCC_VERSION}"
@@ -116,6 +116,7 @@ PREFERRED_VERSION_gcc-cross-intermediate ?= "${ANGSTROM_GCC_VERSION}"
 
 #Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom
 require conf/distro/include/preferred-e-versions.inc
+require conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
 require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
 
 #avr32 only has patches for binutils 2.17 in OE
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index c1dc088ead..e58eb40519 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -28,4 +28,3 @@ PREFERRED_VERSION_pulseaudio 	= "0.9.10"
 PREFERRED_VERSION_tiff 		= "3.8.2+4.0.0beta2"
 PREFERRED_VERSION_udev 		= "124"
 PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
-PREFERRED_VERSION_xserver-xorg  = "1.5.1"
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 48cbb49d2c..5d250074c5 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -21,6 +21,32 @@ CACHE = "${TMPDIR}/cache/${ANGSTROM_MODE}/${MACHINE}"
 DEPLOY_DIR = "${TMPDIR}/deploy/${ANGSTROM_MODE}"
 require conf/distro/include/angstrom-${ANGSTROM_MODE}.inc
 
+# ARM920T and up can use thumb mode to decrease binary size at the expense of speed
+# (the complete story is a bit more nuanced due to cache starvation)
+# Angstrom turns on thumb for armv4t machine according to this RFC:
+# http://lists.linuxtogo.org/pipermail/angstrom-distro-devel/2008-October/002714.html
+
+# We can't do ARM_INSTRUCTION_SET_armv4t since that will un-overridable in recipes like gcc
+ANGSTROM_ARM_INSTRUCTION_SET ?= "arm"
+ANGSTROM_ARM_INSTRUCTION_SET_armv4t = "thumb"
+
+ARM_INSTRUCTION_SET = "${ANGSTROM_ARM_INSTRUCTION_SET}"
+# "arm" "thumb"
+#    The instruction set the compiler should use when generating application
+#    code.  The kernel is always compiled with arm code at present.  arm code
+#    is the original 32 bit ARM instruction set, thumb code is the 16 bit
+#    encoded RISC sub-set.  Thumb code is smaller (maybe 70% of the ARM size)
+#    but requires more instructions (140% for 70% smaller code) so may be
+#    slower.
+
+THUMB_INTERWORK = "yes"
+# "yes" "no"
+#    Whether to compile with code to allow interworking between the two
+#    instruction sets.  This allows thumb code to be executed on a primarily
+#    arm system and vice versa.  It is strongly recommended that DISTROs not
+#    turn this off - the actual cost is very small.
+
+
 #Use this variable in feeds and other parts that need a URI
 ANGSTROM_URI ?= "http://www.angstrom-distribution.org"
 
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
new file mode 100644
index 0000000000..cf999a2a4d
--- /dev/null
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
@@ -0,0 +1,3 @@
+# This file is for updates after X11R7.4 was released
+
+PREFERRED_VERSION_xserver-xorg ?= "1.5.3"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
index 548d8239e8..46fa8d496a 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
@@ -191,6 +191,9 @@ PREFERRED_VERSION_libxxf86dga ?= "1.0.2"
 PREFERRED_VERSION_libxxf86misc ?= "1.0.1"
 PREFERRED_VERSION_libxxf86vm ?= "1.0.2"
 PREFERRED_VERSION_xtrans ?= "1.2.1"
+
+# This should be here but is needed until bitbake can do
+# versioned depends
 PREFERRED_VERSION_mesa ?= "7.2"
 
 # proto
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index d36a6188df..a4a006f92c 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -60,6 +60,7 @@ PREFERRED_PROVIDER_gtk+ = "gtk+-fastscaling"
 PREFERRED_VERSION_gtk+-fastscaling = "2.10.14"
 
 # for jalimo
+PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
 PREFERRED_PROVIDER_classpath = "classpath"
 PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial"
 PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk"