diff graphics/libgd/libgd.sh @ 904:25a95c53d800

vanilla: rename FREETYPE to TTF, closes #2202
author David Demelier <markand@malikania.fr>
date Mon, 26 Aug 2019 20:20:00 +0200
parents a133976e0783
children ddab65a5b3f5
line wrap: on
line diff
--- 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