COntribs: remove livedotcome.win32 patch, merged upstream (kudos to Ross)
authorJean-Baptiste Kempf <jb@videolan.org>
Fri, 4 Jan 2008 23:29:05 +0000 (23:29 +0000)
committerJean-Baptiste Kempf <jb@videolan.org>
Fri, 4 Jan 2008 23:29:05 +0000 (23:29 +0000)
extras/contrib/src/Makefile
extras/contrib/src/Patches/livedotcom-win32.patch [deleted file]

index 32c98c5..0dabc57 100644 (file)
@@ -1227,9 +1227,6 @@ live555-$(LIVEDOTCOM_VERSION).tar.gz:
 live: live555-$(LIVEDOTCOM_VERSION).tar.gz
        $(EXTRACT_GZ)
 #      patch -p0 < Patches/live.patch
-ifdef HAVE_WIN32 
-       patch -p0 < Patches/livedotcom-win32.patch
-endif
 ifdef HAVE_DARWIN_OS
        patch -p0 < Patches/live-osx.patch
 endif
diff --git a/extras/contrib/src/Patches/livedotcom-win32.patch b/extras/contrib/src/Patches/livedotcom-win32.patch
deleted file mode 100644 (file)
index 224dc2a..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ru live.orig/config.mingw live/config.mingw
---- live.orig/config.mingw     2005-10-23 08:50:31.000000000 +0200
-+++ live/config.mingw  2005-10-23 17:09:35.000000000 +0200
-@@ -1,15 +1,15 @@
- COMPILE_OPTS =         $(INCLUDES) -I. -O -DSOCKLEN_T=int
- C =                    c
--C_COMPILER =           gcc
--C_FLAGS =              $(COMPILE_OPTS) -DUSE_OUR_BZERO=1 -D__MINGW32__
-+C_COMPILER =           $(CC)
-+C_FLAGS =              $(COMPILE_OPTS) -DUSE_OUR_BZERO=1 -D__MINGW32__ -DUSE_LOCALE
- CPP =                  cpp
--CPLUSPLUS_COMPILER =   c++
--CPLUSPLUS_FLAGS =      $(COMPILE_OPTS) -D__MINGW32__ -Wall -Wno-deprecated
-+CPLUSPLUS_COMPILER =   $(CXX)
-+CPLUSPLUS_FLAGS =      $(COMPILE_OPTS) -D__MINGW32__ -DUSE_LOCALE -Wall -Wno-deprecated 
- OBJ =                  o
--LINK =                 c++ -o 
-+LINK =                 $(CXX) -o 
- LINK_OPTS =            -L.
- CONSOLE_LINK_OPTS =    $(LINK_OPTS)
--LIBRARY_LINK =         ld -o 
-+LIBRARY_LINK =         $(LD) -o 
- LIBRARY_LINK_OPTS =    $(LINK_OPTS) -r -Bstatic
- LIB_SUFFIX =                   a
- LIBS_FOR_CONSOLE_APPLICATION = -lws2_32