Mercurial > vanilla
diff graphics/cairo/cairo.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/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