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
cvs diff -r1.9 -r1.10 pkgsrc/fonts/SDL2_ttf/Makefile (expand / switch to unified diff)

--- 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,20 +1,21 @@ @@ -1,20 +1,21 @@
1# $NetBSD: Makefile,v 1.9 2017/09/16 19:26:56 wiz Exp $ 1# $NetBSD: Makefile,v 1.10 2018/05/10 21:48:15 wiz Exp $
2 2
3DISTNAME= SDL2_ttf-2.0.14 3DISTNAME= SDL2_ttf-2.0.14
4CATEGORIES= devel 4CATEGORIES= devel
5MASTER_SITES= https://www.libsdl.org/projects/SDL_ttf/release/ 5MASTER_SITES= https://www.libsdl.org/projects/SDL_ttf/release/
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://www.libsdl.org/projects/SDL_ttf/ 8HOMEPAGE= http://www.libsdl.org/projects/SDL_ttf/
9COMMENT= Use TrueType fonts in your SDL2 applications 9COMMENT= Use TrueType fonts in your SDL2 applications
10LICENSE= zlib 10LICENSE= zlib
11 11
12USE_LIBTOOL= yes 12USE_LIBTOOL= yes
 13USE_TOOLS+= pkg-config
13GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
14 15
15PKGCONFIG_OVERRIDE+= SDL2_ttf.pc.in 16PKGCONFIG_OVERRIDE+= SDL2_ttf.pc.in
16 17
17.include "../../devel/SDL2/buildlink3.mk" 18.include "../../devel/SDL2/buildlink3.mk"
18.include "../../devel/zlib/buildlink3.mk" 19.include "../../devel/zlib/buildlink3.mk"
19.include "../../graphics/freetype2/buildlink3.mk" 20.include "../../graphics/freetype2/buildlink3.mk"
20.include "../../mk/bsd.pkg.mk" 21.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/fonts/SDL2_ttf/distinfo (expand / switch to unified diff)

--- 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 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.4 2016/02/07 14:11:33 wiz Exp $ 1$NetBSD: distinfo,v 1.5 2018/05/10 21:48:15 wiz Exp $
2 2
3SHA1 (SDL2_ttf-2.0.14.tar.gz) = 34c5fdc8508c7e14356579477f9ca2b0d6c06ffc 3SHA1 (SDL2_ttf-2.0.14.tar.gz) = 34c5fdc8508c7e14356579477f9ca2b0d6c06ffc
4RMD160 (SDL2_ttf-2.0.14.tar.gz) = a3cfa00535220c8dc9034bc94dce064fb22c4b85 4RMD160 (SDL2_ttf-2.0.14.tar.gz) = a3cfa00535220c8dc9034bc94dce064fb22c4b85
5SHA512 (SDL2_ttf-2.0.14.tar.gz) = 4db817573fd216e26180f4c401cc869ce407589a461032fd7167dc612d35e038cca1ab67be7909b6b49c741581a68125ab46362ad8e3c0a2cdd39624ad847099 5SHA512 (SDL2_ttf-2.0.14.tar.gz) = 4db817573fd216e26180f4c401cc869ce407589a461032fd7167dc612d35e038cca1ab67be7909b6b49c741581a68125ab46362ad8e3c0a2cdd39624ad847099
6Size (SDL2_ttf-2.0.14.tar.gz) = 4147462 bytes 6Size (SDL2_ttf-2.0.14.tar.gz) = 4147462 bytes
 7SHA1 (patch-configure) = 6a207d14e3f3ff2aac0bf15e31f4ddf07ad13a25
File Added: pkgsrc/fonts/SDL2_ttf/patches/Attic/patch-configure
$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