Commit be35cc23 authored by Mickaël Turnel's avatar Mickaël Turnel

Change options for the new opus CMakeLists

parent b9232688
......@@ -21,7 +21,7 @@
############################################################################
if(LINPHONE_BUILDER_PREBUILT_URL)
set(OPUS_FILENAME "opus-1.0.3-${LINPHONE_BUILDER_ARCHITECTURE}.zip")
set(OPUS_FILENAME "opus-1.3.1-${LINPHONE_BUILDER_ARCHITECTURE}.zip")
file(DOWNLOAD "${LINPHONE_BUILDER_PREBUILT_URL}/${OPUS_FILENAME}" "${CMAKE_CURRENT_BINARY_DIR}/${OPUS_FILENAME}" STATUS OPUS_FILENAME_STATUS)
list(GET OPUS_FILENAME_STATUS 0 OPUS_DOWNLOAD_STATUS)
if(NOT OPUS_DOWNLOAD_STATUS)
......@@ -33,8 +33,8 @@ if(OPUS_PREBUILT)
lcb_url("${CMAKE_CURRENT_BINARY_DIR}/${OPUS_FILENAME}")
lcb_build_method("prebuilt")
else()
lcb_url("http://downloads.xiph.org/releases/opus/opus-1.1.1.tar.gz")
lcb_url_hash("MD5=cfb354d4c65217ca32a762f8ab15f2ac")
lcb_url("http://downloads.xiph.org/releases/opus/opus-1.3.1.tar.gz")
lcb_url_hash("MD5=d7c07db796d21c9cf1861e0c2b0c0617")
lcb_external_source_paths("opus" "externals/opus" "external/opus")
lcb_may_be_found_on_system(YES)
lcb_ignore_warnings(YES)
......
......@@ -107,11 +107,7 @@ if(NOT ENABLE_EMBEDDED_OPENH264)
endif()
# opus
lcb_builder_cmake_options(opus "-DENABLE_FIXED_POINT=YES")
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "armv5te")
lcb_builder_cmake_options(opus "-DENABLE_ASM=NO")
lcb_builder_cmake_options(opus "-DENABLE_INTRINSICS=NO")
endif()
lcb_builder_cmake_options(opus "-DOPUS_FIXED_POINT=YES")
# ortp
lcb_builder_cmake_options(ortp "-DENABLE_DOC=NO")
......
......@@ -125,10 +125,12 @@ if(ENABLE_STATIC_ONLY)
# polarssl
lcb_builder_linking_type(polarssl "-DUSE_SHARED_POLARSSL_LIBRARY=0")
endif()
if(NOT ENABLE_STATIC_ONLY AND NOT ENABLE_EMBEDDED_OPENH264)
# openh264
lcb_builder_linking_type(openh264 "-shared")
else()
if (NOT ENABLE_EMBEDDED_OPENH264)
# openh264
lcb_builder_linking_type(openh264 "-shared")
endif()
lcb_builder_linking_type(opus "-DBUILD_SHARED_LIBS=YES")
endif()
# voamrwbenc
......
......@@ -61,7 +61,7 @@ lcb_builder_cross_compilation_options(ffmpeg
)
# opus
lcb_builder_cmake_options(opus "-DENABLE_FIXED_POINT=YES")
lcb_builder_cmake_options(opus "-DOPUS_FIXED_POINT=YES")
# speex
lcb_builder_cmake_options(speex
......
......@@ -104,7 +104,7 @@ lcb_builder_linking_type(mswebrtc "-DENABLE_SHARED=YES" "-DENABLE_STATIC=NO")
lcb_builder_linking_type(msx264 "-DENABLE_SHARED=YES" "-DENABLE_STATIC=NO")
# opus
lcb_builder_cmake_options(opus "-DENABLE_FIXED_POINT=YES")
lcb_builder_cmake_options(opus "-DOPUS_FIXED_POINT=YES")
# ortp
lcb_builder_cmake_options(ortp "-DENABLE_DOC=NO")
......
......@@ -42,7 +42,7 @@ lcb_builder_cross_compilation_options(ffmpeg
)
# opus
lcb_builder_cmake_options(opus "-DENABLE_FIXED_POINT=YES")
lcb_builder_cmake_options(opus "-DOPUS_FIXED_POINT=YES")
# speex
lcb_builder_cmake_options(speex "-DENABLE_FLOAT_API=NO")
......
......@@ -50,6 +50,4 @@ lcb_builder_cmake_options(linphone "-DENABLE_SOCI=NO")
lcb_builder_cmake_options(ms2 "-DENABLE_RELATIVE_PREFIX=YES")
# opus
lcb_builder_cmake_options(opus "-DENABLE_ASM=NO")
lcb_builder_cmake_options(opus "-DENABLE_FIXED_POINT=YES")
lcb_builder_linking_type(opus "-DENABLE_SHARED=NO" "-DENABLE_STATIC=YES")
lcb_builder_cmake_options(opus "-DOPUS_FIXED_POINT=YES")
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