Commit b897457c authored by Rafaël Carré's avatar Rafaël Carré
Browse files

drop live555 patch

parent dc0e019b
From eef45a21a5aba9eaebc08964f3063145ea320039 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Sun, 31 Jul 2011 00:05:21 +0200
Subject: [PATCH 4/7] Old contribs: compile live on Android
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
---
extras/contrib/src/Patches/live-android.patch | 55 +++++++++++++++++++++++++
extras/contrib/src/contrib-src.mak | 3 +
2 files changed, 58 insertions(+), 0 deletions(-)
create mode 100644 extras/contrib/src/Patches/live-android.patch
diff --git a/extras/contrib/src/Patches/live-android.patch b/extras/contrib/src/Patches/live-android.patch
new file mode 100644
index 0000000..e2f4b2e
--- /dev/null
+++ b/extras/contrib/src/Patches/live-android.patch
@@ -0,0 +1,55 @@
+diff -ruN live/Makefile.tail live.new/Makefile.tail
+--- live/Makefile.tail 2011-03-15 08:40:37.000000000 +0900
++++ live.new/Makefile.tail 2011-04-13 17:20:54.238795233 +0900
+@@ -14,8 +14,8 @@
+ cd $(GROUPSOCK_DIR) ; $(MAKE)
+ cd $(USAGE_ENVIRONMENT_DIR) ; $(MAKE)
+ cd $(BASIC_USAGE_ENVIRONMENT_DIR) ; $(MAKE)
+- cd $(TESTPROGS_DIR) ; $(MAKE)
+- cd $(MEDIA_SERVER_DIR) ; $(MAKE)
++# cd $(TESTPROGS_DIR) ; $(MAKE)
++# cd $(MEDIA_SERVER_DIR) ; $(MAKE)
+
+ clean:
+ cd $(LIVEMEDIA_DIR) ; $(MAKE) clean
+diff -ruN live/groupsock/GroupsockHelper.cpp live.new/groupsock/GroupsockHelper.cpp
+--- live/groupsock/GroupsockHelper.cpp 2011-03-15 08:40:37.000000000 +0900
++++ live.new/groupsock/GroupsockHelper.cpp 2011-03-25 17:52:53.829087921 +0900
+@@ -424,9 +424,9 @@
+ if (!IsMulticastAddress(groupAddress)) return True; // ignore this case
+
+ struct ip_mreq_source imr;
+- imr.imr_multiaddr.s_addr = groupAddress;
+- imr.imr_sourceaddr.s_addr = sourceFilterAddr;
+- imr.imr_interface.s_addr = ReceivingInterfaceAddr;
++ imr.imr_multiaddr = groupAddress;
++ imr.imr_sourceaddr = sourceFilterAddr;
++ imr.imr_interface = ReceivingInterfaceAddr;
+ if (setsockopt(socket, IPPROTO_IP, IP_ADD_SOURCE_MEMBERSHIP,
+ (const char*)&imr, sizeof (struct ip_mreq_source)) < 0) {
+ socketErr(env, "setsockopt(IP_ADD_SOURCE_MEMBERSHIP) error: ");
+@@ -442,9 +442,9 @@
+ if (!IsMulticastAddress(groupAddress)) return True; // ignore this case
+
+ struct ip_mreq_source imr;
+- imr.imr_multiaddr.s_addr = groupAddress;
+- imr.imr_sourceaddr.s_addr = sourceFilterAddr;
+- imr.imr_interface.s_addr = ReceivingInterfaceAddr;
++ imr.imr_multiaddr = groupAddress;
++ imr.imr_sourceaddr = sourceFilterAddr;
++ imr.imr_interface = ReceivingInterfaceAddr;
+ if (setsockopt(socket, IPPROTO_IP, IP_DROP_SOURCE_MEMBERSHIP,
+ (const char*)&imr, sizeof (struct ip_mreq_source)) < 0) {
+ return False;
+--- live/config.armlinux.orig 2011-08-22 23:59:33.000000000 +0200
++++ live/config.armlinux 2011-08-30 17:27:45.266588936 +0200
+@@ -1,5 +1,7 @@
+-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
++-include ../../../config.mak
++
++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
+ C = c
+ C_COMPILER = $(CROSS_COMPILE)gcc
+ C_FLAGS = $(COMPILE_OPTS)
diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index f0739b6..a058eb7 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -1250,6 +1250,9 @@ ifndef HAVE_WINCE
patch -p0 < Patches/live-getaddrinfo.patch
endif
endif
+ifdef HAVE_ANDROID
+ patch -p0 < Patches/live-android.patch
+endif
LIVE_TARGET-$(ENABLED) = linux
LIVE_TARGET-$(HAVE_WIN32) = mingw
--
1.7.5.4
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment