[vlc-devel] [PATCH 4/5] contrib: live555: fix FTBFS on glibc >= 2.26

[Sean McGovern]

Recent glibc no longer ships xlocale.h.
---
 contrib/src/live555/no_xlocale_h.patch | 12 ++++++++++++
 contrib/src/live555/rules.mak          |  2 ++
 2 files changed, 14 insertions(+)
 create mode 100644 contrib/src/live555/no_xlocale_h.patch

diff --git a/contrib/src/live555/no_xlocale_h.patch b/contrib/src/live555/no_xlocale_h.patch
new file mode 100644
index 0000000..94d5712
--- /dev/null
+++ b/contrib/src/live555/no_xlocale_h.patch
@@ -0,0 +1,12 @@
+--- live555/liveMedia/include/Locale.hh.orig	2016-11-28 16:42:18.000000000 -0500
++++ live555/liveMedia/include/Locale.hh	2018-02-06 03:21:43.538199390 -0500
+@@ -43,9 +43,6 @@
+ 
+ #ifndef LOCALE_NOT_USED
+ #include <locale.h>
+-#ifndef XLOCALE_NOT_USED
+-#include <xlocale.h> // because, on some systems, <locale.h> doesn't include <xlocale.h>; this makes sure that we get both
+-#endif
+ #endif
+ 
+ 
diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
index 59fa145..f800d60 100644
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@ -74,6 +74,8 @@ endif
 	$(APPLY) $(SRC)/live555/add-pkgconfig-file.patch
 	# Expose Server:
 	$(APPLY) $(SRC)/live555/expose_server_string.patch
+	# Fix FTBFS on glibc >= 2.26
+	$(APPLY) $(SRC)/live555/no_xlocale_h.patch
 
 	mv live.$(LIVE555_VERSION) $@ && touch $@
 
-- 
2.7.4