TomasMorris · TomasMorris · Apr 26, 2023 · Apr 25, 2023 · Apr 26, 2023 · Apr 26, 2023
diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake
@@ -10,14 +10,14 @@ if("tao" IN_LIST FEATURES)
     vcpkg_download_distfile(ARCHIVE
         URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${VERSION_DIRECTORY}/ACE%2BTAO-src-${VERSION}.tar.gz"
         FILENAME "ACE-TAO-${VERSION}.tar.gz"
-        SHA512 7210091f0512fa9c7ba2ea9e3f805a2ba0aab4d848a8e9e5651a824dcac65ddd50b95c98f4da86900487fa0a79aede126d021f4eb109f224224fc88a58133f79
+        SHA512 a40a4761d396f1e7dc96287075810a3d874794f56057cf1f18b2bd27fbb89e024c2926890fd0a8efe825c31865c382b91e90477d78cba64877b93ba9909b7da2
     )
 else()
     # Don't change to vcpkg_from_github! This points to a release and not an archive
     vcpkg_download_distfile(ARCHIVE
         URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${VERSION_DIRECTORY}/ACE-src-${VERSION}.tar.gz"
         FILENAME "ACE-src-${VERSION}.tar.gz"
-        SHA512 6e8b63ee8fa691656544a7a9e5887b499a8791f25766a8081df1d64e911f667a95fed26c1eb6355f6ce1233694f8ef11c1a986ca16a686e21fb1e375035a29ed
+        SHA512 716b27e347e013b866fa08f7ab182c60faf108e8000089b90717db86d6dd92d8c7e776d4850be27c5f50c8e31543f573ce19466efcd9b4b7bc8836eec5447860
     )
 endif()
 

diff --git a/ports/ace/vcpkg.json b/ports/ace/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "ace",
-  "version": "7.0.11",
-  "port-version": 2,
+  "version": "7.1.0",
   "maintainers": "Johnny Willemsen <[email protected]>",
   "description": "The ADAPTIVE Communication Environment",
   "homepage": "https://github.com/DOCGroup/ACE_TAO",

diff --git a/ports/aws-sdk-cpp/compute_build_only.cmake b/ports/aws-sdk-cpp/compute_build_only.cmake
@@ -548,9 +548,6 @@ endif()
 if("mobile" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY mobile)
 endif()
-if("mobileanalytics" IN_LIST FEATURES)
-  list(APPEND BUILD_ONLY mobileanalytics)
-endif()
 if("monitoring" IN_LIST FEATURES)
   list(APPEND BUILD_ONLY monitoring)
 endif()

diff --git a/ports/aws-sdk-cpp/patch-relocatable-rpath.patch b/ports/aws-sdk-cpp/patch-relocatable-rpath.patch
@@ -1,12 +1,12 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a653e38628..76d6067646 100644
+index 41d220d5fa..f6ee9a2a74 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -142,7 +142,6 @@ else()
- endif()
- 
- # Add Linker search paths to RPATH so as to fix the problem where some linkers can't find cross-compiled dependent libraries in customer paths when linking executables.
--set(CMAKE_INSTALL_RPATH_USE_LINK_PATH true)
- 
- # build the sdk targets
- project("aws-cpp-sdk-all" VERSION "${PROJECT_VERSION}" LANGUAGES CXX)
+@@ -147,7 +147,6 @@ if (LEGACY_BUILD)
+     endif ()
+
+     # Add Linker search paths to RPATH so as to fix the problem where some linkers can't find cross-compiled dependent libraries in customer paths when linking executables.
+-    set(CMAKE_INSTALL_RPATH_USE_LINK_PATH true)
+
+     # build the sdk targets
+     project("aws-cpp-sdk-all" VERSION "${PROJECT_VERSION}" LANGUAGES CXX)
diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake
@@ -4,12 +4,13 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO aws/aws-sdk-cpp
     REF "${VERSION}"
-    SHA512 d30a9cbe67aca41e98c799b55122ff97e9a935d2073ae4c1ca6545b68719236c0f2daf665cc3c0da4210e6e24e908a7a3cd0b826242e8fb5a97763f43e92b57a
+    SHA512 e3fff504e8437741493451f602289010150d767f57ceb0a3aea02bf85268ddb2afb7473affa4a162aa356a410573ded50324979bf77265e81c047c861d887635
     PATCHES
         patch-relocatable-rpath.patch
         fix-aws-root.patch
         fix-openssl3.patch
         lock-curl-http-and-tls-settings.patch
+        turn-off-warnings-as-errors.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT)

diff --git a/ports/aws-sdk-cpp/turn-off-warnings-as-errors.patch b/ports/aws-sdk-cpp/turn-off-warnings-as-errors.patch
@@ -0,0 +1,14 @@
+diff --git a/cmake/compiler_settings.cmake b/cmake/compiler_settings.cmake
+index a7689dc595..13e594f12c 100644
+--- a/cmake/compiler_settings.cmake
++++ b/cmake/compiler_settings.cmake
+@@ -153,9 +153,6 @@ macro(set_msvc_warnings)
+         endif()
+
+         # warnings as errors, max warning level (4)
+-        if(NOT CMAKE_CXX_FLAGS MATCHES "/WX")
+-            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
+-        endif()
+
+         # taken from http://stackoverflow.com/questions/2368811/how-to-set-warning-level-in-cmake
+         if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "$note": "Automatically generated by generateFeatures.ps1",
   "name": "aws-sdk-cpp",
-  "version": "1.11.4",
+  "version": "1.11.65",
   "description": "AWS SDK for C++",
   "homepage": "https://github.com/aws/aws-sdk-cpp",
   "license": "Apache-2.0",
@@ -585,9 +585,6 @@
     "mobile": {
       "description": "C++ SDK for the AWS mobile service"
     },
-    "mobileanalytics": {
-      "description": "C++ SDK for the AWS mobileanalytics service"
-    },
     "monitoring": {
       "description": "C++ SDK for the AWS monitoring service"
     },

diff --git a/ports/collada-dom/use-vcpkg-minizip.patch b/ports/collada-dom/use-vcpkg-minizip.patch
@@ -1,13 +1,14 @@
-diff --git a/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp b/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp
-index 4536275..77651f9 100644
---- a/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp
-+++ b/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp
-@@ -32,7 +32,7 @@
- #include <iomanip>
- using namespace std;
-
--#include <zip.h> // for saving compressed files
-+#include <minizip/zip.h> // for saving compressed files
- #ifdef _WIN32
- #include <iowin32.h>
- #else
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f6c2bb6..3351ab0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -222,7 +222,8 @@ else()
+   endif()
+ endif()
+
+-pkg_check_modules(minizip minizip)
++find_package(minizip NAMES unofficial-minizip REQUIRED)
++add_library(minizip ALIAS unofficial::minizip::minizip)
+ if(minizip_FOUND)
+   set(MINIZIP_INCLUDE_DIR ${minizip_INCLUDE_DIRS})
+ else()
diff --git a/ports/collada-dom/vcpkg.json b/ports/collada-dom/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "collada-dom",
   "version": "2.5.0",
-  "port-version": 8,
+  "port-version": 9,
   "description": "The COLLADA Document Object Model (DOM) is an application programming interface (API) that provides a C++ object representation of a COLLADA XML instance document.",
   "homepage": "https://github.com/rdiankov/collada-dom",
   "license": null,

diff --git a/ports/fmilib/devendor-sublibs.diff b/ports/fmilib/devendor-sublibs.diff
@@ -1,13 +1,13 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b01aba5..583e15b 100644
+index 690ee5f..2816987 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -230,7 +230,7 @@ configure_file (
    "${FMILibrary_BINARY_DIR}/fmilib_config.h"
    ) 
 
 -set(FMILIB_SHARED_SUBLIBS ${FMIXML_LIBRARIES} ${FMIZIP_LIBRARIES} ${FMICAPI_LIBRARIES} expat minizip zlib c99snprintf)
-+set(FMILIB_SHARED_SUBLIBS ${FMIXML_LIBRARIES} ${FMIZIP_LIBRARIES} ${FMICAPI_LIBRARIES} c99snprintf)
++set(FMILIB_SHARED_SUBLIBS ${FMIXML_LIBRARIES} ${FMIZIP_LIBRARIES} ${FMICAPI_LIBRARIES} minizip c99snprintf)
  set(FMILIB_SUBLIBS ${FMIIMPORT_LIBRARIES} ${JMUTIL_LIBRARIES} ${FMILIB_SHARED_SUBLIBS})
  set(FMILIB_SHARED_SRC ${FMIIMPORTSOURCE} ${JMUTILSOURCE} ${FMIIMPORTHEADERS})
 
@@ -35,16 +35,20 @@ index ddd3c1f..3bafac3 100644
  include_directories("${EXPAT_INCLUDE_DIRS}" "${FMILIB_THIRDPARTYLIBS}/FMI/" "${FMIXMLGENDIR}/FMI1" "${FMIXMLGENDIR}/FMI2")
 
 diff --git a/Config.cmake/fmizip.cmake b/Config.cmake/fmizip.cmake
-index 091fc4d..c53555f 100644
+index c046d47..50e82b3 100644
 --- a/Config.cmake/fmizip.cmake
 +++ b/Config.cmake/fmizip.cmake
-@@ -20,7 +20,8 @@ if(NOT FMIZIPDIR)
+@@ -20,7 +20,12 @@ if(NOT FMIZIPDIR)
 
      set(FMIZIP_LIBRARIES fmizip)
 
 -    add_subdirectory(Config.cmake/Minizip)
-+    find_package(minizip CONFIG REQUIRED)
-+    add_library(minizip ALIAS minizip::minizip)
++    add_library(minizip OBJECT
++      "${FMILIB_THIRDPARTYLIBS}/Minizip/minizip/miniunz.c"
++      "${FMILIB_THIRDPARTYLIBS}/Minizip/minizip/minizip.c"
++    )
++    find_package(unofficial-minizip CONFIG REQUIRED)
++    target_link_libraries(minizip PRIVATE unofficial::minizip::minizip)
 
  	include_directories("${FMIZIPDIR}/include" "${FMILIB_THIRDPARTYLIBS}/Minizip/minizip" "${FMILIB_THIRDPARTYLIBS}/FMI" "${FMILIB_THIRDPARTYLIBS}/Zlib/zlib-1.2.6" "${FMILibrary_BINARY_DIR}/zlib")
 
diff --git a/ports/fmilib/minizip.patch b/ports/fmilib/minizip.patch
@@ -0,0 +1,52 @@
+diff --git a/ThirdParty/Minizip/minizip/miniunz.c b/ThirdParty/Minizip/minizip/miniunz.c
+index 1931161..d7a8be1 100644
+--- a/ThirdParty/Minizip/minizip/miniunz.c
++++ b/ThirdParty/Minizip/minizip/miniunz.c
+@@ -45,6 +45,7 @@
+ #include <time.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#include <sys/stat.h>
+ #include <stdarg.h>
+
+ #ifdef _WIN32
+@@ -107,7 +108,7 @@ void change_file_date(filename,dosdate,tmu_date)
+   SetFileTime(hFile,&ftm,&ftLastAcc,&ftm);
+   CloseHandle(hFile);
+ #else
+-#ifdef unix || __APPLE__
++#if defined(unix) || defined(__APPLE__)
+   struct utimbuf ut;
+   struct tm newdate;
+   newdate.tm_sec = tmu_date.tm_sec;
+@@ -137,7 +138,7 @@ int mymkdir(dirname)
+     int ret=0;
+ #ifdef _WIN32
+     ret = _mkdir(dirname);
+-#elif unix
++#elif 1
+     ret = mkdir (dirname,0775);
+ #elif __APPLE__
+     ret = mkdir (dirname,0775);
+diff --git a/ThirdParty/Minizip/minizip/minizip.c b/ThirdParty/Minizip/minizip/minizip.c
+index e22f80d..548b6ca 100644
+--- a/ThirdParty/Minizip/minizip/minizip.c
++++ b/ThirdParty/Minizip/minizip/minizip.c
+@@ -101,7 +101,7 @@ uLong filetime(f, tmzip, dt)
+   return ret;
+ }
+ #else
+-#ifdef unix || __APPLE__
++#if defined(unix) || defined(__APPLE__)
+ uLong filetime(f, tmzip, dt)
+     char *f;               /* name of file to get info on */
+     tm_zip *tmzip;         /* return value: access, modific. and creation times */
+@@ -453,7 +453,7 @@ int minizip(argc,argv)
+                      }
+                      if( lastslash != NULL )
+                      {
+-                         savefilenameinzip = lastslash+1; // base filename follows last slash.
++                         savefilenameinzip = lastslash+1;
+                      }
+                  }
+
diff --git a/ports/fmilib/portfile.cmake b/ports/fmilib/portfile.cmake
@@ -8,13 +8,16 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         devendor-sublibs.diff
+        minizip.patch
         fix-mergestaticlibs.diff
         unofficial-export.diff
 )
 
-file(REMOVE RECURSE
+file(GLOB vendored_minizip "${SOURCE_PATH}/ThirdParty/Minizip/minizip/*")
+list(FILTER vendored_minizip EXCLUDE REGEX "/minizip.[ch]\$|/miniunz.[ch]\$")
+file(REMOVE_RECURSE
+    ${vendored_minizip}
     "${SOURCE_PATH}/ThirdParty/Expat"
-    "${SOURCE_PATH}/ThirdParty/Minizip"
     "${SOURCE_PATH}/ThirdParty/Zlib"
 )
 

diff --git a/ports/fmilib/unofficial-fmilib-config.cmake b/ports/fmilib/unofficial-fmilib-config.cmake
@@ -1,4 +1,4 @@
 include(CMakeFindDependencyMacro)
 find_dependency(expat CONFIG)
-find_dependency(minizip CONFIG)
+find_dependency(unofficial-minizip CONFIG)
 include("${CMAKE_CURRENT_LIST_DIR}/unofficial-fmilib-targets.cmake")
diff --git a/ports/fmilib/vcpkg.json b/ports/fmilib/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "fmilib",
   "version": "2.4.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "FMI library is intended as a foundation for applications interfacing FMUs (Functional Mockup Units) that follow FMI Standard. This version of the library supports FMI 1.0 and FMI2.0.",
   "homepage": "https://www.fmi-standard.org/",
   "license": "BSD-3-Clause",

diff --git a/ports/folly/fix-deps.patch b/ports/folly/fix-deps.patch
@@ -57,7 +57,7 @@ index 4b78e9f..ac83c99 100644
      thread
    REQUIRED
  )
-+set (Boost_LIBRARIES Boost::context Boost::filesystem Boost::program_options Boost::regex  Boost::system Boost::thread
++set (Boost_LIBRARIES Boost::boost Boost::context Boost::filesystem Boost::program_options Boost::regex  Boost::system Boost::thread
 +  )
  list(APPEND FOLLY_LINK_LIBRARIES ${Boost_LIBRARIES})
 -list(APPEND FOLLY_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIRS})

diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "folly",
   "version-string": "2022.10.31.00",
-  "port-version": 5,
+  "port-version": 6,
   "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows",
   "homepage": "https://github.com/facebook/folly",
   "license": "Apache-2.0",

diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake
@@ -4,12 +4,18 @@ vcpkg_download_distfile(GLIB_ARCHIVE
     FILENAME "glib-${VERSION}.tar.xz"
     SHA512 7ab8740925fa4ed2d860a35544c475ae905df5fa7fc0cc64ffa8c543df6073794e44c8ff39e3e1de1d677016ef9d27e9bc709d2505d13090faa8d6c47cd64bd0
 )
+vcpkg_download_distfile(GLIB_MR_3386
+    URLS "https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3386.diff"
+    FILENAME "glib-mr-3386.diff"
+    SHA512 cb67e8908a7cb6f945d019da1bf56f504b9c2131a832bcdfbdc61c973c89efd8e4380d5d67f83e229998da1e8579f3ff87b7695a3318eee9613d1ab1168bd0db
+)
 
 vcpkg_extract_source_archive(SOURCE_PATH
     ARCHIVE "${GLIB_ARCHIVE}"
     PATCHES
         use-libiconv-on-windows.patch
         libintl.patch
+        ${GLIB_MR_3386}
 )
 
 vcpkg_list(SET OPTIONS)

diff --git a/ports/glib/vcpkg.json b/ports/glib/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "glib",
   "version": "2.76.1",
+  "port-version": 1,
   "description": "Portable, general-purpose utility library.",
   "homepage": "https://developer.gnome.org/glib/",
   "license": "LGPL-2.1-or-later",

diff --git a/ports/gstreamer/vcpkg.json b/ports/gstreamer/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "gstreamer",
   "version": "1.20.5",
-  "port-version": 5,
+  "port-version": 6,
   "description": "GStreamer open-source multimedia framework core library",
   "homepage": "https://gstreamer.freedesktop.org/",
   "license": "LGPL-2.0-only",
@@ -312,6 +312,13 @@
         {
           "name": "ffmpeg",
           "default-features": false
+        },
+        {
+          "name": "gstreamer",
+          "default-features": false,
+          "features": [
+            "plugins-base"
+          ]
         }
       ]
     },

diff --git a/ports/gtkmm/portfile.cmake b/ports/gtkmm/portfile.cmake
@@ -1,7 +1,8 @@
+string(REGEX MATCH "^([0-9]*[.][0-9]*)" GTKMM_MAJOR_MINOR "${VERSION}")
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://ftp.gnome.org/pub/GNOME/sources/gtkmm/4.6/gtkmm-4.6.0.tar.xz"
-    FILENAME "gtkmm-4.6.0.tar.xz"
-    SHA512 d1040be44d133cfa016efc581b79c5303806d0d441b57dcc22bd84a05c3e7934f9b7b894e71d7f4a0be332daba3dd58ef558f58070b83bf8a9de7d1027d92199
+    URLS "https://ftp.gnome.org/pub/GNOME/sources/gtkmm/${GTKMM_MAJOR_MINOR}/gtkmm-${VERSION}.tar.xz"
+    FILENAME "gtkmm-${VERSION}.tar.xz"
+    SHA512 ee40cce37c34814884ffc06e614013d23fa31cac51ea9d98ea5689a08acc2ff58bb2ca80ba822d6fe3c0f3bdcb9ce2596ede3c05c69a702b524c4e38afc3d9ab
 )
 
 vcpkg_extract_source_archive(

diff --git a/ports/gtkmm/vcpkg.json b/ports/gtkmm/vcpkg.json
@@ -1,27 +1,16 @@
 {
   "name": "gtkmm",
-  "version": "4.6.0",
-  "port-version": 2,
+  "version": "4.10.0",
   "description": "gtkmm is the official C++ interface for the popular GUI library GTK+.",
   "homepage": "https://www.gtkmm.org/",
   "license": "LGPL-3.0-or-later",
   "supports": "!uwp",
   "dependencies": [
-    "atk",
-    "atkmm",
-    "cairo",
     "cairomm",
     "gdk-pixbuf",
-    "gettext",
-    "glib",
-    {
-      "name": "glib",
-      "host": true
-    },
     "glibmm",
     "gtk",
     "libepoxy",
-    "pango",
     "pangomm",
     {
       "name": "vcpkg-tool-meson",

diff --git a/ports/gtl/portfile.cmake b/ports/gtl/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO greg7mdp/gtl
-    REF v1.1.5
-    SHA512 87666a975d3e355d24463f31bd7fe9796eb9e90b557b678807432fc3797a2b501e76acefae490cbaa503f993efe7f44c04a7cc8bd48662c38293c90741c8f7df
+    REF "v${VERSION}"
+    SHA512 c6ab1ae6bfdee7f4fa49ab6ea27138cfe7159b5b0fb918a65f27cc7fff74e632f2567508453d1767bc406ac6286ff3a12edeffd185b5b2acf0ef304d4175b86e
     HEAD_REF main
 )
 

diff --git a/ports/gtl/vcpkg.json b/ports/gtl/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "gtl",
-  "version": "1.1.5",
+  "version": "1.1.8",
   "description": "Greg's Template Library of useful classes.",
   "homepage": "https://github.com/greg7mdp/gtl",
   "license": "Apache-2.0",