disable fontconfig on macOS

(cherry picked from commit 81550230adc2359d7ec4f5cff6a5c960b7df7e6e)

diff --git a/contrib/harfbuzz/module.defs b/contrib/harfbuzz/module.defs
index f252c0417bba90f8f924940833849d9ed1f9cbc8..07415f3f3b884d24aa4d930c5fcac3c7aae9f34e 100644 (file)
--- a/contrib/harfbuzz/module.defs
+++ b/contrib/harfbuzz/module.defs
@@ -1,4 +1,9 @@
-__deps__ := FONTCONFIG FREETYPE
+__deps__ := FREETYPE
+
+ifneq ($(BUILD.system),darwin)
+    __deps__ += FONTCONFIG
+endif
+
 $(eval $(call import.MODULE.defs,HARFBUZZ,harfbuzz,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,HARFBUZZ))
 
@@ -6,16 +11,20 @@ HARFBUZZ.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/harfbuz
 HARFBUZZ.FETCH.url    += https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.3.0.tar.bz2
 HARFBUZZ.FETCH.sha256  = b04be31633efee2cae1d62d46434587302554fa837224845a62565ec68a0334d
 
-# Tell configure where to find our versions of freetype and fontconfig
+# Tell configure where to find our version of freetype
 HARFBUZZ.CONFIGURE.extra = \
-    --with-fontconfig=yes --with-freetype=yes \
+    --with-freetype=yes \
     FREETYPE_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfreetype" \
     FREETYPE_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include/freetype2" \
-    FONTCONFIG_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfontconfig" \
-    FONTCONFIG_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include"
 
-ifeq ($(BUILD.system),darwin)
-    HARFBUZZ.CONFIGURE.extra += --with-coretext=no --with-glib=no
+ifneq ($(BUILD.system),darwin)
+       # Tell configure where to find our version of fontconfig
+       HARFBUZZ.CONFIGURE.extra += \
+           --with-fontconfig=yes \
+           FONTCONFIG_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfontconfig" \
+           FONTCONFIG_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include"
+else
+    HARFBUZZ.CONFIGURE.extra += --with-coretext=yes --with-fontconfig=no --with-glib=no
 endif
 
 ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))

diff --git a/contrib/libass/module.defs b/contrib/libass/module.defs
index 0b68ff05844bc6153bba8c09a3537f8f1f3e5eb0..8201714439b82d406285345afbea309a4dd070ce 100644 (file)
--- a/contrib/libass/module.defs
+++ b/contrib/libass/module.defs
@@ -1,4 +1,9 @@
-__deps__ := YASM FONTCONFIG FREETYPE FRIBIDI HARFBUZZ
+__deps__ := YASM FREETYPE FRIBIDI HARFBUZZ
+
+ifneq ($(BUILD.system),darwin)
+    __deps__ += FONTCONFIG
+endif
+
 $(eval $(call import.MODULE.defs,LIBASS,libass,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,LIBASS))
 
@@ -6,13 +11,21 @@ LIBASS.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/libass-0.
 LIBASS.FETCH.url    += https://github.com/libass/libass/releases/download/0.13.2/libass-0.13.2.tar.gz
 LIBASS.FETCH.sha256  = 8baccf663553b62977b1c017d18b3879835da0ef79dc4d3b708f2566762f1d5e
 
-# Tell configure where to find our versions of freetype and fontconfig
+# Tell configure where to find our version of freetype
 LIBASS.CONFIGURE.extra = \
-    --enable-asm --enable-fontconfig --enable-harfbuzz \
+    --enable-asm --enable-harfbuzz \
     FREETYPE_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfreetype" \
     FREETYPE_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include/freetype2" \
-    FONTCONFIG_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfontconfig" \
-    FONTCONFIG_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include"
+
+ifneq ($(BUILD.system),darwin)
+    # Tell configure where to find our version of fontconfig
+    LIBASS.CONFIGURE.extra += \
+        --enable-fontconfig \
+        FONTCONFIG_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfontconfig" \
+        FONTCONFIG_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include"
+else
+    LIBASS.CONFIGURE.extra += --disable-fontconfig
+endif
 
 ifneq ($(BUILD.system),linux)
     LIBASS.CONFIGURE.extra += \
@@ -27,10 +40,6 @@ ifneq (1,$(BUILD.cross))
     endif
 endif
 
-ifeq ($(BUILD.system),darwin)
-    LIBASS.CONFIGURE.extra += --disable-coretext
-endif
-
 ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
     LIBASS.CONFIGURE.extra += --disable-directwrite
 endif

diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj
index 786c4e4a09a39845121bb3239c76aecc74076de8..809a76eb3f41455784ea39bef27558cbef5419d8 100644 (file)
--- a/macosx/HandBrake.xcodeproj/project.pbxproj
+++ b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -51,7 +51,6 @@
                27D6C74C14B102DA00B785E4 /* libbluray.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72C14B102DA00B785E4 /* libbluray.a */; };
                27D6C75014B102DA00B785E4 /* libdvdnav.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72E14B102DA00B785E4 /* libdvdnav.a */; };
                27D6C75214B102DA00B785E4 /* libdvdread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72F14B102DA00B785E4 /* libdvdread.a */; };
-               27D6C75614B102DA00B785E4 /* libfontconfig.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73114B102DA00B785E4 /* libfontconfig.a */; };
                27D6C75814B102DA00B785E4 /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73214B102DA00B785E4 /* libfreetype.a */; };
                27D6C75A14B102DA00B785E4 /* libfribidi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73314B102DA00B785E4 /* libfribidi.a */; };
                27D6C75F14B102DA00B785E4 /* libmp3lame.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73614B102DA00B785E4 /* libmp3lame.a */; };
@@ -121,7 +120,6 @@
                A91CE2B91C7DABBC0068F46F /* libbluray.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72C14B102DA00B785E4 /* libbluray.a */; };
                A91CE2BA1C7DABBC0068F46F /* libdvdnav.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72E14B102DA00B785E4 /* libdvdnav.a */; };
                A91CE2BB1C7DABBC0068F46F /* libdvdread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72F14B102DA00B785E4 /* libdvdread.a */; };
-               A91CE2BC1C7DABBC0068F46F /* libfontconfig.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73114B102DA00B785E4 /* libfontconfig.a */; };
                A91CE2BD1C7DABBC0068F46F /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73214B102DA00B785E4 /* libfreetype.a */; };
                A91CE2BE1C7DABBC0068F46F /* libfribidi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C73314B102DA00B785E4 /* libfribidi.a */; };
                A91CE2BF1C7DABBC0068F46F /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A95512881A320A12001BFC6F /* libjansson.a */; };
@@ -210,6 +208,10 @@
                A99F40CF1B624E7E00750170 /* HBPictureViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A99F40CD1B624E7E00750170 /* HBPictureViewController.m */; };
                A99F40D31B624EA500750170 /* HBPictureViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A99F40D11B624EA500750170 /* HBPictureViewController.xib */; };
                A9A0CBE81CCEA3670045B3DF /* HBPlayerTrack.m in Sources */ = {isa = PBXBuildFile; fileRef = A9A0CBE61CCEA1D10045B3DF /* HBPlayerTrack.m */; };
+               A9ABD1A61E2A0F0700EC8B65 /* CoreText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9ABD1A51E2A0F0700EC8B65 /* CoreText.framework */; };
+               A9ABD1A71E2A0F7500EC8B65 /* CoreText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9ABD1A51E2A0F0700EC8B65 /* CoreText.framework */; };
+               A9ABD1A91E2A0F8200EC8B65 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9ABD1A81E2A0F8200EC8B65 /* CoreGraphics.framework */; };
+               A9ABD1AA1E2A0F8F00EC8B65 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9ABD1A81E2A0F8200EC8B65 /* CoreGraphics.framework */; };
                A9BB0F2719A0ECE40079F1C1 /* HBHUDButtonCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A9BB0F2619A0ECE40079F1C1 /* HBHUDButtonCell.m */; };
                A9BC24C91A69293E007DC41A /* HBAttributedStringAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = A9BC24C81A69293E007DC41A /* HBAttributedStringAdditions.m */; };
                A9C0DB85197E7B0000DF55B3 /* SubtitlesDefaults.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9C0DB83197E7B0000DF55B3 /* SubtitlesDefaults.xib */; };
@@ -509,6 +511,8 @@
                A9AA447B1970724D00D7DEFC /* HBAdvancedController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HBAdvancedController.h; sourceTree = "<group>"; };
                A9AA447C1970726500D7DEFC /* HBQueueController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HBQueueController.h; sourceTree = "<group>"; };
                A9AA447D1970729300D7DEFC /* HBPreviewGenerator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HBPreviewGenerator.h; sourceTree = "<group>"; };
+               A9ABD1A51E2A0F0700EC8B65 /* CoreText.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreText.framework; path = System/Library/Frameworks/CoreText.framework; sourceTree = SDKROOT; };
+               A9ABD1A81E2A0F8200EC8B65 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
                A9B34D74197696FE00871B7D /* DiskArbitration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DiskArbitration.framework; path = System/Library/Frameworks/DiskArbitration.framework; sourceTree = SDKROOT; };
                A9BB0F2519A0ECE40079F1C1 /* HBHUDButtonCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBHUDButtonCell.h; sourceTree = "<group>"; };
                A9BB0F2619A0ECE40079F1C1 /* HBHUDButtonCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBHUDButtonCell.m; sourceTree = "<group>"; };
@@ -577,6 +581,8 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               A9ABD1A91E2A0F8200EC8B65 /* CoreGraphics.framework in Frameworks */,
+                               A9ABD1A71E2A0F7500EC8B65 /* CoreText.framework in Frameworks */,
                                A9E165521C523016003EF30E /* libavfilter.a in Frameworks */,
                                273F203014ADB9790021BE6D /* AudioToolbox.framework in Frameworks */,
                                273F203314ADB9F00021BE6D /* CoreServices.framework in Frameworks */,
@@ -594,7 +600,6 @@
                                27D6C74C14B102DA00B785E4 /* libbluray.a in Frameworks */,
                                27D6C75014B102DA00B785E4 /* libdvdnav.a in Frameworks */,
                                27D6C75214B102DA00B785E4 /* libdvdread.a in Frameworks */,
-                               27D6C75614B102DA00B785E4 /* libfontconfig.a in Frameworks */,
                                27D6C75814B102DA00B785E4 /* libfreetype.a in Frameworks */,
                                27D6C75A14B102DA00B785E4 /* libfribidi.a in Frameworks */,
                                27D6C75F14B102DA00B785E4 /* libmp3lame.a in Frameworks */,
@@ -630,6 +635,8 @@
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               A9ABD1AA1E2A0F8F00EC8B65 /* CoreGraphics.framework in Frameworks */,
+                               A9ABD1A61E2A0F0700EC8B65 /* CoreText.framework in Frameworks */,
                                A91119A31C7DD591001C463C /* IOKit.framework in Frameworks */,
                                A91119A21C7DD58B001C463C /* Cocoa.framework in Frameworks */,
                                A9736F1F1C7DA667008F1D18 /* Foundation.framework in Frameworks */,
@@ -649,7 +656,6 @@
                                A91CE2BA1C7DABBC0068F46F /* libdvdnav.a in Frameworks */,
                                A91CE2BB1C7DABBC0068F46F /* libdvdread.a in Frameworks */,
                                1C6D76561CD7733400F5B943 /* libharfbuzz.a in Frameworks */,
-                               A91CE2BC1C7DABBC0068F46F /* libfontconfig.a in Frameworks */,
                                A91CE2BD1C7DABBC0068F46F /* libfreetype.a in Frameworks */,
                                A91CE2BE1C7DABBC0068F46F /* libfribidi.a in Frameworks */,
                                A91CE2BF1C7DABBC0068F46F /* libjansson.a in Frameworks */,
@@ -761,6 +767,8 @@
                273F203414ADBAC30021BE6D /* Frameworks */ = {
                        isa = PBXGroup;
                        children = (
+                               A9ABD1A81E2A0F8200EC8B65 /* CoreGraphics.framework */,
+                               A9ABD1A51E2A0F0700EC8B65 /* CoreText.framework */,
                                A91CE2D31C7DABE40068F46F /* libiconv.tbd */,
                                A91CE2D11C7DABDA0068F46F /* libz.tbd */,
                                A91CE2CF1C7DABCE0068F46F /* libbz2.tbd */,

diff --git a/make/include/main.defs b/make/include/main.defs
index 9335bb19fca61a3f540b81c9f3fd787ea96acde8..a2ca1ded858887ffe1ab40ebdbdcfc6766993399 100644 (file)
--- a/make/include/main.defs
+++ b/make/include/main.defs
@@ -41,8 +41,11 @@ ifneq ($(HAS.bz2),1)
 endif
 endif
 
-ifneq (,$(filter $(BUILD.system),darwin cygwin mingw))
+ifneq (,$(filter $(BUILD.system),cygwin mingw))
     MODULES += contrib/fontconfig
+endif
+
+ifneq (,$(filter $(BUILD.system),darwin cygwin mingw))
     MODULES += contrib/freetype
     MODULES += contrib/fribidi
     MODULES += contrib/harfbuzz

diff --git a/test/module.defs b/test/module.defs
index 3750d6efddc75627dbe2a8bf701dc3676def96b8..5f19ebecc9187e7843df3f0d5d077cff94aa7a61 100644 (file)
--- a/test/module.defs
+++ b/test/module.defs
@@ -15,10 +15,14 @@ TEST.libs = $(LIBHB.a)
 
 TEST.GCC.l = \
         ass avresample avformat avcodec avfilter avutil mp3lame dvdnav \
-        dvdread fontconfig fribidi \
+        dvdread fribidi \
         samplerate swscale vpx theoraenc theoradec vorbis vorbisenc ogg x264 \
         bluray freetype xml2 bz2 z jansson harfbuzz opus
 
+ifneq ($(BUILD.system),darwin)
+    TEST.GCC.l += fontconfig
+endif
+
 ifeq (1,$(FEATURE.qsv))
     TEST.GCC.D += USE_QSV HAVE_THREADS=1
 ifeq ($(BUILD.system),linux)
@@ -51,7 +55,7 @@ BUILD.out += $(TEST.install.exe)
 TEST.GCC.I += $(LIBHB.GCC.I)
 
 ifeq ($(BUILD.system),darwin)
-    TEST.GCC.f += IOKit CoreServices AudioToolbox Foundation
+    TEST.GCC.f += IOKit CoreServices CoreText CoreGraphics AudioToolbox Foundation
     TEST.GCC.l += iconv
 else ifeq ($(BUILD.system),linux)
     TEST.GCC.l += pthread dl m