microsoft · BillyONeal · Dec 2, 2021 · Nov 19, 2021 · Nov 19, 2021 · Nov 19, 2021
diff --git a/ports/atk/vcpkg.json b/ports/atk/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "atk",
   "version": "2.36.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "GNOME Accessibility Toolkit",
   "homepage": "https://developer.gnome.org/atk/",
   "supports": "!arm",
@@ -11,6 +11,10 @@
     {
       "name": "glib",
       "host": true
+    },
+    {
+      "name": "vcpkg-tool-meson",
+      "host": true
     }
   ]
 }
diff --git a/ports/atkmm/vcpkg.json b/ports/atkmm/vcpkg.json
@@ -1,13 +1,17 @@
 {
   "name": "atkmm",
   "version": "2.36.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "atkmm is the official C++ interface for the ATK accessibility toolkit library. It may be used, for instance, by user interfaces implemented with gtkmm.",
   "homepage": "https://www.gtkmm.org",
   "dependencies": [
     "atk",
     "gettext",
     "glib",
-    "glibmm"
+    "glibmm",
+    {
+      "name": "vcpkg-tool-meson",
+      "host": true
+    }
   ]
 }
diff --git a/ports/cairo/portfile.cmake b/ports/cairo/portfile.cmake
@@ -33,7 +33,7 @@ else()
     list(APPEND OPTIONS -Dxlib=disabled)
 endif()
 list(APPEND OPTIONS -Dxcb=disabled)
-list(APPEND OPTIONS -Dxlib-xcb=disabled)
+#list(APPEND OPTIONS -Dxlib-xcb=disabled) don't forget this option with the next update!
 
 if("gobject" IN_LIST FEATURES)
     if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
@@ -55,7 +55,6 @@ vcpkg_configure_meson(
         -Dzlib=enabled
         -Dpng=enabled
         -Dspectre=auto
-        -Dsymbol-lookup=disabled
         -Dgtk2-utils=disabled
 )
 vcpkg_install_meson()

diff --git a/ports/cairo/vcpkg.json b/ports/cairo/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "cairo",
   "version": "1.17.4",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.",
   "homepage": "https://cairographics.org",
   "dependencies": [
@@ -11,6 +11,10 @@
     "lzo",
     "pixman",
     "pthread",
+    {
+      "name": "vcpkg-tool-meson",
+      "host": true
+    },
     "zlib"
   ],
   "default-features": [

diff --git a/ports/cairomm/vcpkg.json b/ports/cairomm/vcpkg.json
@@ -1,10 +1,15 @@
 {
   "name": "cairomm",
   "version": "1.16.0",
+  "port-version": 1,
   "description": "A C++ wrapper for the cairo graphics library",
   "homepage": "https://www.cairographics.org",
   "dependencies": [
     "cairo",
-    "libsigcpp"
+    "libsigcpp",
+    {
+      "name": "vcpkg-tool-meson",
+      "host": true
+    }
   ]
 }
diff --git a/ports/dav1d/vcpkg.json b/ports/dav1d/vcpkg.json
@@ -1,11 +1,14 @@
 {
   "name": "dav1d",
   "version-semver": "0.8.2",
-  "port-version": 1,
+  "port-version": 2,
   "description": "dav1d is a new open-source AV1 decoder developed by the VideoLAN and FFmpeg communities and sponsored by the Alliance for Open Media.",
   "homepage": "https://code.videolan.org/videolan/dav1d",
   "supports": "!(uwp | arm | x86)",
   "dependencies": [
-    "tool-meson"
+    {
+      "name": "vcpkg-tool-meson",
+      "host": true
+    }
   ]
 }
diff --git a/ports/fontconfig/vcpkg.json b/ports/fontconfig/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "fontconfig",
   "version": "2.13.94",
-  "port-version": 3,
+  "port-version": 4,
   "description": "Library for configuring and customizing font access.",
   "homepage": "https://www.freedesktop.org/wiki/Software/fontconfig",
   "dependencies": [
@@ -15,6 +15,10 @@
       "name": "libuuid",
       "platform": "!windows & !osx & !mingw"
     },
-    "pthread"
+    "pthread",
+    {
+      "name": "vcpkg-tool-meson",
+      "host": true
+    }
   ]
 }
diff --git a/ports/fribidi/vcpkg.json b/ports/fribidi/vcpkg.json
@@ -1,9 +1,13 @@
 {
   "name": "fribidi",
   "version": "1.0.11",
+  "port-version": 1,
   "description": "GNU FriBidi is an implementation of the Unicode Bidirectional Algorithm (bidi)",
   "supports": "!(uwp | arm)",
   "dependencies": [
-    "tool-meson"
+    {
+      "name": "vcpkg-tool-meson",
+      "host": true
+    }
   ]
 }
diff --git a/ports/gdk-pixbuf/vcpkg.json b/ports/gdk-pixbuf/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "gdk-pixbuf",
   "version": "2.42.2",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Image loading library.",
   "homepage": "https://developer.gnome.org/gdk-pixbuf/",
   "dependencies": [
@@ -13,6 +13,10 @@
     },
     "libpng",
     "tiff",
+    {
+      "name": "vcpkg-tool-meson",
+      "host": true
+    },
     "zlib"
   ]
 }
diff --git a/ports/glib/vcpkg.json b/ports/glib/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "glib",
   "version": "2.70.1",
+  "port-version": 1,
   "description": "Portable, general-purpose utility library.",
   "homepage": "https://developer.gnome.org/glib/",
   "supports": "!uwp & !(windows & static)",
@@ -11,7 +12,7 @@
     "libiconv",
     "pcre",
     {
-      "name": "tool-meson",
+      "name": "vcpkg-tool-meson",
       "host": true
     },
     "zlib"

diff --git a/ports/glibmm/vcpkg.json b/ports/glibmm/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "glibmm",
   "version": "2.68.1",
+  "port-version": 1,
   "description": "This is glibmm, a C++ API for parts of glib that are useful for C++.",
   "homepage": "https://www.gtkmm.org.",
   "supports": "!uwp",
@@ -11,6 +12,10 @@
     "libiconv",
     "libsigcpp-3",
     "pcre",
+    {
+      "name": "vcpkg-tool-meson",
+      "host": true
+    },
     "zlib"
   ]
 }
diff --git a/ports/graphene/vcpkg.json b/ports/graphene/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "graphene",
   "version": "1.10.2",
-  "port-version": 1,
+  "port-version": 2,
   "description": "A thin layer of types for graphic libraries.",
   "homepage": "https://www.gtk.org/",
   "supports": "!(arm & windows)",
@@ -11,6 +11,10 @@
     {
       "name": "glib",
       "host": true
+    },
+    {
+      "name": "vcpkg-tool-meson",
+      "host": true
     }
   ]
 }
diff --git a/ports/gst-rtsp-server/vcpkg.json b/ports/gst-rtsp-server/vcpkg.json
@@ -1,8 +1,13 @@
 {
   "name": "gst-rtsp-server",
   "version": "1.19.2",
+  "port-version": 1,
   "description": "gst-rtsp-server is a library on top of GStreamer for building an RTSP server",
   "dependencies": [
-    "gstreamer"
+    "gstreamer",
+    {
+      "name": "vcpkg-tool-meson",
+      "host": true
+    }
   ]
 }
diff --git a/ports/gstreamer/portfile.cmake b/ports/gstreamer/portfile.cmake
@@ -136,7 +136,6 @@ vcpkg_configure_meson(
         -Dgstreamer:tests=disabled
         -Dgstreamer:benchmarks=disabled
         -Dgstreamer:tools=disabled
-        -Dgstreamer:gtk_doc=disabled
         -Dgstreamer:introspection=disabled
         -Dgstreamer:nls=disabled
         # gst-plugins-base

diff --git a/ports/gstreamer/vcpkg.json b/ports/gstreamer/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "gstreamer",
   "version": "1.19.2",
-  "port-version": 1,
+  "port-version": 2,
   "description": "GStreamer open-source multimedia framework core library",
   "homepage": "https://gstreamer.freedesktop.org/",
   "license": "LGPL-2.0",
@@ -34,7 +34,10 @@
       "platform": "windows | osx"
     },
     "openssl",
-    "tool-meson",
+    {
+      "name": "vcpkg-tool-meson",
+      "host": true
+    },
     {
       "name": "yasm-tool-helper",
       "platform": "windows"

diff --git a/ports/gtk/portfile.cmake b/ports/gtk/portfile.cmake
@@ -48,13 +48,10 @@ vcpkg_configure_meson(
         -Dgtk_doc=false
         -Dman-pages=false
         -Dintrospection=disabled
-        -Dsassc=enabled             # Rebuild themes using sassc
         -Dmedia-ffmpeg=disabled     # Build the ffmpeg media backend
         -Dmedia-gstreamer=disabled  # Build the gstreamer media backend
         -Dprint-cups=disabled       # Build the cups print backend
-        -Dprint-cloudprint=disabled # Build the cloudprint print backend
         -Dvulkan=disabled           # Enable support for the Vulkan graphics API
-        -Dxinerama=disabled         # Enable support for the X11 Xinerama extension
         -Dcloudproviders=disabled   # Enable the cloudproviders support
         -Dsysprof=disabled          # include tracing support for sysprof
         -Dtracker=disabled          # Enable Tracker3 filechooser search

diff --git a/ports/gtk/vcpkg.json b/ports/gtk/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "gtk",
   "version": "4.4.0",
+  "port-version": 1,
   "description": "Portable library for creating graphical user interfaces.",
   "homepage": "https://www.gtk.org/",
   "dependencies": [
@@ -30,6 +31,10 @@
     "graphene",
     "libepoxy",
     "pango",
-    "sassc"
+    "sassc",
+    {
+      "name": "vcpkg-tool-meson",
+      "host": true
+    }
   ]
 }
diff --git a/ports/gtkmm/vcpkg.json b/ports/gtkmm/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "gtkmm",
   "version": "4.0.1",
+  "port-version": 1,
   "description": "gtkmm is the official C++ interface for the popular GUI library GTK+.",
   "homepage": "https://www.gtkmm.org/",
   "supports": "!uwp",
@@ -20,6 +21,10 @@
     "gtk",
     "libepoxy",
     "pango",
-    "pangomm"
+    "pangomm",
+    {
+      "name": "vcpkg-tool-meson",
+      "host": true
+    }
   ]
 }
diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "harfbuzz",
   "version-semver": "3.0.0",
+  "port-version": 1,
   "description": "HarfBuzz OpenType text shaping engine",
   "homepage": "https://github.com/harfbuzz/harfbuzz",
   "dependencies": [
@@ -11,6 +12,10 @@
     {
       "name": "gettext",
       "platform": "osx"
+    },
+    {
+      "name": "vcpkg-tool-meson",
+      "host": true
     }
   ],
   "features": {

diff --git a/ports/libepoxy/vcpkg.json b/ports/libepoxy/vcpkg.json
@@ -1,9 +1,13 @@
 {
   "name": "libepoxy",
   "version-semver": "1.5.9",
+  "port-version": 1,
   "description": "Epoxy is a library for handling OpenGL function pointer management for you",
   "homepage": "https://github.com/anholt/libepoxy",
   "dependencies": [
-    "tool-meson"
+    {
+      "name": "vcpkg-tool-meson",
+      "host": true
+    }
   ]
 }
diff --git a/ports/libgxps/vcpkg.json b/ports/libgxps/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libgxps",
   "version": "0.3.2",
+  "port-version": 1,
   "description": "libgxps is a GObject based library for handling and rendering XPS documents.",
   "homepage": "https://wiki.gnome.org/Projects/libgxps",
   "dependencies": [
@@ -12,6 +13,9 @@
     "libpng",
     "libxslt",
     "tiff",
-    "tool-meson"
+    {
+      "name": "vcpkg-tool-meson",
+      "host": true
+    }
   ]
 }
diff --git a/ports/libsecret/vcpkg.json b/ports/libsecret/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libsecret",
   "version": "0.20.4",
+  "port-version": 1,
   "description": "libsecret is a GObject-based library for accessing the Secret Service API of the freedesktop.org project, a cross-desktop effort to access passwords, tokens and other types of secrets. libsecret provides a convenient wrapper for these methods so consumers do not have to call the low-level DBus methods.",
   "homepage": "https://gitlab.gnome.org/GNOME/libsecret/",
   "license": "LGPL-2.1-or-later",
@@ -11,6 +12,10 @@
       "name": "glib",
       "host": true
     },
-    "libgcrypt"
+    "libgcrypt",
+    {
+      "name": "vcpkg-tool-meson",
+      "host": true
+    }
   ]
 }