Mercurial > vanilla

changeset 904:25a95c53d800

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
vanilla: rename FREETYPE to TTF, closes #2202
author David Demelier <markand@malikania.fr>
date Mon, 26 Aug 2019 20:20:00 +0200
parents 931d2626ae5f
children ddd05af79e28
files Docs/options.md emulation/retroarch/retroarch.sh fonts/harfbuzz/harfbuzz.sh graphics/cairo/cairo.sh graphics/graphviz/graphviz.sh graphics/libgd/libgd.sh multimedia/ffmpeg/ffmpeg.sh multimedia/libbluray/libbluray.sh qt/qtbase/qtbase.sh terminals/xterm/xterm.sh x11/xclock/xclock.sh
diffstat 11 files changed, 91 insertions(+), 90 deletions(-) [+]
line wrap: on
line diff
--- a/Docs/options.md	Mon Aug 26 20:45:00 2019 +0200
+++ b/Docs/options.md	Mon Aug 26 20:20:00 2019 +0200
@@ -25,7 +25,6 @@
 - FFI: enable foreign function interface support
 - FLAC: enable flac support
 - FONTCONFIG: enable fontconfig support
-- FREETYPE: enable freetype support
 - GALLIUM: enable LLVM gallium support
 - GDBM: enable GNU database support
 - GEOLOCATION: enable geolocation positioning support
@@ -91,6 +90,7 @@
 - THEORA: enable theora video codec support
 - TIFF: enable TIFF image format support
 - TRUECOLOR: enable truecolor in terminal applications
+- TTF: enable truetype font support (usually freetype)
 - UDEV: enable eudev support
 - UPOWER: enable upower system support
 - UUID: enable UUID support
--- a/emulation/retroarch/retroarch.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/emulation/retroarch/retroarch.sh	Mon Aug 26 20:20:00 2019 +0200
@@ -27,7 +27,6 @@
             DBUS
             FFMPEG
             FLAC
-            FREETYPE
             JACK
             KMS
             OPENAL
@@ -35,6 +34,7 @@
             PULSEAUDIO
             QT
             SDL2
+            TTF
             UDEV
             USB
             WAYLAND
@@ -54,7 +54,6 @@
 : ${DBUS:=no}
 : ${FFMPEG:=yes}
 : ${FLAC:=yes}
-: ${FREETYPE:=yes}
 : ${JACK:=yes}
 : ${KMS:=yes}
 : ${OPENAL:=yes}
@@ -62,6 +61,7 @@
 : ${PULSEAUDIO:=yes}
 : ${QT:=yes}
 : ${SDL2:=yes}
+: ${TTF:=yes}
 : ${UDEV:=yes}
 : ${USB:=yes}
 : ${WAYLAND:=yes}
@@ -96,13 +96,6 @@
 	with_flac="--disable-flac"
 fi
 
-if [ "$FREETYPE" = "yes" ]; then
-	PKGDEPENDS="freetype $PKGDEPENDS"
-	with_freetype="--enable-freetype"
-else
-	with_freetype="--disable-freetype"
-fi
-
 if [ "$JACK" = "yes" ]; then
 	PKGDEPENDS="audio/jack $PKGDEPENDS"
 	with_jack="--enable-jack"
@@ -155,6 +148,13 @@
 	with_sdl2="--disable-sdl2"
 fi
 
+if [ "$TTF" = "yes" ]; then
+	PKGDEPENDS="freetype $PKGDEPENDS"
+	with_ttf="--enable-freetype"
+else
+	with_ttf="--disable-freetype"
+fi
+
 if [ "$UDEV" = "yes" ]; then
 	PKGDEPENDS="eudev $PKGDEPENDS"
 	with_udev="--enable-udev"
@@ -227,7 +227,6 @@
 		$with_alsa \
 		$with_dbus \
 		$with_ffmpeg \
-		$with_freetype \
 		$with_jack \
 		$with_kms \
 		$with_openal \
@@ -235,6 +234,7 @@
 		$with_pulseaudio \
 		$with_qt \
 		$with_sdl2 \
+		$with_ttf \
 		$with_udev \
 		$with_usb \
 		$with_wayland \
--- a/fonts/harfbuzz/harfbuzz.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/fonts/harfbuzz/harfbuzz.sh	Mon Aug 26 20:20:00 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="MIT"
 PKGSUMMARY="OpenType text shaping engine"
 PKGDOWNLOAD="https://www.freedesktop.org/software/$PKGNAME/release/$PKGNAME-$PKGVERSION.tar.bz2"
-PKGOPTIONS="CAIRO FONTCONFIG FREETYPE GLIB ICU"
+PKGOPTIONS="CAIRO FONTCONFIG GLIB ICU TTF"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
@@ -33,9 +33,9 @@
 : ${LIBS:=}
 : ${CAIRO:=yes}
 : ${FONTCONFIG:=yes}
-: ${FREETYPE:=yes}
 : ${GLIB:=yes}
 : ${ICU:=yes}
+: ${TTF:=yes}
 
 if [ "$CAIRO" = "yes" ]; then
 	PKGDEPENDS="cairo $PKGDEPENDS"
@@ -51,13 +51,6 @@
 	with_fontconfig="--without-fontconfig"
 fi
 
-if [ "$FREETYPE" = "yes" ]; then
-	PKGDEPENDS="freetype $PKGDEPENDS"
-	with_freetype="--with-freetype"
-else
-	with_freetype="--without-freetype"
-fi
-
 if [ "$GLIB" = "yes" ]; then
 	PKGDEPENDS="glib $PKGDEPENDS"
 	with_glib="--with-glib --with-gobject"
@@ -72,6 +65,14 @@
 	with_icu="--without-icu"
 fi
 
+if [ "$TTF" = "yes" ]; then
+	PKGDEPENDS="freetype $PKGDEPENDS"
+	with_ttf="--with-freetype"
+else
+	with_ttf="--without-freetype"
+fi
+
+
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
@@ -90,9 +91,9 @@
 		--prefix= \
 		$with_cairo \
 		$with_fontconfig \
-		$with_freetype \
 		$with_glib \
-		$with_icu
+		$with_icu \
+		$with_ttf
 	make
 	make install DESTDIR=$DESTDIR
 	find $DESTDIR -type f -name "*.la" -delete
--- a/graphics/cairo/cairo.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/graphics/cairo/cairo.sh	Mon Aug 26 20:20:00 2019 +0200
@@ -22,7 +22,7 @@
 PKGSUMMARY="vector graphics library"
 PKGDOWNLOAD="https://cairographics.org/releases/$PKGNAME-$PKGVERSION.tar.xz"
 PKGDEPENDS="pixman"
-PKGOPTIONS="DRM EGL FONTCONFIG FREETYPE GALLIUM GLES2 GLES3 GLIB PDF PNG SVG X"
+PKGOPTIONS="DRM EGL FONTCONFIG GALLIUM GLES2 GLES3 GLIB PDF PNG SVG TTF X"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
@@ -33,7 +33,6 @@
 : ${DRM:=no}
 : ${EGL:=no}
 : ${FONTCONFIG:=yes}
-: ${FREETYPE:=yes}
 : ${GALLIUM:=no}
 : ${GLES2:=no}
 : ${GLES3:=no}
@@ -41,6 +40,7 @@
 : ${PDF:=yes}
 : ${PNG:=yes}
 : ${SVG:=yes}
+: ${TTF:=yes}
 : ${X:=yes}
 
 if [ "$DRM" = "yes" ]; then
@@ -57,13 +57,6 @@
 	with_fontconfig="--disable-fc"
 fi
 
-if [ "$FREETYPE" = "yes" ]; then
-	PKGDEPENDS="freetype $PKGDEPENDS"
-	with_freetype="--enable-ft"
-else
-	with_freetype="--disable-ft"
-fi
-
 # All these options require mesa.
 if [ "$EGL" = "yes" ] || [ "$GALLIUM" = "yes" ] || [ "$GLES2" = "yes" ] || [ "$GLES3" = "yes" ]; then
 	PKGDEPENDS="mesa $PKGDEPENDS"
@@ -115,6 +108,13 @@
 	with_svg="--disable-svg"
 fi
 
+if [ "$TTF" = "yes" ]; then
+	PKGDEPENDS="freetype $PKGDEPENDS"
+	with_ttf="--enable-ft"
+else
+	with_ttf="--disable-ft"
+fi
+
 if [ "$X" = "yes" ]; then
 	PKGDEPENDS="libxrender libxext libx11 libxcb"
 	with_x="--enable-xlib $with_x"
@@ -148,7 +148,6 @@
 		--enable-shared \
 		$with_drm \
 		$with_fontconfig \
-		$with_freetype \
 		$with_egl \
 		$with_gles2 \
 		$with_gles3 \
@@ -156,6 +155,7 @@
 		$with_pdf \
 		$with_png \
 		$with_svg \
+		$with_ttf \
 		$with_x
 	make
 	make install DESTDIR=$DESTDIR
--- a/graphics/graphviz/graphviz.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/graphics/graphviz/graphviz.sh	Mon Aug 26 20:20:00 2019 +0200
@@ -22,7 +22,7 @@
 PKGSUMMARY="graph drawing programs"
 PKGDOWNLOAD="http://files.malikania.fr/distfiles/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="libtool bash:build"
-PKGOPTIONS="FONTCONFIG FREETYPE GD GTK PANGO WEBP X XML"
+PKGOPTIONS="FONTCONFIG GD GTK PANGO TTF WEBP X XML"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
@@ -33,10 +33,10 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}
 : ${FONTCONFIG:=yes}
-: ${FREETYPE:=yes}
 : ${GD:=yes}
 : ${GTK:=yes}
 : ${PANGO:=yes}
+: ${TTF:=yes}
 : ${WEBP:=no}
 : ${X:=yes}
 : ${XML:=yes}
@@ -48,13 +48,6 @@
 	with_fontconfig="--without-fontconfig"
 fi
 
-if [ "$FREETYPE" = "yes" ]; then
-	PKGDEPENDS="freetype $PKGDEPENDS"
-	with_freetype="--with-freetype2"
-else
-	with_freetype="--without-freetype2"
-fi
-
 if [ "$GD" = "yes" ]; then
 	PKGDEPENDS="libgd $PKGDEPENDS"
 	with_gd="--with-libgd"
@@ -76,6 +69,13 @@
 	with_pango="--without-pangocairo"
 fi
 
+if [ "$TTF" = "yes" ]; then
+	PKGDEPENDS="freetype $PKGDEPENDS"
+	with_ttf="--with-freetype2"
+else
+	with_ttf="--without-freetype2"
+fi
+
 if [ "$WEBP" = "yes" ]; then
 	PKGDEPENDS="graphics/webp $PKGDEPENDS"
 	with_webp="--with-webp"
@@ -148,10 +148,10 @@
 		--without-ipsepcola \
 		--with-sfdp \
 		$with_fontconfig \
-		$with_freetype \
 		$with_gd \
 		$with_gtk \
 		$with_pango \
+		$with_ttf \
 		$with_webp \
 		$with_x \
 		$with_xml
--- a/graphics/libgd/libgd.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/graphics/libgd/libgd.sh	Mon Aug 26 20:20:00 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="library for the dynamic creation of images"
 PKGDOWNLOAD="https://github.com/libgd/libgd/releases/download/gd-$PKGVERSION/$PKGNAME-$PKGVERSION.tar.xz"
-PKGOPTIONS="FONTCONFIG FREETYPE JPEG LIQ PNG TIFF WEBP X ZLIB"
+PKGOPTIONS="FONTCONFIG JPEG LIQ PNG TIFF TTF WEBP X ZLIB"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
@@ -30,11 +30,11 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}
 : ${FONTCONFIG:=no}
-: ${FREETYPE:=no}
 : ${JPEG:=yes}
 : ${LIQ:=no}
 : ${PNG:=yes}
 : ${TIFF:=no}
+: ${TTF:=no}
 : ${WEBP:=no}
 : ${X:=no}
 : ${ZLIB:=no}
@@ -46,13 +46,6 @@
 	with_fontconfig="--without-fontconfig"
 fi
 
-if [ "$FREETYPE" = "yes" ]; then
-	PKGDEPENDS="freetype $PKGDEPENDS"
-	with_freetype="--with-freetype"
-else
-	with_freetype="--without-freetype"
-fi
-
 if [ "$JPEG" = "yes" ]; then
 	PKGDEPENDS="libjpeg-turbo $PKGDEPENDS"
 	with_jpeg="--with-jpeg"
@@ -81,6 +74,13 @@
 	with_tiff="--without-tiff"
 fi
 
+if [ "$TTF" = "yes" ]; then
+	PKGDEPENDS="freetype $PKGDEPENDS"
+	with_ttf="--with-freetype"
+else
+	with_ttf="--without-freetype"
+fi
+
 if [ "$WEBP" = "yes" ]; then
 	PKGDEPENDS="graphics/webp $PKGDEPENDS"
 	with_webp="--with-webp"
@@ -118,11 +118,11 @@
 		--prefix= \
 		--enable-shared \
 		$with_fontconfig \
-		$with_freetype \
 		$with_jpeg \
 		$with_liq \
 		$with_png \
 		$with_tiff \
+		$with_ttf \
 		$with_webp \
 		$with_x \
 		$with_zlib
--- a/multimedia/ffmpeg/ffmpeg.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/multimedia/ffmpeg/ffmpeg.sh	Mon Aug 26 20:20:00 2019 +0200
@@ -56,7 +56,6 @@
             BZIP2
             CRYPTO
             FONTCONFIG
-            FREETYPE
             FRIBIDI
             GMP
             JACK
@@ -70,6 +69,7 @@
             SSL
             SVG
             THEORA
+            TTF
             VORBIS
             WEBP
             X
@@ -82,7 +82,6 @@
 : ${BZIP2:=yes}
 : ${CRYPTO:=no}
 : ${FONTCONFIG:=no}
-: ${FREETYPE:=no}
 : ${FRIBIDI:=no}
 : ${GMP:=no}
 : ${JACK:=no}
@@ -96,6 +95,7 @@
 : ${SSL:=no}
 : ${SVG:=no}
 : ${THEORA:=no}
+: ${TTF:=no}
 : ${VORBIS:=no}
 : ${WEBP:=no}
 : ${X265:=no}
@@ -138,13 +138,6 @@
 	with_fontconfig="--disable-fontconfig"
 fi
 
-if [ "$FREETYPE" = "yes" ]; then
-	PKGDEPENDS="freetype $PKGDEPENDS"
-	with_freetype="--enable-libfreetype"
-else
-	with_freetype="--disable-libfreetype"
-fi
-
 if [ "$FRIBIDI" = "yes" ]; then
 	PKGDEPENDS="fonts/fribidi $PKGDEPENDS"
 	with_fribidi="--enable-libfribidi"
@@ -239,6 +232,13 @@
 	with_theora="--disable-libtheora"
 fi
 
+if [ "$TTF" = "yes" ]; then
+	PKGDEPENDS="freetype $PKGDEPENDS"
+	with_ttf="--enable-libfreetype"
+else
+	with_ttf="--disable-libfreetype"
+fi
+
 if [ "$VORBIS" = "yes" ]; then
 	PKGDEPENDS="libvorbis $PKGDEPENDS"
 	with_vorbis="--enable-libvorbis"
@@ -317,7 +317,6 @@
 		$with_bzip2 \
 		$with_crypto \
 		$with_fontconfig \
-		$with_freetype \
 		$with_fribidi \
 		$with_gmp \
 		$with_jack \
@@ -331,6 +330,7 @@
 		$with_ssl \
 		$with_svg \
 		$with_theora \
+		$with_ttf \
 		$with_vorbis \
 		$with_webp \
 		$with_x265 \
--- a/multimedia/libbluray/libbluray.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/multimedia/libbluray/libbluray.sh	Mon Aug 26 20:20:00 2019 +0200
@@ -21,7 +21,7 @@
 PKGLICENSE="LGPLv21+"
 PKGSUMMARY="bluray access library"
 PKGDOWNLOAD="https://download.videolan.org/pub/videolan/$PKGNAME/$PKGVERSION/$PKGNAME-$PKGVERSION.tar.bz2"
-PKGOPTIONS="FONTCONFIG FREETYPE XML"
+PKGOPTIONS="FONTCONFIG TTF XML"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
@@ -30,7 +30,7 @@
 : ${LDFLAGS:=}
 : ${LIBS:=}
 : ${FONTCONFIG:=yes}
-: ${FREETYPE:=yes}
+: ${TTF:=yes}
 : ${XML:=yes}
 
 if [ "$FONTCONFIG" = "yes" ]; then
@@ -40,11 +40,11 @@
 	with_fontconfig="--without-fontconfig"
 fi
 
-if [ "$FREETYPE" = "yes" ]; then
+if [ "$TTF" = "yes" ]; then
 	PKGDEPENDS="freetype $PKGDEPENDS"
-	with_freetype="--with-freetype"
+	with_ttf="--with-freetype"
 else
-	with_freetype="--without-freetype"
+	with_ttf="--without-freetype"
 fi
 
 if [ "$XML" = "yes" ]; then
@@ -72,7 +72,7 @@
 		--disable-bdjava-jar \
 		--enable-shared \
 		$with_fontconfig \
-		$with_freetype \
+		$with_ttf \
 		$with_xml
 	make
 	make install DESTDIR=$DESTDIR
--- a/qt/qtbase/qtbase.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/qt/qtbase/qtbase.sh	Mon Aug 26 20:20:00 2019 +0200
@@ -30,7 +30,6 @@
             DBUS
             EVDEV
             FONTCONFIG
-            FREETYPE
             GLIB
             GTK
             GUI
@@ -44,6 +43,7 @@
             PNG
             SSL
             SYSLOG
+            TTF
             UDEV
             X
             ZLIB"
@@ -55,10 +55,9 @@
 : ${DBUS:=yes}
 : ${EVDEV:=yes}
 : ${FONTCONFIG:=yes}
-: ${FREETYPE:=yes}
 : ${GLIB:=yes}
 : ${GTK:=yes}
-: ${GUI:=yes}           # requires FREETYPE
+: ${GUI:=yes}           # requires TTF
 : ${HARFBUZZ:=yes}
 : ${ICU:=yes}
 : ${JPEG:=yes}
@@ -69,6 +68,7 @@
 : ${PNG:=yes}
 : ${SSL:=yes}
 : ${SYSLOG:=no}
+: ${TTF:=yes}
 : ${UDEV:=yes}
 : ${X:=yes}
 : ${ZLIB:=yes}
@@ -127,11 +127,11 @@
 	with_fontconfig="-no-fontconfig"
 fi
 
-if [ "$FREETYPE" = "yes" ]; then
+if [ "$TTF" = "yes" ]; then
 	PKGDEPENDS="freetype $PKGDEPENDS"
-	with_freetype="-system-freetype"
+	with_ttf="-system-freetype"
 else
-	with_freetype="-no-freetype"
+	with_ttf="-no-freetype"
 fi
 
 if [ "$GLIB" = "yes" ]; then
@@ -149,9 +149,9 @@
 fi
 
 if [ "$GUI" = "yes" ]; then
-        if [ "$FREETYPE" != "yes" ]; then
-                echo "warning: GUI requires FREETYPE" 1>&2
-        fi
+	if [ "$TTF" != "yes" ]; then
+		echo "warning: GUI requires TTF" 1>&2
+	fi
 
 	with_gui="-gui"
 else
@@ -275,7 +275,6 @@
 		$with_dbus \
 		$with_evdev \
 		$with_fontconfig \
-		$with_freetype \
 		$with_glib \
 		$with_gtk \
 		$with_gui \
@@ -287,6 +286,7 @@
 		$with_png \
 		$with_ssl \
 		$with_syslog \
+		$with_ttf \
 		$with_udev \
 		$with_x \
 		$with_zlib
--- a/terminals/xterm/xterm.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/terminals/xterm/xterm.sh	Mon Aug 26 20:20:00 2019 +0200
@@ -22,7 +22,7 @@
 PKGSUMMARY="CUSTOM"
 PKGDOWNLOAD="ftp://ftp.invisible-island.net/pub/$PKGNAME/$PKGNAME-$PKGVERSION.tgz"
 PKGDEPENDS="luit"
-PKGOPTIONS="FREETYPE"
+PKGOPTIONS="TTF"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
@@ -30,13 +30,13 @@
 : ${CFLAGS:=-O2}
 : ${LDFLAGS:=}
 : ${LIBS:=}
-: ${FREETYPE:=yes}
+: ${TTF:=yes}
 
-if [ "$FREETYPE" = "yes" ]; then
+if [ "$TTF" = "yes" ]; then
 	PKGDEPENDS="freetype $PKGDEPENDS"
-	with_freetype="--enable-freetype"
+	with_ttf="--enable-freetype"
 else
-	with_freetype="--disable-freetype"
+	with_ttf="--disable-freetype"
 fi
 
 build()
@@ -56,7 +56,7 @@
 		--host=$CHOST \
 		--prefix= \
 		--enable-luit \
-		$with_freetype
+		$with_ttf
 	make
 	make install DESTDIR=$DESTDIR
 
--- a/x11/xclock/xclock.sh	Mon Aug 26 20:45:00 2019 +0200
+++ b/x11/xclock/xclock.sh	Mon Aug 26 20:20:00 2019 +0200
@@ -26,7 +26,7 @@
             libxaw
             util-macros:build
             xorgproto:build"
-PKGOPTIONS="FREETYPE"
+PKGOPTIONS="TTF"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
@@ -34,13 +34,13 @@
 : ${CFLAGS:=-O2}
 : ${LDFLAGS:=}
 : ${LIBS:=}
-: ${FREETYPE:=yes}
+: ${TTF:=yes}
 
-if [ "$FREETYPE" = "yes" ]; then
+if [ "$TTF" = "yes" ]; then
 	PKGDEPENDS="libxft $PKGDEPENDS"
-	with_freetype="--with-xft"
+	with_ttf="--with-xft"
 else
-	with_freetype="--without-xft"
+	with_ttf="--without-xft"
 fi
 
 build()
@@ -57,7 +57,7 @@
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix= \
-		$with_freetype
+		$with_ttf
 	make
 	make install DESTDIR=$DESTDIR