From 96029f3ece167bc002a5655448f68f7731f4bd34 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 28 Dec 2017 15:28:59 +0100 Subject: [PATCH 01/13] Fix missing audio on incoming call by cherrypicking the fix on submodule/linphone. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 20efb4ad4..c0e206650 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 20efb4ad41357daf700fa393dbcae9fdb3ab2730 +Subproject commit c0e20665031cdc6dadd245ebf99daf4cb4118b4f From c7186b6313d12f4c030800cec11a7234a50feaba Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Thu, 28 Dec 2017 16:49:35 +0100 Subject: [PATCH 02/13] Update version number --- AndroidManifest.xml | 6 +++--- AndroidManifestLibrary.xml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 4d7a82b07..3565d458b 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2,8 +2,8 @@ + android:versionCode="3320" + android:versionName="3.3.2"> - \ No newline at end of file + diff --git a/AndroidManifestLibrary.xml b/AndroidManifestLibrary.xml index 7bc83f320..1d333c9de 100755 --- a/AndroidManifestLibrary.xml +++ b/AndroidManifestLibrary.xml @@ -2,8 +2,8 @@ + android:versionCode="3320" + android:versionName="3.3.2"> Date: Fri, 12 Jan 2018 17:38:38 +0100 Subject: [PATCH 03/13] Update submodules --- submodules/belcard | 2 +- submodules/belr | 2 +- submodules/linphone | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/submodules/belcard b/submodules/belcard index b9e1951be..2d04062e8 160000 --- a/submodules/belcard +++ b/submodules/belcard @@ -1 +1 @@ -Subproject commit b9e1951be4575c62e326d761a7f7c79c5cce9cb9 +Subproject commit 2d04062e83f43ff249c6b0dad9fbdf7e3f4cd436 diff --git a/submodules/belr b/submodules/belr index 9364d69fb..6dc5d2f9d 160000 --- a/submodules/belr +++ b/submodules/belr @@ -1 +1 @@ -Subproject commit 9364d69fb16b058066a129f993558d764a6836cf +Subproject commit 6dc5d2f9d37ba094cf397135c16b47375261be83 diff --git a/submodules/linphone b/submodules/linphone index 3b6978839..fd4827f90 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 3b69788398f70e138d1d60d22621a3d570942e1b +Subproject commit fd4827f907e7b24ae97e675f52204a321ec1ce57 From 1d1e720e42da7b585d0c5e13969658e88d837e13 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 17 Jan 2018 18:25:54 +0100 Subject: [PATCH 04/13] Fix compilation --- submodules/belr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/belr b/submodules/belr index 6dc5d2f9d..61244560d 160000 --- a/submodules/belr +++ b/submodules/belr @@ -1 +1 @@ -Subproject commit 6dc5d2f9d37ba094cf397135c16b47375261be83 +Subproject commit 61244560df5f4f45a495d8525e970aa73e4e3beb From 15ea1bce2e772a5202b06efd5fa9962d3504879e Mon Sep 17 00:00:00 2001 From: Danmei Chen Date: Thu, 18 Jan 2018 15:02:48 +0100 Subject: [PATCH 05/13] update mediasteamer2 --- submodules/mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index 927dda741..9f73be628 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit 927dda7418fef78d92e1c3da18854841de9da605 +Subproject commit 9f73be62887963079856a3c9b5ce66cdbf420ff1 From c3125f35ef277004b2f5aff2a9442f6d451be8bd Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Fri, 19 Jan 2018 10:09:25 +0100 Subject: [PATCH 06/13] Update submodule cmake-builder --- submodules/cmake-builder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/cmake-builder b/submodules/cmake-builder index ed5a622a9..a6dff67cc 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit ed5a622a91da4014b18470e2ef4fcfc5d482dc36 +Subproject commit a6dff67cc8e5bb1e930cf1629dec835f94d6d626 From a2769575233e532f310b804698850a9b9ec85e52 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Fri, 19 Jan 2018 10:12:51 +0100 Subject: [PATCH 07/13] Update submodule bzrtp --- submodules/bzrtp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/bzrtp b/submodules/bzrtp index 37adaa053..7515af934 160000 --- a/submodules/bzrtp +++ b/submodules/bzrtp @@ -1 +1 @@ -Subproject commit 37adaa0536432149a51332d8eb04973a3ba6bac9 +Subproject commit 7515af934e5fa96c7e59f94f49c8bd25dd3ce071 From 5f234569e2eb09b50ae7793f5802a2eb47fd50bc Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 19 Jan 2018 12:29:55 +0100 Subject: [PATCH 08/13] Updated ms2 --- submodules/mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index 9f73be628..28c00fa23 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit 9f73be62887963079856a3c9b5ce66cdbf420ff1 +Subproject commit 28c00fa23befda6619c4d0eec888a148ea88d77a From c8e07c493240b8800e2f3e0190cee95924d8d72c Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 19 Jan 2018 12:45:03 +0100 Subject: [PATCH 09/13] Updated ms2 --- submodules/mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index 28c00fa23..2a508c62e 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit 28c00fa23befda6619c4d0eec888a148ea88d77a +Subproject commit 2a508c62e60a3b416e0db3df8090ff01f802675d From c5306f3cddd0be7daba86adff63e385ab3a16d89 Mon Sep 17 00:00:00 2001 From: Danmei Chen Date: Fri, 19 Jan 2018 15:29:56 +0100 Subject: [PATCH 10/13] update mediastreamer2 for compability of using srtp2 --- submodules/mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index 2a508c62e..979034983 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit 2a508c62e60a3b416e0db3df8090ff01f802675d +Subproject commit 97903498364ae2596e790cb2c2ce9ac76c04d64a From 03e848d0e8ae95b6795d2d2816cd059dd7b1c84d Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 19 Jan 2018 15:33:04 +0100 Subject: [PATCH 11/13] [Switch submodule branch] Update cmake-builder submodule. --- cmake_builder/CMakeLists.txt | 25 +++++++++++++++++++++++++ prepare.py | 34 +++++++++++++++++++++++++++++++--- submodules/cmake-builder | 2 +- 3 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 cmake_builder/CMakeLists.txt diff --git a/cmake_builder/CMakeLists.txt b/cmake_builder/CMakeLists.txt new file mode 100644 index 000000000..4b1c79c12 --- /dev/null +++ b/cmake_builder/CMakeLists.txt @@ -0,0 +1,25 @@ +############################################################################ +# CMakeLists.txt +# Copyright (C) 2018 Belledonne Communications, Grenoble France +# +############################################################################ +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +############################################################################ + +# Blacklist these dependencies because they are useless for now +lcb_blacklist_dependencies("libxsd" "xerces-c" "soci") + diff --git a/prepare.py b/prepare.py index 07e1ca57d..992d8fd0a 100755 --- a/prepare.py +++ b/prepare.py @@ -50,6 +50,10 @@ class AndroidTarget(prepare.Target): self.toolchain_file = 'toolchains/toolchain-android-' + arch + '.cmake' self.output = 'liblinphone-sdk/android-' + arch self.external_source_path = os.path.join(current_path, 'submodules') + external_builders_path = os.path.join(current_path, 'cmake_builder') + self.additional_args = [ + "-DLINPHONE_BUILDER_EXTERNAL_BUILDERS_PATH=" + external_builders_path + ] class AndroidArmTarget(AndroidTarget): @@ -140,7 +144,7 @@ class AndroidPreparator(prepare.Preparator): retval = True ndk_build = find_executable('ndk-build') ndk_path = os.path.dirname(ndk_build) - # NDK prior to r11 had a RELEASE.TXT file holding the version number + # NDK prior to r11 had a RELEASE.TXT file holding the version number release_file = os.path.join(ndk_path, 'RELEASE.TXT') if os.path.isfile(release_file): version = open(release_file).read().strip() @@ -156,8 +160,19 @@ class AndroidPreparator(prepare.Preparator): if len(python_config_files) > 0: version = open(python_config_files[0]).readlines()[0] res = re.match('^.*/(aosp-)?ndk-r(\d+).*$', version) - version = int(res.group(2)) - retval = False + if res is not None: # Will be if NDK < 16 + version = int(res.group(2)) + retval = False + else: + release_file = os.path.join(ndk_path, 'source.properties') # Since NDK 16 + if os.path.isfile(release_file): + version = open(release_file).read().strip() + res = re.findall(r'(?:(\d+))', version) + version = int(res[0]) + retval = False + else: + error("Could not get Android NDK version!") + sys.exit(-1) else: error("Could not get Android NDK version!") sys.exit(-1) @@ -238,6 +253,7 @@ $(TOPDIR)/res/raw/rootca.pem: copy-libs: \trm -rf libs-debug/armeabi \trm -rf libs/armeabi +\trm -rf src/linphone-wrapper && mkdir -p src/linphone-wrapper/ \tif test -d "liblinphone-sdk/android-arm"; then \\ \t\tmkdir -p libs-debug/armeabi && \\ \t\tcp -f liblinphone-sdk/android-arm/lib/lib*.so libs-debug/armeabi && \\ @@ -304,6 +320,18 @@ copy-libs: \t\tcp -f liblinphone-sdk/android-x86/bin/gdbserver libs/x86 && \\ \t\tcp -f liblinphone-sdk/android-x86/bin/gdb.setup libs/x86; \\ \tfi +\tif test -d "liblinphone-sdk/android-arm/share/linphonej"; then \\ +\t\tcp -R liblinphone-sdk/android-arm/share/linphonej/java/* src/linphone-wrapper; \\ +\tfi +\tif test -d "liblinphone-sdk/android-armv7/share/linphonej"; then \\ +\t\tcp -R liblinphone-sdk/android-armv7/share/linphonej/java/* src/linphone-wrapper; \\ +\tfi +\tif test -d "liblinphone-sdk/android-arm64/share/linphonej"; then \\ +\t\tcp -R liblinphone-sdk/android-arm64/share/linphonej/java/* src/linphone-wrapper; \\ +\tfi +\tif test -d "liblinphone-sdk/android-x86/share/linphonej"; then \\ +\t\tcp -R liblinphone-sdk/android-x86/share/linphonej/java/* src/linphone-wrapper; \\ +\tfi copy-libs-mediastreamer: \trm -rf submodules/mediastreamer2/java/libs/armeabi diff --git a/submodules/cmake-builder b/submodules/cmake-builder index a6dff67cc..bd9735547 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit a6dff67cc8e5bb1e930cf1629dec835f94d6d626 +Subproject commit bd973554739e1e991a8726e6a9b80ba0e78950fa From 43812a8b8c33e5b8a96cafdf3cdcc85ce1b609e8 Mon Sep 17 00:00:00 2001 From: Danmei Chen Date: Fri, 19 Jan 2018 15:37:47 +0100 Subject: [PATCH 12/13] [Switch submodule branch] update srtp2 --- submodules/externals/srtp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/externals/srtp b/submodules/externals/srtp index a752d47da..59430f48d 160000 --- a/submodules/externals/srtp +++ b/submodules/externals/srtp @@ -1 +1 @@ -Subproject commit a752d47da1a80e634f81a57bb975b6a80fc14ffa +Subproject commit 59430f48d4e1032238c34508c036ed5ca013d417 From 81e8420eb4696f3b1b5e09e23434e72814b1d48b Mon Sep 17 00:00:00 2001 From: Danmei Chen Date: Mon, 22 Jan 2018 10:36:32 +0100 Subject: [PATCH 13/13] update srtp --- submodules/externals/srtp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/externals/srtp b/submodules/externals/srtp index 59430f48d..451b1daa3 160000 --- a/submodules/externals/srtp +++ b/submodules/externals/srtp @@ -1 +1 @@ -Subproject commit 59430f48d4e1032238c34508c036ed5ca013d417 +Subproject commit 451b1daa314dfdb20d59433a92dda0319b5d8c11