From 2b10df715600a249450cb61f50fc5916a80ca43a Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Fri, 25 Jan 2008 16:29:08 +0000 Subject: packages/libogg/libtheora: The encoder example is using vorbis add it to the DEPENDS Add libvorbis to the DEPENDS as the encoder example is using libvorbis. --- packages/libogg/libtheora_0.9+1.0alpha7.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') 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" -- cgit v1.2.3 From b00ae8808d4dc76a0fbce2e91e940485c496cbd2 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Fri, 25 Jan 2008 16:44:14 +0000 Subject: packages/speex/speex: Stage the speex.m4 file as well, copied the line from the vorbis recipe --- packages/speex/speex_1.0.4.bb | 1 + packages/speex/speex_1.1.12+1.2beta1.bb | 1 + packages/speex/speex_1.1.12.bb | 1 + packages/speex/speex_1.1.7.bb | 1 + 4 files changed, 4 insertions(+) (limited to 'packages') 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/ } -- cgit v1.2.3 From a5166183debdcbe11a0089822d5e04bcdf9ac8dc Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Fri, 25 Jan 2008 16:56:10 +0000 Subject: packages/libshout/libshout: Add initial version 2.2.2 Remove ogg.m4, speex.m4, vorbis.m4 from the source directory before starting to regenerate the configure script. Do not add $prefix/include to the CPPFLAGS as this is evil --- packages/libshout/.mtn2git_empty | 0 packages/libshout/files/.mtn2git_empty | 0 packages/libshout/files/no-host-includes.ac | 13 +++++++++++++ packages/libshout/libshout.inc | 16 ++++++++++++++++ packages/libshout/libshout_2.2.2.bb | 1 + 5 files changed, 30 insertions(+) create mode 100644 packages/libshout/.mtn2git_empty create mode 100644 packages/libshout/files/.mtn2git_empty create mode 100644 packages/libshout/files/no-host-includes.ac create mode 100644 packages/libshout/libshout.inc create mode 100644 packages/libshout/libshout_2.2.2.bb (limited to 'packages') diff --git a/packages/libshout/.mtn2git_empty b/packages/libshout/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/libshout/files/.mtn2git_empty b/packages/libshout/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 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..9ca8745b9b --- /dev/null +++ b/packages/libshout/libshout.inc @@ -0,0 +1,16 @@ +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 +} 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 -- cgit v1.2.3 From 78c5ca2bf6696bc378cd50cabc5a5c640b9eb262 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Fri, 25 Jan 2008 17:35:38 +0000 Subject: packages/libshout/libshout.inc: Stage the headers, libs and m4 file Like all xiph.org packages the .pc files are a bit odd and not staged. --- packages/libshout/libshout.inc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'packages') diff --git a/packages/libshout/libshout.inc b/packages/libshout/libshout.inc index 9ca8745b9b..3037eb0f46 100644 --- a/packages/libshout/libshout.inc +++ b/packages/libshout/libshout.inc @@ -14,3 +14,7 @@ do_configure_prepend() { rm -f ${S}/m4/ogg.m4 rm -f ${S}/m4/vorbis.m4 } + +do_stage() { + autotools_stage_all +} -- cgit v1.2.3