Commit 9f55fe99 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Contribs: update live555 after 8 months...

(cherry picked from commit c98e5d95)
(cherry picked from commit ba1a4be1)
(cherry picked from commit c3977541)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent b0935f27
6d84373dc81df478e3870acd38d72b60d61070861d4b6f394728cf21be06eb41d6e84bc97848c997fe205ec93133c5f4f67bdd7865631a148901b48629c69286 live.2011.12.23.tar.gz
9e1bbf5e662c160d05c21abdb89240d570a84ff603d9fc18b9232b7d533000d4798383d463fb4d81731bb4074fcde429c380751a2d5e551a49859ba999604395 live.2012.08.20.tar.gz
diff -ur live.orig/groupsock/GroupsockHelper.cpp live/groupsock/GroupsockHelper.cpp
--- live.orig/groupsock/GroupsockHelper.cpp 2012-01-19 16:56:57.026348234 -0500
+++ live/groupsock/GroupsockHelper.cpp 2012-01-19 16:57:10.470348233 -0500
@@ -466,9 +466,9 @@
diff -ruN live/groupsock/GroupsockHelper.cpp live.n/groupsock/GroupsockHelper.cpp
--- live/groupsock/GroupsockHelper.cpp 2012-08-20 09:33:31.000000000 +0200
+++ live.n/groupsock/GroupsockHelper.cpp 2012-08-20 10:58:28.598217212 +0200
@@ -466,7 +466,7 @@
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: ");
@@ -484,9 +484,9 @@
-#ifdef ANDROID
+#ifdef __ANDROID__
imr.imr_multiaddr = groupAddress;
imr.imr_sourceaddr = sourceFilterAddr;
imr.imr_interface = ReceivingInterfaceAddr;
@@ -490,7 +490,7 @@
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;
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
-#ifdef ANDROID
+#ifdef __ANDROID__
imr.imr_multiaddr = groupAddress;
imr.imr_sourceaddr = sourceFilterAddr;
imr.imr_interface = ReceivingInterfaceAddr;
# live555
#LIVEDOTCOM_URL := http://live555.com/liveMedia/public/live555-latest.tar.gz
LIVE555_FILE := live.2011.12.23.tar.gz
LIVEDOTCOM_URL := http://live555sourcecontrol.googlecode.com/files/$(LIVE555_FILE)
LIVE555_FILE := live.2012.08.20.tar.gz
LIVEDOTCOM_URL := http://download.videolan.org/pub/contrib/live555/$(LIVE555_FILE)
PKGS += live555
......@@ -48,7 +48,10 @@ endif
.live555: live555
cd $< && ./genMakefiles $(LIVE_TARGET)
cd $< && $(MAKE) $(HOSTVARS)
cd $< && $(MAKE) $(HOSTVARS) -C groupsock \
&& $(MAKE) $(HOSTVARS) -C liveMedia \
&& $(MAKE) $(HOSTVARS) -C UsageEnvironment \
&& $(MAKE) $(HOSTVARS) -C BasicUsageEnvironment
mkdir -p -- "$(PREFIX)/lib" "$(PREFIX)/include"
cp \
$</groupsock/libgroupsock.a \
......@@ -60,7 +63,7 @@ endif
$</groupsock/include/*.hh \
$</groupsock/include/*.h \
$</liveMedia/include/*.hh \
$</UsageEnvironment/include/*.hh \
$</BasicUsageEnvironment/include/*.hh \
$</UsageEnvironment/include/*.hh \
$</BasicUsageEnvironment/include/*.hh \
"$(PREFIX)/include/"
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