[vlc-commits] commit: Contribs: live555 remove patch applied upstream. ( Jean-Baptiste Kempf )

[git at videolan.org]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Mar 29 21:30:28 2010 +0200| [26aa0669e55bd411bee2afb75f703b249c8f311e] | committer: Jean-Baptiste Kempf 

Contribs: live555 remove patch applied upstream.

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

 extras/contrib/src/Makefile                    |    1 -
 extras/contrib/src/Patches/live-armlinux.patch |   28 ------------------------
 2 files changed, 0 insertions(+), 29 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index a215ed6..e584a9b 100644
--- 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
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-
-+CROSS_COMPILE?=		arm-elf-
- COMPILE_OPTS =		$(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -DNO_SSTREAM=1 -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
- C =			c
- C_COMPILER =		$(CROSS_COMPILE)gcc
- C_FLAGS =		$(COMPILE_OPTS)
- CPP =			cpp
--CPLUSPLUS_COMPILER =	$(CROSS_COMPILE)gcc
-+CPLUSPLUS_COMPILER =	$(CROSS_COMPILE)g++
- CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) -Wall -DBSD=1
- OBJ =			o
--LINK =			$(CROSS_COMPILE)gcc -o
--LINK_OPTS =		-L.
-+LINK =			$(CROSS_COMPILE)g++ -o
-+LINK_OPTS =		
- CONSOLE_LINK_OPTS =	$(LINK_OPTS)
--LIBRARY_LINK =		$(CROSS_COMPILE)ar cr
-+LIBRARY_LINK =		$(CROSS_COMPILE)ar cr 
- LIBRARY_LINK_OPTS =	$(LINK_OPTS)
- LIB_SUFFIX =			a
- LIBS_FOR_CONSOLE_APPLICATION =