[vlc-commits] contrib: shout: respect the availability of strings.h everywhere

[Steve Lhomme]

vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Thu Mar 29 15:00:53 2018 +0200| [b277d9e909314d303355cf9aa67a14e7892db3ee] | committer: Steve Lhomme

contrib: shout: respect the availability of strings.h everywhere

(cherry picked from commit 3fc9ce383565b12a3d1e372f062576510b741779) (rebased)

rebased:
- some shout patches were backported before

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

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

 contrib/src/shout/rules.mak           |  1 +
 contrib/src/shout/shout-strings.patch | 36 +++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/contrib/src/shout/rules.mak b/contrib/src/shout/rules.mak
index e48b0b37c1..5e487ec124 100644
--- a/contrib/src/shout/rules.mak
+++ b/contrib/src/shout/rules.mak
@@ -23,6 +23,7 @@ libshout: libshout-$(SHOUT_VERSION).tar.gz .sum-shout
 	$(APPLY) $(SRC)/shout/bsd.patch
 	$(APPLY) $(SRC)/shout/libshout-arpa.patch
 	$(APPLY) $(SRC)/shout/fix-xiph_openssl.patch
+	$(APPLY) $(SRC)/shout/shout-strings.patch
 	$(APPLY) $(SRC)/shout/no-examples.patch
 	$(APPLY) $(SRC)/shout/no-force-libwsock.patch
 	$(call pkg_static,"shout.pc.in")
diff --git a/contrib/src/shout/shout-strings.patch b/contrib/src/shout/shout-strings.patch
new file mode 100644
index 0000000000..438a364899
--- /dev/null
+++ b/contrib/src/shout/shout-strings.patch
@@ -0,0 +1,36 @@
+--- libshout/src/common/httpp/encoding.c.strings	2015-11-20 20:51:36.000000000 +0100
++++ libshout/src/common/httpp/encoding.c	2018-03-29 11:00:04.524097700 +0200
+@@ -27,7 +27,9 @@
+ #endif
+ 
+ #include <sys/types.h>
++#ifdef HAVE_STRINGS_H
+ #include <strings.h>
++#endif
+ #include <string.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+--- libshout/src/proto_http.c.strings	2015-11-20 17:22:27.000000000 +0100
++++ libshout/src/proto_http.c	2018-03-29 10:53:02.770498200 +0200
+@@ -28,7 +28,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#ifdef HAVE_STRINGS_H
+ #include <strings.h>
++#endif
+ 
+ #include <shout/shout.h>
+ #include "shout_private.h"
+--- libshout/src/shout.c.strings	2015-11-09 12:54:12.000000000 +0100
++++ libshout/src/shout.c	2018-03-29 10:52:59.169968800 +0200
+@@ -29,7 +29,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#ifdef HAVE_STRINGS_H
+ #include <strings.h>
++#endif
+ #include <errno.h>
+ 
+ #include <shout/shout.h>