From 3b805694ed3e5a4e9d33612fb74abb91bbf3932b Mon Sep 17 00:00:00 2001 From: talregev Date: Thu, 10 Jul 2025 11:51:40 +0300 Subject: [PATCH] [babl, gegl] Update ports. Add introspection feature (#46320) --- ports/babl/portfile.cmake | 13 +++++++++++-- ports/babl/vcpkg.json | 9 +++++++-- ports/gegl/portfile.cmake | 2 +- ports/gegl/vcpkg.json | 2 +- versions/b-/babl.json | 5 +++++ versions/baseline.json | 6 +++--- versions/g-/gegl.json | 5 +++++ 7 files changed, 33 insertions(+), 9 deletions(-) diff --git a/ports/babl/portfile.cmake b/ports/babl/portfile.cmake index 01b63d8611..e89cf1b492 100644 --- a/ports/babl/portfile.cmake +++ b/ports/babl/portfile.cmake @@ -3,7 +3,7 @@ string(REGEX MATCH [[^[0-9][0-9]*\.[1-9][0-9]*]] VERSION_MAJOR_MINOR ${VERSION}) vcpkg_download_distfile(ARCHIVE URLS "https://download.gimp.org/pub/babl/${VERSION_MAJOR_MINOR}/babl-${VERSION}.tar.xz" FILENAME "babl-${VERSION}.tar.xz" - SHA512 20e40baa6654785d69642e6e85542968db3c5d08da630adc590ff066a52c5938f4ce8a77c0097e00010a905c8c31d8f131eb0308a3f8b6439ab6be4133eae246 + SHA512 ff410c9839f4fe4d6afd4dec7e4d02af34b1c8a4edbc05483784ed82f91045b1102414fc1c58357866044b7f1ab499eda24fe744f5dd692af5804020c76b2382 ) vcpkg_extract_source_archive( @@ -18,12 +18,21 @@ else() list(APPEND feature_options "-Dwith-lcms=false") endif() +if("introspection" IN_LIST FEATURES) + list(APPEND feature_options "-Denable-gir=true") + vcpkg_get_gobject_introspection_programs(PYTHON3 GIR_COMPILER GIR_SCANNER) +else() + list(APPEND feature_options "-Denable-gir=false") +endif() + vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${feature_options} - -Denable-gir=false -Dwith-docs=false + ADDITIONAL_BINARIES + "g-ir-compiler='${GIR_COMPILER}'" + "g-ir-scanner='${GIR_SCANNER}'" ) vcpkg_install_meson() vcpkg_copy_pdbs() diff --git a/ports/babl/vcpkg.json b/ports/babl/vcpkg.json index 922a985b8b..f7b8251b24 100644 --- a/ports/babl/vcpkg.json +++ b/ports/babl/vcpkg.json @@ -1,7 +1,6 @@ { "name": "babl", - "version": "0.1.110", - "port-version": 2, + "version": "0.1.114", "description": "A pixel encoding and color space conversion engine.", "homepage": "https://gegl.org/babl/", "license": "LGPL-3.0-or-later", @@ -18,6 +17,12 @@ "dependencies": [ "lcms" ] + }, + "introspection": { + "description": "Enable introspection", + "dependencies": [ + "gobject-introspection" + ] } } } diff --git a/ports/gegl/portfile.cmake b/ports/gegl/portfile.cmake index fab39c1d65..e6a454637e 100644 --- a/ports/gegl/portfile.cmake +++ b/ports/gegl/portfile.cmake @@ -3,7 +3,7 @@ string(REGEX MATCH [[^[0-9][0-9]*\.[1-9][0-9]*]] VERSION_MAJOR_MINOR ${VERSION}) vcpkg_download_distfile(ARCHIVE URLS https://download.gimp.org/pub/gegl/${VERSION_MAJOR_MINOR}/gegl-${VERSION}.tar.xz FILENAME "gegl-${VERSION}.tar.xz" - SHA512 95a6ef4866b90c9ce950af2e8e1e465044bc8f0e0065884b103c7d86d7a56f5b9142a90abc4676675add46e69b811f5b8225eb7676454d5c49d7cd19e4edab7e + SHA512 bf4801588abe8b568ae3d1daafa97af28516bbbdd44d2a0798c87412b49301f621db3cf1c7a3ec33f19d96ab4dbd37d80824f04460116a896dd7415aa0d5229d ) vcpkg_extract_source_archive( diff --git a/ports/gegl/vcpkg.json b/ports/gegl/vcpkg.json index b9f62a03ab..9a7d7c09b9 100644 --- a/ports/gegl/vcpkg.json +++ b/ports/gegl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gegl", - "version": "0.4.54", + "version": "0.4.62", "description": "Generic Graphical Library.", "homepage": "https://gegl.org/", "license": "LGPL-3.0-or-later", diff --git a/versions/b-/babl.json b/versions/b-/babl.json index e98a08247c..b5b0c009e0 100644 --- a/versions/b-/babl.json +++ b/versions/b-/babl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cad9c6bb5734a52689427bed4145c2d0d9a80fca", + "version": "0.1.114", + "port-version": 0 + }, { "git-tree": "feb19fafaacdb7dba45f5c2a42970ba81b2d87c5", "version": "0.1.110", diff --git a/versions/baseline.json b/versions/baseline.json index 983e1f1821..6510ab52a1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -585,8 +585,8 @@ "port-version": 2 }, "babl": { - "baseline": "0.1.110", - "port-version": 2 + "baseline": "0.1.114", + "port-version": 0 }, "backward-cpp": { "baseline": "2023-11-24", @@ -3161,7 +3161,7 @@ "port-version": 4 }, "gegl": { - "baseline": "0.4.54", + "baseline": "0.4.62", "port-version": 0 }, "gemmlowp": { diff --git a/versions/g-/gegl.json b/versions/g-/gegl.json index 346c6652e8..9926e06ee0 100644 --- a/versions/g-/gegl.json +++ b/versions/g-/gegl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9eddf53829c7d2dc14266b4002373790f09946de", + "version": "0.4.62", + "port-version": 0 + }, { "git-tree": "d85039d4ae76e2fbb0721678333d4188049e26b3", "version": "0.4.54",