diff multimedia/ffmpeg/ffmpeg.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/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 \