Contribs: Remove unneeded Android patch

diff --git a/contrib/src/live555/android.patch b/contrib/src/live555/android.patch
deleted file mode 100644 (file)
index 3918a76..0000000
--- a/contrib/src/live555/android.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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;
--#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;
--#ifdef ANDROID
-+#ifdef __ANDROID__
-     imr.imr_multiaddr = groupAddress;
-     imr.imr_sourceaddr = sourceFilterAddr;
-     imr.imr_interface = ReceivingInterfaceAddr;

diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
index b66415f496f43b7732bb532dd6307c0d46a74dab..014f29072ea2e2f2dad42ee29b89410b0e965937 100644 (file)
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@ -49,7 +49,6 @@ endif
        cd live && sed -e 's%-D_FILE_OFFSET_BITS=64%-D_FILE_OFFSET_BITS=64\ -fPIC\ -DPIC%' -i.orig config.linux
 ifdef HAVE_ANDROID
        cd live && sed -e 's%-DPIC%-DPIC -DNO_SSTREAM=1 -DLOCALE_NOT_USED -I$(ANDROID_NDK)/platforms/android-9/arch-$(PLATFORM_SHORT_ARCH)/usr/include%' -i.orig config.linux
-       patch -p0 < $(SRC)/live555/android.patch
 endif
        mv live $@
        touch $@