[vlc-commits] contrib: libshout

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Jun 28 17:08:36 2011 +0300| [7bb3e9192050f5d455a0e46a760df982fae166fd] | committer: Rémi Denis-Courmont

contrib: libshout

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7bb3e9192050f5d455a0e46a760df982fae166fd
---

 contrib/src/shout/SHA512SUMS           |    1 +
 contrib/src/shout/libshout-win32.patch |   24 ++++++++++++++++++++++++
 contrib/src/shout/rules.mak            |   29 +++++++++++++++++++++++++++++
 3 files changed, 54 insertions(+), 0 deletions(-)

diff --git a/contrib/src/shout/SHA512SUMS b/contrib/src/shout/SHA512SUMS
new file mode 100644
index 0000000..368556c
--- /dev/null
+++ b/contrib/src/shout/SHA512SUMS
@@ -0,0 +1 @@
+f6ebe556ab10cc67201d35f1172127a411ebb28494a7873474c9f33077e2f097244b0fb94d861ff258a2b887a17afbe4c6916283cc234ead6d0981d85fe45ee5  libshout-2.2.2.tar.gz
diff --git a/contrib/src/shout/libshout-win32.patch b/contrib/src/shout/libshout-win32.patch
new file mode 100644
index 0000000..1844274
--- /dev/null
+++ b/contrib/src/shout/libshout-win32.patch
@@ -0,0 +1,24 @@
+diff -u libshout/include/shout/shout.h.in libshout-new/include/shout/shout.h.in
+--- libshout/include/shout/shout.h.in	2004-10-30 02:23:15.000000000 +0100
++++ libshout-new/include/shout/shout.h.in	2006-03-12 21:06:13.000000000 +0000
+@@ -22,9 +22,6 @@
+ #define __LIBSHOUT_SHOUT_H__
+ 
+ #include <sys/types.h>
+-#ifdef WIN32
+-#include <os.h>
+-#endif
+ 
+ #define SHOUTERR_SUCCESS	(0)
+ #define SHOUTERR_INSANE		(-1)
+--- libshout/Makefile.in	2009-06-15 02:28:13.000000000 +0200
++++ libshout/Makefile.in	2009-06-15 02:29:10.000000000 +0200
+@@ -246,7 +246,7 @@
+ target_alias = @target_alias@
+ AUTOMAKE_OPTIONS = 1.6 foreign
+ ACLOCAL_AMFLAGS = -I m4
+-SUBDIRS = include src examples debian doc win32
++SUBDIRS = include src doc win32
+ EXTRA_DIST = INSTALL m4/shout.m4 m4/ac_config_libconfig_in.m4 m4/acx_pthread.m4 \
+ 	m4/ogg.m4 m4/vorbis.m4 m4/xiph_compiler.m4 m4/xiph_net.m4 \
+ 	m4/xiph_types.m4
diff --git a/contrib/src/shout/rules.mak b/contrib/src/shout/rules.mak
new file mode 100644
index 0000000..2cf74f4
--- /dev/null
+++ b/contrib/src/shout/rules.mak
@@ -0,0 +1,29 @@
+# shout
+
+SHOUT_VERSION := 2.2.2
+SHOUT_URL := http://downloads.us.xiph.org/releases/libshout/libshout-$(SHOUT_VERSION).tar.gz
+
+PKGS += shout
+
+$(TARBALLS)/libshout-$(SHOUT_VERSION).tar.gz:
+	$(DOWNLOAD) $(SHOUT_URL)
+
+.sum-shout: libshout-$(SHOUT_VERSION).tar.gz
+
+# TODO: fix socket stuff on POSIX and Linux
+libshout: libshout-$(SHOUT_VERSION).tar.gz .sum-shout
+	$(UNPACK)
+	(cd $@-$(SHOUT_VERSION) && patch -p1) < $(SRC)/shout/libshout-win32.patch
+	mv libshout-$(SHOUT_VERSION) $@
+	touch $@
+
+ifdef HAVE_FPU
+.shout: .vorbis
+else
+.shout: .tremor
+endif
+
+.shout: libshout .theora .ogg .speex
+	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
+	cd $< && $(MAKE) install
+	touch $@