mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-17 11:28:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use linphone-sdk.

Browse source
This commit is contained in:
Ghislain MARY 2018-11-01 15:39:43 +01:00
parent afb842ae2f
commit d8d0a99f06
40 changed files with 119 additions and 156 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

107
.gitlab-ci.yml Normal file
View file

@ -0,0 +1,107 @@
variables:
GIT_SUBMODULE_STRATEGY: recursive
.linux-ccache-template: &linux-ccache-definition
cache:
key: $CI_JOB_NAME
paths:
- ccache/
before_script:
- mkdir -p ccache
- export CCACHE_BASEDIR=${PWD}
- export CCACHE_DIR=${PWD}/ccache
.job-linux-desktop-template: &job-linux-desktop-definition
tags: [ "docker" ]
<<: *linux-ccache-definition
script:
- export CC=$CC
- export CXX=$CXX
- ccache -s
- ./prepare.py -G "$CMAKE_GENERATOR" -cc -DENABLE_NON_FREE_CODECS=YES -DENABLE_OPENH264=YES
- cmake --build WORK/desktop/cmake -- $ADDITIONAL_BUILD_OPTIONS >> build_log.txt 2>&1
- ccache -s
artifacts:
paths:
- build_log.txt
when: always
expire_in: 1 week
job-debian9-ninja-gcc:
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:9
variables:
CMAKE_GENERATOR: Ninja
CC: gcc
CXX: g++
<<: *job-linux-desktop-definition
job-debian9-ninja-clang:
image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:9
variables:
CMAKE_GENERATOR: Ninja
CC: clang
CXX: clang++
<<: *job-linux-desktop-definition
.job-macosx-template: &job-macosx-definition
tags: [ "macosx" ]
script:
- ccache -s
- export Qt5_DIR=/usr/local/opt/qt/lib/cmake
- export PATH=$PATH:/usr/local/opt/qt/bin
- python prepare.py -G "$CMAKE_GENERATOR" -cc --package -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 -DENABLE_UPDATE_CHECK=YES
- cmake --build WORK/desktop/cmake -- $ADDITIONAL_BUILD_OPTIONS >> build_log.txt 2>&1
- ccache -s
artifacts:
paths:
- build_log.txt
- WORK/desktop/Build/linphone_package/Linphone-*.dmg
- WORK/desktop/Build/linphone_package/linphone-sdk-*-mac.zip
when: always
expire_in: 1 week
job-macosx-ninja:
variables:
CMAKE_GENERATOR: Ninja
<<: *job-macosx-definition
job-macosx-xcode:
variables:
CMAKE_GENERATOR: Xcode
ADDITIONAL_BUILD_OPTIONS: -IDEBuildOperationMaxNumberOfConcurrentCompileTasks=2
<<: *job-macosx-definition
job-windows-vs2015:
tags: [ "windows" ]
script:
- echo %Qt5_DIR%
- echo %PATH%
- python prepare.py -G "Visual Studio 14 2015" --package -DENABLE_NON_FREE_CODECS=YES -DENABLE_OPENH264=YES -DENABLE_UPDATE_CHECK=YES
- cmake --build WORK/desktop/cmake --config Release -- /maxcpucount
artifacts:
paths:
- WORK/desktop/Build/linphone_package/Linphone-*-win32.exe
expire_in: 1 week

115
.gitmodules vendored
View file

@ -1,115 +1,6 @@
[submodule "submodules/belle-sip"]
path = submodules/belle-sip
url = https://gitlab.linphone.org/BC/public/belle-sip.git
[submodule "submodules/cmake-builder"]
path = submodules/cmake-builder
url = https://gitlab.linphone.org/BC/public/linphone-cmake-builder.git
[submodule "submodules/linphone"]
path = submodules/linphone
url = https://gitlab.linphone.org/BC/public/linphone.git
[submodule "submodules/bcg729"]
path = submodules/bcg729
url = https://gitlab.linphone.org/BC/public/bcg729.git
[submodule "submodules/bzrtp"]
path = submodules/bzrtp
url = https://gitlab.linphone.org/BC/public/bzrtp.git
[submodule "submodules/msamr"]
path = submodules/msamr
url = https://gitlab.linphone.org/BC/public/msamr.git
[submodule "submodules/msopenh264"]
path = submodules/msopenh264
url = https://gitlab.linphone.org/BC/public/msopenh264.git
[submodule "submodules/mssilk"]
path = submodules/mssilk
url = https://gitlab.linphone.org/BC/public/mssilk.git
[submodule "submodules/msx264"]
path = submodules/msx264
url = https://gitlab.linphone.org/BC/public/msx264.git
[submodule "submodules/mswebrtc"]
path = submodules/mswebrtc
url = https://gitlab.linphone.org/BC/public/mswebrtc.git
[submodule "submodules/belcard"]
path = submodules/belcard
url = https://gitlab.linphone.org/BC/public/belcard.git
[submodule "submodules/belr"]
path = submodules/belr
url = https://gitlab.linphone.org/BC/public/belr.git
[submodule "submodules/bctoolbox"]
path = submodules/bctoolbox
url = https://gitlab.linphone.org/BC/public/bctoolbox.git
[submodule "submodules/externals/mbedtls"]
path = submodules/externals/mbedtls
url = https://gitlab.linphone.org/BC/public/external/mbedtls.git
[submodule "submodules/externals/bv16-floatingpoint"]
path = submodules/externals/bv16-floatingpoint
url = https://gitlab.linphone.org/BC/public/external/bv16-floatingpoint.git
[submodule "submodules/externals/speex"]
path = submodules/externals/speex
url = https://gitlab.linphone.org/BC/public/external/speex.git
[submodule "submodules/externals/ffmpeg"]
path = submodules/externals/ffmpeg
url = https://gitlab.linphone.org/BC/public/external/ffmpeg.git
ignore = dirty
[submodule "submodules/externals/libvpx"]
path = submodules/externals/libvpx
url = https://gitlab.linphone.org/BC/public/external/libvpx.git
[submodule "submodules/externals/opus"]
path = submodules/externals/opus
url = https://gitlab.linphone.org/BC/public/external/opus.git
ignore = dirty
[submodule "submodules/externals/gsm"]
path = submodules/externals/gsm
url = https://gitlab.linphone.org/BC/public/external/gsm.git
[submodule "submodules/externals/srtp"]
path = submodules/externals/srtp
url = https://gitlab.linphone.org/BC/public/external/srtp.git
[submodule "submodules/externals/v4l-utils"]
path = submodules/externals/v4l-utils
url = https://gitlab.linphone.org/BC/public/external/v4l-utils.git
[submodule "submodules/externals/libxml2"]
path = submodules/externals/libxml2
url = https://gitlab.linphone.org/BC/public/external/libxml2.git
ignore = dirty
[submodule "submodules/externals/zlib"]
path = submodules/externals/zlib
url = https://gitlab.linphone.org/BC/public/external/zlib.git
ignore = dirty
[submodule "submodules/externals/openh264"]
path = submodules/externals/openh264
url = https://gitlab.linphone.org/BC/public/external/openh264.git
[submodule "submodules/bcunit"]
path = submodules/bcunit
url = https://gitlab.linphone.org/BC/public/bcunit.git
[submodule "submodules/belle-msrp"]
path = submodules/belle-msrp
url = https://gitlab.linphone.org/BC/public/belle-msrp.git
[submodule "submodules/externals/libjpeg-turbo"]
path = submodules/externals/libjpeg-turbo
url = https://gitlab.linphone.org/BC/public/external/libjpeg-turbo.git
[submodule "submodules/ortp"]
path = submodules/ortp
url = https://gitlab.linphone.org/BC/public/ortp.git
[submodule "submodules/mediastreamer2"]
path = submodules/mediastreamer2
url = https://gitlab.linphone.org/BC/public/mediastreamer2.git
[submodule "submodules/mswasapi"]
path = submodules/mswasapi
url = https://gitlab.linphone.org/BC/public/mswasapi.git
[submodule "submodules/bcmatroska2"]
path = submodules/bcmatroska2
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
[submodule "submodules/externals/libxsd"]
path = submodules/externals/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.git
[submodule "submodules/externals/minizip"]
path = submodules/externals/minizip
url = https://gitlab.linphone.org/BC/public/external/minizip.git
[submodule "submodules/externals/sqlite3"]
path = submodules/externals/sqlite3
url = https://gitlab.linphone.org/BC/public/external/sqlite3.git
[submodule "linphone-sdk"]
path = linphone-sdk
url = https://gitlab.linphone.org/BC/public/linphone-sdk.git

1
linphone-sdk Submodule

@ -0,0 +1 @@
Subproject commit 579d34ba779c74db001c8bc896843957f595af0c

16
prepare.py
View file

@ -28,12 +28,12 @@ import sys
from logging import error, warning, info
from subprocess import Popen
sys.dont_write_bytecode = True
sys.path.insert(0, 'submodules/cmake-builder')
sys.path.insert(0, 'linphone-sdk/cmake-builder')
try:
import prepare
except Exception as e:
error(
"Could not find prepare module: {}, probably missing submodules/cmake-builder? Try running:\n"
"Could not find prepare module: {}, probably missing linphone-sdk/cmake-builder? Try running:\n"
"git submodule sync && git submodule update --init --recursive".format(e))
exit(1)
@ -46,7 +46,7 @@ class DesktopTarget(prepare.Target):
current_path = os.path.dirname(os.path.realpath(__file__))
self.config_file = 'configs/config-desktop.cmake'
self.output = 'OUTPUT/' + self.name
self.external_source_path = os.path.join(current_path, 'submodules')
self.external_source_path = os.path.join(current_path, 'linphone-sdk')
self.packaging_args = [
"-DENABLE_RELATIVE_PREFIX=YES"
]
@ -66,7 +66,7 @@ class DesktopRaspberryTarget(prepare.Target):
self.config_file = 'configs/config-desktop-raspberry.cmake'
self.toolchain_file = 'toolchains/toolchain-raspberry.cmake'
self.output = 'OUTPUT/' + self.name
self.external_source_path = os.path.join(current_path, 'submodules')
self.external_source_path = os.path.join(current_path, 'linphone-sdk')
self.packaging_args = [
"-DCMAKE_INSTALL_RPATH=$ORIGIN/../lib",
"-DENABLE_RELATIVE_PREFIX=YES"
@ -80,7 +80,7 @@ class DesktopRpmTarget(prepare.Target):
current_path = os.path.dirname(os.path.realpath(__file__))
self.config_file = 'configs/config-desktop-rpm.cmake'
self.output = 'OUTPUT/' + self.name
self.external_source_path = os.path.join(current_path, 'submodules')
self.external_source_path = os.path.join(current_path, 'linphone-sdk')
external_builders_path = os.path.join(current_path, 'cmake_builder')
self.additional_args = [
"-DLINPHONE_BUILDER_EXTERNAL_BUILDERS_PATH=" + external_builders_path,
@ -95,7 +95,7 @@ class NoUITarget(prepare.Target):
current_path = os.path.dirname(os.path.realpath(__file__))
self.config_file = 'configs/config-desktop.cmake'
self.output = 'OUTPUT/' + self.name
self.external_source_path = os.path.join(current_path, 'submodules')
self.external_source_path = os.path.join(current_path, 'linphone-sdk')
self.packaging_args = [
"-DCMAKE_INSTALL_RPATH=$ORIGIN/../lib",
"-DENABLE_RELATIVE_PREFIX=YES",
@ -112,7 +112,7 @@ class PythonTarget(prepare.Target):
current_path = os.path.dirname(os.path.realpath(__file__))
self.config_file = 'configs/config-python.cmake'
self.output = 'OUTPUT/' + self.name
self.external_source_path = os.path.join(current_path, 'submodules')
self.external_source_path = os.path.join(current_path, 'linphone-sdk')
external_builders_path = os.path.join(current_path, 'cmake_builder')
self.additional_args += [
"-DLINPHONE_BUILDER_EXTERNAL_BUILDERS_PATH=" + external_builders_path,
@ -129,7 +129,7 @@ class PythonRaspberryTarget(prepare.Target):
self.config_file = 'configs/config-python-raspberry.cmake'
self.toolchain_file = 'toolchains/toolchain-raspberry.cmake'
self.output = 'OUTPUT/' + self.name
self.external_source_path = os.path.join(current_path, 'submodules')
self.external_source_path = os.path.join(current_path, 'linphone-sdk')

1
submodules/bcg729

@ -1 +0,0 @@
Subproject commit 9c4f0ee0f10765f7b7e450452291f674a52fe865

1
submodules/bcmatroska2

@ -1 +0,0 @@
Subproject commit 7cc7b930af024707b1e7d4a9da4c40c3fa3d4ed7

1
submodules/bctoolbox

@ -1 +0,0 @@
Subproject commit 77088a4ebc8a445b00a2672d56194a55878eb7e2

1
submodules/bcunit

@ -1 +0,0 @@
Subproject commit 8f5e72c3428ad6ff9bfa59da5a83524ff0764fa5

1
submodules/belcard

@ -1 +0,0 @@
Subproject commit ab5416d66620f32ff6882b6e29dec63203dbca41

1
submodules/belle-msrp

@ -1 +0,0 @@
Subproject commit ed811c15b72a8c39478c4d01569a424a4018e8a3

1
submodules/belle-sip

@ -1 +0,0 @@
Subproject commit 67114d45541fd659afad340cfe55d2d46d0ca627

1
submodules/belr

@ -1 +0,0 @@
Subproject commit 8e841b047641b1812a83880a90e89d702747ca5b

1
submodules/bzrtp

@ -1 +0,0 @@
Subproject commit e86b99fdc51c95f4d4997d7fdcfdfe0d1589ca92

1
submodules/cmake-builder

@ -1 +0,0 @@
Subproject commit 00a7a94f4496015409c7eeb90892633424ef36fc

1
submodules/externals/bv16-floatingpoint vendored

@ -1 +0,0 @@
Subproject commit 52539817da9bd17b15c3aef6926eb1aaea48d1b6

1
submodules/externals/ffmpeg vendored

@ -1 +0,0 @@
Subproject commit 9638caa76cd2da86e4793b34676bd5e32e94f2c7

1
submodules/externals/gsm vendored

@ -1 +0,0 @@
Subproject commit 0f8822b5326c76bb9dc4c6b552631f51792c3982

1
submodules/externals/libjpeg-turbo vendored

@ -1 +0,0 @@
Subproject commit 9f34b5eade75fd8e1548e6c7daf278d6ffb73526

1
submodules/externals/libvpx vendored

@ -1 +0,0 @@
Subproject commit e30f719387857056a45a6722bf4f3a55203d812b

1
submodules/externals/libxml2 vendored

@ -1 +0,0 @@
Subproject commit 3211973961d01b9c5efb5c5f3b8620a2a3c17561

1
submodules/externals/libxsd vendored

@ -1 +0,0 @@
Subproject commit 34af5de2ee71dde72a010fde336d2efa9c386abd

1
submodules/externals/mbedtls vendored

@ -1 +0,0 @@
Subproject commit cb152c35ddf7cc837221072e7dc99809f0f7c885

1
submodules/externals/openh264 vendored

@ -1 +0,0 @@
Subproject commit a180c9d4d6f1a4830ca9eed9d159d54996bd63cb

1
submodules/externals/opus vendored

@ -1 +0,0 @@
Subproject commit 35b371a85bf2cf21ab4b12b5475c76a2775b25d1

1
submodules/externals/soci vendored

@ -1 +0,0 @@
Subproject commit d1fc622b2cbe5fe9b55959b32af054c7ae75e1a1

1
submodules/externals/speex vendored

@ -1 +0,0 @@
Subproject commit fc1dd43c3c9d244bca1c300e408ce0373dbd5ed8

1
submodules/externals/sqlite3 vendored

@ -1 +0,0 @@
Subproject commit 4c8be2e9603c47378b10b07cf698a0540891cf0e

1
submodules/externals/srtp vendored

@ -1 +0,0 @@
Subproject commit 41dd462ddbd86ed2d2020b60dab53d5445d0a562

1
submodules/externals/v4l-utils vendored

@ -1 +0,0 @@
Subproject commit 10d5c745bde031f21b36f8d016b5790150f70eea

1
submodules/externals/xerces-c vendored

@ -1 +0,0 @@
Subproject commit 703b042c43b2b3afef93b42df16a64fd823e4dcf

1
submodules/externals/zlib vendored

@ -1 +0,0 @@
Subproject commit cacf7f1d4e3d44d871b605da3b647f07d718623f

1
submodules/linphone

@ -1 +0,0 @@
Subproject commit 6c2489abb725524bbb9940bc3324d9b044b0b55e

1
submodules/mediastreamer2

@ -1 +0,0 @@
Subproject commit 6dfb0355badba930666f0e1742cfb0643989f135

1
submodules/msamr

@ -1 +0,0 @@
Subproject commit 1051f223b2a9ee57e2603872bda9f336a7b9441a

1
submodules/msopenh264

@ -1 +0,0 @@
Subproject commit fd330d26ecd368f6ee71e81c4f72ca6b935b8b33

1
submodules/mssilk

@ -1 +0,0 @@
Subproject commit fd1620c38e5ebeba63b4d8799769d94f0c6a956c

1
submodules/mswasapi

@ -1 +0,0 @@
Subproject commit 0fd04f29dcc3eb2d60f4053cb75cca7d14691d5d

1
submodules/mswebrtc

@ -1 +0,0 @@
Subproject commit e13b18490b4e73520dc50dfe0b4bd43a0dc8ffd3

1
submodules/msx264

@ -1 +0,0 @@
Subproject commit f4fe74056d0474b42025d95449ec859e984d78ea

1
submodules/ortp

@ -1 +0,0 @@
Subproject commit 17be28e9d0b8e50b89ff9fba75990a51f03f111e