aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>2021-05-01 02:03:26 +0800
committerGitHub <noreply@github.com>2021-04-30 11:03:26 -0700
commitd790cb641064d5b7fc918774907c5dfe25128c84 (patch)
tree1bd7f67bfd47bdd0ae939bb7efb29f754b207eb2
parentf3619bdadc1ffd3dabbc4368d0caed1119dffb71 (diff)
downloadvcpkg-d790cb641064d5b7fc918774907c5dfe25128c84.tar.gz
vcpkg-d790cb641064d5b7fc918774907c5dfe25128c84.zip
[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
-rw-r--r--ports/libosip2/CONTROL6
-rw-r--r--ports/libosip2/fix-path-in-project.patch304
-rw-r--r--ports/libosip2/portfile.cmake51
-rw-r--r--ports/libosip2/vcpkg.json10
-rw-r--r--scripts/ci.baseline.txt6
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/l-/libosip2.json5
7 files changed, 357 insertions, 27 deletions
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 @@
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+- <AdditionalIncludeDirectories>..\..\..\osip\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>ENABLE_TRACE;SYSTEM_LOGGER_ENABLED;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+@@ -97,7 +97,7 @@
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+- <AdditionalIncludeDirectories>..\..\..\osip\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>ENABLE_TRACE;SYSTEM_LOGGER_ENABLED;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+@@ -113,7 +113,7 @@
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+- <AdditionalIncludeDirectories>..\..\..\osip\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>ENABLE_TRACE;SYSTEM_LOGGER_ENABLED;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <PrecompiledHeader>
+@@ -129,7 +129,7 @@
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+- <AdditionalIncludeDirectories>..\..\..\osip\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>ENABLE_TRACE;SYSTEM_LOGGER_ENABLED;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <PrecompiledHeader>
+@@ -144,37 +144,37 @@
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+- <ClCompile Include="..\..\..\osip\src\osip2\fsm_misc.c" />
+- <ClCompile Include="..\..\..\osip\src\osip2\ict.c" />
+- <ClCompile Include="..\..\..\osip\src\osip2\ict_fsm.c" />
+- <ClCompile Include="..\..\..\osip\src\osip2\ist.c" />
+- <ClCompile Include="..\..\..\osip\src\osip2\ist_fsm.c" />
+- <ClCompile Include="..\..\..\osip\src\osip2\nict.c" />
+- <ClCompile Include="..\..\..\osip\src\osip2\nict_fsm.c" />
+- <ClCompile Include="..\..\..\osip\src\osip2\nist.c" />
+- <ClCompile Include="..\..\..\osip\src\osip2\nist_fsm.c" />
+- <ClCompile Include="..\..\..\osip\src\osip2\osip.c" />
+- <ClCompile Include="..\..\..\osip\src\osip2\osip_dialog.c" />
+- <ClCompile Include="..\..\..\osip\src\osip2\osip_event.c" />
+- <ClCompile Include="..\..\..\osip\src\osip2\osip_time.c" />
+- <ClCompile Include="..\..\..\osip\src\osip2\osip_transaction.c" />
+- <ClCompile Include="..\..\..\osip\src\osip2\port_condv.c" />
+- <ClCompile Include="..\..\..\osip\src\osip2\port_fifo.c" />
+- <ClCompile Include="..\..\..\osip\src\osip2\port_sema.c" />
+- <ClCompile Include="..\..\..\osip\src\osip2\port_thread.c" />
++ <ClCompile Include="..\..\src\osip2\fsm_misc.c" />
++ <ClCompile Include="..\..\src\osip2\ict.c" />
++ <ClCompile Include="..\..\src\osip2\ict_fsm.c" />
++ <ClCompile Include="..\..\src\osip2\ist.c" />
++ <ClCompile Include="..\..\src\osip2\ist_fsm.c" />
++ <ClCompile Include="..\..\src\osip2\nict.c" />
++ <ClCompile Include="..\..\src\osip2\nict_fsm.c" />
++ <ClCompile Include="..\..\src\osip2\nist.c" />
++ <ClCompile Include="..\..\src\osip2\nist_fsm.c" />
++ <ClCompile Include="..\..\src\osip2\osip.c" />
++ <ClCompile Include="..\..\src\osip2\osip_dialog.c" />
++ <ClCompile Include="..\..\src\osip2\osip_event.c" />
++ <ClCompile Include="..\..\src\osip2\osip_time.c" />
++ <ClCompile Include="..\..\src\osip2\osip_transaction.c" />
++ <ClCompile Include="..\..\src\osip2\port_condv.c" />
++ <ClCompile Include="..\..\src\osip2\port_fifo.c" />
++ <ClCompile Include="..\..\src\osip2\port_sema.c" />
++ <ClCompile Include="..\..\src\osip2\port_thread.c" />
+ </ItemGroup>
+ <ItemGroup>
+- <ClInclude Include="..\..\..\osip\src\osip2\fsm.h" />
+- <ClInclude Include="..\..\..\osip\include\osip2\internal.h" />
+- <ClInclude Include="..\..\..\osip\include\osip2\osip.h" />
+- <ClInclude Include="..\..\..\osip\include\osip2\osip_condv.h" />
+- <ClInclude Include="..\..\..\osip\include\osip2\osip_dialog.h" />
+- <ClInclude Include="..\..\..\osip\include\osip2\osip_fifo.h" />
+- <ClInclude Include="..\..\..\osip\include\osip2\osip_mt.h" />
+- <ClInclude Include="..\..\..\osip\src\osip2\xixt.h" />
++ <ClInclude Include="..\..\src\osip2\fsm.h" />
++ <ClInclude Include="..\..\include\osip2\internal.h" />
++ <ClInclude Include="..\..\include\osip2\osip.h" />
++ <ClInclude Include="..\..\include\osip2\osip_condv.h" />
++ <ClInclude Include="..\..\include\osip2\osip_dialog.h" />
++ <ClInclude Include="..\..\include\osip2\osip_fifo.h" />
++ <ClInclude Include="..\..\include\osip2\osip_mt.h" />
++ <ClInclude Include="..\..\src\osip2\xixt.h" />
+ </ItemGroup>
+ <ItemGroup>
+- <ProjectReference Include="..\..\..\osip\platform\vsnet\osipparser2.vcxproj">
++ <ProjectReference Include="..\..\platform\vsnet\osipparser2.vcxproj">
+ <Project>{44f46b7e-0e51-4304-9735-330dfbab41e5}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+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 @@
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+- <AdditionalIncludeDirectories>..\..\..\osip\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>ENABLE_TRACE;SYSTEM_LOGGER_ENABLED;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+@@ -97,7 +97,7 @@
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+- <AdditionalIncludeDirectories>..\..\..\osip\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>ENABLE_TRACE;SYSTEM_LOGGER_ENABLED;_CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+@@ -113,7 +113,7 @@
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+- <AdditionalIncludeDirectories>..\..\..\osip\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>ENABLE_TRACE;SYSTEM_LOGGER_ENABLED;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <PrecompiledHeader>
+@@ -129,7 +129,7 @@
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+- <AdditionalIncludeDirectories>..\..\..\osip\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++ <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>ENABLE_TRACE;SYSTEM_LOGGER_ENABLED;_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <PrecompiledHeader>
+@@ -144,83 +144,83 @@
+ </Lib>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+- <ClCompile Include="..\..\..\osip\src\osipparser2\osip_accept.c" />
+- <ClCompile Include="..\..\..\osip\src\osipparser2\osip_accept_encoding.c" />
+- <ClCompile Include="..\..\..\osip\src\osipparser2\osip_accept_language.c" />
+- <ClCompile Include="..\..\..\osip\src\osipparser2\osip_alert_info.c" />
+- <ClCompile Include="..\..\..\osip\src\osipparser2\osip_allow.c" />
+- <ClCompile Include="..\..\..\osip\src\osipparser2\osip_authentication_info.c" />
+- <ClCompile Include="..\..\..\osip\src\osipparser2\osip_authorization.c" />
+- <ClCompile Include="..\..\..\osip\src\osipparser2\osip_body.c" />
+- <ClCompile Include="..\..\..\osip\src\osipparser2\osip_call_id.c" />
+- <ClCompile Include="..\..\..\osip\src\osipparser2\osip_call_info.c" />
+- <ClCompile Include="..\..\..\osip\src\osipparser2\osip_contact.c" />
+- <ClCompile Include="..\..\..\osip\src\osipparser2\osip_content_disposition.c" />
+- <ClCompile Include="..\..\..\osip\src\osipparser2\osip_content_encoding.c" />
+- <ClCompile Include="..\..\..\osip\src\osipparser2\osip_content_length.c" />
+- <ClCompile Include="..\..\..\osip\src\osipparser2\osip_content_type.c" />
+- <ClCompile Include="..\..\..\osip\src\osipparser2\osip_cseq.c" />
+- <ClCompile Include="..\..\..\osip\src\osipparser2\osip_error_info.c" />
+- <ClCompile Include="..\..\..\osip\src\osipparser2\osip_from.c" />
+- <ClCompile Include="..\..\..\osip\src\osipparser2\osip_header.c" />
+- <ClCompile Include="..\..\..\osip\src\osipparser2\osip_list.c" />
+- <ClCompile Include="..\..\..\osip\src\osipparser2\osip_md5c.c" />
+- <ClCompile Include="..\..\..\osip\src\osipparser2\osip_message.c" />
+- <ClCompile Include="..\..\..\osip\src\osipparser2\osip_message_parse.c" />
+- <ClCompile Include="..\..\..\osip\src\osipparser2\osip_message_to_str.c" />
+- <ClCompile Include="..\..\..\osip\src\osipparser2\osip_mime_version.c" />
+- <ClCompile Include="..\..\..\osip\src\osipparser2\osip_parser_cfg.c" />
+- <ClCompile Include="..\..\..\osip\src\osipparser2\osip_port.c" />
+- <ClCompile Include="..\..\..\osip\src\osipparser2\osip_proxy_authenticate.c" />
+- <ClCompile Include="..\..\..\osip\src\osipparser2\osip_proxy_authentication_info.c" />
+- <ClCompile Include="..\..\..\osip\src\osipparser2\osip_proxy_authorization.c" />
+- <ClCompile Include="..\..\..\osip\src\osipparser2\osip_record_route.c" />
+- <ClCompile Include="..\..\..\osip\src\osipparser2\osip_route.c" />
+- <ClCompile Include="..\..\..\osip\src\osipparser2\osip_to.c" />
+- <ClCompile Include="..\..\..\osip\src\osipparser2\osip_uri.c" />
+- <ClCompile Include="..\..\..\osip\src\osipparser2\osip_via.c" />
+- <ClCompile Include="..\..\..\osip\src\osipparser2\osip_www_authenticate.c" />
+- <ClCompile Include="..\..\..\osip\src\osipparser2\sdp_accessor.c" />
+- <ClCompile Include="..\..\..\osip\src\osipparser2\sdp_message.c" />
++ <ClCompile Include="..\..\src\osipparser2\osip_accept.c" />
++ <ClCompile Include="..\..\src\osipparser2\osip_accept_encoding.c" />
++ <ClCompile Include="..\..\src\osipparser2\osip_accept_language.c" />
++ <ClCompile Include="..\..\src\osipparser2\osip_alert_info.c" />
++ <ClCompile Include="..\..\src\osipparser2\osip_allow.c" />
++ <ClCompile Include="..\..\src\osipparser2\osip_authentication_info.c" />
++ <ClCompile Include="..\..\src\osipparser2\osip_authorization.c" />
++ <ClCompile Include="..\..\src\osipparser2\osip_body.c" />
++ <ClCompile Include="..\..\src\osipparser2\osip_call_id.c" />
++ <ClCompile Include="..\..\src\osipparser2\osip_call_info.c" />
++ <ClCompile Include="..\..\src\osipparser2\osip_contact.c" />
++ <ClCompile Include="..\..\src\osipparser2\osip_content_disposition.c" />
++ <ClCompile Include="..\..\src\osipparser2\osip_content_encoding.c" />
++ <ClCompile Include="..\..\src\osipparser2\osip_content_length.c" />
++ <ClCompile Include="..\..\src\osipparser2\osip_content_type.c" />
++ <ClCompile Include="..\..\src\osipparser2\osip_cseq.c" />
++ <ClCompile Include="..\..\src\osipparser2\osip_error_info.c" />
++ <ClCompile Include="..\..\src\osipparser2\osip_from.c" />
++ <ClCompile Include="..\..\src\osipparser2\osip_header.c" />
++ <ClCompile Include="..\..\src\osipparser2\osip_list.c" />
++ <ClCompile Include="..\..\src\osipparser2\osip_md5c.c" />
++ <ClCompile Include="..\..\src\osipparser2\osip_message.c" />
++ <ClCompile Include="..\..\src\osipparser2\osip_message_parse.c" />
++ <ClCompile Include="..\..\src\osipparser2\osip_message_to_str.c" />
++ <ClCompile Include="..\..\src\osipparser2\osip_mime_version.c" />
++ <ClCompile Include="..\..\src\osipparser2\osip_parser_cfg.c" />
++ <ClCompile Include="..\..\src\osipparser2\osip_port.c" />
++ <ClCompile Include="..\..\src\osipparser2\osip_proxy_authenticate.c" />
++ <ClCompile Include="..\..\src\osipparser2\osip_proxy_authentication_info.c" />
++ <ClCompile Include="..\..\src\osipparser2\osip_proxy_authorization.c" />
++ <ClCompile Include="..\..\src\osipparser2\osip_record_route.c" />
++ <ClCompile Include="..\..\src\osipparser2\osip_route.c" />
++ <ClCompile Include="..\..\src\osipparser2\osip_to.c" />
++ <ClCompile Include="..\..\src\osipparser2\osip_uri.c" />
++ <ClCompile Include="..\..\src\osipparser2\osip_via.c" />
++ <ClCompile Include="..\..\src\osipparser2\osip_www_authenticate.c" />
++ <ClCompile Include="..\..\src\osipparser2\sdp_accessor.c" />
++ <ClCompile Include="..\..\src\osipparser2\sdp_message.c" />
+ </ItemGroup>
+ <ItemGroup>
+- <ClInclude Include="..\..\..\osip\include\osipparser2\headers\osip_accept.h" />
+- <ClInclude Include="..\..\..\osip\include\osipparser2\headers\osip_accept_encoding.h" />
+- <ClInclude Include="..\..\..\osip\include\osipparser2\headers\osip_accept_language.h" />
+- <ClInclude Include="..\..\..\osip\include\osipparser2\headers\osip_alert_info.h" />
+- <ClInclude Include="..\..\..\osip\include\osipparser2\headers\osip_allow.h" />
+- <ClInclude Include="..\..\..\osip\include\osipparser2\headers\osip_authorization.h" />
+- <ClInclude Include="..\..\..\osip\include\osipparser2\internal.h" />
+- <ClInclude Include="..\..\..\osip\include\osipparser2\osip_body.h" />
+- <ClInclude Include="..\..\..\osip\include\osipparser2\headers\osip_call_id.h" />
+- <ClInclude Include="..\..\..\osip\include\osipparser2\headers\osip_call_info.h" />
+- <ClInclude Include="..\..\..\osip\include\osipparser2\osip_const.h" />
+- <ClInclude Include="..\..\..\osip\include\osipparser2\headers\osip_contact.h" />
+- <ClInclude Include="..\..\..\osip\include\osipparser2\headers\osip_content_disposition.h" />
+- <ClInclude Include="..\..\..\osip\include\osipparser2\headers\osip_content_encoding.h" />
+- <ClInclude Include="..\..\..\osip\include\osipparser2\headers\osip_content_length.h" />
+- <ClInclude Include="..\..\..\osip\include\osipparser2\headers\osip_content_type.h" />
+- <ClInclude Include="..\..\..\osip\include\osipparser2\headers\osip_cseq.h" />
+- <ClInclude Include="..\..\..\osip\include\osipparser2\headers\osip_error_info.h" />
+- <ClInclude Include="..\..\..\osip\include\osipparser2\headers\osip_from.h" />
+- <ClInclude Include="..\..\..\osip\include\osipparser2\headers\osip_header.h" />
+- <ClInclude Include="..\..\..\osip\include\osipparser2\osip_headers.h" />
+- <ClInclude Include="..\..\..\osip\include\osipparser2\osip_list.h" />
+- <ClInclude Include="..\..\..\osip\include\osipparser2\osip_md5.h" />
+- <ClInclude Include="..\..\..\osip\include\osipparser2\osip_message.h" />
+- <ClInclude Include="..\..\..\osip\include\osipparser2\headers\osip_mime_version.h" />
+- <ClInclude Include="..\..\..\osip\include\osipparser2\osip_parser.h" />
+- <ClInclude Include="..\..\..\osip\include\osipparser2\osip_port.h" />
+- <ClInclude Include="..\..\..\osip\include\osipparser2\headers\osip_proxy_authenticate.h" />
+- <ClInclude Include="..\..\..\osip\include\osipparser2\headers\osip_proxy_authorization.h" />
+- <ClInclude Include="..\..\..\osip\include\osipparser2\headers\osip_record_route.h" />
+- <ClInclude Include="..\..\..\osip\include\osipparser2\headers\osip_route.h" />
+- <ClInclude Include="..\..\..\osip\include\osipparser2\headers\osip_to.h" />
+- <ClInclude Include="..\..\..\osip\include\osipparser2\osip_uri.h" />
+- <ClInclude Include="..\..\..\osip\include\osipparser2\headers\osip_via.h" />
+- <ClInclude Include="..\..\..\osip\include\osipparser2\headers\osip_www_authenticate.h" />
+- <ClInclude Include="..\..\..\osip\src\osipparser2\parser.h" />
+- <ClInclude Include="..\..\..\osip\include\osipparser2\sdp_message.h" />
++ <ClInclude Include="..\..\include\osipparser2\headers\osip_accept.h" />
++ <ClInclude Include="..\..\include\osipparser2\headers\osip_accept_encoding.h" />
++ <ClInclude Include="..\..\include\osipparser2\headers\osip_accept_language.h" />
++ <ClInclude Include="..\..\include\osipparser2\headers\osip_alert_info.h" />
++ <ClInclude Include="..\..\include\osipparser2\headers\osip_allow.h" />
++ <ClInclude Include="..\..\include\osipparser2\headers\osip_authorization.h" />
++ <ClInclude Include="..\..\include\osipparser2\internal.h" />
++ <ClInclude Include="..\..\include\osipparser2\osip_body.h" />
++ <ClInclude Include="..\..\include\osipparser2\headers\osip_call_id.h" />
++ <ClInclude Include="..\..\include\osipparser2\headers\osip_call_info.h" />
++ <ClInclude Include="..\..\include\osipparser2\osip_const.h" />
++ <ClInclude Include="..\..\include\osipparser2\headers\osip_contact.h" />
++ <ClInclude Include="..\..\include\osipparser2\headers\osip_content_disposition.h" />
++ <ClInclude Include="..\..\include\osipparser2\headers\osip_content_encoding.h" />
++ <ClInclude Include="..\..\include\osipparser2\headers\osip_content_length.h" />
++ <ClInclude Include="..\..\include\osipparser2\headers\osip_content_type.h" />
++ <ClInclude Include="..\..\include\osipparser2\headers\osip_cseq.h" />
++ <ClInclude Include="..\..\include\osipparser2\headers\osip_error_info.h" />
++ <ClInclude Include="..\..\include\osipparser2\headers\osip_from.h" />
++ <ClInclude Include="..\..\include\osipparser2\headers\osip_header.h" />
++ <ClInclude Include="..\..\include\osipparser2\osip_headers.h" />
++ <ClInclude Include="..\..\include\osipparser2\osip_list.h" />
++ <ClInclude Include="..\..\include\osipparser2\osip_md5.h" />
++ <ClInclude Include="..\..\include\osipparser2\osip_message.h" />
++ <ClInclude Include="..\..\include\osipparser2\headers\osip_mime_version.h" />
++ <ClInclude Include="..\..\include\osipparser2\osip_parser.h" />
++ <ClInclude Include="..\..\include\osipparser2\osip_port.h" />
++ <ClInclude Include="..\..\include\osipparser2\headers\osip_proxy_authenticate.h" />
++ <ClInclude Include="..\..\include\osipparser2\headers\osip_proxy_authorization.h" />
++ <ClInclude Include="..\..\include\osipparser2\headers\osip_record_route.h" />
++ <ClInclude Include="..\..\include\osipparser2\headers\osip_route.h" />
++ <ClInclude Include="..\..\include\osipparser2\headers\osip_to.h" />
++ <ClInclude Include="..\..\include\osipparser2\osip_uri.h" />
++ <ClInclude Include="..\..\include\osipparser2\headers\osip_via.h" />
++ <ClInclude Include="..\..\include\osipparser2\headers\osip_www_authenticate.h" />
++ <ClInclude Include="..\..\src\osipparser2\parser.h" />
++ <ClInclude Include="..\..\include\osipparser2\sdp_message.h" />
+ <ClInclude Include="..\..\include\osipparser2\headers\osip_authentication_info.h" />
+ <ClInclude Include="..\..\include\osipparser2\headers\osip_proxy_authentication_info.h" />
+ </ItemGroup>
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,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "468e53f1a4709f0b1b2b83efe23a2a4bc9dd63c2",
+ "version": "5.2.0",
+ "port-version": 0
+ },
+ {
"git-tree": "df0fccae350dd810e2ac0621cb9b71a820d742f0",
"version-string": "5.1.0-4",
"port-version": 0