Contribs: live555 remove patch applied upstream.

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index a215ed60de0708badeb21569625fa9595a4dabed..e584a9b378511e96da42e4b7ba4d6c1905e86898 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1217,7 +1217,6 @@ live555-$(LIVEDOTCOM_VERSION).tar.gz:
 live: live555-$(LIVEDOTCOM_VERSION).tar.gz
        $(EXTRACT_GZ)
        patch -p0 < Patches/live-uselocale.patch
-       patch -p0 < Patches/live-armlinux.patch
 ifdef HAVE_WIN64
        patch -p0 < Patches/live-win64.patch
 endif

diff --git a/extras/contrib/src/Patches/live-armlinux.patch b/extras/contrib/src/Patches/live-armlinux.patch
deleted file mode 100644 (file)
index b307bfd..0000000
--- a/extras/contrib/src/Patches/live-armlinux.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Use g++ to build/link C++
-Use environment CROSS_COMPILE if present
-Do not use ar -L. when linking
-Put a space between ar options and arguments
---- live/config.armlinux.orig  2010-02-18 08:11:09.000000000 +0100
-+++ live/config.armlinux       2010-02-18 08:11:20.000000000 +0100
-@@ -1,16 +1,16 @@
--CROSS_COMPILE=                arm-elf-\r
-+CROSS_COMPILE?=               arm-elf-\r
- COMPILE_OPTS =                $(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -DNO_SSTREAM=1 -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64\r
- C =                   c\r
- C_COMPILER =          $(CROSS_COMPILE)gcc\r
- C_FLAGS =             $(COMPILE_OPTS)\r
- CPP =                 cpp\r
--CPLUSPLUS_COMPILER =  $(CROSS_COMPILE)gcc\r
-+CPLUSPLUS_COMPILER =  $(CROSS_COMPILE)g++\r
- CPLUSPLUS_FLAGS =     $(COMPILE_OPTS) -Wall -DBSD=1\r
- OBJ =                 o\r
--LINK =                        $(CROSS_COMPILE)gcc -o\r
--LINK_OPTS =           -L.\r
-+LINK =                        $(CROSS_COMPILE)g++ -o\r
-+LINK_OPTS =           \r
- CONSOLE_LINK_OPTS =   $(LINK_OPTS)\r
--LIBRARY_LINK =                $(CROSS_COMPILE)ar cr\r
-+LIBRARY_LINK =                $(CROSS_COMPILE)ar cr \r
- LIBRARY_LINK_OPTS =   $(LINK_OPTS)\r
- LIB_SUFFIX =                  a\r
- LIBS_FOR_CONSOLE_APPLICATION =\r