git: de6064a1368a - main - graphics/sdl_ttf: prepare for freetype2 update

Tobias C. Berner tcberner at FreeBSD.org
Sat Aug 7 07:39:17 UTC 2021


The branch main has been updated by tcberner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=de6064a1368a5d7986a0e050de996b468542c4ca

commit de6064a1368a5d7986a0e050de996b468542c4ca
Author:     Tobias C. Berner <tcberner at FreeBSD.org>
AuthorDate: 2021-08-07 07:36:08 +0000
Commit:     Tobias C. Berner <tcberner at FreeBSD.org>
CommitDate: 2021-08-07 07:36:08 +0000

    graphics/sdl_ttf: prepare for freetype2 update
    
    - freetype2 will no longer ship freetype-config (which was a pkg-config
    wrapper) in the near future -- use pkg-config to gather the required
    flags.
    
    PR:             251512
---
 graphics/sdl_ttf/Makefile              |  2 ++
 graphics/sdl_ttf/files/patch-configure | 13 +++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/graphics/sdl_ttf/Makefile b/graphics/sdl_ttf/Makefile
index 6f90b561aa6f..1f9ee82e1c1f 100644
--- a/graphics/sdl_ttf/Makefile
+++ b/graphics/sdl_ttf/Makefile
@@ -22,6 +22,8 @@ USE_GL=		gl
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
+BINARY_ALIAS=	freetype-config=true
+
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/.libs/glfont ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/.libs/showfont \
diff --git a/graphics/sdl_ttf/files/patch-configure b/graphics/sdl_ttf/files/patch-configure
new file mode 100644
index 000000000000..49511310b535
--- /dev/null
+++ b/graphics/sdl_ttf/files/patch-configure
@@ -0,0 +1,13 @@
+--- configure.orig	2021-08-07 07:33:50 UTC
++++ configure
+@@ -12642,8 +12642,8 @@ echo "$as_me: error:
+ " >&2;}
+    { (exit 1); exit 1; }; }
+ else
+-    CFLAGS="$CFLAGS `$FREETYPE_CONFIG $freetypeconf_args --cflags`"
+-    LIBS="$LIBS `$FREETYPE_CONFIG $freetypeconf_args --libs`"
++    CFLAGS="$CFLAGS `pkg-config freetype2 --cflags`"
++    LIBS="$LIBS `pkg-config freetype2 --libs`"
+ fi
+ 
+ SDL_VERSION=1.2.4


More information about the dev-commits-ports-main mailing list