summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/checksums.ini4
-rwxr-xr-xcontrib/angstrom/sort.sh2
-rw-r--r--recipes/ffmpeg/ffmpeg_svn.bb2
-rw-r--r--recipes/glib-2.0/glib-2.0-2.21.6/atomic-thumb.patch (renamed from recipes/glib-2.0/glib-2.0-2.21.4/atomic-thumb.patch)0
-rw-r--r--recipes/glib-2.0/glib-2.0-2.21.6/configure-libtool.patch (renamed from recipes/glib-2.0/glib-2.0-2.21.4/configure-libtool.patch)0
-rw-r--r--recipes/glib-2.0/glib-2.0-native_2.21.6.bb (renamed from recipes/glib-2.0/glib-2.0-native_2.21.4.bb)0
-rw-r--r--recipes/glib-2.0/glib-2.0_2.21.6.bb (renamed from recipes/glib-2.0/glib-2.0_2.21.4.bb)0
7 files changed, 6 insertions, 2 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index d35513c38e..087dee9bf9 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -8194,6 +8194,10 @@ sha256=af709f0eabfbbfa5c59a02764ca1dd5e6509bbe7fb67a474b2c448bda7b06fb9
md5=5092c5b479ba80065dc164d27e63000f
sha256=b772e4bdf1b28dd23cdb4c4d7f1d219ddb748226d0207e57c75992bf0100182d
+[http://ftp.gnome.org/pub/GNOME/sources/glib/2.21/glib-2.21.6.tar.bz2]
+md5=3b0452fbd877db53dafabdc074600cb8
+sha256=8b4750523a07102c90c7eecf1743f852ce2aadcb7a43284a9e06baf70beb9b8a
+
[ftp://ftp.gtk.org/pub/gtk/v2.4/glib-2.4.6.tar.bz2]
md5=a45db7d82480da431f6cd00ea041a534
sha256=d2ca79bac06a625d9276b48492c2c1caccf7f8962f9b331b39796391013e72f2
diff --git a/contrib/angstrom/sort.sh b/contrib/angstrom/sort.sh
index b44b781e89..b1f9314a66 100755
--- a/contrib/angstrom/sort.sh
+++ b/contrib/angstrom/sort.sh
@@ -48,7 +48,7 @@ case "$arch" in
"armv4t")
machines="micro2440 ep93xx h6300 om-gta01 om-gta02 fic-gta01 fic-gta02" ;;
"armv5te")
- machines="da830-omapl137-evm htcalpine dm6446-evm dm6467-evm dm355-evm dm365-evm dm357-evm topas910 sheevaplug dm355-leopard n2100 dns323 mv2120 kuropro lspro tsx09 ts409 davinci-dvevm davinci-sffsdr neuros-osd neuros-osd2 gumstix-connex gumstix-verdex gumstix e680 a780 a1200 at91sam9263ek rokre6 rokre2 rokr-e2 akita c7x0 h2200 h3900 h4000 h5000 htcapache htctornado htcblueangel htcuniversal hx4700 nslu2le hx2000 ixp4xxle magician netbook-pro nokia770 palmt650 palmt680 palmld palmtx palmtt3 palmz72 qemuarm omap5912osk poodle spitz tosa mx27ads at91sam9g20ek mainstone" ;;
+ machines="da850-omapl138-evm da830-omapl137-evm htcalpine dm6446-evm dm6467-evm dm355-evm dm365-evm dm357-evm topas910 sheevaplug dm355-leopard n2100 dns323 mv2120 kuropro lspro tsx09 ts409 davinci-dvevm davinci-sffsdr neuros-osd neuros-osd2 gumstix-connex gumstix-verdex gumstix e680 a780 a1200 at91sam9263ek rokre6 rokre2 rokr-e2 akita c7x0 h2200 h3900 h4000 h5000 htcapache htctornado htcblueangel htcuniversal hx4700 nslu2le hx2000 ixp4xxle magician netbook-pro nokia770 palmt650 palmt680 palmld palmtx palmtt3 palmz72 qemuarm omap5912osk poodle spitz tosa mx27ads at91sam9g20ek mainstone" ;;
"armv5teb")
machines="ixp4xxbe nslu2be" ;;
"armv6-novfp")
diff --git a/recipes/ffmpeg/ffmpeg_svn.bb b/recipes/ffmpeg/ffmpeg_svn.bb
index 8091bc0505..6f2717fbed 100644
--- a/recipes/ffmpeg/ffmpeg_svn.bb
+++ b/recipes/ffmpeg/ffmpeg_svn.bb
@@ -2,7 +2,7 @@ require ffmpeg.inc
DEPENDS += "schroedinger libgsm"
-SRCREV = "19947"
+SRCREV = "19958"
PE = "1"
PV = "0.5.0+${PR}+svnr${SRCREV}"
diff --git a/recipes/glib-2.0/glib-2.0-2.21.4/atomic-thumb.patch b/recipes/glib-2.0/glib-2.0-2.21.6/atomic-thumb.patch
index d7aa08821f..d7aa08821f 100644
--- a/recipes/glib-2.0/glib-2.0-2.21.4/atomic-thumb.patch
+++ b/recipes/glib-2.0/glib-2.0-2.21.6/atomic-thumb.patch
diff --git a/recipes/glib-2.0/glib-2.0-2.21.4/configure-libtool.patch b/recipes/glib-2.0/glib-2.0-2.21.6/configure-libtool.patch
index 3ba79b8986..3ba79b8986 100644
--- a/recipes/glib-2.0/glib-2.0-2.21.4/configure-libtool.patch
+++ b/recipes/glib-2.0/glib-2.0-2.21.6/configure-libtool.patch
diff --git a/recipes/glib-2.0/glib-2.0-native_2.21.4.bb b/recipes/glib-2.0/glib-2.0-native_2.21.6.bb
index b5ce9da849..b5ce9da849 100644
--- a/recipes/glib-2.0/glib-2.0-native_2.21.4.bb
+++ b/recipes/glib-2.0/glib-2.0-native_2.21.6.bb
diff --git a/recipes/glib-2.0/glib-2.0_2.21.4.bb b/recipes/glib-2.0/glib-2.0_2.21.6.bb
index 4aac57f96d..4aac57f96d 100644
--- a/recipes/glib-2.0/glib-2.0_2.21.4.bb
+++ b/recipes/glib-2.0/glib-2.0_2.21.6.bb