diff --git a/ports/harfbuzz/fix-build-ffmpeg-failed.patch b/ports/harfbuzz/fix-build-ffmpeg-failed.patch new file mode 100644 index 0000000000..c7251f7187 --- /dev/null +++ b/ports/harfbuzz/fix-build-ffmpeg-failed.patch @@ -0,0 +1,37 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c8e377db6..eb38f45ba 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -340,15 +340,15 @@ endif () + if (WIN32 AND HB_HAVE_GDI) + add_definitions(-DHAVE_GDI) + list(APPEND project_headers ${PROJECT_SOURCE_DIR}/src/hb-gdi.h) +- list(APPEND THIRD_PARTY_LIBS gdi32) +- list(APPEND PC_LIBS_PRIV -lgdi32) ++ list(APPEND THIRD_PARTY_LIBS gdi32 user32) ++ list(APPEND PC_LIBS_PRIV -lgdi32 -luser32) + endif () + + if (WIN32 AND HB_HAVE_UNISCRIBE) + add_definitions(-DHAVE_UNISCRIBE) + list(APPEND project_headers ${PROJECT_SOURCE_DIR}/src/hb-uniscribe.h) +- list(APPEND THIRD_PARTY_LIBS usp10 gdi32 rpcrt4) +- list(APPEND PC_LIBS_PRIV -lusp10 -lgdi32 -lrpcrt4) ++ list(APPEND THIRD_PARTY_LIBS usp10 gdi32 rpcrt4 user32) ++ list(APPEND PC_LIBS_PRIV -lusp10 -lgdi32 -lrpcrt4 -luser32) + endif () + + if (WIN32 AND HB_HAVE_DIRECTWRITE) +diff --git a/meson.build b/meson.build +index 5a02b3bb2..00a8c5ec8 100644 +--- a/meson.build ++++ b/meson.build +@@ -321,7 +321,7 @@ if host_machine.system() == 'windows' and not get_option('gdi').disabled() + endif + + gdi_deps_found = true +- foreach usplib : ['usp10', 'gdi32', 'rpcrt4'] ++ foreach usplib : ['usp10', 'gdi32', 'rpcrt4', 'user32'] + dep = cpp.find_library(usplib, required: get_option('gdi')) + gdi_deps_found = gdi_deps_found and dep.found() + gdi_uniscribe_deps += dep diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index bc1bda8f78..5336f78bf6 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-win32-build.patch + fix-build-ffmpeg-failed.patch ) if("icu" IN_LIST FEATURES) diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index 8c48868c42..ce0cb7a1de 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -1,7 +1,7 @@ { "name": "harfbuzz", "version": "10.2.0", - "port-version": 1, + "port-version": 2, "description": "HarfBuzz OpenType text shaping engine", "homepage": "https://github.com/harfbuzz/harfbuzz", "license": "MIT-Modern-Variant", diff --git a/versions/baseline.json b/versions/baseline.json index 1700dd1f12..a099f36ce2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3442,7 +3442,7 @@ }, "harfbuzz": { "baseline": "10.2.0", - "port-version": 1 + "port-version": 2 }, "hash-library": { "baseline": "8", diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 626175b40a..18afc1a880 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e877500fd52227ef36b3137d281f6fb313770b3d", + "version": "10.2.0", + "port-version": 2 + }, { "git-tree": "dca5663a0e2943d17c1bc0a308ce820613854084", "version": "10.2.0",