Commit 8382c705 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Contribs: update libshout to 2.4.1

parent ef7b6703
19c1421e654310ddbc25f343d205d921b7c3f1c9c97f028207deaf1a46150b7f6c8069d52b7a3c9ed72dda276b52237cf1208292fbfa09aa7d09f85072c46a7b libshout-2.3.1.tar.gz
4d4b958947e020de3330d49d39d59220fc89315f25f653a7456b9aa24ca9566fca30bb3d65e6348e79958656096b6b864ea8885157d24e55c8d84d6604670219 libshout-2.4.1.tar.gz
--- 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 -ruN libshout/configure.ac libshout-new/configure.ac
--- libshout/configure.ac 2015-11-20 20:48:32.000000000 +0100
+++ libshout-new/configure.ac 2015-11-30 18:05:57.123213048 +0100
@@ -74,7 +74,7 @@
dnl Checks for header files.
AC_HEADER_STDC
AC_HEADER_TIME
-AC_CHECK_HEADERS([strings.h sys/timeb.h])
+AC_CHECK_HEADERS([strings.h sys/timeb.h arpa/inet.h])
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
diff -ruN libshout/src/proto_roaraudio.c libshout-new/src/proto_roaraudio.c
--- libshout/src/proto_roaraudio.c 2015-11-20 17:22:27.000000000 +0100
+++ libshout-new/src/proto_roaraudio.c 2015-11-30 18:06:41.823051979 +0100
@@ -28,7 +28,9 @@
#endif
/* for htonl(). */
+#ifdef HAVE_ARPA_INET_H
#include <arpa/inet.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
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
# 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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment