From: Clément Stenac <zorglub@videolan.org>
Date: Sun, 23 Oct 2005 15:34:37 +0000 (+0000)
Subject: Backport OS X specific USE_LOCALE patch to trunk/
X-Git-Tag: 0.8.4~164
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=5165e593cb45ef83adc53c923e3d722963d02af0;p=vlc

Backport OS X specific USE_LOCALE patch to trunk/
---

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index ce154d70fb..84fad492dc 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -865,6 +865,7 @@ live555-$(LIVEDOTCOM_VERSION).tar.gz:
 live: live555-$(LIVEDOTCOM_VERSION).tar.gz
 	$(EXTRACT_GZ)
 	patch -p 0 < Patches/live.patch
+	patch -p 0 < Patches/livedotcom-osx.patch
 
 .live: live
 ifeq ($(HOST),ppc-darwin)
diff --git a/extras/contrib/src/Patches/livedotcom-osx.patch b/extras/contrib/src/Patches/livedotcom-osx.patch
new file mode 100644
index 0000000000..8a0a34bcac
--- /dev/null
+++ b/extras/contrib/src/Patches/livedotcom-osx.patch
@@ -0,0 +1,15 @@
+--- live.orig/config.macosx	2005-10-23 08:50:31.000000000 +0200
++++ live/config.macosx	2005-10-23 17:10:57.000000000 +0200
+@@ -1,10 +1,10 @@
+ COMPILE_OPTS =		$(INCLUDES) -I. -DBSD=1 -O -DSOCKLEN_T=socklen_t
+ C =			c
+ C_COMPILER =		cc
+-C_FLAGS =		$(COMPILE_OPTS)
++C_FLAGS =		$(COMPILE_OPTS) -DUSE_LOCALE
+ CPP =			cpp
+ CPLUSPLUS_COMPILER =	c++
+-CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) -Wall
++CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) -Wall -DUSE_LOCALE
+ OBJ =			o
+ LINK =			c++ -o 
+ LINK_OPTS =		-L.