videolan
/
vlc
mirror of https://gitea.goldendeliverer.com/videolan/vlc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

contrib: qt: fix harfbuzz detection on macOS 

It needs the CoreFoundation/CoreText/CoreGraphics when linking and it can't be
added to the configure options.
pull/141/head
Steve Lhomme 4 years ago
parent
52f4ac3570
commit
b9d3d9929a
1 changed files with 2 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      contrib/src/qt/rules.mak

2
contrib/src/qt/rules.mak
View File

@ -58,6 +58,8 @@ endif
$(APPLY) $(SRC)/qt/qt-fix-gcc11-build.patch $(APPLY) $(SRC)/qt/qt-fix-gcc11-build.patch
$(APPLY) $(SRC)/qt/qt-add-missing-header-darwin.patch $(APPLY) $(SRC)/qt/qt-add-missing-header-darwin.patch
$(APPLY) $(SRC)/qt/set-mkspecs-properties.patch $(APPLY) $(SRC)/qt/set-mkspecs-properties.patch
# fix detection of our harfbuzz on macosx
sed -i.orig 's#"-lharfbuzz"#{ "libs": "-framework CoreText -framework CoreGraphics -framework CoreFoundation -lharfbuzz", "condition": "config.darwin" }, "-lharfbuzz"#' "$(UNPACK_DIR)/src/gui/configure.json"
# Let us decide the WINVER/_WIN32_WINNT # Let us decide the WINVER/_WIN32_WINNT
sed -i.orig 's,mingw: DEFINES += WINVER=0x0601,# mingw: DEFINES += WINVER=0x0601,' "$(UNPACK_DIR)/mkspecs/features/qt_build_config.prf" sed -i.orig 's,mingw: DEFINES += WINVER=0x0601,# mingw: DEFINES += WINVER=0x0601,' "$(UNPACK_DIR)/mkspecs/features/qt_build_config.prf"
$(MOVE) $(MOVE)

Write Preview
Loading…
Cancel
Save