vlc/vlc-1.2 | branch: master | Rafaël Carré <[email protected]> | Sun Jan 22 03:57:03 2012 -0500| [1a8689119367ef91167d1da8338fbd41e013108e] | committer: Jean-Baptiste Kempf
contrib: live555: android: patch live before moving Fix error if interrupted in the process (cherry picked from commit d6411a2a2a3d7eba00b1aa78bcb7060181d43358) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=1a8689119367ef91167d1da8338fbd41e013108e --- contrib/src/live555/android.patch | 12 ++++++------ contrib/src/live555/rules.mak | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/contrib/src/live555/android.patch b/contrib/src/live555/android.patch index 8606355..b75af73 100644 --- a/contrib/src/live555/android.patch +++ b/contrib/src/live555/android.patch @@ -1,6 +1,6 @@ -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 +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 @@ if (!IsMulticastAddress(groupAddress)) return True; // ignore this case @@ -27,9 +27,9 @@ diff -ur live555.orig/groupsock/GroupsockHelper.cpp live555/groupsock/GroupsockH if (setsockopt(socket, IPPROTO_IP, IP_DROP_SOURCE_MEMBERSHIP, (const char*)&imr, sizeof (struct ip_mreq_source)) < 0) { return False; -diff -ur live555.orig/Makefile.tail live555/Makefile.tail ---- live555.orig/Makefile.tail 2012-01-19 16:56:57.038348232 -0500 -+++ live555/Makefile.tail 2012-01-19 16:57:10.470348233 -0500 +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) diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak index d90c9b7..340c79f 100644 --- a/contrib/src/live555/rules.mak +++ b/contrib/src/live555/rules.mak @@ -15,10 +15,10 @@ live555: $(LIVE555_FILE) .sum-live555 rm -Rf live $(UNPACK) chmod -R u+w live - mv live $@ ifdef HAVE_ANDROID patch -p0 < $(SRC)/live555/android.patch endif + mv live $@ touch $@ LIVE_TARGET = $(error live555 target not defined!) _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
