pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/fonts/SDL2_ttf SDL2_ttf: use pkg-config to find freety...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6ce214fee27e
branches:  trunk
changeset: 380068:6ce214fee27e
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu May 10 21:48:15 2018 +0000

description:
SDL2_ttf: use pkg-config to find freetype2.

diffstat:

 fonts/SDL2_ttf/Makefile                |   3 ++-
 fonts/SDL2_ttf/distinfo                |   3 ++-
 fonts/SDL2_ttf/patches/patch-configure |  17 +++++++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diffs (50 lines):

diff -r 739ae69eadb7 -r 6ce214fee27e fonts/SDL2_ttf/Makefile
--- a/fonts/SDL2_ttf/Makefile   Thu May 10 21:10:38 2018 +0000
+++ b/fonts/SDL2_ttf/Makefile   Thu May 10 21:48:15 2018 +0000
@@ -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
diff -r 739ae69eadb7 -r 6ce214fee27e fonts/SDL2_ttf/distinfo
--- a/fonts/SDL2_ttf/distinfo   Thu May 10 21:10:38 2018 +0000
+++ b/fonts/SDL2_ttf/distinfo   Thu May 10 21:48:15 2018 +0000
@@ -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
diff -r 739ae69eadb7 -r 6ce214fee27e fonts/SDL2_ttf/patches/patch-configure
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/fonts/SDL2_ttf/patches/patch-configure    Thu May 10 21:48:15 2018 +0000
@@ -0,0 +1,17 @@
+$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



Home | Main Index | Thread Index | Old Index