Commit b94f3ae7 authored by Ghislain MARY's avatar Ghislain MARY

Update openh264 to version 1.5.0.

parent bc05369e
......@@ -33,7 +33,7 @@ if(NOT NASM_PROGRAM)
endif()
set(EP_openh264_GIT_REPOSITORY "https://github.com/cisco/openh264" CACHE STRING "openh264 repository URL")
set(EP_openh264_GIT_TAG "v1.4.0" CACHE STRING "openh264 tag to use")
set(EP_openh264_GIT_TAG "v1.5.0" CACHE STRING "openh264 tag to use")
set(EP_openh264_EXTERNAL_SOURCE_PATHS "externals/openh264")
set(EP_openh264_BUILD_METHOD "custom")
......@@ -42,7 +42,6 @@ set(EP_openh264_BUILD_TYPE "Release") # Always use Release build type, otherwise
set(EP_openh264_CONFIGURE_COMMAND_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/builders/openh264/configure.sh.cmake)
set(EP_openh264_BUILD_COMMAND_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/builders/openh264/build.sh.cmake)
set(EP_openh264_INSTALL_COMMAND_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/builders/openh264/install.sh.cmake)
set(EP_openh264_OUT_OF_TREE_BUILD_PATCH "${CMAKE_CURRENT_SOURCE_DIR}/builders/openh264/out-of-tree-build.patch")
if (MSVC)
set(EP_openh264_ADDITIONAL_OPTIONS "OS=\"msvc\"")
endif()
......
......@@ -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 -f @ep_source@/Makefile libraries PREFIX="@CMAKE_INSTALL_PREFIX@" BUILDTYPE="@EP_openh264_BUILD_TYPE@" ASM="@NASM_PROGRAM@" @EP_openh264_ADDITIONAL_OPTIONS@ @ep_redirect_to_file@
make -f @ep_source_relative_to_build@/Makefile libraries PREFIX="@CMAKE_INSTALL_PREFIX@" BUILDTYPE="@EP_openh264_BUILD_TYPE@" ASM="@NASM_PROGRAM@" @EP_openh264_ADDITIONAL_OPTIONS@ @ep_redirect_to_file@
#!/bin/sh
cd @ep_source@
if [ ! -f .out-of-tree-build-patch-applied ]; then
patch -p1 -i @EP_openh264_OUT_OF_TREE_BUILD_PATCH@ && touch .out-of-tree-build-patch-applied
fi
......@@ -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 -f @ep_source@/Makefile install@EP_openh264_LINKING_TYPE@ DESTDIR="@CMAKE_INSTALL_PREFIX@" PREFIX="" BUILDTYPE="@EP_openh264_BUILD_TYPE@" @EP_openh264_ADDITIONAL_OPTIONS@ @ep_redirect_to_file@
make -f @ep_source_relative_to_build@/Makefile install@EP_openh264_LINKING_TYPE@ DESTDIR="@CMAKE_INSTALL_PREFIX@" PREFIX="" BUILDTYPE="@EP_openh264_BUILD_TYPE@" @EP_openh264_ADDITIONAL_OPTIONS@ @ep_redirect_to_file@
This diff is collapsed.
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