Thu May 10 21:48:15 2018 UTC ()
SDL2_ttf: use pkg-config to find freetype2.
(wiz)
diff -r1.9 -r1.10 pkgsrc/fonts/SDL2_ttf/Makefile
diff -r1.4 -r1.5 pkgsrc/fonts/SDL2_ttf/distinfo
diff -r0 -r1.1 pkgsrc/fonts/SDL2_ttf/patches/patch-configure
--- pkgsrc/fonts/SDL2_ttf/Makefile 2017/09/16 19:26:56 1.9
+++ pkgsrc/fonts/SDL2_ttf/Makefile 2018/05/10 21:48:15 1.10
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2017/09/16 19:26:56 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2018/05/10 21:48:15 wiz Exp $
DISTNAME= SDL2_ttf-2.0.14
CATEGORIES= devel
@@ -10,6 +10,7 @@
LICENSE= zlib
USE_LIBTOOL= yes
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= yes
PKGCONFIG_OVERRIDE+= SDL2_ttf.pc.in
--- pkgsrc/fonts/SDL2_ttf/distinfo 2016/02/07 14:11:33 1.4
+++ pkgsrc/fonts/SDL2_ttf/distinfo 2018/05/10 21:48:15 1.5
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2016/02/07 14:11:33 wiz Exp $
+$NetBSD: distinfo,v 1.5 2018/05/10 21:48:15 wiz Exp $
SHA1 (SDL2_ttf-2.0.14.tar.gz) = 34c5fdc8508c7e14356579477f9ca2b0d6c06ffc
RMD160 (SDL2_ttf-2.0.14.tar.gz) = a3cfa00535220c8dc9034bc94dce064fb22c4b85
SHA512 (SDL2_ttf-2.0.14.tar.gz) = 4db817573fd216e26180f4c401cc869ce407589a461032fd7167dc612d35e038cca1ab67be7909b6b49c741581a68125ab46362ad8e3c0a2cdd39624ad847099
Size (SDL2_ttf-2.0.14.tar.gz) = 4147462 bytes
+SHA1 (patch-configure) = 6a207d14e3f3ff2aac0bf15e31f4ddf07ad13a25
$NetBSD: patch-configure,v 1.1 2018/05/10 21:48:15 wiz Exp $
Hack around freetype2>=2.9.1 not having freetype-config any longer.
--- configure.orig 2016-02-01 21:41:46.000000000 +0000
+++ configure
@@ -11773,8 +11773,8 @@ if test "$FREETYPE_CONFIG" = "no" ; then
*** Unable to find FreeType2 library (http://www.freetype.org/)
" "$LINENO" 5
else
- CFLAGS="$CFLAGS `$FREETYPE_CONFIG $freetypeconf_args --cflags`"
- LIBS="$LIBS `$FREETYPE_CONFIG $freetypeconf_args --libs`"
+ CFLAGS="$CFLAGS `$FREETYPE_CONFIG $freetypeconf_args --cflags` `pkg-config freetype2 --cflags`"
+ LIBS="$LIBS `$FREETYPE_CONFIG $freetypeconf_args --libs` `pkg-config freetype2 --libs`"
fi
SDL_VERSION=2.0.0