From bf069e36ce85779676ef5cd6ad5da96c06946a94 Mon Sep 17 00:00:00 2001 From: jiayuehua <3423893+jiayuehua@users.noreply.github.com> Date: Sun, 12 Jun 2022 15:34:56 +0800 Subject: [PATCH 01/56] [glog]: update to v0.6.0 --- ports/glog/fix-windows-CXX11_ATOMIC.patch | 17 - ports/glog/fix_crosscompile_symbolize.patch | 12 +- ports/glog/fix_glog_CMAKE_MODULE_PATH.patch | 51 +- ports/glog/fix_log_every_n.patch | 839 -------------------- ports/glog/glog_disable_debug_postfix.patch | 26 +- ports/glog/portfile.cmake | 13 +- ports/glog/vcpkg.json | 3 +- versions/baseline.json | 4 +- versions/g-/glog.json | 5 + 9 files changed, 44 insertions(+), 926 deletions(-) delete mode 100644 ports/glog/fix-windows-CXX11_ATOMIC.patch delete mode 100644 ports/glog/fix_log_every_n.patch diff --git a/ports/glog/fix-windows-CXX11_ATOMIC.patch b/ports/glog/fix-windows-CXX11_ATOMIC.patch deleted file mode 100644 index 1e1723e363e70a..00000000000000 --- a/ports/glog/fix-windows-CXX11_ATOMIC.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in -index 3ecacfb..2d48a0e 100644 ---- a/src/glog/logging.h.in -+++ b/src/glog/logging.h.in -@@ -100,6 +100,12 @@ - #include - #endif - -+#ifdef GLOG_OS_WINDOWS -+#ifndef HAVE_CXX11_ATOMIC -+#define HAVE_CXX11_ATOMIC -+#endif -+#endif -+ - #ifdef HAVE_CXX11_ATOMIC - #include - #elif defined(GLOG_OS_WINDOWS) diff --git a/ports/glog/fix_crosscompile_symbolize.patch b/ports/glog/fix_crosscompile_symbolize.patch index 65f0fd26602b65..6bfa33d82e7d07 100644 --- a/ports/glog/fix_crosscompile_symbolize.patch +++ b/ports/glog/fix_crosscompile_symbolize.patch @@ -1,6 +1,9 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 16fef38..4f94251 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -401,4 +401,7 @@ +@@ -450,6 +450,9 @@ endif (HAVE_CXX11_ATOMIC) + if (WITH_SYMBOLIZE) if (WIN32 OR CYGWIN) + if(CMAKE_CROSSCOMPILING) @@ -8,11 +11,12 @@ + else() cmake_push_check_state (RESET) set (CMAKE_REQUIRED_LIBRARIES DbgHelp) -@@ -430,6 +433,7 @@ + +@@ -480,6 +483,7 @@ if (WITH_SYMBOLIZE) ]=] HAVE_SYMBOLIZE) - + cmake_pop_check_state () + endif() - + if (HAVE_SYMBOLIZE) set (HAVE_STACKTRACE 1) diff --git a/ports/glog/fix_glog_CMAKE_MODULE_PATH.patch b/ports/glog/fix_glog_CMAKE_MODULE_PATH.patch index 31219437b96f5e..903b7eaa389646 100644 --- a/ports/glog/fix_glog_CMAKE_MODULE_PATH.patch +++ b/ports/glog/fix_glog_CMAKE_MODULE_PATH.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 28e2688..cf87798 100644 +index 846b444..1fdeac6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -843,36 +843,6 @@ write_basic_package_version_file ( +@@ -1028,41 +1028,6 @@ write_basic_package_version_file ( export (TARGETS glog NAMESPACE glog:: FILE glog-targets.cmake) export (PACKAGE glog) @@ -26,52 +26,21 @@ index 28e2688..cf87798 100644 -install (CODE -" -set (glog_FULL_CMake_DATADIR \"\\\${CMAKE_CURRENT_LIST_DIR}/${glog_REL_CMake_DATADIR}\") +-set (glog_DATADIR_DESTINATION ${_glog_CMake_INSTALLDIR}) +- +-if (NOT IS_ABSOLUTE ${_glog_CMake_INSTALLDIR}) +- set (glog_DATADIR_DESTINATION \"\${CMAKE_INSTALL_PREFIX}/\${glog_DATADIR_DESTINATION}\") +-endif (NOT IS_ABSOLUTE ${_glog_CMake_INSTALLDIR}) +- -configure_file (\"${CMAKE_CURRENT_SOURCE_DIR}/glog-modules.cmake.in\" - \"${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/glog-modules.cmake\" @ONLY) -file (INSTALL - \"${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/glog-modules.cmake\" - DESTINATION -- \"\${CMAKE_INSTALL_PREFIX}/${_glog_CMake_INSTALLDIR}\") +- \"\${glog_DATADIR_DESTINATION}\") -" - COMPONENT Development -) -- + install (FILES ${CMAKE_CURRENT_BINARY_DIR}/glog-config.cmake - ${CMAKE_CURRENT_BINARY_DIR}/glog-config-version.cmake -diff --git a/glog-config.cmake.in b/glog-config.cmake.in -index 5c5c9c0..31fac52 100644 ---- a/glog-config.cmake.in -+++ b/glog-config.cmake.in -@@ -5,7 +5,6 @@ endif (CMAKE_VERSION VERSION_LESS @glog_CMake_VERSION@) - @PACKAGE_INIT@ - - include (CMakeFindDependencyMacro) --include (${CMAKE_CURRENT_LIST_DIR}/glog-modules.cmake) - - @gflags_DEPENDENCY@ - @Unwind_DEPENDENCY@ -diff --git a/glog-modules.cmake.in b/glog-modules.cmake.in -deleted file mode 100644 -index 71c5160..0000000 ---- a/glog-modules.cmake.in -+++ /dev/null -@@ -1,18 +0,0 @@ --cmake_policy (PUSH) --cmake_policy (SET CMP0057 NEW) -- --if (CMAKE_VERSION VERSION_LESS 3.3) -- message (FATAL_ERROR "glog-modules.cmake requires the consumer " -- "to use CMake 3.3 (or newer)") --endif (CMAKE_VERSION VERSION_LESS 3.3) -- --set (glog_MODULE_PATH "@glog_FULL_CMake_DATADIR@") --list (APPEND CMAKE_MODULE_PATH ${glog_MODULE_PATH}) -- --if (NOT glog_MODULE_PATH IN_LIST CMAKE_MODULE_PATH) -- message (FATAL_ERROR "Cannot add '${glog_MODULE_PATH}' to " -- "CMAKE_MODULE_PATH. This will cause glog-config.cmake to fail at " -- "locating required find modules. Make sure CMAKE_MODULE_PATH is not a cache variable.") --endif (NOT glog_MODULE_PATH IN_LIST CMAKE_MODULE_PATH) -- --cmake_policy (POP) diff --git a/ports/glog/fix_log_every_n.patch b/ports/glog/fix_log_every_n.patch deleted file mode 100644 index 52950481ce295a..00000000000000 --- a/ports/glog/fix_log_every_n.patch +++ /dev/null @@ -1,839 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 61e5f6c..889df87 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -501,6 +501,7 @@ set (GLOG_PUBLIC_H - ${CMAKE_CURRENT_BINARY_DIR}/glog/stl_logging.h - ${CMAKE_CURRENT_BINARY_DIR}/glog/vlog_is_on.h - src/glog/log_severity.h -+ src/glog/platform.h - ) - - set (GLOG_SRCS -diff --git a/src/demangle.cc b/src/demangle.cc -index f3e6ad7..8c0bdc7 100644 ---- a/src/demangle.cc -+++ b/src/demangle.cc -@@ -38,14 +38,14 @@ - #include "utilities.h" - #include "demangle.h" - --#if defined(OS_WINDOWS) -+#if defined(GLOG_OS_WINDOWS) - #include - #pragma comment(lib, "dbghelp") - #endif - - _START_GOOGLE_NAMESPACE_ - --#if !defined(OS_WINDOWS) -+#if !defined(GLOG_OS_WINDOWS) - typedef struct { - const char *abbrev; - const char *real_name; -@@ -1324,7 +1324,7 @@ static bool ParseTopLevelMangledName(State *state) { - - // The demangler entry point. - bool Demangle(const char *mangled, char *out, int out_size) { --#if defined(OS_WINDOWS) -+#if defined(GLOG_OS_WINDOWS) - // When built with incremental linking, the Windows debugger - // library provides a more complicated `Symbol->Name` with the - // Incremental Linking Table offset, which looks like -diff --git a/src/demangle_unittest.cc b/src/demangle_unittest.cc -index be48341..c65adc4 100644 ---- a/src/demangle_unittest.cc -+++ b/src/demangle_unittest.cc -@@ -62,7 +62,7 @@ static const char *DemangleIt(const char * const mangled) { - } - } - --#if defined(OS_WINDOWS) -+#if defined(GLOG_OS_WINDOWS) - - TEST(Demangle, Windows) { - EXPECT_STREQ( -diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in -index 421f1e0..3ecacfb 100644 ---- a/src/glog/logging.h.in -+++ b/src/glog/logging.h.in -@@ -35,7 +35,6 @@ - // - #ifndef _LOGGING_H_ - #define _LOGGING_H_ -- - #include - #include - #include -@@ -58,6 +57,8 @@ - #define GLOG_MSVC_POP_WARNING() - #endif - -+#include -+ - #if @ac_cv_have_glog_export@ - #include "glog/export.h" - #endif -@@ -101,7 +102,7 @@ - - #ifdef HAVE_CXX11_ATOMIC - #include --#elif defined(OS_WINDOWS) -+#elif defined(GLOG_OS_WINDOWS) - #include - #endif - -@@ -1057,7 +1058,7 @@ namespace google { - __FILE__, __LINE__, @ac_google_namespace@::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() - --#elif defined(OS_WINDOWS) -+#elif defined(GLOG_OS_WINDOWS) - - #define SOME_KIND_OF_LOG_EVERY_N(severity, n, what_to_do) \ - static int LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ -diff --git a/src/glog/platform.h b/src/glog/platform.h -new file mode 100644 -index 0000000..e614411 ---- /dev/null -+++ b/src/glog/platform.h -@@ -0,0 +1,58 @@ -+// Copyright (c) 2008, Google Inc. -+// All rights reserved. -+// -+// Redistribution and use in source and binary forms, with or without -+// modification, are permitted provided that the following conditions are -+// met: -+// -+// * Redistributions of source code must retain the above copyright -+// notice, this list of conditions and the following disclaimer. -+// * Redistributions in binary form must reproduce the above -+// copyright notice, this list of conditions and the following disclaimer -+// in the documentation and/or other materials provided with the -+// distribution. -+// * Neither the name of Google Inc. nor the names of its -+// contributors may be used to endorse or promote products derived from -+// this software without specific prior written permission. -+// -+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+// -+// Author: Shinichiro Hamaji -+// -+// Detect supported platforms. -+ -+#ifndef GLOG_PLATFORM_H -+#define GLOG_PLATFORM_H -+ -+#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) -+#define GLOG_OS_WINDOWS -+#elif defined(__CYGWIN__) || defined(__CYGWIN32__) -+#define GLOG_OS_CYGWIN -+#elif defined(linux) || defined(__linux) || defined(__linux__) -+#ifndef GLOG_OS_LINUX -+#define GLOG_OS_LINUX -+#endif -+#elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) -+#define GLOG_OS_MACOSX -+#elif defined(__FreeBSD__) -+#define GLOG_OS_FREEBSD -+#elif defined(__NetBSD__) -+#define GLOG_OS_NETBSD -+#elif defined(__OpenBSD__) -+#define GLOG_OS_OPENBSD -+#else -+// TODO(hamaji): Add other platforms. -+#error Platform not supported by glog. Please consider to contribute platform information by submitting a pull request on Github. -+#endif -+ -+#endif // GLOG_PLATFORM_H -diff --git a/src/googletest.h b/src/googletest.h -index 7230606..a7ce3c2 100644 ---- a/src/googletest.h -+++ b/src/googletest.h -@@ -72,7 +72,7 @@ _END_GOOGLE_NAMESPACE_ - #define GOOGLE_GLOG_DLL_DECL - - static inline string GetTempDir() { --#ifndef OS_WINDOWS -+#ifndef GLOG_OS_WINDOWS - return "/tmp"; - #else - char tmp[MAX_PATH]; -@@ -81,7 +81,7 @@ static inline string GetTempDir() { - #endif - } - --#if defined(OS_WINDOWS) && defined(_MSC_VER) && !defined(TEST_SRC_DIR) -+#if defined(GLOG_OS_WINDOWS) && defined(_MSC_VER) && !defined(TEST_SRC_DIR) - // The test will run in glog/vsproject/ - // (e.g., glog/vsproject/logging_unittest). - static const char TEST_SRC_DIR[] = "../.."; -@@ -207,7 +207,7 @@ static inline void CalledAbort() { - longjmp(g_jmp_buf, 1); - } - --#ifdef OS_WINDOWS -+#ifdef GLOG_OS_WINDOWS - // TODO(hamaji): Death test somehow doesn't work in Windows. - #define ASSERT_DEATH(fn, msg) - #else -@@ -490,7 +490,7 @@ static inline bool MungeAndDiffTestStderr(const string& golden_filename) { - WriteToFile(golden, munged_golden); - string munged_captured = cap->filename() + ".munged"; - WriteToFile(captured, munged_captured); --#ifdef OS_WINDOWS -+#ifdef GLOG_OS_WINDOWS - string diffcmd("fc " + munged_golden + " " + munged_captured); - #else - string diffcmd("diff -u " + munged_golden + " " + munged_captured); -@@ -532,7 +532,7 @@ class Thread { - virtual ~Thread() {} - - void SetJoinable(bool) {} --#if defined(OS_WINDOWS) && !defined(OS_CYGWIN) -+#if defined(GLOG_OS_WINDOWS) && !defined(GLOG_OS_CYGWIN) - void Start() { - handle_ = CreateThread(NULL, - 0, -@@ -565,7 +565,7 @@ class Thread { - return NULL; - } - --#if defined(OS_WINDOWS) && !defined(OS_CYGWIN) -+#if defined(GLOG_OS_WINDOWS) && !defined(GLOG_OS_CYGWIN) - HANDLE handle_; - DWORD th_; - #else -@@ -574,7 +574,7 @@ class Thread { - }; - - static inline void SleepForMilliseconds(int t) { --#ifndef OS_WINDOWS -+#ifndef GLOG_OS_WINDOWS - # if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 199309L - const struct timespec req = {0, t * 1000 * 1000}; - nanosleep(&req, NULL); -diff --git a/src/logging.cc b/src/logging.cc -index 71de91d..f251d67 100644 ---- a/src/logging.cc -+++ b/src/logging.cc -@@ -59,7 +59,7 @@ - #include - #include // for errno - #include --#ifdef OS_WINDOWS -+#ifdef GLOG_OS_WINDOWS - #include "windows/dirent.h" - #else - #include // for automatic removal of old logs -@@ -122,7 +122,7 @@ GLOG_DEFINE_bool(alsologtostderr, BoolFromEnv("GOOGLE_ALSOLOGTOSTDERR", false), - "log messages go to stderr in addition to logfiles"); - GLOG_DEFINE_bool(colorlogtostderr, false, - "color messages logged to stderr (if supported by terminal)"); --#ifdef OS_LINUX -+#ifdef GLOG_OS_LINUX - GLOG_DEFINE_bool(drop_log_memory, true, "Drop in-memory buffers of log contents. " - "Logs can grow very quickly and they are rarely read before they " - "need to be evicted from memory. Instead, drop them from memory " -@@ -198,7 +198,7 @@ GLOG_DEFINE_bool(log_utc_time, false, - #define PATH_SEPARATOR '/' - - #ifndef HAVE_PREAD --#if defined(OS_WINDOWS) -+#if defined(GLOG_OS_WINDOWS) - #include - #define ssize_t SSIZE_T - #endif -@@ -241,7 +241,7 @@ static void GetHostName(string* hostname) { - *buf.nodename = '\0'; - } - *hostname = buf.nodename; --#elif defined(OS_WINDOWS) -+#elif defined(GLOG_OS_WINDOWS) - char buf[MAX_COMPUTERNAME_LENGTH + 1]; - DWORD len = MAX_COMPUTERNAME_LENGTH + 1; - if (GetComputerNameA(buf, &len)) { -@@ -258,7 +258,7 @@ static void GetHostName(string* hostname) { - // Returns true iff terminal supports using colors in output. - static bool TerminalSupportsColor() { - bool term_supports_color = false; --#ifdef OS_WINDOWS -+#ifdef GLOG_OS_WINDOWS - // on Windows TERM variable is usually not set, but the console does - // support colors. - term_supports_color = true; -@@ -312,7 +312,7 @@ static GLogColor SeverityToColor(LogSeverity severity) { - return color; - } - --#ifdef OS_WINDOWS -+#ifdef GLOG_OS_WINDOWS - - // Returns the character attribute for the given color. - static WORD GetColorAttribute(GLogColor color) { -@@ -337,7 +337,7 @@ static const char* GetAnsiColorCode(GLogColor color) { - return NULL; // stop warning about return type. - } - --#endif // OS_WINDOWS -+#endif // GLOG_OS_WINDOWS - - // Safely get max_log_size, overriding to 1 if it somehow gets defined as 0 - static int32 MaxLogSize() { -@@ -753,7 +753,7 @@ static void ColoredWriteToStderr(LogSeverity severity, - fwrite(message, len, 1, stderr); - return; - } --#ifdef OS_WINDOWS -+#ifdef GLOG_OS_WINDOWS - const HANDLE stderr_handle = GetStdHandle(STD_ERROR_HANDLE); - - // Gets the current text color. -@@ -775,7 +775,7 @@ static void ColoredWriteToStderr(LogSeverity severity, - fprintf(stderr, "\033[0;3%sm", GetAnsiColorCode(color)); - fwrite(message, len, 1, stderr); - fprintf(stderr, "\033[m"); // Resets the terminal to default. --#endif // OS_WINDOWS -+#endif // GLOG_OS_WINDOWS - } - - static void WriteToStderr(const char* message, size_t len) { -@@ -788,7 +788,7 @@ inline void LogDestination::MaybeLogToStderr(LogSeverity severity, - const char* message, size_t message_len, size_t prefix_len) { - if ((severity >= FLAGS_stderrthreshold) || FLAGS_alsologtostderr) { - ColoredWriteToStderr(severity, message, message_len); --#ifdef OS_WINDOWS -+#ifdef GLOG_OS_WINDOWS - // On Windows, also output to the debugger - ::OutputDebugStringA(message); - #elif defined(__ANDROID__) -@@ -1056,7 +1056,7 @@ bool LogFileObject::CreateLogfile(const string& time_pid_string) { - } - return false; - } --#ifdef OS_WINDOWS -+#ifdef GLOG_OS_WINDOWS - // https://github.com/golang/go/issues/27638 - make sure we seek to the end to append - // empirically replicated with wine over mingw build - if (!FLAGS_timestamp_in_logfile_name) { -@@ -1080,7 +1080,7 @@ bool LogFileObject::CreateLogfile(const string& time_pid_string) { - linkpath += linkname; - unlink(linkpath.c_str()); // delete old one if it exists - --#if defined(OS_WINDOWS) -+#if defined(GLOG_OS_WINDOWS) - // TODO(hamaji): Create lnk file on Windows? - #elif defined(HAVE_UNISTD_H) - // We must have unistd.h. -@@ -1270,7 +1270,7 @@ void LogFileObject::Write(bool force_flush, - (bytes_since_flush_ >= 1000000) || - (CycleClock_Now() >= next_flush_time_) ) { - FlushUnlocked(); --#ifdef OS_LINUX -+#ifdef GLOG_OS_LINUX - // Only consider files >= 3MiB - if (FLAGS_drop_log_memory && file_length_ >= (3 << 20)) { - // Don't evict the most recent 1-2MiB so as not to impact a tailer -@@ -1305,7 +1305,7 @@ void LogFileObject::Write(bool force_flush, - - - LogCleaner::LogCleaner() : enabled_(false), overdue_days_(7), dir_delim_('/') { --#ifdef OS_WINDOWS -+#ifdef GLOG_OS_WINDOWS - dir_delim_ = '\\'; - #endif - } -@@ -1898,7 +1898,7 @@ void LogMessage::RecordCrashReason( - # define ATTRIBUTE_NORETURN - #endif - --#if defined(OS_WINDOWS) -+#if defined(GLOG_OS_WINDOWS) - __declspec(noreturn) - #endif - static void logging_fail() ATTRIBUTE_NORETURN; -@@ -2223,7 +2223,7 @@ bool SendEmail(const char*dest, const char *subject, const char*body){ - - static void GetTempDirectories(vector* list) { - list->clear(); --#ifdef OS_WINDOWS -+#ifdef GLOG_OS_WINDOWS - // On windows we'll try to find a directory in this order: - // C:/Documents & Settings/whomever/TEMP (or whatever GetTempPath() is) - // C:/TMP/ -@@ -2282,7 +2282,7 @@ const vector& GetLoggingDirectories() { - logging_directories_list->push_back(FLAGS_log_dir.c_str()); - } else { - GetTempDirectories(logging_directories_list); --#ifdef OS_WINDOWS -+#ifdef GLOG_OS_WINDOWS - char tmp[MAX_PATH]; - if (GetWindowsDirectoryA(tmp, MAX_PATH)) - logging_directories_list->push_back(tmp); -@@ -2325,7 +2325,7 @@ void TruncateLogFile(const char *path, int64 limit, int64 keep) { - // Don't follow symlinks unless they're our own fd symlinks in /proc - int flags = O_RDWR; - // TODO(hamaji): Support other environments. --#ifdef OS_LINUX -+#ifdef GLOG_OS_LINUX - const char *procfd_prefix = "/proc/self/fd/"; - if (strncmp(procfd_prefix, path, strlen(procfd_prefix))) flags |= O_NOFOLLOW; - #endif -@@ -2464,7 +2464,7 @@ int posix_strerror_r(int err, char *buf, size_t len) { - return 0; - } else { - buf[0] = '\000'; --#if defined(OS_MACOSX) || defined(OS_FREEBSD) || defined(OS_OPENBSD) -+#if defined(GLOG_OS_MACOSX) || defined(GLOG_OS_FREEBSD) || defined(GLOG_OS_OPENBSD) - if (reinterpret_cast(rc) < sys_nerr) { - // This means an error on MacOSX or FreeBSD. - return -1; -diff --git a/src/logging_custom_prefix_unittest.cc b/src/logging_custom_prefix_unittest.cc -index c9fb5b8..8740fad 100644 ---- a/src/logging_custom_prefix_unittest.cc -+++ b/src/logging_custom_prefix_unittest.cc -@@ -588,7 +588,7 @@ void TestCHECK() { - - // Tests using CHECK*() on anonymous enums. - // Apple's GCC doesn't like this. --#if !defined(OS_MACOSX) -+#if !defined(GLOG_OS_MACOSX) - CHECK_EQ(CASE_A, CASE_A); - CHECK_NE(CASE_A, CASE_B); - CHECK_GE(CASE_A, CASE_A); -@@ -670,7 +670,7 @@ static void GetFiles(const string& pattern, vector* files) { - files->push_back(string(g.gl_pathv[i])); - } - globfree(&g); --#elif defined(OS_WINDOWS) -+#elif defined(GLOG_OS_WINDOWS) - WIN32_FIND_DATAA data; - HANDLE handle = FindFirstFileA(pattern.c_str(), &data); - size_t index = pattern.rfind('\\'); -@@ -799,7 +799,7 @@ static void TestTwoProcessesWrite() { - } - - static void TestSymlink() { --#ifndef OS_WINDOWS -+#ifndef GLOG_OS_WINDOWS - fprintf(stderr, "==== Test setting log file symlink\n"); - string dest = FLAGS_test_tmpdir + "/logging_test_symlink"; - string sym = FLAGS_test_tmpdir + "/symlinkbase"; -@@ -942,7 +942,7 @@ static void TestTruncate() { - // MacOSX 10.4 doesn't fail in this case. - // Windows doesn't have symlink. - // Let's just ignore this test for these cases. --#if !defined(OS_MACOSX) && !defined(OS_WINDOWS) -+#if !defined(GLOG_OS_MACOSX) && !defined(GLOG_OS_WINDOWS) - // Through a symlink should fail to truncate - string linkname = path + ".link"; - unlink(linkname.c_str()); -@@ -951,7 +951,7 @@ static void TestTruncate() { - #endif - - // The /proc/self path makes sense only for linux. --#if defined(OS_LINUX) -+#if defined(GLOG_OS_LINUX) - // Through an open fd symlink should work - int fd; - CHECK_ERR(fd = open(path.c_str(), O_APPEND | O_WRONLY)); -@@ -1205,7 +1205,7 @@ TEST(Strerror, logging) { - CHECK_EQ(posix_strerror_r(errcode, buf, 0), -1); - CHECK_EQ(buf[0], 'A'); - CHECK_EQ(posix_strerror_r(errcode, NULL, buf_size), -1); --#if defined(OS_MACOSX) || defined(OS_FREEBSD) || defined(OS_OPENBSD) -+#if defined(GLOG_OS_MACOSX) || defined(GLOG_OS_FREEBSD) || defined(GLOG_OS_OPENBSD) - // MacOSX or FreeBSD considers this case is an error since there is - // no enough space. - CHECK_EQ(posix_strerror_r(errcode, buf, 1), -1); -diff --git a/src/logging_unittest.cc b/src/logging_unittest.cc -index edc7d35..ce3c483 100644 ---- a/src/logging_unittest.cc -+++ b/src/logging_unittest.cc -@@ -561,7 +561,7 @@ void TestCHECK() { - - // Tests using CHECK*() on anonymous enums. - // Apple's GCC doesn't like this. --#if !defined(OS_MACOSX) -+#if !defined(GLOG_OS_MACOSX) - CHECK_EQ(CASE_A, CASE_A); - CHECK_NE(CASE_A, CASE_B); - CHECK_GE(CASE_A, CASE_A); -@@ -643,7 +643,7 @@ static void GetFiles(const string& pattern, vector* files) { - files->push_back(string(g.gl_pathv[i])); - } - globfree(&g); --#elif defined(OS_WINDOWS) -+#elif defined(GLOG_OS_WINDOWS) - WIN32_FIND_DATAA data; - HANDLE handle = FindFirstFileA(pattern.c_str(), &data); - size_t index = pattern.rfind('\\'); -@@ -772,7 +772,7 @@ static void TestTwoProcessesWrite() { - } - - static void TestSymlink() { --#ifndef OS_WINDOWS -+#ifndef GLOG_OS_WINDOWS - fprintf(stderr, "==== Test setting log file symlink\n"); - string dest = FLAGS_test_tmpdir + "/logging_test_symlink"; - string sym = FLAGS_test_tmpdir + "/symlinkbase"; -@@ -915,7 +915,7 @@ static void TestTruncate() { - // MacOSX 10.4 doesn't fail in this case. - // Windows doesn't have symlink. - // Let's just ignore this test for these cases. --#if !defined(OS_MACOSX) && !defined(OS_WINDOWS) -+#if !defined(GLOG_OS_MACOSX) && !defined(GLOG_OS_WINDOWS) - // Through a symlink should fail to truncate - string linkname = path + ".link"; - unlink(linkname.c_str()); -@@ -924,7 +924,7 @@ static void TestTruncate() { - #endif - - // The /proc/self path makes sense only for linux. --#if defined(OS_LINUX) -+#if defined(GLOG_OS_LINUX) - // Through an open fd symlink should work - int fd; - CHECK_ERR(fd = open(path.c_str(), O_APPEND | O_WRONLY)); -@@ -1178,7 +1178,7 @@ TEST(Strerror, logging) { - CHECK_EQ(posix_strerror_r(errcode, buf, 0), -1); - CHECK_EQ(buf[0], 'A'); - CHECK_EQ(posix_strerror_r(errcode, NULL, buf_size), -1); --#if defined(OS_MACOSX) || defined(OS_FREEBSD) || defined(OS_OPENBSD) -+#if defined(GLOG_OS_MACOSX) || defined(GLOG_OS_FREEBSD) || defined(GLOG_OS_OPENBSD) - // MacOSX or FreeBSD considers this case is an error since there is - // no enough space. - CHECK_EQ(posix_strerror_r(errcode, buf, 1), -1); -diff --git a/src/signalhandler.cc b/src/signalhandler.cc -index b6d6e25..ababf86 100644 ---- a/src/signalhandler.cc -+++ b/src/signalhandler.cc -@@ -63,7 +63,7 @@ const struct { - { SIGILL, "SIGILL" }, - { SIGFPE, "SIGFPE" }, - { SIGABRT, "SIGABRT" }, --#if !defined(OS_WINDOWS) -+#if !defined(GLOG_OS_WINDOWS) - { SIGBUS, "SIGBUS" }, - #endif - { SIGTERM, "SIGTERM" }, -@@ -208,7 +208,7 @@ void DumpSignalInfo(int signal_number, siginfo_t *siginfo) { - formatter.AppendUint64((uintptr_t)pthread_self(), 16); - formatter.AppendString(") "); - // Only linux has the PID of the signal sender in si_pid. --#ifdef OS_LINUX -+#ifdef GLOG_OS_LINUX - formatter.AppendString("from PID "); - formatter.AppendUint64(siginfo->si_pid, 10); - formatter.AppendString("; "); -@@ -253,7 +253,7 @@ void InvokeDefaultSignalHandler(int signal_number) { - sig_action.sa_handler = SIG_DFL; - sigaction(signal_number, &sig_action, NULL); - kill(getpid(), signal_number); --#elif defined(OS_WINDOWS) -+#elif defined(GLOG_OS_WINDOWS) - signal(signal_number, SIG_DFL); - raise(signal_number); - #endif -@@ -267,7 +267,7 @@ static pthread_t* g_entered_thread_id_pointer = NULL; - - // Dumps signal and stack frame information, and invokes the default - // signal handler once our job is done. --#if defined(OS_WINDOWS) -+#if defined(GLOG_OS_WINDOWS) - void FailureSignalHandler(int signal_number) - #else - void FailureSignalHandler(int signal_number, -@@ -314,7 +314,7 @@ void FailureSignalHandler(int signal_number, - // First dump time info. - DumpTimeInfo(); - --#if !defined(OS_WINDOWS) -+#if !defined(GLOG_OS_WINDOWS) - // Get the program counter from ucontext. - void *pc = GetPC(ucontext); - DumpStackFrameInfo("PC: ", pc); -@@ -364,7 +364,7 @@ bool IsFailureSignalHandlerInstalled() { - sigaction(SIGABRT, NULL, &sig_action); - if (sig_action.sa_sigaction == &FailureSignalHandler) - return true; --#elif defined(OS_WINDOWS) -+#elif defined(GLOG_OS_WINDOWS) - return kFailureSignalHandlerInstalled; - #endif // HAVE_SIGACTION - return false; -@@ -385,7 +385,7 @@ void InstallFailureSignalHandler() { - CHECK_ERR(sigaction(kFailureSignals[i].number, &sig_action, NULL)); - } - kFailureSignalHandlerInstalled = true; --#elif defined(OS_WINDOWS) -+#elif defined(GLOG_OS_WINDOWS) - for (size_t i = 0; i < ARRAYSIZE(kFailureSignals); ++i) { - CHECK_NE(signal(kFailureSignals[i].number, &FailureSignalHandler), - SIG_ERR); -@@ -395,7 +395,7 @@ void InstallFailureSignalHandler() { - } - - void InstallFailureWriter(void (*writer)(const char* data, int size)) { --#if defined(HAVE_SIGACTION) || defined(OS_WINDOWS) -+#if defined(HAVE_SIGACTION) || defined(GLOG_OS_WINDOWS) - g_failure_writer = writer; - #endif // HAVE_SIGACTION - } -diff --git a/src/stacktrace_x86-inl.h b/src/stacktrace_x86-inl.h -index af2783d..99c5de7 100644 ---- a/src/stacktrace_x86-inl.h -+++ b/src/stacktrace_x86-inl.h -@@ -31,9 +31,9 @@ - - #include // for uintptr_t - --#include "utilities.h" // for OS_* macros -+#include "utilities.h" // for GLOG_OS_* macros - --#if !defined(OS_WINDOWS) -+#if !defined(GLOG_OS_WINDOWS) - #include - #include - #endif -@@ -74,7 +74,7 @@ static void **NextStackFrame(void **old_sp) { - // last two pages in the address space - if ((uintptr_t)new_sp >= 0xffffe000) return NULL; - #endif --#if !defined(OS_WINDOWS) -+#if !defined(GLOG_OS_WINDOWS) - if (!STRICT_UNWINDING) { - // Lax sanity checks cause a crash in 32-bit tcmalloc/crash_reason_test - // on AMD-based machines with VDSO-enabled kernels. -diff --git a/src/symbolize.cc b/src/symbolize.cc -index f7fbc53..8688ca2 100644 ---- a/src/symbolize.cc -+++ b/src/symbolize.cc -@@ -46,7 +46,7 @@ - // and memmove(). We assume they are async-signal-safe. - // - // Additional header can be specified by the GLOG_BUILD_CONFIG_INCLUDE --// macro to add platform specific defines (e.g. OS_OPENBSD). -+// macro to add platform specific defines (e.g. GLOG_OS_OPENBSD). - - #ifdef GLOG_BUILD_CONFIG_INCLUDE - #include GLOG_BUILD_CONFIG_INCLUDE -@@ -113,7 +113,7 @@ _END_GOOGLE_NAMESPACE_ - #if defined(HAVE_DLFCN_H) - #include - #endif --#if defined(OS_OPENBSD) -+#if defined(GLOG_OS_OPENBSD) - #include - #else - #include -@@ -846,7 +846,7 @@ static ATTRIBUTE_NOINLINE bool SymbolizeAndDemangle(void *pc, char *out, - - _END_GOOGLE_NAMESPACE_ - --#elif defined(OS_MACOSX) && defined(HAVE_DLADDR) -+#elif defined(GLOG_OS_MACOSX) && defined(HAVE_DLADDR) - - #include - #include -@@ -871,7 +871,7 @@ static ATTRIBUTE_NOINLINE bool SymbolizeAndDemangle(void *pc, char *out, - - _END_GOOGLE_NAMESPACE_ - --#elif defined(OS_WINDOWS) || defined(OS_CYGWIN) -+#elif defined(GLOG_OS_WINDOWS) || defined(GLOG_OS_CYGWIN) - - #include - #include -diff --git a/src/symbolize_unittest.cc b/src/symbolize_unittest.cc -index 0b53230..7e8f6d4 100644 ---- a/src/symbolize_unittest.cc -+++ b/src/symbolize_unittest.cc -@@ -359,7 +359,7 @@ static void ATTRIBUTE_NOINLINE TestWithReturnAddress() { - #endif - } - --# elif defined(OS_WINDOWS) || defined(OS_CYGWIN) -+# elif defined(GLOG_OS_WINDOWS) || defined(GLOG_OS_CYGWIN) - - #ifdef _MSC_VER - #include -@@ -411,10 +411,10 @@ int main(int argc, char **argv) { - TestWithPCInsideNonInlineFunction(); - TestWithReturnAddress(); - return RUN_ALL_TESTS(); --# elif defined(OS_WINDOWS) || defined(OS_CYGWIN) -+# elif defined(GLOG_OS_WINDOWS) || defined(GLOG_OS_CYGWIN) - TestWithReturnAddress(); - return RUN_ALL_TESTS(); --# else // OS_WINDOWS -+# else // GLOG_OS_WINDOWS - printf("PASS (no symbolize_unittest support)\n"); - return 0; - # endif // __ELF__ -diff --git a/src/utilities.cc b/src/utilities.cc -index 6b9a69e..ecda730 100644 ---- a/src/utilities.cc -+++ b/src/utilities.cc -@@ -151,7 +151,7 @@ static void DumpStackTraceAndExit() { - sigemptyset(&sig_action.sa_mask); - sig_action.sa_handler = SIG_DFL; - sigaction(SIGABRT, &sig_action, NULL); --#elif defined(OS_WINDOWS) -+#elif defined(GLOG_OS_WINDOWS) - signal(SIGABRT, SIG_DFL); - #endif // HAVE_SIGACTION - } -@@ -180,7 +180,7 @@ bool IsGoogleLoggingInitialized() { - return g_program_invocation_short_name != NULL; - } - --#ifdef OS_WINDOWS -+#ifdef GLOG_OS_WINDOWS - struct timeval { - long tv_sec, tv_usec; - }; -@@ -236,9 +236,9 @@ bool PidHasChanged() { - - pid_t GetTID() { - // On Linux and MacOSX, we try to use gettid(). --#if defined OS_LINUX || defined OS_MACOSX -+#if defined GLOG_OS_LINUX || defined GLOG_OS_MACOSX - #ifndef __NR_gettid --#ifdef OS_MACOSX -+#ifdef GLOG_OS_MACOSX - #define __NR_gettid SYS_gettid - #elif ! defined __i386__ - #error "Must define __NR_gettid for non-x86 platforms" -@@ -258,12 +258,12 @@ pid_t GetTID() { - // the value change to "true". - lacks_gettid = true; - } --#endif // OS_LINUX || OS_MACOSX -+#endif // GLOG_OS_LINUX || GLOG_OS_MACOSX - - // If gettid() could not be used, we use one of the following. --#if defined OS_LINUX -+#if defined GLOG_OS_LINUX - return getpid(); // Linux: getpid returns thread ID when gettid is absent --#elif defined OS_WINDOWS && !defined OS_CYGWIN -+#elif defined GLOG_OS_WINDOWS && !defined GLOG_OS_CYGWIN - return GetCurrentThreadId(); - #elif defined(HAVE_PTHREAD) - // If none of the techniques above worked, we use pthread_self(). -@@ -275,7 +275,7 @@ pid_t GetTID() { - - const char* const_basename(const char* filepath) { - const char* base = strrchr(filepath, '/'); --#ifdef OS_WINDOWS // Look for either path separator in Windows -+#ifdef GLOG_OS_WINDOWS // Look for either path separator in Windows - if (!base) - base = strrchr(filepath, '\\'); - #endif -@@ -288,7 +288,7 @@ const string& MyUserName() { - } - static void MyUserNameInitializer() { - // TODO(hamaji): Probably this is not portable. --#if defined(OS_WINDOWS) -+#if defined(GLOG_OS_WINDOWS) - const char* user = getenv("USERNAME"); - #else - const char* user = getenv("USER"); -@@ -337,7 +337,7 @@ void InitGoogleLoggingUtilities(const char* argv0) { - CHECK(!IsGoogleLoggingInitialized()) - << "You called InitGoogleLogging() twice!"; - const char* slash = strrchr(argv0, '/'); --#ifdef OS_WINDOWS -+#ifdef GLOG_OS_WINDOWS - if (!slash) slash = strrchr(argv0, '\\'); - #endif - g_program_invocation_short_name = slash ? slash + 1 : argv0; -diff --git a/src/utilities.h b/src/utilities.h -index e4115ad..86bc296 100644 ---- a/src/utilities.h -+++ b/src/utilities.h -@@ -34,25 +34,6 @@ - #ifndef UTILITIES_H__ - #define UTILITIES_H__ - --#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) --# define OS_WINDOWS --#elif defined(__CYGWIN__) || defined(__CYGWIN32__) --# define OS_CYGWIN --#elif defined(linux) || defined(__linux) || defined(__linux__) --# ifndef OS_LINUX --# define OS_LINUX --# endif --#elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) --# define OS_MACOSX --#elif defined(__FreeBSD__) --# define OS_FREEBSD --#elif defined(__NetBSD__) --# define OS_NETBSD --#elif defined(__OpenBSD__) --# define OS_OPENBSD --#else --// TODO(hamaji): Add other platforms. --#endif - - // printf macros for size_t, in the style of inttypes.h - #ifdef _LP64 -@@ -76,12 +57,12 @@ - - #include - --#if defined(OS_WINDOWS) -+#include "glog/logging.h" -+#if defined(GLOG_OS_WINDOWS) - # include "port.h" - #endif - - #include "config.h" --#include "glog/logging.h" - - // There are three different ways we can try to get the stack trace: - // -@@ -114,7 +95,7 @@ - # define STACKTRACE_H "stacktrace_x86_64-inl.h" - # elif (defined(__ppc__) || defined(__PPC__)) && __GNUC__ >= 2 - # define STACKTRACE_H "stacktrace_powerpc-inl.h" --# elif defined(OS_WINDOWS) -+# elif defined(GLOG_OS_WINDOWS) - # define STACKTRACE_H "stacktrace_windows-inl.h" - # endif - #endif -@@ -130,12 +111,12 @@ - #ifndef GLOG_NO_SYMBOLIZE_DETECTION - #ifndef HAVE_SYMBOLIZE - // defined by gcc --#if defined(__ELF__) && defined(OS_LINUX) -+#if defined(__ELF__) && defined(GLOG_OS_LINUX) - # define HAVE_SYMBOLIZE --#elif defined(OS_MACOSX) && defined(HAVE_DLADDR) -+#elif defined(GLOG_OS_MACOSX) && defined(HAVE_DLADDR) - // Use dladdr to symbolize. - # define HAVE_SYMBOLIZE --#elif defined(OS_WINDOWS) -+#elif defined(GLOG_OS_WINDOWS) - // Use DbgHelp to symbolize - # define HAVE_SYMBOLIZE - #endif -@@ -154,7 +135,7 @@ namespace glog_internal_namespace_ { - #ifdef HAVE___ATTRIBUTE__ - # define ATTRIBUTE_NOINLINE __attribute__ ((noinline)) - # define HAVE_ATTRIBUTE_NOINLINE --#elif defined(OS_WINDOWS) -+#elif defined(GLOG_OS_WINDOWS) - # define ATTRIBUTE_NOINLINE __declspec(noinline) - # define HAVE_ATTRIBUTE_NOINLINE - #else diff --git a/ports/glog/glog_disable_debug_postfix.patch b/ports/glog/glog_disable_debug_postfix.patch index 9f62ec3799e117..45cbce9789c00a 100644 --- a/ports/glog/glog_disable_debug_postfix.patch +++ b/ports/glog/glog_disable_debug_postfix.patch @@ -1,13 +1,13 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 62ebbcc..28e2688 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -65,7 +65,7 @@ include (GenerateExportHeader) - include (GetCacheVariables) - include (GNUInstallDirs) - --set (CMAKE_DEBUG_POSTFIX d) -+#set (CMAKE_DEBUG_POSTFIX d) - set (CMAKE_THREAD_PREFER_PTHREAD 1) - - find_package (GTest) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1fdeac6..16fef38 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -65,7 +65,7 @@ set (CMAKE_CXX_VISIBILITY_PRESET hidden) + set (CMAKE_POSITION_INDEPENDENT_CODE ON) + set (CMAKE_VISIBILITY_INLINES_HIDDEN ON) + +-set (CMAKE_DEBUG_POSTFIX d) ++#set (CMAKE_DEBUG_POSTFIX d) + set (CMAKE_THREAD_PREFER_PTHREAD 1) + + find_package (GTest NO_MODULE) diff --git a/ports/glog/portfile.cmake b/ports/glog/portfile.cmake index 10e1d13c234441..abd690937a1212 100644 --- a/ports/glog/portfile.cmake +++ b/ports/glog/portfile.cmake @@ -1,16 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/glog - REF v0.5.0 - SHA512 445e4338f3d81cd0b065f2da9c6ce343c243263ca144cea424ef97531a4e9e09c06ffd6942ac01c5213a8003c75cfbbede3c4028d12f0134f23ff29314769c1a + REF v0.6.0 + SHA512 fd2c42583d0dd72c790a8cf888f328a64447c5fb9d99b2e2a3833d70c102cb0eb9ae874632c2732424cc86216c8a076a3e24b23a793eaddb5da8a1dc52ba9226 HEAD_REF master PATCHES - glog_disable_debug_postfix.patch - fix_glog_CMAKE_MODULE_PATH.patch - fix_log_every_n.patch - fix-windows-CXX11_ATOMIC.patch - fix_crosscompile_symbolize.patch - + fix_glog_CMAKE_MODULE_PATH.patch + glog_disable_debug_prefix.patch + fix_crosscompile_symbolize.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/glog/vcpkg.json b/ports/glog/vcpkg.json index 5f6b947fed76ac..9f88d84f26ac4d 100644 --- a/ports/glog/vcpkg.json +++ b/ports/glog/vcpkg.json @@ -1,7 +1,6 @@ { "name": "glog", - "version": "0.5.0", - "port-version": 4, + "version": "0.6.0", "description": "C++ implementation of the Google logging module", "homepage": "https://github.com/google/glog", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index bb54b660c8839e..36ad1f52ee059b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2581,8 +2581,8 @@ "port-version": 4 }, "glog": { - "baseline": "0.5.0", - "port-version": 4 + "baseline": "0.6.0", + "port-version": 0 }, "gloo": { "baseline": "20201203", diff --git a/versions/g-/glog.json b/versions/g-/glog.json index 94c50d82ac0083..4030509279c4f3 100644 --- a/versions/g-/glog.json +++ b/versions/g-/glog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "04578f624928c2ec7cf1d25a88e2d0667a38615c", + "version": "0.6.0", + "port-version": 0 + }, { "git-tree": "bb5f54eba990cc0f03c64e1d09f343dd6cd7b22b", "version": "0.5.0", From f5b6730c2c7bac556b6c36eb62cd8febf978fcf9 Mon Sep 17 00:00:00 2001 From: jiayuehua <3423893+jiayuehua@users.noreply.github.com> Date: Mon, 13 Jun 2022 12:35:28 +0800 Subject: [PATCH 02/56] fix typo --- ports/glog/portfile.cmake | 2 +- versions/g-/glog.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/glog/portfile.cmake b/ports/glog/portfile.cmake index abd690937a1212..b154878103bf95 100644 --- a/ports/glog/portfile.cmake +++ b/ports/glog/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES fix_glog_CMAKE_MODULE_PATH.patch - glog_disable_debug_prefix.patch + glog_disable_debug_postfix.patch fix_crosscompile_symbolize.patch ) diff --git a/versions/g-/glog.json b/versions/g-/glog.json index 4030509279c4f3..87ffe208a15c34 100644 --- a/versions/g-/glog.json +++ b/versions/g-/glog.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "04578f624928c2ec7cf1d25a88e2d0667a38615c", + "git-tree": "dbef6aa7b5d1aef41005d9a57388861302e1d83f", "version": "0.6.0", "port-version": 0 }, From 6506e80eb253ac671d4ae37c83b895ac26c773e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Mon, 13 Jun 2022 20:57:56 +0000 Subject: [PATCH 03/56] [cgal] Fix incorrect warning message (#24112) * [cgal] Install data folder * version * Add double quotes * version * version * Add comment to patch * version --- ports/cgal/fix-incorrect-warning.patch | 15 +++++++++++ ports/cgal/portfile.cmake | 35 ++++++++++++++++---------- ports/cgal/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/c-/cgal.json | 5 ++++ 5 files changed, 44 insertions(+), 14 deletions(-) create mode 100644 ports/cgal/fix-incorrect-warning.patch diff --git a/ports/cgal/fix-incorrect-warning.patch b/ports/cgal/fix-incorrect-warning.patch new file mode 100644 index 00000000000000..f8d002fab374b7 --- /dev/null +++ b/ports/cgal/fix-incorrect-warning.patch @@ -0,0 +1,15 @@ +diff --git a/Installation/lib/cmake/CGAL/CGALConfig.cmake b/Installation/lib/cmake/CGAL/CGALConfig.cmake +index 4f3a16b..6edefb1 100644 +--- a/Installation/lib/cmake/CGAL/CGALConfig.cmake ++++ b/Installation/lib/cmake/CGAL/CGALConfig.cmake +@@ -89,7 +89,9 @@ if (NOT CGAL_DATA_DIR) + if (EXISTS "${CMAKE_SOURCE_DIR}/../../data") + set(CGAL_DATA_DIR "${CMAKE_SOURCE_DIR}/../../data") + else() +- message(WARNING "CGAL_DATA_DIR cannot be deduced, set the variable CGAL_DATA_DIR to set the default value of CGAL::data_file_path()") ++ if(CGAL_TEST_SUITE) ++ message(WARNING "CGAL_DATA_DIR cannot be deduced, set the variable CGAL_DATA_DIR to set the default value of CGAL::data_file_path()") ++ endif() + endif() + endif() + endif() diff --git a/ports/cgal/portfile.cmake b/ports/cgal/portfile.cmake index 927b78decefb5c..34880b2e9c3781 100644 --- a/ports/cgal/portfile.cmake +++ b/ports/cgal/portfile.cmake @@ -1,3 +1,4 @@ +# Header only vcpkg_buildpath_length_warning(37) vcpkg_from_github( @@ -6,6 +7,7 @@ vcpkg_from_github( REF v5.4.1 SHA512 2ec6167d8ebf1df121f1ac372d01862f7f3acb043deea4a334e0329976306f9c9e917cdc66b355728d3f99fdb76f5491d96f10fff660716ce27bfd3793380875 HEAD_REF master + PATCHES fix-incorrect-warning.patch # https://github.com/CGAL/cgal/pull/6649 ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -18,7 +20,14 @@ vcpkg_cmake_configure( OPTIONS -DCGAL_HEADER_ONLY=ON -DCGAL_INSTALL_CMAKE_DIR=share/cgal + -DBUILD_TESTING=OFF + -DBUILD_DOC=OFF + -DCGAL_BUILD_THREE_DOC=OFF ${FEATURE_OPTIONS} + MAYBE_UNUSED_VARIABLES + CGAL_BUILD_THREE_DOC + CGAL_HEADER_ONLY + WITH_CGAL_Qt5 ) vcpkg_cmake_install() @@ -28,28 +37,28 @@ vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() # Clean -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") else() - foreach(ROOT ${CURRENT_PACKAGES_DIR}/bin) + foreach(ROOT "${CURRENT_PACKAGES_DIR}/bin") file(REMOVE - ${ROOT}/cgal_create_CMakeLists - ${ROOT}/cgal_create_cmake_script - ${ROOT}/cgal_make_macosx_app + "${ROOT}/cgal_create_CMakeLists" + "${ROOT}/cgal_create_cmake_script" + "${ROOT}/cgal_make_macosx_app" ) endforeach() endif() -file(INSTALL ${SOURCE_PATH}/Installation/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/Installation/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file( COPY - ${SOURCE_PATH}/Installation/LICENSE.BSL - ${SOURCE_PATH}/Installation/LICENSE.RFL - ${SOURCE_PATH}/Installation/LICENSE.GPL - ${SOURCE_PATH}/Installation/LICENSE.LGPL - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + "${SOURCE_PATH}/Installation/LICENSE.BSL" + "${SOURCE_PATH}/Installation/LICENSE.RFL" + "${SOURCE_PATH}/Installation/LICENSE.GPL" + "${SOURCE_PATH}/Installation/LICENSE.LGPL" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" ) -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/cgal/vcpkg.json b/ports/cgal/vcpkg.json index b35852c91a3fb2..fce76bdb489223 100644 --- a/ports/cgal/vcpkg.json +++ b/ports/cgal/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cgal", "version": "5.4.1", + "port-version": 1, "description": "The Computational Geometry Algorithms Library (CGAL) is a C++ library that aims to provide easy access to efficient and reliable algorithms in computational geometry.", "homepage": "https://github.com/CGAL/cgal", "license": "GPL-3.0-or-later AND LGPL-3.0-or-later AND BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index bb54b660c8839e..f03cd085e9b94e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1326,7 +1326,7 @@ }, "cgal": { "baseline": "5.4.1", - "port-version": 0 + "port-version": 1 }, "cgicc": { "baseline": "3.2.19", diff --git a/versions/c-/cgal.json b/versions/c-/cgal.json index b427c98ef569bc..7add1957d5374e 100644 --- a/versions/c-/cgal.json +++ b/versions/c-/cgal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "de8aef00f45ff890d5b4ce4aae56afbc559a5fea", + "version": "5.4.1", + "port-version": 1 + }, { "git-tree": "898c2a987fc0104e3c8ba17afde418672e3b0019", "version": "5.4.1", From 73d50c1b8290af45cb5922d721b74946c058481c Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Tue, 14 Jun 2022 07:23:26 +0800 Subject: [PATCH 04/56] [check] Fix the incorrect path of dll (#25211) * [check] Fix the incorrect path of dll * update license * x-add-version Co-authored-by: Cheney-Wang Co-authored-by: Lily Wang --- ports/check/fix-lib-path.patch | 8 +++----- ports/check/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/c-/check.json | 5 +++++ 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ports/check/fix-lib-path.patch b/ports/check/fix-lib-path.patch index 1951c2bfe7c98f..d3086e74fe7087 100644 --- a/ports/check/fix-lib-path.patch +++ b/ports/check/fix-lib-path.patch @@ -29,17 +29,15 @@ index 38cbc53..d8a4272 100644 # vim: shiftwidth=2:softtabstop=2:tabstop=2:expandtab:autoindent diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 4a02dbe..ade4cfd 100644 +index 4a02dbe..3bf2fa6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -191,8 +191,8 @@ if(NOT THIS_IS_SUBPROJECT) +@@ -191,7 +191,7 @@ if(NOT THIS_IS_SUBPROJECT) install(TARGETS check checkShared EXPORT check-targets ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/manual-link -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}/manual-link + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ) - endif() diff --git a/ports/check/vcpkg.json b/ports/check/vcpkg.json index bf10a4838c5256..94886bedac951d 100644 --- a/ports/check/vcpkg.json +++ b/ports/check/vcpkg.json @@ -1,10 +1,10 @@ { "name": "check", "version": "0.15.2", - "port-version": 3, + "port-version": 4, "description": "A unit testing framework for C", "homepage": "https://github.com/libcheck/check", - "license": "LGPL-2.1", + "license": "LGPL-2.1-only", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index f03cd085e9b94e..d30c46a6aa1391 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1362,7 +1362,7 @@ }, "check": { "baseline": "0.15.2", - "port-version": 3 + "port-version": 4 }, "chipmunk": { "baseline": "7.0.3", diff --git a/versions/c-/check.json b/versions/c-/check.json index 2bdf457569a265..d66579d7462a60 100644 --- a/versions/c-/check.json +++ b/versions/c-/check.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d3b96c10d08746796f0e7540f9cb896b263cd4a9", + "version": "0.15.2", + "port-version": 4 + }, { "git-tree": "f9804577939493b7f7934d98adc953624e0020c4", "version": "0.15.2", From 86aed649b301dd5a04e094ec65a13174a122c0c2 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 14 Jun 2022 01:25:35 +0200 Subject: [PATCH 05/56] [libpng] Fix `find_package` debug libraries (#25200) * [cmake-user] Extend check for release vs. debug libs * Add wrapper for PNG * Update versions --- ports/libpng/portfile.cmake | 1 + ports/libpng/vcpkg-cmake-wrapper.cmake | 3 ++ ports/libpng/vcpkg.json | 2 +- .../cmake-user/project/CMakeLists.txt | 32 ++++++++++++------- versions/baseline.json | 2 +- versions/l-/libpng.json | 5 +++ 6 files changed, 32 insertions(+), 13 deletions(-) create mode 100644 ports/libpng/vcpkg-cmake-wrapper.cmake diff --git a/ports/libpng/portfile.cmake b/ports/libpng/portfile.cmake index fda335e345cf35..f9bf9f4b2583e6 100644 --- a/ports/libpng/portfile.cmake +++ b/ports/libpng/portfile.cmake @@ -81,6 +81,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/libpng) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/png") vcpkg_fixup_pkgconfig() if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) diff --git a/ports/libpng/vcpkg-cmake-wrapper.cmake b/ports/libpng/vcpkg-cmake-wrapper.cmake new file mode 100644 index 00000000000000..de1e087fcebfe4 --- /dev/null +++ b/ports/libpng/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,3 @@ +find_library(PNG_LIBRARY_RELEASE NAMES png16 libpng16 NAMES_PER_DIR PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH) +find_library(PNG_LIBRARY_DEBUG NAMES png16d libpng16d NAMES_PER_DIR PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH) +_find_package(${ARGS}) diff --git a/ports/libpng/vcpkg.json b/ports/libpng/vcpkg.json index a827351d9721f5..8ff5901531a5df 100644 --- a/ports/libpng/vcpkg.json +++ b/ports/libpng/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libpng", "version": "1.6.37", - "port-version": 17, + "port-version": 18, "description": "libpng is a library implementing an interface for reading and writing PNG (Portable Network Graphics) format files", "homepage": "https://github.com/glennrp/libpng", "license": "libpng-2.0", diff --git a/scripts/test_ports/cmake-user/project/CMakeLists.txt b/scripts/test_ports/cmake-user/project/CMakeLists.txt index 8ef35915402a3a..e2a9a86f3bbcae 100644 --- a/scripts/test_ports/cmake-user/project/CMakeLists.txt +++ b/scripts/test_ports/cmake-user/project/CMakeLists.txt @@ -78,22 +78,32 @@ foreach(package ${FIND_PACKAGES}) endif() target_link_libraries(exe PRIVATE ${libraries}) - if(CMAKE_BUILD_TYPE STREQUAL "Release") - string(REPLACE "debug;" "ignore:" libraries "${libraries}") - elseif(CMAKE_BUILD_TYPE STREQUAL "Debug") - string(REPLACE "optimized;" "ignore:" libraries "${libraries}") - endif() + set(last_keyword "") foreach(item IN LISTS libraries) - string(FIND "${item}" "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/" starts_with_vcpkg) - if(NOT starts_with_vcpkg EQUAL "0") + if(item STREQUAL "optimized" OR item STREQUAL "debug") + set(last_keyword "${item}") continue() endif() string(FIND "${item}" "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/" starts_with_release) string(FIND "${item}" "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/" starts_with_debug) - if(CMAKE_BUILD_TYPE STREQUAL "Release" AND starts_with_debug EQUAL "0") - message(SEND_ERROR "Debug lib in release build: ${item}") - elseif(CMAKE_BUILD_TYPE STREQUAL "Debug" AND starts_with_release EQUAL "0") - message(SEND_ERROR "Release lib in debug build: ${item}") + if(starts_with_release EQUAL "0") + if(last_keyword STREQUAL "optimized") + # okay + elseif(last_keyword STREQUAL "debug") + message(SEND_ERROR "Release lib for 'debug' keyword: ${item}") + elseif(CMAKE_BUILD_TYPE STREQUAL "Debug") + message(SEND_ERROR "Release lib for 'Debug' build: ${item}") + endif() + elseif(starts_with_debug EQUAL "0") + if(last_keyword STREQUAL "debug") + # okay + elseif(last_keyword STREQUAL "optimized") + message(SEND_ERROR "Debug lib for 'optimized' keyword: ${item}") + elseif(CMAKE_BUILD_TYPE STREQUAL "Release") + message(SEND_ERROR "Debug lib for 'Release' build: ${item}") + endif() endif() + set(last_keyword "") + continue() endforeach() endforeach() diff --git a/versions/baseline.json b/versions/baseline.json index d30c46a6aa1391..6a4ab5e04223ec 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3926,7 +3926,7 @@ }, "libpng": { "baseline": "1.6.37", - "port-version": 17 + "port-version": 18 }, "libpopt": { "baseline": "1.16", diff --git a/versions/l-/libpng.json b/versions/l-/libpng.json index 492a9a83cf27be..da868b875a1739 100644 --- a/versions/l-/libpng.json +++ b/versions/l-/libpng.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5e3ec787e7c6f09dd162648b700aeb712af0ffd2", + "version": "1.6.37", + "port-version": 18 + }, { "git-tree": "ffe71783883ccf1c6e6a306daa686868bfb62191", "version": "1.6.37", From 60993b8ec5d5cec012d7b3dc78d39d892a997a62 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 14 Jun 2022 01:27:17 +0200 Subject: [PATCH 06/56] [libiconv] Update to 1.17 (#25184) * [libiconv] Update to 1.17 * [libiconv] License processing * Update versions * Adapt gettext uwp patch for libiconv * Update versions --- ports/libiconv/0002-Config-for-MSVC.patch | 15 +++++++++++++- ports/libiconv/portfile.cmake | 25 ++++++++++++++++++----- ports/libiconv/vcpkg.json | 6 +++--- versions/baseline.json | 4 ++-- versions/l-/libiconv.json | 5 +++++ 5 files changed, 44 insertions(+), 11 deletions(-) diff --git a/ports/libiconv/0002-Config-for-MSVC.patch b/ports/libiconv/0002-Config-for-MSVC.patch index 0c90e50ef1cadb..5c79d25c425e6d 100644 --- a/ports/libiconv/0002-Config-for-MSVC.patch +++ b/ports/libiconv/0002-Config-for-MSVC.patch @@ -11,4 +11,17 @@ index 6dc011b..158ccdd 100644 # ifdef mbstate_t # define mbrtowc(pwc, s, n, ps) (mbrtowc)(pwc, s, n, 0) # define mbsinit(ps) 1 - \ No newline at end of file +diff --git a/srclib/fcntl.c b/srclib/fcntl.c +index f9753c4..02fc8be 100644 +--- a/srclib/fcntl.c ++++ b/srclib/fcntl.c +@@ -37,6 +37,9 @@ + /* Get declarations of the native Windows API functions. */ + # define WIN32_LEAN_AND_MEAN + # include ++#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP) ++#define HANDLE_FLAG_INHERIT 0 ++#endif + + /* Get _get_osfhandle. */ + # if GNULIB_MSVC_NOTHROW diff --git a/ports/libiconv/portfile.cmake b/ports/libiconv/portfile.cmake index 3cca1b292cd0d0..9794211de5d366 100644 --- a/ports/libiconv/portfile.cmake +++ b/ports/libiconv/portfile.cmake @@ -5,17 +5,17 @@ if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_ANDROID) return() endif() -set(LIBICONV_VERSION 1.16) +set(LIBICONV_VERSION 1.17) vcpkg_download_distfile(ARCHIVE URLS "https://ftp.gnu.org/gnu/libiconv/libiconv-${LIBICONV_VERSION}.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/libiconv/libiconv-${LIBICONV_VERSION}.tar.gz" FILENAME "libiconv-${LIBICONV_VERSION}.tar.gz" - SHA512 365dac0b34b4255a0066e8033a8b3db4bdb94b9b57a9dca17ebf2d779139fe935caf51a465d17fd8ae229ec4b926f3f7025264f37243432075e5583925bb77b7 + SHA512 18a09de2d026da4f2d8b858517b0f26d853b21179cf4fa9a41070b2d140030ad9525637dc4f34fc7f27abca8acdc84c6751dfb1d426e78bf92af4040603ced86 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF ${LIBICONV_VERSION} + ARCHIVE "${ARCHIVE}" + REF "${LIBICONV_VERSION}" PATCHES 0002-Config-for-MSVC.patch 0003-Add-export.patch @@ -50,4 +50,19 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}") # share contains un # Please keep, the default usage is broken file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/COPYING.LIB" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(READ "${SOURCE_PATH}/COPYING.LIB" copying_lib) +file(READ "${SOURCE_PATH}/COPYING" copying_tool) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" " +The libiconv and libcharset libraries and their header files are under LGPL, +see COPYING.LIB below. + +The iconv program and the documentation are under GPL, see COPYING below. + +# COPYING.LIB + +${copying_lib} + +# COPYING + +${copying_tool} +") diff --git a/ports/libiconv/vcpkg.json b/ports/libiconv/vcpkg.json index b567aee18bb77a..5314ec6cc2b1e5 100644 --- a/ports/libiconv/vcpkg.json +++ b/ports/libiconv/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libiconv", - "version": "1.16", - "port-version": 13, + "version": "1.17", "description": "GNU Unicode text conversion", - "homepage": "https://www.gnu.org/software/libiconv/" + "homepage": "https://www.gnu.org/software/libiconv/", + "license": null } diff --git a/versions/baseline.json b/versions/baseline.json index 6a4ab5e04223ec..3fc82c82998d59 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3689,8 +3689,8 @@ "port-version": 1 }, "libiconv": { - "baseline": "1.16", - "port-version": 13 + "baseline": "1.17", + "port-version": 0 }, "libics": { "baseline": "1.6.5", diff --git a/versions/l-/libiconv.json b/versions/l-/libiconv.json index 24335a8f50aa59..ea95cbbec27a79 100644 --- a/versions/l-/libiconv.json +++ b/versions/l-/libiconv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1f92b7d29ce3243d3d51e07686869eca63ece88a", + "version": "1.17", + "port-version": 0 + }, { "git-tree": "cc4f1edf5a444934d4a757420a6cd3fed596e1d5", "version": "1.16", From 70cfcd0e1863f6e2a3d977208aaf175c2c53fa30 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Tue, 14 Jun 2022 01:29:51 +0200 Subject: [PATCH 07/56] [libspatialite] Fix build with VCPKG_BUILD_TYPE=release (#25180) --- ports/libspatialite/portfile.cmake | 12 ++++++++---- ports/libspatialite/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libspatialite.json | 5 +++++ 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ports/libspatialite/portfile.cmake b/ports/libspatialite/portfile.cmake index db8d8bcda84b84..6d97e062ab6462 100644 --- a/ports/libspatialite/portfile.cmake +++ b/ports/libspatialite/portfile.cmake @@ -98,14 +98,18 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/spatialite_i.lib") - file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/spatialite_i.lib") + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/spatialite_i.lib") + endif() else() file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/spatialite.lib") - file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/spatialite.lib") file(RENAME "${CURRENT_PACKAGES_DIR}/lib/spatialite_i.lib" "${CURRENT_PACKAGES_DIR}/lib/spatialite.lib") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/spatialite_i.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/spatialite.lib") + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/spatialite.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/spatialite_i.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/spatialite.lib") + endif() endif() set(infile "${SOURCE_PATH}/spatialite.pc.in") diff --git a/ports/libspatialite/vcpkg.json b/ports/libspatialite/vcpkg.json index 521ba15233cfe2..9de45472ba9ef2 100644 --- a/ports/libspatialite/vcpkg.json +++ b/ports/libspatialite/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libspatialite", "version": "5.0.1", - "port-version": 4, + "port-version": 5, "description": "SpatiaLite is an open source library intended to extend the SQLite core to support fully fledged Spatial SQL capabilities.", "homepage": "https://www.gaia-gis.it/gaia-sins/libspatialite-sources", "license": "MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 3fc82c82998d59..023e54c2caa80f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4058,7 +4058,7 @@ }, "libspatialite": { "baseline": "5.0.1", - "port-version": 4 + "port-version": 5 }, "libspnav": { "baseline": "0.2.3", diff --git a/versions/l-/libspatialite.json b/versions/l-/libspatialite.json index a122398270ea2a..1a7787f3d4858b 100644 --- a/versions/l-/libspatialite.json +++ b/versions/l-/libspatialite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "27ff74dc3c1f0d6c5e11dbcc110f34e46dae862a", + "version": "5.0.1", + "port-version": 5 + }, { "git-tree": "4d7f5aa6151c1285c1b6cd5b6c03ee34db4c0c98", "version": "5.0.1", From b9e42cd228a288480f7d1eb84f572d0685659a38 Mon Sep 17 00:00:00 2001 From: "Giovanni A. Zuliani" <74901950+gvnnz@users.noreply.github.com> Date: Mon, 13 Jun 2022 16:30:52 -0700 Subject: [PATCH 08/56] [rtmidi] Add new 'alsa' feature (#25156) --- ports/rtmidi/portfile.cmake | 7 ++++++- ports/rtmidi/vcpkg.json | 13 +++++++++++-- versions/baseline.json | 2 +- versions/r-/rtmidi.json | 5 +++++ 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/ports/rtmidi/portfile.cmake b/ports/rtmidi/portfile.cmake index d14dec4ea6b3f3..404a49ebc3f103 100644 --- a/ports/rtmidi/portfile.cmake +++ b/ports/rtmidi/portfile.cmake @@ -11,12 +11,17 @@ vcpkg_from_github( PATCHES fix-cmake-usage.patch # Remove this patch in the next update ) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + alsa RTMIDI_API_ALSA +) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DRTMIDI_API_ALSA=OFF -DRTMIDI_API_JACK=OFF -DRTMIDI_BUILD_TESTING=OFF + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() diff --git a/ports/rtmidi/vcpkg.json b/ports/rtmidi/vcpkg.json index bb43d6611a841c..91979a2d5394f1 100644 --- a/ports/rtmidi/vcpkg.json +++ b/ports/rtmidi/vcpkg.json @@ -1,7 +1,7 @@ { "name": "rtmidi", "version": "5.0.0", - "port-version": 1, + "port-version": 2, "description": "A set of C++ classes that provide a common API for realtime MIDI input/output across Linux (ALSA & JACK), Macintosh OS X (CoreMidi & JACK) and Windows (Multimedia)", "homepage": "https://github.com/thestk/rtmidi", "license": "MIT", @@ -15,5 +15,14 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "alsa": { + "description": "Build ALSA API", + "supports": "linux", + "dependencies": [ + "alsa" + ] + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index 023e54c2caa80f..fa97cfcb09fde3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6318,7 +6318,7 @@ }, "rtmidi": { "baseline": "5.0.0", - "port-version": 1 + "port-version": 2 }, "rttr": { "baseline": "0.9.6", diff --git a/versions/r-/rtmidi.json b/versions/r-/rtmidi.json index 667c5a16432698..ec95ea91a161b0 100644 --- a/versions/r-/rtmidi.json +++ b/versions/r-/rtmidi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "70873823ce910dcf80078a94f12191371523d84c", + "version": "5.0.0", + "port-version": 2 + }, { "git-tree": "30614a92baff91c2d2790029179dbb37122ca331", "version": "5.0.0", From b88cd52af58f912242d539173541cab651e38e97 Mon Sep 17 00:00:00 2001 From: Alexandre Bique Date: Tue, 14 Jun 2022 01:41:09 +0200 Subject: [PATCH 09/56] [pipewire] new port, version 0.3.52 (#25160) This patch only add support to build the client libraries. --- ports/pipewire/portfile.cmake | 83 +++++++++++++++++++++++++++++++++++ ports/pipewire/vcpkg.json | 14 ++++++ versions/baseline.json | 4 ++ versions/p-/pipewire.json | 9 ++++ 4 files changed, 110 insertions(+) create mode 100644 ports/pipewire/portfile.cmake create mode 100644 ports/pipewire/vcpkg.json create mode 100644 versions/p-/pipewire.json diff --git a/ports/pipewire/portfile.cmake b/ports/pipewire/portfile.cmake new file mode 100644 index 00000000000000..11214f58372392 --- /dev/null +++ b/ports/pipewire/portfile.cmake @@ -0,0 +1,83 @@ +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/ + OUT_SOURCE_PATH SOURCE_PATH + REPO pipewire/pipewire + REF 0.3.52 + SHA512 30e9cf74c92babafe386f02a03bb5c41a8ee5591a02f15845cca1ee44f091ce68eb14d48943d43b680cb525026a19e0290997670f9a82156eaa72e974fe6d01a + HEAD_REF master # branch name +) + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dalsa=disabled + -Daudioconvert=disabled + -Daudiomixer=disabled + -Daudiotestsrc=disabled + -Davahi=disabled + -Dbluez5-backend-hfp-native=disabled + -Dbluez5-backend-hsp-native=disabled + -Dbluez5-backend-hsphfpd=disabled + -Dbluez5-backend-ofono=disabled + -Dbluez5-codec-aac=disabled + -Dbluez5-codec-aptx=disabled + -Dbluez5-codec-lc3plus=disabled + -Dbluez5-codec-ldac=disabled + -Dbluez5=disabled + -Dcontrol=disabled + -Ddbus=disabled + -Ddocs=disabled + -Decho-cancel-webrtc=disabled + -Devl=disabled + -Dexamples=disabled + -Dffmpeg=disabled + -Dgstreamer-device-provider=disabled + -Dgstreamer=disabled + -Dinstalled_tests=disabled + -Djack-devel=false + -Djack=disabled + -Dlegacy-rtkit=false + -Dlibcamera=disabled + -Dlibcanberra=disabled + -Dlibpulse=disabled + -Dlibusb=disabled + -Dlv2=disabled + -Dman=disabled + -Dpipewire-alsa=disabled + -Dpipewire-jack=disabled + -Dpipewire-v4l2=disabled + -Dpw-cat=disabled + -Draop=disabled + -Droc=disabled + -Dsdl2=disabled + -Dsndfile=disabled + -Dspa-plugins=enabled # This one must be enabled or the resulting build won't be able to connect to pipewire daemon + -Dsupport=enabled # This one must be enabled or the resulting build won't be able to connect to pipewire daemon + -Dsystemd-system-service=disabled + -Dsystemd-system-unit-dir=disabled + -Dsystemd-user-service=disabled + -Dsystemd-user-unit-dir=disabled + -Dsystemd=disabled + -Dtest=disabled + -Dtests=disabled + -Dudev=disabled + -Dudevrulesdir=disabled + -Dv4l2=disabled + -Dvideoconvert=disabled + -Dvideotestsrc=disabled + -Dvolume=disabled + -Dvulkan=disabled + -Dx11-xfixes=disabled + -Dx11=disabled + -Dsession-managers=[] +) +vcpkg_install_meson() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() diff --git a/ports/pipewire/vcpkg.json b/ports/pipewire/vcpkg.json new file mode 100644 index 00000000000000..a45c9c806aea0a --- /dev/null +++ b/ports/pipewire/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "pipewire", + "version": "0.3.52", + "description": "Low-latency audio/video router and processor. This port only builds the client library, not the server.", + "homepage": "https://pipewire.org", + "license": "MIT", + "supports": "linux", + "dependencies": [ + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index fa97cfcb09fde3..075946affd085b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5452,6 +5452,10 @@ "baseline": "2019-07-11", "port-version": 2 }, + "pipewire": { + "baseline": "0.3.52", + "port-version": 0 + }, "pistache": { "baseline": "2021-03-31", "port-version": 3 diff --git a/versions/p-/pipewire.json b/versions/p-/pipewire.json new file mode 100644 index 00000000000000..08c3f08d2889bc --- /dev/null +++ b/versions/p-/pipewire.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4ec746fd8458f073339bf953335742b2abb0ac53", + "version": "0.3.52", + "port-version": 0 + } + ] +} From ac7992c0979d12985f66bae92e801943dcfa9d9d Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Mon, 13 Jun 2022 19:42:08 -0400 Subject: [PATCH 10/56] [physx] Add support for Mac on ARM. (#25154) * [physx] Add support for Mac on ARM. Co-authored-by: Darryl Pogue Co-authored-by: Niklas Gray * add-x-version * [physx] Download patches, simplify werror patch Co-authored-by: Darryl Pogue Co-authored-by: Niklas Gray Co-authored-by: Robert Schumacher --- ports/physx/portfile.cmake | 16 +++++++ ports/physx/remove-werror.patch | 78 ++++++++++++++------------------- ports/physx/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/physx.json | 5 +++ 5 files changed, 55 insertions(+), 48 deletions(-) diff --git a/ports/physx/portfile.cmake b/ports/physx/portfile.cmake index 2d963f7913e7fd..090f744194c364 100644 --- a/ports/physx/portfile.cmake +++ b/ports/physx/portfile.cmake @@ -1,3 +1,17 @@ +vcpkg_download_distfile( + patch1 + URLS "https://github.com/NVIDIAGameWorks/PhysX/commit/ada4fccf04e5a5832af1353d6d1f91de691aa47d.patch" + FILENAME "physx-PR569-ada4fccf.patch" + SHA512 ec2fc2fce0b5aab4d42b77f21373bf067f129543e672516477513419241c56b99f2d663b992cb29d296933440e7e7cc31a57198f6fcc78d6eac26b7706c1e937 +) + +vcpkg_download_distfile( + patch2 + URLS "https://github.com/NVIDIAGameWorks/PhysX/commit/d590c88e3cbf0fb682726abf7d7c16417855084f.patch" + FILENAME "physx-PR569-d590c88e.patch" + SHA512 4eb7630db1cb10b2372220c3706dfe255075f466c6b2b12654c9fbc3b17c4df69d7b91e6f0d798c92a4cb8806e1c34b66bb52b46d9358d643ca62ec0de321fd2 +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO NVIDIAGameWorks/PhysX @@ -6,6 +20,8 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-compiler-flag.patch + "${patch1}" + "${patch2}" remove-werror.patch ) diff --git a/ports/physx/remove-werror.patch b/ports/physx/remove-werror.patch index 94f802e0f21a67..86f3a1d713802e 100644 --- a/ports/physx/remove-werror.patch +++ b/ports/physx/remove-werror.patch @@ -1,66 +1,52 @@ diff --git a/physx/source/compiler/cmake/android/CMakeLists.txt b/physx/source/compiler/cmake/android/CMakeLists.txt -index 06e0d98b..e6a77f17 100644 +index 06e0d98..2e5454d 100644 --- a/physx/source/compiler/cmake/android/CMakeLists.txt +++ b/physx/source/compiler/cmake/android/CMakeLists.txt -@@ -33,15 +33,15 @@ STRING(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWERCASE) - SET(PHYSX_WARNING_DISABLES "-Wno-invalid-offsetof -Wno-maybe-uninitialized -Wno-unused-variable -Wno-variadic-macros -Wno-array-bounds -Wno-strict-aliasing") +@@ -52,6 +52,8 @@ SET(PHYSX_CXX_FLAGS_RELEASE "-O3 -g" CACHE INTERNAL "PhysX Release CXX Flags") - IF(${ANDROID_ABI} STREQUAL "armeabi-v7a") -- SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra -Wpedantic -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections -funwind-tables -fomit-frame-pointer -funswitch-loops -finline-limit=300 -fno-strict-aliasing -fstack-protector ${PHYSX_WARNING_DISABLES}" CACHE INTERNAL "PhysX CXX") -+ SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections -funwind-tables -fomit-frame-pointer -funswitch-loops -finline-limit=300 -fno-strict-aliasing -fstack-protector ${PHYSX_WARNING_DISABLES}" CACHE INTERNAL "PhysX CXX") - ELSEIF(${ANDROID_ABI} STREQUAL "armeabi-v7a with NEON") -- SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra -Wpedantic -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -funwind-tables -fomit-frame-pointer -funswitch-loops -finline-limit=300 -fno-strict-aliasing -fstack-protector ${PHYSX_WARNING_DISABLES}" CACHE INTERNAL "PhysX CXX") -+ SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -funwind-tables -fomit-frame-pointer -funswitch-loops -finline-limit=300 -fno-strict-aliasing -fstack-protector ${PHYSX_WARNING_DISABLES}" CACHE INTERNAL "PhysX CXX") - ELSEIF(${ANDROID_ABI} STREQUAL "arm64-v8a") -- SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra -Wpedantic -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections ${PHYSX_WARNING_DISABLES} " CACHE INTERNAL "PhysX CXX") -+ SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections ${PHYSX_WARNING_DISABLES} " CACHE INTERNAL "PhysX CXX") - ELSEIF(${ANDROID_ABI} STREQUAL "x86") -- SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra -Wpedantic -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections ${PHYSX_WARNING_DISABLES} -fpack-struct=8 -malign-double " CACHE INTERNAL "PhysX CXX") -+ SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections ${PHYSX_WARNING_DISABLES} -fpack-struct=8 -malign-double " CACHE INTERNAL "PhysX CXX") - ELSEIF(${ANDROID_ABI} STREQUAL "x86_64") -- SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra -Wpedantic -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections ${PHYSX_WARNING_DISABLES} -mstackrealign -msse3 " CACHE INTERNAL "PhysX CXX") -+ SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections ${PHYSX_WARNING_DISABLES} -mstackrealign -msse3 " CACHE INTERNAL "PhysX CXX") - ENDIF() - # Build debug info for all configurations + # These flags are local to the directory the CMakeLists.txt is in ++string(REPLACE " -Werror " " " PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}") ++set(PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}" CACHE INTERNAL "PhysX CXX") + SET(CMAKE_CXX_FLAGS ${PHYSX_CXX_FLAGS}) + + SET(CMAKE_CXX_FLAGS_DEBUG ${PHYSX_CXX_FLAGS_DEBUG}) diff --git a/physx/source/compiler/cmake/ios/CMakeLists.txt b/physx/source/compiler/cmake/ios/CMakeLists.txt -index 5605e9af..3d2fe6f0 100644 +index 5605e9a..b40500b 100644 --- a/physx/source/compiler/cmake/ios/CMakeLists.txt +++ b/physx/source/compiler/cmake/ios/CMakeLists.txt -@@ -26,7 +26,7 @@ - ## Copyright (c) 2008-2021 NVIDIA Corporation. All rights reserved. - +@@ -39,6 +39,8 @@ SET(PHYSX_CXX_FLAGS_PROFILE "-O3 -g" CACHE INTERNAL "PhysX Profile CXX Flags") + SET(PHYSX_CXX_FLAGS_RELEASE "-O3 -g" CACHE INTERNAL "PhysX Release CXX Flags") --SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections -ferror-limit=0 -Wall -Wextra -Werror -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-unknown-warning-option -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-undefined-reinterpret-cast -Wno-invalid-offsetof -Wno-zero-as-null-pointer-constant -Wno-atomic-implicit-seq-cst -gdwarf-2" CACHE INTERNAL "PhysX CXX") -+SET(PHYSX_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections -ferror-limit=0 -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-unknown-warning-option -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-undefined-reinterpret-cast -Wno-invalid-offsetof -Wno-zero-as-null-pointer-constant -Wno-atomic-implicit-seq-cst -gdwarf-2" CACHE INTERNAL "PhysX CXX") + # These flags are local to the directory the CMakeLists.txt is in ++string(REPLACE " -Werror " " " PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}") ++set(PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}" CACHE INTERNAL "PhysX CXX") + SET(CMAKE_CXX_FLAGS ${PHYSX_CXX_FLAGS}) - SET(CMAKE_SHARED_LINKER_FLAGS_CHECKED "") - SET(CMAKE_SHARED_LINKER_FLAGS_PROFILE "") + SET(CMAKE_CXX_FLAGS_DEBUG ${PHYSX_CXX_FLAGS_DEBUG}) diff --git a/physx/source/compiler/cmake/linux/CMakeLists.txt b/physx/source/compiler/cmake/linux/CMakeLists.txt -index aba53365..6246e488 100644 +index aba5336..fd5f813 100644 --- a/physx/source/compiler/cmake/linux/CMakeLists.txt +++ b/physx/source/compiler/cmake/linux/CMakeLists.txt -@@ -28,8 +28,8 @@ - STRING(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWERCASE) +@@ -45,6 +45,8 @@ SET(PHYSX_CXX_FLAGS_PROFILE "-O3" CACHE INTERNAL "PhysX Profile CXX Flags") + SET(PHYSX_CXX_FLAGS_RELEASE "-O3" CACHE INTERNAL "PhysX Release CXX Flags") - #TODO: Fix warnings --SET(CLANG_WARNINGS "-ferror-limit=0 -Wall -Wextra -Werror -Wno-alloca -Wno-anon-enum-enum-conversion -Wstrict-aliasing=2 -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-gnu-anonymous-struct -Wno-undef -Wno-unused-function -Wno-nested-anon-types -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-format-nonliteral -Wno-implicit-fallthrough -Wno-undefined-reinterpret-cast -Wno-disabled-macro-expansion -Wno-zero-as-null-pointer-constant -Wno-shadow -Wno-unknown-warning-option -Wno-atomic-implicit-seq-cst -Wno-extra-semi-stmt") --SET(GCC_WARNINGS "-Wall -Werror -Wno-invalid-offsetof -Wno-uninitialized") -+SET(CLANG_WARNINGS "-ferror-limit=0 -Wall -Wextra -Wno-alloca -Wno-anon-enum-enum-conversion -Wstrict-aliasing=2 -Weverything -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-gnu-anonymous-struct -Wno-undef -Wno-unused-function -Wno-nested-anon-types -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-format-nonliteral -Wno-implicit-fallthrough -Wno-undefined-reinterpret-cast -Wno-disabled-macro-expansion -Wno-zero-as-null-pointer-constant -Wno-shadow -Wno-unknown-warning-option -Wno-atomic-implicit-seq-cst -Wno-extra-semi-stmt") -+SET(GCC_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-uninitialized") + # These flags are local to the directory the CMakeLists.txt is in, so don't get carried over to OTHER CMakeLists.txt (thus the CACHE variables above) ++string(REPLACE " -Werror " " " PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}") ++set(PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}" CACHE INTERNAL "PhysX CXX") + SET(CMAKE_CXX_FLAGS ${PHYSX_CXX_FLAGS}) - IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - # using Clang + SET(CMAKE_CXX_FLAGS_DEBUG ${PHYSX_CXX_FLAGS_DEBUG}) diff --git a/physx/source/compiler/cmake/mac/CMakeLists.txt b/physx/source/compiler/cmake/mac/CMakeLists.txt -index 36799700..97cb4c7f 100644 +index bfd1357..cffb090 100644 --- a/physx/source/compiler/cmake/mac/CMakeLists.txt +++ b/physx/source/compiler/cmake/mac/CMakeLists.txt -@@ -28,7 +28,7 @@ - SET(OSX_BITNESS "-arch x86_64") - SET(CMAKE_OSX_ARCHITECTURES "x86_64") +@@ -49,6 +49,8 @@ SET(PHYSX_CXX_FLAGS_PROFILE "-O3 -g" CACHE INTERNAL "PhysX Profile CXX Flags") + SET(PHYSX_CXX_FLAGS_RELEASE "-O3 -g" CACHE INTERNAL "PhysX Release CXX Flags") --SET(PHYSX_CXX_FLAGS "${OSX_BITNESS} -msse2 -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections -Werror -ferror-limit=0 -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-unknown-warning-option -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-undefined-reinterpret-cast -Wno-invalid-offsetof -Wno-zero-as-null-pointer-constant -Wno-atomic-implicit-seq-cst -gdwarf-2" CACHE INTERNAL "PhysX CXX") -+SET(PHYSX_CXX_FLAGS "${OSX_BITNESS} -msse2 -std=c++11 -fno-rtti -fno-exceptions -ffunction-sections -fdata-sections -ferror-limit=0 -Wall -Wextra -fstrict-aliasing -Wstrict-aliasing=2 -Weverything -Wno-unknown-warning-option -Wno-documentation-deprecated-sync -Wno-documentation-unknown-command -Wno-float-equal -Wno-padded -Wno-weak-vtables -Wno-cast-align -Wno-conversion -Wno-missing-noreturn -Wno-missing-variable-declarations -Wno-shift-sign-overflow -Wno-covered-switch-default -Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes -Wno-unreachable-code -Wno-unused-macros -Wno-unused-member-function -Wno-used-but-marked-unused -Wno-weak-template-vtables -Wno-deprecated -Wno-non-virtual-dtor -Wno-invalid-noreturn -Wno-return-type-c-linkage -Wno-reserved-id-macro -Wno-c++98-compat-pedantic -Wno-unused-local-typedef -Wno-old-style-cast -Wno-newline-eof -Wno-unused-private-field -Wno-undefined-reinterpret-cast -Wno-invalid-offsetof -Wno-zero-as-null-pointer-constant -Wno-atomic-implicit-seq-cst -gdwarf-2" CACHE INTERNAL "PhysX CXX") + # These flags are local to the directory the CMakeLists.txt is in ++string(REPLACE " -Werror " " " PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}") ++set(PHYSX_CXX_FLAGS "${PHYSX_CXX_FLAGS}" CACHE INTERNAL "PhysX CXX") + SET(CMAKE_CXX_FLAGS ${PHYSX_CXX_FLAGS}) - SET(CMAKE_SHARED_LINKER_FLAGS_CHECKED "") - SET(CMAKE_SHARED_LINKER_FLAGS_PROFILE "") + SET(CMAKE_CXX_FLAGS_DEBUG ${PHYSX_CXX_FLAGS_DEBUG}) diff --git a/ports/physx/vcpkg.json b/ports/physx/vcpkg.json index 4d7cfa741c3a55..1a3adee240ad8e 100644 --- a/ports/physx/vcpkg.json +++ b/ports/physx/vcpkg.json @@ -1,7 +1,7 @@ { "name": "physx", "version": "4.1.2", - "port-version": 3, + "port-version": 4, "description": "The NVIDIA PhysX SDK is a scalable multi-platform physics solution supporting a wide range of devices, from smartphones to high-end multicore CPUs and GPUs", "homepage": "https://github.com/NVIDIAGameWorks/PhysX", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 075946affd085b..feda478736cf59 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5438,7 +5438,7 @@ }, "physx": { "baseline": "4.1.2", - "port-version": 3 + "port-version": 4 }, "picojson": { "baseline": "1.3.0", diff --git a/versions/p-/physx.json b/versions/p-/physx.json index 89e0155e0af75a..b780cd523660b3 100644 --- a/versions/p-/physx.json +++ b/versions/p-/physx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ebfd4955bdff06becb259bc91575143bc9866dcc", + "version": "4.1.2", + "port-version": 4 + }, { "git-tree": "304769b6a45107c9a8abf12fad9b9d82bac22c3b", "version": "4.1.2", From b03f150241107bbe9b643c47eeaf6d1bb13e5e5c Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 13 Jun 2022 17:05:39 -0700 Subject: [PATCH 11/56] Add entry for Python with venv support. (#25215) --- scripts/vcpkgTools.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index aa30aa15662482..5c21091aeb64b1 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -7,6 +7,13 @@ d647d7141d1b13c899671b882e686a1b1cc6f759e5b7428ec858cdffd9ef019c78fb0b989174b98f30cb696297bfeff3d171f7eaabb339f5154886c030b8e4d9 python-3.10.2-embed-win32.zip + + 3.10.2 + tools\python.exe + https://www.nuget.org/api/v2/package/python/3.10.2 + eb94c254e669eb22aad276c6cc6eec7ae6c19dacfa7d29b0b980953717f4c73a52e0f37807dfe925ecefd1b04b1f78bf0095b03e578a4b6405e52c640e4ab4c5 + python-3.10.2.nupkg.zip + 3.22.2 cmake-3.22.2-windows-i386\bin\cmake.exe From bcf339274eb3fe47b092e898aea7e33307943318 Mon Sep 17 00:00:00 2001 From: Simone Dal Poz Date: Tue, 14 Jun 2022 04:07:14 +0200 Subject: [PATCH 12/56] [mqtt-cpp] Update to 13.0.0 (#25162) * update mqtt-cpp to version 13.0.0, adjust interface installation * fix versions * triadias' comments * fix versions * Update ports/mqtt-cpp/portfile.cmake Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> * Update ports/mqtt-cpp/portfile.cmake Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> * Update ports/mqtt-cpp/portfile.cmake Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> --- ports/mqtt-cpp/portfile.cmake | 22 +++++++++++++--------- ports/mqtt-cpp/vcpkg.json | 5 +++-- versions/baseline.json | 2 +- versions/m-/mqtt-cpp.json | 5 +++++ 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/ports/mqtt-cpp/portfile.cmake b/ports/mqtt-cpp/portfile.cmake index a41fc5c7cd34b7..1fb0d6361388d2 100644 --- a/ports/mqtt-cpp/portfile.cmake +++ b/ports/mqtt-cpp/portfile.cmake @@ -1,23 +1,27 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO redboltz/mqtt_cpp - REF v12.0.0 - SHA512 60f2497633373a316724b7c8f87c090eb2bb26202bf48a55c32a13888bf3ec5e9bdc8854056735f625af5b016bcd9bca179d980077fb8752e16710992a0ea0c5 + REF v13.0.0 + SHA512 +2f0c85ac813cc6c99cc5b1ca02514ee6643abc39750bce541a362d1fcd281b8b9011cc39ddeaf4394fd3772904eed15e8ecbe6b3839caad13cae2b04201e682b HEAD_REF master -) + ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DMQTT_BUILD_EXAMPLES=OFF - -DMQTT_BUILD_TESTS=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON -) + -DMQTT_BUILD_EXAMPLES=OFF + -DMQTT_BUILD_TESTS=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON + ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/mqtt_cpp_iface) +vcpkg_cmake_config_fixup(PACKAGE_NAME mqtt_cpp_iface CONFIG_PATH lib/cmake/mqtt_cpp_iface) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") -file(INSTALL "${SOURCE_PATH}/LICENSE_1_0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file( + INSTALL "${SOURCE_PATH}/LICENSE_1_0.txt" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright) diff --git a/ports/mqtt-cpp/vcpkg.json b/ports/mqtt-cpp/vcpkg.json index 2f20851fbf5a3d..791485f17b4468 100644 --- a/ports/mqtt-cpp/vcpkg.json +++ b/ports/mqtt-cpp/vcpkg.json @@ -1,13 +1,14 @@ { "name": "mqtt-cpp", - "version-semver": "12.0.0", + "version-semver": "13.0.0", "description": "Header-only MQTT client/server for C++14 based on Boost.Asio.", "homepage": "https://github.com/redboltz/mqtt_cpp", + "license": "BSL-1.0", "dependencies": [ "boost-any", "boost-asio", - "boost-log", "boost-multi-index", + "boost-program-options", "boost-type-erasure", { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index feda478736cf59..21a629c44baab3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4693,7 +4693,7 @@ "port-version": 0 }, "mqtt-cpp": { - "baseline": "12.0.0", + "baseline": "13.0.0", "port-version": 0 }, "ms-angle": { diff --git a/versions/m-/mqtt-cpp.json b/versions/m-/mqtt-cpp.json index 482ba03f61862e..d4a7ddf8a5d7e2 100644 --- a/versions/m-/mqtt-cpp.json +++ b/versions/m-/mqtt-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "185adb92fcfed90301dfc5aec8390b687cd35403", + "version-semver": "13.0.0", + "port-version": 0 + }, { "git-tree": "869a51ca4a2e5b126e9de0af838a24fb9e7c3ab1", "version-semver": "12.0.0", From 6dfade46cbd9c57836f9b3a6d53297e31ba3fdef Mon Sep 17 00:00:00 2001 From: Sergey Podobry Date: Tue, 14 Jun 2022 05:08:18 +0300 Subject: [PATCH 13/56] [plog] Update to 1.1.8 (#25166) * [plog] Update to 1.1.8 * Update ports/plog/usage Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> * Update plog.json version hash Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> --- ports/plog/portfile.cmake | 37 ++++++++++++++++++++----------------- ports/plog/usage | 6 ++++-- ports/plog/vcpkg.json | 14 ++++++++++++-- versions/baseline.json | 2 +- versions/p-/plog.json | 5 +++++ 5 files changed, 42 insertions(+), 22 deletions(-) diff --git a/ports/plog/portfile.cmake b/ports/plog/portfile.cmake index 6007c168578848..b06b55b711906c 100644 --- a/ports/plog/portfile.cmake +++ b/ports/plog/portfile.cmake @@ -1,17 +1,20 @@ -# Header-only library -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO SergiusTheBest/plog - REF 1.1.6 - SHA512 5240532df96144d5026d6f879b69f7d6f393ebc9122c6458c41076fd3db998565e45ed2ab4948f8c3cb59e08c0aad7695ee416f95b49fd70209cd937220cdf8b - HEAD_REF master -) - -# Copy header files -file(INSTALL "${SOURCE_PATH}/include" DESTINATION "${CURRENT_PACKAGES_DIR}" FILES_MATCHING PATTERN "*.h") - -# Copy usage file -file(COPY "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") - -# Put the licence file where vcpkg expects it -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +# Header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO SergiusTheBest/plog + REF 1.1.8 + SHA512 09bf6e0cae7f20c1b42e68a174b4cd6a2fb8751db9758efb87449cbff48375708e43c147c72b7ed17fb9334acaf7802441f61578356284a8ed337fd886a45e79 + HEAD_REF master +) + +vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH} OPTIONS -DPLOG_BUILD_SAMPLES=OFF) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) + +# Copy usage file +file(COPY "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +# Put the licence file where vcpkg expects it +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/plog/usage b/ports/plog/usage index 6c232afda6bbe7..bfba94d5e26ec5 100644 --- a/ports/plog/usage +++ b/ports/plog/usage @@ -1,4 +1,6 @@ The package plog is header only and can be used from CMake via: - find_path(PLOG_INCLUDE_DIRS "plog/Log.h") - target_include_directories(main PRIVATE ${PLOG_INCLUDE_DIRS}) +Modern CMake: + find_package(plog CONFIG REQUIRED) + target_link_libraries(main PRIVATE plog::plog) + diff --git a/ports/plog/vcpkg.json b/ports/plog/vcpkg.json index 4e1d89420835d9..7f044436081fd1 100644 --- a/ports/plog/vcpkg.json +++ b/ports/plog/vcpkg.json @@ -1,7 +1,17 @@ { "name": "plog", - "version": "1.1.6", + "version": "1.1.8", "description": "Portable, simple and extensible C++ logging library.", "homepage": "https://github.com/SergiusTheBest/plog", - "license": "MPL-2.0" + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 21a629c44baab3..c315072c5e6ed3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5505,7 +5505,7 @@ "port-version": 6 }, "plog": { - "baseline": "1.1.6", + "baseline": "1.1.8", "port-version": 0 }, "plplot": { diff --git a/versions/p-/plog.json b/versions/p-/plog.json index af0042a7a3651f..fae370de9c22c0 100644 --- a/versions/p-/plog.json +++ b/versions/p-/plog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b16507d8b9cbf419b2923d55de7ddfdf013f0267", + "version": "1.1.8", + "port-version": 0 + }, { "git-tree": "aaca8cb03c90bca09c7bf83b393521dce2719686", "version": "1.1.6", From 72fa4d4630c0971eadea7d0a70045351ab13be9d Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 14 Jun 2022 00:54:29 -0700 Subject: [PATCH 14/56] Update vcpkg-unstable internal pipeline to MSVC-CI-PHASE5-YAML (#25219) --- scripts/azure-pipelines/windows-unstable/job.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-pipelines/windows-unstable/job.yml b/scripts/azure-pipelines/windows-unstable/job.yml index 325da69e1fd269..a4b09cd6e55ef0 100644 --- a/scripts/azure-pipelines/windows-unstable/job.yml +++ b/scripts/azure-pipelines/windows-unstable/job.yml @@ -24,7 +24,7 @@ jobs: inputs: buildType: specific project: '0bdbc590-a062-4c3f-b0f6-9383f67865ee' - pipeline: 8136 + pipeline: 16549 buildVersionToDownload: latestFromBranch branchName: 'refs/heads/$(MSVCBranchName)' artifactName: BuildNumber From 80bcf1e5beb45ceb744018cd13ba5f7a929ee032 Mon Sep 17 00:00:00 2001 From: jiayuehua <3423893+jiayuehua@users.noreply.github.com> Date: Tue, 14 Jun 2022 16:31:56 +0800 Subject: [PATCH 15/56] fix cmake module path --- ports/glog/fix_crosscompile_symbolize.patch | 2 +- ports/glog/fix_glog_CMAKE_MODULE_PATH.patch | 43 +++++++++++++++++++-- ports/glog/glog_disable_debug_postfix.patch | 2 +- versions/g-/glog.json | 2 +- 4 files changed, 43 insertions(+), 6 deletions(-) diff --git a/ports/glog/fix_crosscompile_symbolize.patch b/ports/glog/fix_crosscompile_symbolize.patch index 6bfa33d82e7d07..7b01516a452f22 100644 --- a/ports/glog/fix_crosscompile_symbolize.patch +++ b/ports/glog/fix_crosscompile_symbolize.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 16fef38..4f94251 100644 +index 8f06a78..6af3624 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -450,6 +450,9 @@ endif (HAVE_CXX11_ATOMIC) diff --git a/ports/glog/fix_glog_CMAKE_MODULE_PATH.patch b/ports/glog/fix_glog_CMAKE_MODULE_PATH.patch index 903b7eaa389646..4970817609426d 100644 --- a/ports/glog/fix_glog_CMAKE_MODULE_PATH.patch +++ b/ports/glog/fix_glog_CMAKE_MODULE_PATH.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 846b444..1fdeac6 100644 +index 846b444..02ae75b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1028,41 +1028,6 @@ write_basic_package_version_file ( +@@ -1028,42 +1028,6 @@ write_basic_package_version_file ( export (TARGETS glog NAMESPACE glog:: FILE glog-targets.cmake) export (PACKAGE glog) @@ -41,6 +41,43 @@ index 846b444..1fdeac6 100644 -" - COMPONENT Development -) - +- install (FILES ${CMAKE_CURRENT_BINARY_DIR}/glog-config.cmake + ${CMAKE_CURRENT_BINARY_DIR}/glog-config-version.cmake +diff --git a/glog-config.cmake.in b/glog-config.cmake.in +index 5c5c9c0..31fac52 100644 +--- a/glog-config.cmake.in ++++ b/glog-config.cmake.in +@@ -5,7 +5,6 @@ endif (CMAKE_VERSION VERSION_LESS @glog_CMake_VERSION@) + @PACKAGE_INIT@ + + include (CMakeFindDependencyMacro) +-include (${CMAKE_CURRENT_LIST_DIR}/glog-modules.cmake) + + @gflags_DEPENDENCY@ + @Unwind_DEPENDENCY@ +diff --git a/glog-modules.cmake.in b/glog-modules.cmake.in +deleted file mode 100644 +index 71c5160..0000000 +--- a/glog-modules.cmake.in ++++ /dev/null +@@ -1,18 +0,0 @@ +-cmake_policy (PUSH) +-cmake_policy (SET CMP0057 NEW) +- +-if (CMAKE_VERSION VERSION_LESS 3.3) +- message (FATAL_ERROR "glog-modules.cmake requires the consumer " +- "to use CMake 3.3 (or newer)") +-endif (CMAKE_VERSION VERSION_LESS 3.3) +- +-set (glog_MODULE_PATH "@glog_FULL_CMake_DATADIR@") +-list (APPEND CMAKE_MODULE_PATH ${glog_MODULE_PATH}) +- +-if (NOT glog_MODULE_PATH IN_LIST CMAKE_MODULE_PATH) +- message (FATAL_ERROR "Cannot add '${glog_MODULE_PATH}' to " +- "CMAKE_MODULE_PATH. This will cause glog-config.cmake to fail at " +- "locating required find modules. Make sure CMAKE_MODULE_PATH is not a cache variable.") +-endif (NOT glog_MODULE_PATH IN_LIST CMAKE_MODULE_PATH) +- +-cmake_policy (POP) diff --git a/ports/glog/glog_disable_debug_postfix.patch b/ports/glog/glog_disable_debug_postfix.patch index 45cbce9789c00a..0ee3a9e2f17099 100644 --- a/ports/glog/glog_disable_debug_postfix.patch +++ b/ports/glog/glog_disable_debug_postfix.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1fdeac6..16fef38 100644 +index 02ae75b..8f06a78 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,7 +65,7 @@ set (CMAKE_CXX_VISIBILITY_PRESET hidden) diff --git a/versions/g-/glog.json b/versions/g-/glog.json index 87ffe208a15c34..7eaf236fe88e9f 100644 --- a/versions/g-/glog.json +++ b/versions/g-/glog.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "dbef6aa7b5d1aef41005d9a57388861302e1d83f", + "git-tree": "9362e4e4352c2ab314426151613a371b673efd7d", "version": "0.6.0", "port-version": 0 }, From 52186bcf8077912cea6ba7eaa4faa18387401df7 Mon Sep 17 00:00:00 2001 From: Luke Shore Date: Tue, 14 Jun 2022 17:07:45 +0100 Subject: [PATCH 16/56] [llvm] updated to 14.0.4 + add spirv backend support (#25142) * [llvm] updated to 14.0.4 + add spirv backend support * [llvm] fix "Thomas1664 - Please add a final newline here." * Fix version database. * [llvm] fix Neumann-A corrections * [llvm] run vcpkg x-add-version llvm * [llvm] mistake fixes * [llvm] removed not need platform type * [llvm] run .\vcpkg.exe x-add-version --all * [llvm] removed unstable script * [llvm] run ./vcpkg x-add-version --all Co-authored-by: Billy Robert O'Neal --- ports/llvm/portfile.cmake | 25 +++++++++++++++++++++---- ports/llvm/vcpkg.json | 14 ++++++++++++-- versions/baseline.json | 4 ++-- versions/l-/llvm.json | 5 +++++ 4 files changed, 40 insertions(+), 8 deletions(-) diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake index b04d7e44c6cd79..d8162fa636c1ba 100644 --- a/ports/llvm/portfile.cmake +++ b/ports/llvm/portfile.cmake @@ -1,4 +1,4 @@ -set(LLVM_VERSION "14.0.3") +set(LLVM_VERSION "14.0.4") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,8 +6,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO llvm/llvm-project REF llvmorg-${LLVM_VERSION} - SHA512 511e93fd9b1c414c38fe9e2649679ac0b16cb04f7f7838569d187b04c542a185e364d6db73e96465026e3b2533649eb75ac95507d12514af32b28bdfb66f2646 - HEAD_REF master + SHA512 e14e6c3a1915a96e9ddc609f16ca3a398ca6f7fd0a691dadaa24490078a661340e845cb2d18f3679de4f47300bb822c33ae69548af6a0370d55737831a28b959 + HEAD_REF main PATCHES 0002-fix-install-paths.patch # This patch fixes paths in ClangConfig.cmake, LLVMConfig.cmake, LLDConfig.cmake etc. 0004-fix-dr-1734.patch @@ -180,6 +180,7 @@ if("libunwind" IN_LIST FEATURES) list(APPEND LLVM_ENABLE_RUNTIMES "libunwind") endif() +# this is for normal targets set(known_llvm_targets AArch64 AMDGPU @@ -209,10 +210,25 @@ foreach(llvm_target IN LISTS known_llvm_targets) endif() endforeach() +# this is for experimental targets +set(known_llvm_experimental_targets + SPRIV +) + +set(LLVM_EXPERIMENTAL_TARGETS_TO_BUILD "") +foreach(llvm_target IN LISTS known_llvm_experimental_targets) + string(TOLOWER "target-${llvm_target}" feature_name) + if(feature_name IN_LIST FEATURES) + list(APPEND LLVM_EXPERIMENTAL_TARGETS_TO_BUILD "${llvm_target}") + endif() +endforeach() + vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON3_DIR ${PYTHON3} DIRECTORY) vcpkg_add_to_path(${PYTHON3_DIR}) +set(LLVM_LINK_JOBS 1) + vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH}/llvm OPTIONS @@ -228,9 +244,10 @@ vcpkg_cmake_configure( "-DLLVM_ENABLE_PROJECTS=${LLVM_ENABLE_PROJECTS}" "-DLLVM_ENABLE_RUNTIMES=${LLVM_ENABLE_RUNTIMES}" "-DLLVM_TARGETS_TO_BUILD=${LLVM_TARGETS_TO_BUILD}" + "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=${LLVM_EXPERIMENTAL_TARGETS_TO_BUILD}" -DPACKAGE_VERSION=${LLVM_VERSION} # Limit the maximum number of concurrent link jobs to 1. This should fix low amount of memory issue for link. - -DLLVM_PARALLEL_LINK_JOBS=1 + "-DLLVM_PARALLEL_LINK_JOBS=${LLVM_LINK_JOBS}" -DLLVM_TOOLS_INSTALL_DIR=tools/llvm ) diff --git a/ports/llvm/vcpkg.json b/ports/llvm/vcpkg.json index 918f1cd7cad37a..94b4f8cf4b5946 100644 --- a/ports/llvm/vcpkg.json +++ b/ports/llvm/vcpkg.json @@ -1,7 +1,6 @@ { "name": "llvm", - "version": "14.0.3", - "port-version": 1, + "version": "14.0.4", "description": "The LLVM Compiler Infrastructure.", "homepage": "https://llvm.org", "license": "Apache-2.0", @@ -79,6 +78,13 @@ "default-targets": { "description": "Build with platform-specific default targets.", "dependencies": [ + { + "name": "llvm", + "default-features": false, + "features": [ + "target-spirv" + ] + }, { "name": "llvm", "default-features": false, @@ -289,6 +295,7 @@ "target-powerpc", "target-riscv", "target-sparc", + "target-spirv", "target-systemz", "target-ve", "target-webassembly", @@ -334,6 +341,9 @@ "target-sparc": { "description": "Build with Sparc backend." }, + "target-spirv": { + "description": "Build with Spriv backend." + }, "target-systemz": { "description": "Build with SystemZ backend." }, diff --git a/versions/baseline.json b/versions/baseline.json index c315072c5e6ed3..2330888533f5ac 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4293,8 +4293,8 @@ "port-version": 2 }, "llvm": { - "baseline": "14.0.3", - "port-version": 1 + "baseline": "14.0.4", + "port-version": 0 }, "lmdb": { "baseline": "0.9.29", diff --git a/versions/l-/llvm.json b/versions/l-/llvm.json index 18b97acd0d6990..f330f79e6449df 100644 --- a/versions/l-/llvm.json +++ b/versions/l-/llvm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7f97dd1dc56be6b5637b8406bd01ac0c245eb0dc", + "version": "14.0.4", + "port-version": 0 + }, { "git-tree": "741b89d3872cb0152d5c295ce075b8d751381f51", "version": "14.0.3", From e78aa8421173e02315fabd88c7cd77de7a3c8e9a Mon Sep 17 00:00:00 2001 From: cd-pkwan <66626590+cd-pkwan@users.noreply.github.com> Date: Wed, 15 Jun 2022 00:09:30 +0800 Subject: [PATCH 17/56] [chartdir] use versioned download link (#23732) * Update download link * Fix version database. * Remove skips from ci.baseline.txt. * Use versioned download link Updated to use versioned download links for macOS, Linux x86 and Linux x64, in addition to Windows. * Update portfile.cmake * Remove support for arm and uwp * Update ci.baseline.txt * Update version database. Co-authored-by: Billy Robert O'Neal III --- ports/chartdir/portfile.cmake | 22 +++++++++++----------- ports/chartdir/vcpkg.json | 5 +++-- scripts/ci.baseline.txt | 2 ++ versions/baseline.json | 2 +- versions/c-/chartdir.json | 5 +++++ 5 files changed, 22 insertions(+), 14 deletions(-) diff --git a/ports/chartdir/portfile.cmake b/ports/chartdir/portfile.cmake index 7e79c17d69ddf2..f4ad36e81f1348 100644 --- a/ports/chartdir/portfile.cmake +++ b/ports/chartdir/portfile.cmake @@ -1,13 +1,13 @@ -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) - -if(TRIPLET_SYSTEM_ARCH MATCHES "arm" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR VCPKG_LIBRARY_LINKAGE STREQUAL static) - - set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +# ChartDirector's DLL interface only contains primitive types, so it is CRT agnostic. +if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") + message(STATUS "Note: ${PORT} only supports dynamic library linkage. Building dynamic library.") + set(VCPKG_LIBRARY_LINKAGE dynamic) +endif() -elseif(VCPKG_TARGET_IS_WINDOWS) +if(VCPKG_TARGET_IS_WINDOWS) vcpkg_download_distfile(ARCHIVE_FILE - URLS "https://www.advsofteng.net/chartdir_cpp_win.zip" + URLS "https://www.advsofteng.com/vcpkg/chartdir_cpp_win_7.0.0.zip" FILENAME "chartdir_cpp_win-7.0.0.zip" SHA512 e5b5d387cff693a7f5ee98c2d2df75f421129b006e4324ae30ace0cbaac58867f048868ddfacdb3224c7165c8f27219c4273f3c778be3330d39ef95260d4186b ) @@ -34,9 +34,9 @@ elseif(VCPKG_TARGET_IS_WINDOWS) elseif(VCPKG_TARGET_IS_OSX) vcpkg_download_distfile(ARCHIVE_FILE - URLS "https://www.advsofteng.net/chartdir_cpp_mac.tar.gz" + URLS "https://www.advsofteng.com/vcpkg/chartdir_cpp_mac_7.0.0.tar.gz" FILENAME "chartdir_cpp_mac-7.0.0.tar.gz" - SHA512 3f00a4eb7c6b7fc1ebd4856c287ca9a76ca4ce813b4203350526c7ef10c946baa3768446178b664af8e8222275f10f9ee6f5f87cf1e23f23c4a221f431864744 + SHA512 fd46ac45e8906854ededb9e30ee3ba8bdd05588e6ca7c9fdf140254ee637d32565417d799da33b23228f1ade8111fcae037eed4cf978a11d35e70ab8861214a2 ) vcpkg_extract_source_archive_ex( @@ -55,7 +55,7 @@ elseif(VCPKG_TARGET_IS_LINUX) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") vcpkg_download_distfile(ARCHIVE_FILE - URLS "https://www.advsofteng.net/chartdir_cpp_linux_64.tar.gz" + URLS "https://www.advsofteng.com/vcpkg/chartdir_cpp_linux_64_7.0.0.tar.gz" FILENAME "chartdir_cpp_linux_64-7.0.0.tar.gz" SHA512 ea2e05f28dd9647fed49feaf130d8034065067463965f144b3fae4eae482579b1ecf528dc86d1b3602887d5ca0c3b1569404489b0f4cb2300b798fed940cd467 ) @@ -63,7 +63,7 @@ elseif(VCPKG_TARGET_IS_LINUX) else() vcpkg_download_distfile(ARCHIVE_FILE - URLS "https://www.advsofteng.net/chartdir_cpp_linux.tar.gz" + URLS "https://www.advsofteng.com/vcpkg/chartdir_cpp_linux_7.0.0.tar.gz" FILENAME "chartdir_cpp_linux-7.0.0.tar.gz" SHA512 54720fb431fa0fb34be3a187ec3886b0f2a7307ea52a0415fab8513117a157f64a8c0e0b01304aac1d313e4557768242e6b12002509fde2e5303d930c78c0e03 ) diff --git a/ports/chartdir/vcpkg.json b/ports/chartdir/vcpkg.json index f99954188dd583..9e8fcacfa5f315 100644 --- a/ports/chartdir/vcpkg.json +++ b/ports/chartdir/vcpkg.json @@ -1,7 +1,8 @@ { "name": "chartdir", "version": "7.0.0", - "port-version": 3, + "port-version": 4, "description": "ChartDirector is a powerful chart component for creating professional looking charts for web and windows applications.", - "homepage": "https://www.advsofteng.com/" + "homepage": "https://www.advsofteng.com/", + "supports": "!arm & !uwp" } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 11fe1ca062fced..32ec72ef8a87bc 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -104,6 +104,8 @@ charls:x64-windows=skip charls:x64-windows-static=skip charls:x64-windows-static-md=skip charls:x86-windows=skip +chmlib:arm-uwp=fail +chmlib:x64-uwp=fail # chartdir does not offer stable download URLs chartdir:arm64-windows=skip chartdir:arm-uwp=skip diff --git a/versions/baseline.json b/versions/baseline.json index 2330888533f5ac..38856410a1d8a3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1358,7 +1358,7 @@ }, "chartdir": { "baseline": "7.0.0", - "port-version": 3 + "port-version": 4 }, "check": { "baseline": "0.15.2", diff --git a/versions/c-/chartdir.json b/versions/c-/chartdir.json index e2b949dd9c81b7..96f84184e05d8b 100644 --- a/versions/c-/chartdir.json +++ b/versions/c-/chartdir.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7f64b5801adec2ea3f13517ffa35bd96b6a8bb9f", + "version": "7.0.0", + "port-version": 4 + }, { "git-tree": "2b4bad1eb46439cbd63295d8120f03966c52d162", "version": "7.0.0", From 3cca353a8a54629e98dfaa99740757d3a5568c7b Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Tue, 14 Jun 2022 18:50:00 +0200 Subject: [PATCH 18/56] [mmloader] Fix `supports` (#25232) * [mmloader] Fix supports * Fix version db * Fix version * version * [mmloader] Remove from CI baseline * unsupported on UWP * version * Revert version db --- ports/mmloader/portfile.cmake | 17 +++++------------ ports/mmloader/vcpkg.json | 13 ++++++++++--- scripts/ci.baseline.txt | 7 ------- versions/baseline.json | 4 ++-- versions/m-/mmloader.json | 5 +++++ 5 files changed, 22 insertions(+), 24 deletions(-) diff --git a/ports/mmloader/portfile.cmake b/ports/mmloader/portfile.cmake index 72d6534846e1df..1250881fac7b32 100644 --- a/ports/mmloader/portfile.cmake +++ b/ports/mmloader/portfile.cmake @@ -1,4 +1,5 @@ -# source +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tishion/mmLoader @@ -7,27 +8,19 @@ vcpkg_from_github( HEAD_REF master ) -# feature vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES shellcode BUILD_SHELLCODE_GEN ) -# config -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} ) -# pre-clean -file(REMOVE_RECURSE "${SOURCE_PATH}/output") - -# build and install -vcpkg_install_cmake(DISABLE_PARALLEL) +vcpkg_cmake_install(DISABLE_PARALLEL) -# remove the debug/include directory file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -# collect license files file(INSTALL "${SOURCE_PATH}/License" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/mmloader/vcpkg.json b/ports/mmloader/vcpkg.json index 30d49748ff60f7..e436ab1118b013 100644 --- a/ports/mmloader/vcpkg.json +++ b/ports/mmloader/vcpkg.json @@ -1,10 +1,17 @@ { "name": "mmloader", - "version-date": "2021-12-13", - "port-version": 1, + "version": "1.0.1", + "port-version": 2, "description": "A library for loading dll module bypassing windows PE loader from memory (x86/x64)", "homepage": "http://tishion.github.io/mmLoader/", - "supports": "(x86 | x64) & windows & static", + "license": "MIT", + "supports": "(x86 | x64) & windows & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], "features": { "shellcode": { "description": "Generate mmLoader shell code headers" diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 32ec72ef8a87bc..0208f3120395ea 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -656,13 +656,6 @@ microsoft-signalr:x64-windows-static-md=skip microsoft-signalr:x86-windows=skip # https://github.com/mlpack/mlpack/pull/2945 mlpack:x64-uwp=fail -mmloader:arm64-windows=fail -mmloader:arm-uwp=fail -mmloader:x64-linux=fail -mmloader:x64-osx=fail -mmloader:x64-uwp=fail -mmloader:x64-windows=fail -mmloader:x86-windows=fail # mmx installs many problematic headers, such as `json.h` and `sched.h` mmx:x64-windows=skip mmx:x64-windows-static=skip diff --git a/versions/baseline.json b/versions/baseline.json index 38856410a1d8a3..d53073070062e8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4601,8 +4601,8 @@ "port-version": 5 }, "mmloader": { - "baseline": "2021-12-13", - "port-version": 1 + "baseline": "1.0.1", + "port-version": 2 }, "mmx": { "baseline": "2019-09-29", diff --git a/versions/m-/mmloader.json b/versions/m-/mmloader.json index a381834b387837..3257087c7896ca 100644 --- a/versions/m-/mmloader.json +++ b/versions/m-/mmloader.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4b102ccdbd92919d2f3f62fff55b2a51839199ad", + "version": "1.0.1", + "port-version": 2 + }, { "git-tree": "104d16ae01f6ae753fde8406f75a01b9353aa1f2", "version-date": "2021-12-13", From 8d2bff31eba419c9530f80d06f7268da330cfcba Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 14 Jun 2022 10:59:29 -0700 Subject: [PATCH 19/56] [webview2] New port of Microsoft.Web.WebView2 (#25217) --- ports/webview2/portfile.cmake | 55 +++++++++++++++++++ .../webview2/unofficial-webview2-config.cmake | 21 +++++++ ports/webview2/vcpkg.json | 12 ++++ versions/baseline.json | 4 ++ versions/w-/webview2.json | 9 +++ 5 files changed, 101 insertions(+) create mode 100644 ports/webview2/portfile.cmake create mode 100644 ports/webview2/unofficial-webview2-config.cmake create mode 100644 ports/webview2/vcpkg.json create mode 100644 versions/w-/webview2.json diff --git a/ports/webview2/portfile.cmake b/ports/webview2/portfile.cmake new file mode 100644 index 00000000000000..d2b215616f9441 --- /dev/null +++ b/ports/webview2/portfile.cmake @@ -0,0 +1,55 @@ +if(VCPKG_TARGET_IS_UWP) + vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +endif() + +set(VERSION 1.0.1210.39) + +vcpkg_download_distfile(ARCHIVE + URLS "https://www.nuget.org/api/v2/package/Microsoft.Web.WebView2/${VERSION}" + FILENAME "microsoft.web.webview2.${VERSION}.zip" + SHA512 c87812247a466f4aaeac8be8b32be49166b4ddb5bbf65581d5df81d69eda340e9911144a8dd8401baa6e51f95337001cd18ff90cd36ca0af86cc65227e8e2ccf +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" + REF "${VERSION}" + NO_REMOVE_ONE_LEVEL +) + +file(COPY + "${SOURCE_PATH}/build/native/include/" + DESTINATION "${CURRENT_PACKAGES_DIR}/include") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(COPY + "${SOURCE_PATH}/build/native/${VCPKG_TARGET_ARCHITECTURE}/WebView2LoaderStatic.lib" + DESTINATION "${CURRENT_PACKAGES_DIR}/lib") +else() + file(COPY + "${SOURCE_PATH}/build/native/include-winrt/" + DESTINATION "${CURRENT_PACKAGES_DIR}/include") + file(COPY + "${SOURCE_PATH}/lib/Microsoft.Web.WebView2.Core.winmd" + DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(COPY + "${SOURCE_PATH}/build/native/${VCPKG_TARGET_ARCHITECTURE}/WebView2Loader.dll.lib" + DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(COPY + "${SOURCE_PATH}/build/native/${VCPKG_TARGET_ARCHITECTURE}/WebView2Loader.dll" + "${SOURCE_PATH}/runtimes/win-${VCPKG_TARGET_ARCHITECTURE}/native_uap/Microsoft.Web.WebView2.Core.dll" + DESTINATION "${CURRENT_PACKAGES_DIR}/bin") +endif() +if(NOT VCPKG_BUILD_TYPE) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(COPY "${CURRENT_PACKAGES_DIR}/bin" DESTINATION "${CURRENT_PACKAGES_DIR}/debug") + endif() + file(COPY "${CURRENT_PACKAGES_DIR}/lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug") +endif() + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/unofficial-webview2-config.cmake" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-webview2") + +# The import libraries for webview fail with "Could not find proper second linker member" +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +configure_file("${SOURCE_PATH}/LICENSE.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/webview2/unofficial-webview2-config.cmake b/ports/webview2/unofficial-webview2-config.cmake new file mode 100644 index 00000000000000..60851bc2390287 --- /dev/null +++ b/ports/webview2/unofficial-webview2-config.cmake @@ -0,0 +1,21 @@ +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_DIR}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) + +if(NOT TARGET unofficial::webview2::webview2) + if(EXISTS "${_IMPORT_PREFIX}/lib/WebView2LoaderStatic.lib") + add_library(unofficial::webview2::webview2 STATIC IMPORTED) + set_target_properties(unofficial::webview2::webview2 + PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" + IMPORTED_LOCATION "${_IMPORT_PREFIX}/lib/WebView2LoaderStatic.lib") + else() + add_library(unofficial::webview2::webview2 SHARED IMPORTED) + set_target_properties(unofficial::webview2::webview2 + PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" + IMPORTED_LOCATION "${_IMPORT_PREFIX}/bin/WebView2Loader.dll" + IMPORTED_IMPLIB "${_IMPORT_PREFIX}/lib/WebView2Loader.dll.lib") + endif() +endif() + +unset(_IMPORT_PREFIX) diff --git a/ports/webview2/vcpkg.json b/ports/webview2/vcpkg.json new file mode 100644 index 00000000000000..8a03278735f767 --- /dev/null +++ b/ports/webview2/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "webview2", + "version": "1.0.1210.39", + "description": "The WebView2 control allows you to embed web technologies (HTML, CSS, and JavaScript) using Microsoft Edge", + "homepage": "https://docs.microsoft.com/en-us/microsoft-edge/webview2", + "documentation": "https://docs.microsoft.com/en-us/microsoft-edge/webview2", + "license": "BSD-3-Clause", + "supports": "windows & (x86 | x64 | arm64)", + "dependencies": [ + "wil" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index d53073070062e8..772478c7fb447a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7512,6 +7512,10 @@ "baseline": "0.8.2", "port-version": 2 }, + "webview2": { + "baseline": "1.0.1210.39", + "port-version": 0 + }, "wepoll": { "baseline": "1.5.8", "port-version": 1 diff --git a/versions/w-/webview2.json b/versions/w-/webview2.json new file mode 100644 index 00000000000000..5a68306fe9bc02 --- /dev/null +++ b/versions/w-/webview2.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "67a13efe8865489439c423563ee9fdaecf8baab1", + "version": "1.0.1210.39", + "port-version": 0 + } + ] +} From 06acb79f7cbfdae9c83e82b919623e951b846a4e Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 14 Jun 2022 11:00:25 -0700 Subject: [PATCH 20/56] [docs] Add search.md (#24755) * [docs] Add search.md * [docs] Remove mention of registries from search.md --- docs/commands/search.md | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 docs/commands/search.md diff --git a/docs/commands/search.md b/docs/commands/search.md new file mode 100644 index 00000000000000..093685fa336093 --- /dev/null +++ b/docs/commands/search.md @@ -0,0 +1,37 @@ +# vcpkg search + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/commands/search.md).** + +## Synopsis + +```no-highlight +vcpkg search [options] [query] +``` + +## Description + +Searches for available packages by name and description. + +Search performs a case-insensitive search through all available package names and descriptions. The results are displayed in a tabular format. + +## Example +```no-highlight +$ vcpkg search zlib +miniz 2.2.0#1 Single C source file zlib-replacement library +zlib 1.2.12#1 A compression library +zlib-ng 2.0.6 zlib replacement with optimizations for 'next generation' systems +``` + +## Options + +All vcpkg commands support a set of [common options](common-options.md). + +### `--x-full-desc` + +**Experimental and may change or be removed at any time** + +Do not truncate long descriptions. + +By default, long descriptions will be truncated to keep the tabular output browsable. + +[Registries]: ../users/registries.md From f3702ede0b334042fc0d00fec9e5d94be8b3d106 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Wed, 15 Jun 2022 19:38:33 +0200 Subject: [PATCH 21/56] [crfft, constexpr] Fix copyright location (#25241) * [clfft,constexpr] Fix copyright * version * Fix cmake * version --- ports/clfft/portfile.cmake | 2 +- ports/clfft/vcpkg.json | 3 ++- ports/constexpr/portfile.cmake | 10 ++++------ ports/constexpr/vcpkg.json | 7 ++++--- versions/baseline.json | 4 ++-- versions/c-/clfft.json | 5 +++++ versions/c-/constexpr.json | 5 +++++ 7 files changed, 23 insertions(+), 13 deletions(-) diff --git a/ports/clfft/portfile.cmake b/ports/clfft/portfile.cmake index 79e83bf6da7522..bd52b123052fb6 100644 --- a/ports/clfft/portfile.cmake +++ b/ports/clfft/portfile.cmake @@ -29,4 +29,4 @@ endif() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION ${CURRENT_PACKAGES_DIR}/share/clfft/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/clfft/vcpkg.json b/ports/clfft/vcpkg.json index d20cfa8bc61d16..15886ab2ff7e28 100644 --- a/ports/clfft/vcpkg.json +++ b/ports/clfft/vcpkg.json @@ -1,9 +1,10 @@ { "name": "clfft", "version": "2.12.2", - "port-version": 4, + "port-version": 5, "description": "clFFT is an OpenCL 1.2 accelerated Fast Fourier Transform library.", "homepage": "https://github.com/clMathLibraries/clFFT", + "license": "Apache-2.0", "dependencies": [ "opencl", { diff --git a/ports/constexpr/portfile.cmake b/ports/constexpr/portfile.cmake index 65773ccec22496..493e78d7b37e7c 100644 --- a/ports/constexpr/portfile.cmake +++ b/ports/constexpr/portfile.cmake @@ -7,10 +7,8 @@ vcpkg_from_github( HEAD_REF master ) -# Put the licence file where vcpkg expects it -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/constexpr/LICENSE) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/constexpr/LICENSE ${CURRENT_PACKAGES_DIR}/share/constexpr/copyright) - # Copy the constexpr header files -file(GLOB HEADER_FILES ${SOURCE_PATH}/src/include/*.h) -file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(GLOB HEADER_FILES "${SOURCE_PATH}/src/include/*.h") +file(COPY ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/constexpr/vcpkg.json b/ports/constexpr/vcpkg.json index 85a8a46c97d8fc..b7f266515fbe80 100644 --- a/ports/constexpr/vcpkg.json +++ b/ports/constexpr/vcpkg.json @@ -1,7 +1,8 @@ { "name": "constexpr", - "version-string": "1.0", - "port-version": 2, + "version": "1.0", + "port-version": 3, "description": "Small MIT License Library of general stdlib functions written as C++11 constexpr functions.", - "homepage": "https://github.com/elbeno/constexpr" + "homepage": "https://github.com/elbeno/constexpr", + "license": "MIT" } diff --git a/versions/baseline.json b/versions/baseline.json index 772478c7fb447a..ccb26bf25e1295 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1418,7 +1418,7 @@ }, "clfft": { "baseline": "2.12.2", - "port-version": 4 + "port-version": 5 }, "cli": { "baseline": "2.0.1", @@ -1542,7 +1542,7 @@ }, "constexpr": { "baseline": "1.0", - "port-version": 2 + "port-version": 3 }, "constexpr-contracts": { "baseline": "2020-08-09", diff --git a/versions/c-/clfft.json b/versions/c-/clfft.json index d1c9665e0e447f..33be216903f29a 100644 --- a/versions/c-/clfft.json +++ b/versions/c-/clfft.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b935ce5f9e186f9be8fe85d6d228043bede4cd04", + "version": "2.12.2", + "port-version": 5 + }, { "git-tree": "fdb3022cd3081e404b7c49ceaa5bd03ad0dc64f4", "version": "2.12.2", diff --git a/versions/c-/constexpr.json b/versions/c-/constexpr.json index 09ba13ef2e92c0..d5b38750f42924 100644 --- a/versions/c-/constexpr.json +++ b/versions/c-/constexpr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c3d2008ccf999119285610e0a76ed0c46c59632b", + "version": "1.0", + "port-version": 3 + }, { "git-tree": "26c459ddb2becb06ea5c1fcb7a55e282b2aae704", "version-string": "1.0", From dae9883cf05da75986addc1fe227121191fec6f2 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Thu, 16 Jun 2022 01:54:48 +0800 Subject: [PATCH 22/56] [installerbase] update to 4.4.0 (#25223) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [qt-installer-framework] update to 4.4.0 * Update scripts/vcpkgTools.xml Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- scripts/vcpkgTools.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 5c21091aeb64b1..e2f9d98dd9ba54 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -131,11 +131,11 @@ 9556335bfc8bc14bace6dfced45fa77fb07c80f08aa975e047a54efda1d19852aae0ea68a5bc7f04fbd88e3edce5a73512a61216b1c5ff4cade224de4a9ab8db - 3.1.81 + 4.4.0 QtInstallerFramework-win-x86\bin\installerbase.exe - https://github.com/podsvirov/installer-framework/releases/download/cr203958-9/QtInstallerFramework-win-x86.zip - 1f3e593270d7c2a4e271fdb49c637a2de462351310ef66bba298d30f6ca23365ec6aecf2e57799a00c873267cd3f92060ecac03eb291d42903d0e0869cd17c73 - QtInstallerFramework-win-x86.zip + https://download.qt.io/official_releases/qt-installer-framework/4.4.0/installer-framework-opensource-src-4.4.0.zip + fc713f54bfe2781cb232cd0ae8eddb96833ec178d53a55ec0b01886aa048b13441eb49a1f33282e8eab7259cfe512c890d50b8e632d3dbf501a0bf1fd83de947 + installer-framework-opensource-src-4.4.0.zip 21.07 From d4cd43eb7d70bb3262bfb51b963da79e346a39de Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 15 Jun 2022 19:58:03 +0200 Subject: [PATCH 23/56] [gmp | mpir] Add --with-pic (#25209) * [gmp] [mpir] Add --with-pic * ./vcpkg x-add-version --all --- ports/gmp/portfile.cmake | 1 + ports/gmp/vcpkg.json | 2 +- ports/mpir/portfile.cmake | 6 +++--- ports/mpir/vcpkg.json | 1 + versions/baseline.json | 4 ++-- versions/g-/gmp.json | 5 +++++ versions/m-/mpir.json | 5 +++++ 7 files changed, 18 insertions(+), 6 deletions(-) diff --git a/ports/gmp/portfile.cmake b/ports/gmp/portfile.cmake index b4acb3047bfb94..2138744fcb40a4 100644 --- a/ports/gmp/portfile.cmake +++ b/ports/gmp/portfile.cmake @@ -49,6 +49,7 @@ vcpkg_configure_make( OPTIONS ${OPTIONS} --enable-cxx + --with-pic ) set(tool_names bases fac fib jacobitab psqr trialdivtab) diff --git a/ports/gmp/vcpkg.json b/ports/gmp/vcpkg.json index 8393feed120dcb..12a6e0d4332c43 100644 --- a/ports/gmp/vcpkg.json +++ b/ports/gmp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gmp", "version": "6.2.1", - "port-version": 9, + "port-version": 10, "description": "The GNU Multiple Precision Arithmetic Library", "homepage": "https://gmplib.org", "supports": "!(windows & (arm | arm64))", diff --git a/ports/mpir/portfile.cmake b/ports/mpir/portfile.cmake index 1b8e188c32d80b..db2e2163e0bc35 100644 --- a/ports/mpir/portfile.cmake +++ b/ports/mpir/portfile.cmake @@ -19,12 +19,12 @@ if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) vcpkg_find_acquire_program(YASM) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(SHARED_STATIC "--enable-static --disable-shared") + set(SHARED_STATIC --enable-static --disable-shared --with-pic) else() - set(SHARED_STATIC "--disable-static --enable-shared") + set(SHARED_STATIC --disable-static --enable-shared) endif() - set(OPTIONS "--disable-silent-rules --enable-gmpcompat --enable-cxx ${SHARED_STATIC}") + set(OPTIONS --disable-silent-rules --enable-gmpcompat --enable-cxx ${SHARED_STATIC}) string(APPEND VCPKG_C_FLAGS " -Wno-implicit-function-declaration") string(APPEND VCPKG_CXX_FLAGS " -Wno-implicit-function-declaration") diff --git a/ports/mpir/vcpkg.json b/ports/mpir/vcpkg.json index 3d5a05a43ed122..5a9c0cc9f59bc0 100644 --- a/ports/mpir/vcpkg.json +++ b/ports/mpir/vcpkg.json @@ -1,6 +1,7 @@ { "name": "mpir", "version-date": "2022-03-02", + "port-version": 1, "description": "Multiple Precision Integers and Rationals", "homepage": "https://github.com/wbhart/mpir", "license": "GPL-3.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index ccb26bf25e1295..cd6c5ead8346ff 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2606,7 +2606,7 @@ }, "gmp": { "baseline": "6.2.1", - "port-version": 9 + "port-version": 10 }, "gmsh": { "baseline": "4.9.0", @@ -4686,7 +4686,7 @@ }, "mpir": { "baseline": "2022-03-02", - "port-version": 0 + "port-version": 1 }, "mpmcqueue": { "baseline": "2021-12-01", diff --git a/versions/g-/gmp.json b/versions/g-/gmp.json index 9505d80d19d521..2a4b1a1f2f0c7c 100644 --- a/versions/g-/gmp.json +++ b/versions/g-/gmp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f4748213535c3fd004de44f6b1f15d123927cce6", + "version": "6.2.1", + "port-version": 10 + }, { "git-tree": "7b9a71843073bf4a86bb64ddf219c9900ebb3dbd", "version": "6.2.1", diff --git a/versions/m-/mpir.json b/versions/m-/mpir.json index ff850fbcd28ccd..8f7790807ec5c8 100644 --- a/versions/m-/mpir.json +++ b/versions/m-/mpir.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9191f07cfaade82121abb4d37cb652182c0e55f6", + "version-date": "2022-03-02", + "port-version": 1 + }, { "git-tree": "5358d4a724061eab499969ae3b56f8abbdea3347", "version-date": "2022-03-02", From 96414493b3cccefbe31016d6dd7c3802ef692fd4 Mon Sep 17 00:00:00 2001 From: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Date: Thu, 16 Jun 2022 02:02:28 +0800 Subject: [PATCH 24/56] [paho-mqtt] Update to 1.3.10 and fix include path (#25207) * [paho-mqtt] Update to 1.3.10 and fix include path * x-add-version * fix paho-mqttpp3 * x-add-version * install LICENSE * x-add-version * remove documentations * x-add-version * apply suggestion * x-add-version Co-authored-by: Lily Wang --- ports/paho-mqtt/fix-install-path.patch | 28 -- .../paho-mqtt/fix-unresolvedsymbol-arm.patch | 7 +- ports/paho-mqtt/portfile.cmake | 26 +- ports/paho-mqtt/remove_compiler_options.patch | 13 - ports/paho-mqtt/vcpkg.json | 13 +- ports/paho-mqttpp3/fix-include-path.patch | 249 ------------------ ports/paho-mqttpp3/portfile.cmake | 16 +- ports/paho-mqttpp3/vcpkg.json | 12 +- versions/baseline.json | 4 +- versions/p-/paho-mqtt.json | 5 + versions/p-/paho-mqttpp3.json | 5 + 11 files changed, 60 insertions(+), 318 deletions(-) delete mode 100644 ports/paho-mqtt/fix-install-path.patch delete mode 100644 ports/paho-mqtt/remove_compiler_options.patch delete mode 100644 ports/paho-mqttpp3/fix-include-path.patch diff --git a/ports/paho-mqtt/fix-install-path.patch b/ports/paho-mqtt/fix-install-path.patch deleted file mode 100644 index 68cb3b4c4b89cc..00000000000000 --- a/ports/paho-mqtt/fix-install-path.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index aa4ad05..669adde 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -60,8 +60,8 @@ IF (NOT PAHO_BUILD_SHARED AND NOT PAHO_BUILD_STATIC) - MESSAGE(FATAL_ERROR "You must set either PAHO_BUILD_SHARED, PAHO_BUILD_STATIC, or both") - ENDIF() - --IF(PAHO_BUILD_DEB_PACKAGE) -- set(CMAKE_INSTALL_DOCDIR share/doc/libpaho-mqtt) -+IF(1) -+ set(CMAKE_INSTALL_DOCDIR share/paho-mqtt) - set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS ON) - set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS_POLICY ">=") - ENDIF() -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 0bc7194..db4a0ac 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -183,7 +183,7 @@ IF (PAHO_BUILD_STATIC) - ENDIF() - - INSTALL(FILES MQTTAsync.h MQTTClient.h MQTTClientPersistence.h MQTTProperties.h MQTTReasonCodes.h MQTTSubscribeOpts.h MQTTExportDeclarations.h -- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/paho-mqtt) - - IF (PAHO_WITH_SSL) - SET(OPENSSL_ROOT_DIR "" CACHE PATH "Directory containing OpenSSL libraries and includes") diff --git a/ports/paho-mqtt/fix-unresolvedsymbol-arm.patch b/ports/paho-mqtt/fix-unresolvedsymbol-arm.patch index 7726368326ef3d..0b7e9fb8802330 100644 --- a/ports/paho-mqtt/fix-unresolvedsymbol-arm.patch +++ b/ports/paho-mqtt/fix-unresolvedsymbol-arm.patch @@ -1,11 +1,12 @@ diff --git a/src/SHA1.c b/src/SHA1.c -index 3ef07d9..f0e82ce 100644 +index 3ef07d9..8ed6b16 100644 --- a/src/SHA1.c +++ b/src/SHA1.c -@@ -19,6 +19,7 @@ +@@ -18,7 +18,7 @@ + #if !defined(OPENSSL) #if defined(_WIN32) || defined(_WIN64) - #pragma comment(lib, "crypt32.lib") +-#pragma comment(lib, "crypt32.lib") +#pragma comment(lib, "Advapi32.lib") int SHA1_Init(SHA_CTX *c) diff --git a/ports/paho-mqtt/portfile.cmake b/ports/paho-mqtt/portfile.cmake index 7c7875bb2be7b6..5257c91bec00cb 100644 --- a/ports/paho-mqtt/portfile.cmake +++ b/ports/paho-mqtt/portfile.cmake @@ -1,21 +1,18 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eclipse/paho.mqtt.c - REF 3b7ae6348bc917d42c04efa962e4868c09bbde9f # v1.3.9 - SHA512 73c10b7da7aa228100511db280ae56484cb8c42b8f0cfafb2fa3f6e230b4bb1d6b3611aa9219736a0baa9d7de0baf802dd70dbf308077f1a745bd61a67a797c7 + REF eff2da4875725509fc97641b118d6badf3e3a08f # v1.3.10 + SHA512 5e190ffd978dad0f60b70bdad2727e567539aff2c55e38023dfbcbe9b50bcbe75d8230c501c09e9c0a0329bed3fd149d5d59d65ad0ba0f84a54f641b4f01390a HEAD_REF master PATCHES - remove_compiler_options.patch - fix-install-path.patch fix-unresolvedsymbol-arm.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PAHO_BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PAHO_BUILD_DYNAMIC) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DPAHO_WITH_SSL=TRUE -DPAHO_BUILD_SHARED=${PAHO_BUILD_DYNAMIC} @@ -23,15 +20,22 @@ vcpkg_configure_cmake( -DPAHO_ENABLE_TESTING=FALSE ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/eclipse-paho-mqtt-c TARGET_PATH share/eclipse-paho-mqtt-c) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME eclipse-paho-mqtt-c CONFIG_PATH lib/cmake/eclipse-paho-mqtt-c) vcpkg_copy_pdbs() if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") vcpkg_copy_tools(TOOL_NAMES MQTTVersion AUTO_CLEAN) endif() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/eclipse-paho-mqtt-c/eclipse-paho-mqtt-cConfig.cmake" + [[# Generated by CMake]] + [[# Generated by CMake +include(CMakeFindDependencyMacro) +find_dependency(OpenSSL)]] +) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") -file(COPY ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL ${SOURCE_PATH}/about.html DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/paho-mqtt/remove_compiler_options.patch b/ports/paho-mqtt/remove_compiler_options.patch deleted file mode 100644 index a1193fee87745b..00000000000000 --- a/ports/paho-mqtt/remove_compiler_options.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 531c39c..3df385a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -41,7 +41,7 @@ IF (PAHO_HIGH_PERFORMANCE) - ENDIF() - - IF(WIN32) -- ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -DWIN32_LEAN_AND_MEAN -MD) -+ ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -DWIN32_LEAN_AND_MEAN) - ELSEIF(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") - ADD_DEFINITIONS(-DOSX) - ENDIF() diff --git a/ports/paho-mqtt/vcpkg.json b/ports/paho-mqtt/vcpkg.json index 186e1299ef7af0..2bed81bb8a8858 100644 --- a/ports/paho-mqtt/vcpkg.json +++ b/ports/paho-mqtt/vcpkg.json @@ -1,9 +1,18 @@ { "name": "paho-mqtt", - "version-semver": "1.3.9", + "version-semver": "1.3.10", "description": "Paho project provides open-source client implementations of MQTT and MQTT-SN messaging protocols aimed at new, existing, and emerging applications for the Internet of Things", "homepage": "https://github.com/eclipse/paho.mqtt.c", + "license": "EPL-2.0", "dependencies": [ - "openssl" + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/paho-mqttpp3/fix-include-path.patch b/ports/paho-mqttpp3/fix-include-path.patch deleted file mode 100644 index 17310738de3f5d..00000000000000 --- a/ports/paho-mqttpp3/fix-include-path.patch +++ /dev/null @@ -1,249 +0,0 @@ -diff --git a/src/mqtt/async_client.h b/src/mqtt/async_client.h -index 7fb13a4..59247ca 100644 ---- a/src/mqtt/async_client.h -+++ b/src/mqtt/async_client.h -@@ -25,7 +25,7 @@ - #ifndef __mqtt_async_client_h - #define __mqtt_async_client_h - --#include "MQTTAsync.h" -+#include "paho-mqtt/MQTTAsync.h" - #include "mqtt/types.h" - #include "mqtt/token.h" - #include "mqtt/create_options.h" -diff --git a/src/mqtt/callback.h b/src/mqtt/callback.h -index 63f21a1..c4638fa 100644 ---- a/src/mqtt/callback.h -+++ b/src/mqtt/callback.h -@@ -24,7 +24,7 @@ - #ifndef __mqtt_callback_h - #define __mqtt_callback_h - --#include "MQTTAsync.h" -+#include "paho-mqtt/MQTTAsync.h" - #include "mqtt/delivery_token.h" - #include "mqtt/types.h" - #include -diff --git a/src/mqtt/connect_options.h b/src/mqtt/connect_options.h -index 8001fe3..650ba91 100644 ---- a/src/mqtt/connect_options.h -+++ b/src/mqtt/connect_options.h -@@ -24,7 +24,7 @@ - #ifndef __mqtt_connect_options_h - #define __mqtt_connect_options_h - --#include "MQTTAsync.h" -+#include "paho-mqtt/MQTTAsync.h" - #include "mqtt/types.h" - #include "mqtt/message.h" - #include "mqtt/topic.h" -diff --git a/src/mqtt/create_options.h b/src/mqtt/create_options.h -index d57e32b..2bb3561 100644 ---- a/src/mqtt/create_options.h -+++ b/src/mqtt/create_options.h -@@ -24,7 +24,7 @@ - #ifndef __mqtt_create_options_h - #define __mqtt_create_options_h - --#include "MQTTAsync.h" -+#include "paho-mqtt/MQTTAsync.h" - #include "mqtt/types.h" - - namespace mqtt { -diff --git a/src/mqtt/delivery_token.h b/src/mqtt/delivery_token.h -index b70d582..ee1b306 100644 ---- a/src/mqtt/delivery_token.h -+++ b/src/mqtt/delivery_token.h -@@ -24,7 +24,7 @@ - #ifndef __mqtt_delivery_token_h - #define __mqtt_delivery_token_h - --#include "MQTTAsync.h" -+#include "paho-mqtt/MQTTAsync.h" - #include "mqtt/token.h" - #include "mqtt/message.h" - #include -diff --git a/src/mqtt/disconnect_options.h b/src/mqtt/disconnect_options.h -index db93679..2739d89 100644 ---- a/src/mqtt/disconnect_options.h -+++ b/src/mqtt/disconnect_options.h -@@ -23,7 +23,7 @@ - #ifndef __mqtt_disconnect_options_h - #define __mqtt_disconnect_options_h - --#include "MQTTAsync.h" -+#include "paho-mqtt/MQTTAsync.h" - #include "mqtt/types.h" - #include "mqtt/token.h" - #include "mqtt/properties.h" -diff --git a/src/mqtt/exception.h b/src/mqtt/exception.h -index 9db330a..32b7c97 100644 ---- a/src/mqtt/exception.h -+++ b/src/mqtt/exception.h -@@ -24,7 +24,7 @@ - #ifndef __mqtt_exception_h - #define __mqtt_exception_h - --#include "MQTTAsync.h" -+#include "paho-mqtt/MQTTAsync.h" - #include "mqtt/types.h" - #include - #include -diff --git a/src/mqtt/iaction_listener.h b/src/mqtt/iaction_listener.h -index 1e34577..2af8c1b 100644 ---- a/src/mqtt/iaction_listener.h -+++ b/src/mqtt/iaction_listener.h -@@ -24,7 +24,7 @@ - #ifndef __mqtt_iaction_listener_h - #define __mqtt_iaction_listener_h - --#include "MQTTAsync.h" -+#include "paho-mqtt/MQTTAsync.h" - #include "mqtt/types.h" - #include - -diff --git a/src/mqtt/iclient_persistence.h b/src/mqtt/iclient_persistence.h -index 635a292..aedc1d9 100644 ---- a/src/mqtt/iclient_persistence.h -+++ b/src/mqtt/iclient_persistence.h -@@ -24,7 +24,7 @@ - #ifndef __mqtt_iclient_persistence_h - #define __mqtt_iclient_persistence_h - --#include "MQTTAsync.h" -+#include "paho-mqtt/MQTTAsync.h" - #include "mqtt/types.h" - #include "mqtt/buffer_view.h" - #include "mqtt/string_collection.h" -diff --git a/src/mqtt/message.h b/src/mqtt/message.h -index 4cb95a6..e036269 100644 ---- a/src/mqtt/message.h -+++ b/src/mqtt/message.h -@@ -25,7 +25,7 @@ - #ifndef __mqtt_message_h - #define __mqtt_message_h - --#include "MQTTAsync.h" -+#include "paho-mqtt/MQTTAsync.h" - #include "mqtt/buffer_ref.h" - #include "mqtt/properties.h" - #include "mqtt/exception.h" -diff --git a/src/mqtt/properties.h b/src/mqtt/properties.h -index 826bc97..42c286a 100644 ---- a/src/mqtt/properties.h -+++ b/src/mqtt/properties.h -@@ -25,7 +25,7 @@ - #define __mqtt_properties_h - - extern "C" { -- #include "MQTTProperties.h" -+ #include "paho-mqtt/MQTTAsync.h" - } - - #include "mqtt/types.h" -diff --git a/src/mqtt/response_options.h b/src/mqtt/response_options.h -index 7bcb45c..40e45a2 100644 ---- a/src/mqtt/response_options.h -+++ b/src/mqtt/response_options.h -@@ -7,7 +7,7 @@ - #ifndef __mqtt_response_options_h - #define __mqtt_response_options_h - --#include "MQTTAsync.h" -+#include "paho-mqtt/MQTTAsync.h" - #include "mqtt/token.h" - #include "mqtt/delivery_token.h" - #include "subscribe_options.h" -diff --git a/src/mqtt/server_response.h b/src/mqtt/server_response.h -index a111839..094135b 100644 ---- a/src/mqtt/server_response.h -+++ b/src/mqtt/server_response.h -@@ -24,7 +24,7 @@ - #ifndef __mqtt_server_response_h - #define __mqtt_server_response_h - --#include "MQTTAsync.h" -+#include "paho-mqtt/MQTTAsync.h" - #include "mqtt/types.h" - #include "mqtt/properties.h" - -diff --git a/src/mqtt/ssl_options.h b/src/mqtt/ssl_options.h -index eba49ed..aad0da3 100644 ---- a/src/mqtt/ssl_options.h -+++ b/src/mqtt/ssl_options.h -@@ -27,7 +27,7 @@ - #ifndef __mqtt_ssl_options_h - #define __mqtt_ssl_options_h - --#include "MQTTAsync.h" -+#include "paho-mqtt/MQTTAsync.h" - #include "mqtt/message.h" - #include "mqtt/topic.h" - #include "mqtt/types.h" -diff --git a/src/mqtt/string_collection.h b/src/mqtt/string_collection.h -index bc43775..99a2674 100644 ---- a/src/mqtt/string_collection.h -+++ b/src/mqtt/string_collection.h -@@ -24,7 +24,7 @@ - #ifndef __mqtt_string_collection_h - #define __mqtt_string_collection_h - --#include "MQTTAsync.h" -+#include "paho-mqtt/MQTTAsync.h" - #include "mqtt/types.h" - #include - #include -diff --git a/src/mqtt/subscribe_options.h b/src/mqtt/subscribe_options.h -index 753c811..5f0d86c 100644 ---- a/src/mqtt/subscribe_options.h -+++ b/src/mqtt/subscribe_options.h -@@ -24,8 +24,8 @@ - #ifndef __mqtt_subscribe_options_h - #define __mqtt_subscribe_options_h - --#include "MQTTAsync.h" --#include "MQTTSubscribeOpts.h" -+#include "paho-mqtt/MQTTAsync.h" -+#include "paho-mqtt/MQTTSubscribeOpts.h" - #include "mqtt/types.h" - - namespace mqtt { -diff --git a/src/mqtt/token.h b/src/mqtt/token.h -index 4cafda7..1815ab9 100644 ---- a/src/mqtt/token.h -+++ b/src/mqtt/token.h -@@ -25,7 +25,7 @@ - #ifndef __mqtt_token_h - #define __mqtt_token_h - --#include "MQTTAsync.h" -+#include "paho-mqtt/MQTTAsync.h" - #include "mqtt/iaction_listener.h" - #include "mqtt/exception.h" - #include "mqtt/types.h" -diff --git a/src/mqtt/topic.h b/src/mqtt/topic.h -index 618eb85..555de60 100644 ---- a/src/mqtt/topic.h -+++ b/src/mqtt/topic.h -@@ -24,7 +24,7 @@ - #ifndef __mqtt_topic_h - #define __mqtt_topic_h - --#include "MQTTAsync.h" -+#include "paho-mqtt/MQTTAsync.h" - #include "mqtt/delivery_token.h" - #include "mqtt/subscribe_options.h" - #include "mqtt/message.h" -diff --git a/src/mqtt/will_options.h b/src/mqtt/will_options.h -index 8c5c67d..63bfffc 100644 ---- a/src/mqtt/will_options.h -+++ b/src/mqtt/will_options.h -@@ -26,7 +26,7 @@ - #ifndef __mqtt_will_options_h - #define __mqtt_will_options_h - --#include "MQTTAsync.h" -+#include "paho-mqtt/MQTTAsync.h" - #include "mqtt/types.h" - #include "mqtt/message.h" - #include "mqtt/topic.h" diff --git a/ports/paho-mqttpp3/portfile.cmake b/ports/paho-mqttpp3/portfile.cmake index 7926d0d73c174d..d2103a8c5f8fae 100644 --- a/ports/paho-mqttpp3/portfile.cmake +++ b/ports/paho-mqttpp3/portfile.cmake @@ -6,7 +6,6 @@ vcpkg_from_github( SHA512 3f4a91987e0106e50e637d8d4fb13a4f8aca14eea168102664fdcebd1260609434e679f5986a1c4d71746735530f1b72fc29d2ac05cb35b3ce734a6aab1a0a55 HEAD_REF master PATCHES - fix-include-path.patch fix-dependency.patch ) @@ -43,9 +42,8 @@ else() set(PAHO_OPTIONS) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DPAHO_BUILD_STATIC=${PAHO_MQTTPP3_STATIC} -DPAHO_BUILD_SHARED=${PAHO_MQTTPP3_SHARED} @@ -55,13 +53,13 @@ vcpkg_configure_cmake( ) # Run the build, copy pdbs and fixup the cmake targets -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/PahoMqttCpp" TARGET_PATH "share/pahomqttcpp") +vcpkg_cmake_config_fixup(PACKAGE_NAME PahoMqttCpp CONFIG_PATH "lib/cmake/PahoMqttCpp") # Remove the include and share folders in debug folder -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Add copyright -file(INSTALL ${SOURCE_PATH}/about.html DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/about.html" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/paho-mqttpp3/vcpkg.json b/ports/paho-mqttpp3/vcpkg.json index b4152d7085e5c8..4ea7289ecc2b95 100644 --- a/ports/paho-mqttpp3/vcpkg.json +++ b/ports/paho-mqttpp3/vcpkg.json @@ -1,10 +1,20 @@ { "name": "paho-mqttpp3", "version": "1.2.0", + "port-version": 1, "description": "Paho project provides open-source C++ wrapper for Paho C library", "homepage": "https://github.com/eclipse/paho.mqtt.cpp", + "license": "EPL-1.0", "dependencies": [ - "paho-mqtt" + "paho-mqtt", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "default-features": [ "ssl" diff --git a/versions/baseline.json b/versions/baseline.json index cd6c5ead8346ff..08a1c497d0030d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5317,12 +5317,12 @@ "port-version": 0 }, "paho-mqtt": { - "baseline": "1.3.9", + "baseline": "1.3.10", "port-version": 0 }, "paho-mqttpp3": { "baseline": "1.2.0", - "port-version": 0 + "port-version": 1 }, "palsigslot": { "baseline": "1.2.1", diff --git a/versions/p-/paho-mqtt.json b/versions/p-/paho-mqtt.json index 91f6400606605e..8bb1182a4b8c85 100644 --- a/versions/p-/paho-mqtt.json +++ b/versions/p-/paho-mqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9edde45ee5a278ee52bbb1891e9a30cab33669f8", + "version-semver": "1.3.10", + "port-version": 0 + }, { "git-tree": "b35399fddec4f6e4eb68e16308d2b1d86b0e5427", "version-semver": "1.3.9", diff --git a/versions/p-/paho-mqttpp3.json b/versions/p-/paho-mqttpp3.json index 9312ab4a247514..20df1bcb3643d1 100644 --- a/versions/p-/paho-mqttpp3.json +++ b/versions/p-/paho-mqttpp3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4e5982f9707bb0222b6694cee8d4a0d23698e20f", + "version": "1.2.0", + "port-version": 1 + }, { "git-tree": "850cb4a6ccac89062c16dd783ad0631215c1a94b", "version": "1.2.0", From d25fb81e9a1a1ee7ee870d8b1426062fc5d568d1 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Thu, 16 Jun 2022 02:04:50 +0800 Subject: [PATCH 25/56] fix support (#25206) --- ports/socket-io-client/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/s-/socket-io-client.json | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/socket-io-client/vcpkg.json b/ports/socket-io-client/vcpkg.json index e178386b542705..aa6a8e52a159d5 100644 --- a/ports/socket-io-client/vcpkg.json +++ b/ports/socket-io-client/vcpkg.json @@ -1,9 +1,10 @@ { "name": "socket-io-client", "version": "3.1.0", + "port-version": 1, "description": "C++11 implementation of Socket.IO client", "homepage": "https://github.com/socketio/socket.io-client-cpp", - "supports": "static", + "license": "MIT", "dependencies": [ "asio", "rapidjson", diff --git a/versions/baseline.json b/versions/baseline.json index 08a1c497d0030d..4789d15436d265 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6634,7 +6634,7 @@ }, "socket-io-client": { "baseline": "3.1.0", - "port-version": 0 + "port-version": 1 }, "sockpp": { "baseline": "0.7.1", diff --git a/versions/s-/socket-io-client.json b/versions/s-/socket-io-client.json index b809e765ab4ec5..97a122629ddcdc 100644 --- a/versions/s-/socket-io-client.json +++ b/versions/s-/socket-io-client.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f31e0afc883eef287abf9b7914563cd10b331b86", + "version": "3.1.0", + "port-version": 1 + }, { "git-tree": "3844cb4dc084c2fe9ddd4a15a77d0c06e391c744", "version": "3.1.0", From ffa73a4e2066e3bed3d32b6e9c0b392c26c45523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 15 Jun 2022 18:10:00 +0000 Subject: [PATCH 26/56] [zziplib] Export unofficial targets (#25205) * [zziplib] Export unofficial targets * version --- ports/zziplib/export-targets.patch | 73 ++++++++++++++++++++++++++++++ ports/zziplib/portfile.cmake | 3 ++ ports/zziplib/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/z-/zziplib.json | 5 ++ 5 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 ports/zziplib/export-targets.patch diff --git a/ports/zziplib/export-targets.patch b/ports/zziplib/export-targets.patch new file mode 100644 index 00000000000000..7bcc0655bc7ee8 --- /dev/null +++ b/ports/zziplib/export-targets.patch @@ -0,0 +1,73 @@ +diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt +index 1883272..16d4380 100644 +--- a/zzip/CMakeLists.txt ++++ b/zzip/CMakeLists.txt +@@ -175,7 +175,7 @@ set(libzzipmmapped_HDRS mmapped.h memdisk.h) + + add_library(libzzip ${libzzip_SRCS} ) + target_link_libraries(libzzip ZLIB::ZLIB ) +-target_include_directories (libzzip PRIVATE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}) ++target_include_directories (libzzip PRIVATE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} PUBLIC $) + + if(ZZIPFSEEKO) + add_library(libzzipfseeko ${libzzipfseeko_SRCS} ) +@@ -255,14 +255,14 @@ install(FILES ${outdir}/zziplib.pc ${outdir}/zzipmmapped.pc ${outdir}/zzipfseeko + endif() + + install(FILES ${libzzip_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zzip ) +-install(TARGETS libzzip ++install(TARGETS libzzip EXPORT unofficial-zziplibTargets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + if(ZZIPFSEEKO) + install(FILES ${libzzipfseeko_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zzip ) +-install(TARGETS libzzipfseeko ++install(TARGETS libzzipfseeko EXPORT unofficial-zziplibTargets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) +@@ -270,12 +270,28 @@ endif() + + if(ZZIPMMAPPED) + install(FILES ${libzzipmmapped_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zzip ) +-install(TARGETS libzzipmmapped ++install(TARGETS libzzipmmapped EXPORT unofficial-zziplibTargets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif() + ++install(EXPORT unofficial-zziplibTargets ++ NAMESPACE unofficial::zziplib:: ++ DESTINATION share/unofficial-zziplib ++) ++ ++file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-zziplib-config.cmake.in" ++[[include(CMakeFindDependencyMacro) ++find_dependency(ZLIB) ++file(GLOB TARGET_FILES "${CMAKE_CURRENT_LIST_DIR}/*Targets.cmake") ++foreach (TARGET_FILE ${TARGET_FILES}) ++ include("${TARGET_FILE}") ++endforeach() ++]]) ++configure_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-zziplib-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-zziplib-config.cmake" @ONLY) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-zziplib-config.cmake DESTINATION share/unofficial-zziplib) ++ + if(ZZIP_COMPAT) + install(FILES ${outdir}/compat/zzip.h ${outdir}/compat/zziplib.h ${outdir}/compat/zzip-io.h + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +diff --git a/zzipwrap/CMakeLists.txt b/zzipwrap/CMakeLists.txt +index ea7ea93..2d41f70 100644 +--- a/zzipwrap/CMakeLists.txt ++++ b/zzipwrap/CMakeLists.txt +@@ -83,7 +83,7 @@ install(FILES ${outdir}/zzipwrap.pc + endif() + + install(FILES ${libzzipwrap_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zzip ) +-install(TARGETS libzzipwrap ++install(TARGETS libzzipwrap EXPORT unofficial-zziplibTargets + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + diff --git a/ports/zziplib/portfile.cmake b/ports/zziplib/portfile.cmake index c771e9aa3900f1..00c9291e8b982e 100644 --- a/ports/zziplib/portfile.cmake +++ b/ports/zziplib/portfile.cmake @@ -5,6 +5,7 @@ vcpkg_from_github( SHA512 4bb089e74813c6fac9657cd96e44e4a6469bf86aba3980d885c4573e8db45e74fd07bbdfcec9f36297c72227c8c0b2c37dab1bc4326cef8529960e482fe501c8 PATCHES no-release-postfix.patch + export-targets.patch ) string(COMPARE EQUAL VCPKG_CRT_LINKAGE "static" MSVC_STATIC_RUNTIME) @@ -26,6 +27,8 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-zziplib) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/zzipfseeko.pc" diff --git a/ports/zziplib/vcpkg.json b/ports/zziplib/vcpkg.json index e0ede655b71b6e..d833544eab280a 100644 --- a/ports/zziplib/vcpkg.json +++ b/ports/zziplib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "zziplib", "version": "0.13.72", + "port-version": 1, "description": "library providing read access on ZIP-archives", "homepage": "https://github.com/gdraheim/zziplib", "license": "LGPL-2.0-or-later OR MPL-1.1", diff --git a/versions/baseline.json b/versions/baseline.json index 4789d15436d265..ab4b4177601164 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7826,7 +7826,7 @@ }, "zziplib": { "baseline": "0.13.72", - "port-version": 0 + "port-version": 1 } } } diff --git a/versions/z-/zziplib.json b/versions/z-/zziplib.json index 3aec32b519e71e..63363563fa2819 100644 --- a/versions/z-/zziplib.json +++ b/versions/z-/zziplib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "571af9ee98bd4bf80bf21fc10a5ec5971678b954", + "version": "0.13.72", + "port-version": 1 + }, { "git-tree": "e09e8bf85eff5c115f9dcf5372f8bdbab590ab6b", "version": "0.13.72", From 4e443a30b9a0a4a94b3d4e230452da6b0bd06f55 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Wed, 15 Jun 2022 20:12:37 +0200 Subject: [PATCH 27/56] [quantlib] Fix `supports` (#25191) * [quantlib] Support dynamic triplets on Windows * version * Fix cmake error * version * Fix cmake * version * only dynamic crt * version --- ports/quantlib/portfile.cmake | 8 +++++--- ports/quantlib/vcpkg.json | 4 +++- versions/baseline.json | 2 +- versions/q-/quantlib.json | 5 +++++ 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ports/quantlib/portfile.cmake b/ports/quantlib/portfile.cmake index a75a85b83171b4..36504190ac9910 100644 --- a/ports/quantlib/portfile.cmake +++ b/ports/quantlib/portfile.cmake @@ -22,9 +22,11 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME QuantLib CONFIG_PATH lib/cmake/QuantLib) vcpkg_copy_pdbs() -# Install custom usage -configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +# Install custom usage +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) + # Handle copyright -configure_file("${SOURCE_PATH}/LICENSE.TXT" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) +file(INSTALL "${SOURCE_PATH}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/quantlib/vcpkg.json b/ports/quantlib/vcpkg.json index 49aa646ed37b57..27dc4edad10cde 100644 --- a/ports/quantlib/vcpkg.json +++ b/ports/quantlib/vcpkg.json @@ -1,9 +1,11 @@ { "name": "quantlib", "version": "1.26", + "port-version": 1, "description": "The QuantLib C++ library", "homepage": "https://www.quantlib.org/", - "supports": "!(windows & !static)", + "license": "BSD-3-Clause", + "supports": "!(windows & !staticcrt)", "dependencies": [ "boost-accumulators", "boost-algorithm", diff --git a/versions/baseline.json b/versions/baseline.json index ab4b4177601164..a4a7ff74152473 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6062,7 +6062,7 @@ }, "quantlib": { "baseline": "1.26", - "port-version": 0 + "port-version": 1 }, "quaternions": { "baseline": "1.0.0", diff --git a/versions/q-/quantlib.json b/versions/q-/quantlib.json index 8e8b979b3a8387..a3498ea8713bd4 100644 --- a/versions/q-/quantlib.json +++ b/versions/q-/quantlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f5eb0f25fa5fdff2d0fd4b5cc1f1bb2e98033b59", + "version": "1.26", + "port-version": 1 + }, { "git-tree": "3af9ced73240dfb4e1ec776c5f9a16ac277d1c27", "version": "1.26", From d2f3f306072d833a506004336a76c2301650b778 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Wed, 15 Jun 2022 20:17:57 +0200 Subject: [PATCH 28/56] [gdal] Fix building for 32bit Android and msvc with poppler (#25190) * [gdal] Fix building for 32bit Android * [gdal] Adjust poppler version Fixes a compiler error * [gdal] Bump port version --- ports/gdal/dependency_win.cmake | 2 +- ports/gdal/portfile.cmake | 4 ++++ ports/gdal/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gdal.json | 5 +++++ 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ports/gdal/dependency_win.cmake b/ports/gdal/dependency_win.cmake index b31ed35461914c..c3be0f56267f30 100644 --- a/ports/gdal/dependency_win.cmake +++ b/ports/gdal/dependency_win.cmake @@ -137,7 +137,7 @@ macro(find_dependency_win) if("poppler" IN_LIST FEATURES) list(APPEND NMAKE_OPTIONS "POPPLER_ENABLED=YES") - list(APPEND NMAKE_OPTIONS "POPPLER_MAJOR_VERSION=22" "POPPLER_MINOR_VERSION=1") # Bump as needed + list(APPEND NMAKE_OPTIONS "POPPLER_MAJOR_VERSION=22" "POPPLER_MINOR_VERSION=3") # Bump as needed list(APPEND NMAKE_OPTIONS "POPPLER_CFLAGS=-I${CURRENT_INSTALLED_DIR}/include -I${CURRENT_INSTALLED_DIR}/include/poppler /std:c++17") x_vcpkg_pkgconfig_get_modules(PREFIX POPPLER MODULES --msvc-syntax poppler LIBS) list(APPEND NMAKE_OPTIONS_REL "POPPLER_LIBS=${POPPLER_LIBS_RELEASE}") diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index af8fb9731d3bc6..23de39e5c3bce5 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -288,6 +288,10 @@ else() list(APPEND CONF_OPTS "--with-tools=no") endif() + if(VCPKG_TARGET_IS_ANDROID AND (VCPKG_TARGET_ARCHITECTURE MATCHES "x86" OR VCPKG_TARGET_ARCHITECTURE MATCHES "arm")) + list(APPEND CONF_OPTS --with-unix-stdio-64=no) + endif() + vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}/gdal" AUTOCONFIG diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 636c1f50d2ccef..3f0251185e73a2 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gdal", "version-semver": "3.4.3", - "port-version": 1, + "port-version": 2, "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index a4a7ff74152473..424f022204fb5a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2458,7 +2458,7 @@ }, "gdal": { "baseline": "3.4.3", - "port-version": 1 + "port-version": 2 }, "gdcm": { "baseline": "3.0.12", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index 93235d40b5a02b..b8b03cbd31fd10 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "509d3e54670e6552cce8d811a329d6c28589392e", + "version-semver": "3.4.3", + "port-version": 2 + }, { "git-tree": "8bdf8b8ff951c1ce8719c789e66ac3a166eed063", "version-semver": "3.4.3", From 0abb2b2d88b9e4064f8fe225aed4e3858a1c66dd Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 15 Jun 2022 11:20:52 -0700 Subject: [PATCH 29/56] Update vcpkg-tool to 2022-06-15 (#25226) * Update vcpkg-tool to 2022-06-15. See https://github.com/microsoft/vcpkg-tool/releases/tag/2022-06-15 * Add `=pass` entries from https://github.com/microsoft/vcpkg-tool/pull/579 * Cherry pick XUnit output from https://github.com/microsoft/vcpkg/pull/23477 which hooks up https://github.com/microsoft/vcpkg-tool/pull/585 (Thanks again @dg0yt !) * Update release process document now that we can do the full tree rebuild to test the tool release before signing. Thank you: @autoantwort @christophe-calmejane @JackBoosY @benmcmorran @hmoffatt @klalumiere @Thomas1664 @Neumann-A @AenBleidd for your contributions! Fixes https://github.com/microsoft/vcpkg/issues/22686 . Fixes https://github.com/microsoft/vcpkg/issues/21800 . Fixes https://github.com/microsoft/vcpkg/issues/16216 . Fixes https://github.com/microsoft/vcpkg/issues/15836 . Full tree rebuild testing this update is: https://dev.azure.com/vcpkg/public/_build/results?buildId=73664&view=results --- .../internal/vcpkg_tool_release_process.md | 37 +++++++++-------- .../azure-pipelines/linux/azure-pipelines.yml | 9 +++++ .../azure-pipelines/osx/azure-pipelines.yml | 9 +++++ .../azure-pipelines/test-modified-ports.ps1 | 5 ++- .../windows/azure-pipelines.yml | 9 +++++ scripts/bootstrap.ps1 | 2 +- scripts/bootstrap.sh | 14 ++++--- scripts/ci.baseline.txt | 40 +++++++++++++++++++ 8 files changed, 98 insertions(+), 27 deletions(-) diff --git a/docs/maintainers/internal/vcpkg_tool_release_process.md b/docs/maintainers/internal/vcpkg_tool_release_process.md index 5ed3ea2df7884d..fed09f577ee11c 100644 --- a/docs/maintainers/internal/vcpkg_tool_release_process.md +++ b/docs/maintainers/internal/vcpkg_tool_release_process.md @@ -6,38 +6,37 @@ such as https://github.com/microsoft/vcpkg/pull/23757 1. Verify that all tests etc. are passing in the vcpkg-tool repo's `main` branch, and that the contents therein are acceptable for release. (Steps after this will sign code there, so this review is responsible gating what has access to code signing.) -2. On your machine, in a prompt changed to the vcpkg-tool repo, - `git fetch https://github.com/microsoft/vcpkg-tool main && git switch -d FETCH_HEAD` -3. Check that the changes there are in fact the changes that we want in that release. (Be aware, +2. Check that the changes there are in fact the changes that we want in that release. (Be aware, you are responsible for what is about to be signed with a Microsoft code signing certificate by proceeding) -4. `git push https://devdiv.visualstudio.com/DevDiv/_git/vcpkg FETCH_HEAD:main` -5. Monitor the resulting signed build at: +3. Submit a new full tree rebuild by https://dev.azure.com/vcpkg/public/_build?definitionId=29 + (microsoft.vcpkg.ci as of this writing) and queue a new build with the vcpkg-tool SHA overridden + to the one you wish to use. Example: + https://dev.azure.com/vcpkg/public/_build/results?buildId=73664&view=results +4. (Probably the next day) Check over the failures and ensure any differences with the most recent + full rebuild using the previous tool version are understood. +5. On your machine, in a prompt changed to the vcpkg-tool repo, + `git fetch https://github.com/microsoft/vcpkg-tool main && git switch -d FETCH_HEAD` +6. `git push https://devdiv.visualstudio.com/DevDiv/_git/vcpkg FETCH_HEAD:main` +7. Monitor the resulting signed build at: https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_build?definitionId=13610 and/or manually submit one. (The push is supposed to automatically submit a build but that has been somewhat unstable at the time of this writing.) -6. The signed build will automatically create a draft GitHub release at +8. The signed build will automatically create a draft GitHub release at https://github.com/microsoft/vcpkg-tool/releases . Erase the contents filled in there and press the "auto generate release notes" button. Manually remove any entries created by the automated localization tools which will start with `* LEGO: Pull request from juno/`. -7. Publish that draft release as "pre-release". -8. Smoke test the 'one liner' installer: (Where 2022-03-30 is replaced with the right release name) +9. Publish that draft release as "pre-release". +10. Smoke test the 'one liner' installer: (Where 2022-06-15 is replaced with the right release name) * Powershell: - `iex (iwr https://github.com/microsoft/vcpkg-tool/releases/download/2022-03-30/vcpkg-init.ps1)` + `iex (iwr https://github.com/microsoft/vcpkg-tool/releases/download/2022-06-15/vcpkg-init.ps1)` * Batch: - `curl -L -o vcpkg-init.cmd https://github.com/microsoft/vcpkg-tool/releases/download/2022-03-30/vcpkg-init.ps1 && .\vcpkg-init.cmd` + `curl -L -o vcpkg-init.cmd https://github.com/microsoft/vcpkg-tool/releases/download/2022-06-15/vcpkg-init.ps1 && .\vcpkg-init.cmd` * Bash: - `. <(curl https://github.com/microsoft/vcpkg-tool/releases/download/2022-03-30/vcpkg-init.sh -L)` -9. In the vcpkg repo, draft a PR which updates `bootstrap-vcpkg.sh` and `boostrap-vcpkg.ps1` + `. <(curl https://github.com/microsoft/vcpkg-tool/releases/download/2022-06-15/vcpkg-init -L)` +11. In the vcpkg repo, draft a PR which updates `bootstrap-vcpkg.sh` and `boostrap-vcpkg.ps1` with the new release date, and update SHAs as appropriate in the .sh script. (For example, see https://github.com/microsoft/vcpkg/pull/23757) -10. Submit a new full tree rebuild by https://dev.azure.com/vcpkg/public/_build?definitionId=29 - (microsoft.vcpkg.ci as of this writing) and queue a new build targeting branch - `refs/pull/ The PR number created in the previous step /head` (for example - `refs/pull/24131/head` - https://dev.azure.com/vcpkg/public/_build/results?buildId=70703&view=results) -11. (Probably the next day) Check over the failures and ensure any differences with the most recent - full rebuild using the previous tool version are understood. 12. Merge the tool update PR. 13. Change the github release in vcpkg-tool from "prerelease" to "release". (This automatically updates the aka.ms links) diff --git a/scripts/azure-pipelines/linux/azure-pipelines.yml b/scripts/azure-pipelines/linux/azure-pipelines.yml index ad50322393813b..3b0d41be46a95c 100644 --- a/scripts/azure-pipelines/linux/azure-pipelines.yml +++ b/scripts/azure-pipelines/linux/azure-pipelines.yml @@ -67,3 +67,12 @@ jobs: inputs: PathtoPublish: scripts/list_files ArtifactName: 'file lists for x64-linux' + - task: PublishTestResults@2 + displayName: 'Publish Test Results' + condition: ne(variables['XML_RESULTS_FILE'], '') + inputs: + testRunTitle: x64-linux + testResultsFormat: xUnit + testResultsFiles: $(XML_RESULTS_FILE) + platform: x64-linux + configuration: static diff --git a/scripts/azure-pipelines/osx/azure-pipelines.yml b/scripts/azure-pipelines/osx/azure-pipelines.yml index a735d66df4656a..4647b17c9edbb7 100644 --- a/scripts/azure-pipelines/osx/azure-pipelines.yml +++ b/scripts/azure-pipelines/osx/azure-pipelines.yml @@ -70,3 +70,12 @@ jobs: inputs: PathtoPublish: scripts/list_files ArtifactName: 'file lists for x64-osx${{ variables.Postfix }}' + - task: PublishTestResults@2 + displayName: 'Publish Test Results' + condition: ne(variables['XML_RESULTS_FILE'], '') + inputs: + testRunTitle: x64-osx + testResultsFormat: xUnit + testResultsFiles: $(XML_RESULTS_FILE) + platform: x64-osx + configuration: static diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index dd8e25fdcab858..55a05aef3220d6 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -116,6 +116,7 @@ else { } $failureLogs = Join-Path $ArtifactStagingDirectory 'failure-logs' +$xunitFile = Join-Path $ArtifactStagingDirectory "$Triplet-results.xml" if ($IsWindows) { @@ -162,7 +163,7 @@ if (($BuildReason -eq 'PullRequest') -and -not $NoParentHashes) # but changes must trigger at least some testing. Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake" Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake-user" -& "./vcpkg$executableExtension" ci "--triplet=$Triplet" --failure-logs=$failureLogs "--ci-baseline=$PSScriptRoot/../ci.baseline.txt" @commonArgs @cachingArgs @parentHashes @skipFailuresArg +& "./vcpkg$executableExtension" ci "--triplet=$Triplet" --failure-logs=$failureLogs --x-xunit=$xunitFile "--ci-baseline=$PSScriptRoot/../ci.baseline.txt" @commonArgs @cachingArgs @parentHashes @skipFailuresArg $failureLogsEmpty = (-Not (Test-Path $failureLogs) -Or ((Get-ChildItem $failureLogs).count -eq 0)) Write-Host "##vso[task.setvariable variable=FAILURE_LOGS_EMPTY]$failureLogsEmpty" @@ -171,3 +172,5 @@ if ($LASTEXITCODE -ne 0) { throw "vcpkg ci failed" } + +Write-Host "##vso[task.setvariable variable=XML_RESULTS_FILE]$xunitFile" diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml index a456464383bdf5..a06da2a2c6d352 100644 --- a/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -96,3 +96,12 @@ jobs: inputs: PathtoPublish: scripts/list_files ArtifactName: 'file lists for ${{ parameters.triplet }}' + - task: PublishTestResults@2 + displayName: 'Publish Test Results' + condition: ne(variables['XML_RESULTS_FILE'], '') + inputs: + testRunTitle: ${{ parameters.triplet }} + testResultsFormat: xUnit + testResultsFiles: $(XML_RESULTS_FILE) + platform: ${{ parameters.triplet }} + diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 3c18f30f29abad..87bdbcd5bd9365 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -45,7 +45,7 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root")) Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found" -$versionDate = '2022-05-05' +$versionDate = '2022-06-15' if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64' -or $env:PROCESSOR_IDENTIFIER -match "ARMv[8,9] \(64-bit\)") { & "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg-arm64.exe" "$vcpkgRootDir\vcpkg.exe" } else { diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 157c7585a7aae4..2f9761df528f2b 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -126,23 +126,23 @@ fi # Choose the vcpkg binary to download vcpkgDownloadTool="ON" -vcpkgToolReleaseTag="2022-05-05" +vcpkgToolReleaseTag="2022-06-15" if [ "$UNAME" = "Darwin" ]; then echo "Downloading vcpkg-macos..." - vcpkgToolReleaseSha="d1bc1de6185892b90641256ac509aac88b6c23d5f4875038d071b4518f33d852d7519346a78d79913748991203a9474632d59645c788b1fe56f74938327bb90f" + vcpkgToolReleaseSha="2062863a36ff4bce3b5cd85a69bf5963bb797daa8c26e192d370b6569475ae773941d6e36362d0eb8d8762332443db6414aeebadce4e209b4da6e6d9e2ba93b1" vcpkgToolName="vcpkg-macos" elif [ "$vcpkgUseMuslC" = "ON" ]; then echo "Downloading vcpkg-muslc..." - vcpkgToolReleaseSha="d698b5c37438eb03846d3908a67a7b955242d4e73c069ac4668de3be5fee8c21bf7ff0d291f5b85c6415fae70ca8d3ff926a757eb5aeda8b5d112d24c6874133" + vcpkgToolReleaseSha="759ad177784d2a3e8445279006ee642899d21eaed11d76f6889c5d8d5607dca67d0ae94784f6c9cc1240bc1dafe38a302fb5ee36a8407416e10434da7dda4f47" vcpkgToolName="vcpkg-muslc" elif [ "$ARCH" = "x86_64" ]; then echo "Downloading vcpkg-glibc..." - vcpkgToolReleaseSha="bd1c24f113acee53c458b204b2443bb3a2e129f0df7f2772c83876e97e7788e9151d0ab92248ed5ee7cecf1152569ccb1050f174e70a7a21d7da8a580c73c132" + vcpkgToolReleaseSha="ddf0814eaa751bef6d5aaa104610ef2c59cda8d304f40679cc4542a8c7dee885d5363dee74567111b0d0a4a9929252370941f690b199e5c60eee3bc3e7c5490a" vcpkgToolName="vcpkg-glibc" else echo "Unable to determine a binary release of vcpkg; attempting to build from source." vcpkgDownloadTool="OFF" - vcpkgToolReleaseSha="9968b2420c19ac88fd912aa0d3d230a4712d51c411a7f5023c4a5d96c5fcc963ce8fbb286594220b5dfc63e23bdbcf3439326b90262dd89ea5b63afa143ca699" + vcpkgToolReleaseSha="cb0ec26f8aab601588b4505f9eeb3076562e22f3f955ef7b21396cd7b2a93940ef89c3f945a5816db6f73d42724a00a69588819b0421d79a122bcd3d63f81b2e" fi # Do the download or build. @@ -195,7 +195,9 @@ if [ "$vcpkgDownloadTool" = "ON" ]; then vcpkgDownloadFile "https://github.com/microsoft/vcpkg-tool/releases/download/$vcpkgToolReleaseTag/$vcpkgToolName" "$vcpkgRootDir/vcpkg" $vcpkgToolReleaseSha else if [ "x$CXX" = "x" ]; then - if which g++-11 >/dev/null 2>&1; then + if which g++-12 >/dev/null 2>&1; then + CXX=g++-12 + elif which g++-11 >/dev/null 2>&1; then CXX=g++-11 elif which g++-10 >/dev/null 2>&1; then CXX=g++-10 diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 0208f3120395ea..2b5865219ff1f1 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1278,3 +1278,43 @@ angle:x64-windows-static-md=fail angle:x64-uwp=fail angle:arm64-windows=fail angle:arm-uwp=fail + +vcpkg-ci-boost:x64-linux=pass +vcpkg-ci-boost:x64-windows-static-md=pass +vcpkg-ci-boost:x64-windows-static=pass +vcpkg-ci-boost:x64-windows=pass +vcpkg-ci-boost:x86-windows=pass +vcpkg-ci-ffmpeg:arm-uwp=pass +vcpkg-ci-ffmpeg:arm64-windows=pass +vcpkg-ci-ffmpeg:x64-linux=pass +vcpkg-ci-ffmpeg:x64-uwp=pass +vcpkg-ci-ffmpeg:x64-windows-static-md=pass +vcpkg-ci-ffmpeg:x64-windows-static=pass +vcpkg-ci-ffmpeg:x64-windows=pass +vcpkg-ci-ffmpeg:x86-windows=pass +vcpkg-ci-llvm:x64-linux=pass +vcpkg-ci-llvm:x64-osx=pass +vcpkg-ci-llvm:x64-windows-static-md=pass +vcpkg-ci-llvm:x64-windows-static=pass +vcpkg-ci-llvm:x64-windows=pass +vcpkg-ci-llvm:x86-windows=pass +vcpkg-ci-opencv:arm-uwp=pass +vcpkg-ci-opencv:arm64-windows=pass +vcpkg-ci-opencv:x64-linux=pass +vcpkg-ci-opencv:x64-uwp=pass +vcpkg-ci-opencv:x64-windows-static-md=pass +vcpkg-ci-opencv:x64-windows-static=pass +vcpkg-ci-opencv:x64-windows=pass +vcpkg-ci-opencv:x86-windows=pass +vcpkg-ci-paraview:x64-linux=pass +vcpkg-ci-paraview:x64-osx=pass +vcpkg-ci-paraview:x64-windows-static-md=pass +vcpkg-ci-paraview:x64-windows-static=pass +vcpkg-ci-paraview:x64-windows=pass +vcpkg-ci-paraview:x86-windows=pass +vcpkg-ci-wxwidgets:arm64-windows=pass +vcpkg-ci-wxwidgets:x64-osx=pass +vcpkg-ci-wxwidgets:x64-windows-static-md=pass +vcpkg-ci-wxwidgets:x64-windows-static=pass +vcpkg-ci-wxwidgets:x64-windows=pass +vcpkg-ci-wxwidgets:x86-windows=pass From aa01a5e13f6a8e7073e47043c60645c6ab4eaab2 Mon Sep 17 00:00:00 2001 From: Christophe Calmejane Date: Wed, 15 Jun 2022 20:27:18 +0200 Subject: [PATCH 30/56] Added documentation for VCPKG_FORCE_DOWNLOADED_BINARIES env var (#24674) See https://github.com/microsoft/vcpkg-tool/pull/138 Co-authored-by: Christophe Calmejane Co-authored-by: Billy Robert O'Neal III --- docs/users/config-environment.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/users/config-environment.md b/docs/users/config-environment.md index 3fca13efe1c801..6cf44aa0953cea 100644 --- a/docs/users/config-environment.md +++ b/docs/users/config-environment.md @@ -59,6 +59,10 @@ List paths to overlays using the platform dependent PATH separator (Windows `;`, This environment variable, if set, suppresses the downloading of CMake and Ninja and forces the use of the system binaries. +#### VCPKG_FORCE_DOWNLOADED_BINARIES + +This environment variable, if set, ignores the use of the system binaries and will always download and use the version defined by vcpkg. + #### VCPKG_KEEP_ENV_VARS This environment variable can be set to a list of environment variables, separated by `;`, which will be propagated to From 86ff75c6d8232b54d3ebd0e71525b4634dcd9523 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Thu, 16 Jun 2022 02:34:55 +0800 Subject: [PATCH 31/56] [glog] fix not work on c++03 (#25155) * [glog] fix not work on c++03 * remove NOMINMAX * Revert "remove NOMINMAX" This reverts commit 17a80f259dd2718a375d06c0686f69c647cf2d57. * fix atomic * remove nominmax * CI [skip actions] --- ports/glog/cmakelists_atomicdetect.patch | 17 +++++++ ports/glog/fix-SOME_KIND_OF_LOG.patch | 58 +++++++++++++++++++++++ ports/glog/fix-windows-CXX11_ATOMIC.patch | 17 ------- ports/glog/portfile.cmake | 4 +- ports/glog/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/glog.json | 5 ++ 7 files changed, 84 insertions(+), 21 deletions(-) create mode 100644 ports/glog/cmakelists_atomicdetect.patch create mode 100644 ports/glog/fix-SOME_KIND_OF_LOG.patch delete mode 100644 ports/glog/fix-windows-CXX11_ATOMIC.patch diff --git a/ports/glog/cmakelists_atomicdetect.patch b/ports/glog/cmakelists_atomicdetect.patch new file mode 100644 index 00000000000000..0b02e1a9abeecd --- /dev/null +++ b/ports/glog/cmakelists_atomicdetect.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 13c474b..7858c8f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -398,6 +398,12 @@ if (HAVE_EXECINFO_H) + set (HAVE_STACKTRACE 1) + endif (HAVE_EXECINFO_H) + ++if (HAVE_CXX11_ATOMIC) ++ set (ac_cv_cxx11_atomic 1) ++else () ++ set (ac_cv_cxx11_atomic 0) ++endif () ++ + if (WITH_SYMBOLIZE) + if (WIN32 OR CYGWIN) + if(CMAKE_CROSSCOMPILING) diff --git a/ports/glog/fix-SOME_KIND_OF_LOG.patch b/ports/glog/fix-SOME_KIND_OF_LOG.patch new file mode 100644 index 00000000000000..7e48d2cfc32f07 --- /dev/null +++ b/ports/glog/fix-SOME_KIND_OF_LOG.patch @@ -0,0 +1,58 @@ +diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in +index 3ecacfb..ef10284 100644 +--- a/src/glog/logging.h.in ++++ b/src/glog/logging.h.in +@@ -100,7 +100,7 @@ + #include + #endif + +-#ifdef HAVE_CXX11_ATOMIC ++#if @ac_cv_cxx11_atomic@ + #include + #elif defined(GLOG_OS_WINDOWS) + #include +@@ -1014,7 +1014,7 @@ extern "C" void AnnotateBenignRaceSized( + namespace google { + #endif + +-#ifdef HAVE_CXX11_ATOMIC ++#if @ac_cv_cxx11_atomic@ + #define SOME_KIND_OF_LOG_EVERY_N(severity, n, what_to_do) \ + static std::atomic LOG_OCCURRENCES(0), LOG_OCCURRENCES_MOD_N(0); \ + _GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_OCCURRENCES, sizeof(int), "")); \ +@@ -1061,7 +1061,7 @@ namespace google { + #elif defined(GLOG_OS_WINDOWS) + + #define SOME_KIND_OF_LOG_EVERY_N(severity, n, what_to_do) \ +- static int LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ ++ static volatile unsigned LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ + InterlockedIncrement(&LOG_OCCURRENCES); \ + if (InterlockedIncrement(&LOG_OCCURRENCES_MOD_N) > n) \ + InterlockedExchangeSubtract(&LOG_OCCURRENCES_MOD_N, n); \ +@@ -1071,7 +1071,7 @@ namespace google { + &what_to_do).stream() + + #define SOME_KIND_OF_LOG_IF_EVERY_N(severity, condition, n, what_to_do) \ +- static int LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ ++ static volatile unsigned LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ + InterlockedIncrement(&LOG_OCCURRENCES); \ + if (condition && \ + (InterlockedIncrement(&LOG_OCCURRENCES_MOD_N) || true) && \ +@@ -1082,7 +1082,7 @@ namespace google { + &what_to_do).stream() + + #define SOME_KIND_OF_PLOG_EVERY_N(severity, n, what_to_do) \ +- static int LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ ++ static volatile unsigned LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ + InterlockedIncrement(&LOG_OCCURRENCES); \ + if (InterlockedIncrement(&LOG_OCCURRENCES_MOD_N) > n) \ + InterlockedExchangeSubtract(&LOG_OCCURRENCES_MOD_N, n); \ +@@ -1092,7 +1092,7 @@ namespace google { + &what_to_do).stream() + + #define SOME_KIND_OF_LOG_FIRST_N(severity, n, what_to_do) \ +- static int LOG_OCCURRENCES = 0; \ ++ static volatile unsigned LOG_OCCURRENCES = 0; \ + if (LOG_OCCURRENCES <= n) \ + InterlockedIncrement(&LOG_OCCURRENCES); \ + if (LOG_OCCURRENCES <= n) \ diff --git a/ports/glog/fix-windows-CXX11_ATOMIC.patch b/ports/glog/fix-windows-CXX11_ATOMIC.patch deleted file mode 100644 index 1e1723e363e70a..00000000000000 --- a/ports/glog/fix-windows-CXX11_ATOMIC.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in -index 3ecacfb..2d48a0e 100644 ---- a/src/glog/logging.h.in -+++ b/src/glog/logging.h.in -@@ -100,6 +100,12 @@ - #include - #endif - -+#ifdef GLOG_OS_WINDOWS -+#ifndef HAVE_CXX11_ATOMIC -+#define HAVE_CXX11_ATOMIC -+#endif -+#endif -+ - #ifdef HAVE_CXX11_ATOMIC - #include - #elif defined(GLOG_OS_WINDOWS) diff --git a/ports/glog/portfile.cmake b/ports/glog/portfile.cmake index 10e1d13c234441..e8b8033b6a88a6 100644 --- a/ports/glog/portfile.cmake +++ b/ports/glog/portfile.cmake @@ -8,9 +8,9 @@ vcpkg_from_github( glog_disable_debug_postfix.patch fix_glog_CMAKE_MODULE_PATH.patch fix_log_every_n.patch - fix-windows-CXX11_ATOMIC.patch + fix-SOME_KIND_OF_LOG.patch fix_crosscompile_symbolize.patch - + cmakelists_atomicdetect.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/glog/vcpkg.json b/ports/glog/vcpkg.json index 5f6b947fed76ac..d53b0421e0417e 100644 --- a/ports/glog/vcpkg.json +++ b/ports/glog/vcpkg.json @@ -1,7 +1,7 @@ { "name": "glog", "version": "0.5.0", - "port-version": 4, + "port-version": 5, "description": "C++ implementation of the Google logging module", "homepage": "https://github.com/google/glog", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 424f022204fb5a..2473f585e9b74d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2582,7 +2582,7 @@ }, "glog": { "baseline": "0.5.0", - "port-version": 4 + "port-version": 5 }, "gloo": { "baseline": "20201203", diff --git a/versions/g-/glog.json b/versions/g-/glog.json index 94c50d82ac0083..eb8144dd2bbb2f 100644 --- a/versions/g-/glog.json +++ b/versions/g-/glog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b1c79ab6934cb1a24d37e2e7c0a73f486f3400c4", + "version": "0.5.0", + "port-version": 5 + }, { "git-tree": "bb5f54eba990cc0f03c64e1d09f343dd6cd7b22b", "version": "0.5.0", From a175d0a7d82fa254fb3d4263c37fcd0ebebb1c83 Mon Sep 17 00:00:00 2001 From: Long Huan <8551701+longhuan2018@users.noreply.github.com> Date: Thu, 16 Jun 2022 02:43:38 +0800 Subject: [PATCH 32/56] [openmvs, vcglib] Update openmvs 2.0.1, vcglib 2022.02 (#25135) * update version * Update vcpkg.json * fix * fix * fix some * x-add-version * license info * x-add-version * Update vcpkg.json * Update openmvs.json --- ports/openmvs/fix-build-boost-1_77_0.patch | 19 -- ports/openmvs/fix-build.patch | 379 ++++----------------- ports/openmvs/no-absolute-paths.patch | 26 +- ports/openmvs/portfile.cmake | 34 +- ports/openmvs/vcpkg.json | 20 +- ports/vcglib/consume-vcpkg-eigen3.patch | 216 +----------- ports/vcglib/fix-build.patch | 13 + ports/vcglib/portfile.cmake | 12 +- ports/vcglib/vcpkg.json | 4 +- versions/baseline.json | 8 +- versions/o-/openmvs.json | 5 + versions/v-/vcglib.json | 5 + 12 files changed, 164 insertions(+), 577 deletions(-) delete mode 100644 ports/openmvs/fix-build-boost-1_77_0.patch create mode 100644 ports/vcglib/fix-build.patch diff --git a/ports/openmvs/fix-build-boost-1_77_0.patch b/ports/openmvs/fix-build-boost-1_77_0.patch deleted file mode 100644 index 69924d219c5671..00000000000000 --- a/ports/openmvs/fix-build-boost-1_77_0.patch +++ /dev/null @@ -1,19 +0,0 @@ - libs/Common/Common.cpp | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/libs/Common/Common.cpp b/libs/Common/Common.cpp -index 052951d..8dc404e 100644 ---- a/libs/Common/Common.cpp -+++ b/libs/Common/Common.cpp -@@ -31,6 +31,11 @@ namespace boost { - ASSERT("boost exception thrown" == NULL); - exit(EXIT_FAILURE); - } -+ void throw_exception(std::exception const & e, boost::source_location const &) { -+ VERBOSE("exception thrown: %s", e.what()); -+ ASSERT("boost exception thrown" == NULL); -+ exit(EXIT_FAILURE); -+ } - } // namespace boost - #endif - #endif diff --git a/ports/openmvs/fix-build.patch b/ports/openmvs/fix-build.patch index f40ec26f484cdf..50884fd73d6b80 100644 --- a/ports/openmvs/fix-build.patch +++ b/ports/openmvs/fix-build.patch @@ -1,170 +1,24 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7966ed5..f34b5b4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -63,9 +63,10 @@ INCLUDE_DIRECTORIES("${OpenMVS_SOURCE_DIR}") - SET(OpenMVS_EXTRA_LIBS "") - if(OpenMVS_USE_OPENMP) - SET(OpenMP_LIBS "") -- FIND_PACKAGE(OpenMP) -- if(OPENMP_FOUND) -- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") -+ FIND_PACKAGE(OpenMP REQUIRED) -+ if(OpenMP_FOUND) -+ link_libraries(OpenMP::OpenMP_CXX) -+ link_libraries(OpenMP::OpenMP_C) - ADD_DEFINITIONS(-D_USE_OPENMP) - SET(_USE_OPENMP TRUE) - #cmake only check for separate OpenMP library on AppleClang 7+ -@@ -83,7 +84,7 @@ if(OpenMVS_USE_OPENGL) - if(POLICY CMP0072) - cmake_policy(SET CMP0072 NEW) - endif() -- FIND_PACKAGE(OpenGL) -+ FIND_PACKAGE(OpenGL REQUIRED) - if(OPENGL_FOUND) - INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR}) - ADD_DEFINITIONS(${OpenGL_DEFINITIONS} -D_USE_OPENGL) -@@ -94,7 +95,7 @@ if(OpenMVS_USE_OPENGL) - endif() +diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt +index 2365de65f..4d871850d 100644 +--- a/apps/CMakeLists.txt ++++ b/apps/CMakeLists.txt +@@ -1,6 +1,7 @@ + # Add applications + ADD_SUBDIRECTORY(InterfaceCOLMAP) + ADD_SUBDIRECTORY(InterfaceMetashape) ++ADD_SUBDIRECTORY(InterfaceVisualSFM) + ADD_SUBDIRECTORY(DensifyPointCloud) + ADD_SUBDIRECTORY(ReconstructMesh) + ADD_SUBDIRECTORY(RefineMesh) + +diff --git a/build/Templates/OpenMVSConfig.cmake.in b/build/Templates/OpenMVSConfig.cmake.in +index 9747b3e1..5e2469d3 100644 +--- a/build/Templates/OpenMVSConfig.cmake.in ++++ b/build/Templates/OpenMVSConfig.cmake.in +@@ -15,9 +15,67 @@ set(OpenMVS_INCLUDE_DIRS "@INSTALL_INCLUDE_DIR_IN@") + + set(OpenMVS_DEFINITIONS "@OpenMVS_DEFINITIONS@") - if(OpenMVS_USE_CUDA) -- FIND_PACKAGE(CUDA) -+ FIND_PACKAGE(CUDA REQUIRED) - if(CUDA_FOUND) - INCLUDE_DIRECTORIES(${CUDA_INCLUDE_DIRS}) - ADD_DEFINITIONS(-D_USE_CUDA) -@@ -108,7 +109,7 @@ else() - endif() - - if(OpenMVS_USE_BREAKPAD) -- FIND_PACKAGE(BREAKPAD) -+ FIND_PACKAGE(BREAKPAD REQUIRED) - if(BREAKPAD_FOUND) - INCLUDE_DIRECTORIES(${BREAKPAD_INCLUDE_DIRS}) - ADD_DEFINITIONS(${BREAKPAD_DEFINITIONS} -D_USE_BREAKPAD) -@@ -119,7 +120,7 @@ if(OpenMVS_USE_BREAKPAD) - endif() - endif() - --FIND_PACKAGE(Boost ${SYSTEM_PACKAGE_REQUIRED} COMPONENTS iostreams program_options system serialization) -+FIND_PACKAGE(Boost COMPONENTS iostreams program_options system serialization REQUIRED) - if(Boost_FOUND) - INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) - ADD_DEFINITIONS(${Boost_DEFINITIONS} -D_USE_BOOST) -@@ -127,14 +128,14 @@ if(Boost_FOUND) - SET(_USE_BOOST TRUE) - endif() - --FIND_PACKAGE(Eigen ${SYSTEM_PACKAGE_REQUIRED}) --if(EIGEN_FOUND) -- INCLUDE_DIRECTORIES(${EIGEN_INCLUDE_DIRS}) -- ADD_DEFINITIONS(${EIGEN_DEFINITIONS} -D_USE_EIGEN) -+FIND_PACKAGE(Eigen3 REQUIRED) -+if(EIGEN3_FOUND) -+ INCLUDE_DIRECTORIES(${EIGEN3_INCLUDE_DIRS}) -+ ADD_DEFINITIONS(${EIGEN3_DEFINITIONS} -D_USE_EIGEN) - SET(_USE_EIGEN TRUE) - endif() - --FIND_PACKAGE(OpenCV ${SYSTEM_PACKAGE_REQUIRED}) -+FIND_PACKAGE(OpenCV REQUIRED) - if(OpenCV_FOUND) - INCLUDE_DIRECTORIES(${OpenCV_INCLUDE_DIRS}) - ADD_DEFINITIONS(${OpenCV_DEFINITIONS}) -@@ -170,7 +171,9 @@ ADD_DEFINITIONS(${OpenMVS_DEFINITIONS}) - - # Add modules - ADD_SUBDIRECTORY(libs) -+if(OpenMVS_BUILD_TOOLS) - ADD_SUBDIRECTORY(apps) -+endif() - ADD_SUBDIRECTORY(docs) - - if(OpenMVS_USE_CERES) -@@ -188,7 +191,7 @@ export(TARGETS Common IO Math MVS FILE "${PROJECT_BINARY_DIR}/OpenMVSTargets.cma - # Export the package for use from the build-tree - # (this registers the build-tree with a global CMake-registry) - export(PACKAGE OpenMVS) -- -+ - # Create the OpenMVSConfig.cmake and OpenMVSConfigVersion files - file(RELATIVE_PATH REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}" "${INSTALL_INCLUDE_DIR}") - # ... for the build tree -@@ -199,7 +202,7 @@ set(CONF_INCLUDE_DIRS "${INSTALL_CMAKE_DIR}/${REL_INCLUDE_DIR}") - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/build/OpenMVSConfig.cmake.in" "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/OpenMVSConfig.cmake" @ONLY) - # ... for both - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/build/OpenMVSConfigVersion.cmake.in" "${PROJECT_BINARY_DIR}/OpenMVSConfigVersion.cmake" @ONLY) -- -+ - # Install the OpenMVSConfig.cmake and OpenMVSConfigVersion.cmake - install(FILES - "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/OpenMVSConfig.cmake" -diff --git a/MvgMvsPipeline.py b/MvgMvsPipeline.py.in -similarity index 97% -rename from MvgMvsPipeline.py -rename to MvgMvsPipeline.py.in -index f4914bf..23d03e6 100644 ---- a/MvgMvsPipeline.py -+++ b/MvgMvsPipeline.py.in -@@ -175,10 +175,10 @@ class StepsStore: - ["-i", "%input_dir%", "-o", "%matches_dir%", "-d", "%camera_file_params%"]], - ["Compute features", # 1 - os.path.join(OPENMVG_BIN, "openMVG_main_ComputeFeatures"), -- ["-i", "%matches_dir%/sfm_data.json", "-o", "%matches_dir%", "-m", "SIFT", "-n", "4"]], -+ ["-i", "%matches_dir%/sfm_data.json", "-o", "%matches_dir%", "-m", "SIFT"]], - ["Compute matches", # 2 - os.path.join(OPENMVG_BIN, "openMVG_main_ComputeMatches"), -- ["-i", "%matches_dir%/sfm_data.json", "-o", "%matches_dir%", "-n", "HNSWL2", "-r", ".8"]], -+ ["-i", "%matches_dir%/sfm_data.json", "-o", "%matches_dir%", "-n", "AUTO", "-r", ".8"]], - ["Incremental reconstruction", # 3 - os.path.join(OPENMVG_BIN, "openMVG_main_IncrementalSfM"), - ["-i", "%matches_dir%/sfm_data.json", "-m", "%matches_dir%", "-o", "%reconstruction_dir%"]], -diff --git a/apps/Viewer/CMakeLists.txt b/apps/Viewer/CMakeLists.txt -index c519040..934cd50 100644 ---- a/apps/Viewer/CMakeLists.txt -+++ b/apps/Viewer/CMakeLists.txt -@@ -16,18 +16,6 @@ else() - MESSAGE("-- Can't find GLEW. Continuing without it.") - RETURN() - endif() --if(CMAKE_COMPILER_IS_GNUCXX) -- FIND_PACKAGE(PkgConfig QUIET) -- pkg_search_module(GLFW QUIET glfw3) -- if(GLFW_FOUND) -- INCLUDE_DIRECTORIES(${GLFW_INCLUDE_DIRS}) -- ADD_DEFINITIONS(${GLFW_DEFINITIONS}) -- MESSAGE(STATUS "GLFW3 ${GLFW_VERSION} found (include: ${GLFW_INCLUDE_DIRS})") -- else() -- MESSAGE("-- Can't find GLFW3. Continuing without it.") -- RETURN() -- endif() --else() - FIND_PACKAGE(glfw3 QUIET) - if(glfw3_FOUND) - INCLUDE_DIRECTORIES(${glfw3_INCLUDE_DIRS}) -@@ -37,7 +25,6 @@ else() - MESSAGE("-- Can't find GLFW3. Continuing without it.") - RETURN() - endif() --endif() - - # List sources files - FILE(GLOB PCH_C "Common.cpp") -diff --git a/build/OpenMVSConfig.cmake.in b/build/OpenMVSConfig.cmake.in -index 96b8fe2..fa6d4a6 100644 ---- a/build/OpenMVSConfig.cmake.in -+++ b/build/OpenMVSConfig.cmake.in -@@ -3,16 +3,71 @@ - # OpenMVS_INCLUDE_DIRS - include directories for OpenMVS - # OpenMVS_LIBRARIES - libraries to link against - # OpenMVS_BINARIES - the binaries -- -+ - # Compute paths - get_filename_component(OpenMVS_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) - set(OpenMVS_INCLUDE_DIRS "@CONF_INCLUDE_DIRS@") -- +list(APPEND CMAKE_MODULE_PATH "${OpenMVS_CMAKE_DIR}") + +if (MSVC) @@ -221,36 +75,33 @@ index 96b8fe2..fa6d4a6 100644 + +add_definitions(@OpenMVS_DEFINITIONS@) + - # Our library dependencies (contains definitions for IMPORTED targets) - if(NOT TARGET MVS AND NOT OpenMVS_BINARY_DIR) - include("${OpenMVS_CMAKE_DIR}/OpenMVSTargets.cmake") - endif() -- ++# Our library dependencies (contains definitions for IMPORTED targets) ++if(NOT TARGET MVS AND NOT OpenMVS_BINARY_DIR) ++ include("${OpenMVS_CMAKE_DIR}/OpenMVSTargets.cmake") ++endif() + # These are IMPORTED targets created by OpenMVSTargets.cmake set(OpenMVS_LIBRARIES MVS) - set(OpenMVS_BINARIES InterfaceVisualSFM DensifyPointCloud ReconstructMesh RefineMesh TextureMesh) +-set(OpenMVS_BINARIES InterfaceCOLMAP DensifyPointCloud ReconstructMesh RefineMesh TextureMesh) +- +-include("${CMAKE_CURRENT_LIST_DIR}/OpenMVSTargets.cmake") +-check_required_components("OpenMVS") ++set(OpenMVS_BINARIES InterfaceVisualSFM InterfaceCOLMAP DensifyPointCloud ReconstructMesh RefineMesh TextureMesh) + diff --git a/build/Utils.cmake b/build/Utils.cmake -index f41c9d8..31cd292 100644 +index 106d43167..33390d192 100644 --- a/build/Utils.cmake +++ b/build/Utils.cmake -@@ -160,7 +160,7 @@ macro(GetOperatingSystemArchitectureBitness) - elseif(CMAKE_SYSTEM_PROCESSOR MATCHES i686.*|i386.*|x86.*) - set(X86 1) - endif() -- -+ - if(NOT ${MY_VAR_PREFIX}_PACKAGE_REQUIRED) - set(${MY_VAR_PREFIX}_PACKAGE_REQUIRED "REQUIRED") - endif() -@@ -173,30 +173,6 @@ macro(ComposePackageLibSuffix) +@@ -173,32 +173,6 @@ macro(ComposePackageLibSuffix) set(PACKAGE_LIB_SUFFIX "") set(PACKAGE_LIB_SUFFIX_DBG "") set(PACKAGE_LIB_SUFFIX_REL "") - if(MSVC) -- if("${MSVC_VERSION}" STREQUAL "1921") +- if("${MSVC_VERSION}" STRGREATER "1929") +- set(PACKAGE_LIB_SUFFIX "/vc17") +- elseif("${MSVC_VERSION}" STRGREATER "1916") - set(PACKAGE_LIB_SUFFIX "/vc16") -- elseif("${MSVC_VERSION}" STREQUAL "1916") +- elseif("${MSVC_VERSION}" STRGREATER "1900") - set(PACKAGE_LIB_SUFFIX "/vc15") - elseif("${MSVC_VERSION}" STREQUAL "1900") - set(PACKAGE_LIB_SUFFIX "/vc14") @@ -274,58 +125,31 @@ index f41c9d8..31cd292 100644 endmacro() -@@ -511,7 +487,7 @@ macro(optimize_default_compiler_settings) - endif() - add_extra_compiler_option(-fdiagnostics-show-option) - add_extra_compiler_option(-ftemplate-backtrace-limit=0) -- -+ - # The -Wno-long-long is required in 64bit systems when including sytem headers. - if(X86_64) - add_extra_compiler_option(-Wno-long-long) -@@ -817,7 +793,7 @@ macro(ConfigCompilerAndLinker) - else() - set(cxx_rtti_support "${cxx_no_rtti_flags}") - endif() -- -+ - SET(cxx_default "${cxx_exception_support} ${cxx_rtti_support}" CACHE PATH "Common compile CXX flags") - SET(c_default "${CMAKE_C_FLAGS} ${cxx_base_flags}" CACHE PATH "Common compile C flags") - endmacro() -@@ -825,16 +801,12 @@ endmacro() - # Initialize variables needed for a library type project. - macro(ConfigLibrary) +@@ -806,12 +780,8 @@ macro(ConfigLibrary) # Offer the user the choice of overriding the installation directories -- set(INSTALL_LIB_DIR "lib/${PROJECT_NAME}" CACHE PATH "Installation directory for libraries") -- set(INSTALL_BIN_DIR "bin/${PROJECT_NAME}" CACHE PATH "Installation directory for executables") -- set(INSTALL_INCLUDE_DIR "include/${PROJECT_NAME}" CACHE PATH "Installation directory for header files") + set(INSTALL_LIB_DIR "lib" CACHE PATH "Installation directory for libraries") + set(INSTALL_BIN_DIR "bin" CACHE PATH "Installation directory for executables") +- set(INSTALL_INCLUDE_DIR "include" CACHE PATH "Installation directory for header files") - if(WIN32 AND NOT CYGWIN) - set(DEF_INSTALL_CMAKE_DIR "CMake") - else() -- set(DEF_INSTALL_CMAKE_DIR "lib/CMake/${PROJECT_NAME}") +- set(DEF_INSTALL_CMAKE_DIR "lib/cmake") - endif() -+ set(INSTALL_LIB_DIR "lib" CACHE PATH "Installation directory for libraries") -+ set(INSTALL_BIN_DIR "bin" CACHE PATH "Installation directory for executables") + set(INSTALL_INCLUDE_DIR "include/openmvs" CACHE PATH "Installation directory for header files") + set(DEF_INSTALL_CMAKE_DIR "share/openmvs") set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files") -- -+ # Make relative paths absolute (needed later on) foreach(p LIB BIN INCLUDE CMAKE) - set(var INSTALL_${p}_DIR) -diff --git a/libs/Common/CMakeLists.txt b/libs/Common/CMakeLists.txt -index 2e6c1a4..6e1fa95 100644 ---- a/libs/Common/CMakeLists.txt -+++ b/libs/Common/CMakeLists.txt -@@ -18,6 +18,7 @@ set_target_pch(Common Common.h) - - # Link its dependencies - TARGET_LINK_LIBRARIES(Common ${Boost_LIBRARIES} ${OpenCV_LIBS}) -+TARGET_INCLUDE_DIRECTORIES(Common PUBLIC $ $) +@@ -822,7 +792,7 @@ macro(ConfigLibrary) + else() + set(${varp} "${CMAKE_INSTALL_PREFIX}/${${var}}") + endif() +- set(${var} "${${varp}}/${PROJECT_NAME}") ++ set(${var} "${${varp}}") + endforeach() + endmacro() - # Install - SET_TARGET_PROPERTIES(Common PROPERTIES + diff --git a/libs/Common/Strings.h b/libs/Common/MVSStrings.h similarity index 100% rename from libs/Common/Strings.h @@ -334,7 +158,7 @@ diff --git a/libs/Common/Types.h b/libs/Common/Types.h index bcac65c..9abeefb 100644 --- a/libs/Common/Types.h +++ b/libs/Common/Types.h -@@ -378,7 +378,7 @@ typedef TAliasCast CastD2I; +@@ -380,7 +380,7 @@ typedef TAliasCast CastD2I; // I N C L U D E S ///////////////////////////////////////////////// @@ -343,90 +167,17 @@ index bcac65c..9abeefb 100644 #include "AutoPtr.h" #include "List.h" #include "Thread.h" -@@ -2558,7 +2558,7 @@ public: - - /// creates an SO3 as a rotation that takes Vector a into the direction of Vector b - /// with the rotation axis along a ^ b. If |a ^ b| == 0, it creates the identity rotation. -- /// An assertion will fail if Vector a and Vector b are in exactly opposite directions. -+ /// An assertion will fail if Vector a and Vector b are in exactly opposite directions. - /// @param a source Vector - /// @param b target Vector - SO3(const Vec3& a, const Vec3& b) { -@@ -2604,7 +2604,7 @@ public: - mat.row(2) -= mat.row(1) * d12; - mat.row(2).normalize(); - // check for positive determinant <=> right handed coordinate system of row vectors -- ASSERT(mat.row(0).cross(mat.row(1)).dot(mat.row(2)) > 0); -+ ASSERT(mat.row(0).cross(mat.row(1)).dot(mat.row(2)) > 0); - } - - /// Exponentiate a vector in the Lie algebra to generate a new SO3. -diff --git a/libs/IO/CMakeLists.txt b/libs/IO/CMakeLists.txt -index a354376..4fd478c 100644 ---- a/libs/IO/CMakeLists.txt -+++ b/libs/IO/CMakeLists.txt -@@ -43,7 +43,8 @@ cxx_library_with_type_no_pch(IO "Libs" "STATIC" "${cxx_default}" - set_target_pch(IO Common.h) - - # Link its dependencies --TARGET_LINK_LIBRARIES(IO Common ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARIES} ${EXIV2_LIBS}) -+TARGET_LINK_LIBRARIES(IO Common ${TIFF_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${EXIV2_LIBS}) -+TARGET_INCLUDE_DIRECTORIES(IO PUBLIC $ $) - - # Install - SET_TARGET_PROPERTIES(IO PROPERTIES -diff --git a/libs/MVS/CMakeLists.txt b/libs/MVS/CMakeLists.txt -index 14be620..867cfd5 100644 ---- a/libs/MVS/CMakeLists.txt -+++ b/libs/MVS/CMakeLists.txt -@@ -1,12 +1,12 @@ - # Find required packages --FIND_PACKAGE(CGAL ${SYSTEM_PACKAGE_REQUIRED}) -+FIND_PACKAGE(CGAL REQUIRED) - if(CGAL_FOUND) - include_directories(${CGAL_INCLUDE_DIRS}) - add_definitions(${CGAL_DEFINITIONS}) - link_directories(${CGAL_LIBRARY_DIRS}) - endif() - --FIND_PACKAGE(VCG ${SYSTEM_PACKAGE_REQUIRED}) -+FIND_PACKAGE(VCG REQUIRED) - if(VCG_FOUND) - include_directories(${VCG_INCLUDE_DIRS}) - add_definitions(${VCG_DEFINITIONS}) -@@ -14,12 +14,10 @@ endif() - - set(CERES_LIBS "") - if(OpenMVS_USE_CERES) -- FIND_PACKAGE(CERES) -+ FIND_PACKAGE(Ceres REQUIRED) - if(CERES_FOUND) - include_directories(${CERES_INCLUDE_DIRS}) - add_definitions(${CERES_DEFINITIONS}) -- else() -- set(OpenMVS_USE_CERES OFF) - endif() - endif() - -@@ -42,7 +40,8 @@ cxx_library_with_type_no_pch(MVS "Libs" "" "${cxx_default}" - set_target_pch(MVS Common.h) - - # Link its dependencies --TARGET_LINK_LIBRARIES(MVS PRIVATE Common Math IO ${CERES_LIBS} ${CGAL_LIBS} ${CUDA_CUDA_LIBRARY}) -+TARGET_LINK_LIBRARIES(MVS PRIVATE Common Math IO ${CERES_LIBS} CGAL::CGAL ${CUDA_CUDA_LIBRARY}) -+TARGET_INCLUDE_DIRECTORIES(MVS PUBLIC $ $) - - # Install - SET_TARGET_PROPERTIES(MVS PROPERTIES -diff --git a/libs/Math/CMakeLists.txt b/libs/Math/CMakeLists.txt -index d592bd0..f1fe4c6 100644 ---- a/libs/Math/CMakeLists.txt -+++ b/libs/Math/CMakeLists.txt -@@ -35,6 +35,7 @@ set_target_pch(Math Common.h) - - # Link its dependencies - TARGET_LINK_LIBRARIES(Math Common) -+TARGET_INCLUDE_DIRECTORIES(Math PUBLIC $ $) - - # Install - INSTALL(FILES ${LIBRARY_FILES_H} DESTINATION "${INSTALL_INCLUDE_DIR}/Math" COMPONENT dev) + +diff --git a/apps/InterfaceMetashape/InterfaceMetashape.cpp b/apps/InterfaceMetashape/InterfaceMetashape.cpp +index 1157bf29..73563b3c 100644 +--- a/apps/InterfaceMetashape/InterfaceMetashape.cpp ++++ b/apps/InterfaceMetashape/InterfaceMetashape.cpp +@@ -246,7 +246,7 @@ bool ParseImageListXML(Scene& scene, PlatformDistCoeffs& pltDistCoeffs, size_t& + tinyxml2::XMLElement* elem; + const size_t nLen(pStream->getSize()); + String strCameras; strCameras.resize(nLen); +- pStream->read(&strCameras[0], nLen); ++ pStream->read(strCameras.data(), nLen); + tinyxml2::XMLDocument doc; + doc.Parse(strCameras.c_str(), nLen); + if (doc.ErrorID() != tinyxml2::XML_SUCCESS) diff --git a/ports/openmvs/no-absolute-paths.patch b/ports/openmvs/no-absolute-paths.patch index 0eda5377080913..9ba0a9753ec724 100644 --- a/ports/openmvs/no-absolute-paths.patch +++ b/ports/openmvs/no-absolute-paths.patch @@ -1,8 +1,8 @@ -diff --git a/MvgMvsPipeline.py.in b/MvgMvsPipeline.py.in -index 04433f4..e1beaf6 100644 ---- a/MvgMvsPipeline.py.in +diff --git a/MvgMvsPipeline.py b/MvgMvsPipeline.py.in +index 53a4a5cc..97735396 100644 +--- a/MvgMvsPipeline.py +++ b/MvgMvsPipeline.py.in -@@ -95,14 +95,14 @@ def find(afile): +@@ -109,14 +109,14 @@ def find(afile): return d return None @@ -22,3 +22,21 @@ index 04433f4..e1beaf6 100644 # Ask user for openMVG and openMVS directories if not found if not OPENMVG_BIN: + +diff --git a/MvgOptimizeSfM.py b/MvgOptimizeSfM.py.in +index 930d6805..6eb672c1 100644 +--- a/MvgOptimizeSfM.py ++++ b/MvgOptimizeSfM.py.in +@@ -56,9 +56,10 @@ def launch(cmdline): + sys.exit('\r\nProcess canceled by user, all files remains') + + ++current_dir = os.path.dirname(os.path.abspath(__file__)) + # Try to find openMVG and openMVS binaries in PATH +-OPENMVG_BIN = whereis("openMVG_main_SfMInit_ImageListing") +-OPENMVS_BIN = whereis("ReconstructMesh") ++OPENMVG_BIN = os.path.join(current_dir, '..', 'openmvg') ++OPENMVS_BIN = current_dir + + # Ask user for openMVG and openMVS directories if not found + if not OPENMVG_BIN: diff --git a/ports/openmvs/portfile.cmake b/ports/openmvs/portfile.cmake index ac412106258f83..1bbcee89854789 100644 --- a/ports/openmvs/portfile.cmake +++ b/ports/openmvs/portfile.cmake @@ -3,12 +3,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cdcseacave/openMVS - REF v1.1.1 - SHA512 eeb15d0756f12136a1e7938a0eed97024d564eef3355f3bb6abf6c681e38919011e1a133d89ca360f463e7fed5feb8e0138a0fe9be4c25b6a13ba4b042aef3eb + REF v2.0.1 + SHA512 f1c1708d6e5c9424b95fb71c88ca510c70a4b11711079f12f173ecf190b009a977f7aa11f49a0b2e634a307f2732e4c33d9cd37d727ba60da99051876adb7d1e HEAD_REF master PATCHES fix-build.patch - fix-build-boost-1_77_0.patch no-absolute-paths.patch ) @@ -16,6 +15,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES cuda OpenMVS_USE_CUDA openmp OpenMVS_USE_OPENMP + nonfree OpenMVS_USE_NONFREE + ceres OpenMVS_USE_CERES ) file(REMOVE "${SOURCE_PATH}/build/Modules/FindCERES.cmake") @@ -25,8 +26,6 @@ file(REMOVE "${SOURCE_PATH}/build/Modules/FindEIGEN.cmake") vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} OPTIONS ${FEATURE_OPTIONS} - -DOpenMVS_USE_NONFREE=ON - -DOpenMVS_USE_CERES=OFF -DOpenMVS_USE_FAST_FLOAT2INT=ON -DOpenMVS_USE_FAST_INVSQRT=OFF -DOpenMVS_USE_FAST_CBRT=ON @@ -43,20 +42,22 @@ vcpkg_cmake_install() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -vcpkg_fixup_cmake_targets() -file(READ ${CURRENT_PACKAGES_DIR}/share/openmvs/OpenMVSTargets-release.cmake TARGETS_CMAKE) -string(REPLACE "bin/InterfaceCOLMAP" "tools/openmvs/InterfaceCOLMAP" TARGETS_CMAKE "${TARGETS_CMAKE}") -string(REPLACE "bin/InterfaceVisualSFM" "tools/openmvs/InterfaceVisualSFM" TARGETS_CMAKE "${TARGETS_CMAKE}") -string(REPLACE "bin/DensifyPointCloud" "tools/openmvs/DensifyPointCloud" TARGETS_CMAKE "${TARGETS_CMAKE}") -string(REPLACE "bin/ReconstructMesh" "tools/openmvs/ReconstructMesh" TARGETS_CMAKE "${TARGETS_CMAKE}") -string(REPLACE "bin/RefineMesh" "tools/openmvs/RefineMesh" TARGETS_CMAKE "${TARGETS_CMAKE}") -string(REPLACE "bin/TextureMesh" "tools/openmvs/TextureMesh" TARGETS_CMAKE "${TARGETS_CMAKE}") -string(REPLACE "bin/Viewer" "tools/openmvs/Viewer" TARGETS_CMAKE "${TARGETS_CMAKE}") -file(WRITE ${CURRENT_PACKAGES_DIR}/share/openmvs/OpenMVSTargets-release.cmake "${TARGETS_CMAKE}") +vcpkg_cmake_config_fixup() +file(READ ${CURRENT_PACKAGES_DIR}/share/${PORT}/OpenMVSTargets-release.cmake TARGETS_CMAKE) +string(REPLACE "bin/InterfaceCOLMAP" "tools/${PORT}/InterfaceCOLMAP" TARGETS_CMAKE "${TARGETS_CMAKE}") +string(REPLACE "bin/InterfaceMetashape" "tools/${PORT}/InterfaceMetashape" TARGETS_CMAKE "${TARGETS_CMAKE}") +string(REPLACE "bin/InterfaceVisualSFM" "tools/${PORT}/InterfaceVisualSFM" TARGETS_CMAKE "${TARGETS_CMAKE}") +string(REPLACE "bin/DensifyPointCloud" "tools/${PORT}/DensifyPointCloud" TARGETS_CMAKE "${TARGETS_CMAKE}") +string(REPLACE "bin/ReconstructMesh" "tools/${PORT}/ReconstructMesh" TARGETS_CMAKE "${TARGETS_CMAKE}") +string(REPLACE "bin/RefineMesh" "tools/${PORT}/RefineMesh" TARGETS_CMAKE "${TARGETS_CMAKE}") +string(REPLACE "bin/TextureMesh" "tools/${PORT}/TextureMesh" TARGETS_CMAKE "${TARGETS_CMAKE}") +string(REPLACE "bin/Viewer" "tools/${PORT}/Viewer" TARGETS_CMAKE "${TARGETS_CMAKE}") +file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/OpenMVSTargets-release.cmake "${TARGETS_CMAKE}") vcpkg_copy_tools(AUTO_CLEAN TOOL_NAMES DensifyPointCloud InterfaceCOLMAP + InterfaceMetashape InterfaceVisualSFM ReconstructMesh RefineMesh @@ -68,6 +69,7 @@ set(OPENMVG_TOOLS_PATH "${CURRENT_INSTALLED_DIR}/tools/openmvg") set(OPENMVS_TOOLS_PATH "${CURRENT_INSTALLED_DIR}/tools/${PORT}") set(SENSOR_WIDTH_CAMERA_DATABASE_TXT_PATH "${OPENMVG_TOOLS_PATH}/sensor_width_camera_database.txt") configure_file("${SOURCE_PATH}/MvgMvsPipeline.py.in" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/MvgMvsPipeline.py" @ONLY) -file(INSTALL "${SOURCE_PATH}/build/Modules/FindVCG.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +configure_file("${SOURCE_PATH}/MvgOptimizeSfM.py.in" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/MvgOptimizeSfM.py" @ONLY) +file(INSTALL "${SOURCE_PATH}/build/Modules/FindVCG.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/openmvs/vcpkg.json b/ports/openmvs/vcpkg.json index 1f1fc66a103914..1d3ab2a3e8e48b 100644 --- a/ports/openmvs/vcpkg.json +++ b/ports/openmvs/vcpkg.json @@ -1,9 +1,9 @@ { "name": "openmvs", - "version": "1.1.1", - "port-version": 3, + "version": "2.0.1", "description": "OpenMVS: open Multi-View Stereo reconstruction library", "homepage": "https://cdcseacave.github.io/openMVS", + "license": "AGPL-3.0-only", "dependencies": [ "boost-iostreams", "boost-program-options", @@ -32,15 +32,31 @@ "name": "vcpkg-cmake", "host": true }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], + "default-features": [ + "nonfree" + ], "features": { + "ceres": { + "description": "CERES support for openmvs", + "dependencies": [ + "ceres" + ] + }, "cuda": { "description": "CUDA support for openmvs", "dependencies": [ "cuda" ] }, + "nonfree": { + "description": "nonfree support for openmvs" + }, "openmp": { "description": "OpenMP support for openmvs" } diff --git a/ports/vcglib/consume-vcpkg-eigen3.patch b/ports/vcglib/consume-vcpkg-eigen3.patch index 35e9f5537b4274..a84f436c4e129f 100644 --- a/ports/vcglib/consume-vcpkg-eigen3.patch +++ b/ports/vcglib/consume-vcpkg-eigen3.patch @@ -1,125 +1,5 @@ -diff --git a/vcg/complex/algorithms/curve_on_manifold.h b/vcg/complex/algorithms/curve_on_manifold.h -index 5b9d858..f091b4b 100644 ---- a/vcg/complex/algorithms/curve_on_manifold.h -+++ b/vcg/complex/algorithms/curve_on_manifold.h -@@ -36,7 +36,7 @@ - #include - #include - #include --#include -+#include - #include - #include - -diff --git a/vcg/complex/algorithms/harmonic.h b/vcg/complex/algorithms/harmonic.h -index d004d7b..13d5167 100644 ---- a/vcg/complex/algorithms/harmonic.h -+++ b/vcg/complex/algorithms/harmonic.h -@@ -24,7 +24,7 @@ - #define __VCGLIB_HARMONIC_FIELD - - #include --#include -+#include - - namespace vcg { - namespace tri { -diff --git a/vcg/complex/algorithms/implicit_smooth.h b/vcg/complex/algorithms/implicit_smooth.h -index 2e1e24f..76311e2 100644 ---- a/vcg/complex/algorithms/implicit_smooth.h -+++ b/vcg/complex/algorithms/implicit_smooth.h -@@ -23,7 +23,7 @@ - #ifndef __VCG_IMPLICIT_SMOOTHER - #define __VCG_IMPLICIT_SMOOTHER - --#include -+#include - #include - #include - #include -diff --git a/vcg/complex/algorithms/inertia.h b/vcg/complex/algorithms/inertia.h -index 41b5a29..f25d6f9 100644 ---- a/vcg/complex/algorithms/inertia.h -+++ b/vcg/complex/algorithms/inertia.h -@@ -24,8 +24,8 @@ - #define _VCG_INERTIA_ - - --#include --#include -+#include -+#include - #include - - namespace vcg -diff --git a/vcg/complex/algorithms/parametrization/poisson_solver.h b/vcg/complex/algorithms/parametrization/poisson_solver.h -index cf5c36d..3b8f1a5 100644 ---- a/vcg/complex/algorithms/parametrization/poisson_solver.h -+++ b/vcg/complex/algorithms/parametrization/poisson_solver.h -@@ -24,7 +24,7 @@ - #ifndef VCG_POISSON_SOLVER - #define VCG_POISSON_SOLVER - --#include -+#include - - #include - #include -diff --git a/vcg/complex/algorithms/update/curvature.h b/vcg/complex/algorithms/update/curvature.h -index 441121b..0a96146 100644 ---- a/vcg/complex/algorithms/update/curvature.h -+++ b/vcg/complex/algorithms/update/curvature.h -@@ -32,7 +32,7 @@ - #include - #include - #include --#include -+#include - - namespace vcg { - namespace tri { -diff --git a/vcg/complex/algorithms/update/curvature_fitting.h b/vcg/complex/algorithms/update/curvature_fitting.h -index b2b8c63..ab04b6b 100644 ---- a/vcg/complex/algorithms/update/curvature_fitting.h -+++ b/vcg/complex/algorithms/update/curvature_fitting.h -@@ -38,11 +38,11 @@ - #include - #include - --#include --#include --#include --#include --#include -+#include -+#include -+#include -+#include -+#include - - - namespace vcg { -diff --git a/vcg/complex/algorithms/update/fitmaps.h b/vcg/complex/algorithms/update/fitmaps.h -index bd2c94f..fd837d7 100644 ---- a/vcg/complex/algorithms/update/fitmaps.h -+++ b/vcg/complex/algorithms/update/fitmaps.h -@@ -34,10 +34,10 @@ - #include - #include "vcg/complex/algorithms/update/curvature_fitting.h" - --#include --#include --#include --#include -+#include -+#include -+#include -+#include - - #include - diff --git a/vcg/math/eigen.h b/vcg/math/eigen.h -index 5cae402..81f32ff 100644 +index 5cae402f..e8f82258 100644 --- a/vcg/math/eigen.h +++ b/vcg/math/eigen.h @@ -53,10 +53,10 @@ struct ei_to_vcgtype; @@ -130,96 +10,10 @@ index 5cae402..81f32ff 100644 -#include "../../eigenlib/Eigen/Geometry" -#include "../../eigenlib/Eigen/Array" -#include "../../eigenlib/Eigen/Core" -+#include "../../eigen3/Eigen/LU" -+#include "../../eigen3/Eigen/Geometry" -+#include "../../eigen3/Eigen/Array" -+#include "../../eigen3/Eigen/Core" - - // add support for unsigned char and short int - namespace Eigen { -diff --git a/vcg/math/matrix44.h b/vcg/math/matrix44.h -index a138e57..5291e0e 100644 ---- a/vcg/math/matrix44.h -+++ b/vcg/math/matrix44.h -@@ -30,8 +30,8 @@ - #include - #include - #include --#include --#include -+#include +#include - - namespace vcg { - -diff --git a/vcg/math/polar_decomposition.h b/vcg/math/polar_decomposition.h -index deabf86..bd725d1 100644 ---- a/vcg/math/polar_decomposition.h -+++ b/vcg/math/polar_decomposition.h -@@ -26,8 +26,8 @@ - - #include - #include --#include --#include -+#include -+#include - - namespace vcg{ - -diff --git a/vcg/math/quadric.h b/vcg/math/quadric.h -index 8522056..99a9de1 100644 ---- a/vcg/math/quadric.h -+++ b/vcg/math/quadric.h -@@ -26,7 +26,7 @@ - #include - #include - #include --#include ++#include ++#include +#include - namespace vcg { - namespace math { -diff --git a/vcg/space/fitting3.h b/vcg/space/fitting3.h -index e9e238a..6861969 100644 ---- a/vcg/space/fitting3.h -+++ b/vcg/space/fitting3.h -@@ -29,8 +29,8 @@ - #include - #include - --#include --#include -+#include -+#include - - namespace vcg { - -diff --git a/vcg/space/point_matching.h b/vcg/space/point_matching.h -index e9ac0ff..c6ff376 100644 ---- a/vcg/space/point_matching.h -+++ b/vcg/space/point_matching.h -@@ -27,8 +27,8 @@ - #include - #include - --#include --#include -+#include -+#include - #include - - namespace vcg -diff --git a/wrap/igl/smooth_field.h b/wrap/igl/smooth_field.h -index e1208cf..a403d54 100644 ---- a/wrap/igl/smooth_field.h -+++ b/wrap/igl/smooth_field.h -@@ -25,7 +25,7 @@ - #define SMOOTHER_FIELD_H - - //eigen stuff --#include -+#include - - //vcg stuff - #include + // add support for unsigned char and short int + namespace Eigen { diff --git a/ports/vcglib/fix-build.patch b/ports/vcglib/fix-build.patch new file mode 100644 index 00000000000000..635805cd22a427 --- /dev/null +++ b/ports/vcglib/fix-build.patch @@ -0,0 +1,13 @@ +diff --git a/vcg/simplex/tetrahedron/pos.h b/vcg/simplex/tetrahedron/pos.h +index d47348ce..078b1f6a 100644 +--- a/vcg/simplex/tetrahedron/pos.h ++++ b/vcg/simplex/tetrahedron/pos.h +@@ -385,7 +385,7 @@ public: + void Assert() + #ifdef _DEBUG + { +- HETYPE ht=*this; ++ BasePosType ht=*this; + ht.FlipT(); + ht.FlipT(); + assert(ht==*this); diff --git a/ports/vcglib/portfile.cmake b/ports/vcglib/portfile.cmake index 1af58bdcb9b2d3..24c4cb6ae6091d 100644 --- a/ports/vcglib/portfile.cmake +++ b/ports/vcglib/portfile.cmake @@ -1,13 +1,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cnr-isti-vclab/vcglib - REF v1.0.1 - SHA512 55d1854054744abae2d41e7b5041df89253bae108df5fc1cfe777013de7192dce04bc474475cb11a1d0343ebcab1ea61b381d9d9c36c452528043e85e75bc211 - PATCHES consume-vcpkg-eigen3.patch + REF 2022.02 + SHA512 1a4b04c53eb52d0d9864f4e942f0a06e6f4fe5f2b5686fa534b6c68b715941147d89ed6d83bce9dc8d0c7029460824ab1f73231ba6b7c32472becfe641e2a7cb + PATCHES + consume-vcpkg-eigen3.patch + fix-build.patch ) -configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/vcglib/copyright COPYONLY) - file(COPY ${SOURCE_PATH}/vcg/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/vcg) file(COPY ${SOURCE_PATH}/wrap/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/wrap) file(COPY ${SOURCE_PATH}/img/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/img) + +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/vcglib/vcpkg.json b/ports/vcglib/vcpkg.json index bde2be1d109475..d8d4898029d0be 100644 --- a/ports/vcglib/vcpkg.json +++ b/ports/vcglib/vcpkg.json @@ -1,8 +1,8 @@ { "name": "vcglib", - "version-string": "1.0.1", - "port-version": 1, + "version-string": "2022.02", "description": "library for manipulation, processing, cleaning, simplifying triangle meshes.", + "license": "GPL-3.0-only", "dependencies": [ "eigen3" ] diff --git a/versions/baseline.json b/versions/baseline.json index 2473f585e9b74d..e9562935945204 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5197,8 +5197,8 @@ "port-version": 4 }, "openmvs": { - "baseline": "1.1.1", - "port-version": 3 + "baseline": "2.0.1", + "port-version": 0 }, "openni2": { "baseline": "2.2.0.33", @@ -7361,8 +7361,8 @@ "port-version": 0 }, "vcglib": { - "baseline": "1.0.1", - "port-version": 1 + "baseline": "2022.02", + "port-version": 0 }, "vcpkg-cmake": { "baseline": "2022-05-10", diff --git a/versions/o-/openmvs.json b/versions/o-/openmvs.json index 883764f1397804..e055a2f310bcd0 100644 --- a/versions/o-/openmvs.json +++ b/versions/o-/openmvs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf082c0deb661743df2e3c5f658224ccd6375919", + "version": "2.0.1", + "port-version": 0 + }, { "git-tree": "b6123f8755c140325b2800c51c6c68e3fb51c668", "version": "1.1.1", diff --git a/versions/v-/vcglib.json b/versions/v-/vcglib.json index 0fde71fa64c10c..bab35eab30cf96 100644 --- a/versions/v-/vcglib.json +++ b/versions/v-/vcglib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1170b49b3d2980357ba10d68769b0bcfaeda42f7", + "version-string": "2022.02", + "port-version": 0 + }, { "git-tree": "4ed58c0ed176662ca418315c77fb0137c2cf7769", "version-string": "1.0.1", From 86bf36258319b35005cc41766914da5adf8620fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?= =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= <79349457+MehdiChinoune@users.noreply.github.com> Date: Wed, 15 Jun 2022 19:46:04 +0100 Subject: [PATCH 33/56] [qt5-tools] Fix deploying translation files with windeployqt (#25134) --- ...lconvert-handling-empty-translations.patch | 25 +++++++++++++++++++ ports/qt5-tools/portfile.cmake | 1 + ports/qt5-tools/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/q-/qt5-tools.json | 5 ++++ 5 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 ports/qt5-tools/Fix-regression-in-lconvert-handling-empty-translations.patch diff --git a/ports/qt5-tools/Fix-regression-in-lconvert-handling-empty-translations.patch b/ports/qt5-tools/Fix-regression-in-lconvert-handling-empty-translations.patch new file mode 100644 index 00000000000000..b1e960bca9d9d9 --- /dev/null +++ b/ports/qt5-tools/Fix-regression-in-lconvert-handling-empty-translations.patch @@ -0,0 +1,25 @@ +diff --git a/src/linguist/shared/qm.cpp b/src/linguist/shared/qm.cpp +index 8c3fc3f..d772855 100644 +--- a/src/linguist/shared/qm.cpp ++++ b/src/linguist/shared/qm.cpp +@@ -552,12 +552,17 @@ bool loadQM(Translator &translator, QIODevice &dev, ConversionData &cd) + goto end; + case Tag_Translation: { + int len = read32(m); +- if (len & 1) { ++ m += 4; ++ ++ // -1 indicates an empty string ++ // Otherwise streaming format is UTF-16 -> 2 bytes per character ++ if ((len != -1) && (len & 1)) { + cd.appendError(QLatin1String("QM-Format error")); + return false; + } +- m += 4; +- QString str = QString((const QChar *)m, len/2); ++ QString str; ++ if (len != -1) ++ str = QString((const QChar *)m, len / 2); + if (QSysInfo::ByteOrder == QSysInfo::LittleEndian) { + for (int i = 0; i < str.length(); ++i) + str[i] = QChar((str.at(i).unicode() >> 8) + diff --git a/ports/qt5-tools/portfile.cmake b/ports/qt5-tools/portfile.cmake index c166ed7f5701c1..0abab4cab0bf27 100644 --- a/ports/qt5-tools/portfile.cmake +++ b/ports/qt5-tools/portfile.cmake @@ -2,6 +2,7 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) qt_submodule_installation(PATCHES icudt-debug-suffix.patch # https://bugreports.qt.io/browse/QTBUG-87677 + Fix-regression-in-lconvert-handling-empty-translations.patch # https://codereview.qt-project.org/c/qt/qttools/+/337738 ) if(EXISTS "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") diff --git a/ports/qt5-tools/vcpkg.json b/ports/qt5-tools/vcpkg.json index cbb1026a3a7b99..e3655514c4e058 100644 --- a/ports/qt5-tools/vcpkg.json +++ b/ports/qt5-tools/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qt5-tools", "version": "5.15.4", + "port-version": 1, "description": "Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications", "license": null, "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index e9562935945204..44dcf757b5288c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5846,7 +5846,7 @@ }, "qt5-tools": { "baseline": "5.15.4", - "port-version": 0 + "port-version": 1 }, "qt5-translations": { "baseline": "5.15.4", diff --git a/versions/q-/qt5-tools.json b/versions/q-/qt5-tools.json index 9549f5ac035c1a..2247bba66e3fc7 100644 --- a/versions/q-/qt5-tools.json +++ b/versions/q-/qt5-tools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6025c1997ce5b8bf0ebb131b0628641e8e550d6d", + "version": "5.15.4", + "port-version": 1 + }, { "git-tree": "b8a761a89f1f3aabb2c3e990b40cc69d0b7ea543", "version": "5.15.4", From 3d054a171071ebfb5a615406367fb09a6fadae58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Ga=C3=9Fmann?= Date: Wed, 15 Jun 2022 21:00:50 +0200 Subject: [PATCH 34/56] [stduuid] Add new port @1.2.2 (#25115) * [stduuid] Add new port @1.2.2 * [stduuid] Add v1.2.2 to version database --- ports/stduuid/fix-gsl-polyfill.patch | 37 ++++++++++++++++++++ ports/stduuid/fix-install-directory.patch | 23 +++++++++++++ ports/stduuid/fix-libuuid-dependency.patch | 32 +++++++++++++++++ ports/stduuid/portfile.cmake | 40 ++++++++++++++++++++++ ports/stduuid/vcpkg.json | 33 ++++++++++++++++++ versions/baseline.json | 4 +++ versions/s-/stduuid.json | 9 +++++ 7 files changed, 178 insertions(+) create mode 100644 ports/stduuid/fix-gsl-polyfill.patch create mode 100644 ports/stduuid/fix-install-directory.patch create mode 100644 ports/stduuid/fix-libuuid-dependency.patch create mode 100644 ports/stduuid/portfile.cmake create mode 100644 ports/stduuid/vcpkg.json create mode 100644 versions/s-/stduuid.json diff --git a/ports/stduuid/fix-gsl-polyfill.patch b/ports/stduuid/fix-gsl-polyfill.patch new file mode 100644 index 00000000000000..2e07871bd60229 --- /dev/null +++ b/ports/stduuid/fix-gsl-polyfill.patch @@ -0,0 +1,37 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f45a7dc..039ee53 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -37,11 +37,11 @@ if (UUID_TIME_GENERATOR) + endif() + + # Using span from std +-if (NOT UUID_USING_CXX20_SPAN) +- target_include_directories(${PROJECT_NAME} INTERFACE +- $ +- $) +- install(DIRECTORY gsl DESTINATION include) ++if (UUID_USING_CXX20_SPAN) ++ target_compile_features(${PROJECT_NAME} INTERFACE cxx_std_20) ++else() ++ find_package(Microsoft.GSL CONFIG REQUIRED) ++ target_link_libraries(${PROJECT_NAME} INTERFACE Microsoft.GSL::GSL) + endif () + + # Install step and imported target +diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in +index 7217b72..fb981d2 100644 +--- a/cmake/Config.cmake.in ++++ b/cmake/Config.cmake.in +@@ -9,6 +9,10 @@ if (@UUID_SYSTEM_GENERATOR@) + endif () + endif () + ++if (NOT "@UUID_USING_CXX20_SPAN@") ++ find_dependency(Microsoft.GSL) ++endif () ++ + include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@-targets.cmake") + + check_required_components(@PROJECT_NAME@) +\ No newline at end of file diff --git a/ports/stduuid/fix-install-directory.patch b/ports/stduuid/fix-install-directory.patch new file mode 100644 index 00000000000000..f80d5b6a630ef2 --- /dev/null +++ b/ports/stduuid/fix-install-directory.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fffb92c..f45a7dc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,7 +11,8 @@ option(UUID_USING_CXX20_SPAN "Using span from std instead of gsl" OFF) + add_library(${PROJECT_NAME} INTERFACE) + target_include_directories(${PROJECT_NAME} INTERFACE + $ +- $) ++ $ ++ $) + + # Using system uuid generator + if (UUID_SYSTEM_GENERATOR) +@@ -44,7 +45,7 @@ if (NOT UUID_USING_CXX20_SPAN) + endif () + + # Install step and imported target +-install(FILES include/uuid.h DESTINATION include) ++install(FILES include/uuid.h DESTINATION include/stduuid) + install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}-targets) + install(EXPORT ${PROJECT_NAME}-targets + DESTINATION lib/cmake/${PROJECT_NAME}) diff --git a/ports/stduuid/fix-libuuid-dependency.patch b/ports/stduuid/fix-libuuid-dependency.patch new file mode 100644 index 00000000000000..59134811d5fbc4 --- /dev/null +++ b/ports/stduuid/fix-libuuid-dependency.patch @@ -0,0 +1,32 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 039ee53..d4218a4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -23,11 +23,8 @@ if (UUID_SYSTEM_GENERATOR) + find_library(CFLIB CoreFoundation REQUIRED) + target_link_libraries(${PROJECT_NAME} INTERFACE ${CFLIB}) + else () +- find_package(Libuuid REQUIRED) +- if (Libuuid_FOUND) +- target_include_directories(${PROJECT_NAME} INTERFACE ${Libuuid_INCLUDE_DIRS}) +- target_link_libraries(${PROJECT_NAME} INTERFACE ${Libuuid_LIBRARIES}) +- endif () ++ find_package(unofficial-libuuid CONFIG REQUIRED) ++ target_link_libraries(${PROJECT_NAME} INTERFACE unofficial::UUID::uuid) + endif () + endif () + +diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in +index fb981d2..8a3c8ab 100644 +--- a/cmake/Config.cmake.in ++++ b/cmake/Config.cmake.in +@@ -4,8 +4,7 @@ include(CMakeFindDependencyMacro) + if (@UUID_SYSTEM_GENERATOR@) + if (WIN32 OR APPLE) + else () +- list (APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) +- find_dependency(Libuuid REQUIRED) ++ find_dependency(unofficial-libuuid CONFIG) + endif () + endif () + diff --git a/ports/stduuid/portfile.cmake b/ports/stduuid/portfile.cmake new file mode 100644 index 00000000000000..27a3bf8d3767e1 --- /dev/null +++ b/ports/stduuid/portfile.cmake @@ -0,0 +1,40 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mariusbancila/stduuid + REF v1.2.2 + SHA512 30970c25992e1ba35d96e3b2fc8530466c1070b8b913b8c37e9f698f39121a5a74361e2c4db4c2ba2feddb0ce9b2f14b78c4761cdac09b89a6a0117b179b08a7 + HEAD_REF master + PATCHES + fix-install-directory.patch + fix-gsl-polyfill.patch + fix-libuuid-dependency.patch +) + +# the debug build is not necessary, because stduuid deployed files are header-only +set(VCPKG_BUILD_TYPE release) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + system-gen UUID_SYSTEM_GENERATOR + INVERTED_FEATURES + gsl-span UUID_USING_CXX20_SPAN +) + +vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DUUID_BUILD_TESTS=OFF + ${FEATURE_OPTIONS} +) +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) + +if("gsl-span" IN_LIST FEATURES) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/stduuid/uuid.h" "#ifdef __cpp_lib_span" "#if 0") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/stduuid/uuid.h" "#include " "#include ") +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/stduuid/uuid.h" "#ifdef __cpp_lib_span" "#if 1") +endif() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/stduuid/vcpkg.json b/ports/stduuid/vcpkg.json new file mode 100644 index 00000000000000..840ce796b08713 --- /dev/null +++ b/ports/stduuid/vcpkg.json @@ -0,0 +1,33 @@ +{ + "name": "stduuid", + "version": "1.2.2", + "description": "A C++17 cross-platform implementation for UUIDs", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "gsl-span": { + "description": "Using span from gsl instead of std", + "dependencies": [ + "ms-gsl" + ] + }, + "system-gen": { + "description": "Enable operating system uuid generator", + "dependencies": [ + { + "name": "libuuid", + "platform": "!osx & !windows" + } + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 44dcf757b5288c..c47f83bf58de00 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6832,6 +6832,10 @@ "baseline": "2021-09-10", "port-version": 0 }, + "stduuid": { + "baseline": "1.2.2", + "port-version": 0 + }, "stftpitchshift": { "baseline": "1.4.1", "port-version": 0 diff --git a/versions/s-/stduuid.json b/versions/s-/stduuid.json new file mode 100644 index 00000000000000..c89c5a62626f11 --- /dev/null +++ b/versions/s-/stduuid.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "bd235773c953e5636a7b9f6356437daef6e5010c", + "version": "1.2.2", + "port-version": 0 + } + ] +} From a00906cf9c81ce1df91b26e8fbe3e7cde4abe45e Mon Sep 17 00:00:00 2001 From: jureviciusr Date: Wed, 15 Jun 2022 21:07:15 +0200 Subject: [PATCH 35/56] [libcaer] New port for libcaer (#25110) * Adding libcaer port file * Formatting libcaer config * Adding version info * Git tree update for libcaer * Updating static builds and osx / linux platforms * Version update * Removing deprecated methods and fixing linux build * libcaer version update * Fix macos build * Version update * Macos test * Version update * Update patch file * Version update * Version update * Fixing comments * Formatting * Versioning update * Adding pkgconfig fixup * Version update Co-authored-by: Rokas Jurevicius --- ports/libcaer/libcaer-static-build.patch | 55 ++++++++++++++++++++++++ ports/libcaer/portfile.cmake | 26 +++++++++++ ports/libcaer/vcpkg.json | 20 +++++++++ versions/baseline.json | 4 ++ versions/l-/libcaer.json | 9 ++++ 5 files changed, 114 insertions(+) create mode 100644 ports/libcaer/libcaer-static-build.patch create mode 100644 ports/libcaer/portfile.cmake create mode 100644 ports/libcaer/vcpkg.json create mode 100644 versions/l-/libcaer.json diff --git a/ports/libcaer/libcaer-static-build.patch b/ports/libcaer/libcaer-static-build.patch new file mode 100644 index 00000000000000..05a25f85df2a07 --- /dev/null +++ b/ports/libcaer/libcaer-static-build.patch @@ -0,0 +1,55 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3b1937a..a75db2b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -20,6 +20,8 @@ OPTION(ENABLE_SERIALDEV "Enable support for serial port devices using libserialp + OPTION(ENABLE_OPENCV "Enable support for frame enhancements using OpenCV" OFF) + OPTION(UDEV_INSTALL "Install udev rules on Linux" ON) + OPTION(EXAMPLES_INSTALL "Build and install examples" OFF) ++OPTION(ENABLE_BINDIR_INSTALLATION "Split archive and binary installation targets [required for vcpkg installation]" OFF) ++OPTION(BUILD_SHARED_LIBS "Build libcaer as a shared library" ON) + + # Cross-compile support + IF(NOT USER_LOCAL_PREFIX) +@@ -98,7 +100,7 @@ INCLUDE(CMakePackageConfigHelpers) + WRITE_BASIC_CONFIG_VERSION_FILE(${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake VERSION ${PROJECT_VERSION} + COMPATIBILITY SameMajorVersion) + SET(include_dirs ${CMAKE_INSTALL_INCLUDEDIR}) +-IF(CC_MSVC) ++IF(ENABLE_BINDIR_INSTALLATION) + SET(export_destination ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}) + ELSE() + SET(export_destination ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 377a556..d9c29d7 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -19,6 +19,10 @@ IF(NOT CC_MSVC) + SET(LIBCAER_COMPILE_OPTIONS "-Wno-unused-function") + ENDIF() + ++IF(OS_MACOS) ++ LIST(APPEND LIBCAER_COMPILE_OPTIONS "-Wno-implicit-function-declaration") ++ENDIF() ++ + SET(LIBCAER_LINK_LIBRARIES_PRIVATE ${BASE_LIBS}) + + IF(OS_LINUX) +@@ -63,7 +67,7 @@ ENDIF() + # Set full RPATH + SET(CMAKE_INSTALL_RPATH ${USER_LOCAL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) + +-ADD_LIBRARY(caer SHARED ${LIBCAER_SOURCES}) ++ADD_LIBRARY(caer ${LIBCAER_SOURCES}) + IF(CC_MSVC) + # This flag needs to be propagated down to depending targets to avoid compilation errors + TARGET_COMPILE_OPTIONS(caer INTERFACE -DWIN32_LEAN_AND_MEAN=ON) +@@ -94,7 +98,7 @@ IF(ENABLE_STATIC) + + SET_TARGET_PROPERTIES(caerStatic PROPERTIES OUTPUT_NAME caer) + +- IF(OS_WINDOWS) ++ IF(ENABLE_BINDIR_INSTALLATION) + INSTALL( + TARGETS caerStatic + EXPORT libcaer-exports diff --git a/ports/libcaer/portfile.cmake b/ports/libcaer/portfile.cmake new file mode 100644 index 00000000000000..ac2335e242ea0f --- /dev/null +++ b/ports/libcaer/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.com/inivation/ + OUT_SOURCE_PATH SOURCE_PATH + REPO dv/libcaer + REF 3.3.14 + SHA512 6e91ebd20796b59c51ebb10be58d12577f3b6370425bbeffcf1a96ff91ad9f3ffaefb2741d0a932b241f2664c157d77158cf475b0f7e39ba208d5482f408fc8b + HEAD_REF ab9470e8900364822fb74ad3c1e99fa4088914df + PATCHES + libcaer-static-build.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DENABLE_OPENCV=ON + -DEXAMPLES_INSTALL=OFF + -DENABLE_BINDIR_INSTALLATION=ON +) +vcpkg_cmake_install() + +vcpkg_fixup_pkgconfig() +vcpkg_cmake_config_fixup(PACKAGE_NAME "libcaer" CONFIG_PATH "share/libcaer") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libcaer/vcpkg.json b/ports/libcaer/vcpkg.json new file mode 100644 index 00000000000000..1de207f1e3f605 --- /dev/null +++ b/ports/libcaer/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "libcaer", + "version": "3.3.14", + "description": "Minimal C library to access, configure and get data from neuromorphic sensors and processors.", + "homepage": "https://gitlab.com/inivation/dv/libcaer", + "license": "BSD-2-Clause", + "dependencies": [ + "libusb", + "opencv4", + "pkgconf", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index c47f83bf58de00..e7de1400fc69ce 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3468,6 +3468,10 @@ "baseline": "1.17.6", "port-version": 1 }, + "libcaer": { + "baseline": "3.3.14", + "port-version": 0 + }, "libcanberra": { "baseline": "0.30", "port-version": 2 diff --git a/versions/l-/libcaer.json b/versions/l-/libcaer.json new file mode 100644 index 00000000000000..19cb640b8be312 --- /dev/null +++ b/versions/l-/libcaer.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4dffda61ffebd9440265c6edde057d1af909cf5c", + "version": "3.3.14", + "port-version": 0 + } + ] +} From ac6ef2f665ce66a101217a17b16cb8e64469a13f Mon Sep 17 00:00:00 2001 From: "Kelly (KT) Thompson" Date: Wed, 15 Jun 2022 14:40:29 -0600 Subject: [PATCH 36/56] [random123] Add new port (#24716) * Provide Deshaw Research's Random123 implementation * Convert CONTROL to vcpkg.json. * Update versions/baseline.json. * Remove call to deprecated function. * Address reviewer comments by using vcpkg_from_github. * Implement recommended changes from MR review. * Update x-add-version. * Random123 uses a proprietary license that is very similar to BSD. * Random123 uses a proprietary license that is very similar to BSD. * Update versions file. * format portfile.cmake * x-add-version * apply suggestion * x-add-version Co-authored-by: Lily Wang --- ports/random123/portfile.cmake | 23 +++++++++++++++++++++++ ports/random123/vcpkg.json | 7 +++++++ versions/baseline.json | 4 ++++ versions/r-/random123.json | 9 +++++++++ 4 files changed, 43 insertions(+) create mode 100644 ports/random123/portfile.cmake create mode 100644 ports/random123/vcpkg.json create mode 100644 versions/r-/random123.json diff --git a/ports/random123/portfile.cmake b/ports/random123/portfile.cmake new file mode 100644 index 00000000000000..31e0049ad47047 --- /dev/null +++ b/ports/random123/portfile.cmake @@ -0,0 +1,23 @@ +# Random123 - Header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO "DEShawResearch/random123" + REF "v1.14.0" + SHA512 1c7d139193f5404e5d14d229f55e0a14b11de596a4cfbf0a39c1419f5ae146055dccc61e9430f724a2d7c1efb8bd01edb72866d4f4705508fcc6ebda6e90e91e + HEAD_REF "main" + ) + +# Copy the headers that define this package to the install location. +file(GLOB header_files + "${SOURCE_PATH}/include/Random123/*.h" + "${SOURCE_PATH}/include/Random123/*.hpp") +file(COPY ${header_files} + "${SOURCE_PATH}/include/Random123/features" + "${SOURCE_PATH}/include/Random123/conventional" + DESTINATION "${CURRENT_PACKAGES_DIR}/include/Random123") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright) diff --git a/ports/random123/vcpkg.json b/ports/random123/vcpkg.json new file mode 100644 index 00000000000000..dd5bf9db54ae6d --- /dev/null +++ b/ports/random123/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "random123", + "version": "1.14.0", + "description": "Random123 is a library of 'counter-based' random number generators (CBRNGs), in which the Nth random number can be obtained by applying a stateless mixing function to N instead of the conventional approach of using N iterations of a stateful transformation.", + "homepage": "http://www.deshawresearch.com/resources_random123.html", + "license": "BSD-3-Clause" +} diff --git a/versions/baseline.json b/versions/baseline.json index e7de1400fc69ce..2fe623dd5da740 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6108,6 +6108,10 @@ "baseline": "6.10", "port-version": 4 }, + "random123": { + "baseline": "1.14.0", + "port-version": 0 + }, "randomstr": { "baseline": "2022-02-03", "port-version": 0 diff --git a/versions/r-/random123.json b/versions/r-/random123.json new file mode 100644 index 00000000000000..37fb262d5a8fa0 --- /dev/null +++ b/versions/r-/random123.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c4e7e093d8eabdc89b0634e4a361e4a982c7cbe5", + "version": "1.14.0", + "port-version": 0 + } + ] +} From 3d8f78171a2a37d461077bf8d063256b63e25a4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 15 Jun 2022 21:09:36 +0000 Subject: [PATCH 37/56] [hdf5] Refix msmpi library path in pkgconfig (#25089) * [hdf5] Refix msmpi library path in pkgconfig * version * version * Apply suggestion * version * [hdf5] Use post-hoc string replacement * version Co-authored-by: Robert Schumacher --- ports/hdf5/portfile.cmake | 14 +++++++++----- ports/hdf5/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/h-/hdf5.json | 5 +++++ 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ports/hdf5/portfile.cmake b/ports/hdf5/portfile.cmake index c75cff7feac7a4..da9f53e78edf35 100644 --- a/ports/hdf5/portfile.cmake +++ b/ports/hdf5/portfile.cmake @@ -84,12 +84,16 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() vcpkg_fixup_pkgconfig() -if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(GLOB pc_files "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/*.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*.pc") - foreach(file IN LISTS pc_files) + +file(GLOB pc_files "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/*.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*.pc") +foreach(file IN LISTS pc_files) + if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") vcpkg_replace_string("${file}" " -lhdf5" " -llibhdf5") - endforeach() -endif() + endif() + if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${file}" "/msmpi.lib\"" "/msmpi\"") + endif() +endforeach() file(READ "${CURRENT_PACKAGES_DIR}/share/hdf5/hdf5-config.cmake" contents) string(REPLACE [[${HDF5_PACKAGE_NAME}_TOOLS_DIR "${PACKAGE_PREFIX_DIR}/bin"]] diff --git a/ports/hdf5/vcpkg.json b/ports/hdf5/vcpkg.json index 26c2caeb3f3b49..36371957146222 100644 --- a/ports/hdf5/vcpkg.json +++ b/ports/hdf5/vcpkg.json @@ -1,6 +1,7 @@ { "name": "hdf5", "version": "1.12.2", + "port-version": 1, "description": "HDF5 is a data model, library, and file format for storing and managing data", "homepage": "https://www.hdfgroup.org/downloads/hdf5/", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 2fe623dd5da740..cfa3bcaa6040df 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2774,7 +2774,7 @@ }, "hdf5": { "baseline": "1.12.2", - "port-version": 0 + "port-version": 1 }, "healpix": { "baseline": "1.12.10", diff --git a/versions/h-/hdf5.json b/versions/h-/hdf5.json index 35a6434a9d6957..6360efbd8c23d5 100644 --- a/versions/h-/hdf5.json +++ b/versions/h-/hdf5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6647d7591d9b5a588d92e0fb4266d2028132ff9", + "version": "1.12.2", + "port-version": 1 + }, { "git-tree": "4abe78968a986c1793207ae653eb686926f3c141", "version": "1.12.2", From 0af508e51056981076c73c7a677550cd4e975bf6 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 16 Jun 2022 10:27:25 -0700 Subject: [PATCH 38/56] [cpuinfo] Always check for x86-ish with the same regex. (#25258) Submitted upstream as https://github.com/pytorch/cpuinfo/pull/93 Resolves https://github.com/microsoft/vcpkg/issues/24713 Competing resolution of https://github.com/microsoft/vcpkg/pull/24726 --- ports/cpuinfo/check-for-x86-correctly.patch | 48 +++++++++++++++++++++ ports/cpuinfo/portfile.cmake | 23 ++-------- ports/cpuinfo/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/c-/cpuinfo.json | 5 +++ 5 files changed, 59 insertions(+), 20 deletions(-) create mode 100644 ports/cpuinfo/check-for-x86-correctly.patch diff --git a/ports/cpuinfo/check-for-x86-correctly.patch b/ports/cpuinfo/check-for-x86-correctly.patch new file mode 100644 index 00000000000000..7acb388cdf7ae0 --- /dev/null +++ b/ports/cpuinfo/check-for-x86-correctly.patch @@ -0,0 +1,48 @@ +From 99486c3d72cc0aec72992eb95bd46a27f09ff41e Mon Sep 17 00:00:00 2001 +From: Billy Robert O'Neal III +Date: Wed, 15 Jun 2022 13:59:23 -0700 +Subject: [PATCH] Always check for x86-ish with the same regex. + +On line 68, and in most places, "intel-like" is checked with `i[3-6]86|AMD64|x86(_64)?`, but in these 3 places the (_x64)? was missing. + +First reported as https://github.com/microsoft/vcpkg/issues/24713 +--- + CMakeLists.txt | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 74364e8..1cdada0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -319,7 +319,7 @@ ENDIF() + # ---[ cpuinfo mock library and mock tests + IF(CPUINFO_SUPPORTED_PLATFORM AND CPUINFO_BUILD_MOCK_TESTS) + SET(CPUINFO_MOCK_SRCS "${CPUINFO_SRCS}") +- IF(CPUINFO_TARGET_PROCESSOR MATCHES "^(i[3-6]86|AMD64|x86_64)$") ++ IF(CPUINFO_TARGET_PROCESSOR MATCHES "^(i[3-6]86|AMD64|x86(_64)?)$") + LIST(APPEND CPUINFO_MOCK_SRCS src/x86/mockcpuid.c) + ENDIF() + IF(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android") +@@ -763,7 +763,7 @@ IF(CPUINFO_SUPPORTED_PLATFORM AND CPUINFO_BUILD_UNIT_TESTS) + ADD_TEST(get-current-test get-current-test) + ENDIF() + +- IF(CPUINFO_TARGET_PROCESSOR MATCHES "^(i[3-6]86|AMD64|x86_64)$") ++ IF(CPUINFO_TARGET_PROCESSOR MATCHES "^(i[3-6]86|AMD64|x86(_64)?)$") + ADD_EXECUTABLE(brand-string-test test/name/brand-string.cc) + CPUINFO_TARGET_ENABLE_CXX11(brand-string-test) + CPUINFO_TARGET_RUNTIME_LIBRARY(brand-string-test) +@@ -830,7 +830,7 @@ IF(CPUINFO_SUPPORTED_PLATFORM AND CPUINFO_BUILD_TOOLS) + CPUINFO_TARGET_RUNTIME_LIBRARY(cpuinfo-dump) + ENDIF() + +- IF(CPUINFO_TARGET_PROCESSOR MATCHES "^(i[3-6]86|AMD64|x86_64)$") ++ IF(CPUINFO_TARGET_PROCESSOR MATCHES "^(i[3-6]86|AMD64|x86(_64)?)$") + ADD_EXECUTABLE(cpuid-dump tools/cpuid-dump.c) + CPUINFO_TARGET_ENABLE_C99(cpuid-dump) + CPUINFO_TARGET_RUNTIME_LIBRARY(cpuid-dump) +@@ -869,4 +869,3 @@ IF(CPUINFO_BUILD_PKG_CONFIG) + DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") + + ENDIF() +- diff --git a/ports/cpuinfo/portfile.cmake b/ports/cpuinfo/portfile.cmake index aa964e6e17d08b..d992673358b266 100644 --- a/ports/cpuinfo/portfile.cmake +++ b/ports/cpuinfo/portfile.cmake @@ -9,6 +9,8 @@ vcpkg_from_github( REF b40bae27785787b6dd70788986fd96434cf90ae2 SHA512 dbbe4f3e1d5ae74ffc8ba2cba0ab745a23f4993788f4947825ef5125dd1cbed3e13e0c98e020e6fcfa9879f54f06d7cba4de73ec29f77649b6a27b4ab82c8f1c HEAD_REF master + PATCHES + check-for-x86-correctly.patch # https://github.com/pytorch/cpuinfo/pull/93 ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -16,6 +18,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS tools CPUINFO_BUILD_TOOLS ) +set(LINK_OPTIONS "") if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") list(APPEND LINK_OPTIONS -DCPUINFO_LIBRARY_TYPE=shared) else() @@ -28,29 +31,11 @@ else() list(APPEND LINK_OPTIONS -DCPUINFO_RUNTIME_TYPE=static) endif() -# hack to get around that toolchains/windows.cmake doesn't set CMAKE_SYSTEM_ARCHITECTURE -set(CPUINFO_TARGET_PROCESSOR_param "") -if(VCPKG_TARGET_IS_WINDOWS) - # NOTE: arm64-windows is unsupported for now; - # see https://github.com/pytorch/cpuinfo/pull/82 for updates - # NOTE: arm-windows is unsupported - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(CPUINFO_TARGET_PROCESSOR_param "-DCPUINFO_TARGET_PROCESSOR=x86") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(CPUINFO_TARGET_PROCESSOR_param "-DCPUINFO_TARGET_PROCESSOR=AMD64") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - set(CPUINFO_TARGET_PROCESSOR_param "-DCPUINFO_TARGET_PROCESSOR=ARM") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - set(CPUINFO_TARGET_PROCESSOR_param "-DCPUINFO_TARGET_PROCESSOR=ARM64") - endif() -endif() - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} ${LINK_OPTIONS} - ${CPUINFO_TARGET_PROCESSOR_param} -DCPUINFO_BUILD_UNIT_TESTS=OFF -DCPUINFO_BUILD_MOCK_TESTS=OFF -DCPUINFO_BUILD_BENCHMARKS=OFF @@ -64,7 +49,7 @@ vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() # pkg_check_modules(libcpuinfo) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if("tools" IN_LIST FEATURES) vcpkg_copy_tools( diff --git a/ports/cpuinfo/vcpkg.json b/ports/cpuinfo/vcpkg.json index d718f9393058a2..cc1c3159cb23f4 100644 --- a/ports/cpuinfo/vcpkg.json +++ b/ports/cpuinfo/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cpuinfo", "version-date": "2022-04-02", + "port-version": 1, "description": "CPU INFOrmation library (x86/x86-64/ARM/ARM64, Linux/Windows/Android/macOS/iOS)", "homepage": "https://github.com/pytorch/cpuinfo", "license": "BSD-2-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index cfa3bcaa6040df..8046bb8a854c74 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1682,7 +1682,7 @@ }, "cpuinfo": { "baseline": "2022-04-02", - "port-version": 0 + "port-version": 1 }, "cr": { "baseline": "2020-04-26", diff --git a/versions/c-/cpuinfo.json b/versions/c-/cpuinfo.json index fef8a68d0b663f..485dd2a03d0651 100644 --- a/versions/c-/cpuinfo.json +++ b/versions/c-/cpuinfo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "11ac581a5c1307b2039cf9db3933c2aeffb7a923", + "version-date": "2022-04-02", + "port-version": 1 + }, { "git-tree": "69febccb10ae5b789dd6c5af2b85740617fc34f4", "version-date": "2022-04-02", From dc7478734ed8b3841d3adc6568c38583cb9e8e37 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 16 Jun 2022 23:05:35 +0200 Subject: [PATCH 39/56] [proj] Update to 9.0.1 (#25257) * Update to 9.0.1 * Update versions --- ports/proj/fix-proj4-targets-cmake.patch | 16 ++++++---------- ports/proj/portfile.cmake | 4 ++-- ports/proj/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/proj.json | 5 +++++ 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/ports/proj/fix-proj4-targets-cmake.patch b/ports/proj/fix-proj4-targets-cmake.patch index 62964308619a55..a6ed22b38bae7a 100644 --- a/ports/proj/fix-proj4-targets-cmake.patch +++ b/ports/proj/fix-proj4-targets-cmake.patch @@ -46,21 +46,17 @@ diff --git a/cmake/project-config.cmake.in b/cmake/project-config.cmake.in index 23f997abd..8baef00f0 100644 --- a/cmake/project-config.cmake.in +++ b/cmake/project-config.cmake.in -@@ -7,6 +7,17 @@ - # @PROJECT_VARIANT_NAME@_LIBRARY_DIRS = /usr/local/lib - # @PROJECT_VARIANT_NAME@_BINARY_DIRS = /usr/local/bin +@@ -9,6 +9,13 @@ # @PROJECT_VARIANT_NAME@_VERSION = 4.9.1 (for example) + + include(CMakeFindDependencyMacro) +cmake_policy(PUSH) +cmake_policy(SET CMP0012 NEW) -+include(CMakeFindDependencyMacro) +find_dependency(unofficial-sqlite3 CONFIG) +if("@ENABLE_TIFF@") + find_dependency(TIFF) +endif() -+if("@ENABLE_CURL@") -+ find_dependency(CURL CONFIG) -+endif() +cmake_policy(POP) - - # Tell the user project where to find our headers and libraries - get_filename_component (_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) + if("@CURL_ENABLED@" STREQUAL "TRUE") + # Chainload CURL usage requirements + find_dependency(CURL) diff --git a/ports/proj/portfile.cmake b/ports/proj/portfile.cmake index 63a50506c3ea18..7e66dc9e8b7d91 100644 --- a/ports/proj/portfile.cmake +++ b/ports/proj/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OSGeo/PROJ - REF 9.0.0 - SHA512 f11a20e9f9615c513755f54ac400cc2e144e40caa91f616c8f640aef9caf779487dc94927b3a4b57b15a595c17b70636b872d9a77d7baaf912b1a507004e6520 + REF 9.0.1 + SHA512 b92a196e6801dd8d77e6c2131e15a392077e8e049a6d9befdb39ee035a3cca5a725b95196b29a4c5d7bad4d826a285e40abc3fdc040b5e11ede5c04ba4f6dbb5 HEAD_REF master PATCHES fix-win-output-name.patch diff --git a/ports/proj/vcpkg.json b/ports/proj/vcpkg.json index a17d5a8aa352f1..a3de02b637c567 100644 --- a/ports/proj/vcpkg.json +++ b/ports/proj/vcpkg.json @@ -1,6 +1,6 @@ { "name": "proj", - "version": "9.0.0", + "version": "9.0.1", "description": "PROJ library for cartographic projections", "homepage": "https://proj.org/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 8046bb8a854c74..0bc14005e22207 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5609,7 +5609,7 @@ "port-version": 1 }, "proj": { - "baseline": "9.0.0", + "baseline": "9.0.1", "port-version": 0 }, "proj4": { diff --git a/versions/p-/proj.json b/versions/p-/proj.json index 59f4dd4bc8f6d0..25ab82f93f0937 100644 --- a/versions/p-/proj.json +++ b/versions/p-/proj.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "55c13547b4c812fc8bbb32a09260b3e54bc0a352", + "version": "9.0.1", + "port-version": 0 + }, { "git-tree": "1566fbbbd7d8abba35cebac6c8821339d1da1d16", "version": "9.0.0", From f5a0eb2b230f952804ad528d06c5338425156ee2 Mon Sep 17 00:00:00 2001 From: Barak Shoshany Date: Thu, 16 Jun 2022 17:06:49 -0400 Subject: [PATCH 40/56] [bshoshany-thread-pool] Updated to v3.0.0 (#25262) * [bshoshany-thread-pool] Updated to v3.0.0 * [bshoshany-thread-pool] Updated to v3.0.0 --- ports/bshoshany-thread-pool/portfile.cmake | 12 +++--------- ports/bshoshany-thread-pool/vcpkg.json | 9 ++++++--- versions/b-/bshoshany-thread-pool.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/ports/bshoshany-thread-pool/portfile.cmake b/ports/bshoshany-thread-pool/portfile.cmake index b958693499299b..3476bb580f5c6b 100644 --- a/ports/bshoshany-thread-pool/portfile.cmake +++ b/ports/bshoshany-thread-pool/portfile.cmake @@ -1,19 +1,13 @@ -#header-only library vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO bshoshany/thread-pool - REF v2.0.0 - SHA512 eac1674ea999d25d8d0b8f1b24714830330ba4d345e3f730e49359bae89d9259e429d48357a45f7b4355cbbe1a63f04e7fe2c4e0be08b3bbea51018c62721fcc + REF v3.0.0 + SHA512 009c45bdca7555d7446add9bdfd1080d1af09071f94034933bf09629425b6945b708e41cd572b0eb270fd53a1e8a57eed606378d147c88e9f05eaf6fd89d88c9 HEAD_REF master ) -# Install headers (header-only): file(GLOB HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/*.hpp") -file(INSTALL - "${HEADER_FILES}" - DESTINATION "${CURRENT_PACKAGES_DIR}/include" -) +file(INSTALL "${HEADER_FILES}" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -# Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/bshoshany-thread-pool/vcpkg.json b/ports/bshoshany-thread-pool/vcpkg.json index 86058533b0954c..85bb9d7aa6133d 100644 --- a/ports/bshoshany-thread-pool/vcpkg.json +++ b/ports/bshoshany-thread-pool/vcpkg.json @@ -1,6 +1,9 @@ { "name": "bshoshany-thread-pool", - "version": "2.0.0", - "description": "A C++17 Thread Pool for High-Performance Scientific Computing", - "homepage": "https://github.com/bshoshany/thread-pool" + "version": "3.0.0", + "maintainers": "Barak Shoshany ", + "description": "BS::thread_pool: a fast, lightweight, and easy-to-use C++17 thread pool library", + "homepage": "https://github.com/bshoshany/thread-pool", + "documentation": "https://github.com/bshoshany/thread-pool/blob/master/README.md", + "license": "MIT" } diff --git a/versions/b-/bshoshany-thread-pool.json b/versions/b-/bshoshany-thread-pool.json index 15c2ec3e2fca26..7cd55ea99242a5 100644 --- a/versions/b-/bshoshany-thread-pool.json +++ b/versions/b-/bshoshany-thread-pool.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "76370f19ee1a5791b57631d57ced31da022f8d3e", + "version": "3.0.0", + "port-version": 0 + }, { "git-tree": "5ce890350a3e619b459eac4f676aa3e0858316b4", "version": "2.0.0", diff --git a/versions/baseline.json b/versions/baseline.json index 0bc14005e22207..cbd01c844360c6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1169,7 +1169,7 @@ "port-version": 0 }, "bshoshany-thread-pool": { - "baseline": "2.0.0", + "baseline": "3.0.0", "port-version": 0 }, "bsio": { From dc6f878c0f49c3b0625d4f94217732fb3743b251 Mon Sep 17 00:00:00 2001 From: Buck Yeh Date: Fri, 17 Jun 2022 06:19:16 +0800 Subject: [PATCH 41/56] [buck-yeh-bux] Update to 1.6.6 (#25254) * [bux] Add new port * Corrections according to Create Pull Request suggested questions * SHA512 * Mark fails into .\scripts\ci.baseline.txt * Mark fails into .\scripts\ci.baseline.txt * No need of "port-version": 1 in vcpkg.json * Update version database * Update ports/bux/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update ports/bux/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update ports/bux/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update ports/bux/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update bux.json * Update ports/bux/vcpkg.json * update version * Update scripts/ci.baseline.txt Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * update bux support * update version * update version * Rename bux to buck-yeh-bux * Update version database * [buck-yeh-bux] upgrade to v1.5.0 1. [New] `bux::C_ParaLog` is ready for a variety of parallel logging configurations, filtered or unfiltered. 2. [New] Necessary helper classes for implementation _s.t_ logger users no longer need to declare child source instances explicitly. 3. [New] Add methods to `ParaLog.h` & `SyncLog.h` to support testability. 4. [New] Add unit test cases to `ParaLog.h` & `SyncLog.h` (test_paralog & test_logger) 5. [New] Update what are found in `test/` to `test/archlinux/aur_poc/` 6. [Bug] `std::uniform_int_distribution` no longer allowed. 7. [Change] `CUR_FUNC_` for Windows (MSVC) 8. [Change] `tbb` is no longer implicitly needed by C++ standard library. 9. [Change] `smoke_filtlog.cpp` verifies 2-level log filters ok. * Missing comma in versions/b-/buck-yeh-bux.json * buck-yeh-bux 1.6.0 * Corrections made according to NancyLi1013's requests in PR #20813 * Fix SHA key in versions/b-/buck-yeh-bux.json * Update to buxk-yeh-bux v1.6.2 * [buck-yeh-bux-mariadb-client] The first release * Add dependency to libmariadb * Inccorect git-tree value in versions/b-/buck-yeh-bux-mariadb-client.json * linux build is enabled * [buck-yeh-bux] Upgrade to 1.6.3 to allow u64-linux * linux build is disabled again for not recognizing C++20 header yet * Mark vcpkg.json to support Linux but ci.baseline.txt to fail the CI build * Repair buck-buck-yeh-bux in version database. * [buck-yeh-bux] Upgrade to 1.6.5 * [buck-yeh-bux] Upgrade to 1.6.5 * Add "license" field * Correction nade by `./vcpkg format-manifest ports/buck-yeh-bux/vcpkg.json` * Update according to `git rev-parse HEAD:ports/buck-yeh-bux` * [buck-yeh-bux-mariadb-client] Upgrade to 1.0.3 * [buck-yeh-bux-sqlite] New port * `vcpkg.json`/"supports" changed to "!(arm | uwp | osx | linux)" for all my ports And remove the corresponding lines from `ci.baseline.txt` * Update "port-version" & "git-tree" * Update "port-version" * Update "git-tree" but revert "port-version" * Update ports/buck-yeh-bux-mariadb-client/vcpkg.json Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * Update ports/buck-yeh-bux/vcpkg.json Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * Run `./vcpkg x-add-version ...` to update port-version * Update buck-yeh-bux-mariadb-client.json * Update buck-yeh-bux.json * [buck-yeh-bux] Update to 1.6.6 * [buck-yeh-bux] Update to 1.6.6 * [buck-yeh-bux] Update to 1.6.6 Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Jonliu1993 <13720414433@163.com> Co-authored-by: Billy Robert O'Neal III Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> --- ports/buck-yeh-bux/portfile.cmake | 4 ++-- ports/buck-yeh-bux/vcpkg.json | 3 +-- versions/b-/buck-yeh-bux.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/buck-yeh-bux/portfile.cmake b/ports/buck-yeh-bux/portfile.cmake index 807638d3ac3645..dc1b9367b9b1e1 100644 --- a/ports/buck-yeh-bux/portfile.cmake +++ b/ports/buck-yeh-bux/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO buck-yeh/bux - REF b125e31341660ea76ca51cc5013e52d8d34a1f27 # v1.6.5 - SHA512 c37fea47076a192161aacacf8694c5b6d487a1c2ebe1fa06acdd9948e42e1b1440d83ebe38f4ae3b86c90cb1aba76f7254cd434ea85e24484a9dacb6944511a9 + REF b046518dcffcdef9b8dbccd0accc2636df301766 # v1.6.6 + SHA512 af1ca5c37623a09c64e1a84a630a26911be8c87eb007b112665b7c6080dfac67bd89eb36367202c5d29af97f4e549d6f27e41410220a57bd7756bdb1ecf8ddf0 HEAD_REF main ) diff --git a/ports/buck-yeh-bux/vcpkg.json b/ports/buck-yeh-bux/vcpkg.json index a5bf5cd599d098..90210c0b8c826b 100644 --- a/ports/buck-yeh-bux/vcpkg.json +++ b/ports/buck-yeh-bux/vcpkg.json @@ -1,7 +1,6 @@ { "name": "buck-yeh-bux", - "version": "1.6.5", - "port-version": 1, + "version": "1.6.6", "description": "A supplemental C++ library with functionalities not directly supported from Modern C++ standard.", "homepage": "https://github.com/buck-yeh/bux", "license": "MIT", diff --git a/versions/b-/buck-yeh-bux.json b/versions/b-/buck-yeh-bux.json index 1b235fcab27af1..0860bb3c05d3a4 100644 --- a/versions/b-/buck-yeh-bux.json +++ b/versions/b-/buck-yeh-bux.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3d58f00b46ad32a1bfba6e5ee139aa47047e2bb6", + "version": "1.6.6", + "port-version": 0 + }, { "git-tree": "70c9bddf07b6b1bf2bed8f994f13d1d5703ed105", "version": "1.6.5", diff --git a/versions/baseline.json b/versions/baseline.json index cbd01c844360c6..1f2e21723a70ae 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1177,8 +1177,8 @@ "port-version": 0 }, "buck-yeh-bux": { - "baseline": "1.6.5", - "port-version": 1 + "baseline": "1.6.6", + "port-version": 0 }, "buck-yeh-bux-mariadb-client": { "baseline": "1.0.3", From 6e16931acdf85ab5476973ba00d8eda733f42858 Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Fri, 17 Jun 2022 00:21:18 +0200 Subject: [PATCH 42/56] [wxwidgets] Remove debug asserts from Release build. (#25240) * [wxWidgets] Remove debug asserts from Release build. Currently when building wxWidgets in Release mode, the debug asserts are enabled. This fixes this issue by providing a necessary define to disable them. Ref: https://docs.wxwidgets.org/3.1.6/group__group__funcmacro__debug.html [wxCharts, vcpkg-ci-wxwidgets] Update ports to include fix for wxWidgets release build with debug asserts off when building a dynamic/shared library. Signed-off-by: Vitalii Koshura * Update wxcharts.json Co-authored-by: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> --- ports/wxcharts/portfile.cmake | 6 ++++-- ports/wxcharts/vcpkg.json | 2 +- ports/wxwidgets/example/CMakeLists.txt | 5 +++++ ports/wxwidgets/portfile.cmake | 2 ++ ports/wxwidgets/vcpkg.json | 2 +- scripts/test_ports/vcpkg-ci-wxwidgets/portfile.cmake | 2 ++ versions/baseline.json | 4 ++-- versions/w-/wxcharts.json | 5 +++++ versions/w-/wxwidgets.json | 5 +++++ 9 files changed, 27 insertions(+), 6 deletions(-) diff --git a/ports/wxcharts/portfile.cmake b/ports/wxcharts/portfile.cmake index cee9220505c982..5fbb5c35c10d09 100644 --- a/ports/wxcharts/portfile.cmake +++ b/ports/wxcharts/portfile.cmake @@ -1,12 +1,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wxIshiko/wxCharts - REF c7c7eb4c4132eeb83f25546b1b981dc61e5c188f - SHA512 f46cf467b356e2ffa46db020de42f8aca9beab801e2ade50f7e75650bba9bc83c641702dcd5ee45e82425b96d4371b82e7f16dce3077050a86ba696ed5c326de + REF 070e1d6084623185c7337226fa562b1e3a772e3d + SHA512 4c52e4ad6d3c4ba496aad7e654ee75ddd9009aadc44be37fc64f3e3ac56001a7e9728f7fdd0c78f8261bff0bf8a6748f8a7649cb160ca37c2d686530c161c2f6 ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_RELEASE + -DwxBUILD_DEBUG_LEVEL=0 ) vcpkg_cmake_install() diff --git a/ports/wxcharts/vcpkg.json b/ports/wxcharts/vcpkg.json index 6e3928655d9e5a..15e320e74b0f94 100644 --- a/ports/wxcharts/vcpkg.json +++ b/ports/wxcharts/vcpkg.json @@ -1,6 +1,6 @@ { "name": "wxcharts", - "version-date": "2022-04-22", + "version-date": "2022-06-16", "description": "Chart controls for the wxWidgets cross-platform GUI library", "homepage": "https://www.wxishiko.com/wxCharts", "license": "MIT", diff --git a/ports/wxwidgets/example/CMakeLists.txt b/ports/wxwidgets/example/CMakeLists.txt index 7d5b12dba4cdbe..14720cf37e2766 100644 --- a/ports/wxwidgets/example/CMakeLists.txt +++ b/ports/wxwidgets/example/CMakeLists.txt @@ -2,6 +2,11 @@ cmake_minimum_required(VERSION 3.7) project(wxwidgets-example) +option(wxBUILD_DEBUG_LEVEL "Debug Level" Default) +if(NOT wxBUILD_DEBUG_LEVEL STREQUAL "Default") + add_compile_options("-DwxDEBUG_LEVEL=${wxBUILD_DEBUG_LEVEL}") +endif() + add_executable(main WIN32 popup.cpp) find_package(wxWidgets REQUIRED) diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake index 32b331623874e7..b8c9d3f54ffc82 100644 --- a/ports/wxwidgets/portfile.cmake +++ b/ports/wxwidgets/portfile.cmake @@ -98,6 +98,8 @@ vcpkg_cmake_configure( # The minimum cmake version requirement for Cotire is 2.8.12. # however, we need to declare that the minimum cmake version requirement is at least 3.1 to use CMAKE_PREFIX_PATH as the path to find .pc. -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=ON + OPTIONS_RELEASE + -DwxBUILD_DEBUG_LEVEL=0 ) vcpkg_cmake_install() diff --git a/ports/wxwidgets/vcpkg.json b/ports/wxwidgets/vcpkg.json index fdf7608f0e69f3..2d222ef1265a9b 100644 --- a/ports/wxwidgets/vcpkg.json +++ b/ports/wxwidgets/vcpkg.json @@ -1,7 +1,7 @@ { "name": "wxwidgets", "version": "3.1.6", - "port-version": 1, + "port-version": 2, "description": [ "Widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications. ", "Set WXWIDGETS_USE_STL in a custom triplet to build with the wxUSE_STL build option.", diff --git a/scripts/test_ports/vcpkg-ci-wxwidgets/portfile.cmake b/scripts/test_ports/vcpkg-ci-wxwidgets/portfile.cmake index d301fa74a15038..7a1349c56bce1c 100644 --- a/scripts/test_ports/vcpkg-ci-wxwidgets/portfile.cmake +++ b/scripts/test_ports/vcpkg-ci-wxwidgets/portfile.cmake @@ -12,6 +12,8 @@ vcpkg_cmake_configure( ${OPTIONS} -DCMAKE_CONFIG_RUN=1 "-DPRINT_VARS=CMAKE_CONFIG_RUN;wxWidgets_LIBRARIES" + OPTIONS_RELEASE + -DwxBUILD_DEBUG_LEVEL=0 ) vcpkg_cmake_build() diff --git a/versions/baseline.json b/versions/baseline.json index 1f2e21723a70ae..13481dc6c7a717 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7621,12 +7621,12 @@ "port-version": 0 }, "wxcharts": { - "baseline": "2022-04-22", + "baseline": "2022-06-16", "port-version": 0 }, "wxwidgets": { "baseline": "3.1.6", - "port-version": 1 + "port-version": 2 }, "x-plane": { "baseline": "3.0.3", diff --git a/versions/w-/wxcharts.json b/versions/w-/wxcharts.json index 4001a09f01e20d..8369741d8a4429 100644 --- a/versions/w-/wxcharts.json +++ b/versions/w-/wxcharts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0d4c30893a28468249d63c0f4c1a1a9e231ac817", + "version-date": "2022-06-16", + "port-version": 0 + }, { "git-tree": "b1e9c16349a281b499d1ff50cdee4dd21c4aafec", "version-date": "2022-04-22", diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json index e71cd8312a1666..0f3a4e1566e334 100644 --- a/versions/w-/wxwidgets.json +++ b/versions/w-/wxwidgets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "27a68f45cbdc9ab88864c353c7a8b91f76153509", + "version": "3.1.6", + "port-version": 2 + }, { "git-tree": "793b49ce7710b440be0a451354614e282e6fc9fa", "version": "3.1.6", From 842c72898a4425bfe72e064c7fd3e84bc948b8c0 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Fri, 17 Jun 2022 06:23:28 +0800 Subject: [PATCH 43/56] [mygui] Add feature tools (#25228) * [mygui] Add feature tools * x-add-version * Test tools on CI * overwrite-version * Add the part of install tools to source's cmakefile * x-add-version --overwrite-version Co-authored-by: Cheney-Wang --- ports/mygui/Install-tools.patch | 14 ++++++++++++++ ports/mygui/Use-vcpkg-sdl2.patch | 14 ++++++++++++++ ports/mygui/portfile.cmake | 13 ++++++++++++- ports/mygui/vcpkg.json | 6 +++++- versions/baseline.json | 2 +- versions/m-/mygui.json | 5 +++++ 6 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 ports/mygui/Install-tools.patch create mode 100644 ports/mygui/Use-vcpkg-sdl2.patch diff --git a/ports/mygui/Install-tools.patch b/ports/mygui/Install-tools.patch new file mode 100644 index 00000000000000..bdfc2c90f7ab70 --- /dev/null +++ b/ports/mygui/Install-tools.patch @@ -0,0 +1,14 @@ +diff --git a/CMake/Utils/MyGUIConfigTargets.cmake b/CMake/Utils/MyGUIConfigTargets.cmake +index 6483339..71710de 100644 +--- a/CMake/Utils/MyGUIConfigTargets.cmake ++++ b/CMake/Utils/MyGUIConfigTargets.cmake +@@ -170,6 +170,9 @@ function(mygui_app PROJECTNAME SOLUTIONFOLDER) + set(MYGUI_EXEC_TYPE WIN32) + endif () + add_executable(${PROJECTNAME} ${MYGUI_EXEC_TYPE} ${HEADER_FILES} ${SOURCE_FILES}) ++ install(TARGETS ${PROJECTNAME} ++ RUNTIME DESTINATION bin ++ ) + endif () + set_target_properties(${PROJECTNAME} PROPERTIES FOLDER ${SOLUTIONFOLDER}) + diff --git a/ports/mygui/Use-vcpkg-sdl2.patch b/ports/mygui/Use-vcpkg-sdl2.patch new file mode 100644 index 00000000000000..6a6059ee6004ef --- /dev/null +++ b/ports/mygui/Use-vcpkg-sdl2.patch @@ -0,0 +1,14 @@ +diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt +index 2b160ff..559e6a8 100644 +--- a/Common/CMakeLists.txt ++++ b/Common/CMakeLists.txt +@@ -99,6 +99,8 @@ add_library(${PROJECTNAME} ${HEADER_FILES} ${SOURCE_FILES}) + + mygui_set_platform_name(${MYGUI_RENDERSYSTEM}) + add_dependencies(${PROJECTNAME} MyGUI.${MYGUI_PLATFORM_NAME}Platform) +-target_link_libraries(${PROJECTNAME} MyGUI.${MYGUI_PLATFORM_NAME}Platform) ++ ++find_package(SDL2 CONFIG REQUIRED) ++target_link_libraries(${PROJECTNAME} MyGUI.${MYGUI_PLATFORM_NAME}Platform SDL2::SDL2 SDL2::SDL2main) + + add_dependencies(${PROJECTNAME} MyGUIEngine) diff --git a/ports/mygui/portfile.cmake b/ports/mygui/portfile.cmake index c728aefecc7d3c..a443744f3ce3ce 100644 --- a/ports/mygui/portfile.cmake +++ b/ports/mygui/portfile.cmake @@ -10,6 +10,8 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-generation.patch + Use-vcpkg-sdl2.patch + Install-tools.patch ) if("opengl" IN_LIST FEATURES) @@ -18,18 +20,23 @@ else() set(MYGUI_RENDERSYSTEM 1) endif() +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools MYGUI_BUILD_TOOLS +) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DMYGUI_STATIC=TRUE -DMYGUI_BUILD_DEMOS=FALSE -DMYGUI_BUILD_PLUGINS=TRUE - -DMYGUI_BUILD_TOOLS=FALSE -DMYGUI_BUILD_UNITTESTS=FALSE -DMYGUI_BUILD_TEST_APP=FALSE -DMYGUI_BUILD_WRAPPER=FALSE -DMYGUI_BUILD_DOCS=FALSE -DMYGUI_RENDERSYSTEM=${MYGUI_RENDERSYSTEM} + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() @@ -41,5 +48,9 @@ file(REMOVE_RECURSE vcpkg_fixup_pkgconfig() +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES FontEditor ImageEditor LayoutEditor SkinEditor AUTO_CLEAN) +endif() + # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING.MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/mygui/vcpkg.json b/ports/mygui/vcpkg.json index aabd5655a9107e..761ef55f383801 100644 --- a/ports/mygui/vcpkg.json +++ b/ports/mygui/vcpkg.json @@ -1,9 +1,10 @@ { "name": "mygui", "version": "3.4.1", - "port-version": 2, + "port-version": 3, "description": "Fast, flexible and simple GUI", "homepage": "http://mygui.info", + "license": "MIT", "supports": "!uwp", "dependencies": [ "freetype", @@ -23,6 +24,9 @@ "dependencies": [ "opengl" ] + }, + "tools": { + "description": "Install MyGUI tools." } } } diff --git a/versions/baseline.json b/versions/baseline.json index 13481dc6c7a717..280c3f53994aac 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4766,7 +4766,7 @@ }, "mygui": { "baseline": "3.4.1", - "port-version": 2 + "port-version": 3 }, "nameof": { "baseline": "0.10.1", diff --git a/versions/m-/mygui.json b/versions/m-/mygui.json index d7b1309f58ae81..2ca6e8ec66502d 100644 --- a/versions/m-/mygui.json +++ b/versions/m-/mygui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5a7598c7df27293baca5e55e28c20aec14bf5672", + "version": "3.4.1", + "port-version": 3 + }, { "git-tree": "425cd3df40c8941ec9b3755bc0b3effdd91dc162", "version": "3.4.1", From ca8bde3748134247a725c215c4f3a364ee9126fe Mon Sep 17 00:00:00 2001 From: Noah <37805707+Curve@users.noreply.github.com> Date: Fri, 17 Jun 2022 00:27:28 +0200 Subject: [PATCH 44/56] [saucer, lockpp] add new port (#25111) * [saucer] add new port [saucer] add lockpp dependency beleg * [lockpp] add new port * [saucer] update ref * [saucer] only support static * fix: revert cibaseline * refactor: also disable uwp * [saucer,lockpp] remove superflous dependencies * [lockpp] update version * [saucer] update to 1.0.0 * [saucer] specifiy only static library * [saucer] bump ref * [saucer] remove unused dependency Co-authored-by: Robert Schumacher * [saucer] use vcpkg webview2 Co-authored-by: Robert Schumacher --- ports/lockpp/portfile.cmake | 15 ++++++++++++ ports/lockpp/vcpkg.json | 13 ++++++++++ ports/saucer/portfile.cmake | 20 +++++++++++++++ ports/saucer/unofficial-webview2.patch | 15 ++++++++++++ ports/saucer/vcpkg.json | 34 ++++++++++++++++++++++++++ versions/baseline.json | 8 ++++++ versions/l-/lockpp.json | 9 +++++++ versions/s-/saucer.json | 9 +++++++ 8 files changed, 123 insertions(+) create mode 100644 ports/lockpp/portfile.cmake create mode 100644 ports/lockpp/vcpkg.json create mode 100644 ports/saucer/portfile.cmake create mode 100644 ports/saucer/unofficial-webview2.patch create mode 100644 ports/saucer/vcpkg.json create mode 100644 versions/l-/lockpp.json create mode 100644 versions/s-/saucer.json diff --git a/ports/lockpp/portfile.cmake b/ports/lockpp/portfile.cmake new file mode 100644 index 00000000000000..1af259ee94153a --- /dev/null +++ b/ports/lockpp/portfile.cmake @@ -0,0 +1,15 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Soundux/lockpp + REF v1.0.2 + SHA512 6d92d3bbcbad3e2afd844ab95526e1eb49a7722d0d9d972ff85df561bbb9dc0b7a8aa5c83847f6832a806e52dde427ec0bcd11570b095d9cce7e35b3717e1f51 + HEAD_REF master +) + +vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH}) + +vcpkg_cmake_install() + + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/lockpp/vcpkg.json b/ports/lockpp/vcpkg.json new file mode 100644 index 00000000000000..bc5b348775e06c --- /dev/null +++ b/ports/lockpp/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "lockpp", + "version": "1.0.2", + "description": "A C++17 Library that provides mutex protected objects", + "homepage": "https://github.com/Soundux/lockpp", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/ports/saucer/portfile.cmake b/ports/saucer/portfile.cmake new file mode 100644 index 00000000000000..ea1a6520957069 --- /dev/null +++ b/ports/saucer/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO saucer/saucer + REF 4d41e0f356c5b95f77803cdb760a3c01eac0aabd + SHA512 b5fe7484c80f0efde3c9f445a3a38421aff48d589ee27778495b501de4d232da44d55072664371ade79891ea7218ab1ddab385e2316b7ae20b5c32cd2332dd56 + HEAD_REF dev + PATCHES "unofficial-webview2.patch" +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS -Dsaucer_prefer_remote=OFF -Dsaucer_remote_webview2=OFF +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/saucer/unofficial-webview2.patch b/ports/saucer/unofficial-webview2.patch new file mode 100644 index 00000000000000..be42769a682cf7 --- /dev/null +++ b/ports/saucer/unofficial-webview2.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9fa4269..f950363 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -111,8 +111,8 @@ elseif (saucer_backend STREQUAL "WebView2") + endif() + + if (NOT saucer_remote_webview2) +- find_package(webview2 CONFIG REQUIRED) +- target_link_libraries(${PROJECT_NAME} PRIVATE webview2::webview2) ++ find_package(unofficial-webview2 CONFIG REQUIRED) ++ target_link_libraries(${PROJECT_NAME} PRIVATE unofficial::webview2::webview2) + else() + include("NuGet.cmake") + nuget_add(WebView2 "Microsoft.Web.WebView2" ${saucer_webview2_version}) diff --git a/ports/saucer/vcpkg.json b/ports/saucer/vcpkg.json new file mode 100644 index 00000000000000..e418e6db72184d --- /dev/null +++ b/ports/saucer/vcpkg.json @@ -0,0 +1,34 @@ +{ + "name": "saucer", + "version": "1.0.0", + "description": "Next-gen desktop apps with web-frontend in C++", + "homepage": "https://saucer.github.io/", + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + "fmt", + "lockpp", + "nlohmann-json", + { + "name": "qt5-webchannel", + "platform": "!windows" + }, + { + "name": "qt5-webengine", + "platform": "!windows" + }, + "tl-expected", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "webview2", + "platform": "windows" + }, + { + "name": "wil", + "platform": "windows" + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 280c3f53994aac..d15598e5c912f1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4304,6 +4304,10 @@ "baseline": "0.9.29", "port-version": 2 }, + "lockpp": { + "baseline": "1.0.2", + "port-version": 0 + }, "lodepng": { "baseline": "2021-12-04", "port-version": 1 @@ -6384,6 +6388,10 @@ "baseline": "3.6.2", "port-version": 0 }, + "saucer": { + "baseline": "1.0.0", + "port-version": 0 + }, "sbp": { "baseline": "3.4.10", "port-version": 1 diff --git a/versions/l-/lockpp.json b/versions/l-/lockpp.json new file mode 100644 index 00000000000000..fbd5055fbc59a5 --- /dev/null +++ b/versions/l-/lockpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "a186ea76115669b87e581cdc125423e950322d70", + "version": "1.0.2", + "port-version": 0 + } + ] +} diff --git a/versions/s-/saucer.json b/versions/s-/saucer.json new file mode 100644 index 00000000000000..3818ed071fd4b6 --- /dev/null +++ b/versions/s-/saucer.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3c2191312af1f74d46d991b955b6c7071dba82d2", + "version": "1.0.0", + "port-version": 0 + } + ] +} From 91393faf123c4f1d22ef3dbfb4ec03531bac907a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 17 Jun 2022 00:23:05 +0000 Subject: [PATCH 45/56] [ignition-cmake2/ignition-modularscripts/ignition-common3] Add options, support pkgconfig and fix usage for common3-graph (#25021) * [ignition-common3] Fix usage for graph * version * Apply suggestion * version * Add option OPTIONS, add pkgconfig support, refactor function option declarations * Remove cmake find module installation, add pkgconfig support and fix PRIVATE_FOR limit * Apply suggestions, fix dependency libxml2 * version --- ...kgconfig-and-remove-privatefor-limit.patch | 48 +++++++++++ ports/ignition-cmake2/portfile.cmake | 4 +- ports/ignition-cmake2/vcpkg.json | 2 +- ports/ignition-common3/fix-dependencies.patch | 81 +++++++++++++++++++ ports/ignition-common3/portfile.cmake | 4 +- ports/ignition-common3/vcpkg.json | 2 +- .../vcpkg-port-config.cmake | 36 +++++++-- ports/ignition-modularscripts/vcpkg.json | 1 + versions/baseline.json | 6 +- versions/i-/ignition-cmake2.json | 5 ++ versions/i-/ignition-common3.json | 5 ++ versions/i-/ignition-modularscripts.json | 5 ++ 12 files changed, 184 insertions(+), 15 deletions(-) create mode 100644 ports/ignition-cmake2/add-pkgconfig-and-remove-privatefor-limit.patch create mode 100644 ports/ignition-common3/fix-dependencies.patch diff --git a/ports/ignition-cmake2/add-pkgconfig-and-remove-privatefor-limit.patch b/ports/ignition-cmake2/add-pkgconfig-and-remove-privatefor-limit.patch new file mode 100644 index 00000000000000..5acf97537a1974 --- /dev/null +++ b/ports/ignition-cmake2/add-pkgconfig-and-remove-privatefor-limit.patch @@ -0,0 +1,48 @@ +diff --git a/cmake/IgnUtils.cmake b/cmake/IgnUtils.cmake +index bc6dbdc..1e8adbb 100644 +--- a/cmake/IgnUtils.cmake ++++ b/cmake/IgnUtils.cmake +@@ -138,7 +138,7 @@ macro(ign_find_package PACKAGE_NAME) + #------------------------------------ + # Define the expected arguments + set(options REQUIRED PRIVATE EXACT QUIET BUILD_ONLY PKGCONFIG_IGNORE) +- set(oneValueArgs VERSION PRETTY PURPOSE EXTRA_ARGS PKGCONFIG PKGCONFIG_LIB PKGCONFIG_VER_COMPARISON) ++ set(oneValueArgs VERSION PRETTY PURPOSE EXTRA_ARGS PKGCONFIG PKGCONFIG_LIB PKGCONFIG_VER_COMPARISON BY_PKGCONFIG) + set(multiValueArgs REQUIRED_BY PRIVATE_FOR COMPONENTS OPTIONAL_COMPONENTS) + + #------------------------------------ +@@ -183,9 +183,15 @@ macro(ign_find_package PACKAGE_NAME) + endif() + + ++ if (NOT ign_find_package_BY_PKGCONFIG) + #------------------------------------ + # Call find_package with the provided arguments + find_package(${${PACKAGE_NAME}_find_package_args}) ++ else() ++ find_package(PkgConfig REQUIRED) ++ include(FindPkgConfig) ++ pkg_check_modules(${PACKAGE_NAME} ${ign_find_package_BY_PKGCONFIG}) ++ endif() + + if(${PACKAGE_NAME}_FOUND) + +@@ -300,17 +306,11 @@ macro(ign_find_package PACKAGE_NAME) + endif() + + if(ign_find_package_REQUIRED_BY) +- +- # Identify which components are privately requiring this package +- foreach(component ${ign_find_package_PRIVATE_FOR}) +- set(${component}_${PACKAGE_NAME}_PRIVATE true) +- endforeach() +- + # If this is required by some components, add it to the + # ${component}_CMAKE_DEPENDENCIES variables that are specific to those + # componenets + foreach(component ${ign_find_package_REQUIRED_BY}) +- if(NOT ${component}_${PACKAGE_NAME}_PRIVATE) ++ if(NOT ign_find_package_BY_PKGCONFIG) + ign_string_append(${component}_CMAKE_DEPENDENCIES "${${PACKAGE_NAME}_find_dependency}" DELIM "\n") + endif() + endforeach() diff --git a/ports/ignition-cmake2/portfile.cmake b/ports/ignition-cmake2/portfile.cmake index cdf98d511d0d99..93dc94a3d6e590 100644 --- a/ports/ignition-cmake2/portfile.cmake +++ b/ports/ignition-cmake2/portfile.cmake @@ -3,7 +3,9 @@ set(PACKAGE_VERSION "2.5.0") ignition_modular_library(NAME cmake VERSION ${PACKAGE_VERSION} SHA512 e39ed44ae6f7ccc338412f466f1257f88989e0818bee801ddbe09350e906cd9ce709be24356310fdbfde22d1b5b5846fed0aa794c06dcf7caf82748a07b428d6 - PATCHES FindGTS.patch) + PATCHES + FindGTS.patch + add-pkgconfig-and-remove-privatefor-limit.patch) # Install custom usage configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) diff --git a/ports/ignition-cmake2/vcpkg.json b/ports/ignition-cmake2/vcpkg.json index 8f00a65bc3022d..84fcf05c345e6d 100644 --- a/ports/ignition-cmake2/vcpkg.json +++ b/ports/ignition-cmake2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ignition-cmake2", "version": "2.5.0", - "port-version": 2, + "port-version": 3, "description": "CMake helper functions for building robotic applications", "homepage": "https://ignitionrobotics.org/libs/cmake", "license": null, diff --git a/ports/ignition-common3/fix-dependencies.patch b/ports/ignition-common3/fix-dependencies.patch new file mode 100644 index 00000000000000..7908991df7af76 --- /dev/null +++ b/ports/ignition-common3/fix-dependencies.patch @@ -0,0 +1,81 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 73920fe..8bee7fe 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -52,7 +52,7 @@ set(IGN_MATH_VER ${ignition-math6_VERSION_MAJOR}) + #-------------------------------------- + # Find Tinyxml2 + if(USE_EXTERNAL_TINYXML2) +- ign_find_package(TINYXML2 PRETTY tinyxml2 ++ ign_find_package(tinyxml2 EXTRA_ARGS CONFIG + REQUIRED_BY graphics + PRIVATE_FOR graphics) + else() +@@ -70,13 +70,13 @@ if(NOT MSVC) + + #------------------------------------ + # Find uuid +- ign_find_package(UUID REQUIRED PRETTY uuid) ++ ign_find_package(UUID REQUIRED PRETTY uuid REQUIRED_BY graphics) + + endif() + + #------------------------------------ + # Find Freeimage +-ign_find_package(FreeImage VERSION 3.9 ++ign_find_package(freeimage EXTRA_ARGS CONFIG + REQUIRED_BY graphics + PRIVATE_FOR graphics) + +@@ -84,6 +84,7 @@ ign_find_package(FreeImage VERSION 3.9 + # Find GNU Triangulation Surface Library + ign_find_package( + GTS PRETTY gts PURPOSE "GNU Triangulation Surface library" ++ BY_PKGCONFIG gts + REQUIRED_BY graphics + PRIVATE_FOR graphics) + +diff --git a/graphics/src/CMakeLists.txt b/graphics/src/CMakeLists.txt +index 000a0ce..f6e1831 100644 +--- a/graphics/src/CMakeLists.txt ++++ b/graphics/src/CMakeLists.txt +@@ -16,8 +16,10 @@ target_link_libraries(${graphics_target} + PUBLIC + ignition-math${IGN_MATH_VER}::ignition-math${IGN_MATH_VER} + PRIVATE +- GTS::GTS +- FreeImage::FreeImage) ++ ${GTS_LINK_LIBRARIES} ++ freeimage::FreeImage) ++ ++target_include_directories(${graphics_target} PRIVATE ${GTS_INCLUDE_DIRS}) + + ign_build_tests(TYPE UNIT SOURCES ${gtest_sources} + LIB_DEPS ${graphics_target}) +@@ -28,13 +30,13 @@ if(USE_EXTERNAL_TINYXML2) + # If we are using an external copy of tinyxml2, add its imported target + target_link_libraries(${graphics_target} + PRIVATE +- TINYXML2::TINYXML2) ++ tinyxml2::tinyxml2) + + # The collada exporter test uses tinyxml2, so we must link it if we're using + # an external copy. The graphics target considers tinyxml2 to be a private + # dependency, so it will not automatically get linked to this test. + if(TARGET UNIT_ColladaExporter_TEST) +- target_link_libraries(UNIT_ColladaExporter_TEST TINYXML2::TINYXML2) ++ target_link_libraries(UNIT_ColladaExporter_TEST tinyxml2::tinyxml2) + endif() + + else() +@@ -62,8 +64,8 @@ endif() + + # define of tinxml2 major version >= 6 + # https://github.com/ignitionrobotics/ign-common/issues/28 +-if (NOT TINYXML2_VERSION VERSION_LESS "6.0.0") +- message(STATUS "TINYXML2_VERSION ${TINYXML2_VERSION} >= 6.0.0") ++if (NOT tinyxml2_VERSION VERSION_LESS "6.0.0") ++ message(STATUS "TINYXML2_VERSION ${tinyxml2_VERSION} >= 6.0.0") + target_compile_definitions(${graphics_target} + PRIVATE "TINYXML2_MAJOR_VERSION_GE_6") + endif() diff --git a/ports/ignition-common3/portfile.cmake b/ports/ignition-common3/portfile.cmake index 1f460f1c567f7e..5ea87a93555f4f 100644 --- a/ports/ignition-common3/portfile.cmake +++ b/ports/ignition-common3/portfile.cmake @@ -1,6 +1,8 @@ ignition_modular_library(NAME common VERSION "3.9.0" - SHA512 1bae86efd7da10ac517d67a75ad1b612ea2046128eb75e0f0a134ffff7cc76431e850a9b46fdb7dc6603e2acb044f4204fdedaf38fc7bff82883db3f36830fb9) + SHA512 1bae86efd7da10ac517d67a75ad1b612ea2046128eb75e0f0a134ffff7cc76431e850a9b46fdb7dc6603e2acb044f4204fdedaf38fc7bff82883db3f36830fb9 + OPTIONS -DUSE_EXTERNAL_TINYXML2=ON + PATCHES fix-dependencies.patch) # Remove non-relocatable helper scripts (see https://github.com/ignitionrobotics/ign-common/issues/82) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/ign_remotery_vis" "${CURRENT_PACKAGES_DIR}/debug/bin/ign_remotery_vis") diff --git a/ports/ignition-common3/vcpkg.json b/ports/ignition-common3/vcpkg.json index 341296b8481d04..f25d46d506cff4 100644 --- a/ports/ignition-common3/vcpkg.json +++ b/ports/ignition-common3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ignition-common3", "version": "3.9.0", - "port-version": 3, + "port-version": 4, "description": "Common libraries for robotics applications", "homepage": "https://ignitionrobotics.org/libs/common", "license": null, diff --git a/ports/ignition-modularscripts/vcpkg-port-config.cmake b/ports/ignition-modularscripts/vcpkg-port-config.cmake index 8a1729d50de368..7737281d475458 100644 --- a/ports/ignition-modularscripts/vcpkg-port-config.cmake +++ b/ports/ignition-modularscripts/vcpkg-port-config.cmake @@ -1,10 +1,18 @@ -function(ignition_modular_build_library NAME MAJOR_VERSION SOURCE_PATH CMAKE_PACKAGE_NAME DEFAULT_CMAKE_PACKAGE_NAME IML_DISABLE_PKGCONFIG_INSTALL) +function(ignition_modular_build_library) + set(options DISABLE_PKGCONFIG_INSTALL) + set(oneValueArgs NAME MAJOR_VERSION SOURCE_PATH CMAKE_PACKAGE_NAME DEFAULT_CMAKE_PACKAGE_NAME) + set(multiValueArgs OPTIONS) + cmake_parse_arguments(IML "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) + vcpkg_find_acquire_program(PKGCONFIG) vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH ${IML_SOURCE_PATH} PREFER_NINJA DISABLE_PARALLEL_CONFIGURE - OPTIONS -DBUILD_TESTING=OFF + OPTIONS + -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} + -DBUILD_TESTING=OFF + ${IML_OPTIONS} ) vcpkg_install_cmake(ADD_BIN_TO_PATH) @@ -12,7 +20,7 @@ function(ignition_modular_build_library NAME MAJOR_VERSION SOURCE_PATH CMAKE_PAC # If necessary, move the CMake config files if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake") # Some ignition libraries install library subcomponents, that are effectively additional cmake packages - # with name ${CMAKE_PACKAGE_NAME}-${COMPONENT_NAME}, so it is needed to call vcpkg_fixup_cmake_targets for them as well + # with name ${IML_CMAKE_PACKAGE_NAME}-${COMPONENT_NAME}, so it is needed to call vcpkg_fixup_cmake_targets for them as well file(GLOB COMPONENTS_CMAKE_PACKAGE_NAMES LIST_DIRECTORIES TRUE RELATIVE "${CURRENT_PACKAGES_DIR}/lib/cmake/" @@ -25,10 +33,10 @@ function(ignition_modular_build_library NAME MAJOR_VERSION SOURCE_PATH CMAKE_PAC endforeach() file(GLOB_RECURSE CMAKE_RELEASE_FILES - "${CURRENT_PACKAGES_DIR}/lib/cmake/${CMAKE_PACKAGE_NAME}/*") + "${CURRENT_PACKAGES_DIR}/lib/cmake/${IML_CMAKE_PACKAGE_NAME}/*") file(COPY ${CMAKE_RELEASE_FILES} DESTINATION - "${CURRENT_PACKAGES_DIR}/share/${CMAKE_PACKAGE_NAME}/") + "${CURRENT_PACKAGES_DIR}/share/${IML_CMAKE_PACKAGE_NAME}/") endif() # Remove unused files files @@ -111,7 +119,7 @@ endfunction() function(ignition_modular_library) set(options DISABLE_PKGCONFIG_INSTALL) set(oneValueArgs NAME VERSION SHA512 REF HEAD_REF CMAKE_PACKAGE_NAME) - set(multiValueArgs PATCHES) + set(multiValueArgs PATCHES OPTIONS) cmake_parse_arguments(IML "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) string(REPLACE "." ";" IML_VERSION_LIST ${IML_VERSION}) @@ -144,6 +152,18 @@ function(ignition_modular_library) FILE_DISAMBIGUATOR 1 ) + if (IML_DISABLE_PKGCONFIG_INSTALL) + set(EXTRA_OPTIONS DISABLE_PKGCONFIG_INSTALL) + endif() + # Build library - ignition_modular_build_library(${IML_NAME} ${IML_MAJOR_VERSION} ${SOURCE_PATH} ${IML_CMAKE_PACKAGE_NAME} ${DEFAULT_CMAKE_PACKAGE_NAME} ${IML_DISABLE_PKGCONFIG_INSTALL}) + ignition_modular_build_library( + NAME ${IML_NAME} + MAJOR_VERSION ${IML_MAJOR_VERSION} + SOURCE_PATH ${SOURCE_PATH} + CMAKE_PACKAGE_NAME ${IML_CMAKE_PACKAGE_NAME} + DEFAULT_CMAKE_PACKAGE_NAME ${DEFAULT_CMAKE_PACKAGE_NAME} + ${EXTRA_OPTIONS} + OPTIONS ${IML_OPTIONS} + ) endfunction() diff --git a/ports/ignition-modularscripts/vcpkg.json b/ports/ignition-modularscripts/vcpkg.json index 9384dc5b678f97..d7beaa13ff731f 100644 --- a/ports/ignition-modularscripts/vcpkg.json +++ b/ports/ignition-modularscripts/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ignition-modularscripts", "version-date": "2022-05-11", + "port-version": 1, "description": "Vcpkg helpers to package ignition libraries", "license": null } diff --git a/versions/baseline.json b/versions/baseline.json index d15598e5c912f1..c38be383ae0c64 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2874,7 +2874,7 @@ }, "ignition-cmake2": { "baseline": "2.5.0", - "port-version": 2 + "port-version": 3 }, "ignition-common1": { "baseline": "1.1.1", @@ -2882,7 +2882,7 @@ }, "ignition-common3": { "baseline": "3.9.0", - "port-version": 3 + "port-version": 4 }, "ignition-fuel-tools1": { "baseline": "1.2.0", @@ -2902,7 +2902,7 @@ }, "ignition-modularscripts": { "baseline": "2022-05-11", - "port-version": 0 + "port-version": 1 }, "ignition-msgs1": { "baseline": "1.0.0", diff --git a/versions/i-/ignition-cmake2.json b/versions/i-/ignition-cmake2.json index 67631a55d47549..652bc5f9cb4658 100644 --- a/versions/i-/ignition-cmake2.json +++ b/versions/i-/ignition-cmake2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "04ad74fe00ed7c2030aec3e27fc0beaaf2c90bf8", + "version": "2.5.0", + "port-version": 3 + }, { "git-tree": "d146d55be3a48e481af0a87660c44ce2a7b5cb11", "version": "2.5.0", diff --git a/versions/i-/ignition-common3.json b/versions/i-/ignition-common3.json index 90153153e1b35a..b34807520d3470 100644 --- a/versions/i-/ignition-common3.json +++ b/versions/i-/ignition-common3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6dc33f01d43ba86ec811a09138434f76815a40c8", + "version": "3.9.0", + "port-version": 4 + }, { "git-tree": "929c84951a63b65c9dd48f73a4a7147ae5a1779b", "version": "3.9.0", diff --git a/versions/i-/ignition-modularscripts.json b/versions/i-/ignition-modularscripts.json index 6a158e1fd194aa..1ee29b448c9e6d 100644 --- a/versions/i-/ignition-modularscripts.json +++ b/versions/i-/ignition-modularscripts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ae302700b77870b26543f2df7764304d848c198a", + "version-date": "2022-05-11", + "port-version": 1 + }, { "git-tree": "d834091edb40475a3e9f55455ff532f3ac629142", "version-date": "2022-05-11", From f2606af170abe6e986ab0fe5e94e9f96b43cba88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=84=B6Y?= Date: Sat, 18 Jun 2022 03:43:38 +0800 Subject: [PATCH 46/56] [air-ctl] Update to v1.1.0 (#25290) * update air-ctl v1.1.0 * update version database --- ports/air-ctl/portfile.cmake | 4 ++-- ports/air-ctl/vcpkg.json | 3 +-- versions/a-/air-ctl.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/air-ctl/portfile.cmake b/ports/air-ctl/portfile.cmake index bad81491bb270e..8ead5bc0f4e664 100644 --- a/ports/air-ctl/portfile.cmake +++ b/ports/air-ctl/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO inie0722/CTL - REF 58ca0f229aff093ada66955993cada93e01da18c #1.0.0 - SHA512 6e1fcd70be0750b3e45de80d6fb30471fdbd8bbd23afd7ff9fb8c3b9fe61669cd02773cf2b6573348dd2905a303845627d3f5f3e647f4e1261db4cc570cf5099 + REF v1.1.0 + SHA512 bf04841d90b39a6f607773c982aa9d4e2ef0aa6297810595391eb5bf01f698583518041fcee00bcde7cd8f5228bea637f7fe299c7f26c49bea16669044618424 HEAD_REF master ) diff --git a/ports/air-ctl/vcpkg.json b/ports/air-ctl/vcpkg.json index ea99269c217c08..ded0183242e63f 100644 --- a/ports/air-ctl/vcpkg.json +++ b/ports/air-ctl/vcpkg.json @@ -1,7 +1,6 @@ { "name": "air-ctl", - "version": "1.0.0", - "port-version": 1, + "version": "1.1.0", "description": "C template container library", "homepage": "https://github.com/inie0722/CTL", "license": "BSL-1.0", diff --git a/versions/a-/air-ctl.json b/versions/a-/air-ctl.json index a96aef4ef0f8be..d00cacba68ea71 100644 --- a/versions/a-/air-ctl.json +++ b/versions/a-/air-ctl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a0f9e096458b1d0a77995acdffca30c15466592e", + "version": "1.1.0", + "port-version": 0 + }, { "git-tree": "f903c4c9124f693bab3174cca9bba73ed068bbb4", "version": "1.0.0", diff --git a/versions/baseline.json b/versions/baseline.json index c38be383ae0c64..6257bf26753463 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -33,8 +33,8 @@ "port-version": 0 }, "air-ctl": { - "baseline": "1.0.0", - "port-version": 1 + "baseline": "1.1.0", + "port-version": 0 }, "aixlog": { "baseline": "1.5.0", From 945e171c8c1be243ec4cb8dc6de5380e98b5f384 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 17 Jun 2022 19:47:31 +0000 Subject: [PATCH 47/56] [redis-plus-plus] Add feature async-std and fix dependency libuv (#25272) * [redis-plus-plus] Add feature async-std and fix dependency libuv * Re-generate patch * version * Add license * version * Apply suggestion * version --- .../fix-dependency-libuv.patch | 23 +++++++++++++++++++ ports/redis-plus-plus/portfile.cmake | 10 ++++++++ ports/redis-plus-plus/vcpkg.json | 20 ++++++++++++++++ versions/baseline.json | 2 +- versions/r-/redis-plus-plus.json | 5 ++++ 5 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 ports/redis-plus-plus/fix-dependency-libuv.patch diff --git a/ports/redis-plus-plus/fix-dependency-libuv.patch b/ports/redis-plus-plus/fix-dependency-libuv.patch new file mode 100644 index 00000000000000..0990debe911653 --- /dev/null +++ b/ports/redis-plus-plus/fix-dependency-libuv.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e85a158..e67681c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -30,8 +30,8 @@ if(REDIS_PLUS_PLUS_BUILD_ASYNC) + message(STATUS "redis-plus-plus build async interface with libuv") + + # libuv dependency +- find_path(REDIS_PLUS_PLUS_ASYNC_LIB_HEADER NAMES uv.h) +- find_library(REDIS_PLUS_PLUS_ASYNC_LIB uv) ++ find_package(unofficial-libuv CONFIG REQUIRED) ++ set(REDIS_PLUS_PLUS_ASYNC_LIB unofficial::libuv::libuv) + else() + message(FATAL_ERROR "invalid REDIS_PLUS_PLUS_BUILD_ASYNC") + endif() +@@ -150,7 +150,6 @@ if(REDIS_PLUS_PLUS_BUILD_STATIC) + + if(REDIS_PLUS_PLUS_BUILD_ASYNC) + target_include_directories(${STATIC_LIB} PUBLIC $) +- target_include_directories(${STATIC_LIB} PUBLIC $) + if(REDIS_PLUS_PLUS_ASYNC_FUTURE STREQUAL "boost") + target_include_directories(${STATIC_LIB} SYSTEM PUBLIC $) + endif() diff --git a/ports/redis-plus-plus/portfile.cmake b/ports/redis-plus-plus/portfile.cmake index 93ee71b583883d..0853be1a977514 100644 --- a/ports/redis-plus-plus/portfile.cmake +++ b/ports/redis-plus-plus/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES fix-ws2-linking-windows.patch fix-conversion.patch + fix-dependency-libuv.patch ) if("cxx17" IN_LIST FEATURES) @@ -15,6 +16,14 @@ else() set(REDIS_PLUS_PLUS_CXX_STANDARD 11) endif() +set(EXTRA_OPT "") +if ("async" IN_LIST FEATURES) + list(APPEND EXTRA_OPT -DREDIS_PLUS_PLUS_BUILD_ASYNC="libuv") +endif() +if ("async-std" IN_LIST FEATURES) + list(APPEND EXTRA_OPT -DREDIS_PLUS_PLUS_ASYNC_FUTURE="std") +endif() + string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" REDIS_PLUS_PLUS_BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" REDIS_PLUS_PLUS_BUILD_SHARED) @@ -26,6 +35,7 @@ vcpkg_cmake_configure( -DREDIS_PLUS_PLUS_BUILD_SHARED=${REDIS_PLUS_PLUS_BUILD_SHARED} -DREDIS_PLUS_PLUS_BUILD_TEST=OFF -DREDIS_PLUS_PLUS_CXX_STANDARD=${REDIS_PLUS_PLUS_CXX_STANDARD} + ${EXTRA_OPT} ) vcpkg_cmake_install() diff --git a/ports/redis-plus-plus/vcpkg.json b/ports/redis-plus-plus/vcpkg.json index 769edb78d2cd15..649fc686ab52c8 100644 --- a/ports/redis-plus-plus/vcpkg.json +++ b/ports/redis-plus-plus/vcpkg.json @@ -1,8 +1,10 @@ { "name": "redis-plus-plus", "version-semver": "1.3.2", + "port-version": 1, "description": "This is a C++ client for Redis. It's based on hiredis, and written in C++ 11", "homepage": "https://github.com/sewenew/redis-plus-plus", + "license": "Apache-2.0", "dependencies": [ "hiredis", { @@ -15,6 +17,24 @@ } ], "features": { + "async": { + "description": "Build with async", + "dependencies": [ + "libuv" + ] + }, + "async-std": { + "description": "Build async with std::future", + "dependencies": [ + { + "name": "redis-plus-plus", + "default-features": false, + "features": [ + "async" + ] + } + ] + }, "cxx17": { "description": "Build redis-plus-plus with cxx 17 standard" } diff --git a/versions/baseline.json b/versions/baseline.json index 6257bf26753463..f6955c4f530ebc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6206,7 +6206,7 @@ }, "redis-plus-plus": { "baseline": "1.3.2", - "port-version": 0 + "port-version": 1 }, "refl-cpp": { "baseline": "0.12.3", diff --git a/versions/r-/redis-plus-plus.json b/versions/r-/redis-plus-plus.json index de899f3b71847e..cfe71b9ca07166 100644 --- a/versions/r-/redis-plus-plus.json +++ b/versions/r-/redis-plus-plus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bfb560234e651a06204f44976997b21466ba6a9d", + "version-semver": "1.3.2", + "port-version": 1 + }, { "git-tree": "a58c88604be6da2e638127442cc413c0504e2f51", "version-semver": "1.3.2", From e1f3eecdebf4b3dea8e6b169ae1cead020776f03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Chlumsk=C3=BD?= Date: Fri, 17 Jun 2022 22:57:34 +0200 Subject: [PATCH 48/56] [skia] Build configuration fix (#25247) * [skia] Build configuration fix * [skia] Changed declared port-version --- ports/skia/portfile.cmake | 4 ++-- ports/skia/skiaConfig.cmake.in | 6 ++++-- ports/skia/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/s-/skia.json | 5 +++++ 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ports/skia/portfile.cmake b/ports/skia/portfile.cmake index 6c68b7fc94ec3d..915189d62b9f3e 100644 --- a/ports/skia/portfile.cmake +++ b/ports/skia/portfile.cmake @@ -377,7 +377,7 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") //:skia) gn_desc_target_defines(SKIA_DEFINITIONS_DBG "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" - //extract_public_config:extract_skia) + //:skia) endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") @@ -386,7 +386,7 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") //:skia) gn_desc_target_defines(SKIA_DEFINITIONS_REL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" - //extract_public_config:extract_skia) + //:skia) endif() configure_file("${CMAKE_CURRENT_LIST_DIR}/skiaConfig.cmake.in" diff --git a/ports/skia/skiaConfig.cmake.in b/ports/skia/skiaConfig.cmake.in index 62f816a6ba44e1..98b491206a365f 100644 --- a/ports/skia/skiaConfig.cmake.in +++ b/ports/skia/skiaConfig.cmake.in @@ -13,8 +13,10 @@ if(_IMPORT_PREFIX STREQUAL "/") set(_IMPORT_PREFIX "") endif() -find_library(SKIA_LIB NAMES skia skia.dll) -target_link_libraries(skia INTERFACE "${SKIA_LIB}") +find_library(SKIA_LIB_DBG NAMES skia skia.dll PATHS ${_IMPORT_PREFIX}/debug/lib NO_DEFAULT_PATH) +find_library(SKIA_LIB_REL NAMES skia skia.dll PATHS ${_IMPORT_PREFIX}/lib NO_DEFAULT_PATH) +target_link_libraries(skia INTERFACE "$<$:${SKIA_LIB_DBG}>") +target_link_libraries(skia INTERFACE "$<$:${SKIA_LIB_REL}>") function(set_dependencies CONFIG LIBRARIES) foreach(LIB ${LIBRARIES}) diff --git a/ports/skia/vcpkg.json b/ports/skia/vcpkg.json index 39f604a2d52a82..39414acf3f1d67 100644 --- a/ports/skia/vcpkg.json +++ b/ports/skia/vcpkg.json @@ -1,6 +1,7 @@ { "name": "skia", "version-date": "2022-04-15", + "port-version": 1, "description": [ "Skia is an open source 2D graphics library which provides common APIs that work across a variety of hardware and software platforms.", "It serves as the graphics engine for Google Chrome and Chrome OS, Android, Mozilla Firefox and Firefox OS, and many other products.", diff --git a/versions/baseline.json b/versions/baseline.json index f6955c4f530ebc..bd002648f7d6d1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6598,7 +6598,7 @@ }, "skia": { "baseline": "2022-04-15", - "port-version": 0 + "port-version": 1 }, "skyr-url": { "baseline": "1.13.0", diff --git a/versions/s-/skia.json b/versions/s-/skia.json index 00a465e3e9ca34..429212d01103b6 100644 --- a/versions/s-/skia.json +++ b/versions/s-/skia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "99590977282f5689ae6f9d6e6f6b13fc8cbfd625", + "version-date": "2022-04-15", + "port-version": 1 + }, { "git-tree": "d167d79c12796fb226b9a869705fde2f4594e789", "version-date": "2022-04-15", From 1f2d10b4537738e159e1cefb9d6a3b21760ec9db Mon Sep 17 00:00:00 2001 From: Christian Ullrich Date: Fri, 17 Jun 2022 23:10:59 +0200 Subject: [PATCH 49/56] [wtl] Add another post-release update (#25229) * Add another post-release update. https://sourceforge.net/p/wtl/patches/66/ * Put the WTL includes into a subdirectory again. This reverts 1323f4b8. * Update metadata. * Update more metadata. * Mention the source of the post-release update list * Refresh metadata. * Revert "Put the WTL includes into a subdirectory again." This reverts commit 1d9c1d6120bc237cb18e19debd57708fabe0c672. --- ports/wtl/atlribbon.h-wtl66.patch | 17 +++++++++++++++++ ports/wtl/portfile.cmake | 3 +++ ports/wtl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/w-/wtl.json | 5 +++++ 5 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 ports/wtl/atlribbon.h-wtl66.patch diff --git a/ports/wtl/atlribbon.h-wtl66.patch b/ports/wtl/atlribbon.h-wtl66.patch new file mode 100644 index 00000000000000..d4ebac4874a7ce --- /dev/null +++ b/ports/wtl/atlribbon.h-wtl66.patch @@ -0,0 +1,17 @@ +--- a/Include/atlribbon.h 2022-06-06 03:12:54.312690900 +0200 ++++ b/Include/atlribbon.h 2022-06-06 03:13:24.337068900 +0200 +@@ -27,10 +27,10 @@ + #error atlribbon.h requires atlapp.h to be included first + #endif + +-#include // for RecentDocumentList classes +-#include // for Frame and UpdateUI classes +-#include // required for atlctrlw.h +-#include // for CCommandBarCtrl ++#include "atlmisc.h" // for RecentDocumentList classes ++#include "atlframe.h" // for Frame and UpdateUI classes ++#include "atlctrls.h" // required for atlctrlw.h ++#include "atlctrlw.h" // for CCommandBarCtrl + + #ifndef __ATLSTR_H__ + #pragma warning(push) diff --git a/ports/wtl/portfile.cmake b/ports/wtl/portfile.cmake index 23c13b9c46bbd7..d80bb7d7efeb0c 100644 --- a/ports/wtl/portfile.cmake +++ b/ports/wtl/portfile.cmake @@ -6,8 +6,11 @@ vcpkg_from_sourceforge( NO_REMOVE_ONE_LEVEL SHA512 086a6cf6a49a4318a8c519136ba6019ded7aa7f2c1d85f78c30b21183654537b3428a400a64fcdacba3a7a10a9ef05137b6f2119f59594da300d55f9ebfb1309 PATCHES + # WTL 10 post-release updates; see + # https://sourceforge.net/projects/wtl/files/WTL%2010/WTL10%20Post-Release%20Updates.txt/download appwizard_setup.js-vs2022.patch atlmisc.h-bug329.patch + atlribbon.h-wtl66.patch ) file(INSTALL "${SOURCE_PATH}/Include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN "*.h") diff --git a/ports/wtl/vcpkg.json b/ports/wtl/vcpkg.json index eda850d79c59ec..605dde9b293858 100644 --- a/ports/wtl/vcpkg.json +++ b/ports/wtl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "wtl", "version": "10.0.10320", - "port-version": 3, + "port-version": 4, "description": "Windows Template Library (WTL) is a C++ library for developing Windows applications and UI components.", "homepage": "https://sourceforge.net/projects/wtl/", "license": "MS-PL" diff --git a/versions/baseline.json b/versions/baseline.json index bd002648f7d6d1..186cb04149ecce 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7622,7 +7622,7 @@ }, "wtl": { "baseline": "10.0.10320", - "port-version": 3 + "port-version": 4 }, "wxchartdir": { "baseline": "2.0.0", diff --git a/versions/w-/wtl.json b/versions/w-/wtl.json index e6c04547bd7904..b0448a20bfa333 100644 --- a/versions/w-/wtl.json +++ b/versions/w-/wtl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c76ddf631b62e5d0b433859f7798c7ab06050f47", + "version": "10.0.10320", + "port-version": 4 + }, { "git-tree": "77302be4bab5f3221389c7948462e15ac941002b", "version": "10.0.10320", From 2bbb79d6e6f956b8c1aa01964bcbab358ad98fdf Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Sat, 18 Jun 2022 05:14:40 +0800 Subject: [PATCH 50/56] [librabbitmq] Fix cannot include header file when using. (#25224) * fix usage include files * update version * add license * overwrite version * update patch and options * update version * update patch * update version * update patch * update version * delete blank lines * overwrite version --- ports/librabbitmq/fix-link-header-files.patch | 41 +++++++++++++++++++ ports/librabbitmq/portfile.cmake | 3 +- ports/librabbitmq/vcpkg.json | 3 +- versions/baseline.json | 2 +- versions/l-/librabbitmq.json | 5 +++ 5 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 ports/librabbitmq/fix-link-header-files.patch diff --git a/ports/librabbitmq/fix-link-header-files.patch b/ports/librabbitmq/fix-link-header-files.patch new file mode 100644 index 00000000000000..3590736cbb6a80 --- /dev/null +++ b/ports/librabbitmq/fix-link-header-files.patch @@ -0,0 +1,41 @@ +diff --git a/librabbitmq/CMakeLists.txt b/librabbitmq/CMakeLists.txt +index 671840b..b46614c 100644 +--- a/librabbitmq/CMakeLists.txt ++++ b/librabbitmq/CMakeLists.txt +@@ -112,11 +112,25 @@ add_definitions(-DAMQP_BUILD -D_CRT_SECURE_NO_WARNINGS) + + set(RMQ_LIBRARIES ${AMQP_SSL_LIBS} ${SOCKET_LIBRARIES} ${LIBRT} ${CMAKE_THREAD_LIBS_INIT}) + ++set(PUBLIC_INCLUDE_DIRS ++ $ ++ $ ++ $ ++) ++ ++set(PRIVATE_INCLUDE_DIRS ++ ${CMAKE_CURRENT_BINARY_DIR} ++) ++ + if (BUILD_SHARED_LIBS) + add_library(rabbitmq SHARED ${RABBITMQ_SOURCES}) + + target_link_libraries(rabbitmq ${RMQ_LIBRARIES}) + ++ target_include_directories(rabbitmq ++ PUBLIC ${PUBLIC_INCLUDE_DIRS} ++ PRIVATE ${PRIVATE_INCLUDE_DIRS} ++ ) + if (WIN32) + set_target_properties(rabbitmq PROPERTIES VERSION ${RMQ_VERSION} OUTPUT_NAME rabbitmq.${RMQ_SOVERSION}) + else (WIN32) +@@ -137,6 +151,10 @@ if (BUILD_STATIC_LIBS) + + target_link_libraries(rabbitmq-static ${RMQ_LIBRARIES}) + ++ target_include_directories(rabbitmq-static ++ PUBLIC ${PUBLIC_INCLUDE_DIRS} ++ PRIVATE ${PRIVATE_INCLUDE_DIRS} ++ ) + set_target_properties(rabbitmq-static PROPERTIES COMPILE_DEFINITIONS AMQP_STATIC) + if (WIN32) + set_target_properties(rabbitmq-static PROPERTIES diff --git a/ports/librabbitmq/portfile.cmake b/ports/librabbitmq/portfile.cmake index ac8e6f5cba5cec..8ed28079f61903 100644 --- a/ports/librabbitmq/portfile.cmake +++ b/ports/librabbitmq/portfile.cmake @@ -6,10 +6,10 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-uwpwarning.patch + fix-link-header-files.patch #Remove this patch in the next version ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" @@ -17,6 +17,7 @@ vcpkg_cmake_configure( -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF -DBUILD_TOOLS=OFF + -DBUILD_STATIC_LIBS=${BUILD_STATIC} ) vcpkg_cmake_install() diff --git a/ports/librabbitmq/vcpkg.json b/ports/librabbitmq/vcpkg.json index 9e8a333212428f..9824f012c27cef 100644 --- a/ports/librabbitmq/vcpkg.json +++ b/ports/librabbitmq/vcpkg.json @@ -1,9 +1,10 @@ { "name": "librabbitmq", "version": "0.11.0", - "port-version": 1, + "port-version": 2, "description": "A C-language AMQP client library for use with v2.0+ of the RabbitMQ broker.", "homepage": "https://github.com/alanxz/rabbitmq-c", + "license": "MIT", "dependencies": [ "openssl", { diff --git a/versions/baseline.json b/versions/baseline.json index 186cb04149ecce..e7bec440f57342 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3966,7 +3966,7 @@ }, "librabbitmq": { "baseline": "0.11.0", - "port-version": 1 + "port-version": 2 }, "libraqm": { "baseline": "0.9.0", diff --git a/versions/l-/librabbitmq.json b/versions/l-/librabbitmq.json index 1184cdf7905eb2..aed7f16772c7b1 100644 --- a/versions/l-/librabbitmq.json +++ b/versions/l-/librabbitmq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eaa23b49b84d0ec45e28645d78adc6c0b2f8faed", + "version": "0.11.0", + "port-version": 2 + }, { "git-tree": "3131805ba3b7940db19df08d930a13d2fc1c707c", "version": "0.11.0", From c266859544a3cdcfd952d218039c55a268863740 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Fri, 17 Jun 2022 17:15:56 -0400 Subject: [PATCH 51/56] [python3] Update to 3.10.5. (#25105) * [python3] Update to current * update versions to current * [vfap] update python3 to current * update vcpkgTools.xml --- ports/python3/portfile.cmake | 4 ++-- ports/python3/vcpkg.json | 3 +-- scripts/cmake/vcpkg_find_acquire_program.cmake | 6 +++--- scripts/vcpkgTools.xml | 16 ++++++++-------- versions/baseline.json | 4 ++-- versions/p-/python3.json | 5 +++++ 6 files changed, 21 insertions(+), 17 deletions(-) diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index 144fd4b002835c..9c4b0076aa15d8 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -5,7 +5,7 @@ endif() set(PYTHON_VERSION_MAJOR 3) set(PYTHON_VERSION_MINOR 10) -set(PYTHON_VERSION_PATCH 2) +set(PYTHON_VERSION_PATCH 5) set(PYTHON_VERSION ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.${PYTHON_VERSION_PATCH}) set(PATCHES @@ -42,7 +42,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO python/cpython REF v${PYTHON_VERSION} - SHA512 14f0d1847d4361fa075adbe4dbf7339fb62be91d5419cf506abdf46b36dc5273564792d35e5a5e0608a8fa877a870152a593743c3b70a98c739d5bd028be9e18 + SHA512 7a736c6bf76735f66eba50bc055661c46fefce1496869c51e9b6b264bca456d2f2c6de293dfc3bc15a9d1df4b633d7f6f66ed86696e71a36e500354a75f4200f HEAD_REF master PATCHES ${PATCHES} ) diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index 21ee84f93dc8bd..61714a805f4476 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,7 +1,6 @@ { "name": "python3", - "version": "3.10.2", - "port-version": 2, + "version": "3.10.5", "description": "The Python programming language", "homepage": "https://github.com/python/cpython", "license": "Python-2.0", diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index cefcfb4be88041..fd96bd70108c6e 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -224,17 +224,17 @@ function(vcpkg_find_acquire_program program) elseif(program STREQUAL "PYTHON3") if(CMAKE_HOST_WIN32) set(program_name python) - set(program_version 3.10.2) + set(program_version 3.10.5) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") set(tool_subdirectory "python-${program_version}-x86") set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}-embed-win32.zip") set(download_filename "python-${program_version}-embed-win32.zip") - set(download_sha512 d647d7141d1b13c899671b882e686a1b1cc6f759e5b7428ec858cdffd9ef019c78fb0b989174b98f30cb696297bfeff3d171f7eaabb339f5154886c030b8e4d9) + set(download_sha512 7598cf838401d87c4aadb43f1d70a66c647b5c4c86d55eed747126eb21e699ee8e662eef50782eabe10c746ae3947a7f1418fa9e2c1131ca8f3ed06dcb48b00f) else() set(tool_subdirectory "python-${program_version}-x64") set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}-embed-amd64.zip") set(download_filename "python-${program_version}-embed-amd64.zip") - set(download_sha512 e04e14f3b5e96f120a3b0d5fac07b2982b9f3394aef4591b140e84ff97c8532e1f8bf3e613bdf5aec6afeac108b975e754bf9727354bcfaa6673fc89826eac37) + set(download_sha512 17b1e00af8a051a4d319dd4bf340a6ad742c1b691faa30ea9f51bc0f2e9daccccd2745e2a081699428981d120d0c06007878ecaafca78936f4cfcab0054b4fb7) endif() set(paths_to_search "${DOWNLOADS}/tools/python/${tool_subdirectory}") vcpkg_list(SET post_install_command "${CMAKE_COMMAND}" -E rm python310._pth) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index e2f9d98dd9ba54..3c49d11cb37cd0 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -1,18 +1,18 @@ - 3.10.2 + 3.10.5 python.exe - https://www.python.org/ftp/python/3.10.2/python-3.10.2-embed-win32.zip - d647d7141d1b13c899671b882e686a1b1cc6f759e5b7428ec858cdffd9ef019c78fb0b989174b98f30cb696297bfeff3d171f7eaabb339f5154886c030b8e4d9 - python-3.10.2-embed-win32.zip + https://www.python.org/ftp/python/3.10.5/python-3.10.5-embed-win32.zip + 7598cf838401d87c4aadb43f1d70a66c647b5c4c86d55eed747126eb21e699ee8e662eef50782eabe10c746ae3947a7f1418fa9e2c1131ca8f3ed06dcb48b00f + python-3.10.5-embed-win32.zip - 3.10.2 + 3.10.5 tools\python.exe - https://www.nuget.org/api/v2/package/python/3.10.2 - eb94c254e669eb22aad276c6cc6eec7ae6c19dacfa7d29b0b980953717f4c73a52e0f37807dfe925ecefd1b04b1f78bf0095b03e578a4b6405e52c640e4ab4c5 - python-3.10.2.nupkg.zip + https://www.nuget.org/api/v2/package/python/3.10.5 + be225985a23b685939ff6cb134fbe29b8fd6683cd6695753fc10ef4784dcc412fc98aa2dedca902cf0be5393dfd97724ea88331cda1bcd4b86a839e9d699de7d + python-3.10.5.nupkg.zip 3.22.2 diff --git a/versions/baseline.json b/versions/baseline.json index e7bec440f57342..467ea01bd36f5b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5689,8 +5689,8 @@ "port-version": 5 }, "python3": { - "baseline": "3.10.2", - "port-version": 2 + "baseline": "3.10.5", + "port-version": 0 }, "qca": { "baseline": "2.3.4", diff --git a/versions/p-/python3.json b/versions/p-/python3.json index 36df2f98ae49d1..006ac77139aafe 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d7c43b7217707bb35a86859d9285496fc2bce8e2", + "version": "3.10.5", + "port-version": 0 + }, { "git-tree": "30321893b72abb4b682e3b66f75c54c1df3051c9", "version": "3.10.2", From 895a82aec6d20e61ceba793cde9ef8e78924f48b Mon Sep 17 00:00:00 2001 From: Max Khon Date: Sat, 18 Jun 2022 01:01:25 +0300 Subject: [PATCH 52/56] [gtk] Add a dependency on gettext[tools] to build translation files (#24596) --- ports/gtk/vcpkg.json | 9 +++++++++ versions/baseline.json | 2 +- versions/g-/gtk.json | 5 +++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ports/gtk/vcpkg.json b/ports/gtk/vcpkg.json index 4a8a991c773dc6..ebe52a36119cfd 100644 --- a/ports/gtk/vcpkg.json +++ b/ports/gtk/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gtk", "version": "4.6.2", + "port-version": 1, "description": "Portable library for creating graphical user interfaces.", "homepage": "https://www.gtk.org/", "license": "LGPL-2.0-only", @@ -23,6 +24,14 @@ }, "gdk-pixbuf", "gettext", + { + "name": "gettext", + "host": true, + "default-features": false, + "features": [ + "tools" + ] + }, "glib", { "name": "glib", diff --git a/versions/baseline.json b/versions/baseline.json index 467ea01bd36f5b..70c00de0c1c92a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2706,7 +2706,7 @@ }, "gtk": { "baseline": "4.6.2", - "port-version": 0 + "port-version": 1 }, "gtkmm": { "baseline": "4.6.0", diff --git a/versions/g-/gtk.json b/versions/g-/gtk.json index a0f3c9c2413d3d..a9c7976cc89f80 100644 --- a/versions/g-/gtk.json +++ b/versions/g-/gtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d2d59edf9986797558b8abafbff9c913bf4f02ca", + "version": "4.6.2", + "port-version": 1 + }, { "git-tree": "00d7796e9bcff96a64e45b977a72129b1dc7be43", "version": "4.6.2", From 92136965aca862dad698d27941d097e60781f280 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Sat, 18 Jun 2022 00:03:58 +0200 Subject: [PATCH 53/56] [comms,commsdsl,comms-ublox] update ports (#24939) * update commsdsl * update comms * versions * updates * format * versions * license * version * apply cr * versions * CRs * versions * Set option to ON * format vcpkg.json * update version Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/comms-ublox/copyright | 5 ++++ ports/comms-ublox/fix-comms.patch | 23 --------------- ports/comms-ublox/portfile.cmake | 21 ++++++-------- ports/comms-ublox/vcpkg.json | 13 +++++++-- ports/comms/portfile.cmake | 48 ++++++------------------------- ports/comms/vcpkg.json | 17 +++-------- ports/commsdsl/portfile.cmake | 19 ++++++------ ports/commsdsl/vcpkg.json | 19 +++++++----- versions/baseline.json | 10 +++---- versions/c-/comms-ublox.json | 5 ++++ versions/c-/comms.json | 5 ++++ versions/c-/commsdsl.json | 5 ++++ 12 files changed, 78 insertions(+), 112 deletions(-) create mode 100644 ports/comms-ublox/copyright delete mode 100644 ports/comms-ublox/fix-comms.patch diff --git a/ports/comms-ublox/copyright b/ports/comms-ublox/copyright new file mode 100644 index 00000000000000..da9779cc8e6b57 --- /dev/null +++ b/ports/comms-ublox/copyright @@ -0,0 +1,5 @@ +The generated code has no license, the vendor is free to pick any as long as it's compatibile with the license(s) of the relevant CommsChampion Ecosystem project: + +The protocol definition uses the COMMS Library, which is provided under the MPL-2.0 licence. It allows usage in any closed source projects as long as modifications to the COMMS Library itself remain open source. +The CommsChampion Tools use open source Qt5 libraries, hence are licensed under the GPLv3. It means that any relevant plugin code must remain open source and is not really available to be used in the closed source commercial products. +The code of this project (libraries and tools it contains) is licensed under Apache v2.0 license. diff --git a/ports/comms-ublox/fix-comms.patch b/ports/comms-ublox/fix-comms.patch deleted file mode 100644 index d9620a4aa5811a..00000000000000 --- a/ports/comms-ublox/fix-comms.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e2b69fe..aff5917 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -66,6 +66,7 @@ endif () - ###################################################################### - - # Use external CommsChampion project or compile it in place -+if(FALSE) - set (CC_EXTERNAL_TGT "comms_champion_external") - if (OPT_BUILD_TEST OR OPT_BUILD_PLUGIN) - set (external_cc_needed TRUE) -@@ -107,6 +108,10 @@ elseif (external_cc_needed) - find_package(CommsChampion NO_MODULE) - set (cc_compile_file "${OPT_CC_MAIN_INSTALL_DIR}/lib/LibComms/cmake/CC_Compile.cmake") - endif () -+else() -+ find_package(LibComms CONFIG REQUIRED) -+ set(cc_compile_file "${LibComms_DIR}/CC_Compile.cmake") -+endif() - - if (EXISTS ${cc_compile_file}) - # Set compiler flags diff --git a/ports/comms-ublox/portfile.cmake b/ports/comms-ublox/portfile.cmake index d5fd4bcea27fa0..a57793cee469eb 100644 --- a/ports/comms-ublox/portfile.cmake +++ b/ports/comms-ublox/portfile.cmake @@ -3,28 +3,23 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO commschamp/cc.ublox.generated - REF v0.20.2 - SHA512 5672d964ea3e505837e44a5fd928069a219a5731764cb54bfe8609e39c6c6dd0059660bcde317c6c60cd1bd8d1f7942d2faa022095bf651817568291bc6a7569 + REF v1.0 + SHA512 0c487d9409c2f2818024f6232832762527250c3563a5eb5c639ad49943931ceb24616db2432bcd752d1a84820ec5349522510dcd202508641d3f29aef41ca1e5 HEAD_REF master - PATCHES - fix-comms.patch ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS - -DOPT_BUILD_TEST=OFF - -DOPT_BUILD_PLUGIN=OFF - -DOPT_NO_COMMS=ON - -DOPT_EXTERNALS_UPDATE_DISCONNECTED=ON + -DOPT_REQUIRE_COMMS_LIB=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/ublox/cmake TARGET_PATH share/ublox) +vcpkg_cmake_config_fixup(PACKAGE_NAME ublox CONFIG_PATH lib/ublox/cmake) # currently this is only a header only library. after moving lib/ublox to share this lib path will be empty file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") # Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CURRENT_PORT_DIR}/copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/comms-ublox/vcpkg.json b/ports/comms-ublox/vcpkg.json index 93668cae03b2ca..4b6fd80b6717f7 100644 --- a/ports/comms-ublox/vcpkg.json +++ b/ports/comms-ublox/vcpkg.json @@ -1,10 +1,19 @@ { "name": "comms-ublox", - "version-semver": "0.20.2", + "version-semver": "1.0.0", "description": "UBLOX (UBX) protocol definition, generated out of cc.ublox.commsdsl", "homepage": "https://commschamp.github.io/", "documentation": "https://github.com/commschamp/cc.ublox.generated", + "license": null, "dependencies": [ - "comms" + "comms", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/comms/portfile.cmake b/ports/comms/portfile.cmake index 0ea8ef0457c5cc..4ad341df22c6dd 100644 --- a/ports/comms/portfile.cmake +++ b/ports/comms/portfile.cmake @@ -1,56 +1,24 @@ #header-only library vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO commschamp/comms_champion - REF v3.4 - SHA512 573afbc0aebd72d8a047067410f0f54588675c4cbad37f824edbb6d8303e9c191c573ac9325bf5fec575dffd3d05562c04e75c1e5b748a34d01056bc8b766fb1 + REPO commschamp/comms + REF v4.0 + SHA512 ec83bef647dd6c32e6ba98ce51970c48befaa2b0ff9c26f538fb0ce72e46da14cd592a0c652af5f9f10906f7058ff623dcf13ac4b81c96c0aea1fd8a31551bb7 HEAD_REF master ) -vcpkg_check_features( - OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - tools CC_BUILD_TOOLS_LIBRARY - tools CC_INSTALL_TOOLS_LIBRARY - tools CC_BUILD_TOOLS - tools CC_INSTALL_TOOLS -) - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - ${FEATURE_OPTIONS} - -DCC_INSTALL_COMMS_LIB=ON - -DCC_BUILD_UNIT_TESTS=OFF + -DCC_COMMS_BUILD_UNIT_TESTS=OFF + -DBUILD_TESTING=OFF -DCC_WARN_AS_ERR=OFF - -DCC_BUILD_DEMO_PROTOCOL=OFF - -DCC_INSTALL_DEMO_PROTOCOL=OFF ) vcpkg_cmake_install() -vcpkg_copy_pdbs() - -vcpkg_cmake_config_fixup(PACKAGE_NAME "LibComms" CONFIG_PATH "lib/LibComms/cmake" ) - -if("tools" IN_LIST FEATURES) - vcpkg_copy_tools( - TOOL_NAMES cc_dump cc_view - AUTO_CLEAN - ) - - file(INSTALL "${CURRENT_PACKAGES_DIR}/lib/CommsChampion/plugin" - DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/lib/CommsChampion/plugin") - vcpkg_cmake_config_fixup(PACKAGE_NAME "CommsChampion" CONFIG_PATH "lib/CommsChampion/cmake") +vcpkg_cmake_config_fixup(PACKAGE_NAME LibComms CONFIG_PATH lib/LibComms/cmake) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/LibComms") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/CommsChampion") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/LibComms") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/CommsChampion") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -else() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/comms/vcpkg.json b/ports/comms/vcpkg.json index fe4c58918ebdc0..0eea1ad2b1d095 100644 --- a/ports/comms/vcpkg.json +++ b/ports/comms/vcpkg.json @@ -1,10 +1,10 @@ { "name": "comms", - "version-semver": "3.4.0", - "port-version": 1, + "version-semver": "4.0.0", "description": "COMMS is the C++(11) headers only, platform independent library, which makes the implementation of a communication protocol to be an easy and relatively quick process.", "homepage": "https://commschamp.github.io/", - "documentation": "https://github.com/commschamp/comms_champion", + "documentation": "https://github.com/commschamp/comms", + "license": "MPL-2.0", "dependencies": [ { "name": "vcpkg-cmake", @@ -14,14 +14,5 @@ "name": "vcpkg-cmake-config", "host": true } - ], - "features": { - "tools": { - "description": "Builds CommsChampion tools", - "supports": "!static", - "dependencies": [ - "qt5-base" - ] - } - } + ] } diff --git a/ports/commsdsl/portfile.cmake b/ports/commsdsl/portfile.cmake index e7131d93a85067..be924c841f0f8a 100644 --- a/ports/commsdsl/portfile.cmake +++ b/ports/commsdsl/portfile.cmake @@ -1,30 +1,31 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO commschamp/commsdsl - REF v3.6.4 - SHA512 dd997bb063baf4e6bc15666539e8d3e8cf435cfda88e8b115b8a1568c8c77cc2ca6dbf1a77ae2fcf9b24f68cb35aa2ae583852cf887fbc85f74e868230374055 + REF v4.0 + SHA512 420fd0dd30aa5530692f40e15e3a640d1ef766c642e91edc07ed182e2125043c6ade1d245ef4d549a606c372c8c5f53fea7faa14b230ff485cf24d4f13ecfbee HEAD_REF master ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS - -DCOMMSDSL_NO_COMMS_CHAMPION=ON -DCOMMSDSL_BUILD_APPS=ON -DCOMMSDSL_INSTALL_APPS=ON - -DCOMMSDSL_CHECKOUT_COMMS_CHAMPION=OFF + -DCOMMSDSL_INSTALL_LIBRARY=ON + -DCOMMSDSL_INSTALL_LIBRARY_HEADERS=ON -DCOMMSDSL_BUILD_UNIT_TESTS=OFF -DCOMMSDSL_WARN_AS_ERR=OFF + -DCOMMSDSL_WIN_ALLOW_LIBXML_BUILD=OFF + -DBUILD_TESTING=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_tools( - TOOL_NAMES commsdsl2comms + TOOL_NAMES commsdsl2comms commsdsl2test commsdsl2tools_qt AUTO_CLEAN ) -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/LibCommsdsl/cmake TARGET_PATH share/LibCommsdsl) +vcpkg_cmake_config_fixup(PACKAGE_NAME LibCommsdsl CONFIG_PATH lib/LibCommsdsl/cmake) # after fixing the following dirs are empty file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/LibCommsdsl") diff --git a/ports/commsdsl/vcpkg.json b/ports/commsdsl/vcpkg.json index 84ceafc77305ff..e76e62e052a947 100644 --- a/ports/commsdsl/vcpkg.json +++ b/ports/commsdsl/vcpkg.json @@ -1,15 +1,20 @@ { "name": "commsdsl", - "version-semver": "3.6.4", - "port-version": 1, + "version-semver": "4.0.0", "description": "DSL schemas parser and code generator for CommsChampion Ecosystem", "homepage": "https://commschamp.github.io/", "documentation": "https://github.com/commschamp/commsdsl", - "supports": "!uwp & !static", + "license": "Apache-2.0", + "supports": "!uwp", "dependencies": [ - "boost-algorithm", - "boost-filesystem", - "boost-program-options", - "libxml2" + "libxml2", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 70c00de0c1c92a..b1e1e0d3de8c79 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1513,16 +1513,16 @@ "port-version": 0 }, "comms": { - "baseline": "3.4.0", - "port-version": 1 + "baseline": "4.0.0", + "port-version": 0 }, "comms-ublox": { - "baseline": "0.20.2", + "baseline": "1.0.0", "port-version": 0 }, "commsdsl": { - "baseline": "3.6.4", - "port-version": 1 + "baseline": "4.0.0", + "port-version": 0 }, "compoundfilereader": { "baseline": "0.1.0", diff --git a/versions/c-/comms-ublox.json b/versions/c-/comms-ublox.json index bde81cf2d42ed8..804defc12a3061 100644 --- a/versions/c-/comms-ublox.json +++ b/versions/c-/comms-ublox.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a129592b8ecf08fed15abaeab8b8c229ef16d045", + "version-semver": "1.0.0", + "port-version": 0 + }, { "git-tree": "9d57cdb7ee417cb5e5ed0208d3d9470b79c80f2a", "version-semver": "0.20.2", diff --git a/versions/c-/comms.json b/versions/c-/comms.json index 3584605796ad4d..17b69422041eab 100644 --- a/versions/c-/comms.json +++ b/versions/c-/comms.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3a9bdbc7d61f9494ad2853f702a19699dae74a70", + "version-semver": "4.0.0", + "port-version": 0 + }, { "git-tree": "377ae2ef208c319a5b1360f6dbce38ddae897466", "version-semver": "3.4.0", diff --git a/versions/c-/commsdsl.json b/versions/c-/commsdsl.json index 44b2e25937444d..966f37169ea7c5 100644 --- a/versions/c-/commsdsl.json +++ b/versions/c-/commsdsl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a363dfeed76ba38fa1d1b3007b06223c347e0063", + "version-semver": "4.0.0", + "port-version": 0 + }, { "git-tree": "6dc397dcd2267999f4c8d34fabd9a7e2dcf48ced", "version-semver": "3.6.4", From b49b2bdf22559c89eddbf29a29621a1dc6929320 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Sat, 18 Jun 2022 00:48:09 +0200 Subject: [PATCH 54/56] [many ports] Remove from CI baseline (#25075) * cppcms * cudnn * devicenameresolver * epsilon * fann * cudnn license * devicenameresolver version * epsilon * version * Remove from ci baseline * license * version * libbf * version * Why are those ports unsupported on static? I think because of failing post build lint * version * cppcms * version * epsilon * version * typo * version * test on static * version * cppcms not supported on static * version * cudnn * device * version * try again... * version * version-date * version * [cppcms] Patch out tests & examples * version * Fix patch * version * remove debug include * version * [cppcms] copy pdbs * version --- ports/cppcms/no-tests-and-examples.patch | 58 ++++++++++++++++++++++++ ports/cppcms/portfile.cmake | 23 ++++++---- ports/cppcms/vcpkg.json | 11 +++-- ports/cudnn/portfile.cmake | 18 ++------ ports/cudnn/vcpkg.json | 2 +- ports/devicenameresolver/portfile.cmake | 2 - ports/devicenameresolver/vcpkg.json | 5 +- ports/epsilon/portfile.cmake | 13 ++++-- ports/epsilon/vcpkg.json | 5 +- ports/fann/portfile.cmake | 22 ++++----- ports/fann/vcpkg.json | 11 ++++- ports/libbf/portfile.cmake | 17 ++----- ports/libbf/vcpkg.json | 14 ++++-- scripts/ci.baseline.txt | 18 -------- versions/baseline.json | 14 +++--- versions/c-/cppcms.json | 5 ++ versions/c-/cudnn.json | 5 ++ versions/d-/devicenameresolver.json | 5 ++ versions/e-/epsilon.json | 5 ++ versions/f-/fann.json | 5 ++ versions/l-/libbf.json | 5 ++ 21 files changed, 172 insertions(+), 91 deletions(-) create mode 100644 ports/cppcms/no-tests-and-examples.patch diff --git a/ports/cppcms/no-tests-and-examples.patch b/ports/cppcms/no-tests-and-examples.patch new file mode 100644 index 00000000000000..7d8e67bdfe0dcf --- /dev/null +++ b/ports/cppcms/no-tests-and-examples.patch @@ -0,0 +1,58 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5ce0d53..5b432c8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -685,9 +685,10 @@ if(NOT DISABLE_SHARED) + endif(NOT DISABLE_SHARED) + + +- ++if(FALSE) + add_executable(hello_world src/hello_world.cpp skin1.cpp skin2.cpp) + target_link_libraries(hello_world ${CPPCMS_LIB}) ++endif() + + if(NOT DISABLE_TCPCACHE) + add_executable(cppcms_scale src/cache_server_main.cpp) +@@ -710,7 +711,7 @@ endif(DISABLE_SHARED) + ######################################### + # Tests + ######################################### +- ++if(FALSE) + set(ALL_TESTS + form_test + proto_test +@@ -775,14 +776,14 @@ set(ALL_TESTS ${ALL_TESTS} external_session_test) + if(NOT DISABLE_GZIP) + target_link_libraries(response_test ${ZLIB}) + endif() +- ++endif() + ##################################### + # End of tests + ##################################### + + # These are use export + if(IS_WINDOWS AND NOT DISABLE_SHARED) +- set_target_properties(${ALL_TESTS} hello_world cppcms PROPERTIES ++ set_target_properties(${ALL_TESTS} cppcms PROPERTIES + COMPILE_DEFINITIONS DLL_EXPORT) + endif() + +@@ -830,7 +831,7 @@ install(DIRECTORY cppcms DESTINATION include + ############# + + +- ++if(FALSE) + set(CNF "${CMAKE_CURRENT_SOURCE_DIR}/tests") + + add_test(base64_test base64_test) +@@ -1103,5 +1104,5 @@ if(NOT IS_WINDOWS) + PROPERTIES TIMEOUT 120) + + endif() +- ++endif() + diff --git a/ports/cppcms/portfile.cmake b/ports/cppcms/portfile.cmake index 54bc5703970e7d..df656168dc926f 100644 --- a/ports/cppcms/portfile.cmake +++ b/ports/cppcms/portfile.cmake @@ -5,24 +5,27 @@ vcpkg_from_github( REPO artyom-beilis/cppcms REF b72b19915794d1af63c9a9e9bea58e20a4ad93d4 SHA512 e99d34d14fbde22be725ac2c0bec069fb584e45c66767af75efaf454ca61a7a5e57434bf86109f910884c72202b8cf98fe16505e7d3d30d9218abd4d8b27d5df + PATCHES + no-tests-and-examples.patch ) vcpkg_find_acquire_program(PYTHON2) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" DISABLE_DYNAMIC) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DPYTHON=${PYTHON2} # Switch to python3 on the next update -DUSE_WINDOWS6_API=ON + -DDISABLE_SHARED=${DISABLE_DYNAMIC} ) -vcpkg_install_cmake() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_copy_tools(TOOL_NAMES cppcms_scale cppcms_make_key cppcms_config_find_param AUTO_CLEAN) -file(GLOB EXE_DEBUG_FILES ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) -file(REMOVE ${EXE_DEBUG_FILES}) -file(GLOB EXE_FILES ${CURRENT_PACKAGES_DIR}/bin/*.exe) -file(REMOVE ${EXE_FILES}) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/MIT.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/MIT.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/cppcms/vcpkg.json b/ports/cppcms/vcpkg.json index 601d5755041cdb..8340ea8746e466 100644 --- a/ports/cppcms/vcpkg.json +++ b/ports/cppcms/vcpkg.json @@ -1,14 +1,19 @@ { "name": "cppcms", - "version-string": "1.2.1", - "port-version": 4, + "version": "1.2.1", + "port-version": 5, "description": "CppCMS is a Free High Performance Web Development Framework (not a CMS) aimed at Rapid Web Application Development", "homepage": "https://github.com/artyom-beilis/cppcms", - "supports": "!(linux | osx)", + "license": "MIT", + "supports": "!(linux | osx | (windows & static))", "dependencies": [ "icu", "openssl", "pcre", + { + "name": "vcpkg-cmake", + "host": true + }, "zlib" ] } diff --git a/ports/cudnn/portfile.cmake b/ports/cudnn/portfile.cmake index 594c74fed6e6cb..b5ebb3239d24c7 100644 --- a/ports/cudnn/portfile.cmake +++ b/ports/cudnn/portfile.cmake @@ -1,16 +1,6 @@ -if(VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_OSX) - message(FATAL_ERROR "This port is only for Windows Desktop or Linux") -endif() - -if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - message(FATAL_ERROR "This port is only for x64 architectures") -endif() - -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) - set(MINIMUM_CUDNN_VERSION "7.6.5") -include(${CURRENT_INSTALLED_DIR}/share/cuda/vcpkg_find_cuda.cmake) +include("${CURRENT_INSTALLED_DIR}/share/cuda/vcpkg_find_cuda.cmake") vcpkg_find_cuda(OUT_CUDA_TOOLKIT_ROOT CUDA_TOOLKIT_ROOT OUT_CUDA_VERSION CUDA_VERSION) # Try to find CUDNN if it exists; only download if it doesn't exist @@ -71,6 +61,6 @@ else() message(FATAL_ERROR "Please install CUDNN using your system package manager (the same way you installed CUDA). For example: apt install libcudnn8-dev.") endif() -file(INSTALL "${CURRENT_PORT_DIR}/FindCUDNN.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL "${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${CURRENT_PORT_DIR}/FindCUDNN.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/cudnn/vcpkg.json b/ports/cudnn/vcpkg.json index ffb97ee1723f8d..2918c45688babf 100644 --- a/ports/cudnn/vcpkg.json +++ b/ports/cudnn/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cudnn", "version": "7.6.5", - "port-version": 6, + "port-version": 7, "description": "NVIDIA's cuDNN deep neural network acceleration library.", "homepage": "https://developer.nvidia.com/cudnn", "license": null, diff --git a/ports/devicenameresolver/portfile.cmake b/ports/devicenameresolver/portfile.cmake index b08e2f681d90e4..027cf63f363c2d 100644 --- a/ports/devicenameresolver/portfile.cmake +++ b/ports/devicenameresolver/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) - vcpkg_from_bitbucket( OUT_SOURCE_PATH SOURCE_PATH REPO mrexodia/devicenameresolver diff --git a/ports/devicenameresolver/vcpkg.json b/ports/devicenameresolver/vcpkg.json index 0647d0831645d9..97bcbb4f40b5ea 100644 --- a/ports/devicenameresolver/vcpkg.json +++ b/ports/devicenameresolver/vcpkg.json @@ -1,8 +1,9 @@ { "name": "devicenameresolver", - "version-string": "2016-06-26-0850d88fa6", - "port-version": 3, + "version-date": "2016-06-26", + "port-version": 4, "description": "a little library that resolves a path from a (virtual) device name.", + "license": null, "supports": "windows & !uwp", "dependencies": [ { diff --git a/ports/epsilon/portfile.cmake b/ports/epsilon/portfile.cmake index 525974ab575546..e753526972272b 100644 --- a/ports/epsilon/portfile.cmake +++ b/ports/epsilon/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) - vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO epsilon-project/epsilon @@ -43,6 +41,13 @@ vcpkg_install_nmake( vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_copy_tools(TOOL_NAMES epsilon SEARCH_DIR "${CURRENT_PACKAGES_DIR}/tools") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/epsilon/vcpkg.json b/ports/epsilon/vcpkg.json index d19ef5749b4126..7973271eaaeff2 100644 --- a/ports/epsilon/vcpkg.json +++ b/ports/epsilon/vcpkg.json @@ -1,9 +1,10 @@ { "name": "epsilon", - "version-string": "0.9.2", - "port-version": 6, + "version": "0.9.2", + "port-version": 7, "description": "EPSILON is an Open Source wavelet image compressor, that is aimed on parallel and robust image processing.", "homepage": "https://sourceforge.net/projects/epsilon-project/", + "license": "GPL-2.0-only OR LGPL-2.0-only", "supports": "windows", "dependencies": [ "libpopt" diff --git a/ports/fann/portfile.cmake b/ports/fann/portfile.cmake index 716bf3e8b94579..b74433baf2f656 100644 --- a/ports/fann/portfile.cmake +++ b/ports/fann/portfile.cmake @@ -1,6 +1,3 @@ -# Official design -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libfann/fann @@ -12,12 +9,11 @@ vcpkg_from_github( fix-uwp-build.patch ) -set(INSTALL_BASE_DIR_DBG ${CURRENT_PACKAGES_DIR}/debug) -set(INSTALL_BASE_DIR_REL ${CURRENT_PACKAGES_DIR}) +set(INSTALL_BASE_DIR_DBG "${CURRENT_PACKAGES_DIR}/debug") +set(INSTALL_BASE_DIR_REL "${CURRENT_PACKAGES_DIR}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DBIN_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/bin -DSBIN_INSTALL_DIR=${INSTALL_BASE_DIR_DBG}/sbin @@ -50,12 +46,16 @@ vcpkg_configure_cmake( -DINFO_INSTALL_DIR=${INSTALL_BASE_DIR_REL}/share/${PORT}/info ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() -file(INSTALL ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/fann/vcpkg.json b/ports/fann/vcpkg.json index c4bc01717c8b4e..03f16620c3fae4 100644 --- a/ports/fann/vcpkg.json +++ b/ports/fann/vcpkg.json @@ -1,7 +1,14 @@ { "name": "fann", "version": "2.2.0", - "port-version": 2, + "port-version": 3, "description": "Fast Artificial Neural Network (FANN) Library is a free open source neural network library, which implements multilayer artificial neural networks in C with support for both fully connected and sparsely connected networks.", - "homepage": "https://github.com/libfann/fann" + "homepage": "https://github.com/libfann/fann", + "license": "LGPL-2.1-only", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/libbf/portfile.cmake b/ports/libbf/portfile.cmake index a50abed942aa60..7aa235a24f71cb 100644 --- a/ports/libbf/portfile.cmake +++ b/ports/libbf/portfile.cmake @@ -1,7 +1,3 @@ -if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Windows" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "libbf does not support MSVC") -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mavam/libbf @@ -10,16 +6,13 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libbf) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/libbf/COPYING ${CURRENT_PACKAGES_DIR}/share/libbf/copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libbf/vcpkg.json b/ports/libbf/vcpkg.json index 1b184fddf45f2d..ec43ed92aef425 100644 --- a/ports/libbf/vcpkg.json +++ b/ports/libbf/vcpkg.json @@ -1,6 +1,14 @@ { "name": "libbf", - "version-string": "1.0.0", - "port-version": 2, - "description": "Bloom filters for C++11." + "version": "1.0.0", + "port-version": 3, + "description": "Bloom filters for C++11.", + "license": "BSD-3-Clause", + "supports": "!windows", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 2b5865219ff1f1..c512c024c598f6 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -159,9 +159,6 @@ coolprop:x64-uwp=fail coroutine:arm-uwp=fail coroutine:x64-linux=fail coroutine:x64-uwp=fail -cppcms:x64-linux=fail -cppcms:x64-osx=fail -cppcms:x64-windows-static=fail cppfs:arm-uwp=fail cppfs:x64-uwp=fail cppmicroservices:arm64-windows=fail @@ -181,11 +178,6 @@ crashpad:x86-windows=fail ctemplate:x64-linux=fail ctemplate:x64-osx=fail cuda:x64-osx=fail -cudnn:arm64-windows=fail -cudnn:arm-uwp=fail -cudnn:x64-uwp=fail -cudnn:x64-windows-static=fail -cudnn:x86-windows=fail # Since pipeline cannot automatically install dbghelp dependency, skip this detection dbghelp:arm-uwp=skip dbghelp:arm64-windows=skip @@ -197,7 +189,6 @@ dbghelp:x64-windows-static-md=skip dbghelp:x64-windows=skip dbghelp:x86-windows=skip dcmtk:x64-uwp=fail -devicenameresolver:x64-windows-static=fail # legacy directxsdk which conflicts with dxsdk-d3dx directxsdk:x86-windows=skip directxsdk:x64-windows=skip @@ -247,8 +238,6 @@ embree2:x64-linux=skip embree2:x64-osx=skip epsilon:arm-uwp=fail epsilon:x64-uwp=fail -epsilon:x64-windows-static=fail -fann:x64-windows-static=fail fastrtps:arm-uwp=fail fastrtps:x64-uwp=fail fastrtps:x64-windows-static=fail @@ -422,13 +411,6 @@ leveldb:arm-uwp=fail leveldb:x64-uwp=fail libaiff:x64-linux=fail libarchive:arm-uwp=fail -libbf:arm64-windows=fail -libbf:arm-uwp=fail -libbf:x64-uwp=fail -libbf:x64-windows=fail -libbf:x64-windows-static=fail -libbf:x64-windows-static-md=fail -libbf:x86-windows=fail libcopp:arm64-windows=fail libcopp:arm-uwp=fail # Missing system libraries on linux to run/prepare autoconf diff --git a/versions/baseline.json b/versions/baseline.json index b1e1e0d3de8c79..97455e536ccbe6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1610,7 +1610,7 @@ }, "cppcms": { "baseline": "1.2.1", - "port-version": 4 + "port-version": 5 }, "cppcodec": { "baseline": "0.2", @@ -1750,7 +1750,7 @@ }, "cudnn": { "baseline": "7.6.5", - "port-version": 6 + "port-version": 7 }, "cunit": { "baseline": "2.1.3", @@ -1861,8 +1861,8 @@ "port-version": 5 }, "devicenameresolver": { - "baseline": "2016-06-26-0850d88fa6", - "port-version": 3 + "baseline": "2016-06-26", + "port-version": 4 }, "devil": { "baseline": "1.8.0", @@ -2106,7 +2106,7 @@ }, "epsilon": { "baseline": "0.9.2", - "port-version": 6 + "port-version": 7 }, "esaxx": { "baseline": "ca7cb332011ec37", @@ -2162,7 +2162,7 @@ }, "fann": { "baseline": "2.2.0", - "port-version": 2 + "port-version": 3 }, "farmhash": { "baseline": "1.1", @@ -3462,7 +3462,7 @@ }, "libbf": { "baseline": "1.0.0", - "port-version": 2 + "port-version": 3 }, "libbson": { "baseline": "1.17.6", diff --git a/versions/c-/cppcms.json b/versions/c-/cppcms.json index b476ab5426ee59..8086bb93bdbfd8 100644 --- a/versions/c-/cppcms.json +++ b/versions/c-/cppcms.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "33ff6dbb307c2baceec0a21f05e098c0d15a8f88", + "version": "1.2.1", + "port-version": 5 + }, { "git-tree": "05ef150cab0e8f56bd4f06b41baa9125d94e3451", "version-string": "1.2.1", diff --git a/versions/c-/cudnn.json b/versions/c-/cudnn.json index 7c7b0ef9a93491..3ef9d240d946b3 100644 --- a/versions/c-/cudnn.json +++ b/versions/c-/cudnn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cfd70db6f58e45dc96c44a61833d821d987c1588", + "version": "7.6.5", + "port-version": 7 + }, { "git-tree": "aa008ef1b1c958146532dbbdabd76b62f9558653", "version": "7.6.5", diff --git a/versions/d-/devicenameresolver.json b/versions/d-/devicenameresolver.json index fe2447d1b9f9fb..3f28e102babcb0 100644 --- a/versions/d-/devicenameresolver.json +++ b/versions/d-/devicenameresolver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb4e35f532b95841344719e4ab90027a2796d5d4", + "version-date": "2016-06-26", + "port-version": 4 + }, { "git-tree": "a87ff3bcc7e455cf7b73ca36ff4e7ac0c54faba1", "version-string": "2016-06-26-0850d88fa6", diff --git a/versions/e-/epsilon.json b/versions/e-/epsilon.json index ab89b1e6aa80d2..39b536af231daa 100644 --- a/versions/e-/epsilon.json +++ b/versions/e-/epsilon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "800dbc074727df7eded3e5707b828be676bb5943", + "version": "0.9.2", + "port-version": 7 + }, { "git-tree": "ad0883f9e090b404fcef27b3e4304df44472bf90", "version-string": "0.9.2", diff --git a/versions/f-/fann.json b/versions/f-/fann.json index f49c67fc995cf5..e005396d3d4a4a 100644 --- a/versions/f-/fann.json +++ b/versions/f-/fann.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "05d4d344a7295f604f3cf541a9d92b9a680fd830", + "version": "2.2.0", + "port-version": 3 + }, { "git-tree": "9bff6da1b7043e1ab6e344c549a285b7101763e2", "version": "2.2.0", diff --git a/versions/l-/libbf.json b/versions/l-/libbf.json index d338b8248d5d60..183b294f445170 100644 --- a/versions/l-/libbf.json +++ b/versions/l-/libbf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3c699adb88cb4cf15b0fb52cb9e506bc91672bf2", + "version": "1.0.0", + "port-version": 3 + }, { "git-tree": "b44ae45673f953a9aa87a1df8bdc04c6a4201aef", "version-string": "1.0.0", From 55f95e5f98a0817e5921a2f5e8458f496e2245f9 Mon Sep 17 00:00:00 2001 From: jiayuehua <3423893+jiayuehua@users.noreply.github.com> Date: Sun, 12 Jun 2022 15:34:56 +0800 Subject: [PATCH 55/56] [glog]: update to v0.6.0 --- ports/glog/fix_crosscompile_symbolize.patch | 12 +- ports/glog/fix_glog_CMAKE_MODULE_PATH.patch | 51 +- ports/glog/fix_log_every_n.patch | 839 -------------------- ports/glog/glog_disable_debug_postfix.patch | 26 +- ports/glog/portfile.cmake | 13 +- 5 files changed, 36 insertions(+), 905 deletions(-) delete mode 100644 ports/glog/fix_log_every_n.patch diff --git a/ports/glog/fix_crosscompile_symbolize.patch b/ports/glog/fix_crosscompile_symbolize.patch index 65f0fd26602b65..6bfa33d82e7d07 100644 --- a/ports/glog/fix_crosscompile_symbolize.patch +++ b/ports/glog/fix_crosscompile_symbolize.patch @@ -1,6 +1,9 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 16fef38..4f94251 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -401,4 +401,7 @@ +@@ -450,6 +450,9 @@ endif (HAVE_CXX11_ATOMIC) + if (WITH_SYMBOLIZE) if (WIN32 OR CYGWIN) + if(CMAKE_CROSSCOMPILING) @@ -8,11 +11,12 @@ + else() cmake_push_check_state (RESET) set (CMAKE_REQUIRED_LIBRARIES DbgHelp) -@@ -430,6 +433,7 @@ + +@@ -480,6 +483,7 @@ if (WITH_SYMBOLIZE) ]=] HAVE_SYMBOLIZE) - + cmake_pop_check_state () + endif() - + if (HAVE_SYMBOLIZE) set (HAVE_STACKTRACE 1) diff --git a/ports/glog/fix_glog_CMAKE_MODULE_PATH.patch b/ports/glog/fix_glog_CMAKE_MODULE_PATH.patch index 31219437b96f5e..903b7eaa389646 100644 --- a/ports/glog/fix_glog_CMAKE_MODULE_PATH.patch +++ b/ports/glog/fix_glog_CMAKE_MODULE_PATH.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 28e2688..cf87798 100644 +index 846b444..1fdeac6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -843,36 +843,6 @@ write_basic_package_version_file ( +@@ -1028,41 +1028,6 @@ write_basic_package_version_file ( export (TARGETS glog NAMESPACE glog:: FILE glog-targets.cmake) export (PACKAGE glog) @@ -26,52 +26,21 @@ index 28e2688..cf87798 100644 -install (CODE -" -set (glog_FULL_CMake_DATADIR \"\\\${CMAKE_CURRENT_LIST_DIR}/${glog_REL_CMake_DATADIR}\") +-set (glog_DATADIR_DESTINATION ${_glog_CMake_INSTALLDIR}) +- +-if (NOT IS_ABSOLUTE ${_glog_CMake_INSTALLDIR}) +- set (glog_DATADIR_DESTINATION \"\${CMAKE_INSTALL_PREFIX}/\${glog_DATADIR_DESTINATION}\") +-endif (NOT IS_ABSOLUTE ${_glog_CMake_INSTALLDIR}) +- -configure_file (\"${CMAKE_CURRENT_SOURCE_DIR}/glog-modules.cmake.in\" - \"${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/glog-modules.cmake\" @ONLY) -file (INSTALL - \"${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/glog-modules.cmake\" - DESTINATION -- \"\${CMAKE_INSTALL_PREFIX}/${_glog_CMake_INSTALLDIR}\") +- \"\${glog_DATADIR_DESTINATION}\") -" - COMPONENT Development -) -- + install (FILES ${CMAKE_CURRENT_BINARY_DIR}/glog-config.cmake - ${CMAKE_CURRENT_BINARY_DIR}/glog-config-version.cmake -diff --git a/glog-config.cmake.in b/glog-config.cmake.in -index 5c5c9c0..31fac52 100644 ---- a/glog-config.cmake.in -+++ b/glog-config.cmake.in -@@ -5,7 +5,6 @@ endif (CMAKE_VERSION VERSION_LESS @glog_CMake_VERSION@) - @PACKAGE_INIT@ - - include (CMakeFindDependencyMacro) --include (${CMAKE_CURRENT_LIST_DIR}/glog-modules.cmake) - - @gflags_DEPENDENCY@ - @Unwind_DEPENDENCY@ -diff --git a/glog-modules.cmake.in b/glog-modules.cmake.in -deleted file mode 100644 -index 71c5160..0000000 ---- a/glog-modules.cmake.in -+++ /dev/null -@@ -1,18 +0,0 @@ --cmake_policy (PUSH) --cmake_policy (SET CMP0057 NEW) -- --if (CMAKE_VERSION VERSION_LESS 3.3) -- message (FATAL_ERROR "glog-modules.cmake requires the consumer " -- "to use CMake 3.3 (or newer)") --endif (CMAKE_VERSION VERSION_LESS 3.3) -- --set (glog_MODULE_PATH "@glog_FULL_CMake_DATADIR@") --list (APPEND CMAKE_MODULE_PATH ${glog_MODULE_PATH}) -- --if (NOT glog_MODULE_PATH IN_LIST CMAKE_MODULE_PATH) -- message (FATAL_ERROR "Cannot add '${glog_MODULE_PATH}' to " -- "CMAKE_MODULE_PATH. This will cause glog-config.cmake to fail at " -- "locating required find modules. Make sure CMAKE_MODULE_PATH is not a cache variable.") --endif (NOT glog_MODULE_PATH IN_LIST CMAKE_MODULE_PATH) -- --cmake_policy (POP) diff --git a/ports/glog/fix_log_every_n.patch b/ports/glog/fix_log_every_n.patch deleted file mode 100644 index 52950481ce295a..00000000000000 --- a/ports/glog/fix_log_every_n.patch +++ /dev/null @@ -1,839 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 61e5f6c..889df87 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -501,6 +501,7 @@ set (GLOG_PUBLIC_H - ${CMAKE_CURRENT_BINARY_DIR}/glog/stl_logging.h - ${CMAKE_CURRENT_BINARY_DIR}/glog/vlog_is_on.h - src/glog/log_severity.h -+ src/glog/platform.h - ) - - set (GLOG_SRCS -diff --git a/src/demangle.cc b/src/demangle.cc -index f3e6ad7..8c0bdc7 100644 ---- a/src/demangle.cc -+++ b/src/demangle.cc -@@ -38,14 +38,14 @@ - #include "utilities.h" - #include "demangle.h" - --#if defined(OS_WINDOWS) -+#if defined(GLOG_OS_WINDOWS) - #include - #pragma comment(lib, "dbghelp") - #endif - - _START_GOOGLE_NAMESPACE_ - --#if !defined(OS_WINDOWS) -+#if !defined(GLOG_OS_WINDOWS) - typedef struct { - const char *abbrev; - const char *real_name; -@@ -1324,7 +1324,7 @@ static bool ParseTopLevelMangledName(State *state) { - - // The demangler entry point. - bool Demangle(const char *mangled, char *out, int out_size) { --#if defined(OS_WINDOWS) -+#if defined(GLOG_OS_WINDOWS) - // When built with incremental linking, the Windows debugger - // library provides a more complicated `Symbol->Name` with the - // Incremental Linking Table offset, which looks like -diff --git a/src/demangle_unittest.cc b/src/demangle_unittest.cc -index be48341..c65adc4 100644 ---- a/src/demangle_unittest.cc -+++ b/src/demangle_unittest.cc -@@ -62,7 +62,7 @@ static const char *DemangleIt(const char * const mangled) { - } - } - --#if defined(OS_WINDOWS) -+#if defined(GLOG_OS_WINDOWS) - - TEST(Demangle, Windows) { - EXPECT_STREQ( -diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in -index 421f1e0..3ecacfb 100644 ---- a/src/glog/logging.h.in -+++ b/src/glog/logging.h.in -@@ -35,7 +35,6 @@ - // - #ifndef _LOGGING_H_ - #define _LOGGING_H_ -- - #include - #include - #include -@@ -58,6 +57,8 @@ - #define GLOG_MSVC_POP_WARNING() - #endif - -+#include -+ - #if @ac_cv_have_glog_export@ - #include "glog/export.h" - #endif -@@ -101,7 +102,7 @@ - - #ifdef HAVE_CXX11_ATOMIC - #include --#elif defined(OS_WINDOWS) -+#elif defined(GLOG_OS_WINDOWS) - #include - #endif - -@@ -1057,7 +1058,7 @@ namespace google { - __FILE__, __LINE__, @ac_google_namespace@::GLOG_ ## severity, LOG_OCCURRENCES, \ - &what_to_do).stream() - --#elif defined(OS_WINDOWS) -+#elif defined(GLOG_OS_WINDOWS) - - #define SOME_KIND_OF_LOG_EVERY_N(severity, n, what_to_do) \ - static int LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ -diff --git a/src/glog/platform.h b/src/glog/platform.h -new file mode 100644 -index 0000000..e614411 ---- /dev/null -+++ b/src/glog/platform.h -@@ -0,0 +1,58 @@ -+// Copyright (c) 2008, Google Inc. -+// All rights reserved. -+// -+// Redistribution and use in source and binary forms, with or without -+// modification, are permitted provided that the following conditions are -+// met: -+// -+// * Redistributions of source code must retain the above copyright -+// notice, this list of conditions and the following disclaimer. -+// * Redistributions in binary form must reproduce the above -+// copyright notice, this list of conditions and the following disclaimer -+// in the documentation and/or other materials provided with the -+// distribution. -+// * Neither the name of Google Inc. nor the names of its -+// contributors may be used to endorse or promote products derived from -+// this software without specific prior written permission. -+// -+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+// -+// Author: Shinichiro Hamaji -+// -+// Detect supported platforms. -+ -+#ifndef GLOG_PLATFORM_H -+#define GLOG_PLATFORM_H -+ -+#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) -+#define GLOG_OS_WINDOWS -+#elif defined(__CYGWIN__) || defined(__CYGWIN32__) -+#define GLOG_OS_CYGWIN -+#elif defined(linux) || defined(__linux) || defined(__linux__) -+#ifndef GLOG_OS_LINUX -+#define GLOG_OS_LINUX -+#endif -+#elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) -+#define GLOG_OS_MACOSX -+#elif defined(__FreeBSD__) -+#define GLOG_OS_FREEBSD -+#elif defined(__NetBSD__) -+#define GLOG_OS_NETBSD -+#elif defined(__OpenBSD__) -+#define GLOG_OS_OPENBSD -+#else -+// TODO(hamaji): Add other platforms. -+#error Platform not supported by glog. Please consider to contribute platform information by submitting a pull request on Github. -+#endif -+ -+#endif // GLOG_PLATFORM_H -diff --git a/src/googletest.h b/src/googletest.h -index 7230606..a7ce3c2 100644 ---- a/src/googletest.h -+++ b/src/googletest.h -@@ -72,7 +72,7 @@ _END_GOOGLE_NAMESPACE_ - #define GOOGLE_GLOG_DLL_DECL - - static inline string GetTempDir() { --#ifndef OS_WINDOWS -+#ifndef GLOG_OS_WINDOWS - return "/tmp"; - #else - char tmp[MAX_PATH]; -@@ -81,7 +81,7 @@ static inline string GetTempDir() { - #endif - } - --#if defined(OS_WINDOWS) && defined(_MSC_VER) && !defined(TEST_SRC_DIR) -+#if defined(GLOG_OS_WINDOWS) && defined(_MSC_VER) && !defined(TEST_SRC_DIR) - // The test will run in glog/vsproject/ - // (e.g., glog/vsproject/logging_unittest). - static const char TEST_SRC_DIR[] = "../.."; -@@ -207,7 +207,7 @@ static inline void CalledAbort() { - longjmp(g_jmp_buf, 1); - } - --#ifdef OS_WINDOWS -+#ifdef GLOG_OS_WINDOWS - // TODO(hamaji): Death test somehow doesn't work in Windows. - #define ASSERT_DEATH(fn, msg) - #else -@@ -490,7 +490,7 @@ static inline bool MungeAndDiffTestStderr(const string& golden_filename) { - WriteToFile(golden, munged_golden); - string munged_captured = cap->filename() + ".munged"; - WriteToFile(captured, munged_captured); --#ifdef OS_WINDOWS -+#ifdef GLOG_OS_WINDOWS - string diffcmd("fc " + munged_golden + " " + munged_captured); - #else - string diffcmd("diff -u " + munged_golden + " " + munged_captured); -@@ -532,7 +532,7 @@ class Thread { - virtual ~Thread() {} - - void SetJoinable(bool) {} --#if defined(OS_WINDOWS) && !defined(OS_CYGWIN) -+#if defined(GLOG_OS_WINDOWS) && !defined(GLOG_OS_CYGWIN) - void Start() { - handle_ = CreateThread(NULL, - 0, -@@ -565,7 +565,7 @@ class Thread { - return NULL; - } - --#if defined(OS_WINDOWS) && !defined(OS_CYGWIN) -+#if defined(GLOG_OS_WINDOWS) && !defined(GLOG_OS_CYGWIN) - HANDLE handle_; - DWORD th_; - #else -@@ -574,7 +574,7 @@ class Thread { - }; - - static inline void SleepForMilliseconds(int t) { --#ifndef OS_WINDOWS -+#ifndef GLOG_OS_WINDOWS - # if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 199309L - const struct timespec req = {0, t * 1000 * 1000}; - nanosleep(&req, NULL); -diff --git a/src/logging.cc b/src/logging.cc -index 71de91d..f251d67 100644 ---- a/src/logging.cc -+++ b/src/logging.cc -@@ -59,7 +59,7 @@ - #include - #include // for errno - #include --#ifdef OS_WINDOWS -+#ifdef GLOG_OS_WINDOWS - #include "windows/dirent.h" - #else - #include // for automatic removal of old logs -@@ -122,7 +122,7 @@ GLOG_DEFINE_bool(alsologtostderr, BoolFromEnv("GOOGLE_ALSOLOGTOSTDERR", false), - "log messages go to stderr in addition to logfiles"); - GLOG_DEFINE_bool(colorlogtostderr, false, - "color messages logged to stderr (if supported by terminal)"); --#ifdef OS_LINUX -+#ifdef GLOG_OS_LINUX - GLOG_DEFINE_bool(drop_log_memory, true, "Drop in-memory buffers of log contents. " - "Logs can grow very quickly and they are rarely read before they " - "need to be evicted from memory. Instead, drop them from memory " -@@ -198,7 +198,7 @@ GLOG_DEFINE_bool(log_utc_time, false, - #define PATH_SEPARATOR '/' - - #ifndef HAVE_PREAD --#if defined(OS_WINDOWS) -+#if defined(GLOG_OS_WINDOWS) - #include - #define ssize_t SSIZE_T - #endif -@@ -241,7 +241,7 @@ static void GetHostName(string* hostname) { - *buf.nodename = '\0'; - } - *hostname = buf.nodename; --#elif defined(OS_WINDOWS) -+#elif defined(GLOG_OS_WINDOWS) - char buf[MAX_COMPUTERNAME_LENGTH + 1]; - DWORD len = MAX_COMPUTERNAME_LENGTH + 1; - if (GetComputerNameA(buf, &len)) { -@@ -258,7 +258,7 @@ static void GetHostName(string* hostname) { - // Returns true iff terminal supports using colors in output. - static bool TerminalSupportsColor() { - bool term_supports_color = false; --#ifdef OS_WINDOWS -+#ifdef GLOG_OS_WINDOWS - // on Windows TERM variable is usually not set, but the console does - // support colors. - term_supports_color = true; -@@ -312,7 +312,7 @@ static GLogColor SeverityToColor(LogSeverity severity) { - return color; - } - --#ifdef OS_WINDOWS -+#ifdef GLOG_OS_WINDOWS - - // Returns the character attribute for the given color. - static WORD GetColorAttribute(GLogColor color) { -@@ -337,7 +337,7 @@ static const char* GetAnsiColorCode(GLogColor color) { - return NULL; // stop warning about return type. - } - --#endif // OS_WINDOWS -+#endif // GLOG_OS_WINDOWS - - // Safely get max_log_size, overriding to 1 if it somehow gets defined as 0 - static int32 MaxLogSize() { -@@ -753,7 +753,7 @@ static void ColoredWriteToStderr(LogSeverity severity, - fwrite(message, len, 1, stderr); - return; - } --#ifdef OS_WINDOWS -+#ifdef GLOG_OS_WINDOWS - const HANDLE stderr_handle = GetStdHandle(STD_ERROR_HANDLE); - - // Gets the current text color. -@@ -775,7 +775,7 @@ static void ColoredWriteToStderr(LogSeverity severity, - fprintf(stderr, "\033[0;3%sm", GetAnsiColorCode(color)); - fwrite(message, len, 1, stderr); - fprintf(stderr, "\033[m"); // Resets the terminal to default. --#endif // OS_WINDOWS -+#endif // GLOG_OS_WINDOWS - } - - static void WriteToStderr(const char* message, size_t len) { -@@ -788,7 +788,7 @@ inline void LogDestination::MaybeLogToStderr(LogSeverity severity, - const char* message, size_t message_len, size_t prefix_len) { - if ((severity >= FLAGS_stderrthreshold) || FLAGS_alsologtostderr) { - ColoredWriteToStderr(severity, message, message_len); --#ifdef OS_WINDOWS -+#ifdef GLOG_OS_WINDOWS - // On Windows, also output to the debugger - ::OutputDebugStringA(message); - #elif defined(__ANDROID__) -@@ -1056,7 +1056,7 @@ bool LogFileObject::CreateLogfile(const string& time_pid_string) { - } - return false; - } --#ifdef OS_WINDOWS -+#ifdef GLOG_OS_WINDOWS - // https://github.com/golang/go/issues/27638 - make sure we seek to the end to append - // empirically replicated with wine over mingw build - if (!FLAGS_timestamp_in_logfile_name) { -@@ -1080,7 +1080,7 @@ bool LogFileObject::CreateLogfile(const string& time_pid_string) { - linkpath += linkname; - unlink(linkpath.c_str()); // delete old one if it exists - --#if defined(OS_WINDOWS) -+#if defined(GLOG_OS_WINDOWS) - // TODO(hamaji): Create lnk file on Windows? - #elif defined(HAVE_UNISTD_H) - // We must have unistd.h. -@@ -1270,7 +1270,7 @@ void LogFileObject::Write(bool force_flush, - (bytes_since_flush_ >= 1000000) || - (CycleClock_Now() >= next_flush_time_) ) { - FlushUnlocked(); --#ifdef OS_LINUX -+#ifdef GLOG_OS_LINUX - // Only consider files >= 3MiB - if (FLAGS_drop_log_memory && file_length_ >= (3 << 20)) { - // Don't evict the most recent 1-2MiB so as not to impact a tailer -@@ -1305,7 +1305,7 @@ void LogFileObject::Write(bool force_flush, - - - LogCleaner::LogCleaner() : enabled_(false), overdue_days_(7), dir_delim_('/') { --#ifdef OS_WINDOWS -+#ifdef GLOG_OS_WINDOWS - dir_delim_ = '\\'; - #endif - } -@@ -1898,7 +1898,7 @@ void LogMessage::RecordCrashReason( - # define ATTRIBUTE_NORETURN - #endif - --#if defined(OS_WINDOWS) -+#if defined(GLOG_OS_WINDOWS) - __declspec(noreturn) - #endif - static void logging_fail() ATTRIBUTE_NORETURN; -@@ -2223,7 +2223,7 @@ bool SendEmail(const char*dest, const char *subject, const char*body){ - - static void GetTempDirectories(vector* list) { - list->clear(); --#ifdef OS_WINDOWS -+#ifdef GLOG_OS_WINDOWS - // On windows we'll try to find a directory in this order: - // C:/Documents & Settings/whomever/TEMP (or whatever GetTempPath() is) - // C:/TMP/ -@@ -2282,7 +2282,7 @@ const vector& GetLoggingDirectories() { - logging_directories_list->push_back(FLAGS_log_dir.c_str()); - } else { - GetTempDirectories(logging_directories_list); --#ifdef OS_WINDOWS -+#ifdef GLOG_OS_WINDOWS - char tmp[MAX_PATH]; - if (GetWindowsDirectoryA(tmp, MAX_PATH)) - logging_directories_list->push_back(tmp); -@@ -2325,7 +2325,7 @@ void TruncateLogFile(const char *path, int64 limit, int64 keep) { - // Don't follow symlinks unless they're our own fd symlinks in /proc - int flags = O_RDWR; - // TODO(hamaji): Support other environments. --#ifdef OS_LINUX -+#ifdef GLOG_OS_LINUX - const char *procfd_prefix = "/proc/self/fd/"; - if (strncmp(procfd_prefix, path, strlen(procfd_prefix))) flags |= O_NOFOLLOW; - #endif -@@ -2464,7 +2464,7 @@ int posix_strerror_r(int err, char *buf, size_t len) { - return 0; - } else { - buf[0] = '\000'; --#if defined(OS_MACOSX) || defined(OS_FREEBSD) || defined(OS_OPENBSD) -+#if defined(GLOG_OS_MACOSX) || defined(GLOG_OS_FREEBSD) || defined(GLOG_OS_OPENBSD) - if (reinterpret_cast(rc) < sys_nerr) { - // This means an error on MacOSX or FreeBSD. - return -1; -diff --git a/src/logging_custom_prefix_unittest.cc b/src/logging_custom_prefix_unittest.cc -index c9fb5b8..8740fad 100644 ---- a/src/logging_custom_prefix_unittest.cc -+++ b/src/logging_custom_prefix_unittest.cc -@@ -588,7 +588,7 @@ void TestCHECK() { - - // Tests using CHECK*() on anonymous enums. - // Apple's GCC doesn't like this. --#if !defined(OS_MACOSX) -+#if !defined(GLOG_OS_MACOSX) - CHECK_EQ(CASE_A, CASE_A); - CHECK_NE(CASE_A, CASE_B); - CHECK_GE(CASE_A, CASE_A); -@@ -670,7 +670,7 @@ static void GetFiles(const string& pattern, vector* files) { - files->push_back(string(g.gl_pathv[i])); - } - globfree(&g); --#elif defined(OS_WINDOWS) -+#elif defined(GLOG_OS_WINDOWS) - WIN32_FIND_DATAA data; - HANDLE handle = FindFirstFileA(pattern.c_str(), &data); - size_t index = pattern.rfind('\\'); -@@ -799,7 +799,7 @@ static void TestTwoProcessesWrite() { - } - - static void TestSymlink() { --#ifndef OS_WINDOWS -+#ifndef GLOG_OS_WINDOWS - fprintf(stderr, "==== Test setting log file symlink\n"); - string dest = FLAGS_test_tmpdir + "/logging_test_symlink"; - string sym = FLAGS_test_tmpdir + "/symlinkbase"; -@@ -942,7 +942,7 @@ static void TestTruncate() { - // MacOSX 10.4 doesn't fail in this case. - // Windows doesn't have symlink. - // Let's just ignore this test for these cases. --#if !defined(OS_MACOSX) && !defined(OS_WINDOWS) -+#if !defined(GLOG_OS_MACOSX) && !defined(GLOG_OS_WINDOWS) - // Through a symlink should fail to truncate - string linkname = path + ".link"; - unlink(linkname.c_str()); -@@ -951,7 +951,7 @@ static void TestTruncate() { - #endif - - // The /proc/self path makes sense only for linux. --#if defined(OS_LINUX) -+#if defined(GLOG_OS_LINUX) - // Through an open fd symlink should work - int fd; - CHECK_ERR(fd = open(path.c_str(), O_APPEND | O_WRONLY)); -@@ -1205,7 +1205,7 @@ TEST(Strerror, logging) { - CHECK_EQ(posix_strerror_r(errcode, buf, 0), -1); - CHECK_EQ(buf[0], 'A'); - CHECK_EQ(posix_strerror_r(errcode, NULL, buf_size), -1); --#if defined(OS_MACOSX) || defined(OS_FREEBSD) || defined(OS_OPENBSD) -+#if defined(GLOG_OS_MACOSX) || defined(GLOG_OS_FREEBSD) || defined(GLOG_OS_OPENBSD) - // MacOSX or FreeBSD considers this case is an error since there is - // no enough space. - CHECK_EQ(posix_strerror_r(errcode, buf, 1), -1); -diff --git a/src/logging_unittest.cc b/src/logging_unittest.cc -index edc7d35..ce3c483 100644 ---- a/src/logging_unittest.cc -+++ b/src/logging_unittest.cc -@@ -561,7 +561,7 @@ void TestCHECK() { - - // Tests using CHECK*() on anonymous enums. - // Apple's GCC doesn't like this. --#if !defined(OS_MACOSX) -+#if !defined(GLOG_OS_MACOSX) - CHECK_EQ(CASE_A, CASE_A); - CHECK_NE(CASE_A, CASE_B); - CHECK_GE(CASE_A, CASE_A); -@@ -643,7 +643,7 @@ static void GetFiles(const string& pattern, vector* files) { - files->push_back(string(g.gl_pathv[i])); - } - globfree(&g); --#elif defined(OS_WINDOWS) -+#elif defined(GLOG_OS_WINDOWS) - WIN32_FIND_DATAA data; - HANDLE handle = FindFirstFileA(pattern.c_str(), &data); - size_t index = pattern.rfind('\\'); -@@ -772,7 +772,7 @@ static void TestTwoProcessesWrite() { - } - - static void TestSymlink() { --#ifndef OS_WINDOWS -+#ifndef GLOG_OS_WINDOWS - fprintf(stderr, "==== Test setting log file symlink\n"); - string dest = FLAGS_test_tmpdir + "/logging_test_symlink"; - string sym = FLAGS_test_tmpdir + "/symlinkbase"; -@@ -915,7 +915,7 @@ static void TestTruncate() { - // MacOSX 10.4 doesn't fail in this case. - // Windows doesn't have symlink. - // Let's just ignore this test for these cases. --#if !defined(OS_MACOSX) && !defined(OS_WINDOWS) -+#if !defined(GLOG_OS_MACOSX) && !defined(GLOG_OS_WINDOWS) - // Through a symlink should fail to truncate - string linkname = path + ".link"; - unlink(linkname.c_str()); -@@ -924,7 +924,7 @@ static void TestTruncate() { - #endif - - // The /proc/self path makes sense only for linux. --#if defined(OS_LINUX) -+#if defined(GLOG_OS_LINUX) - // Through an open fd symlink should work - int fd; - CHECK_ERR(fd = open(path.c_str(), O_APPEND | O_WRONLY)); -@@ -1178,7 +1178,7 @@ TEST(Strerror, logging) { - CHECK_EQ(posix_strerror_r(errcode, buf, 0), -1); - CHECK_EQ(buf[0], 'A'); - CHECK_EQ(posix_strerror_r(errcode, NULL, buf_size), -1); --#if defined(OS_MACOSX) || defined(OS_FREEBSD) || defined(OS_OPENBSD) -+#if defined(GLOG_OS_MACOSX) || defined(GLOG_OS_FREEBSD) || defined(GLOG_OS_OPENBSD) - // MacOSX or FreeBSD considers this case is an error since there is - // no enough space. - CHECK_EQ(posix_strerror_r(errcode, buf, 1), -1); -diff --git a/src/signalhandler.cc b/src/signalhandler.cc -index b6d6e25..ababf86 100644 ---- a/src/signalhandler.cc -+++ b/src/signalhandler.cc -@@ -63,7 +63,7 @@ const struct { - { SIGILL, "SIGILL" }, - { SIGFPE, "SIGFPE" }, - { SIGABRT, "SIGABRT" }, --#if !defined(OS_WINDOWS) -+#if !defined(GLOG_OS_WINDOWS) - { SIGBUS, "SIGBUS" }, - #endif - { SIGTERM, "SIGTERM" }, -@@ -208,7 +208,7 @@ void DumpSignalInfo(int signal_number, siginfo_t *siginfo) { - formatter.AppendUint64((uintptr_t)pthread_self(), 16); - formatter.AppendString(") "); - // Only linux has the PID of the signal sender in si_pid. --#ifdef OS_LINUX -+#ifdef GLOG_OS_LINUX - formatter.AppendString("from PID "); - formatter.AppendUint64(siginfo->si_pid, 10); - formatter.AppendString("; "); -@@ -253,7 +253,7 @@ void InvokeDefaultSignalHandler(int signal_number) { - sig_action.sa_handler = SIG_DFL; - sigaction(signal_number, &sig_action, NULL); - kill(getpid(), signal_number); --#elif defined(OS_WINDOWS) -+#elif defined(GLOG_OS_WINDOWS) - signal(signal_number, SIG_DFL); - raise(signal_number); - #endif -@@ -267,7 +267,7 @@ static pthread_t* g_entered_thread_id_pointer = NULL; - - // Dumps signal and stack frame information, and invokes the default - // signal handler once our job is done. --#if defined(OS_WINDOWS) -+#if defined(GLOG_OS_WINDOWS) - void FailureSignalHandler(int signal_number) - #else - void FailureSignalHandler(int signal_number, -@@ -314,7 +314,7 @@ void FailureSignalHandler(int signal_number, - // First dump time info. - DumpTimeInfo(); - --#if !defined(OS_WINDOWS) -+#if !defined(GLOG_OS_WINDOWS) - // Get the program counter from ucontext. - void *pc = GetPC(ucontext); - DumpStackFrameInfo("PC: ", pc); -@@ -364,7 +364,7 @@ bool IsFailureSignalHandlerInstalled() { - sigaction(SIGABRT, NULL, &sig_action); - if (sig_action.sa_sigaction == &FailureSignalHandler) - return true; --#elif defined(OS_WINDOWS) -+#elif defined(GLOG_OS_WINDOWS) - return kFailureSignalHandlerInstalled; - #endif // HAVE_SIGACTION - return false; -@@ -385,7 +385,7 @@ void InstallFailureSignalHandler() { - CHECK_ERR(sigaction(kFailureSignals[i].number, &sig_action, NULL)); - } - kFailureSignalHandlerInstalled = true; --#elif defined(OS_WINDOWS) -+#elif defined(GLOG_OS_WINDOWS) - for (size_t i = 0; i < ARRAYSIZE(kFailureSignals); ++i) { - CHECK_NE(signal(kFailureSignals[i].number, &FailureSignalHandler), - SIG_ERR); -@@ -395,7 +395,7 @@ void InstallFailureSignalHandler() { - } - - void InstallFailureWriter(void (*writer)(const char* data, int size)) { --#if defined(HAVE_SIGACTION) || defined(OS_WINDOWS) -+#if defined(HAVE_SIGACTION) || defined(GLOG_OS_WINDOWS) - g_failure_writer = writer; - #endif // HAVE_SIGACTION - } -diff --git a/src/stacktrace_x86-inl.h b/src/stacktrace_x86-inl.h -index af2783d..99c5de7 100644 ---- a/src/stacktrace_x86-inl.h -+++ b/src/stacktrace_x86-inl.h -@@ -31,9 +31,9 @@ - - #include // for uintptr_t - --#include "utilities.h" // for OS_* macros -+#include "utilities.h" // for GLOG_OS_* macros - --#if !defined(OS_WINDOWS) -+#if !defined(GLOG_OS_WINDOWS) - #include - #include - #endif -@@ -74,7 +74,7 @@ static void **NextStackFrame(void **old_sp) { - // last two pages in the address space - if ((uintptr_t)new_sp >= 0xffffe000) return NULL; - #endif --#if !defined(OS_WINDOWS) -+#if !defined(GLOG_OS_WINDOWS) - if (!STRICT_UNWINDING) { - // Lax sanity checks cause a crash in 32-bit tcmalloc/crash_reason_test - // on AMD-based machines with VDSO-enabled kernels. -diff --git a/src/symbolize.cc b/src/symbolize.cc -index f7fbc53..8688ca2 100644 ---- a/src/symbolize.cc -+++ b/src/symbolize.cc -@@ -46,7 +46,7 @@ - // and memmove(). We assume they are async-signal-safe. - // - // Additional header can be specified by the GLOG_BUILD_CONFIG_INCLUDE --// macro to add platform specific defines (e.g. OS_OPENBSD). -+// macro to add platform specific defines (e.g. GLOG_OS_OPENBSD). - - #ifdef GLOG_BUILD_CONFIG_INCLUDE - #include GLOG_BUILD_CONFIG_INCLUDE -@@ -113,7 +113,7 @@ _END_GOOGLE_NAMESPACE_ - #if defined(HAVE_DLFCN_H) - #include - #endif --#if defined(OS_OPENBSD) -+#if defined(GLOG_OS_OPENBSD) - #include - #else - #include -@@ -846,7 +846,7 @@ static ATTRIBUTE_NOINLINE bool SymbolizeAndDemangle(void *pc, char *out, - - _END_GOOGLE_NAMESPACE_ - --#elif defined(OS_MACOSX) && defined(HAVE_DLADDR) -+#elif defined(GLOG_OS_MACOSX) && defined(HAVE_DLADDR) - - #include - #include -@@ -871,7 +871,7 @@ static ATTRIBUTE_NOINLINE bool SymbolizeAndDemangle(void *pc, char *out, - - _END_GOOGLE_NAMESPACE_ - --#elif defined(OS_WINDOWS) || defined(OS_CYGWIN) -+#elif defined(GLOG_OS_WINDOWS) || defined(GLOG_OS_CYGWIN) - - #include - #include -diff --git a/src/symbolize_unittest.cc b/src/symbolize_unittest.cc -index 0b53230..7e8f6d4 100644 ---- a/src/symbolize_unittest.cc -+++ b/src/symbolize_unittest.cc -@@ -359,7 +359,7 @@ static void ATTRIBUTE_NOINLINE TestWithReturnAddress() { - #endif - } - --# elif defined(OS_WINDOWS) || defined(OS_CYGWIN) -+# elif defined(GLOG_OS_WINDOWS) || defined(GLOG_OS_CYGWIN) - - #ifdef _MSC_VER - #include -@@ -411,10 +411,10 @@ int main(int argc, char **argv) { - TestWithPCInsideNonInlineFunction(); - TestWithReturnAddress(); - return RUN_ALL_TESTS(); --# elif defined(OS_WINDOWS) || defined(OS_CYGWIN) -+# elif defined(GLOG_OS_WINDOWS) || defined(GLOG_OS_CYGWIN) - TestWithReturnAddress(); - return RUN_ALL_TESTS(); --# else // OS_WINDOWS -+# else // GLOG_OS_WINDOWS - printf("PASS (no symbolize_unittest support)\n"); - return 0; - # endif // __ELF__ -diff --git a/src/utilities.cc b/src/utilities.cc -index 6b9a69e..ecda730 100644 ---- a/src/utilities.cc -+++ b/src/utilities.cc -@@ -151,7 +151,7 @@ static void DumpStackTraceAndExit() { - sigemptyset(&sig_action.sa_mask); - sig_action.sa_handler = SIG_DFL; - sigaction(SIGABRT, &sig_action, NULL); --#elif defined(OS_WINDOWS) -+#elif defined(GLOG_OS_WINDOWS) - signal(SIGABRT, SIG_DFL); - #endif // HAVE_SIGACTION - } -@@ -180,7 +180,7 @@ bool IsGoogleLoggingInitialized() { - return g_program_invocation_short_name != NULL; - } - --#ifdef OS_WINDOWS -+#ifdef GLOG_OS_WINDOWS - struct timeval { - long tv_sec, tv_usec; - }; -@@ -236,9 +236,9 @@ bool PidHasChanged() { - - pid_t GetTID() { - // On Linux and MacOSX, we try to use gettid(). --#if defined OS_LINUX || defined OS_MACOSX -+#if defined GLOG_OS_LINUX || defined GLOG_OS_MACOSX - #ifndef __NR_gettid --#ifdef OS_MACOSX -+#ifdef GLOG_OS_MACOSX - #define __NR_gettid SYS_gettid - #elif ! defined __i386__ - #error "Must define __NR_gettid for non-x86 platforms" -@@ -258,12 +258,12 @@ pid_t GetTID() { - // the value change to "true". - lacks_gettid = true; - } --#endif // OS_LINUX || OS_MACOSX -+#endif // GLOG_OS_LINUX || GLOG_OS_MACOSX - - // If gettid() could not be used, we use one of the following. --#if defined OS_LINUX -+#if defined GLOG_OS_LINUX - return getpid(); // Linux: getpid returns thread ID when gettid is absent --#elif defined OS_WINDOWS && !defined OS_CYGWIN -+#elif defined GLOG_OS_WINDOWS && !defined GLOG_OS_CYGWIN - return GetCurrentThreadId(); - #elif defined(HAVE_PTHREAD) - // If none of the techniques above worked, we use pthread_self(). -@@ -275,7 +275,7 @@ pid_t GetTID() { - - const char* const_basename(const char* filepath) { - const char* base = strrchr(filepath, '/'); --#ifdef OS_WINDOWS // Look for either path separator in Windows -+#ifdef GLOG_OS_WINDOWS // Look for either path separator in Windows - if (!base) - base = strrchr(filepath, '\\'); - #endif -@@ -288,7 +288,7 @@ const string& MyUserName() { - } - static void MyUserNameInitializer() { - // TODO(hamaji): Probably this is not portable. --#if defined(OS_WINDOWS) -+#if defined(GLOG_OS_WINDOWS) - const char* user = getenv("USERNAME"); - #else - const char* user = getenv("USER"); -@@ -337,7 +337,7 @@ void InitGoogleLoggingUtilities(const char* argv0) { - CHECK(!IsGoogleLoggingInitialized()) - << "You called InitGoogleLogging() twice!"; - const char* slash = strrchr(argv0, '/'); --#ifdef OS_WINDOWS -+#ifdef GLOG_OS_WINDOWS - if (!slash) slash = strrchr(argv0, '\\'); - #endif - g_program_invocation_short_name = slash ? slash + 1 : argv0; -diff --git a/src/utilities.h b/src/utilities.h -index e4115ad..86bc296 100644 ---- a/src/utilities.h -+++ b/src/utilities.h -@@ -34,25 +34,6 @@ - #ifndef UTILITIES_H__ - #define UTILITIES_H__ - --#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) --# define OS_WINDOWS --#elif defined(__CYGWIN__) || defined(__CYGWIN32__) --# define OS_CYGWIN --#elif defined(linux) || defined(__linux) || defined(__linux__) --# ifndef OS_LINUX --# define OS_LINUX --# endif --#elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) --# define OS_MACOSX --#elif defined(__FreeBSD__) --# define OS_FREEBSD --#elif defined(__NetBSD__) --# define OS_NETBSD --#elif defined(__OpenBSD__) --# define OS_OPENBSD --#else --// TODO(hamaji): Add other platforms. --#endif - - // printf macros for size_t, in the style of inttypes.h - #ifdef _LP64 -@@ -76,12 +57,12 @@ - - #include - --#if defined(OS_WINDOWS) -+#include "glog/logging.h" -+#if defined(GLOG_OS_WINDOWS) - # include "port.h" - #endif - - #include "config.h" --#include "glog/logging.h" - - // There are three different ways we can try to get the stack trace: - // -@@ -114,7 +95,7 @@ - # define STACKTRACE_H "stacktrace_x86_64-inl.h" - # elif (defined(__ppc__) || defined(__PPC__)) && __GNUC__ >= 2 - # define STACKTRACE_H "stacktrace_powerpc-inl.h" --# elif defined(OS_WINDOWS) -+# elif defined(GLOG_OS_WINDOWS) - # define STACKTRACE_H "stacktrace_windows-inl.h" - # endif - #endif -@@ -130,12 +111,12 @@ - #ifndef GLOG_NO_SYMBOLIZE_DETECTION - #ifndef HAVE_SYMBOLIZE - // defined by gcc --#if defined(__ELF__) && defined(OS_LINUX) -+#if defined(__ELF__) && defined(GLOG_OS_LINUX) - # define HAVE_SYMBOLIZE --#elif defined(OS_MACOSX) && defined(HAVE_DLADDR) -+#elif defined(GLOG_OS_MACOSX) && defined(HAVE_DLADDR) - // Use dladdr to symbolize. - # define HAVE_SYMBOLIZE --#elif defined(OS_WINDOWS) -+#elif defined(GLOG_OS_WINDOWS) - // Use DbgHelp to symbolize - # define HAVE_SYMBOLIZE - #endif -@@ -154,7 +135,7 @@ namespace glog_internal_namespace_ { - #ifdef HAVE___ATTRIBUTE__ - # define ATTRIBUTE_NOINLINE __attribute__ ((noinline)) - # define HAVE_ATTRIBUTE_NOINLINE --#elif defined(OS_WINDOWS) -+#elif defined(GLOG_OS_WINDOWS) - # define ATTRIBUTE_NOINLINE __declspec(noinline) - # define HAVE_ATTRIBUTE_NOINLINE - #else diff --git a/ports/glog/glog_disable_debug_postfix.patch b/ports/glog/glog_disable_debug_postfix.patch index 9f62ec3799e117..45cbce9789c00a 100644 --- a/ports/glog/glog_disable_debug_postfix.patch +++ b/ports/glog/glog_disable_debug_postfix.patch @@ -1,13 +1,13 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 62ebbcc..28e2688 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -65,7 +65,7 @@ include (GenerateExportHeader) - include (GetCacheVariables) - include (GNUInstallDirs) - --set (CMAKE_DEBUG_POSTFIX d) -+#set (CMAKE_DEBUG_POSTFIX d) - set (CMAKE_THREAD_PREFER_PTHREAD 1) - - find_package (GTest) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1fdeac6..16fef38 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -65,7 +65,7 @@ set (CMAKE_CXX_VISIBILITY_PRESET hidden) + set (CMAKE_POSITION_INDEPENDENT_CODE ON) + set (CMAKE_VISIBILITY_INLINES_HIDDEN ON) + +-set (CMAKE_DEBUG_POSTFIX d) ++#set (CMAKE_DEBUG_POSTFIX d) + set (CMAKE_THREAD_PREFER_PTHREAD 1) + + find_package (GTest NO_MODULE) diff --git a/ports/glog/portfile.cmake b/ports/glog/portfile.cmake index e8b8033b6a88a6..abd690937a1212 100644 --- a/ports/glog/portfile.cmake +++ b/ports/glog/portfile.cmake @@ -1,16 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/glog - REF v0.5.0 - SHA512 445e4338f3d81cd0b065f2da9c6ce343c243263ca144cea424ef97531a4e9e09c06ffd6942ac01c5213a8003c75cfbbede3c4028d12f0134f23ff29314769c1a + REF v0.6.0 + SHA512 fd2c42583d0dd72c790a8cf888f328a64447c5fb9d99b2e2a3833d70c102cb0eb9ae874632c2732424cc86216c8a076a3e24b23a793eaddb5da8a1dc52ba9226 HEAD_REF master PATCHES - glog_disable_debug_postfix.patch - fix_glog_CMAKE_MODULE_PATH.patch - fix_log_every_n.patch - fix-SOME_KIND_OF_LOG.patch - fix_crosscompile_symbolize.patch - cmakelists_atomicdetect.patch + fix_glog_CMAKE_MODULE_PATH.patch + glog_disable_debug_prefix.patch + fix_crosscompile_symbolize.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS From c08666c06b6d972ab7cc28090389369f9a70893d Mon Sep 17 00:00:00 2001 From: jiayuehua <3423893+jiayuehua@users.noreply.github.com> Date: Sat, 18 Jun 2022 11:07:07 +0800 Subject: [PATCH 56/56] make cplusplus macro work on msvc --- ports/glog/fix_cpluplus_macro.patch | 15 +++++++++++++++ ports/glog/portfile.cmake | 3 ++- ports/glog/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/g-/glog.json | 5 +++++ 5 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 ports/glog/fix_cpluplus_macro.patch diff --git a/ports/glog/fix_cpluplus_macro.patch b/ports/glog/fix_cpluplus_macro.patch new file mode 100644 index 00000000000000..ee22dcdd53b82c --- /dev/null +++ b/ports/glog/fix_cpluplus_macro.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4f94251..959bf35 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -669,6 +669,10 @@ if (CYGWIN OR WIN32) + target_compile_definitions (glog PUBLIC GLOG_NO_ABBREVIATED_SEVERITIES) + endif (CYGWIN OR WIN32) + ++if ((MSVC) AND (MSVC_VERSION GREATER_EQUAL 1914)) ++ target_compile_options(glog INTERFACE "/Zc:__cplusplus") ++endif() ++ + if (WITH_CUSTOM_PREFIX) + target_compile_definitions (glog PUBLIC GLOG_CUSTOM_PREFIX_SUPPORT) + endif (WITH_CUSTOM_PREFIX) diff --git a/ports/glog/portfile.cmake b/ports/glog/portfile.cmake index abd690937a1212..93801ffd803e7d 100644 --- a/ports/glog/portfile.cmake +++ b/ports/glog/portfile.cmake @@ -6,8 +6,9 @@ vcpkg_from_github( HEAD_REF master PATCHES fix_glog_CMAKE_MODULE_PATH.patch - glog_disable_debug_prefix.patch + glog_disable_debug_postfix.patch fix_crosscompile_symbolize.patch + fix_cpluplus_macro.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/glog/vcpkg.json b/ports/glog/vcpkg.json index d53b0421e0417e..9f88d84f26ac4d 100644 --- a/ports/glog/vcpkg.json +++ b/ports/glog/vcpkg.json @@ -1,7 +1,6 @@ { "name": "glog", - "version": "0.5.0", - "port-version": 5, + "version": "0.6.0", "description": "C++ implementation of the Google logging module", "homepage": "https://github.com/google/glog", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 97455e536ccbe6..f9856489d30310 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2581,8 +2581,8 @@ "port-version": 4 }, "glog": { - "baseline": "0.5.0", - "port-version": 5 + "baseline": "0.6.0", + "port-version": 0 }, "gloo": { "baseline": "20201203", diff --git a/versions/g-/glog.json b/versions/g-/glog.json index eb8144dd2bbb2f..abaae47a1d4b6a 100644 --- a/versions/g-/glog.json +++ b/versions/g-/glog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "123e9dfbdc65587da84d20133b540336244c15ff", + "version": "0.6.0", + "port-version": 0 + }, { "git-tree": "b1c79ab6934cb1a24d37e2e7c0a73f486f3400c4", "version": "0.5.0",