Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
d6411a2a
Commit
d6411a2a
authored
Jan 22, 2012
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib: live555: android: patch live before moving
Fix error if interrupted in the process
parent
1a4006ed
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
contrib/src/live555/android.patch
contrib/src/live555/android.patch
+6
-6
contrib/src/live555/rules.mak
contrib/src/live555/rules.mak
+1
-1
No files found.
contrib/src/live555/android.patch
View file @
d6411a2a
diff -ur live
555.orig/groupsock/GroupsockHelper.cpp live555
/groupsock/GroupsockHelper.cpp
--- live
555
.orig/groupsock/GroupsockHelper.cpp 2012-01-19 16:56:57.026348234 -0500
+++ live
555
/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 live
555.orig/Makefile.tail live555
/Makefile.tail
--- live
555
.orig/Makefile.tail 2012-01-19 16:56:57.038348232 -0500
+++ live
555
/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)
...
...
contrib/src/live555/rules.mak
View file @
d6411a2a
...
...
@@ -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!
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment