Skip to content

GitLab

Commit e70e23d1 authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Replace the msisac builder by the mswebrtc builder.

parent 0e33f8f1
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 11 deletions
builders/CMakeLists.txt
View file @ e70e23d1
......@@ -117,8 +117,8 @@ if(_target_found GREATER -1)
linphone_builder_add_builder_to_target(TARGET_ms2plugins libilbcrfc3951)
linphone_builder_add_builder_to_target(TARGET_ms2plugins msilbc)
endif()
if(${ENABLE_ISAC})
linphone_builder_add_builder_to_target(TARGET_ms2plugins msisac)
if(${ENABLE_ISAC} OR ${ENABLE_WEBRTC_AEC})
linphone_builder_add_builder_to_target(TARGET_ms2plugins mswebrtc)
endif()
if(${ENABLE_SILK})
linphone_builder_add_builder_to_target(TARGET_ms2plugins mssilk)
......
builders/msisac.cmake → builders/mswebrtc.cmake
View file @ e70e23d1
############################################################################
# msisac.cmake
# mswebrtc.cmake
# Copyright (C) 2014 Belledonne Communications, Grenoble France
#
############################################################################
......@@ -20,18 +20,25 @@
#
############################################################################
set(EP_msisac_GIT_REPOSITORY "git://git.linphone.org/msisac.git")
set(EP_mswebrtc_GIT_REPOSITORY "git://git.linphone.org/mswebrtc.git")
if(${LINPHONE_BUILDER_LATEST})
set(EP_msisac_GIT_TAG "master")
set(EP_mswebrtc_GIT_TAG "master")
else()
set(EP_msisac_GIT_TAG "fafe68323df68b5f4e18b15b350134a54888f2b4")
set(EP_mswebrtc_GIT_TAG "6e24f3ddbdc9c44860c2f1f1ca4967c1910b1502")
endif()
set(EP_msisac_BUILD_METHOD "autotools")
set(EP_msisac_USE_AUTOGEN "yes")
set(EP_msisac_CROSS_COMPILATION_OPTIONS
set(EP_mswebrtc_BUILD_METHOD "autotools")
set(EP_mswebrtc_USE_AUTOGEN "yes")
set(EP_mswebrtc_CROSS_COMPILATION_OPTIONS
"--prefix=${CMAKE_INSTALL_PREFIX}"
"--host=${LINPHONE_BUILDER_HOST}"
)
set(EP_msisac_LINKING_TYPE "--disable-static" "--enable-shared")
set(EP_msisac_DEPENDENCIES EP_ms2)
set(EP_mswebrtc_LINKING_TYPE "--disable-static" "--enable-shared")
set(EP_mswebrtc_DEPENDENCIES EP_ms2)
set(EP_mswebrtc_CONFIGURE_OPTIONS )
if(NOT ${ENABLE_ISAC})
list(APPEND EP_mswebrtc_CONFIGURE_OPTIONS "--disable-isac")
endif()
if(NOT ${ENABLE_WEBRTC_AEC})
list(APPEND EP_mswebrtc_CONFIGURE_OPTIONS "--disable-aec")
endif()
cmake/LinphoneBuilderOptions.cmake
View file @ e70e23d1
......@@ -60,6 +60,9 @@ linphone_builder_add_feature_info("Silk" ENABLE_SILK "Silk audio encoding/decodi
option(ENABLE_SPEEX "Enable speex audio codec support." ${DEFAULT_VALUE_ENABLE_SPEEX})
linphone_builder_add_feature_info("Speex" ENABLE_SPEEX "Speex audio encoding/decoding support.")
option(ENABLE_WEBRTC_AEC "Enable WebRTC echo canceller support." ${DEFAULT_VALUE_ENABLE_WEBRTC_AEC})
linphone_builder_add_feature_info("WebRTC AEC" ENABLE_WEBRTC_AEC "WebRTC echo canceller support.")
cmake_dependent_option(ENABLE_FFMPEG "Enable ffmpeg support." ${DEFAULT_VALUE_ENABLE_FFMPEG} "ENABLE_VIDEO;ENABLE_GPL_THIRD_PARTIES" OFF)
linphone_builder_add_feature_info("FFmpeg" ENABLE_FFMPEG "Some video processing features via FFmpeg: MPEG4 encoding/decoding, video scaling...")
cmake_dependent_option(ENABLE_H263 "Enable H263 video codec support." ${DEFAULT_VALUE_ENABLE_H263} "ENABLE_FFMPEG" OFF)
......
configs/config-bb10.cmake
View file @ e70e23d1
......@@ -35,6 +35,7 @@ set(DEFAULT_VALUE_ENABLE_ISAC OFF)
set(DEFAULT_VALUE_ENABLE_OPUS ON)
set(DEFAULT_VALUE_ENABLE_SILK OFF)
set(DEFAULT_VALUE_ENABLE_SPEEX ON)
set(DEFAULT_VALUE_ENABLE_WEBRTC_AEC OFF)
set(DEFAULT_VALUE_ENABLE_H263 OFF)
set(DEFAULT_VALUE_ENABLE_H263P OFF)
set(DEFAULT_VALUE_ENABLE_MPEG4 OFF)
......
configs/config-desktop.cmake
View file @ e70e23d1
......@@ -35,6 +35,7 @@ set(DEFAULT_VALUE_ENABLE_ISAC ON)
set(DEFAULT_VALUE_ENABLE_OPUS ON)
set(DEFAULT_VALUE_ENABLE_SILK ON)
set(DEFAULT_VALUE_ENABLE_SPEEX ON)
set(DEFAULT_VALUE_ENABLE_WEBRTC_AEC OFF)
set(DEFAULT_VALUE_ENABLE_H263 ON)
set(DEFAULT_VALUE_ENABLE_H263P ON)
set(DEFAULT_VALUE_ENABLE_MPEG4 ON)
......
configs/config-ios.cmake
View file @ e70e23d1
......@@ -35,6 +35,7 @@ set(DEFAULT_VALUE_ENABLE_ISAC OFF)
set(DEFAULT_VALUE_ENABLE_OPUS ON)
set(DEFAULT_VALUE_ENABLE_SILK OFF)
set(DEFAULT_VALUE_ENABLE_SPEEX ON)
set(DEFAULT_VALUE_ENABLE_WEBRTC_AEC OFF)
set(DEFAULT_VALUE_ENABLE_H263 OFF)
set(DEFAULT_VALUE_ENABLE_H263P OFF)
set(DEFAULT_VALUE_ENABLE_MPEG4 OFF)
......
configs/config-webplugin.cmake
View file @ e70e23d1
......@@ -35,6 +35,7 @@ set(DEFAULT_VALUE_ENABLE_ISAC OFF)
set(DEFAULT_VALUE_ENABLE_OPUS ON)
set(DEFAULT_VALUE_ENABLE_SILK OFF)
set(DEFAULT_VALUE_ENABLE_SPEEX ON)
set(DEFAULT_VALUE_ENABLE_WEBRTC_AEC OFF)
set(DEFAULT_VALUE_ENABLE_H263 OFF)
set(DEFAULT_VALUE_ENABLE_H263P OFF)
set(DEFAULT_VALUE_ENABLE_MPEG4 OFF)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment