[pull] master from microsoft:master

ports/fast-float/portfile.cmake

@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO fastfloat/fast_float
     REF "v${VERSION}"
-    SHA512 37280efebea7aa33cc25c8d8375b6c9456a8025d29d618abb5aac580c025097a6110ec3a913d1504fd9af1df43e434bc5411e07e38dd66c12491f3edc7374fff
+    SHA512 43c21f8dbcb4524fb678b5d928d6edeefc84b6e356221696ffe0f3e8d49e97aa2c0325ca116541ec9ae2cec7d268d6720a49999e8daad52a5d7bf34377c970da
     HEAD_REF master
 )
 

ports/fast-float/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "fast-float",
-  "version": "6.0.0",
+  "version": "6.1.0",
   "description": "Fast and exact implementation of the C++ from_chars functions for float and double types: 4x faster than strtod",
   "homepage": "https://github.com/fastfloat/fast_float",
   "license": "Apache-2.0 OR BSL-1.0 OR MIT",

ports/ffmpeg/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "ffmpeg",
   "version": "6.1.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": [
     "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.",
     "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations."
@@ -510,7 +510,7 @@
           "name": "ffmpeg",
           "default-features": false,
           "features": [
-            "nonfree"
+            "version3"
           ]
         },
         "openssl"

ports/fplus/portfile.cmake

@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Dobiasd/FunctionalPlus
     REF "v${VERSION}"
-    SHA512 399ff3012efd49e8617a0ae275e72bf13e87380e830f6ceb56f85fcda948d4ef252c5aa48f48f0a4a015874015d6e8ff442ac9395d523b4c946a01c17f2bd1b9
+    SHA512 025216c9b054b581d2be2c6bf3a9ebf906cce436875d3f7246fdd85f06fe0f29ece9b4dbe3f25228cd329cce36e95aa73fc406fb1bbdd0ee1a6bc30bf95ecf76
     HEAD_REF master
 )
 

ports/fplus/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "fplus",
-  "version": "0.2.22",
+  "version": "0.2.23",
   "description": "Functional Programming Library for C++. Write concise and readable C++ code",
   "homepage": "https://github.com/Dobiasd/FunctionalPlus",
   "license": "BSL-1.0",

ports/frugally-deep/portfile.cmake

@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Dobiasd/frugally-deep
     REF "v${VERSION}"
-    SHA512 ec31a174a1a13d572d7cfce4a1773964cc185c1acaf91250bc8038cd9eba77f864fe9fd592a39648de8c620f02375142344f70c9663613ab1b406df1c68e6cb1
+    SHA512 9695e61f5c0774d34a77153750a42597c0b63b7da1db8aaf421f540a1db584fd1962bc059bf93e13a28140f4cdfc0b64681ac6294e2269d853e3f07ccea7b506
     HEAD_REF master
 )
 

ports/frugally-deep/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "frugally-deep",
-  "version-semver": "0.15.30",
+  "version-semver": "0.15.31",
   "description": "Header-only library for using Keras models in C++.",
   "homepage": "https://github.com/Dobiasd/frugally-deep",
   "license": "MIT",

ports/giflib/exports.def

@@ -42,7 +42,7 @@ EXPORTS
     GifAsciiTable8x8 @41 DATA
     GifBitSize @42
     GifDrawBox @43
-    ; needs strtok_r: GifDrawBoxedText8x8 @44
+    GifDrawBoxedText8x8 @44
     GifDrawRectangle @45
     GifDrawText8x8 @46
     GifErrorString @47

ports/giflib/msvc.diff

@@ -0,0 +1,89 @@
+diff --git a/dgif_lib.c b/dgif_lib.c
+index cbcf23f..15dee84 100644
+--- a/dgif_lib.c
++++ b/dgif_lib.c
+@@ -57,7 +57,7 @@ GifFileType *DGifOpenFileName(const char *FileName, int *Error) {
+ 	int FileHandle;
+ 	GifFileType *GifFile;
+
+-	if ((FileHandle = open(FileName, O_RDONLY)) == -1) {
++	if ((FileHandle = _open(FileName, O_RDONLY)) == -1) {
+ 		if (Error != NULL) {
+ 			*Error = D_GIF_ERR_OPEN_FAILED;
+ 		}
+@@ -84,7 +84,7 @@ GifFileType *DGifOpenFileHandle(int FileHandle, int *Error) {
+ 		if (Error != NULL) {
+ 			*Error = D_GIF_ERR_NOT_ENOUGH_MEM;
+ 		}
+-		(void)close(FileHandle);
++		(void)_close(FileHandle);
+ 		return NULL;
+ 	}
+
+@@ -99,7 +99,7 @@ GifFileType *DGifOpenFileHandle(int FileHandle, int *Error) {
+ 		if (Error != NULL) {
+ 			*Error = D_GIF_ERR_NOT_ENOUGH_MEM;
+ 		}
+-		(void)close(FileHandle);
++		(void)_close(FileHandle);
+ 		free((char *)GifFile);
+ 		return NULL;
+ 	}
+@@ -110,7 +110,7 @@ GifFileType *DGifOpenFileHandle(int FileHandle, int *Error) {
+ 	_setmode(FileHandle, O_BINARY); /* Make sure it is in binary mode. */
+ #endif                                  /* _WIN32 */
+
+-	f = fdopen(FileHandle, "rb"); /* Make it into a stream: */
++	f = _fdopen(FileHandle, "rb"); /* Make it into a stream: */
+
+ 	/*@-mustfreeonly@*/
+ 	GifFile->Private = (void *)Private;
+diff --git a/egif_lib.c b/egif_lib.c
+index 1526868..6644eed 100644
+--- a/egif_lib.c
++++ b/egif_lib.c
+@@ -64,10 +64,10 @@ GifFileType *EGifOpenFileName(const char *FileName, const bool TestExistence,
+ 	GifFileType *GifFile;
+
+ 	if (TestExistence) {
+-		FileHandle = open(FileName, O_WRONLY | O_CREAT | O_EXCL,
++		FileHandle = _open(FileName, O_WRONLY | O_CREAT | O_EXCL,
+ 		                  S_IREAD | S_IWRITE);
+ 	} else {
+-		FileHandle = open(FileName, O_WRONLY | O_CREAT | O_TRUNC,
++		FileHandle = _open(FileName, O_WRONLY | O_CREAT | O_TRUNC,
+ 		                  S_IREAD | S_IWRITE);
+ 	}
+
+@@ -79,7 +79,7 @@ GifFileType *EGifOpenFileName(const char *FileName, const bool TestExistence,
+ 	}
+ 	GifFile = EGifOpenFileHandle(FileHandle, Error);
+ 	if (GifFile == (GifFileType *)NULL) {
+-		(void)close(FileHandle);
++		(void)_close(FileHandle);
+ 	}
+ 	return GifFile;
+ }
+@@ -125,7 +125,7 @@ GifFileType *EGifOpenFileHandle(const int FileHandle, int *Error) {
+ 	_setmode(FileHandle, O_BINARY); /* Make sure it is in binary mode. */
+ #endif                                  /* _WIN32 */
+
+-	f = fdopen(FileHandle, "wb"); /* Make it into a stream: */
++	f = _fdopen(FileHandle, "wb"); /* Make it into a stream: */
+
+ 	GifFile->Private = (void *)Private;
+ 	Private->FileHandle = FileHandle;
+diff --git a/gif_font.c b/gif_font.c
+index 75f9731..c215795 100644
+--- a/gif_font.c
++++ b/gif_font.c
+@@ -200,6 +200,9 @@ void GifDrawRectangle(SavedImage *Image, const int x, const int y, const int w,
+ 	}
+ }
+
++#ifdef _MSC_VER
++#  define strtok_r strtok_s
++#endif
+ void GifDrawBoxedText8x8(SavedImage *Image, const int x, const int y,
+                          const char *legend, const int border, const int bg,
+                          const int fg) {

ports/giflib/portfile.cmake

@@ -1,18 +1,14 @@
-set(GIFLIB_VERSION 5.2.1)
-
 set(EXTRA_PATCHES "")
-if (VCPKG_TARGET_IS_WINDOWS)
-    list(APPEND EXTRA_PATCHES fix-compile-error.patch)
+if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+    list(APPEND EXTRA_PATCHES msvc.diff)
 endif()
 
 vcpkg_from_sourceforge(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO "giflib"
-    FILENAME "giflib-${GIFLIB_VERSION}.tar.gz"
-    SHA512 4550e53c21cb1191a4581e363fc9d0610da53f7898ca8320f0d3ef6711e76bdda2609c2df15dc94c45e28bff8de441f1227ec2da7ea827cb3c0405af4faa4736
+    FILENAME "giflib-${VERSION}.tar.gz"
+    SHA512 0865ab2b1904fa14640c655fdb14bb54244ad18a66e358565c00287875d00912343f9be8bfac7658cc0146200d626f7ec9160d7a339f20ba3be6b9941d73975f
     PATCHES
-        msvc-guard-unistd-h.patch
-        disable-GifDrawBoxedText8x8-win32.patch # MSVC doesn't have strtok_r
         ${EXTRA_PATCHES}
 )
 

ports/giflib/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "giflib",
-  "version": "5.2.1",
-  "port-version": 3,
+  "version": "5.2.2",
   "description": "A library for reading and writing gif images.",
   "homepage": "https://sourceforge.net/projects/giflib/",
   "license": "MIT",

ports/glib-networking/portfile.cmake

@@ -0,0 +1,64 @@
+set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
+vcpkg_from_gitlab(
+    GITLAB_URL https://gitlab.gnome.org
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO GNOME/glib-networking
+    REF "${VERSION}"
+    SHA512 "35b6b05afab29da4f4d54f559ded3cc6a16376f188afdb72689b7d9bcba71b9963317bcbd1101327137ae31ee51e25438f9bfa267e23d6076706a64c3594cbb5"
+    HEAD_REF main
+)
+
+vcpkg_list(SET FEATURE_OPTIONS)
+if (gnutls IN_LIST FEATURES)
+    list(APPEND FEATURE_OPTIONS -Dgnutls=enabled)
+else()
+    list(APPEND FEATURE_OPTIONS -Dgnutls=disabled)
+endif()
+
+if (openssl IN_LIST FEATURES)
+    list(APPEND FEATURE_OPTIONS -Dopenssl=enabled)
+else()
+    list(APPEND FEATURE_OPTIONS -Dopenssl=disabled)
+endif()
+
+if (libproxy IN_LIST FEATURES)
+    list(APPEND FEATURE_OPTIONS -Dlibproxy=enabled)
+else()
+    list(APPEND FEATURE_OPTIONS -Dlibproxy=disabled)
+endif()
+
+if (environment-proxy IN_LIST FEATURES)
+    list(APPEND FEATURE_OPTIONS -Denvironment_proxy=enabled)
+else()
+    list(APPEND FEATURE_OPTIONS -Denvironment_proxy=disabled)
+endif()
+
+vcpkg_configure_meson(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        ${FEATURE_OPTIONS}
+        -Dgnome_proxy=disabled
+    ADDITIONAL_BINARIES
+        "gio-querymodules = '${CURRENT_HOST_INSTALLED_DIR}/tools/glib/gio-querymodules${CMAKE_EXECUTABLE_SUFFIX}'"
+)
+
+vcpkg_install_meson()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/gio/modules/pkgconfig")
+file(GLOB MODULE_FILES "${CURRENT_PACKAGES_DIR}/lib/gio/modules/*")
+file(COPY ${MODULE_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/plugins/${PORT}")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/gio/modules/pkgconfig")
+file(GLOB MODULE_DEBUG_FILES "${CURRENT_PACKAGES_DIR}/debug/lib/gio/modules/*")
+file(COPY ${MODULE_DEBUG_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/plugins/${PORT}")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib")
+
+if(libproxy IN_LIST FEATURES)
+    vcpkg_copy_tools(TOOL_NAMES glib-pacrunner SEARCH_DIR "${CURRENT_PACKAGES_DIR}/libexec")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/libexec" "${CURRENT_PACKAGES_DIR}/debug/libexec")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/dbus-1/services/org.gtk.GLib.PACRunner.service" "${CURRENT_PACKAGES_DIR}/libexec/glib-pacrunner" "${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}/glib-pacrunner")
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")

ports/glib-networking/usage

@@ -0,0 +1 @@
+glib-networking is a gio module, you should set GIO_MODULE_DIR to the location of dynamic libraries.