Commit 2c7b59ef authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Update openh264, msopenh264 and allow static build of openh264 for the webplugin.

parent 6da261b4
......@@ -24,7 +24,7 @@ set(EP_msopenh264_GIT_REPOSITORY "git://git.linphone.org/msopenh264.git")
if(${LINPHONE_BUILDER_LATEST})
set(EP_msopenh264_GIT_TAG "master")
else()
set(EP_msopenh264_GIT_TAG "c871fcf27d125fb0a5f3c2f15595f59290b2e047")
set(EP_msopenh264_GIT_TAG "1c1be3e1abed1564627ffd8d07958554c5ce064d")
endif()
set(EP_msopenh264_BUILD_METHOD "autotools")
set(EP_msopenh264_USE_AUTOGEN "yes")
......
......@@ -32,7 +32,7 @@ if(NOT NASM_PROGRAM)
endif()
set(EP_openh264_GIT_REPOSITORY "https://github.com/cisco/openh264")
set(EP_openh264_GIT_TAG "fb5700bd5cc18dd33c120ce9dd5f79b8f1f35f3a")
set(EP_openh264_GIT_TAG "v1.0.0")
set(EP_openh264_BUILD_METHOD "custom")
set(EP_openh264_BUILD_IN_SOURCE "yes")
set(EP_openh264_LINKING_TYPE "-shared")
......
......@@ -21,4 +21,4 @@ export PKG_CONFIG_PATH="@LINPHONE_BUILDER_PKG_CONFIG_PATH@"
export PKG_CONFIG_LIBDIR="@LINPHONE_BUILDER_PKG_CONFIG_LIBDIR@"
cd @ep_build@
make PREFIX="@CMAKE_INSTALL_PREFIX@" SHARED="@EP_openh264_LINKING_TYPE@" BUILDTYPE="@EP_openh264_BUILD_TYPE@"
make PREFIX="@CMAKE_INSTALL_PREFIX@" BUILDTYPE="@EP_openh264_BUILD_TYPE@"
......@@ -21,4 +21,4 @@ export PKG_CONFIG_PATH="@LINPHONE_BUILDER_PKG_CONFIG_PATH@"
export PKG_CONFIG_LIBDIR="@LINPHONE_BUILDER_PKG_CONFIG_LIBDIR@"
cd @ep_build@
make install PREFIX="@CMAKE_INSTALL_PREFIX@" SHARED="@EP_openh264_LINKING_TYPE@" BUILDTYPE="@EP_openh264_BUILD_TYPE@"
make install@EP_openh264_LINKING_TYPE@ PREFIX="@CMAKE_INSTALL_PREFIX@" BUILDTYPE="@EP_openh264_BUILD_TYPE@"
......@@ -95,6 +95,14 @@ list(APPEND EP_ms2_CONFIGURE_OPTIONS
"--enable-relativeprefix=yes"
)
# openh264
set(EP_openh264_LINKING_TYPE "-static")
# Force regeneration of cmake files so that linking type change is effective
linphone_builder_set_ep_directories(openh264)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/builders/openh264/configure.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/EP_openh264_configure.sh)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/builders/openh264/build.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/EP_openh264_build.sh)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/builders/openh264/install.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/EP_openh264_install.sh)
# opus
if(NOT MSVC)
# TODO: Also build statically on windows
......
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