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
ba1a4be1
Commit
ba1a4be1
authored
Aug 20, 2012
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Contribs: fix android compilation and build only the library
parent
c98e5d95
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
40 deletions
+18
-40
contrib/src/live555/android.patch
contrib/src/live555/android.patch
+15
-37
contrib/src/live555/rules.mak
contrib/src/live555/rules.mak
+3
-3
No files found.
contrib/src/live555/android.patch
View file @
ba1a4be1
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 -05
00
--- live
/groupsock/GroupsockHelper.cpp 2012-08-20 09:33:31.000000000 +02
00
+++ live
/groupsock/GroupsockHelper.cpp 2012-01-19 16:57:10.470348233 -05
00
+++ live
.n/groupsock/GroupsockHelper.cpp 2012-08-20 10:58:28.598217212 +02
00
@@ -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
contrib/src/live555/rules.mak
View file @
ba1a4be1
...
@@ -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
$@
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