vlc/vlc-1.2 | branch: master | Rafaël Carré <[email protected]> | Sun Jan 22 03:55:59 2012 -0500| [02fe18310fb218daf50a7bc2065890ca25e955da] | committer: Jean-Baptiste Kempf
contrib: live555: android: don't update config.armlinux (cherry picked from commit 1a4006ed1695eb8ca385bae15176b4fef974b931) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=02fe18310fb218daf50a7bc2065890ca25e955da --- contrib/src/live555/android.patch | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/contrib/src/live555/android.patch b/contrib/src/live555/android.patch index 621675a..8606355 100644 --- a/contrib/src/live555/android.patch +++ b/contrib/src/live555/android.patch @@ -1,14 +1,3 @@ -diff -ur live555.orig/config.armlinux live555/config.armlinux ---- live555.orig/config.armlinux 2012-01-19 16:56:57.026348234 -0500 -+++ live555/config.armlinux 2012-01-19 16:57:42.806348231 -0500 -@@ -1,5 +1,5 @@ --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 -+CROSS_COMPILE?= arm-linux-androideabi- -+COMPILE_OPTS = $(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -DNO_SSTREAM=1 -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -I$(ANDROID_NDK)/platforms/android-9/arch-arm/usr/include -DLOCALE_NOT_USED - C = c - C_COMPILER = $(CROSS_COMPILE)gcc - C_FLAGS = $(COMPILE_OPTS) diff -ur live555.orig/groupsock/GroupsockHelper.cpp live555/groupsock/GroupsockHelper.cpp --- live555.orig/groupsock/GroupsockHelper.cpp 2012-01-19 16:56:57.026348234 -0500 +++ live555/groupsock/GroupsockHelper.cpp 2012-01-19 16:57:10.470348233 -0500 _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
