Commit ba1a4be1 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Contribs: fix android compilation and build only the library

parent c98e5d95
diff -ur live.orig/groupsock/GroupsockHelper.cpp live/groupsock/GroupsockHelper.cpp diff -ruN live/groupsock/GroupsockHelper.cpp live.n/groupsock/GroupsockHelper.cpp
--- live.orig/groupsock/GroupsockHelper.cpp 2012-01-19 16:56:57.026348234 -0500 --- live/groupsock/GroupsockHelper.cpp 2012-08-20 09:33:31.000000000 +0200
+++ live/groupsock/GroupsockHelper.cpp 2012-01-19 16:57:10.470348233 -0500 +++ live.n/groupsock/GroupsockHelper.cpp 2012-08-20 10:58:28.598217212 +0200
@@ -466,9 +466,9 @@ @@ -466,7 +466,7 @@
if (!IsMulticastAddress(groupAddress)) return True; // ignore this case if (!IsMulticastAddress(groupAddress)) return True; // ignore this case
struct ip_mreq_source imr; struct ip_mreq_source imr;
- imr.imr_multiaddr.s_addr = groupAddress; -#ifdef ANDROID
- imr.imr_sourceaddr.s_addr = sourceFilterAddr; +#ifdef __ANDROID__
- imr.imr_interface.s_addr = ReceivingInterfaceAddr; imr.imr_multiaddr = groupAddress;
+ imr.imr_multiaddr = groupAddress; imr.imr_sourceaddr = sourceFilterAddr;
+ imr.imr_sourceaddr = sourceFilterAddr; imr.imr_interface = ReceivingInterfaceAddr;
+ imr.imr_interface = ReceivingInterfaceAddr; @@ -490,7 +490,7 @@
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: ");
@@ -484,9 +484,9 @@
if (!IsMulticastAddress(groupAddress)) return True; // ignore this case if (!IsMulticastAddress(groupAddress)) return True; // ignore this case
struct ip_mreq_source imr; struct ip_mreq_source imr;
- imr.imr_multiaddr.s_addr = groupAddress; -#ifdef ANDROID
- imr.imr_sourceaddr.s_addr = sourceFilterAddr; +#ifdef __ANDROID__
- imr.imr_interface.s_addr = ReceivingInterfaceAddr; imr.imr_multiaddr = groupAddress;
+ imr.imr_multiaddr = groupAddress; imr.imr_sourceaddr = sourceFilterAddr;
+ imr.imr_sourceaddr = sourceFilterAddr; imr.imr_interface = ReceivingInterfaceAddr;
+ imr.imr_interface = ReceivingInterfaceAddr;
if (setsockopt(socket, IPPROTO_IP, IP_DROP_SOURCE_MEMBERSHIP,
(const char*)&imr, sizeof (struct ip_mreq_source)) < 0) {
return False;
diff -ur live.orig/Makefile.tail live/Makefile.tail
--- live.orig/Makefile.tail 2012-01-19 16:56:57.038348232 -0500
+++ live/Makefile.tail 2012-01-19 16:57:10.470348233 -0500
@@ -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
...@@ -54,7 +54,7 @@ endif ...@@ -54,7 +54,7 @@ endif
.live555: live555 .live555: live555
cd $< && ./genMakefiles $(LIVE_TARGET) cd $< && ./genMakefiles $(LIVE_TARGET)
cd $< && $(MAKE) $(HOSTVARS) cd $< && $(MAKE) $(HOSTVARS) groupsock liveMedia UsageEnvironment BasicUsageEnvironment
mkdir -p -- "$(PREFIX)/lib" "$(PREFIX)/include" mkdir -p -- "$(PREFIX)/lib" "$(PREFIX)/include"
cp \ cp \
$</groupsock/libgroupsock.a \ $</groupsock/libgroupsock.a \
...@@ -66,7 +66,7 @@ endif ...@@ -66,7 +66,7 @@ endif
$</groupsock/include/*.hh \ $</groupsock/include/*.hh \
$</groupsock/include/*.h \ $</groupsock/include/*.h \
$</liveMedia/include/*.hh \ $</liveMedia/include/*.hh \
$</UsageEnvironment/include/*.hh \ $</UsageEnvironment/include/*.hh \
$</BasicUsageEnvironment/include/*.hh \ $</BasicUsageEnvironment/include/*.hh \
"$(PREFIX)/include/" "$(PREFIX)/include/"
touch $@ touch $@
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