diff --git a/cmake_builder/linphone_package/CMakeLists.txt b/cmake_builder/linphone_package/CMakeLists.txt index 30f21e63aa3cb35ac07c1f64cba5339bfc73a94b..a022e3f6cbf033b00e90746d101f83e22c1ba7a4 100644 --- a/cmake_builder/linphone_package/CMakeLists.txt +++ b/cmake_builder/linphone_package/CMakeLists.txt @@ -115,10 +115,6 @@ endif () if (ENABLE_FFMPEG) add_list_file(ffmpeg) endif () -if (ENABLE_OPENH264) - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/README.openh264.txt.in" "${LINPHONE_SDK_TMP}/README.openh264.txt" @ONLY) - add_list_file(openh264) -endif () file(WRITE "${LINPHONE_SDK_TMP}/${EXECUTABLE_NAME}-sdk.list" "") foreach (_file ${LIST_FILES}) file(READ "${_file}" _content) @@ -175,12 +171,6 @@ if (WIN32) ) if (ENABLE_OPENH264) - # Include bunzip2.exe and bzip2.dll to be able to extract the openh264 file downloaded from Cisco. - install(DIRECTORY "${TOOLS_DIR}/" - DESTINATION "bin" - COMPONENT "msopenh264" - FILES_MATCHING PATTERN "b*zip2.*" - ) install(FILES "${LINPHONE_OUTPUT_DIR}/lib/mediastreamer/plugins/libmsopenh264.dll" DESTINATION "lib/mediastreamer/plugins" COMPONENT "msopenh264" @@ -287,11 +277,6 @@ if (WIN32) set(CPACK_COMPONENT_LINPHONE_BASE_DISPLAY_NAME "${APPLICATION_NAME}") set(CPACK_COMPONENT_LINPHONE_BASE_DESCRIPTION "Minimal installation of ${APPLICATION_NAME}") set(CPACK_COMPONENT_LINPHONE_BASE_REQUIRED True) - if (ENABLE_OPENH264) - set(CPACK_COMPONENT_MSOPENH264_DISPLAY_NAME "Cisco's OpenH264 codec") - set(CPACK_COMPONENT_MSOPENH264_DESCRIPTION "Download OpenH264 Video Codec provided by Cisco Systems, Inc.") - set(CPACK_COMPONENT_MSOPENH264_DISABLED True) - endif () # Use template from the current source directory to force uninstallation and ensure that linphone is not running before installation. set(CPACK_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}") @@ -308,22 +293,12 @@ if (WIN32) endif () set(CPACK_NSIS_URL_INFO_ABOUT "http://www.linphone.org/") - file(TO_NATIVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" DOS_STYLE_SOURCE_DIR) - string(REPLACE "\\" "\\\\" ESCAPED_DOS_STYLE_SOURCE_DIR "${DOS_STYLE_SOURCE_DIR}") file(TO_NATIVE_PATH "${CMAKE_CURRENT_BINARY_DIR}" DOS_STYLE_BINARY_DIR) string(REPLACE "\\" "\\\\" ESCAPED_DOS_STYLE_BINARY_DIR "${DOS_STYLE_BINARY_DIR}") configure_file("${CMAKE_CURRENT_SOURCE_DIR}/uri-handler-install.nsi.in" "${CMAKE_CURRENT_BINARY_DIR}/uri-handler-install.nsi" @ONLY) set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "!include \\\"${ESCAPED_DOS_STYLE_BINARY_DIR}\\\\uri-handler-install.nsi\\\"") configure_file("${CMAKE_CURRENT_SOURCE_DIR}/uninstall.nsi.in" "${CMAKE_CURRENT_BINARY_DIR}/uninstall.nsi" COPYONLY) set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "!include \\\"${ESCAPED_DOS_STYLE_BINARY_DIR}\\\\uninstall.nsi\\\"") - if (ENABLE_OPENH264) - # Add NSI instructions to download the openh264 codec from Cisco's servers whether msopenh264 has been installed. - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/openh264-install.nsi.in" "${CMAKE_CURRENT_BINARY_DIR}/openh264-install.nsi" @ONLY) - set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "!include \\\"${ESCAPED_DOS_STYLE_BINARY_DIR}\\\\openh264-install.nsi\\\"") - - # Add NSI instructions to delete the openh264 codecs while uninstalling Linphone. - set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "${CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS}\n!include \\\"${ESCAPED_DOS_STYLE_SOURCE_DIR}\\\\openh264-uninstall.nsi\\\"") - endif () # Sign the installer. set(TIMESTAMP_URL "http://timestamp.verisign.com/scripts/timestamp.dll") diff --git a/cmake_builder/linphone_package/README.openh264.txt.in b/cmake_builder/linphone_package/README.openh264.txt.in deleted file mode 100644 index 4f88bbedffd1cbcfb248c55b704a3ad08ad510b9..0000000000000000000000000000000000000000 --- a/cmake_builder/linphone_package/README.openh264.txt.in +++ /dev/null @@ -1,20 +0,0 @@ -H264 codec ----------- -Mediastreamer 2 uses Cisco's OpenH264 library as H264 codec. OpenH264 is an -open source library but H264 is a coding format protected by a patent from -MPEG-LA. That's why that bundle does not embed any OpenH264 library and so you -will not able to use H264 out-the-box. - -Fortunatly, Cisco Systems Inc. distribute OpenH264 in its binary form that you -can use in Mediastreamer without paying much royalties to MPEG-LA. However, -that binary file as a restrictive licence. See http://www.openh264.org/BINARY_LICENSE.txt form more information. - - -Installation procedure ----------------------- -The Cisco's provided OpenH264 library is available at this address: -http://ciscobinary.openh264.org/libopenh264-@OPENH264_VERSION@-osx64.dylib.bz2 for MacOS -http://ciscobinary.openh264.org/openh264-@OPENH264_VERSION@-win32msvc.dll.bz2 for Windows (32 bit) - -Once you get the library, uncompress it into /lib/libopenh264.1.dylib -On Windows, the library must be installed into \bin\openh264.dll diff --git a/cmake_builder/linphone_package/openh264-install.nsi.in b/cmake_builder/linphone_package/openh264-install.nsi.in deleted file mode 100644 index 0ef94525bd9de39ea8b0ee0186a3fb7679c2ecc6..0000000000000000000000000000000000000000 --- a/cmake_builder/linphone_package/openh264-install.nsi.in +++ /dev/null @@ -1,7 +0,0 @@ -SectionGetFlags ${msopenh264} $0 -IntOp $0 $0 & ${SF_SELECTED} -IntCmpU $0 0 done done download -download: -NSISdl::download http://ciscobinary.openh264.org/openh264-@OPENH264_VERSION@-win32msvc.dll.bz2 $INSTDIR\lib\mediastreamer\plugins\openh264.dll.bz2 -ExecWait '"$INSTDIR\bin\bunzip2.exe" "$INSTDIR\lib\mediastreamer\plugins\openh264.dll.bz2"' -done: \ No newline at end of file diff --git a/cmake_builder/linphone_package/openh264-uninstall.nsi b/cmake_builder/linphone_package/openh264-uninstall.nsi deleted file mode 100644 index 967bfb1b4862daeac05b75fcf505f19838ca2f5a..0000000000000000000000000000000000000000 --- a/cmake_builder/linphone_package/openh264-uninstall.nsi +++ /dev/null @@ -1 +0,0 @@ -Delete $INSTDIR\lib\mediastreamer\plugins\openh264.dll \ No newline at end of file