From 5b491da363e27136ccf55663cba1dc33b6c680a1 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Tue, 26 Jun 2018 14:44:26 +0200 Subject: [PATCH 01/21] Update submodules -bctoolbox -belcard -belle-sip -belr -linphone -mediastreamer2 --- submodules/bctoolbox | 2 +- submodules/belcard | 2 +- submodules/belr | 2 +- submodules/linphone | 2 +- submodules/mediastreamer2 | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/submodules/bctoolbox b/submodules/bctoolbox index 3eef7b372..ed53ae3c9 160000 --- a/submodules/bctoolbox +++ b/submodules/bctoolbox @@ -1 +1 @@ -Subproject commit 3eef7b37214cc8a3fc1453fe92ac483a6b388f08 +Subproject commit ed53ae3c9da4fb15c13454153383014b3257939a diff --git a/submodules/belcard b/submodules/belcard index b1622d7dd..ab5416d66 160000 --- a/submodules/belcard +++ b/submodules/belcard @@ -1 +1 @@ -Subproject commit b1622d7ddf1cbe6a0f929537861dfa8b45b293c4 +Subproject commit ab5416d66620f32ff6882b6e29dec63203dbca41 diff --git a/submodules/belr b/submodules/belr index 8e841b047..cfad8fcc2 160000 --- a/submodules/belr +++ b/submodules/belr @@ -1 +1 @@ -Subproject commit 8e841b047641b1812a83880a90e89d702747ca5b +Subproject commit cfad8fcc28c7cdba69684c8e35846711aaa16775 diff --git a/submodules/linphone b/submodules/linphone index b085154c6..61e38e370 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit b085154c6f21aee15f5b8af0fbe601d026b0167f +Subproject commit 61e38e3704e1a37c9e884897ca5597158725b202 diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index e02b12e57..54a79f731 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit e02b12e579faee6c792bcf34c6cca9ac20f88251 +Subproject commit 54a79f731fea61d345dfff4f8fcb2fc390c2fed7 From 47605e22951161830f644bf850415bd2c149b9a8 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 26 Jun 2018 16:04:33 +0200 Subject: [PATCH 02/21] Set release notes for 4.0.1 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b6801e467..ccc840914 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,13 @@ Group changes to describe their impact on the project, as follows: ## [Incomming] +## [4.0.1] - 2018-06-26 + +### Fixed +- fix loading of plugins +- fix issue with video stream, not started when receiving an incoming call just after the app is launched +- fix issue with TURN + ## [4.0.0] - 2018-06-15 ### Added From a9e628852d0f679f22ca71f4bcbcef920936801d Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Wed, 27 Jun 2018 11:50:47 +0200 Subject: [PATCH 03/21] Update version number --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c83fd6e85..946406175 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2,8 +2,8 @@ + android:versionCode="4002" + android:versionName="4.0.1"> Date: Fri, 29 Jun 2018 16:54:54 +0200 Subject: [PATCH 04/21] Update .gitmodules --- .gitmodules | 68 ++++++++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/.gitmodules b/.gitmodules index cdfee6b31..2934c41e9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,95 +1,95 @@ [submodule "submodules/linphone"] path = submodules/linphone - url = git://git.linphone.org/linphone.git + url = https://gitlab.linphone.org/BC/public/linphone.git [submodule "submodules/externals/gsm"] path = submodules/externals/gsm - url = git://git.linphone.org/gsm.git + url = https://gitlab.linphone.org/BC/public/external/gsm.git [submodule "submodules/externals/speex"] path = submodules/externals/speex - url = git://git.linphone.org/speex.git + url = https://gitlab.linphone.org/BC/public/external/speex.git [submodule "submodules/externals/ffmpeg"] path = submodules/externals/ffmpeg - url = git://git.linphone.org/ffmpeg.git + url = https://gitlab.linphone.org/BC/public/external/ffmpeg.git ignore = dirty [submodule "submodules/externals/x264"] path = submodules/externals/x264 - url = git://git.linphone.org/x264.git + url = https://gitlab.linphone.org/BC/public/external/x264.git ignore = dirty [submodule "submodules/msx264"] path = submodules/msx264 - url = git://git.linphone.org/msx264.git + url = https://gitlab.linphone.org/BC/public/external/msx264.git [submodule "submodules/externals/opencore-amr"] path = submodules/externals/opencore-amr - url = git://git.linphone.org/opencore-amr.git + url = https://gitlab.linphone.org/BC/public/external/opencore-amr.git ignore = dirty [submodule "submodules/msamr"] path = submodules/msamr - url = git://git.linphone.org/msamr.git + url = https://gitlab.linphone.org/BC/public/external/msamr.git [submodule "submodules/externals/libvpx"] path = submodules/externals/libvpx - url = git://git.linphone.org/libvpx.git + url = https://gitlab.linphone.org/BC/public/external/libvpx.git ignore = dirty [submodule "submodules/bzrtp"] path = submodules/bzrtp - url = git://git.linphone.org/bzrtp.git + url = https://gitlab.linphone.org/BC/public/bzrtp.git [submodule "submodules/externals/srtp"] path = submodules/externals/srtp - url = git://git.linphone.org/srtp.git + url = https://gitlab.linphone.org/BC/public/external/srtp.git [submodule "submodules/mssilk"] path = submodules/mssilk - url = git://git.linphone.org/mssilk.git + url = https://gitlab.linphone.org/BC/public/external/mssilk.git [submodule "submodules/bcg729"] path = submodules/bcg729 - url = git://git.linphone.org/bcg729.git + url = https://gitlab.linphone.org/BC/public/bcg729.git [submodule "submodules/belle-sip"] path = submodules/belle-sip - url = git://git.linphone.org/belle-sip.git + url = https://gitlab.linphone.org/BC/public/belle-sip.git [submodule "submodules/externals/libxml2"] path = submodules/externals/libxml2 - url = https://github.com/GNOME/libxml2.git + url = https://gitlab.linphone.org/BC/public/external/libxml2.git ignore = dirty [submodule "submodules/externals/libupnp"] path = submodules/externals/libupnp - url = git://git.linphone.org/libupnp.git + url = https://gitlab.linphone.org/BC/public/external/libupnp.git [submodule "submodules/externals/opus"] path = submodules/externals/opus - url = git://git.linphone.org/opus.git + url = https://gitlab.linphone.org/BC/public/external/opus.git ignore = dirty [submodule "submodules/mswebrtc"] path = submodules/mswebrtc - url = git://git.linphone.org/mswebrtc.git + url = https://gitlab.linphone.org/BC/public/external/mswebrtc.git [submodule "submodules/msopenh264"] path = submodules/msopenh264 - url = git://git.linphone.org/msopenh264.git + url = https://gitlab.linphone.org/BC/public/external/msopenh264.git [submodule "submodules/externals/openh264"] path = submodules/externals/openh264 url = https://github.com/cisco/openh264 ignore = dirty [submodule "submodules/mscodec2"] path = submodules/mscodec2 - url = git://git.linphone.org/mscodec2.git + url = https://gitlab.linphone.org/BC/public/external/mscodec2.git [submodule "submodules/bctoolbox"] path = submodules/bctoolbox - url = git://git.linphone.org/bctoolbox.git + url = https://gitlab.linphone.org/BC/public/bctoolbox.git [submodule "submodules/externals/mbedtls"] path = submodules/externals/mbedtls - url = git://git.linphone.org/mbedtls.git + url = https://gitlab.linphone.org/BC/public/mbedtls.git ignore = dirty [submodule "submodules/cmake-builder"] path = submodules/cmake-builder - url = git://git.linphone.org/linphone-cmake-builder.git + url = https://gitlab.linphone.org/BC/public/linphone-cmake-builder.git [submodule "submodules/externals/bv16-floatingpoint"] path = submodules/externals/bv16-floatingpoint url = git://git.linphone.org/bv16-floatingpoint.git [submodule "submodules/belr"] path = submodules/belr - url = git://git.linphone.org/belr.git + url = https://gitlab.linphone.org/BC/public/belr.git [submodule "submodules/belcard"] path = submodules/belcard - url = git://git.linphone.org/belcard.git + url = https://gitlab.linphone.org/BC/public/belcard.git [submodule "submodules/bcunit"] path = submodules/bcunit - url = git://git.linphone.org/bcunit.git + url = https://gitlab.linphone.org/BC/public/bcunit.git [submodule "submodules/externals/vo-amrwbenc"] path = submodules/externals/vo-amrwbenc url = git://git.linphone.org/vo-amrwbenc.git @@ -98,25 +98,25 @@ url = git://git.linphone.org/codec2 [submodule "submodules/externals/libjpeg-turbo"] path = submodules/externals/libjpeg-turbo - url = git://git.linphone.org/libjpeg-turbo.git + url = https://gitlab.linphone.org/BC/public/external/libjpeg-turbo.git [submodule "submodules/mediastreamer2"] path = submodules/mediastreamer2 - url = git://git.linphone.org/mediastreamer2.git + url = https://gitlab.linphone.org/BC/public/mediastreamer2.git [submodule "submodules/oRTP"] path = submodules/oRTP - url = git://git.linphone.org/ortp.git + url = https://gitlab.linphone.org/BC/public/ortp.git [submodule "submodules/bcmatroska2"] path = submodules/bcmatroska2 - url = git://git.linphone.org/bcmatroska2.git + url = https://gitlab.linphone.org/BC/public/bcmatroska2.git [submodule "submodules/externals/xerces-c"] path = submodules/externals/xerces-c - url = git://git.linphone.org/xerces-c.git + url = https://gitlab.linphone.org/BC/public/external/xerces-c.git [submodule "submodules/externals/libxsd"] path = submodules/externals/libxsd - url = git://git.linphone.org/libxsd + url = https://gitlab.linphone.org/BC/public/external/libxsd [submodule "submodules/externals/soci"] path = submodules/externals/soci - url = git://git.linphone.org/soci + url = https://gitlab.linphone.org/BC/public/external/soci [submodule "submodules/externals/zxing-cpp"] path = submodules/externals/zxing-cpp - url = git://git.linphone.org/zxing-cpp.git + url = https://gitlab.linphone.org/BC/public/external/zxing-cpp.git From f82e0c176948ed0d3b4a3a4efe0584d77800dde6 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Fri, 29 Jun 2018 17:01:37 +0200 Subject: [PATCH 05/21] Fix .gitmodules --- .gitmodules | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 2934c41e9..3bab7384a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -73,7 +73,7 @@ url = https://gitlab.linphone.org/BC/public/bctoolbox.git [submodule "submodules/externals/mbedtls"] path = submodules/externals/mbedtls - url = https://gitlab.linphone.org/BC/public/mbedtls.git + url = https://gitlab.linphone.org/BC/public/external/mbedtls.git ignore = dirty [submodule "submodules/cmake-builder"] path = submodules/cmake-builder @@ -107,16 +107,16 @@ url = https://gitlab.linphone.org/BC/public/ortp.git [submodule "submodules/bcmatroska2"] path = submodules/bcmatroska2 - url = https://gitlab.linphone.org/BC/public/bcmatroska2.git + url = git://git.linphone.org/bcmatroska2.git [submodule "submodules/externals/xerces-c"] path = submodules/externals/xerces-c url = https://gitlab.linphone.org/BC/public/external/xerces-c.git [submodule "submodules/externals/libxsd"] path = submodules/externals/libxsd - url = https://gitlab.linphone.org/BC/public/external/libxsd + url = https://gitlab.linphone.org/BC/public/external/libxsd.git [submodule "submodules/externals/soci"] path = submodules/externals/soci - url = https://gitlab.linphone.org/BC/public/external/soci + url = https://gitlab.linphone.org/BC/public/external/soci.git [submodule "submodules/externals/zxing-cpp"] path = submodules/externals/zxing-cpp url = https://gitlab.linphone.org/BC/public/external/zxing-cpp.git From 7b8ede7b5e8bdf5c989bfe116b08d517bbcce9b3 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Fri, 29 Jun 2018 17:10:49 +0200 Subject: [PATCH 06/21] Fix .gitmodules --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 3bab7384a..1ec4c27b4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -20,7 +20,7 @@ url = https://gitlab.linphone.org/BC/public/external/msx264.git [submodule "submodules/externals/opencore-amr"] path = submodules/externals/opencore-amr - url = https://gitlab.linphone.org/BC/public/external/opencore-amr.git + url = git://git.linphone.org/opencore-amr.git ignore = dirty [submodule "submodules/msamr"] path = submodules/msamr From 152ea38bd09733fdb4fe1ce72191c85ee1a8ebb7 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Mon, 2 Jul 2018 09:36:32 +0200 Subject: [PATCH 07/21] Fix .gitmodules --- .gitmodules | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 1ec4c27b4..428ff5871 100644 --- a/.gitmodules +++ b/.gitmodules @@ -24,7 +24,7 @@ ignore = dirty [submodule "submodules/msamr"] path = submodules/msamr - url = https://gitlab.linphone.org/BC/public/external/msamr.git + url = git://git.linphone.org/msamr.git [submodule "submodules/externals/libvpx"] path = submodules/externals/libvpx url = https://gitlab.linphone.org/BC/public/external/libvpx.git @@ -37,7 +37,7 @@ url = https://gitlab.linphone.org/BC/public/external/srtp.git [submodule "submodules/mssilk"] path = submodules/mssilk - url = https://gitlab.linphone.org/BC/public/external/mssilk.git + url = git://git.linphone.org/mssilk.git [submodule "submodules/bcg729"] path = submodules/bcg729 url = https://gitlab.linphone.org/BC/public/bcg729.git @@ -57,17 +57,17 @@ ignore = dirty [submodule "submodules/mswebrtc"] path = submodules/mswebrtc - url = https://gitlab.linphone.org/BC/public/external/mswebrtc.git + url = git://git.linphone.org/mswebrtc.git [submodule "submodules/msopenh264"] path = submodules/msopenh264 - url = https://gitlab.linphone.org/BC/public/external/msopenh264.git + url = git://git.linphone.org/msopenh264.git [submodule "submodules/externals/openh264"] path = submodules/externals/openh264 url = https://github.com/cisco/openh264 ignore = dirty [submodule "submodules/mscodec2"] path = submodules/mscodec2 - url = https://gitlab.linphone.org/BC/public/external/mscodec2.git + url = git://git.linphone.org/mscodec2.git [submodule "submodules/bctoolbox"] path = submodules/bctoolbox url = https://gitlab.linphone.org/BC/public/bctoolbox.git From 612987676ff7f7770c6b1c5cd4589d57729c6cf3 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Mon, 2 Jul 2018 10:30:21 +0200 Subject: [PATCH 08/21] Fix .gitmodules --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 428ff5871..2ea1b6cfe 100644 --- a/.gitmodules +++ b/.gitmodules @@ -17,7 +17,7 @@ ignore = dirty [submodule "submodules/msx264"] path = submodules/msx264 - url = https://gitlab.linphone.org/BC/public/external/msx264.git + url = git://git.linphone.org/msx264.git [submodule "submodules/externals/opencore-amr"] path = submodules/externals/opencore-amr url = git://git.linphone.org/opencore-amr.git From 581f504f343126fa5816dd8ca0a8e0a4570e8daf Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 2 Jul 2018 16:53:13 +0200 Subject: [PATCH 09/21] Fix build with openh264 and update openh264 to the 1.8.0 release. --- .gitmodules | 2 +- submodules/cmake-builder | 2 +- submodules/externals/openh264 | 2 +- submodules/linphone | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 2ea1b6cfe..aba22f251 100644 --- a/.gitmodules +++ b/.gitmodules @@ -63,7 +63,7 @@ url = git://git.linphone.org/msopenh264.git [submodule "submodules/externals/openh264"] path = submodules/externals/openh264 - url = https://github.com/cisco/openh264 + url = https://gitlab.linphone.org/BC/public/external/openh264.git ignore = dirty [submodule "submodules/mscodec2"] path = submodules/mscodec2 diff --git a/submodules/cmake-builder b/submodules/cmake-builder index d389b30b6..21ba41720 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit d389b30b6c417d8bc7a79f561075a5c58871e3bc +Subproject commit 21ba41720fbff55d5f33e492022e1b909e3fbadc diff --git a/submodules/externals/openh264 b/submodules/externals/openh264 index 9e75838c8..852d23c72 160000 --- a/submodules/externals/openh264 +++ b/submodules/externals/openh264 @@ -1 +1 @@ -Subproject commit 9e75838c8638c48a32b15c73c9da7b1fe942fd5f +Subproject commit 852d23c72acd537b75e4b95af93b866925d31bda diff --git a/submodules/linphone b/submodules/linphone index 61e38e370..8ab1cde0f 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 61e38e3704e1a37c9e884897ca5597158725b202 +Subproject commit 8ab1cde0fe32d0f60feb2ca9fc240390ae7a98bc From ea8f67cfd2989f4bdd41b10a70c7131c95ab03b2 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Mon, 2 Jul 2018 17:13:18 +0200 Subject: [PATCH 10/21] Update .gitmodules --- .gitmodules | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitmodules b/.gitmodules index aba22f251..846dc5310 100644 --- a/.gitmodules +++ b/.gitmodules @@ -17,14 +17,14 @@ ignore = dirty [submodule "submodules/msx264"] path = submodules/msx264 - url = git://git.linphone.org/msx264.git + url = https://gitlab.linphone.org/BC/public/msx264.git [submodule "submodules/externals/opencore-amr"] path = submodules/externals/opencore-amr - url = git://git.linphone.org/opencore-amr.git + url = https://gitlab.linphone.org/BC/public/external/opencore-amr.git ignore = dirty [submodule "submodules/msamr"] path = submodules/msamr - url = git://git.linphone.org/msamr.git + url = https://gitlab.linphone.org/BC/public/msamr.git [submodule "submodules/externals/libvpx"] path = submodules/externals/libvpx url = https://gitlab.linphone.org/BC/public/external/libvpx.git @@ -37,7 +37,7 @@ url = https://gitlab.linphone.org/BC/public/external/srtp.git [submodule "submodules/mssilk"] path = submodules/mssilk - url = git://git.linphone.org/mssilk.git + url = https://gitlab.linphone.org/BC/public/mssilk.git [submodule "submodules/bcg729"] path = submodules/bcg729 url = https://gitlab.linphone.org/BC/public/bcg729.git @@ -57,17 +57,17 @@ ignore = dirty [submodule "submodules/mswebrtc"] path = submodules/mswebrtc - url = git://git.linphone.org/mswebrtc.git + url = https://gitlab.linphone.org/BC/public/mswebrtc.git [submodule "submodules/msopenh264"] path = submodules/msopenh264 - url = git://git.linphone.org/msopenh264.git + url = https://gitlab.linphone.org/BC/public/msopenh264.git [submodule "submodules/externals/openh264"] path = submodules/externals/openh264 url = https://gitlab.linphone.org/BC/public/external/openh264.git ignore = dirty [submodule "submodules/mscodec2"] path = submodules/mscodec2 - url = git://git.linphone.org/mscodec2.git + url = https://gitlab.linphone.org/BC/public/mscodec2.git [submodule "submodules/bctoolbox"] path = submodules/bctoolbox url = https://gitlab.linphone.org/BC/public/bctoolbox.git @@ -80,7 +80,7 @@ url = https://gitlab.linphone.org/BC/public/linphone-cmake-builder.git [submodule "submodules/externals/bv16-floatingpoint"] path = submodules/externals/bv16-floatingpoint - url = git://git.linphone.org/bv16-floatingpoint.git + url = https://gitlab.linphone.org/BC/public/external/bv16-floatingpoint.git [submodule "submodules/belr"] path = submodules/belr url = https://gitlab.linphone.org/BC/public/belr.git @@ -92,10 +92,10 @@ url = https://gitlab.linphone.org/BC/public/bcunit.git [submodule "submodules/externals/vo-amrwbenc"] path = submodules/externals/vo-amrwbenc - url = git://git.linphone.org/vo-amrwbenc.git + url = https://gitlab.linphone.org/BC/public/external/vo-amrwbenc.git [submodule "submodules/externals/codec2"] path = submodules/externals/codec2 - url = git://git.linphone.org/codec2 + url = https://gitlab.linphone.org/BC/public/external/codec2 [submodule "submodules/externals/libjpeg-turbo"] path = submodules/externals/libjpeg-turbo url = https://gitlab.linphone.org/BC/public/external/libjpeg-turbo.git @@ -107,7 +107,7 @@ url = https://gitlab.linphone.org/BC/public/ortp.git [submodule "submodules/bcmatroska2"] path = submodules/bcmatroska2 - url = git://git.linphone.org/bcmatroska2.git + url = https://gitlab.linphone.org/BC/public/bcmatroska2.git [submodule "submodules/externals/xerces-c"] path = submodules/externals/xerces-c url = https://gitlab.linphone.org/BC/public/external/xerces-c.git From 3402e527602965b074b5c1883b1e40848306eed7 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Mon, 2 Jul 2018 17:16:42 +0200 Subject: [PATCH 11/21] Update .gitmodules --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 846dc5310..7eb66567b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,7 +19,7 @@ path = submodules/msx264 url = https://gitlab.linphone.org/BC/public/msx264.git [submodule "submodules/externals/opencore-amr"] - path = submodules/externals/opencore-amr + path = submodules/externals/opencore-amr.git url = https://gitlab.linphone.org/BC/public/external/opencore-amr.git ignore = dirty [submodule "submodules/msamr"] @@ -95,7 +95,7 @@ url = https://gitlab.linphone.org/BC/public/external/vo-amrwbenc.git [submodule "submodules/externals/codec2"] path = submodules/externals/codec2 - url = https://gitlab.linphone.org/BC/public/external/codec2 + url = https://gitlab.linphone.org/BC/public/external/codec2.git [submodule "submodules/externals/libjpeg-turbo"] path = submodules/externals/libjpeg-turbo url = https://gitlab.linphone.org/BC/public/external/libjpeg-turbo.git From 625fc3a697b7ff8315296d40cd92a1273bd0befa Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Mon, 2 Jul 2018 17:17:54 +0200 Subject: [PATCH 12/21] Fix .gitmodules --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 7eb66567b..379a64301 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,7 +19,7 @@ path = submodules/msx264 url = https://gitlab.linphone.org/BC/public/msx264.git [submodule "submodules/externals/opencore-amr"] - path = submodules/externals/opencore-amr.git + path = submodules/externals/opencore-amr url = https://gitlab.linphone.org/BC/public/external/opencore-amr.git ignore = dirty [submodule "submodules/msamr"] From 156abbc61ac097e72e2b17f6196fd9fb545217ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Thu, 5 Jul 2018 15:15:03 +0200 Subject: [PATCH 13/21] [feature] Support of H265 by using MediaCodec implementation. --- CHANGELOG.md | 1 + submodules/linphone | 2 +- submodules/mediastreamer2 | 2 +- submodules/oRTP | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ccc840914..23d31a6a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ Group changes to describe their impact on the project, as follows: Security to invite users to upgrade in case of vulnerabilities. ## [Incomming] +- feature: support of H265 codec. ## [4.0.1] - 2018-06-26 diff --git a/submodules/linphone b/submodules/linphone index 8ab1cde0f..f9ecf54cb 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 8ab1cde0fe32d0f60feb2ca9fc240390ae7a98bc +Subproject commit f9ecf54cbe108f059e81bf8ddab7336c2989dd07 diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index 54a79f731..604904a06 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit 54a79f731fea61d345dfff4f8fcb2fc390c2fed7 +Subproject commit 604904a069270c464b5ddd58812ea4aa245c6841 diff --git a/submodules/oRTP b/submodules/oRTP index 3afc47570..a88be02b9 160000 --- a/submodules/oRTP +++ b/submodules/oRTP @@ -1 +1 @@ -Subproject commit 3afc47570a1c9f34bd2f1a759ae00fb7ecd26a0e +Subproject commit a88be02b93e2274ae3fcf80e1e0032adc43c0448 From 4544302a27eaf3bb46b5fac00e13eebc2a8a9154 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Fri, 6 Jul 2018 11:21:32 +0200 Subject: [PATCH 14/21] Fix build when -DENABLE_SHARED=ON --- submodules/linphone | 2 +- submodules/mediastreamer2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/linphone b/submodules/linphone index f9ecf54cb..d1a8d275b 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit f9ecf54cbe108f059e81bf8ddab7336c2989dd07 +Subproject commit d1a8d275b553c82b56a21ebb32d34024b0adbb99 diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index 604904a06..149fc91e9 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit 604904a069270c464b5ddd58812ea4aa245c6841 +Subproject commit 149fc91e943b140c27412f0837977be96cad20cf From fb20311c6c9f61d58cc283eaaca4f6352f261ea7 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Fri, 6 Jul 2018 15:40:23 +0200 Subject: [PATCH 15/21] Clean repo --- .classpath | 16 ----- .project | 33 ---------- bsed.sh | 48 --------------- check_tools.sh | 55 ----------------- cmake_builder/CMakeLists.txt | 25 -------- doc/CustomsParameters.txt | 72 ---------------------- patches/ffmpeg_non_versioned_soname.patch | 11 ---- patches/libvpx_configure_android_x86.patch | 37 ----------- patches/openh264-permissive.patch | 40 ------------ patches/x264_log2f_fix.patch | 41 ------------ 10 files changed, 378 deletions(-) delete mode 100644 .classpath delete mode 100644 .project delete mode 100755 bsed.sh delete mode 100755 check_tools.sh delete mode 100644 cmake_builder/CMakeLists.txt delete mode 100644 doc/CustomsParameters.txt delete mode 100644 patches/ffmpeg_non_versioned_soname.patch delete mode 100644 patches/libvpx_configure_android_x86.patch delete mode 100644 patches/openh264-permissive.patch delete mode 100644 patches/x264_log2f_fix.patch diff --git a/.classpath b/.classpath deleted file mode 100644 index 63762c92a..000000000 --- a/.classpath +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/.project b/.project deleted file mode 100644 index f9c163d50..000000000 --- a/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - linphone-android - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/bsed.sh b/bsed.sh deleted file mode 100755 index b357ae14e..000000000 --- a/bsed.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash - -# Script found at http://everydaywithlinux.blogspot.fr/2012/11/patch-strings-in-binary-files-with-sed.html - -function patch_strings_in_file() { - local FILE="$1" - local PATTERN="$2" - local REPLACEMENT="$3" - - # Find all unique strings in FILE that contain the pattern - STRINGS=$(strings ${FILE} | grep ${PATTERN} | sort -u -r) - - if [ "${STRINGS}" != "" ] ; then - echo "File '${FILE}' contain strings with '${PATTERN}' in them:" - - for OLD_STRING in ${STRINGS} ; do - # Create the new string with a simple bash-replacement - NEW_STRING=${OLD_STRING//${PATTERN}/${REPLACEMENT}} - - # Create null terminated ASCII HEX representations of the strings - OLD_STRING_HEX="$(echo -n ${OLD_STRING} | xxd -g 0 -u -ps -c 256)00" - NEW_STRING_HEX="$(echo -n ${NEW_STRING} | xxd -g 0 -u -ps -c 256)00" - - if [ ${#NEW_STRING_HEX} -le ${#OLD_STRING_HEX} ] ; then - # Pad the replacement string with null terminations so the - # length matches the original string - while [ ${#NEW_STRING_HEX} -lt ${#OLD_STRING_HEX} ] ; do - NEW_STRING_HEX="${NEW_STRING_HEX}00" - done - - # Now, replace every occurrence of OLD_STRING with NEW_STRING - echo -n "Replacing ${OLD_STRING} with ${NEW_STRING}... " - hexdump -ve '1/1 "%.2X"' ${FILE} | \ - sed "s/${OLD_STRING_HEX}/${NEW_STRING_HEX}/g" | \ - xxd -r -p > ${FILE}.tmp - chmod --reference ${FILE} ${FILE}.tmp - mv ${FILE}.tmp ${FILE} - echo "Done!" - else - echo "New string '${NEW_STRING}' is longer than old" \ - "string '${OLD_STRING}'. Skipping." - fi - done - fi -} - -patch_strings_in_file libs/armeabi-v7a/liblinphone-armeabi-v7a.so "./obj/local/armeabi-v7a/libffmpeg-linphone-arm.so" "libffmpeg-linphone-arm.so" -patch_strings_in_file libs/x86/liblinphone-x86.so "./obj/local/x86/libffmpeg-linphone-x86.so" "libffmpeg-linphone-x86.so" diff --git a/check_tools.sh b/check_tools.sh deleted file mode 100755 index 0c19fb138..000000000 --- a/check_tools.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh - -error_on_quit=0 - -echo_err() { - echo "$@" >&2 - error_on_quit=1 -} - -check_installed() { - if [ -z "$(which $1)" ]; then - echo_err "Could not find $1. Please install $2." - return 1 - fi - return 0 -} - -for prog in automake autoconf pkg-config java ant yasm nasm wget; do - check_installed "$prog" "it" -done -if [ $(uname) = "Darwin" ]; then - check_installed "libtool" "libtool" -else - check_installed "libtoolize" "libtool" -fi -check_installed "ndk-build" "android NDK" -if check_installed "android" "android SDK"; then - check_installed "adb" "android SDK platform tools" - # check that at least one target is installed - if [ -z "$(android list target -c)" ]; then - echo_err "Install at least one android target in the android SDK" - fi -fi -if nasm -f elf32 2>&1 | grep -q "fatal: unrecognised output format"; then - echo_err "Invalid version of nasm: your version does not support elf32 output format. If you have installed nasm, please check that your PATH env variable is set correctly." -fi -if ! (find submodules/linphone/mediastreamer2 -mindepth 1 2>/dev/null | grep -q . \ - || find submodules/linphone/oRTP -mindepth 1 2>/dev/null | grep -q .); then - echo_err "Missing some git submodules. Did you run 'git submodule update --init --recursive'?" -fi -# Android NDK should NOT be simlinked! -if [ -L "$ANDROID_NDK" ] && [ -d "$ANDROID_NDK" ]; then - echo_err "ANDROID_NDK=$ANDROID_NDK must NOT be a symbolic link, please modify it accordingly" -fi - -if [ $error_on_quit = 0 ]; then - rm -f check_tools.mk - touch check_tools.mk - echo "JAVA=\"$(which java)\"" >> check_tools.mk - echo "ANTLR=\"$(which java)\" -jar \"submodules/externals/antlr3/antlr-3.2.jar\"" >> check_tools.mk -else - echo "Failed to detect required tools, aborting." -fi - -exit $error_on_quit diff --git a/cmake_builder/CMakeLists.txt b/cmake_builder/CMakeLists.txt deleted file mode 100644 index ea7e0f119..000000000 --- a/cmake_builder/CMakeLists.txt +++ /dev/null @@ -1,25 +0,0 @@ -############################################################################ -# 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/doc/CustomsParameters.txt b/doc/CustomsParameters.txt deleted file mode 100644 index dc39dbba5..000000000 --- a/doc/CustomsParameters.txt +++ /dev/null @@ -1,72 +0,0 @@ - ********************************** - * LINPHONE customs parameters * - ********************************** - -In res/values/non_localizable_custom.xml (filled with linphone default options): - -1. Global - - * Set the default domain used by the application: - sip.linphone.orghttps://sip3.linphone.org:444/inapp.php - - * In CreateAccount, allow username instead of phone number for creating a new account - true - - * Hide buttons in assistant menu - false - false - false - - -3. Inapp - - * Enabled inapp purchase - true - - * Days before end of trial period that launch daily notification to remind user to buy an account - 5 - - * Time between two inapp notifications in seconds - 86400 - - * Hide username field in purchase view (automatically get from default account) - true - - -In res/raw/linphonerc_factory sections: - - [in-app-purchase] - * Server xmlrpc url for inapp - server_url=https://sip3.linphone.org:444/inapp.php - - * Item ids from the google play store - purchasable_items_ids=test_account_subscription - - [app] - - * Numbers of digits to enter for validation/recover account - activation_code_length=4 - - - [assistant] - - * Set the default domain used for account creation : - domain=sip.linphone.org - - * Set the default password length (min-max) : - password_max_length=-1 - password_min_length=1 - - * Set the default username length (min-max) : - username_length=-1 - username_max_length=64 - username_min_length=1 - username_regex=^[a-z0-9_.\-]*$ - - * Server xmlrpc url for accounts - xmlrpc_url=https://sip3.linphone.org:444/inapp.php diff --git a/patches/ffmpeg_non_versioned_soname.patch b/patches/ffmpeg_non_versioned_soname.patch deleted file mode 100644 index 34a0ecaf0..000000000 --- a/patches/ffmpeg_non_versioned_soname.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- submodules/externals/ffmpeg/library.mak.orig 2013-09-26 10:58:19.000000000 +0200 -+++ submodules/externals/ffmpeg/library.mak 2013-09-26 10:58:13.000000000 +0200 -@@ -54,7 +54,7 @@ - - $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SUBDIR)lib$(NAME).ver - $(SLIB_CREATE_DEF_CMD) -- $$(LD) $(SHFLAGS) $(LDFLAGS) $$(LD_O) $$(filter %.o,$$^) $(FFEXTRALIBS) -+ $$(LD) $(subst $$(@F),$(SLIBNAME),$(SHFLAGS)) $(LDFLAGS) $$(LD_O) $$(filter %.o,$$^) $(FFEXTRALIBS) - $(SLIB_EXTRA_CMD) - - ifdef SUBDIR diff --git a/patches/libvpx_configure_android_x86.patch b/patches/libvpx_configure_android_x86.patch deleted file mode 100644 index fa1004599..000000000 --- a/patches/libvpx_configure_android_x86.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/build/make/configure.sh b/build/make/configure.sh -index c592b63..e4998d7 100644 ---- a/build/make/configure.sh -+++ b/build/make/configure.sh -@@ -1132,6 +1132,32 @@ EOF - AS=${AS:-nasm} - add_ldflags -Zhigh-mem - ;; -+ android*) -+ SDK_PATH=${sdk_path} -+ COMPILER_LOCATION=`find "${SDK_PATH}" \ -+ -name "i686-linux-android-gcc*" -print -quit` -+ TOOLCHAIN_PATH=${COMPILER_LOCATION%/*}/i686-linux-android- -+ CC=${TOOLCHAIN_PATH}gcc -+ CXX=${TOOLCHAIN_PATH}g++ -+ AR=${TOOLCHAIN_PATH}ar -+ LD=${TOOLCHAIN_PATH}gcc -+ STRIP=${TOOLCHAIN_PATH}strip -+ NM=${TOOLCHAIN_PATH}nm -+ -+ if [ -z "${alt_libc}" ]; then -+ alt_libc=`find "${SDK_PATH}" -name arch-x86 -print | \ -+ awk '{n = split($0,a,"/"); \ -+ split(a[n-1],b,"-"); \ -+ print $0 " " b[2]}' | \ -+ sort -g -k 2 | \ -+ awk '{ print $1 }' | tail -1` -+ fi -+ -+ add_cflags "--sysroot=${alt_libc}" -+ add_ldflags "--sysroot=${alt_libc}" -+ -+ soft_enable realtime_only -+ ;; - esac - - AS="${alt_as:-${AS:-auto}}" diff --git a/patches/openh264-permissive.patch b/patches/openh264-permissive.patch deleted file mode 100644 index bff18b6ce..000000000 --- a/patches/openh264-permissive.patch +++ /dev/null @@ -1,40 +0,0 @@ -commit 6b3de978d928b6c0baec3305c9803c21a4367d0c -Author: Simon Morlat -Date: Tue Apr 15 15:19:37 2014 +0200 - - permissive mode: allow reference frames to be used even if there were lost slices. - -diff --git a/codec/decoder/core/src/manage_dec_ref.cpp b/codec/decoder/core/src/manage_dec_ref.cpp -index dcf61ca..5582ec9 100644 ---- a/codec/decoder/core/src/manage_dec_ref.cpp -+++ b/codec/decoder/core/src/manage_dec_ref.cpp -@@ -165,6 +165,7 @@ int32_t WelsReorderRefList (PWelsDecoderContext pCtx) { - && (pSliceHeader->iSpsId != ppRefList[i]->iSpsId)) { //check; - WelsLog (pCtx, WELS_LOG_WARNING, "WelsReorderRefList()-1::::BASE LAYER::::iSpsId:%d, ref_sps_id:%d\n", - pSliceHeader->iSpsId, ppRefList[i]->iSpsId); -+ return ERR_NONE; - pCtx->iErrorCode = dsNoParamSets; //cross-IDR reference frame selection, SHOULD request IDR.-- - return ERR_INFO_REFERENCE_PIC_LOST; - } else { - -commit a1f3b95ad18d0788c2c803fac80e78d6365673ce -Author: Simon Morlat -Date: Tue Apr 15 17:54:58 2014 +0200 - - permissive mode (2) - -diff --git a/codec/decoder/core/src/decoder_core.cpp b/codec/decoder/core/src/decoder_core.cpp -index a14e971..e742dbf 100644 ---- a/codec/decoder/core/src/decoder_core.cpp -+++ b/codec/decoder/core/src/decoder_core.cpp -@@ -1738,8 +1738,8 @@ int32_t DecodeCurrentAccessUnit (PWelsDecoderContext pCtx, uint8_t** ppDst, int3 - if ((iLastIdD < 0) || //case 1: first layer - (iLastIdD == iCurrIdD)) { //case 2: same uiDId - InitDqLayerInfo (dq_cur, &pLayerInfo, pNalCur, pCtx->pDec); -- -- if (!dq_cur->sLayerInfo.pSps->bGapsInFrameNumValueAllowedFlag) { -+ if (0){ -+ //if (!dq_cur->sLayerInfo.pSps->bGapsInFrameNumValueAllowedFlag) { - const bool kbIdrFlag = dq_cur->sLayerInfo.sNalHeaderExt.bIdrFlag - || (dq_cur->sLayerInfo.sNalHeaderExt.sNalUnitHeader.eNalUnitType == NAL_UNIT_CODED_SLICE_IDR); - // Subclause 8.2.5.2 Decoding process for gaps in frame_num diff --git a/patches/x264_log2f_fix.patch b/patches/x264_log2f_fix.patch deleted file mode 100644 index e5d0647a0..000000000 --- a/patches/x264_log2f_fix.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -urN submodules/externals/x264/common/osdep.h.orig submodules/externals/x264/common/osdep.h ---- submodules/externals/x264/common/osdep.h.orig 2014-02-06 13:56:59.243663951 +0100 -+++ submodules/externals/x264/common/osdep.h 2014-02-06 13:57:17.215685078 +0100 -@@ -35,11 +35,6 @@ - - #include "config.h" - --#if !HAVE_LOG2F --#define log2f(x) (logf(x)/0.693147180559945f) --#define log2(x) (log(x)/0.693147180559945) --#endif -- - #ifdef _WIN32 - #include // _setmode() - #include // _O_BINARY -@@ -55,6 +60,11 @@ - #include - #endif - -+#if !HAVE_LOG2F -+#define log2f(x) (logf(x)/0.693147180559945f) -+#define log2(x) (log(x)/0.693147180559945) -+#endif -+ - #if (defined(__GNUC__) || defined(__INTEL_COMPILER)) && (ARCH_X86 || ARCH_X86_64) - #define HAVE_X86_INLINE_ASM 1 - #endif -diff -urN submodules/externals/x264/configure.orig submodules/externals/x264/configure ---- submodules/externals/x264/configure.orig 2014-02-06 13:56:59.231663937 +0100 -+++ submodules/externals/x264/configure 2014-02-06 13:57:17.219685083 +0100 -@@ -816,10 +816,6 @@ - fi - [ "$thread" != "no" ] && define HAVE_THREAD - --if cc_check "math.h" "-Werror" "return log2f(2);" ; then -- define HAVE_LOG2F --fi -- - if [ "$vis" = "yes" ] ; then - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -I/usr/X11R6/include" From be8f76972686698b8108b2980a13f5f1246351f0 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Mon, 9 Jul 2018 09:38:37 +0200 Subject: [PATCH 16/21] Add remove file --- cmake_builder/CMakeLists.txt | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) 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..ea7e0f119 --- /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") + From e3730d7497af1d5f7e9eb9a6698982b44928e5f9 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Mon, 9 Jul 2018 13:41:46 +0200 Subject: [PATCH 17/21] Update submodule mediastreamer2 --- submodules/mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index 149fc91e9..75a861960 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit 149fc91e943b140c27412f0837977be96cad20cf +Subproject commit 75a86196030bb6efd9d67d42c0b25f17b4ec4e25 From c3f5cfe3f6d42ccc8b2ff9893466c74db2ee7873 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Mon, 9 Jul 2018 15:06:32 +0200 Subject: [PATCH 18/21] Update prepare.py --- prepare.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/prepare.py b/prepare.py index a16d7c6b9..b4ce81827 100755 --- a/prepare.py +++ b/prepare.py @@ -362,7 +362,9 @@ release: java-clean build copy-libs unsigned: java-clean build copy-libs \t./gradlew assemblePackaged -generate-sdk: liblinphone-android-sdk +generate-release-sdk: liblinphone-android-sdk-release + +generate-sdk: liblinphone-android-sdk-debug generate-javadoc: \t./gradlew -q androidJavadocsJar @@ -377,9 +379,15 @@ liblinphone-android-sdk: java-clean build copy-libs generate-javadoc release linphone-android-sdk: java-clean build copy-libs \t./gradlew -b linphoneAndroidSdk.gradle androidJavadocsJar \t./gradlew -b linphoneAndroidSdk.gradle sourcesJar + +linphone-android-sdk-release: linphone-android-sdk \t./gradlew -b linphoneAndroidSdk.gradle assembleRelease \t./gradlew -b linphoneAndroidSdk.gradle sdkZip +linphone-android-sdk-debug: linphone-android-sdk +\t./gradlew -b linphoneAndroidSdk.gradle debugRelease +\t./gradlew -b linphoneAndroidSdk.gradle sdkZip + mediastreamer2-sdk: build copy-libs-mediastreamer \t@cd $(TOPDIR)/submodules/mediastreamer2/java && \\ \t./gradlew -b mediastreamerSdk.gradle assembleRelease From 7d40fe9e2c09cf91b87d34ffdd888d3c04a38753 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Mon, 9 Jul 2018 15:33:08 +0200 Subject: [PATCH 19/21] Update prepare.py liblinphone-android-sdk in debug --- prepare.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prepare.py b/prepare.py index b4ce81827..54de0fa5a 100755 --- a/prepare.py +++ b/prepare.py @@ -373,7 +373,7 @@ generate-javadoc: debug-sdk: java-clean build copy-libs generate-javadoc generate-apk \t./gradlew -q sdkZip -liblinphone-android-sdk: java-clean build copy-libs generate-javadoc release +liblinphone-android-sdk: java-clean build copy-libs generate-javadoc debug \t./gradlew -q sdkZip linphone-android-sdk: java-clean build copy-libs From 4821fc1aea4e07151fe25b6b52387bb283517435 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Mon, 9 Jul 2018 16:11:41 +0200 Subject: [PATCH 20/21] Revert "Update prepare.py liblinphone-android-sdk in debug" This reverts commit 7d40fe9e2c09cf91b87d34ffdd888d3c04a38753. --- prepare.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prepare.py b/prepare.py index 54de0fa5a..b4ce81827 100755 --- a/prepare.py +++ b/prepare.py @@ -373,7 +373,7 @@ generate-javadoc: debug-sdk: java-clean build copy-libs generate-javadoc generate-apk \t./gradlew -q sdkZip -liblinphone-android-sdk: java-clean build copy-libs generate-javadoc debug +liblinphone-android-sdk: java-clean build copy-libs generate-javadoc release \t./gradlew -q sdkZip linphone-android-sdk: java-clean build copy-libs From 3935206f4e6b068bb57d6b2cce6cb4d6f7315d56 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 10 Jul 2018 18:09:51 +0200 Subject: [PATCH 21/21] Handle build with sanitizer enabled. --- prepare.py | 12 ++++++++++++ submodules/cmake-builder | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/prepare.py b/prepare.py index b4ce81827..f29602f74 100755 --- a/prepare.py +++ b/prepare.py @@ -267,6 +267,9 @@ copy-libs: \t\tcp -f liblinphone-sdk/android-arm/bin/gdbserver libs/armeabi && \\ \t\tcp -f liblinphone-sdk/android-arm/bin/gdb.setup libs/armeabi; \\ \tfi +\tif test -f "liblinphone-sdk/android-arm/lib/wrap.sh"; then \\ +\t\tcp -f liblinphone-sdk/android-arm/lib/wrap.sh libs/armeabi; \\ +\tfi \trm -rf libs-debug/armeabi-v7a \trm -rf libs/armeabi-v7a \tif test -d "liblinphone-sdk/android-armv7"; then \\ @@ -284,6 +287,9 @@ copy-libs: \t\tcp -f liblinphone-sdk/android-armv7/bin/gdbserver libs/armeabi-v7a && \\ \t\tcp -f liblinphone-sdk/android-armv7/bin/gdb.setup libs/armeabi-v7a; \\ \tfi +\tif test -f "liblinphone-sdk/android-armv7/lib/wrap.sh"; then \\ +\t\tcp -f liblinphone-sdk/android-armv7/lib/wrap.sh libs/armeabi-v7a; \\ +\tfi \trm -rf libs-debug/arm64-v8a \trm -rf libs/arm64-v8a \tif test -d "liblinphone-sdk/android-arm64"; then \\ @@ -301,6 +307,9 @@ copy-libs: \t\tcp -f liblinphone-sdk/android-arm64/bin/gdbserver libs/arm64-v8a && \\ \t\tcp -f liblinphone-sdk/android-arm64/bin/gdb.setup libs/arm64-v8a; \\ \tfi +\tif test -f "liblinphone-sdk/android-arm64/lib/wrap.sh"; then \\ +\t\tcp -f liblinphone-sdk/android-arm64/lib/wrap.sh libs/arm64-v8a; \\ +\tfi \trm -rf libs-debug/x86 \trm -rf libs/x86 \tif test -d "liblinphone-sdk/android-x86"; then \\ @@ -318,6 +327,9 @@ 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 -f "liblinphone-sdk/android-x86/lib/wrap.sh"; then \\ +\t\tcp -f liblinphone-sdk/android-x86/lib/wrap.sh libs/x86; \\ +\tfi copy-libs-mediastreamer: \trm -rf submodules/mediastreamer2/java/libs/armeabi diff --git a/submodules/cmake-builder b/submodules/cmake-builder index 21ba41720..456993edd 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit 21ba41720fbff55d5f33e492022e1b909e3fbadc +Subproject commit 456993eddd5f4724ff2b59487fb57aa5a85d782a