diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 510f40d2e1..bf84f95bf8 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -35,7 +35,11 @@ if("cairo" IN_LIST FEATURES) else() list(APPEND FEATURE_OPTIONS -Dcairo=disabled) endif() -list(APPEND FEATURE_OPTIONS -Dfreetype=enabled) #Enable freetype interop helpers +if("freetype" IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS -Dfreetype=enabled) #Enable freetype interop helpers +else() + list(APPEND FEATURE_OPTIONS -Dfreetype=disabled) +endif() #if(VCPKG_TARGET_IS_WINDOWS) #link errors in qt5-base. probably requires changes to the pc files generated by meson #list(APPEND FEATURE_OPTIONS -Dgdi=enabled) # enable gdi helpers and uniscribe shaper backend (windows only) diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index 89367789e1..a92051f2cd 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -1,16 +1,12 @@ { "name": "harfbuzz", "version": "8.3.0", - "port-version": 1, + "port-version": 2, "description": "HarfBuzz OpenType text shaping engine", "homepage": "https://github.com/harfbuzz/harfbuzz", "license": "MIT-Modern-Variant", "supports": "!uwp", "dependencies": [ - { - "name": "freetype", - "default-features": false - }, { "name": "gettext", "platform": "osx" @@ -20,6 +16,9 @@ "host": true } ], + "default-features": [ + "freetype" + ], "features": { "cairo": { "description": "Enable Cairo graphics library support", @@ -37,6 +36,15 @@ "description": "Enable CoreText shaper backend on macOS", "supports": "osx" }, + "freetype": { + "description": "Enable FreeType support", + "dependencies": [ + { + "name": "freetype", + "default-features": false + } + ] + }, "glib": { "description": "Glib Unicode callbacks support", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index f87a1fb1a1..626468f3fb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3274,7 +3274,7 @@ }, "harfbuzz": { "baseline": "8.3.0", - "port-version": 1 + "port-version": 2 }, "hash-library": { "baseline": "8", diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index b6d5550fef..9fa3889802 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ff776c837e28a47a91cad45946d7ab6b51dc3c67", + "version": "8.3.0", + "port-version": 2 + }, { "git-tree": "6e2d07391d009a33797b19b707bf5bc60cdb17e5", "version": "8.3.0",