merge of '8725fc715529f6dba921a0a92e01e4e68124bfdb'

     and '9f6c6e0638e90b5a038c5a87f9d87060ab2a3dbf'

10 files changed, 39 insertions, 1 deletions

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/
 }