Skip to content

V
vlc-2-2
Commit d6411a2a authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

contrib: live555: android: patch live before moving 

Fix error if interrupted in the process
parent 1a4006ed
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
contrib/src/live555/android.patch
View file @ d6411a2a
diff -ur live555.orig/groupsock/GroupsockHelper.cpp live555/groupsock/GroupsockHelper.cpp diff -ur live.orig/groupsock/GroupsockHelper.cpp live/groupsock/GroupsockHelper.cpp
--- live555.orig/groupsock/GroupsockHelper.cpp 2012-01-19 16:56:57.026348234 -0500 --- live.orig/groupsock/GroupsockHelper.cpp 2012-01-19 16:56:57.026348234 -0500
+++ live555/groupsock/GroupsockHelper.cpp 2012-01-19 16:57:10.470348233 -0500 +++ live/groupsock/GroupsockHelper.cpp 2012-01-19 16:57:10.470348233 -0500
@@ -466,9 +466,9 @@ @@ -466,9 +466,9 @@
if (!IsMulticastAddress(groupAddress)) return True; // ignore this case if (!IsMulticastAddress(groupAddress)) return True; // ignore this case
...@@ -27,9 +27,9 @@ diff -ur live555.orig/groupsock/GroupsockHelper.cpp live555/groupsock/GroupsockH ...@@ -27,9 +27,9 @@ diff -ur live555.orig/groupsock/GroupsockHelper.cpp live555/groupsock/GroupsockH
if (setsockopt(socket, IPPROTO_IP, IP_DROP_SOURCE_MEMBERSHIP, if (setsockopt(socket, IPPROTO_IP, IP_DROP_SOURCE_MEMBERSHIP,
(const char*)&imr, sizeof (struct ip_mreq_source)) < 0) { (const char*)&imr, sizeof (struct ip_mreq_source)) < 0) {
return False; return False;
diff -ur live555.orig/Makefile.tail live555/Makefile.tail diff -ur live.orig/Makefile.tail live/Makefile.tail
--- live555.orig/Makefile.tail 2012-01-19 16:56:57.038348232 -0500 --- live.orig/Makefile.tail 2012-01-19 16:56:57.038348232 -0500
+++ live555/Makefile.tail 2012-01-19 16:57:10.470348233 -0500 +++ live/Makefile.tail 2012-01-19 16:57:10.470348233 -0500
@@ -14,8 +14,8 @@ @@ -14,8 +14,8 @@
cd $(GROUPSOCK_DIR) ; $(MAKE) cd $(GROUPSOCK_DIR) ; $(MAKE)
cd $(USAGE_ENVIRONMENT_DIR) ; $(MAKE) cd $(USAGE_ENVIRONMENT_DIR) ; $(MAKE)
......
contrib/src/live555/rules.mak
View file @ d6411a2a
...@@ -15,10 +15,10 @@ live555: $(LIVE555_FILE) .sum-live555 ...@@ -15,10 +15,10 @@ live555: $(LIVE555_FILE) .sum-live555
rm -Rf live rm -Rf live
$(UNPACK) $(UNPACK)
chmod -R u+w live chmod -R u+w live
mv live $@
ifdef HAVE_ANDROID ifdef HAVE_ANDROID
patch -p0 < $(SRC)/live555/android.patch patch -p0 < $(SRC)/live555/android.patch
endif endif
mv live $@
touch $@ touch $@
LIVE_TARGET = $(error live555 target not defined!) LIVE_TARGET = $(error live555 target not defined!)
......
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