[vlc-commits] [Git][videolan/vlc][master] 2 commits: contrib: fontconfig: remove dubious libfontconfig.la patching

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
b5953056 by Steve Lhomme at 2022-12-06T08:26:20+00:00
contrib: fontconfig: remove dubious libfontconfig.la patching

Originally introduced in f1faa9d8e7511839f897ba61f9b996ee94dc92ef and
modified in b8fd571826ec95ad5d6f5e51300c7b71b69045f1. We might not even
need a HAVE_MACOSX differentiation.

- - - - -
c1fb764d by Steve Lhomme at 2022-12-06T08:26:20+00:00
contrib: fontconfig: build out of tree

Avoid recreating the gperf file on macos as it seems to fail otherwise.

- - - - -


1 changed file:

- contrib/src/fontconfig/rules.mak


Changes:

=====================================
contrib/src/fontconfig/rules.mak
=====================================
@@ -18,10 +18,17 @@ $(TARBALLS)/fontconfig-$(FONTCONFIG_VERSION).tar.gz:
 fontconfig: fontconfig-$(FONTCONFIG_VERSION).tar.gz .sum-fontconfig
 	$(UNPACK)
 	$(RM) $(UNPACK_DIR)/src/fcobjshash.gperf
+	# include the generated fcobjshash.h, not the one from src/
+	sed -i.orig -e 's,"fcobjshash.h",<fcobjshash.h>,' $(UNPACK_DIR)/src/fcobjs.c
 	$(call pkg_static, "fontconfig.pc.in")
 	$(MOVE)
 
 FONTCONFIG_CONF := --enable-libxml2 --disable-docs
+FONTCONFIG_INSTALL :=
+ifdef HAVE_MACOSX
+# fc-cache crashes on macOS
+FONTCONFIG_INSTALL += RUN_FC_CACHE_TEST=false
+endif
 
 # FreeType flags
 ifneq ($(findstring freetype2,$(PKGS)),)
@@ -42,15 +49,8 @@ endif
 DEPS_fontconfig = freetype2 $(DEPS_freetype2) libxml2 $(DEPS_libxml2)
 
 .fontconfig: fontconfig
-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(FONTCONFIG_CONF)
-	$(MAKE) -C $<
-ifndef HAVE_MACOSX
-	$(MAKE) -C $< install
-else
-	$(MAKE) -C $< install-exec
-	$(MAKE) -C $< -C fontconfig
-	$(MAKE) -C $< -C fontconfig install-data
-	sed -e 's%/usr/lib/libiconv.la%%' -i.orig $(PREFIX)/lib/libfontconfig.la
-	cp $</fontconfig.pc $(PREFIX)/lib/pkgconfig/
-endif
+	$(MAKEBUILDDIR)
+	$(MAKECONFIGURE) $(FONTCONFIG_CONF)
+	+$(MAKEBUILD)
+	+$(MAKEBUILD) $(FONTCONFIG_INSTALL) install
 	touch $@



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/b3f42a9a2039770311a7641aeeabb2c8958859f1...c1fb764d35d8ba732f8628a99c3b1ebb87b599c9

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/b3f42a9a2039770311a7641aeeabb2c8958859f1...c1fb764d35d8ba732f8628a99c3b1ebb87b599c9
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance