vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Mon Nov 30 18:10:31 2015 +0100| [330723435bd337cd6af1a9cf8b2435810e18620d] | committer: Jean-Baptiste Kempf
Contribs: update libshout to 2.4.1 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=330723435bd337cd6af1a9cf8b2435810e18620d --- contrib/src/shout/SHA512SUMS | 2 +- contrib/src/shout/bsd.patch | 4 ++-- contrib/src/shout/libshout-win32.patch | 24 ------------------------ contrib/src/shout/rules.mak | 4 ++-- 4 files changed, 5 insertions(+), 29 deletions(-) diff --git a/contrib/src/shout/SHA512SUMS b/contrib/src/shout/SHA512SUMS index e90e3f6..98562b5 100644 --- a/contrib/src/shout/SHA512SUMS +++ b/contrib/src/shout/SHA512SUMS @@ -1 +1 @@ -19c1421e654310ddbc25f343d205d921b7c3f1c9c97f028207deaf1a46150b7f6c8069d52b7a3c9ed72dda276b52237cf1208292fbfa09aa7d09f85072c46a7b libshout-2.3.1.tar.gz +4d4b958947e020de3330d49d39d59220fc89315f25f653a7456b9aa24ca9566fca30bb3d65e6348e79958656096b6b864ea8885157d24e55c8d84d6604670219 libshout-2.4.1.tar.gz diff --git a/contrib/src/shout/bsd.patch b/contrib/src/shout/bsd.patch index 7bb3bc6..c4c153d 100644 --- a/contrib/src/shout/bsd.patch +++ b/contrib/src/shout/bsd.patch @@ -1,5 +1,5 @@ ---- libshout.orig/src/net/sock.c 2012-10-04 13:04:55.000000000 +0200 -+++ libshout/src/net/sock.c 2012-10-04 13:05:18.000000000 +0200 +--- libshout.orig/src/common/net/sock.c 2012-10-04 13:04:55.000000000 +0200 ++++ libshout/src/common/net/sock.c 2012-10-04 13:05:18.000000000 +0200 @@ -22,6 +22,10 @@ #include <config.h> #endif diff --git a/contrib/src/shout/libshout-win32.patch b/contrib/src/shout/libshout-win32.patch deleted file mode 100644 index 512dbf0..0000000 --- a/contrib/src/shout/libshout-win32.patch +++ /dev/null @@ -1,24 +0,0 @@ -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-2.3.1/Makefile.in.orig 2012-05-25 17:21:33.000000000 +0200 -+++ libshout-2.3.1/Makefile.in 2012-08-08 00:08:03.968189479 +0200 -@@ -288,7 +288,7 @@ - top_srcdir = @top_srcdir@ - 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/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 index 5dcbedc..94f3861 100644 --- a/contrib/src/shout/rules.mak +++ b/contrib/src/shout/rules.mak @@ -1,6 +1,6 @@ # shout -SHOUT_VERSION := 2.3.1 +SHOUT_VERSION := 2.4.1 SHOUT_URL := http://downloads.us.xiph.org/releases/libshout/libshout-$(SHOUT_VERSION).tar.gz ifdef BUILD_ENCODERS @@ -20,8 +20,8 @@ $(TARBALLS)/libshout-$(SHOUT_VERSION).tar.gz: # TODO: fix socket stuff on POSIX and Linux libshout: libshout-$(SHOUT_VERSION).tar.gz .sum-shout $(UNPACK) - $(APPLY) $(SRC)/shout/libshout-win32.patch $(APPLY) $(SRC)/shout/bsd.patch + $(APPLY) $(SRC)/shout/libshout-arpa.patch $(UPDATE_AUTOCONFIG) $(MOVE) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
