Commit a4963f27 authored by jehan's avatar jehan

add transcoder support for flexisip

parent b73209d6
......@@ -244,7 +244,11 @@ else()
if(_target_found GREATER -1)
add_custom_target(TARGET_flexisip ALL)
add_dependencies(TARGET_linphone_builder TARGET_flexisip)
add_dependencies(TARGET_flexisip TARGET_ortp)
if (ENABLE_TRANSCODER)
add_dependencies(TARGET_flexisip TARGET_ms2)
else ()
add_dependencies(TARGET_flexisip TARGET_ortp)
endif()
if(ENABLE_PRESENCE)
add_dependencies(TARGET_flexisip TARGET_bctoolbox TARGET_bellesip)
endif()
......
......@@ -41,16 +41,21 @@ set(EP_flexisip_CROSS_COMPILATION_OPTIONS
)
set(EP_flexisip_CONFIG_H_FILE "flexisip.spec")
set(EP_flexisip_SPEC_FILE "flexisip.spec")
set(EP_flexisip_DEPENDENCIES EP_ortp EP_sofiasip )
set(EP_flexisip_DEPENDENCIES EP_sofiasip )
if (ENABLE_PRESENCE)
list(APPEND EP_flexisip_DEPENDENCIES EP_bellesip)
endif()
if(ENABLE_SOCI_BUILD)
list(APPEND EP_flexisip_DEPENDENCIES EP_soci)
endif()
if (ENABLE_TRANSCODER)
list(APPEND EP_flexisip_DEPENDENCIES EP_ms2)
else()
list(APPEND EP_flexisip_DEPENDENCIES EP_ortp)
list(APPEND EP_flexisip_CONFIGURE_OPTIONS "--disable-transcoder")
endif()
list(APPEND EP_flexisip_CONFIGURE_OPTIONS "--disable-transcoder")
list(APPEND EP_flexisip_CMAKE_OPTIONS "-DENABLE_TRANSCODER=NO")
list(APPEND EP_flexisip_CMAKE_OPTIONS "-DENABLE_TRANSCODER=${ENABLE_TRANSCODER}")
list(APPEND EP_flexisip_CMAKE_OPTIONS "-DENABLE_ODB=${ENABLE_ODB}")
if(ENABLE_ODB)
......
......@@ -26,7 +26,12 @@ set(EP_ms2_GIT_TAG "2.12.0" CACHE STRING "ms2 tag to use")
set(EP_ms2_EXTERNAL_SOURCE_PATHS "mediastreamer2" "linphone/mediastreamer2")
set(EP_ms2_GROUPABLE YES)
set(EP_ms2_LINKING_TYPE ${DEFAULT_VALUE_CMAKE_LINKING_TYPE})
if(EP_ms2_FORCE_AUTOTOOLS)
set(EP_ms2_USE_AUTOGEN True)
else()
set(EP_ms2_LINKING_TYPE ${DEFAULT_VALUE_CMAKE_LINKING_TYPE})
endif()
set(EP_ms2_DEPENDENCIES EP_ortp EP_bctoolbox)
if(ANDROID)
list(APPEND EP_ms2_DEPENDENCIES EP_androidcpufeatures)
......@@ -101,3 +106,6 @@ endif()
if(ENABLE_V4L AND LINPHONE_BUILDER_BUILD_DEPENDENCIES)
list(APPEND EP_ms2_DEPENDENCIES EP_v4l)
endif()
set(EP_ms2_SPEC_FILE "mediastreamer2.spec")
set(EP_ms2_RPMBUILD_NAME "mediastreamer")
......@@ -194,6 +194,9 @@ macro(linphone_builder_create_targets_list)
list(APPEND LINPHONE_BUILDER_TARGETS "bctoolbox" "belle-sip" "ortp" "ms2" "ms2-plugins" "linphone")
elseif(LINPHONE_BUILDER_TARGET STREQUAL "flexisip")
list(APPEND LINPHONE_BUILDER_TARGETS "ortp" "flexisip")
if(ENABLE_TRANSCODER)
list(APPEND LINPHONE_BUILDER_TARGETS "bctoolbox" "ms2")
endif()
if(ENABLE_PRESENCE)
list(APPEND LINPHONE_BUILDER_TARGETS "bctoolbox" "belle-sip")
endif()
......
......@@ -94,6 +94,10 @@ endif()
# needed *before* the include
set(EP_ortp_FORCE_AUTOTOOLS True)
list(APPEND EP_ms2_CMAKE_OPTIONS "-DENABLE_TESTS=NO")
set(EP_ms2_USE_AUTOGEN True)
set(EP_ms2_FORCE_AUTOTOOLS True)
set(EP_ms2_CONFIGURE_OPTIONS "--disable-video")
#required to use autotools
set(EP_bellesip_USE_AUTOGEN True)
set(EP_flexisip_FORCE_AUTOTOOLS True)
......@@ -112,21 +116,30 @@ set(EP_bellesip_BUILD_METHOD "rpm")
set(EP_sofiasip_BUILD_METHOD "rpm")
set(EP_flexisip_BUILD_METHOD "rpm")
set(EP_odb_BUILD_METHOD "custom")
set(EP_ms2_BUILD_METHOD "rpm")
set(EP_ms2_SPEC_PREFIX "${RPM_INSTALL_PREFIX}")
set(EP_ortp_SPEC_PREFIX "${RPM_INSTALL_PREFIX}")
set(EP_bellesip_SPEC_PREFIX "${RPM_INSTALL_PREFIX}")
set(EP_sofiasip_SPEC_PREFIX "${RPM_INSTALL_PREFIX}")
set(EP_flexisip_SPEC_PREFIX "${RPM_INSTALL_PREFIX}")
set(EP_flexisip_CONFIGURE_OPTIONS "--disable-transcoder" "--enable-redis" "--enable-libodb=no" "--enable-libodb-mysql=no")
set(EP_flexisip_CONFIGURE_OPTIONS "--enable-redis" "--enable-libodb=no" "--enable-libodb-mysql=no")
set(EP_ortp_RPMBUILD_OPTIONS "--with bc --without srtp")
set(EP_ortp_RPMBUILD_OPTIONS "--with bc")
set(EP_ms2_RPMBUILD_OPTIONS "--with bc --without video")
set(EP_unixodbc_RPMBUILD_OPTIONS "--with bc")
set(EP_myodbc_RPMBUILD_OPTIONS "--with bc")
set(EP_sofiasip_RPMBUILD_OPTIONS "--with bc --without glib")
set(EP_hiredis_RPMBUILD_OPTIONS "--with bc" )
set(EP_flexisip_RPMBUILD_OPTIONS "--with bc --without transcoder --with push")
if (ENABLE_TRANSCODER)
set(EP_flexisip_RPMBUILD_OPTIONS "--with bc --with push")
else()
list(APPEND EP_flexisip_CONFIGURE_OPTIONS "--disable-transcoder")
set(EP_flexisip_RPMBUILD_OPTIONS "--with bc --without transcoder --with push")
endif()
set(EP_bellesip_RPMBUILD_OPTIONS "--with bc ")
if (ENABLE_PRESENCE)
......
......@@ -32,6 +32,8 @@ set(DEFAULT_VALUE_ENABLE_PRESENCE OFF)
set(DEFAULT_VALUE_ENABLE_SNMP ON)
set(DEFAULT_VALUE_ENABLE_POLARSSL ON)
set(DEFAULT_VALUE_ENABLE_VIDEO OFF)
set(DEFAULT_VALUE_CMAKE_LINKING_TYPE "-DENABLE_STATIC=NO")
# ms2 default values
......
......@@ -47,3 +47,7 @@ add_feature_info("SNMP" ENABLE_SNMP "Enable SNMP support")
option(ENABLE_SOCI "Enable SOCI support" "${DEFAULT_ENABLE_SOCI}")
add_feature_info("SOCI" ENABLE_SOCI "Enable SOCI support")
cmake_dependent_option(ENABLE_SOCI_BUILD "Build SOCI from sources instead of taking the operating system version." "${DEFAULT_VALUE_ENABLE_SOCI_BUILD}" "ENABLE_SOCI" OFF)
option(ENABLE_TRANSCODER "Enable TRANSCODER support" "${DEFAULT_ENABLE_TRANSCODER}")
add_feature_info("TRANSCODER" ENABLE_TRANSCODER "Enable TRANSCODER support")
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