[vlc-commits] [Git][videolan/vlc][master] contrib: freetype2: build with CMake

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
d9c9482b by Steve Lhomme at 2022-09-20T06:45:10+00:00
contrib: freetype2: build with CMake

So we don't use a home made build system that doesn't allow out of tree builds.

- - - - -


1 changed file:

- contrib/src/freetype2/rules.mak


Changes:

=====================================
contrib/src/freetype2/rules.mak
=====================================
@@ -20,12 +20,13 @@ freetype: freetype-$(FREETYPE2_VERSION).tar.xz .sum-freetype2
 
 DEPS_freetype2 = zlib $(DEPS_zlib)
 
-.freetype2: freetype
+FREETYPE_CONF = -DFT_DISABLE_ZLIB=OFF -DFT_DISABLE_PNG=ON -DFT_DISABLE_BZIP2=NO -DDISABLE_FORCE_DEBUG_POSTFIX:BOOL=ON
+
+.freetype2: freetype toolchain.cmake
 ifndef AD_CLAUSES
 	$(REQUIRE_GPL)
 endif
-	cd $< && cp builds/unix/install-sh .
-	sed -i.orig s/-ansi// $</builds/unix/configure
-	cd $< && GNUMAKE=$(MAKE) $(HOSTVARS) ./configure --with-harfbuzz=no --with-zlib=yes --without-png --with-bzip2=no $(HOSTCONF)
-	cd $< && $(MAKE) && $(MAKE) install
+	$(CMAKECLEAN)
+	$(HOSTVARS) $(CMAKE) $(FREETYPE_CONF)
+	+$(CMAKEBUILD) --target install
 	touch $@



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/d9c9482b253762312bcb5c0ab5043e34bb23575f

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


VideoLAN code repository instance