From a01a2c982ad889c633c13f106ce7b3f5915c076f Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Wed, 12 Oct 2011 14:48:52 +0200 Subject: [PATCH] Make latest ZRTP a git submodule --- .gitmodules | 3 +++ README | 11 ++++++----- prepare_sources.sh | 3 ++- submodules/externals/build/libzrtpcpp/Android.mk | 2 ++ submodules/externals/libzrtpcpp | 1 + 5 files changed, 14 insertions(+), 6 deletions(-) create mode 160000 submodules/externals/libzrtpcpp diff --git a/.gitmodules b/.gitmodules index 7334733a7..b2adc916d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -40,3 +40,6 @@ [submodule "submodules/externals/libvpx"] path = submodules/externals/libvpx url = http://git.chromium.org/webm/libvpx.git +[submodule "submodules/externals/libzrtpcpp"] + path = submodules/externals/libzrtpcpp + url = git://github.com/wernerd/ZRTPCPP.git diff --git a/README b/README index 2bbc5c6d7..d44a69955 100644 --- a/README +++ b/README @@ -3,7 +3,7 @@ To build liblinphone for Android, you must: 1) download the Android ndk (>=r5c) from google. -2) install the autotools: autoconf, automake, aclocal, libtoolize +2) install the autotools: autoconf, automake, aclocal, libtoolize and cmake 3) run the ./prepare_sources.sh script in the top level directory. This will download iLBC source files and convert some assembly files in VP8 project. $ ./prepare_sources.sh @@ -13,10 +13,11 @@ To build liblinphone for Android, you must: Some options can be passed to ndk-build, like "ndk-build SOME_OPTION=SOME_VALUE" -Option Name | Possible values ----------------------------------------- -BUILD_X264 0 (don't build x264) or 1 (build x264) -BUILD_AMR 0 (don't build amr codec), light (try to use amr codec from android), full (build your own amr codec) +Option Name | Possible values +--------------------------------------------------------------------------------- +BUILD_X264 0 (don't build x264) or 1 (build x264) +BUILD_AMR 0 (don't build amr codec), light (try to use amr codec from android), full (build your own amr codec) +BUILD_GPLV3_ZRTP 0 (don't support ZRTP), 1 (support ZRTP and make the whole program GPLv3) diff --git a/prepare_sources.sh b/prepare_sources.sh index c9814a328..86c0cd8fa 100755 --- a/prepare_sources.sh +++ b/prepare_sources.sh @@ -14,4 +14,5 @@ cd submodules/libilbc-rfc3951 && ./autogen.sh && ./configure && make || ( echo " cd $topdir/submodules/externals/build/libvpx && ./asm_conversion.sh && cp *.asm *.h ../../libvpx/ || ( echo "VP8 prepare stage failed." ; exit 1 ) - +echo Preparing ZRTP (need cmake installed) +cmake -Denable-ccrtp=false submodules/externals/libzrtpcpp diff --git a/submodules/externals/build/libzrtpcpp/Android.mk b/submodules/externals/build/libzrtpcpp/Android.mk index b78eb74a8..cac26625e 100644 --- a/submodules/externals/build/libzrtpcpp/Android.mk +++ b/submodules/externals/build/libzrtpcpp/Android.mk @@ -26,6 +26,8 @@ LOCAL_SRC_FILES := \ src/ZrtpPacketHello.cpp \ src/ZrtpPacketPingAck.cpp \ src/ZrtpPacketPing.cpp \ + src/ZrtpPacketRelayAck.cpp \ + src/ZrtpPacketSASrelay.cpp \ src/ZrtpStateClass.cpp \ src/ZrtpTextData.cpp diff --git a/submodules/externals/libzrtpcpp b/submodules/externals/libzrtpcpp new file mode 160000 index 000000000..93dbdb315 --- /dev/null +++ b/submodules/externals/libzrtpcpp @@ -0,0 +1 @@ +Subproject commit 93dbdb3159f55bb35f69c13df1f60ac4901c88fb