Commit 19f2f46e authored by Sylvain Berfini's avatar Sylvain Berfini 🎩

Retrofit changes in dev_bb10 branch here

parent dac22227
......@@ -193,7 +193,9 @@ else()
# Do not build sqlite3, xml2 and zlib on IOS, they are provided by the system
linphone_builder_add_builder_to_target(TARGET_linphone sqlite3)
linphone_builder_add_builder_to_target(TARGET_linphone xml2)
linphone_builder_add_builder_to_target(TARGET_linphone zlib)
if (NOT QNX)
linphone_builder_add_builder_to_target(TARGET_linphone zlib)
endif()
endif()
if(ENABLE_UNIT_TESTS)
linphone_builder_add_builder_to_target(TARGET_linphone cunit)
......
......@@ -29,7 +29,10 @@ set(EP_linphone_LINKING_TYPE "${DEFAULT_VALUE_CMAKE_LINKING_TYPE}")
set(EP_linphone_DEPENDENCIES EP_bellesip EP_ortp EP_ms2)
if(LINPHONE_BUILDER_BUILD_DEPENDENCIES AND NOT IOS)
# Do not build sqlite3, xml2 and zlib on IOS, they are provided by the system
list(APPEND EP_linphone_DEPENDENCIES EP_sqlite3 EP_xml2 EP_zlib)
list(APPEND EP_linphone_DEPENDENCIES EP_sqlite3 EP_xml2)
if (NOT QNX)
list(APPEND EP_linphone_DEPENDENCIES EP_zlib)
endif()
endif()
if(MSVC)
set(EP_linphone_EXTRA_LDFLAGS "/SAFESEH:NO")
......
......@@ -106,12 +106,35 @@ else()
endif()
set(EP_vpx_LINKING_TYPE "--enable-static" "--disable-shared" "--enable-pic")
else()
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(EP_vpx_TARGET "x86_64-linux-gcc")
if("${CMAKE_SYSTEM_NAME}" STREQUAL "QNX")
set(EP_vpx_PATCH_COMMAND "${PATCH_PROGRAM}" "-p1" "-i" "${CMAKE_CURRENT_SOURCE_DIR}/builders/vpx/enable-qnx-build.patch" "--binary")
set(EP_vpx_TARGET "armv7-qnx-gcc")
set(EP_vpx_CONFIGURE_OPTIONS
"--enable-error-concealment"
"--enable-realtime-only"
"--enable-spatial-resampling"
"--enable-vp8"
"--disable-vp9"
"--enable-libs"
"--disable-install-docs"
"--disable-debug-libs"
"--disable-examples"
"--disable-unit-tests"
"--disable-multithread"
"--as=yasm"
"--libc=${QNX_TARGET}/${ROOT_PATH_SUFFIX}"
"--force-target=armv7-qnx-gcc"
"--disable-runtime-cpu-detect"
)
set(EP_vpx_BUILD_IN_SOURCE "yes")
else()
set(EP_vpx_TARGET "x86-linux-gcc")
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(EP_vpx_TARGET "x86_64-linux-gcc")
else()
set(EP_vpx_TARGET "x86-linux-gcc")
endif()
set(EP_vpx_LINKING_TYPE "--disable-static" "--enable-shared")
endif()
set(EP_vpx_LINKING_TYPE "--disable-static" "--enable-shared")
endif()
set(EP_vpx_CROSS_COMPILATION_OPTIONS
......
--- libvpx/build/make/configure.sh.orig 2015-08-28 15:32:01.186543252 +0200
+++ libvpx/build/make/configure.sh 2015-08-28 15:32:10.346523909 +0200
@@ -697,6 +697,9 @@
*os2*)
tgt_os=os2
;;
+ *qnx*)
+ tgt_os=qnx
+ ;;
esac
if [ -n "$tgt_isa" ] && [ -n "$tgt_os" ]; then
@@ -918,6 +921,11 @@
disable_feature multithread
disable_feature os_support
;;
+
+ qnx*)
+ disable_feature multithread
+ add_cflags --sysroot ${alt_libc}
+ ;;
android*)
SDK_PATH=${sdk_path}
......@@ -20,8 +20,9 @@
#
############################################################################
include(configs/config-bb10.cmake)
set(DEFAULT_VALUE_ENABLE_VPX ON)
include(configs/config-bb10.cmake)
# Global configuration
set(LINPHONE_BUILDER_CFLAGS "${LINPHONE_BUILDER_CFLAGS} -march=armv7-a -mfpu=neon")
......@@ -38,4 +39,7 @@ list(APPEND EP_speex_CMAKE_OPTIONS
list(APPEND EP_opus_CONFIGURE_OPTIONS "--enable-fixed-point")
#polar ssl
list(APPEND EP_polarssl_EXTRA_CFLAGS "-fomit-frame-pointer")
\ No newline at end of file
list(APPEND EP_polarssl_EXTRA_CFLAGS "-fomit-frame-pointer")
# vpx
set(EP_vpx_LINKING_TYPE "--enable-static" "--disable-shared" "--enable-pic")
\ No newline at end of file
......@@ -20,4 +20,6 @@
#
############################################################################
set(DEFAULT_VALUE_ENABLE_VPX OFF)
include(configs/config-bb10.cmake)
......@@ -21,10 +21,10 @@
############################################################################
# Define default values for the linphone builder options
set(DEFAULT_VALUE_ENABLE_VIDEO OFF)
set(DEFAULT_VALUE_ENABLE_VIDEO ON)
set(DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES ON)
set(DEFAULT_VALUE_ENABLE_FFMPEG OFF)
set(DEFAULT_VALUE_ENABLE_ZRTP OFF)
set(DEFAULT_VALUE_ENABLE_ZRTP ON)
set(DEFAULT_VALUE_ENABLE_SRTP ON)
set(DEFAULT_VALUE_ENABLE_DTLS OFF)
set(DEFAULT_VALUE_ENABLE_AMRNB OFF)
......@@ -42,12 +42,12 @@ set(DEFAULT_VALUE_ENABLE_H263 OFF)
set(DEFAULT_VALUE_ENABLE_H263P OFF)
set(DEFAULT_VALUE_ENABLE_MPEG4 OFF)
set(DEFAULT_VALUE_ENABLE_OPENH264 OFF)
set(DEFAULT_VALUE_ENABLE_VPX OFF)
set(DEFAULT_VALUE_ENABLE_X264 OFF)
set(DEFAULT_VALUE_ENABLE_TUNNEL OFF)
set(DEFAULT_VALUE_ENABLE_UNIT_TESTS ON)
set(DEFAULT_VALUE_CMAKE_LINKING_TYPE "-DENABLE_STATIC=YES")
set(DEFAULT_VALUE_ENABLE_PACKAGING OFF)
set(DEFAULT_VALUE_ENABLE_V4L OFF)
# Global configuration
......@@ -67,9 +67,6 @@ include(builders/CMakeLists.txt)
# belle-sip
set(EP_bellesip_EXTRA_CFLAGS "-DUSE_STRUCT_RES_STATE_NAMESERVERS ${EP_bellesip_EXTRA_CFLAGS}")
# ffmpeg
set(EP_ffmpeg_LINKING_TYPE "--disable-static" "--enable-shared")
# linphone
list(APPEND EP_linphone_CMAKE_OPTIONS
"-DENABLE_RELATIVE_PREFIX=YES"
......@@ -81,6 +78,7 @@ list(APPEND EP_linphone_CMAKE_OPTIONS
"-DENABLE_UNIT_TESTS=NO"
"-DENABLE_UPNP=NO"
"-DENABLE_MSG_STORAGE=YES"
"-DENABLE_NLS=NO"
)
# mediastreamer2
......@@ -93,6 +91,9 @@ list(APPEND EP_ms2_CMAKE_OPTIONS
"-DENABLE_GLX=NO"
"-DENABLE_X11=NO"
"-DENABLE_XV=NO"
"-DENABLE_V4L=NO"
"-DENABLE_MKV=NO"
"-DENABLE_QNX=YES"
)
# polarssl
......
......@@ -81,7 +81,7 @@ cmake_dependent_option(ENABLE_X264 "Enable H.264 video encoder support with the
add_feature_info("x264" ENABLE_X264 "H.264 video encoding support with the x264 library (require license).")
cmake_dependent_option(ENABLE_OPENH264 "Enable H.264 video encoder support with the openh264 library." ${DEFAULT_VALUE_ENABLE_OPENH264} "ENABLE_VIDEO; ENABLE_NON_FREE_CODECS; NOT ENABLE_X264" OFF)
add_feature_info("openh264" ENABLE_OPENH264 "H.264 video encoding support with the openh264 library (require license).")
cmake_dependent_option(ENABLE_V4L "Enable V4L camera driver." ON "ENABLE_VIDEO; UNIX; NOT APPLE" OFF)
cmake_dependent_option(ENABLE_V4L "Enable V4L camera driver." ${DEFAULT_VALUE_ENABLE_V4L} "ENABLE_VIDEO; UNIX; NOT APPLE" OFF)
add_feature_info("v4l" ENABLE_V4L "V4L camera driver.")
option(ENABLE_MKV "Enable MKV playing and recording support" ${DEFAULT_VALUE_ENABLE_MKV})
add_feature_info("MKV" ENABLE_MKV "MKV playing and recording support.")
......@@ -55,7 +55,7 @@ get_filename_component(COMPILER_NAME ${COMPILER_PATH} NAME)
string(REGEX REPLACE "-gcc$" "" BB10_TOOLCHAIN_PATH ${COMPILER_PATH})
string(REGEX REPLACE "-gcc$" "" BB10_TOOLCHAIN_HOST ${COMPILER_NAME})
foreach(TOOLNAME gcc g++ ld ar ranlib strip nm)
foreach(TOOLNAME gcc g++ ld ar ranlib strip nm as)
configure_file(${CMAKE_CURRENT_LIST_DIR}/tool_wrapper.cmake ${CMAKE_CURRENT_BINARY_DIR}/${BB10_TOOLCHAIN_HOST}-${TOOLNAME})
endforeach(TOOLNAME)
......@@ -66,7 +66,9 @@ set(BB10_TOOLCHAIN_AR "${CMAKE_CURRENT_BINARY_DIR}/${BB10_TOOLCHAIN_HOST}-ar")
set(BB10_TOOLCHAIN_RANLIB "${CMAKE_CURRENT_BINARY_DIR}/${BB10_TOOLCHAIN_HOST}-ranlib")
set(BB10_TOOLCHAIN_STRIP "${CMAKE_CURRENT_BINARY_DIR}/${BB10_TOOLCHAIN_HOST}-strip")
set(BB10_TOOLCHAIN_NM "${CMAKE_CURRENT_BINARY_DIR}/${BB10_TOOLCHAIN_HOST}-nm")
set(BB10_TOOLCHAIN_AS "${CMAKE_CURRENT_BINARY_DIR}/${BB10_TOOLCHAIN_HOST}-as")
set(QNX True)
include(CMakeForceCompiler)
......
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