From 7e061b717610cba005e3e8712fb5e5e8c7c58def Mon Sep 17 00:00:00 2001 From: djp952 Date: Wed, 9 Dec 2020 14:59:35 -0500 Subject: [PATCH] Update cURL library to version 7.74.0 --- depends/libcurl | 2 +- pvr.hdhomerundvr/changelog.txt | 5 ++-- src/uwp.vcxproj | 54 ++++++++++++++++++++++++++++++++++ src/uwp.vcxproj.filters | 12 ++++++++ src/windows.vcxproj | 38 ++++++++++++++++++++++++ src/windows.vcxproj.filters | 12 ++++++++ 6 files changed, 120 insertions(+), 3 deletions(-) diff --git a/depends/libcurl b/depends/libcurl index b72e4183..60cee54e 160000 --- a/depends/libcurl +++ b/depends/libcurl @@ -1 +1 @@ -Subproject commit b72e418369600db749d8845d5d58c297b42b1242 +Subproject commit 60cee54e75f2733417002ef870a1de5843f9fa93 diff --git a/pvr.hdhomerundvr/changelog.txt b/pvr.hdhomerundvr/changelog.txt index 8920e210..a5c03422 100644 --- a/pvr.hdhomerundvr/changelog.txt +++ b/pvr.hdhomerundvr/changelog.txt @@ -1,6 +1,7 @@ -v3.3.4 (2020.12.xx) +v3.3.4 (2020.12.09) - Update SQLite database engine to version 3.34.0 - - Update cURL library to version 7.73.0 + - Update cURL library to version 7.74.0 + - (Linux) Retarget ARMEL build to require ARMv6 architecture v3.3.3 (2020.09.30) - Update SQLite database engine to version 3.33.0 diff --git a/src/uwp.vcxproj b/src/uwp.vcxproj index b15de975..6f5568b6 100644 --- a/src/uwp.vcxproj +++ b/src/uwp.vcxproj @@ -244,6 +244,7 @@ + @@ -291,6 +292,7 @@ + @@ -448,6 +450,32 @@ + + $(ProjectDir)..\depends\libcurl\src;$(ProjectDir)..\depends\libcurl\src\lib;$(ProjectDir)..\depends\libz\src;%(AdditionalIncludeDirectories) + $(ProjectDir)..\depends\libcurl\src;$(ProjectDir)..\depends\libcurl\src\lib;$(ProjectDir)..\depends\libz\src;%(AdditionalIncludeDirectories) + $(ProjectDir)..\depends\libcurl\src;$(ProjectDir)..\depends\libcurl\src\lib;$(ProjectDir)..\depends\libz\src;%(AdditionalIncludeDirectories) + $(ProjectDir)..\depends\libcurl\src;$(ProjectDir)..\depends\libcurl\src\lib;$(ProjectDir)..\depends\libz\src;%(AdditionalIncludeDirectories) + $(ProjectDir)..\depends\libcurl\src;$(ProjectDir)..\depends\libcurl\src\lib;$(ProjectDir)..\depends\libz\src;%(AdditionalIncludeDirectories) + $(ProjectDir)..\depends\libcurl\src;$(ProjectDir)..\depends\libcurl\src\lib;$(ProjectDir)..\depends\libz\src;%(AdditionalIncludeDirectories) + WINAPI_FAMILY=2;_WIN32_WINNT=0x0602;BUILDING_LIBCURL;CURL_STATICLIB;HTTP_ONLY;CURL_DISABLE_NTLM;CURL_DISABLE_CRYPTO_AUTH;HAVE_GETSOCKNAME;USE_IPV6;HAVE_ZLIB_H;HAVE_LIBZ;%(PreprocessorDefinitions) + WINAPI_FAMILY=2;_WIN32_WINNT=0x0602;BUILDING_LIBCURL;CURL_STATICLIB;HTTP_ONLY;CURL_DISABLE_NTLM;CURL_DISABLE_CRYPTO_AUTH;HAVE_GETSOCKNAME;USE_IPV6;HAVE_ZLIB_H;HAVE_LIBZ;%(PreprocessorDefinitions) + WINAPI_FAMILY=2;_WIN32_WINNT=0x0602;BUILDING_LIBCURL;CURL_STATICLIB;HTTP_ONLY;CURL_DISABLE_NTLM;CURL_DISABLE_CRYPTO_AUTH;HAVE_GETSOCKNAME;USE_IPV6;HAVE_ZLIB_H;HAVE_LIBZ;%(PreprocessorDefinitions) + WINAPI_FAMILY=2;_WIN32_WINNT=0x0602;BUILDING_LIBCURL;CURL_STATICLIB;HTTP_ONLY;CURL_DISABLE_NTLM;CURL_DISABLE_CRYPTO_AUTH;HAVE_GETSOCKNAME;USE_IPV6;HAVE_ZLIB_H;HAVE_LIBZ;%(PreprocessorDefinitions) + WINAPI_FAMILY=2;_WIN32_WINNT=0x0602;BUILDING_LIBCURL;CURL_STATICLIB;HTTP_ONLY;CURL_DISABLE_NTLM;CURL_DISABLE_CRYPTO_AUTH;HAVE_GETSOCKNAME;USE_IPV6;HAVE_ZLIB_H;HAVE_LIBZ;%(PreprocessorDefinitions) + WINAPI_FAMILY=2;_WIN32_WINNT=0x0602;BUILDING_LIBCURL;CURL_STATICLIB;HTTP_ONLY;CURL_DISABLE_NTLM;CURL_DISABLE_CRYPTO_AUTH;HAVE_GETSOCKNAME;USE_IPV6;HAVE_ZLIB_H;HAVE_LIBZ;%(PreprocessorDefinitions) + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + $(IntDir)curl\ + $(IntDir)curl\ + $(IntDir)curl\ + $(IntDir)curl\ + $(IntDir)curl\ + $(IntDir)curl\ + NotUsing NotUsing @@ -1748,6 +1776,32 @@ $(IntDir)curl\ $(IntDir)curl\ + + $(IntDir)curl\ + $(IntDir)curl\ + $(IntDir)curl\ + $(IntDir)curl\ + $(IntDir)curl\ + $(IntDir)curl\ + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + WINAPI_FAMILY=2;_WIN32_WINNT=0x0602;BUILDING_LIBCURL;CURL_STATICLIB;HTTP_ONLY;CURL_DISABLE_NTLM;CURL_DISABLE_CRYPTO_AUTH;HAVE_GETSOCKNAME;USE_IPV6;HAVE_ZLIB_H;HAVE_LIBZ;%(PreprocessorDefinitions) + WINAPI_FAMILY=2;_WIN32_WINNT=0x0602;BUILDING_LIBCURL;CURL_STATICLIB;HTTP_ONLY;CURL_DISABLE_NTLM;CURL_DISABLE_CRYPTO_AUTH;HAVE_GETSOCKNAME;USE_IPV6;HAVE_ZLIB_H;HAVE_LIBZ;%(PreprocessorDefinitions) + WINAPI_FAMILY=2;_WIN32_WINNT=0x0602;BUILDING_LIBCURL;CURL_STATICLIB;HTTP_ONLY;CURL_DISABLE_NTLM;CURL_DISABLE_CRYPTO_AUTH;HAVE_GETSOCKNAME;USE_IPV6;HAVE_ZLIB_H;HAVE_LIBZ;%(PreprocessorDefinitions) + WINAPI_FAMILY=2;_WIN32_WINNT=0x0602;BUILDING_LIBCURL;CURL_STATICLIB;HTTP_ONLY;CURL_DISABLE_NTLM;CURL_DISABLE_CRYPTO_AUTH;HAVE_GETSOCKNAME;USE_IPV6;HAVE_ZLIB_H;HAVE_LIBZ;%(PreprocessorDefinitions) + WINAPI_FAMILY=2;_WIN32_WINNT=0x0602;BUILDING_LIBCURL;CURL_STATICLIB;HTTP_ONLY;CURL_DISABLE_NTLM;CURL_DISABLE_CRYPTO_AUTH;HAVE_GETSOCKNAME;USE_IPV6;HAVE_ZLIB_H;HAVE_LIBZ;%(PreprocessorDefinitions) + WINAPI_FAMILY=2;_WIN32_WINNT=0x0602;BUILDING_LIBCURL;CURL_STATICLIB;HTTP_ONLY;CURL_DISABLE_NTLM;CURL_DISABLE_CRYPTO_AUTH;HAVE_GETSOCKNAME;USE_IPV6;HAVE_ZLIB_H;HAVE_LIBZ;%(PreprocessorDefinitions) + $(ProjectDir)..\depends\libcurl\src;$(ProjectDir)..\depends\libcurl\src\lib;$(ProjectDir)..\depends\libz\src;%(AdditionalIncludeDirectories) + $(ProjectDir)..\depends\libcurl\src;$(ProjectDir)..\depends\libcurl\src\lib;$(ProjectDir)..\depends\libz\src;%(AdditionalIncludeDirectories) + $(ProjectDir)..\depends\libcurl\src;$(ProjectDir)..\depends\libcurl\src\lib;$(ProjectDir)..\depends\libz\src;%(AdditionalIncludeDirectories) + $(ProjectDir)..\depends\libcurl\src;$(ProjectDir)..\depends\libcurl\src\lib;$(ProjectDir)..\depends\libz\src;%(AdditionalIncludeDirectories) + $(ProjectDir)..\depends\libcurl\src;$(ProjectDir)..\depends\libcurl\src\lib;$(ProjectDir)..\depends\libz\src;%(AdditionalIncludeDirectories) + $(ProjectDir)..\depends\libcurl\src;$(ProjectDir)..\depends\libcurl\src\lib;$(ProjectDir)..\depends\libz\src;%(AdditionalIncludeDirectories) + NotUsing NotUsing diff --git a/src/uwp.vcxproj.filters b/src/uwp.vcxproj.filters index 2c7e0512..49e78af0 100644 --- a/src/uwp.vcxproj.filters +++ b/src/uwp.vcxproj.filters @@ -747,6 +747,12 @@ External Libraries\curl\Header Files + + External Libraries\curl\Header Files + + + External Libraries\curl\Header Files + @@ -1406,5 +1412,11 @@ External Libraries\curl\Source Files + + External Libraries\curl\Source Files + + + External Libraries\curl\Source Files + \ No newline at end of file diff --git a/src/windows.vcxproj b/src/windows.vcxproj index 372eb822..3c2d2398 100644 --- a/src/windows.vcxproj +++ b/src/windows.vcxproj @@ -179,6 +179,7 @@ + @@ -226,6 +227,7 @@ + @@ -386,6 +388,24 @@ + + $(ProjectDir)..\depends\libcurl\src;$(ProjectDir)..\depends\libcurl\src\lib;$(ProjectDir)..\depends\libz\src;%(AdditionalIncludeDirectories) + $(ProjectDir)..\depends\libcurl\src;$(ProjectDir)..\depends\libcurl\src\lib;$(ProjectDir)..\depends\libz\src;%(AdditionalIncludeDirectories) + $(ProjectDir)..\depends\libcurl\src;$(ProjectDir)..\depends\libcurl\src\lib;$(ProjectDir)..\depends\libz\src;%(AdditionalIncludeDirectories) + $(ProjectDir)..\depends\libcurl\src;$(ProjectDir)..\depends\libcurl\src\lib;$(ProjectDir)..\depends\libz\src;%(AdditionalIncludeDirectories) + _WIN32_WINNT=0x0602;BUILDING_LIBCURL;CURL_STATICLIB;HTTP_ONLY;USE_WIN32_IDN;WANT_IDN_PROTOTYPES;USE_IPV6;USE_WINDOWS_SSPI;HAVE_GETSOCKNAME;HAVE_ZLIB_H;HAVE_LIBZ;%(PreprocessorDefinitions) + _WIN32_WINNT=0x0602;BUILDING_LIBCURL;CURL_STATICLIB;HTTP_ONLY;USE_WIN32_IDN;WANT_IDN_PROTOTYPES;USE_IPV6;USE_WINDOWS_SSPI;HAVE_GETSOCKNAME;HAVE_ZLIB_H;HAVE_LIBZ;%(PreprocessorDefinitions) + _WIN32_WINNT=0x0602;BUILDING_LIBCURL;CURL_STATICLIB;HTTP_ONLY;USE_WIN32_IDN;WANT_IDN_PROTOTYPES;USE_IPV6;USE_WINDOWS_SSPI;HAVE_GETSOCKNAME;HAVE_ZLIB_H;HAVE_LIBZ;%(PreprocessorDefinitions) + _WIN32_WINNT=0x0602;BUILDING_LIBCURL;CURL_STATICLIB;HTTP_ONLY;USE_WIN32_IDN;WANT_IDN_PROTOTYPES;USE_IPV6;USE_WINDOWS_SSPI;HAVE_GETSOCKNAME;HAVE_ZLIB_H;HAVE_LIBZ;%(PreprocessorDefinitions) + NotUsing + NotUsing + NotUsing + NotUsing + $(IntDir)curl\ + $(IntDir)curl\ + $(IntDir)curl\ + $(IntDir)curl\ + NotUsing NotUsing @@ -1286,6 +1306,24 @@ $(IntDir)curl\ $(IntDir)curl\ + + $(IntDir)curl\ + $(IntDir)curl\ + $(IntDir)curl\ + $(IntDir)curl\ + NotUsing + NotUsing + NotUsing + NotUsing + _WIN32_WINNT=0x0602;BUILDING_LIBCURL;CURL_STATICLIB;HTTP_ONLY;USE_WIN32_IDN;WANT_IDN_PROTOTYPES;USE_IPV6;USE_WINDOWS_SSPI;HAVE_GETSOCKNAME;HAVE_ZLIB_H;HAVE_LIBZ;%(PreprocessorDefinitions) + _WIN32_WINNT=0x0602;BUILDING_LIBCURL;CURL_STATICLIB;HTTP_ONLY;USE_WIN32_IDN;WANT_IDN_PROTOTYPES;USE_IPV6;USE_WINDOWS_SSPI;HAVE_GETSOCKNAME;HAVE_ZLIB_H;HAVE_LIBZ;%(PreprocessorDefinitions) + _WIN32_WINNT=0x0602;BUILDING_LIBCURL;CURL_STATICLIB;HTTP_ONLY;USE_WIN32_IDN;WANT_IDN_PROTOTYPES;USE_IPV6;USE_WINDOWS_SSPI;HAVE_GETSOCKNAME;HAVE_ZLIB_H;HAVE_LIBZ;%(PreprocessorDefinitions) + _WIN32_WINNT=0x0602;BUILDING_LIBCURL;CURL_STATICLIB;HTTP_ONLY;USE_WIN32_IDN;WANT_IDN_PROTOTYPES;USE_IPV6;USE_WINDOWS_SSPI;HAVE_GETSOCKNAME;HAVE_ZLIB_H;HAVE_LIBZ;%(PreprocessorDefinitions) + $(ProjectDir)..\depends\libcurl\src;$(ProjectDir)..\depends\libcurl\src\lib;$(ProjectDir)..\depends\libz\src;%(AdditionalIncludeDirectories) + $(ProjectDir)..\depends\libcurl\src;$(ProjectDir)..\depends\libcurl\src\lib;$(ProjectDir)..\depends\libz\src;%(AdditionalIncludeDirectories) + $(ProjectDir)..\depends\libcurl\src;$(ProjectDir)..\depends\libcurl\src\lib;$(ProjectDir)..\depends\libz\src;%(AdditionalIncludeDirectories) + $(ProjectDir)..\depends\libcurl\src;$(ProjectDir)..\depends\libcurl\src\lib;$(ProjectDir)..\depends\libz\src;%(AdditionalIncludeDirectories) + NotUsing NotUsing diff --git a/src/windows.vcxproj.filters b/src/windows.vcxproj.filters index e79ec72f..2767d774 100644 --- a/src/windows.vcxproj.filters +++ b/src/windows.vcxproj.filters @@ -753,6 +753,12 @@ External Libraries\curl\Header Files + + External Libraries\curl\Header Files + + + External Libraries\curl\Header Files + @@ -1412,6 +1418,12 @@ External Libraries\curl\Source Files + + External Libraries\curl\Source Files + + + External Libraries\curl\Source Files +