From d790cb641064d5b7fc918774907c5dfe25128c84 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Sat, 1 May 2021 02:03:26 +0800 Subject: [libosip2] Update to 5.2.0 and add windows support (#17321) * [libosip2] Add Windows support * Update version files * Update portfile.cmake * Update versions/l-/libosip2.json * Fix typo error * Update versions/l-/libosip2.json * Address review suggestion * Update versions/l-/libosip2.json * Update ports/libosip2/portfile.cmake * Remove space line * Update versions/l-/libosip2.json --- ports/libosip2/CONTROL | 6 - ports/libosip2/fix-path-in-project.patch | 304 +++++++++++++++++++++++++++++++ ports/libosip2/portfile.cmake | 51 ++++-- ports/libosip2/vcpkg.json | 10 + scripts/ci.baseline.txt | 6 - versions/baseline.json | 2 +- versions/l-/libosip2.json | 5 + 7 files changed, 357 insertions(+), 27 deletions(-) delete mode 100644 ports/libosip2/CONTROL create mode 100644 ports/libosip2/fix-path-in-project.patch create mode 100644 ports/libosip2/vcpkg.json diff --git a/ports/libosip2/CONTROL b/ports/libosip2/CONTROL deleted file mode 100644 index 5d172511e..000000000 --- a/ports/libosip2/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: libosip2 -Version: 5.1.0-4 -Homepage: https://www.gnu.org/software/osip/ -Description: oSIP is an LGPL implementation of SIP. It's stable, portable, flexible and compliant! -may be more-! It is used mostly with eXosip2 stack (GPL) which provides simpler API for User-Agent implementation. -Build-Depends: pthread -Supports: !(windows|uwp) diff --git a/ports/libosip2/fix-path-in-project.patch b/ports/libosip2/fix-path-in-project.patch new file mode 100644 index 000000000..807a0b975 --- /dev/null +++ b/ports/libosip2/fix-path-in-project.patch @@ -0,0 +1,304 @@ +diff --git a/platform/vsnet/osip2.vcxproj b/platform/vsnet/osip2.vcxproj +index b13cbe9..40b8e23 100644 +--- a/platform/vsnet/osip2.vcxproj ++++ b/platform/vsnet/osip2.vcxproj +@@ -79,7 +79,7 @@ + + + Disabled +- ..\..\..\osip\include;%(AdditionalIncludeDirectories) ++ ..\..\include;%(AdditionalIncludeDirectories) + ENABLE_TRACE;SYSTEM_LOGGER_ENABLED;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks +@@ -97,7 +97,7 @@ + + + Disabled +- ..\..\..\osip\include;%(AdditionalIncludeDirectories) ++ ..\..\include;%(AdditionalIncludeDirectories) + ENABLE_TRACE;SYSTEM_LOGGER_ENABLED;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug +@@ -113,7 +113,7 @@ + + + +- ..\..\..\osip\include;%(AdditionalIncludeDirectories) ++ ..\..\include;%(AdditionalIncludeDirectories) + ENABLE_TRACE;SYSTEM_LOGGER_ENABLED;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + +@@ -129,7 +129,7 @@ + + + +- ..\..\..\osip\include;%(AdditionalIncludeDirectories) ++ ..\..\include;%(AdditionalIncludeDirectories) + ENABLE_TRACE;SYSTEM_LOGGER_ENABLED;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + +@@ -144,37 +144,37 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ + + +- ++ + {44f46b7e-0e51-4304-9735-330dfbab41e5} + false + +diff --git a/platform/vsnet/osipparser2.vcxproj b/platform/vsnet/osipparser2.vcxproj +index 6c73222..bda0fe5 100644 +--- a/platform/vsnet/osipparser2.vcxproj ++++ b/platform/vsnet/osipparser2.vcxproj +@@ -79,7 +79,7 @@ + + + Disabled +- ..\..\..\osip\include;%(AdditionalIncludeDirectories) ++ ..\..\include;%(AdditionalIncludeDirectories) + ENABLE_TRACE;SYSTEM_LOGGER_ENABLED;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks +@@ -97,7 +97,7 @@ + + + Disabled +- ..\..\..\osip\include;%(AdditionalIncludeDirectories) ++ ..\..\include;%(AdditionalIncludeDirectories) + ENABLE_TRACE;SYSTEM_LOGGER_ENABLED;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug +@@ -113,7 +113,7 @@ + + + +- ..\..\..\osip\include;%(AdditionalIncludeDirectories) ++ ..\..\include;%(AdditionalIncludeDirectories) + ENABLE_TRACE;SYSTEM_LOGGER_ENABLED;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + +@@ -129,7 +129,7 @@ + + + +- ..\..\..\osip\include;%(AdditionalIncludeDirectories) ++ ..\..\include;%(AdditionalIncludeDirectories) + ENABLE_TRACE;SYSTEM_LOGGER_ENABLED;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + +@@ -144,83 +144,83 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + diff --git a/ports/libosip2/portfile.cmake b/ports/libosip2/portfile.cmake index 28321ff45..bf3fdc538 100644 --- a/ports/libosip2/portfile.cmake +++ b/ports/libosip2/portfile.cmake @@ -1,28 +1,51 @@ -set(LIBOSIP2_VER "5.1.0") +set(LIBOSIP2_VER "5.2.0") vcpkg_download_distfile(ARCHIVE URLS "https://ftp.gnu.org/gnu/osip/libosip2-${LIBOSIP2_VER}.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/osip/libosip2-${LIBOSIP2_VER}.tar.gz" FILENAME "libosip2-${LIBOSIP2_VER}.tar.gz" - SHA512 391c9a0ea399f789d7061b0216d327eecba5bbf0429659f4f167604b9e703e1678ba6f58079aa4f84b3636a937064ecfb92e985368164fcb679e95654e43d65b + SHA512 cc714ab5669c466ee8f0de78cf74a8b7633f3089bf104c9c1474326840db3d791270159456f9deb877af2df346b04493e8f796b2bb7d2be134f6c08b25a29f83 ) +if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND PATCHES fix-path-in-project.patch) +endif() + vcpkg_extract_source_archive_ex( ARCHIVE ${ARCHIVE} OUT_SOURCE_PATH SOURCE_PATH + PATCHES ${PATCHES} ) -if(VCPKG_TARGET_IS_WINDOWS) - set(OPTIONS --enable-mt=no) -endif() -vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS ${OPTIONS} -) +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_fail_port_install(ON_ARCH "arm" "arm64") + + vcpkg_install_msbuild( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH "platform/vsnet/osip2.vcxproj" + INCLUDES_SUBPATH include + USE_VCPKG_INTEGRATION + REMOVE_ROOT_INCLUDES + ) + + vcpkg_install_msbuild( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH "platform/vsnet/osipparser2.vcxproj" + USE_VCPKG_INTEGRATION + ) + +elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) + vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS ${OPTIONS} + ) -vcpkg_install_make() -vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + vcpkg_install_make() + vcpkg_fixup_pkgconfig() + + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +endif() # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/libosip2/vcpkg.json b/ports/libosip2/vcpkg.json new file mode 100644 index 000000000..e7c34ef99 --- /dev/null +++ b/ports/libosip2/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "libosip2", + "version": "5.2.0", + "description": "oSIP is an LGPL implementation of SIP. It's stable, portable, flexible and compliant! -may be more-! It is used mostly with eXosip2 stack (GPL) which provides simpler API for User-Agent implementation.", + "homepage": "https://www.gnu.org/software/osip/", + "supports": "!(windows & arm)", + "dependencies": [ + "pthread" + ] +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 8bd670527..32cf4e13c 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -706,13 +706,7 @@ libopusenc:arm-uwp=fail libopusenc:x64-linux=fail libopusenc:x64-osx=fail libopusenc:x64-uwp=fail -libosip2:arm64-windows=fail -libosip2:arm-uwp=fail -libosip2:x64-uwp=fail -libosip2:x64-windows=fail -libosip2:x64-windows-static=fail libosip2:x64-windows-static-md=fail -libosip2:x86-windows=fail libpcap:arm64-windows=fail libpcap:arm-uwp=fail libpcap:x64-osx=fail diff --git a/versions/baseline.json b/versions/baseline.json index bc7dfe81d..62e449885 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3349,7 +3349,7 @@ "port-version": 1 }, "libosip2": { - "baseline": "5.1.0-4", + "baseline": "5.2.0", "port-version": 0 }, "libosmium": { diff --git a/versions/l-/libosip2.json b/versions/l-/libosip2.json index 6cf74c995..236338329 100644 --- a/versions/l-/libosip2.json +++ b/versions/l-/libosip2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "468e53f1a4709f0b1b2b83efe23a2a4bc9dd63c2", + "version": "5.2.0", + "port-version": 0 + }, { "git-tree": "df0fccae350dd810e2ac0621cb9b71a820d742f0", "version-string": "5.1.0-4", -- cgit v1.2.3