contribs: live555 compilation fix

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 523edda273fe78f6853fe651158b6882569e1a8a..8744d83c33ae5b2bcd275f3bdf0c6b8bf4956afc 100644 (file)
--- 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 4870161ac51824b7f0a281cd6bbd98f914bb9de1..e1f540156b77bca428e2a48e954f4b82cc8460fb 100644 (file)
--- 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