merge of '8725fc715529f6dba921a0a92e01e4e68124bfdb'

     and '9f6c6e0638e90b5a038c5a87f9d87060ab2a3dbf'

11 files changed, 151 insertions, 1 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index d9c9b5080c..8b9b58ebc5 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -222,6 +222,10 @@ sha256=137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f
 md5=61beda590bfc5b4a12e979d5f2d70d7a
 sha256=dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd
 
+[http://downloads.sourceforge.net/mesa3d/MesaLib-7.0.2.tar.bz2]
+md5=93e6ed7924ff069a4f883b4fce5349dc
+sha256=9d4707b556960f6aef14480f91fcd4f868720f64321947ab1b2fd20e85ce7f9e
+
 [http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/Module-Build-0.2805.tar.gz]
 md5=598bb59b86c2c4842eeffb03392fab5b
 sha256=8fd609d1e6b460b5c95ad5612cb823aa863d51360ed55caea987909a9bab50f5
@@ -1290,6 +1294,26 @@ sha256=984b7974670d4f0291094ea2a36ee21fe46591f36cb51f95292dbe143c1eeab4
 md5=158ccadd830fe6cb3d21a109f398e037
 sha256=08ef1e87c7198fb6d7c0a5f830fc2d99e5fd077dbb7d4ca1b66117ae924f6df3
 
+[http://www.busybox.net/downloads/busybox-1.7.2.tar.gz]
+md5=34c76dc55004d8d5dcea884e0e99bc21
+sha256=e0eb7d59ba996a58608999998ad630c67b93c05af4eafea29770c4839c0e5461
+
+[http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-ash.patch]
+md5=4149857c0b2c7f3d52a1f2cec5d7778d
+sha256=73706e7d77144a6270da02ede61cde3c2e3b0e716d879737ac9d478b29233ba9
+
+[http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-iptun.patch]
+md5=6c5f498e0677fd91b5b0e85ec5ac3b23
+sha256=b80a8c173c7a7a40a504585c6af5c74396c8fdbbb1cec179de9edcc030aa6a9a
+
+[http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-logger.patch]
+md5=43c292e93bf92623aaa29dd0e243e9a9
+sha256=5117584a563c512b68cd9678d3cf54e6186f5a062836398791385f8ed73cca86
+
+[http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-tail.patch]
+md5=c211189556c59a2665af45bffe5a5878
+sha256=f44c3c2d7d9b3fc8a5f9fb6ac587ae4170d2515d72f9e76deb8c071ce9847abe
+
 [http://downloads.sourceforge.net/bvi/bvi-1.3.1.src.tar.gz]
 md5=b9d77c57bda2e019207a1874d9bb4dea
 sha256=c94dbfa293cbc61b8571d025e90fd1f06a34f8d4e5b11a59856bfc1f13014de3
@@ -1338,6 +1362,10 @@ sha256=594e78a66044898c321e378d47faf43b665b23ba638834d2787e344ba13e5132
 md5=b254633046eafe603776d0bee791b751
 sha256=7cf292ae376e7120ec548ad6a807a2f0f4f0539a304229a3bd98921453becd47
 
+[http://cairographics.org/releases/cairo-1.4.8.tar.gz]
+md5=5b9db574c9fbb94ce52047600190a1ba
+sha256=a3e9b0f07910ee325406118cf3e136fc78a5155c47fdb19e66e895a3c587bc51
+
 [http://gpephone.linuxtogo.org/download/gpephone/calendar-1.0/calendar-1.0.tar.gz]
 md5=eb7be3b85955a1bbe7a0154cbf2f70f9
 sha256=7e6425b688a2d4bbeef0904cac52737b232d03fdc4d35866fd03359f2d5f1794
@@ -2414,6 +2442,14 @@ sha256=52b31fa70151b97ef871d44ad9214e90279f7cbd95144c6b40da49079ed0f1ce
 md5=3654bbbf01deeb0d804df194e1b1a2b3
 sha256=52b31fa70151b97ef871d44ad9214e90279f7cbd95144c6b40da49079ed0f1ce
 
+[ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.8.3.tar.gz]
+md5=f123ffb457eb3577fcbb5e2c2432a922
+sha256=fd2ae24fc5bc14bfe63e0be551134a0f7906659f45803a427a2377b67d193867
+
+[ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.9.1.tar.gz]
+md5=163a846e51b39fd626b43548c2cdda7c
+sha256=6a3a993ab90540719e47b4968f60f8023a3cbb93f2a1ce611cd7a2d52ac1c38e
+
 [ftp://oss.sgi.com/projects/fam/download/stable/fam-2.6.10.tar.gz]
 md5=1c5a2ea659680bdd1e238d7828a857a7
 sha256=885ced3480aef3cee519a459a572e31cd2fd5e24bcd35b1d0c8833361699026e
@@ -3086,6 +3122,10 @@ sha256=cfc0efbcc6fcde0d416a32dfb246c9df022515a312683fac412578c4fd09a9bc
 md5=ac6d19831220c4aeef4475492725486f
 sha256=98bdb26cd2644f2290e34453d9115b88bcff940bd1feb88db5a0fc557ec0ea5e
 
+[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.2.2/gcc-4.2.2.tar.bz2]
+md5=7ae33781417a35a2eb03ee098a9f4490
+sha256=673b85d780a082c014ded4ac11f8269a3fe893b4dbb584d65b8602d50b3872b1
+
 [http://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.2.tar.gz]
 md5=fc49f45251c1336fe1dad5dba1c83fcd
 sha256=fdd3963294e80b27416f902a5c029c033d321f03310d3cafa3afb62b50ddce92
@@ -3254,6 +3294,10 @@ sha256=142d5d4795bef093eb9cfd50e384ae87ba9b9934d22b667174535d377ad47f1b
 md5=b3f6a2a318610af6398b3445f1a2d6c6
 sha256=10113e7b91f858557c7edb4b611cc009855c5ff8663af54977a65acb69445058
 
+[http://ftp.gnome.org/pub/GNOME/sources/glib/2.14/glib-2.14.0.tar.bz2]
+md5=6fabf21f68631043bc6924e01398e3af
+sha256=92e0aed2b5816bfcdfcd943215a7b59e9000f89ae7824218b7959c90161560a8
+
 [http://ftp.gnome.org/pub/GNOME/sources/glib/2.14/glib-2.14.1.tar.bz2]
 md5=196d7944a8ddc1f7c3d1e9c7146dd560
 sha256=6f36ca624a12dce03cdea59c9eb900eda49ea2f463b329737eb9f2a8f3ac144d
@@ -3302,10 +3346,18 @@ sha256=0ae1b1dc1ee870d307ae6ad4546778377b04055520d3771dab1290e60ab13286
 md5=1fb29764a6a650a4d5b409dda227ac9f
 sha256=9b2e12bb1eafb55ab2e5a868532b8e6ec39216c66c25b8998d7474bc4d4eb529
 
+[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-2.6.1.tar.bz2]
+md5=11cf6d3fc86dbe0890b8d00372eb6286
+sha256=3ded3a3c3ba2cf02d72479a5cc0829c7c261a9d0934e49a79233de9fa276ec22
+
 [ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-2.5.tar.bz2]
 md5=8787868ba8962d9b125997ec2f25ac01
 sha256=de77e49e0beee6061d4c6e480f322566ba25d4e5e018c456a18ea4a8da5c0ede
 
+[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-2.6.1.tar.bz2]
+md5=503f1315afd808728ebaa75b3d87a7d9
+sha256=67c98ca1299f5f25eaece256d033e0e63bcf6876b920ca62a1fe61ac62c5c451
+
 [ftp://ftp.gnu.org/gnu/glibc/glibc-linuxthreads-2.2.5.tar.gz]
 md5=c766a79a51668d7fa33f175a249655b4
 sha256=c027824ee6593a838e0883bdd4bf8bd455b3dcf4ff0aa77fe82452819d882f47
@@ -3322,6 +3374,10 @@ sha256=2d7af8211cda81abde3e0bb8ccedbd18924a27b244ff35d4eacafcf899038c56
 md5=183f6d46e8fa5e4b2aff240ab1586c2e
 sha256=80c38a005325e7539012bd665fb8e06af9ee9bfc74efb236ebff121265bfd463
 
+[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-2.6.1.tar.bz2]
+md5=53d88ca624642dd267752ccce77b19d0
+sha256=d094028bc6d6691f56b4efeff7cd7e1c7ca10733e0cb5efc36e8fb08d8324bf1
+
 [ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/2.8/glibmm-2.8.4.tar.bz2]
 md5=952cdde2d6aef201c528d431036d71e1
 sha256=7ff592b6687caefa367b33d8cb8f66f3c0273fa86d4b688c0758d0d9fee7a2cb
@@ -4414,6 +4470,10 @@ sha256=d02344239d048390ba02fcfd7de4f9efc0dfb51e7b06dfa46a6314d666ea4de2
 md5=20d763198efb38263b22dee347f69da6
 sha256=3aab107fb97a280b77fa30d07540e325d1511907bbce1e7efa5b4db2dffa28a3
 
+[http://download.gnome.org/sources/gtk+/2.12/gtk+-2.12.0.tar.bz2]
+md5=e9c280afec29b11772af5a7c807abf41
+sha256=faa1dc73f8077f72849ade14963202d8af22b51469c1e8e88e20c69d330fd2fd
+
 [http://handhelds.org/packages/gtk-2.0/gtk+-2.2.4.diff.bz2]
 md5=c6697665e06cad01e87c2cf8d0913725
 sha256=2a768a45adea587c4a7d6e3c3567ad7961bf7509e118ae62ce32f5369b1aeeb0
@@ -4966,6 +5026,10 @@ sha256=913ff534aa777e3c36f3e9fe3e8638c3ccfe398daeb7532fa917e7bcd6fed07d
 md5=e2c4cf4c2ad59d1e27f09381f6b4a3c3
 sha256=62ba68a056daa89f5b21a02b27f6a4c858933e1c5547c9d16985d9ed182014e6
 
+[http://xorg.freedesktop.org/releases/individual/proto/inputproto-1.4.2.1.tar.bz2]
+md5=aa948a7469168ddd9c33f11c5dff55ac
+sha256=9b6db77037de7c52b9a17862b99bc435bd5c20e5d3faf5aec943b206cdaff3ed
+
 [http://xorg.freedesktop.org/releases/individual/proto/inputproto-1.4.tar.gz]
 md5=3faf4bc1e2bb9353590d7b1fe50ec306
 sha256=5360e221354bbdfd67bf9834c2c1d7a0d83f22c17e057f92194411911fbb81f5
@@ -5366,6 +5430,10 @@ sha256=15bedd7f892fbb130e2b9c17d4f927c4904362a7be5b73d07d56d8aa7025f6f1
 md5=071f96648ac25c8e87a3de11a7de2d8a
 sha256=ffd46270dae30cad147d73559142a701a8ff8d0658f4abfb2341edefabb8161d
 
+[http://xorg.freedesktop.org/releases/individual/lib/libICE-1.0.4.tar.bz2]
+md5=4ab4e67e0b8845aa201e984153087f4a
+sha256=13055e2f4c645cbd135ce97a7974a5866f9ba3ed8988e686b552f55c30514f04
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libICE-X11R7.0-1.0.0.tar.bz2]
 md5=c778084b135311726da8dc74a16b3555
 sha256=e37cffdb45bbb193e5cb75e74e7e0410554f4b3c3a1fe436debea907778e6aac
@@ -5418,6 +5486,10 @@ sha256=5359db57793430429786b648ac570d4ab205797306e049bf1e8675250af21541
 md5=710bf38a9477a5a1b235bc94f1d0593c
 sha256=b77e4fd2bbd4092e7e78d0964760ad8ab160caccd4bc6d7d0c87a23febaea85e
 
+[http://xorg.freedesktop.org/releases/individual/lib/libX11-1.1.3.tar.bz2]
+md5=4d43d3e472c552d2f191ecdd4e75112c
+sha256=4a2f566e2ea5dd955c875cb8fa9c18dd725324fc5cf4e23c803442e31ab8917a
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libX11-X11R7.0-1.0.0.tar.bz2]
 md5=dcf59f148c978816ebbe3fbc5c9ef0e1
 sha256=89a3c2d8324ff9d0d91682503407310f7df30a74915cd253be3a75247b044248
@@ -5490,6 +5562,10 @@ sha256=142cd1c1958e2cb92ff2975a092a2c519dd5f4c433c9d1d8b6cc9ca967aad283
 md5=ec2acd10a7736a85dd1e1ed9ea5bec96
 sha256=8f039f81af52c88d583fba48b878abd074542221cb0030638ad52336b4ae1377
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXcursor-1.1.9.tar.bz2]
+md5=99b7554037a92b260891091e81815a0a
+sha256=1dffb3542271c8ce964066d561474caec5b639d6588b257b21cfb8225a15d2b4
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXcursor-X11R7.0-1.1.5.2.tar.bz2]
 md5=048e15b725d8e081ac520e021af9a62c
 sha256=52bbd6e05de84e94ec11f2734029183411c91e2297779098fb17e162aca5e191
@@ -5614,6 +5690,10 @@ sha256=7e6339539d3d0a4fc95cc23ca2b13ae67dd783e011b3cc5ca76040e376bff57f
 md5=9c4dd85f3e2a75bfb60bd288502bc288
 sha256=4deda13613f03e4524d3cf0ac14b9e20be5044d415cb8478713ecbe47f4de862
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXi-1.1.3.tar.bz2]
+md5=7c510abb0cad8dc20493fb27ff7859d8
+sha256=c77a5bbe97d0d0a6493adefcf1bd57aca91bc33279633b3f6cf1d2bb8812153f
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXi-X11R7.0-1.0.0.tar.bz2]
 md5=99503799b4d52ec0cac8e203341bb7b3
 sha256=64e8ece13fc778b9dd86ef93c4b782de9a1176a005ed7d895552a73acb103d9b
@@ -5686,6 +5766,10 @@ sha256=ba5adedc37da835a5c9e5a5d457dce13feead64fc364bc4719c41720ca0a3c50
 md5=5860360f5b038cc728f388f875ce525d
 sha256=2d2df642eb8e0527936cdf4ed1c096f69df53e9b95e2532c8ed0cabd06a45407
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXrandr-1.2.2.tar.bz2]
+md5=1b244b5d19f0ccab01d7083436cd3558
+sha256=206f8dc850f12b1213fb73dbef09fafa1bb8fb8c3ddfe4d39721c1e2dec12a98
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXrandr-X11R7.0-1.1.0.2.tar.bz2]
 md5=e10aed44c2e1e5d9e6848a62ff2c90c7
 sha256=6b6a3fcf44621bf163ba2db6dbcc518bff4e8cf74695d1b86595387a3ff3c6fb
@@ -5698,6 +5782,10 @@ sha256=5cfaac877aca06e3be09380037a68c6d2c4a57641fa6994bc14f07c0105cca25
 md5=2f1b2c6e8dcbcb6d760e59f445abd92c
 sha256=0f749183ab1a0ece14d33c3299b3f70893122349c0bfa9d7bd0e66ce19d1802a
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXrender-0.9.4.tar.bz2]
+md5=dc266e850c51368f964e0d67bf5fb5e6
+sha256=5682d343dd4e7ef291a6577e956c331946ce5801d8fa076284a01b41de3017ec
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXrender-X11R7.0-0.9.0.2.tar.bz2]
 md5=3f0fa590dd84df07568631c91fbe68ab
 sha256=f240490ce348cedcf09c2c5d170c7d79002790d72ea5dc3d7d702005684ff713
@@ -6554,6 +6642,10 @@ sha256=920fa2a0924d66884825d36a2e843de069cfdf1af01945d05da25999bbd6396c
 md5=461d7097bf47864b872085a94ff94e10
 sha256=01453d561255b5fcb361997904752860e4f8c6b9742f290578a44615fcc94356
 
+[http://downloads.xiph.org/releases/ogg/libogg-1.1.3.tar.gz]
+md5=eaf7dc6ebbff30975de7527a80831585
+sha256=bae29e79fbc50bbedf1235852094b71c8c910a1ef0cd42fe4163b7b545630b65
+
 [http://liboil.freedesktop.org/download/liboil-0.3.10.tar.gz]
 md5=770f656bca8166dab33b322d5886a4bf
 sha256=4587753a023550a066abe59a7e467c1af35b9f5e81bfb40a12463ad2df8f088c
@@ -6738,6 +6830,10 @@ sha256=835265bb0d39689e8a8580b5ffb53222b3f5f483d58aa533a5c7ebfc3d273d50
 md5=ddc52cc8196f9f0bf48a5c7569b6bb38
 sha256=83e82b9afe296584a6c9f1f8b3e3a70d324209021e0049f68d28bd1de8c18136
 
+[http://downloads.us.xiph.org/releases/libshout/libshout-2.2.2.tar.gz]
+md5=4f75fc9901c724b712c371c9a1e782d3
+sha256=912a1fdb12d31af757e7881db49321e5b5240bd8bd4199e9fb0ce16d66568160
+
 [http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/libsidplay-1.36.59.tgz]
 md5=37c51ba4bd57164b1b0bb7b43b9adece
 sha256=3da9b38d4eb5bf9e936b9604ba92da0594ef38047d50cf806a8e11c400008024
@@ -6826,6 +6922,10 @@ sha256=2be78a947bdbfd24aa4f35ae97d2b7bafa60162c5e824cf3dd085b40eddee8ff
 md5=2cbbbeaf97c154a7fb9b088b95deb70e
 sha256=53e8740a3a36ece8078b371b95c79646dc69f0ad3ee2665e5fb659412c0baf35
 
+[http://downloads.xiph.org/releases/theora/libtheora-1.0alpha7.tar.gz]
+md5=55ee3c6db3e0927e7918309891a8f52b
+sha256=f5c7730ded0273a8615b12b46a32b800bbcb9e861e3a18aa92b1c062981a2fef
+
 [http://downloads.sourceforge.net/tilp/libticables-3.9.2.tar.gz]
 md5=354675bfbd881082a9447efde9935226
 sha256=1c091859f09d5a38c76f0d64a93db46aa2b5d637c8a7370d348f21e7be324c37
@@ -6894,6 +6994,10 @@ sha256=748a9a5a1b2e6bf1db4cc767742acf58d836e551e56a493bd34ad759d3bb4f53
 md5=4d6726fd02ce02f6e24824e594b0949a
 sha256=20b3cbdb4b05322d470404a7d2e8cdae1e0ce5372113218ae3cada3b29da70f7
 
+[http://downloads.xiph.org/releases/vorbis/libvorbis-1.2.0.tar.gz]
+md5=478646358c49f34aedcce58948793619
+sha256=6eb7040048e35448fe224fa3fd993eb4e49a905c57893886082f1674d43b0e73
+
 [http://ftp.gnome.org/pub/GNOME/sources/libwnck/2.10/libwnck-2.10.2.tar.bz2]
 md5=d8276da50ce560c5e66ed94e4238d9ef
 sha256=d03295e5cb22ed7d086ce1ce754c498ed6bc2388c45e4547417d922580d3cd7c
@@ -9538,6 +9642,10 @@ sha256=06b32d6f8fe7065b4c2c8142a244374e1be963757125bac20ba016b92231b5bf
 md5=5f8dd5a041ca7c700b16620228f922aa
 sha256=de7290f334baf631a14d031df304ee94cfb550aa69e7512aa589d21c2381c7d8
 
+[http://download.savannah.gnu.org/releases/quilt/quilt-0.46.tar.gz]
+md5=4508546d1ed0257ef7c128b6121b7208
+sha256=47bf030565bb462840db694acc183273455714028c74974c5b3a3bd4ad29ad89
+
 [http://downloads.sourceforge.net/qwt/qwt-4.2.0rc1.tgz]
 md5=142b10ab27e837c3c4603cf9a7e9343b
 sha256=3b6db68d53441119dced27e5bad26ec087294cb9d878d37bcea61e1f1e4849a1
@@ -9638,6 +9746,10 @@ sha256=779317ca2e99f02b394af0c6f77f16def56de3b71a5d9f9ac6e5e9cfb65192e1
 md5=28fbe8a59ebd31f098b90ec64f3d133a
 sha256=7754dfbbb1e3818f28720fa9647b8a593e9d54626a7896771c2bfac7f75e2726
 
+[http://xorg.freedesktop.org/releases/individual/proto/renderproto-0.9.3.tar.bz2]
+md5=598bc9a493deee2e48e4434e94467189
+sha256=c98a08b877e98a8fa7daa04be472de7e0cb38a99593faca8b987effcea2dd45b
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/renderproto-X11R7.0-0.9.2.tar.bz2]
 md5=a7f3be0960c92ecb6a06a1022fe957df
 sha256=a875741d110a73952119460fac31e1bb7d0b0aff16f59c2a0a04bcd434c74f41
diff --git a/packages/libogg/libtheora_0.9+1.0alpha7.bb b/packages/libogg/libtheora_0.9+1.0alpha7.bb
index 67ec27b560..5a372b65a1 100644
--- a/packages/libogg/libtheora_0.9+1.0alpha7.bb
+++ b/packages/libogg/libtheora_0.9+1.0alpha7.bb
@@ -1,5 +1,5 @@
 
-DEPENDS = "libogg libsdl-x11"
+DEPENDS = "libogg libvorbis libsdl-x11"
 
 SRC_URI = "http://downloads.xiph.org/releases/theora/libtheora-1.0alpha7.tar.gz"
 
diff --git a/packages/libshout/.mtn2git_empty b/packages/libshout/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libshout/.mtn2git_empty
diff --git a/packages/libshout/files/.mtn2git_empty b/packages/libshout/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libshout/files/.mtn2git_empty
diff --git a/packages/libshout/files/no-host-includes.ac b/packages/libshout/files/no-host-includes.ac
new file mode 100644
index 0000000000..f5255359b0
--- /dev/null
+++ b/packages/libshout/files/no-host-includes.ac
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 52fc51d..e93fc52 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -179,7 +179,7 @@ eval shout_includedir="$includedir"
+ prefix="$save_prefix"
+ 
+ SHOUT_VERSION="$VERSION"
+-SHOUT_CPPFLAGS="-I$shout_includedir $VORBIS_CFLAGS $PTHREAD_CPPFLAGS"
++SHOUT_CPPFLAGS="$VORBIS_CFLAGS $PTHREAD_CPPFLAGS"
+ SHOUT_CFLAGS="$PTHREAD_CFLAGS"
+ SHOUT_LIBS="-lshout"
+ 
diff --git a/packages/libshout/libshout.inc b/packages/libshout/libshout.inc
new file mode 100644
index 0000000000..3037eb0f46
--- /dev/null
+++ b/packages/libshout/libshout.inc
@@ -0,0 +1,20 @@
+DESCRIPTION = "Library which can be used to write a source client like ices"
+HOMEPAGE = "http://www.icecast.org"
+DEPENDS = "speex libtheora libvorbis libogg"
+LICENSE = "LGPL"
+
+SRC_URI = "http://downloads.us.xiph.org/releases/libshout/libshout-${PV}.tar.gz \
+           file://no-host-includes.ac;patch=1 "
+
+inherit autotools
+
+do_configure_prepend() {
+    # Use the staged m4 files
+    rm -f ${S}/m4/speex.m4
+    rm -f ${S}/m4/ogg.m4
+    rm -f ${S}/m4/vorbis.m4
+}
+
+do_stage() {
+    autotools_stage_all
+}
diff --git a/packages/libshout/libshout_2.2.2.bb b/packages/libshout/libshout_2.2.2.bb
new file mode 100644
index 0000000000..bd54419686
--- /dev/null
+++ b/packages/libshout/libshout_2.2.2.bb
@@ -0,0 +1 @@
+require ${PN}.inc
diff --git a/packages/speex/speex_1.0.4.bb b/packages/speex/speex_1.0.4.bb
index e96c249f81..e1af8d18da 100644
--- a/packages/speex/speex_1.0.4.bb
+++ b/packages/speex/speex_1.0.4.bb
@@ -22,5 +22,6 @@ do_stage() {
   install -m 0644 include/speex/speex_callbacks.h ${STAGING_INCDIR}/speex
   install -m 0644 include/speex/speex_header.h ${STAGING_INCDIR}/speex
   install -m 0644 include/speex/speex_stereo.h ${STAGING_INCDIR}/speex
+  install -m 0644 speex.m4 ${STAGING_DATADIR}/aclocal/
 }
 
diff --git a/packages/speex/speex_1.1.12+1.2beta1.bb b/packages/speex/speex_1.1.12+1.2beta1.bb
index 01bd93909e..5430983e36 100644
--- a/packages/speex/speex_1.1.12+1.2beta1.bb
+++ b/packages/speex/speex_1.1.12+1.2beta1.bb
@@ -36,4 +36,5 @@ do_stage() {
 	oe_libinstall -C libspeex -so libspeex ${STAGING_LIBDIR}
 	install -d ${STAGING_INCDIR}/speex
 	install -m 0644 include/speex/*.h ${STAGING_INCDIR}/speex
+	install -m 0644 speex.m4 ${STAGING_DATADIR}/aclocal/
 }
diff --git a/packages/speex/speex_1.1.12.bb b/packages/speex/speex_1.1.12.bb
index c34d459a26..b18151e48d 100644
--- a/packages/speex/speex_1.1.12.bb
+++ b/packages/speex/speex_1.1.12.bb
@@ -34,4 +34,5 @@ do_stage() {
 	oe_libinstall -C libspeex -so libspeex ${STAGING_LIBDIR}
 	install -d ${STAGING_INCDIR}/speex
 	install -m 0644 include/speex/*.h ${STAGING_INCDIR}/speex
+	install -m 0644 speex.m4 ${STAGING_DATADIR}/aclocal/
 }
diff --git a/packages/speex/speex_1.1.7.bb b/packages/speex/speex_1.1.7.bb
index 7ce34a80eb..00b51b1c2e 100644
--- a/packages/speex/speex_1.1.7.bb
+++ b/packages/speex/speex_1.1.7.bb
@@ -34,4 +34,5 @@ do_stage() {
 	install -m 0644 include/speex/speex_callbacks.h ${STAGING_INCDIR}/speex
 	install -m 0644 include/speex/speex_header.h ${STAGING_INCDIR}/speex
 	install -m 0644 include/speex/speex_stereo.h ${STAGING_INCDIR}/speex
+	install -m 0644 speex.m4 ${STAGING_DATADIR}/aclocal/
 }