From 163065a3522ec540c7ce625b88203c6f0251b7c7 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 3 Dec 2021 00:48:34 +0100 Subject: [PATCH] Update meson to 0.60.2 (#21542) * update meson to 0.60.1 * add port vcpkg-tool-meson for consistency deprecate usage of tool-meson * [skip actions] make every port using meson depend on vcpkg-tool-meson (except pkgconf for now.) * fix subtle bugs in vcpkg_find_acquire_program make the port install meson if the system does not provide it. * make pkgconf depend on meson * restore old vcpkg_find_acquire_program behavior for versioning * Update ports/gstreamer/vcpkg.json remove duplicated dependency * remove invalid option in glib * [skip actions] fix ci failures? * remove invalid option in gstreamer * try without cmake * get more logs from meson configure. * update glib to 2.70.1 * fix typo * fix pc file of flac * update meson to 0.60.2 * try the patch from the other pr. * patch meson ..... * version stuff * fix port version * fix gstreamer version * remove version * format-manifest * version stuff * format manifest again * revert version stuff * remove outdated gtk options * version stuff * pango version stuff * correct baseline lost in merge * Fix fontconfig version db Co-authored-by: Billy Robert O'Neal III --- ports/atk/vcpkg.json | 6 +- ports/atkmm/vcpkg.json | 8 ++- ports/cairo/portfile.cmake | 3 +- ports/cairo/vcpkg.json | 6 +- ports/cairomm/vcpkg.json | 7 +- ports/dav1d/vcpkg.json | 7 +- ports/fontconfig/vcpkg.json | 8 ++- ports/fribidi/vcpkg.json | 6 +- ports/gdk-pixbuf/vcpkg.json | 6 +- ports/glib/vcpkg.json | 3 +- ports/glibmm/vcpkg.json | 5 ++ ports/graphene/vcpkg.json | 6 +- ports/gst-rtsp-server/vcpkg.json | 7 +- ports/gstreamer/portfile.cmake | 1 - ports/gstreamer/vcpkg.json | 7 +- ports/gtk/portfile.cmake | 3 - ports/gtk/vcpkg.json | 7 +- ports/gtkmm/vcpkg.json | 7 +- ports/harfbuzz/vcpkg.json | 5 ++ ports/libepoxy/vcpkg.json | 6 +- ports/libgxps/vcpkg.json | 6 +- ports/libsecret/vcpkg.json | 7 +- ports/libxmlpp/vcpkg.json | 8 ++- ports/mesa/vcpkg.json | 6 +- ports/munit/vcpkg.json | 7 +- ports/openh264/vcpkg.json | 7 +- ports/pango/vcpkg.json | 5 ++ ports/pangomm/vcpkg.json | 7 +- ports/pistache/vcpkg.json | 8 ++- ports/pixman/vcpkg.json | 6 +- ports/pkgconf/vcpkg.json | 9 ++- ports/tomlplusplus/vcpkg.json | 6 +- ports/tool-meson/portfile.cmake | 5 +- ports/tool-meson/vcpkg.json | 7 +- ports/vcpkg-tool-meson/meson-intl.patch | 14 ++++ ports/vcpkg-tool-meson/portfile.cmake | 60 +++++++++++++++++ ports/vcpkg-tool-meson/vcpkg.json | 7 ++ scripts/cmake/vcpkg_configure_meson.cmake | 8 ++- .../cmake/vcpkg_find_acquire_program.cmake | 36 ++++++----- versions/a-/atk.json | 5 ++ versions/a-/atkmm.json | 5 ++ versions/baseline.json | 64 ++++++++++--------- versions/c-/cairo.json | 5 ++ versions/c-/cairomm.json | 5 ++ versions/d-/dav1d.json | 5 ++ versions/f-/fontconfig.json | 5 ++ versions/f-/fribidi.json | 5 ++ versions/g-/gdk-pixbuf.json | 5 ++ versions/g-/glib.json | 5 ++ versions/g-/glibmm.json | 5 ++ versions/g-/graphene.json | 5 ++ versions/g-/gst-rtsp-server.json | 5 ++ versions/g-/gstreamer.json | 5 ++ versions/g-/gtk.json | 5 ++ versions/g-/gtkmm.json | 5 ++ versions/h-/harfbuzz.json | 5 ++ versions/l-/libepoxy.json | 5 ++ versions/l-/libgxps.json | 5 ++ versions/l-/libsecret.json | 5 ++ versions/l-/libxmlpp.json | 5 ++ versions/m-/mesa.json | 5 ++ versions/m-/munit.json | 5 ++ versions/o-/openh264.json | 5 ++ versions/p-/pango.json | 5 ++ versions/p-/pangomm.json | 5 ++ versions/p-/pistache.json | 5 ++ versions/p-/pixman.json | 5 ++ versions/p-/pkgconf.json | 5 ++ versions/t-/tomlplusplus.json | 5 ++ versions/t-/tool-meson.json | 5 ++ versions/v-/vcpkg-tool-meson.json | 9 +++ 71 files changed, 462 insertions(+), 94 deletions(-) create mode 100644 ports/vcpkg-tool-meson/meson-intl.patch create mode 100644 ports/vcpkg-tool-meson/portfile.cmake create mode 100644 ports/vcpkg-tool-meson/vcpkg.json create mode 100644 versions/v-/vcpkg-tool-meson.json diff --git a/ports/atk/vcpkg.json b/ports/atk/vcpkg.json index d0a2e1f735..2c7b4360ab 100644 --- 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 index c173ce9cee..ac6b39011e 100644 --- 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 index 61a7108b17..64ec99418e 100644 --- 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 index e7de197c48..4170587c5a 100644 --- 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 index d760825a0e..b1f937ba6c 100644 --- 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 index aa63b1a8ce..7863c3c4de 100644 --- 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 index a383d2c24e..4c84b6a6ca 100644 --- 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 index 486571ca17..8044c4f93c 100644 --- 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 index ca65da57a9..45a085d52b 100644 --- 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 index 0afb22048d..15e16ec920 100644 --- 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 index feb01216f9..d028b50e30 100644 --- 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 index 8849b4d42d..f34bcb7996 100644 --- 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 index f9f495c64b..cd58d37f02 100644 --- 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 index 20d94fef78..6739f0bddd 100644 --- 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 index d6d9848179..ca0ed44eb1 100644 --- 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 index 63cb02230f..3583b051cc 100644 --- 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 index d045461352..c34f28d3be 100644 --- 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 index f394a6c800..d97ae011f9 100644 --- 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 index 13207c7228..58ccedd5f5 100644 --- 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 index b786ce4e4c..a28f326718 100644 --- 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 index b74fcc9eaa..e052c37d9b 100644 --- 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 index 1fbcf7b7c5..3c57811cce 100644 --- 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 + } ] } diff --git a/ports/libxmlpp/vcpkg.json b/ports/libxmlpp/vcpkg.json index c5f74dfbff..ff1b69a481 100644 --- a/ports/libxmlpp/vcpkg.json +++ b/ports/libxmlpp/vcpkg.json @@ -1,11 +1,15 @@ { "name": "libxmlpp", "version": "5.0.0", - "port-version": 1, + "port-version": 2, "description": "a C++ wrapper for the libxml XML parser library.", "supports": "!(windows & static)", "dependencies": [ "glibmm", - "libxml2" + "libxml2", + { + "name": "vcpkg-tool-meson", + "host": true + } ] } diff --git a/ports/mesa/vcpkg.json b/ports/mesa/vcpkg.json index 2030dfe0e4..3063933424 100644 --- a/ports/mesa/vcpkg.json +++ b/ports/mesa/vcpkg.json @@ -1,11 +1,15 @@ { "name": "mesa", "version": "21.2.0", + "port-version": 1, "description": "Mesa - The 3D Graphics Library", "homepage": "https://www.mesa3d.org/", "supports": "!(windows & arm)", "dependencies": [ - "tool-meson", + { + "name": "vcpkg-tool-meson", + "host": true + }, "zlib", "zstd" ], diff --git a/ports/munit/vcpkg.json b/ports/munit/vcpkg.json index a729d1df72..63c511f315 100644 --- a/ports/munit/vcpkg.json +++ b/ports/munit/vcpkg.json @@ -1,11 +1,14 @@ { "name": "munit", "version-string": "2019-04-06", - "port-version": 3, + "port-version": 4, "description": "A small but full-featured unit testing framework for C", "homepage": "https://github.com/nemequ/munit", "supports": "!(arm | arm64 | uwp)", "dependencies": [ - "tool-meson" + { + "name": "vcpkg-tool-meson", + "host": true + } ] } diff --git a/ports/openh264/vcpkg.json b/ports/openh264/vcpkg.json index f05ee09782..23f7be6b01 100644 --- a/ports/openh264/vcpkg.json +++ b/ports/openh264/vcpkg.json @@ -1,11 +1,14 @@ { "name": "openh264", "version-date": "2021-03-16", - "port-version": 2, + "port-version": 3, "description": "OpenH264 is a codec library which supports H.264 encoding and decoding. It is suitable for use in real time applications such as WebRTC.", "homepage": "https://www.openh264.org/", "supports": "!uwp", "dependencies": [ - "tool-meson" + { + "name": "vcpkg-tool-meson", + "host": true + } ] } diff --git a/ports/pango/vcpkg.json b/ports/pango/vcpkg.json index 07b7c83113..a5416fba8f 100644 --- a/ports/pango/vcpkg.json +++ b/ports/pango/vcpkg.json @@ -1,6 +1,7 @@ { "name": "pango", "version": "1.48.10", + "port-version": 1, "description": "Text and font handling library.", "homepage": "https://ftp.gnome.org/pub/GNOME/sources/pango/", "dependencies": [ @@ -26,6 +27,10 @@ "coretext" ], "platform": "osx" + }, + { + "name": "vcpkg-tool-meson", + "host": true } ] } diff --git a/ports/pangomm/vcpkg.json b/ports/pangomm/vcpkg.json index f0e36aa4eb..96b24310e5 100644 --- a/ports/pangomm/vcpkg.json +++ b/ports/pangomm/vcpkg.json @@ -1,6 +1,7 @@ { "name": "pangomm", "version": "2.48.1", + "port-version": 1, "description": "pangomm is the official C++ interface for the Pango font layout library. See, for instance, the Pango::Layout class.", "homepage": "https://ftp.gnome.org/pub/GNOME/sources/pangomm", "dependencies": [ @@ -16,6 +17,10 @@ }, "glibmm", "harfbuzz", - "pango" + "pango", + { + "name": "vcpkg-tool-meson", + "host": true + } ] } diff --git a/ports/pistache/vcpkg.json b/ports/pistache/vcpkg.json index d627fc301c..fb464a5a10 100644 --- a/ports/pistache/vcpkg.json +++ b/ports/pistache/vcpkg.json @@ -1,11 +1,15 @@ { "name": "pistache", "version-date": "2021-03-31", - "port-version": 2, + "port-version": 3, "description": "Pistache is a modern and elegant HTTP and REST framework for C++. It is entirely written in pure-C++11 and provides a clear and pleasant API", "homepage": "https://github.com/oktal/pistache", "supports": "linux", "dependencies": [ - "rapidjson" + "rapidjson", + { + "name": "vcpkg-tool-meson", + "host": true + } ] } diff --git a/ports/pixman/vcpkg.json b/ports/pixman/vcpkg.json index 17284edad0..916f1a4f08 100644 --- a/ports/pixman/vcpkg.json +++ b/ports/pixman/vcpkg.json @@ -1,10 +1,14 @@ { "name": "pixman", "version": "0.40.0", + "port-version": 1, "description": "Pixman is a low-level software library for pixel manipulation, providing features such as image compositing and trapezoid rasterization.", "homepage": "https://www.cairographics.org/releases", "dependencies": [ "libpng", - "tool-meson" + { + "name": "vcpkg-tool-meson", + "host": true + } ] } diff --git a/ports/pkgconf/vcpkg.json b/ports/pkgconf/vcpkg.json index 8d544f1023..8143e90743 100644 --- a/ports/pkgconf/vcpkg.json +++ b/ports/pkgconf/vcpkg.json @@ -1,7 +1,14 @@ { "name": "pkgconf", "version": "1.8.0", + "port-version": 1, "description": "pkgconf is a program which helps to configure compiler and linker flags for development libraries. It is similar to pkg-config from freedesktop.org.", "homepage": "https://github.com/pkgconf/pkgconf", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-tool-meson", + "host": true + } + ] } diff --git a/ports/tomlplusplus/vcpkg.json b/ports/tomlplusplus/vcpkg.json index b8833ee25f..267b097dad 100644 --- a/ports/tomlplusplus/vcpkg.json +++ b/ports/tomlplusplus/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tomlplusplus", "version": "2.5.0", - "port-version": 2, + "port-version": 3, "description": "Header-only TOML config file parser and serializer for modern C++.", "homepage": "https://marzer.github.io/tomlplusplus/", "supports": "!uwp", @@ -9,6 +9,10 @@ { "name": "vcpkg-cmake-config", "host": true + }, + { + "name": "vcpkg-tool-meson", + "host": true } ] } diff --git a/ports/tool-meson/portfile.cmake b/ports/tool-meson/portfile.cmake index c39e614071..ed3c452cce 100644 --- a/ports/tool-meson/portfile.cmake +++ b/ports/tool-meson/portfile.cmake @@ -1,7 +1,4 @@ -# This port represents a dependency on the Meson build system. -# In the future, it is expected that this port acquires and installs Meson. -# Currently is used in ports that call vcpkg_find_acquire_program(MESON) in order to force rebuilds. - +#deprecated port. -> new port "vcpkg-tool-meson" for better grouping with other vcpkg tools set(VCPKG_POLICY_EMPTY_PACKAGE enabled) vcpkg_find_acquire_program(MESON) message(STATUS "Using meson: ${MESON}") \ No newline at end of file diff --git a/ports/tool-meson/vcpkg.json b/ports/tool-meson/vcpkg.json index 936b5d6c54..617d20486b 100644 --- a/ports/tool-meson/vcpkg.json +++ b/ports/tool-meson/vcpkg.json @@ -1,6 +1,9 @@ { "name": "tool-meson", - "version": "0.58.1", + "version-date": "2021-11-19", "description": "Meson build system", - "homepage": "https://github.com/mesonbuild/meson" + "homepage": "https://github.com/mesonbuild/meson", + "dependencies": [ + "vcpkg-tool-meson" + ] } diff --git a/ports/vcpkg-tool-meson/meson-intl.patch b/ports/vcpkg-tool-meson/meson-intl.patch new file mode 100644 index 0000000000..614db056d6 --- /dev/null +++ b/ports/vcpkg-tool-meson/meson-intl.patch @@ -0,0 +1,14 @@ +diff --git a/tools/meson/mesonbuild/dependencies/misc.py b/tools/meson/mesonbuild/dependencies/misc.py +index 537af1f89..43d7febf2 100644 +--- a/tools/meson/mesonbuild/dependencies/misc.py ++++ b/tools/meson/mesonbuild/dependencies/misc.py +@@ -610,7 +610,8 @@ iconv_factory = DependencyFactory( + + intl_factory = DependencyFactory( + 'intl', ++ [DependencyMethods.BUILTIN, DependencyMethods.SYSTEM, DependencyMethods.CMAKE], ++ cmake_name='Intl', +- [DependencyMethods.BUILTIN, DependencyMethods.SYSTEM], + builtin_class=IntlBuiltinDependency, + system_class=IntlSystemDependency, + ) diff --git a/ports/vcpkg-tool-meson/portfile.cmake b/ports/vcpkg-tool-meson/portfile.cmake new file mode 100644 index 0000000000..a858c5f45d --- /dev/null +++ b/ports/vcpkg-tool-meson/portfile.cmake @@ -0,0 +1,60 @@ +# This port represents a dependency on the Meson build system. +# In the future, it is expected that this port acquires and installs Meson. +# Currently is used in ports that call vcpkg_find_acquire_program(MESON) in order to force rebuilds. + +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +set(program MESON) +set(program_version 0.60.2) +set(program_name meson) +set(search_names meson meson.py) +set(interpreter PYTHON3) +set(apt_package_name "meson") +set(brew_package_name "meson") +set(ref 5e9b709ad0b34d8ac920dff057a5361080c0889b) +set(paths_to_search "${CURRENT_PACKAGES_DIR}/tools/meson") +set(download_urls "https://github.com/mesonbuild/meson/archive/${ref}.tar.gz") +set(download_filename "meson-${ref}.tar.gz") +set(download_sha512 5fb89c6b81f75825b6f300039db6dae9d907c81403a8ebe30c7426729d5cb3179e30b9b84d6ed756c2aa39ca34ea681afa0c5cd78835a94c43d5ab25e625abd0) +set(supported_on_unix ON) +set(version_command --version) +set(extra_search_args EXACT_VERSION_MATCH) + +vcpkg_find_acquire_program(PYTHON3) + +# Reenable if no patching of meson is required within vcpkg +# z_vcpkg_find_acquire_program_find_external("${program}" +# ${extra_search_args} +# PROGRAM_NAME "${program_name}" +# MIN_VERSION "${program_version}" +# INTERPRETER "${interpreter}" +# NAMES ${search_names} +# VERSION_COMMAND ${version_command} +# ) + +if(NOT "${program}") + vcpkg_download_distfile(archive_path + URLS ${download_urls} + SHA512 "${download_sha512}" + FILENAME "${download_filename}" + ) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools") + vcpkg_execute_in_download_mode( + COMMAND "${CMAKE_COMMAND}" -E tar xzf "${archive_path}" + WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools" + ) + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/meson-${ref}" "${CURRENT_PACKAGES_DIR}/tools/meson") + z_vcpkg_apply_patches( + SOURCE_PATH "${CURRENT_PACKAGES_DIR}" + PATCHES meson-intl.patch + ) +endif() + +z_vcpkg_find_acquire_program_find_internal("${program}" + INTERPRETER "${interpreter}" + PATHS ${paths_to_search} + NAMES ${search_names} +) +#vcpkg_find_acquire_program(MESON) +message(STATUS "Using meson: ${MESON}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/meson/version.txt" "${program_version}") # For vcpkg_find_acquire_program diff --git a/ports/vcpkg-tool-meson/vcpkg.json b/ports/vcpkg-tool-meson/vcpkg.json new file mode 100644 index 0000000000..418753714e --- /dev/null +++ b/ports/vcpkg-tool-meson/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "vcpkg-tool-meson", + "version": "0.60.2", + "description": "Meson build system", + "homepage": "https://github.com/mesonbuild/meson", + "supports": "native" +} diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index 4c5d7be641..88f0abc81a 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -518,11 +518,15 @@ function(vcpkg_configure_meson) #Copy meson log files into buildtree for CI if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}/meson-logs/meson-log.txt") file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}/meson-logs/meson-log.txt" DESTINATION "${CURRENT_BUILDTREES_DIR}") - file(RENAME "${CURRENT_BUILDTREES_DIR}/meson-log.txt" "${CURRENT_BUILDTREES_DIR}/meson-log-${suffix_${buildtype}}.txt") + file(RENAME "${CURRENT_BUILDTREES_DIR}/meson-log.txt" "${CURRENT_BUILDTREES_DIR}/meson-log-${suffix_${buildtype}}.log") + endif() + if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}/meson-info/intro-dependencies.json") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}/meson-info/intro-dependencies.json" DESTINATION "${CURRENT_BUILDTREES_DIR}") + file(RENAME "${CURRENT_BUILDTREES_DIR}/intro-dependencies.json" "${CURRENT_BUILDTREES_DIR}/intro-dependencies-${suffix_${buildtype}}.log") endif() if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}/meson-logs/install-log.txt") file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}/meson-logs/install-log.txt" DESTINATION "${CURRENT_BUILDTREES_DIR}") - file(RENAME "${CURRENT_BUILDTREES_DIR}/install-log.txt" "${CURRENT_BUILDTREES_DIR}/install-log-${suffix_${buildtype}}.txt") + file(RENAME "${CURRENT_BUILDTREES_DIR}/install-log.txt" "${CURRENT_BUILDTREES_DIR}/install-log-${suffix_${buildtype}}.log") endif() message(STATUS "Configuring ${TARGET_TRIPLET}-${suffix_${buildtype}} done") diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 7769cfc905..285efefe05 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -88,17 +88,19 @@ function(z_vcpkg_find_acquire_program_find_external program) if("${arg_INTERPRETER}" STREQUAL "") find_program("${program}" NAMES ${arg_NAMES}) else() - find_file(SCRIPT_${program} NAMES ${arg_NAMES}) - if(SCRIPT_${program}) - vcpkg_list(SET program_tmp ${${interpreter}} ${SCRIPT_${program}}) + find_file(SCRIPT_${arg_PROGRAM_NAME} NAMES ${arg_NAMES}) + if(SCRIPT_${arg_PROGRAM_NAME}) + vcpkg_list(SET program_tmp ${${interpreter}} ${SCRIPT_${arg_PROGRAM_NAME}}) set("${program}" "${program_tmp}" CACHE INTERNAL "") + else() + set("${program}" "" CACHE INTERNAL "") endif() - unset(SCRIPT_${program} CACHE) + unset(SCRIPT_${arg_PROGRAM_NAME} CACHE) endif() if("${version_command}" STREQUAL "") set(version_is_good ON) # can't check for the version being good, so assume it is - else() + elseif(${program}) # only do a version check if ${program} has a value z_vcpkg_find_acquire_program_version_check(version_is_good ${arg_EXACT_VERSION_MATCH} COMMAND ${${program}} ${arg_VERSION_COMMAND} @@ -347,24 +349,26 @@ function(vcpkg_find_acquire_program program) set(download_filename "nuget.5.11.0.exe") set(raw_executable ON) set(download_sha512 06a337c9404dec392709834ef2cdbdce611e104b510ef40201849595d46d242151749aef65bc2d7ce5ade9ebfda83b64c03ce14c8f35ca9957a17a8c02b8c4b7) - elseif(program STREQUAL "MESON") - set(program_version 0.58.1) + elseif(program STREQUAL "MESON") # Should always be found! set(program_name meson) set(search_names meson meson.py) set(interpreter PYTHON3) set(apt_package_name "meson") set(brew_package_name "meson") - set(ref aeda7f249c4a5dbbecc52e44f382246a2377b5b0) - set(paths_to_search "${DOWNLOADS}/tools/meson/meson-${ref}") - set(download_urls "https://github.com/mesonbuild/meson/archive/${ref}.tar.gz") - set(download_filename "meson-${ref}.tar.gz") - #set(paths_to_search ${DOWNLOADS}/tools/meson/meson-${program_version}) - #set(download_urls "https://github.com/mesonbuild/meson/releases/download/${program_version}/meson-${program_version}.tar.gz") - #set(download_filename "meson-${program_version}.tar.gz") - set(download_sha512 18a012a45274dbb4582e99fd69d920f38831e788d9860f9553c64847bedb1c2010ae0b5c0ef4a4350c03f5e0f95aaa0395378e1208109b59640c1a70b1e202d2) - set(supported_on_unix ON) set(version_command --version) set(extra_search_args EXACT_VERSION_MATCH) + if(EXISTS "${CURRENT_HOST_INSTALLED_DIR}/share/meson/version.txt") + file(READ "${CURRENT_HOST_INSTALLED_DIR}/share/meson/version.txt" program_version) + set(paths_to_search "${CURRENT_HOST_INSTALLED_DIR}/tools/meson") + else() # Old behavior + set(program_version 0.58.1) + set(ref aeda7f249c4a5dbbecc52e44f382246a2377b5b0) + set(paths_to_search "${DOWNLOADS}/tools/meson/meson-${ref}") + set(download_urls "https://github.com/mesonbuild/meson/archive/${ref}.tar.gz") + set(download_filename "meson-${ref}.tar.gz") + set(download_sha512 18a012a45274dbb4582e99fd69d920f38831e788d9860f9553c64847bedb1c2010ae0b5c0ef4a4350c03f5e0f95aaa0395378e1208109b59640c1a70b1e202d2) + set(supported_on_unix ON) + endif() elseif(program STREQUAL "FLEX" OR program STREQUAL "BISON") if(CMAKE_HOST_WIN32) vcpkg_list(SET sourceforge_args diff --git a/versions/a-/atk.json b/versions/a-/atk.json index f7de501e72..9d9460584f 100644 --- a/versions/a-/atk.json +++ b/versions/a-/atk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "15723fa24f08f04e859253b16f5cbc05529d10cf", + "version": "2.36.0", + "port-version": 2 + }, { "git-tree": "cf5656ae96a202ad1846f5cb233cc4daf4f3336d", "version": "2.36.0", diff --git a/versions/a-/atkmm.json b/versions/a-/atkmm.json index d338170a69..7f0ed67740 100644 --- a/versions/a-/atkmm.json +++ b/versions/a-/atkmm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bd4ca61c3b3fcfbadf494e019aa13a659eeff930", + "version": "2.36.0", + "port-version": 2 + }, { "git-tree": "340ce8d9ccb6154374ecbe6bf6c9a70b83442578", "version": "2.36.0", diff --git a/versions/baseline.json b/versions/baseline.json index 2e84594fe1..cc6afd9ad7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -206,11 +206,11 @@ }, "atk": { "baseline": "2.36.0", - "port-version": 1 + "port-version": 2 }, "atkmm": { "baseline": "2.36.0", - "port-version": 1 + "port-version": 2 }, "atlmfc": { "baseline": "0", @@ -1214,11 +1214,11 @@ }, "cairo": { "baseline": "1.17.4", - "port-version": 2 + "port-version": 3 }, "cairomm": { "baseline": "1.16.0", - "port-version": 0 + "port-version": 1 }, "calceph": { "baseline": "3.5.0", @@ -1758,7 +1758,7 @@ }, "dav1d": { "baseline": "0.8.2", - "port-version": 1 + "port-version": 2 }, "daw-header-libraries": { "baseline": "1.29.7", @@ -2226,7 +2226,7 @@ }, "fontconfig": { "baseline": "2.13.94", - "port-version": 3 + "port-version": 4 }, "foonathan-memory": { "baseline": "2019-07-21", @@ -2286,7 +2286,7 @@ }, "fribidi": { "baseline": "1.0.11", - "port-version": 0 + "port-version": 1 }, "frozen": { "baseline": "2021-04-22", @@ -2374,7 +2374,7 @@ }, "gdk-pixbuf": { "baseline": "2.42.2", - "port-version": 1 + "port-version": 2 }, "gemmlowp": { "baseline": "2021-09-28", @@ -2470,11 +2470,11 @@ }, "glib": { "baseline": "2.70.1", - "port-version": 0 + "port-version": 1 }, "glibmm": { "baseline": "2.68.1", - "port-version": 0 + "port-version": 1 }, "glm": { "baseline": "0.9.9.8", @@ -2546,7 +2546,7 @@ }, "graphene": { "baseline": "1.10.2", - "port-version": 1 + "port-version": 2 }, "graphicsmagick": { "baseline": "1.3.36", @@ -2590,11 +2590,11 @@ }, "gst-rtsp-server": { "baseline": "1.19.2", - "port-version": 0 + "port-version": 1 }, "gstreamer": { "baseline": "1.19.2", - "port-version": 1 + "port-version": 2 }, "gtest": { "baseline": "1.11.0", @@ -2602,11 +2602,11 @@ }, "gtk": { "baseline": "4.4.0", - "port-version": 0 + "port-version": 1 }, "gtkmm": { "baseline": "4.0.1", - "port-version": 0 + "port-version": 1 }, "gts": { "baseline": "0.7.6", @@ -2646,7 +2646,7 @@ }, "harfbuzz": { "baseline": "3.0.0", - "port-version": 0 + "port-version": 1 }, "hayai": { "baseline": "2019-08-10", @@ -3418,7 +3418,7 @@ }, "libepoxy": { "baseline": "1.5.9", - "port-version": 0 + "port-version": 1 }, "libevent": { "baseline": "2.1.12", @@ -3510,7 +3510,7 @@ }, "libgxps": { "baseline": "0.3.2", - "port-version": 0 + "port-version": 1 }, "libharu": { "baseline": "2017-08-15", @@ -3866,7 +3866,7 @@ }, "libsecret": { "baseline": "0.20.4", - "port-version": 0 + "port-version": 1 }, "libsercomm": { "baseline": "1.3.2", @@ -4074,7 +4074,7 @@ }, "libxmlpp": { "baseline": "5.0.0", - "port-version": 1 + "port-version": 2 }, "libxmp-lite": { "baseline": "4.4.1", @@ -4330,7 +4330,7 @@ }, "mesa": { "baseline": "21.2.0", - "port-version": 0 + "port-version": 1 }, "meschach": { "baseline": "1.2b", @@ -4574,7 +4574,7 @@ }, "munit": { "baseline": "2019-04-06", - "port-version": 3 + "port-version": 4 }, "muparser": { "baseline": "2.3.2", @@ -4962,7 +4962,7 @@ }, "openh264": { "baseline": "2021-03-16", - "port-version": 2 + "port-version": 3 }, "openigtlink": { "baseline": "3.0", @@ -5122,7 +5122,7 @@ }, "pango": { "baseline": "1.48.10", - "port-version": 0 + "port-version": 1 }, "pangolin": { "baseline": "0.6", @@ -5130,7 +5130,7 @@ }, "pangomm": { "baseline": "2.48.1", - "port-version": 0 + "port-version": 1 }, "parallel-hashmap": { "baseline": "1.33", @@ -5246,7 +5246,7 @@ }, "pistache": { "baseline": "2021-03-31", - "port-version": 2 + "port-version": 3 }, "pixel": { "baseline": "0.3", @@ -5254,11 +5254,11 @@ }, "pixman": { "baseline": "0.40.0", - "port-version": 0 + "port-version": 1 }, "pkgconf": { "baseline": "1.8.0", - "port-version": 0 + "port-version": 1 }, "platform-folders": { "baseline": "4.1.0", @@ -6850,10 +6850,10 @@ }, "tomlplusplus": { "baseline": "2.5.0", - "port-version": 2 + "port-version": 3 }, "tool-meson": { - "baseline": "0.58.1", + "baseline": "2021-11-19", "port-version": 0 }, "torch-th": { @@ -7088,6 +7088,10 @@ "baseline": "2021-10-23", "port-version": 0 }, + "vcpkg-tool-meson": { + "baseline": "0.60.2", + "port-version": 0 + }, "vcpkg-tool-nodejs": { "baseline": "14.17.4", "port-version": 0 diff --git a/versions/c-/cairo.json b/versions/c-/cairo.json index 60935f639e..6242839810 100644 --- a/versions/c-/cairo.json +++ b/versions/c-/cairo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d8bed1ec84c641aad98858b6fb1151b09273227e", + "version": "1.17.4", + "port-version": 3 + }, { "git-tree": "96aa6adbfefae2d4f2e3d79e012876b1d4a40b93", "version": "1.17.4", diff --git a/versions/c-/cairomm.json b/versions/c-/cairomm.json index d56ab293ba..8b828b0c22 100644 --- a/versions/c-/cairomm.json +++ b/versions/c-/cairomm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6cf38af57700ebdb1933bd3e4f4c0580de8aaab9", + "version": "1.16.0", + "port-version": 1 + }, { "git-tree": "0e16b66d1552c1cbda240f8a11d65895c607e6b5", "version": "1.16.0", diff --git a/versions/d-/dav1d.json b/versions/d-/dav1d.json index 0871da5a96..c655ee649f 100644 --- a/versions/d-/dav1d.json +++ b/versions/d-/dav1d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d0d3738c56710defd998cb619b649ddf6e43e017", + "version-semver": "0.8.2", + "port-version": 2 + }, { "git-tree": "d06178194bfa123b40c146ad161200d3e491f48b", "version-semver": "0.8.2", diff --git a/versions/f-/fontconfig.json b/versions/f-/fontconfig.json index 858b1f630c..3756041a7f 100644 --- a/versions/f-/fontconfig.json +++ b/versions/f-/fontconfig.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "41142efe19b6591f0de47857a32fecdb8bbfc717", + "version": "2.13.94", + "port-version": 4 + }, { "git-tree": "6b0bf8a5aa81b6f10909b6d303be77553ca26011", "version": "2.13.94", diff --git a/versions/f-/fribidi.json b/versions/f-/fribidi.json index 86abb9f868..b3fa5b2e1c 100644 --- a/versions/f-/fribidi.json +++ b/versions/f-/fribidi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1555ac8e52ae978d26277e842322241a3da9c8ae", + "version": "1.0.11", + "port-version": 1 + }, { "git-tree": "0e040a494c14a4fade7878bf200a0463abc21e96", "version": "1.0.11", diff --git a/versions/g-/gdk-pixbuf.json b/versions/g-/gdk-pixbuf.json index efc409eaf5..d431dc9220 100644 --- a/versions/g-/gdk-pixbuf.json +++ b/versions/g-/gdk-pixbuf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c6274b79c119e29062eaaa6ad99271fe868f0288", + "version": "2.42.2", + "port-version": 2 + }, { "git-tree": "f90cd0dd11fd312fe803519706f422a9207336d0", "version": "2.42.2", diff --git a/versions/g-/glib.json b/versions/g-/glib.json index 6efc32a794..abbb4bb3f3 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "52cb59030261a49d5afb22e2f95e5f9d24548532", + "version": "2.70.1", + "port-version": 1 + }, { "git-tree": "21a2facd76ae194ca1880c497122f7785750f912", "version": "2.70.1", diff --git a/versions/g-/glibmm.json b/versions/g-/glibmm.json index f6c30ddb9e..09bf15aa5f 100644 --- a/versions/g-/glibmm.json +++ b/versions/g-/glibmm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f0db0bb27bb35a57f5d72b56f5d080545dde76ba", + "version": "2.68.1", + "port-version": 1 + }, { "git-tree": "e43bb60b861fbd9469297581a968e3a647537b4d", "version": "2.68.1", diff --git a/versions/g-/graphene.json b/versions/g-/graphene.json index 2a1efbf32a..9a023fe39a 100644 --- a/versions/g-/graphene.json +++ b/versions/g-/graphene.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "35d8f02c154c44312abd824ba408d52855dbf138", + "version": "1.10.2", + "port-version": 2 + }, { "git-tree": "1cd3ae48053d2f9b26c2ee6e2e01a413ea6bd0d2", "version": "1.10.2", diff --git a/versions/g-/gst-rtsp-server.json b/versions/g-/gst-rtsp-server.json index e16a6ef93b..695937996b 100644 --- a/versions/g-/gst-rtsp-server.json +++ b/versions/g-/gst-rtsp-server.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d769d57cd8c5c732146992a174266c11e7ef52ec", + "version": "1.19.2", + "port-version": 1 + }, { "git-tree": "0c628b2e09422aa3c82fc3d06757cdef559e9ce4", "version": "1.19.2", diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index c4906802ae..62cc11ebf3 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ec9fdf057bbec637e21db3a56297439e420106d4", + "version": "1.19.2", + "port-version": 2 + }, { "git-tree": "9e1e058b933a63ff71eeaa2a7a59fa713d0ba51b", "version": "1.19.2", diff --git a/versions/g-/gtk.json b/versions/g-/gtk.json index 1d536e8805..fb80660741 100644 --- a/versions/g-/gtk.json +++ b/versions/g-/gtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a7d9e7cccb1be0a50b7b9cfa961adc93bca948fa", + "version": "4.4.0", + "port-version": 1 + }, { "git-tree": "1248de2309515809a0a6d6f4a1cdb48f0aca304e", "version": "4.4.0", diff --git a/versions/g-/gtkmm.json b/versions/g-/gtkmm.json index d97dfd1612..8831fe950f 100644 --- a/versions/g-/gtkmm.json +++ b/versions/g-/gtkmm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1c78f4d8d6a4375808cd69668375088c5b578e65", + "version": "4.0.1", + "port-version": 1 + }, { "git-tree": "14e153bf596fcdfa4376218e20d2a140f33bae8e", "version": "4.0.1", diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 84a3c02af7..fb4840943b 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "151b8dba4351ec70354a0cc1485e5eb720df5f75", + "version-semver": "3.0.0", + "port-version": 1 + }, { "git-tree": "ec7e9e00eba714984a7c4b22b5c51ce0fe1c4e08", "version-semver": "3.0.0", diff --git a/versions/l-/libepoxy.json b/versions/l-/libepoxy.json index 7af49b945e..e24c9a7c9e 100644 --- a/versions/l-/libepoxy.json +++ b/versions/l-/libepoxy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "76fed10554d79f7163b7a0e6928fd03b37284989", + "version-semver": "1.5.9", + "port-version": 1 + }, { "git-tree": "6441c5ae7e331cdd952258f9806972ca7d173c8b", "version-semver": "1.5.9", diff --git a/versions/l-/libgxps.json b/versions/l-/libgxps.json index 05fc8f2dd2..ef93cc3ff6 100644 --- a/versions/l-/libgxps.json +++ b/versions/l-/libgxps.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bc4e4576421dec679fb4a7c09497cbc13f99df00", + "version": "0.3.2", + "port-version": 1 + }, { "git-tree": "aa14ea859cee510d9c738fbdb5a1955531aabb87", "version": "0.3.2", diff --git a/versions/l-/libsecret.json b/versions/l-/libsecret.json index bdfe26d0a1..4b17d8ff5a 100644 --- a/versions/l-/libsecret.json +++ b/versions/l-/libsecret.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a5e91b4b0043a5deb14f9ab62710b3410e969d54", + "version": "0.20.4", + "port-version": 1 + }, { "git-tree": "28e3a8bccc8c6ba0b40bf89f178e293dd282959b", "version": "0.20.4", diff --git a/versions/l-/libxmlpp.json b/versions/l-/libxmlpp.json index 9db123f9e0..526fed6df5 100644 --- a/versions/l-/libxmlpp.json +++ b/versions/l-/libxmlpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a603edc93c74d92bdbcef0bd8c38bbe331d1aa9d", + "version": "5.0.0", + "port-version": 2 + }, { "git-tree": "d3b0562bb045d23c33e6c01ed6d418c8f20f2358", "version": "5.0.0", diff --git a/versions/m-/mesa.json b/versions/m-/mesa.json index 7d643482e5..635a315479 100644 --- a/versions/m-/mesa.json +++ b/versions/m-/mesa.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5308d779b4070c295771c630e4b2251582e16d0c", + "version": "21.2.0", + "port-version": 1 + }, { "git-tree": "931291396b7abd6c8fcdf7d6e995782dfa64bb80", "version": "21.2.0", diff --git a/versions/m-/munit.json b/versions/m-/munit.json index 36ea7690b0..e5aabeb353 100644 --- a/versions/m-/munit.json +++ b/versions/m-/munit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "37416e6f9f63789221184c07fd4e040d4d8646a2", + "version-string": "2019-04-06", + "port-version": 4 + }, { "git-tree": "f6489068c02b6a87d45ab01592ef733e22904bd7", "version-string": "2019-04-06", diff --git a/versions/o-/openh264.json b/versions/o-/openh264.json index 301ffd6c56..895d98ae05 100644 --- a/versions/o-/openh264.json +++ b/versions/o-/openh264.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "de70ba65ce87de6c9e2c53797d560e42bf6771ea", + "version-date": "2021-03-16", + "port-version": 3 + }, { "git-tree": "dd110373e4afc53e6ea5b43b9f940fda9204c72c", "version-date": "2021-03-16", diff --git a/versions/p-/pango.json b/versions/p-/pango.json index 3cb984a7c5..a13e3d9c0a 100644 --- a/versions/p-/pango.json +++ b/versions/p-/pango.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a9cc75941c3ff73920fb3900615d84bc6f1b423e", + "version": "1.48.10", + "port-version": 1 + }, { "git-tree": "a411f99ebac4507806d3824364cc766f578850e5", "version": "1.48.10", diff --git a/versions/p-/pangomm.json b/versions/p-/pangomm.json index 2634add9c5..8562ba8f0a 100644 --- a/versions/p-/pangomm.json +++ b/versions/p-/pangomm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c01e75e9dc192ca4e6e7161f3362d6866a952e7c", + "version": "2.48.1", + "port-version": 1 + }, { "git-tree": "1ff0b71c742896ffb9da84638f7e20b2960aff80", "version": "2.48.1", diff --git a/versions/p-/pistache.json b/versions/p-/pistache.json index e7538a6939..9c84e2e39a 100644 --- a/versions/p-/pistache.json +++ b/versions/p-/pistache.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "270e04cb56d330fc6cd8482697341ed0d3bf1320", + "version-date": "2021-03-31", + "port-version": 3 + }, { "git-tree": "e8c089b0eec0784be71fb4347dbd583c4aaeb0d8", "version-date": "2021-03-31", diff --git a/versions/p-/pixman.json b/versions/p-/pixman.json index 9d4faf2fd5..5379531d8c 100644 --- a/versions/p-/pixman.json +++ b/versions/p-/pixman.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c2dd7fec404954b43ad0da4ee86c29a4cfdd8fc1", + "version": "0.40.0", + "port-version": 1 + }, { "git-tree": "9fa31a3aa7682c205028903d0b2d2df269a95db5", "version": "0.40.0", diff --git a/versions/p-/pkgconf.json b/versions/p-/pkgconf.json index 44a48125a8..1b3ed2d12d 100644 --- a/versions/p-/pkgconf.json +++ b/versions/p-/pkgconf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cbcb5f984f7713a636caa075f06b755d37493dbd", + "version": "1.8.0", + "port-version": 1 + }, { "git-tree": "a56de4007c52482253b4e052bc5551655711034c", "version": "1.8.0", diff --git a/versions/t-/tomlplusplus.json b/versions/t-/tomlplusplus.json index 7bbdb0081c..89c218d7f1 100644 --- a/versions/t-/tomlplusplus.json +++ b/versions/t-/tomlplusplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "06ce1fc365e8e7aa80b1a234a97665ca5e593d0d", + "version": "2.5.0", + "port-version": 3 + }, { "git-tree": "8a772c48d2f8b5d525a1bcad95296bb483194e7a", "version": "2.5.0", diff --git a/versions/t-/tool-meson.json b/versions/t-/tool-meson.json index ec49d3f117..0fdd3e2c03 100644 --- a/versions/t-/tool-meson.json +++ b/versions/t-/tool-meson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "924a9b5b5dc11ea420a1be748873f8b252fd1417", + "version-date": "2021-11-19", + "port-version": 0 + }, { "git-tree": "7faddc68a615d0902938f8dd18182586f9e2363a", "version": "0.58.1", diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json new file mode 100644 index 0000000000..cb90b4013d --- /dev/null +++ b/versions/v-/vcpkg-tool-meson.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e6ef15a9dc810b4bde53d9b1e3da3a20107e3983", + "version": "0.60.2", + "port-version": 0 + } + ] +}