vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Fri Jan 24 14:44:42 2014 +0100| [b81456fb970d3586f968f0c29eca5190e9944d88] | committer: Jean-Baptiste Kempf
Contribs: Remove unneeded Android patch > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b81456fb970d3586f968f0c29eca5190e9944d88 --- contrib/src/live555/android.patch | 21 --------------------- contrib/src/live555/rules.mak | 1 - 2 files changed, 22 deletions(-) diff --git a/contrib/src/live555/android.patch b/contrib/src/live555/android.patch deleted file mode 100644 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 b66415f..014f290 100644 --- 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 $@ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
