[vlc-devel] commit: contribs: live555 compilation fix ( Felix Paul Kühne )

[git version control]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Tue Apr  7 15:40:49 2009 +0200| [c0b34512b2ea261782ec0f62b7fb9dacf51aee22] | committer: Felix Paul Kühne 

contribs: live555 compilation fix

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

 extras/contrib/src/Makefile                     |    2 ++
 extras/contrib/src/Patches/live-uselocale.patch |    9 ---------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 523edda..8744d83 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1265,7 +1265,9 @@ live: live555-$(LIVEDOTCOM_VERSION).tar.gz
 	$(EXTRACT_GZ)
 	patch -p0 < Patches/live-noapps.patch
 	patch -p0 < Patches/live-uselocale.patch
+ifdef HAVE_WIN32
 	patch -p0 < Patches/live-win32-nonblock.patch
+endif
 
 .live: live
 ifdef HAVE_WIN32
diff --git a/extras/contrib/src/Patches/live-uselocale.patch b/extras/contrib/src/Patches/live-uselocale.patch
index 4870161..e1f5401 100644
--- a/extras/contrib/src/Patches/live-uselocale.patch
+++ b/extras/contrib/src/Patches/live-uselocale.patch
@@ -1,14 +1,5 @@
 Copyright (C) 2008 Rémi Denis-Courmont, adaptation by Felix Kühne (C) 2009.
 Licensed under GNU General Public License version 2 or higher.
-diff -urN live.orig/config.mingw live/config.mingw
---- live.orig/config.mingw	2009-03-23 01:26:16 +0300
-+++ live/config.mingw	2009-03-26 19:17:43 +0300
-@@ -1,4 +1,4 @@
--COMPILE_OPTS =         $(INCLUDES) -I. -O -DSOCKLEN_T=int
-+COMPILE_OPTS =         $(INCLUDES) -I. -O -DSOCKLEN_T=int -DLOCALE_NOT_USED
- C =                    c
- C_COMPILER =           $(CC)
- C_FLAGS =              $(COMPILE_OPTS) -DUSE_OUR_BZERO=1 -D__MINGW32__
 diff -urN live.orig/liveMedia/include/Locale.hh live/liveMedia/include/Locale.hh
 --- live.orig/liveMedia/include/Locale.hh	2009-03-23 01:26:16 +0300
 +++ live/liveMedia/include/Locale.hh	2009-03-26 19:17:43 +0300