mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00
Code Issues Releases Activity

games/scourge: prepare for freetype2 update

Browse Source 
- 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
This commit is contained in:
Tobias C. Berner 2021-08-10 16:38:26 +02:00
parent 107f7d815e
commit d30b474483
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
games/scourge/Makefile
View File

@ -14,7 +14,7 @@ COMMENT= Rogue-like game
LIB_DEPENDS= libfreetype.so:print/freetype2
RUN_DEPENDS= ${LOCALBASE}/${DATADIR_REL}/config/scourge.cfg:games/scourge-data
USES= autoreconf compiler gettext gl gmake localbase sdl
USES= autoreconf compiler gettext gl gmake localbase pkgconfig sdl
GNU_CONFIGURE= yes
USE_GL= gl
USE_SDL= sdl image mixer net ttf
@ -31,6 +31,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
OPTIONS_DEFINE= DEBUG
DEBUG_CONFIGURE_ENABLE= debug
BINARY_ALIAS= freetype-config=true
post-patch:
@${REINPLACE_CMD} -e 's|GLvoid|void|g' ${WRKSRC}/src/sdlhandler.cpp ${WRKSRC}/src/sdlhandler.h
@${REINPLACE_CMD} -e 's|\([^a-z_]\)type(|\1squirrel_type(|g' ${WRKSRC}/src/squirrel/*.cpp ${WRKSRC}/src/squirrel/*.h

21
games/scourge/files/patch-configure.in
View File

@ -1,6 +1,19 @@
--- configure.in.orig 2008-12-22 23:38:10.000000000 +0000
+++ configure.in 2010-06-14 11:57:29.000000000 +0000
@@ -493,3 +493,6 @@
--- configure.in.orig 2008-12-22 23:38:10 UTC
+++ configure.in
@@ -421,8 +421,8 @@ if test "$FREETYPE" = "no"; then
AC_MSG_ERROR(Cannot find freetype2: Is freetype-config in path?)
have_FREETYPE=no
else
- FREETYPE_CFLAGS=`freetype-config --cflags`
- FREETYPE_LIBS=`freetype-config --libs`
+ FREETYPE_CFLAGS=`pkg-config freetype2 --cflags`
+ FREETYPE_LIBS=`pkg-config freetype2 --libs`
have_FREETYPE=yes
fi
fi
@@ -491,7 +491,10 @@ if test "x$has_glx_get_proc" = "xyes" ; then
fi
dnl Check for glext.h
-AC_CHECK_HEADERS( "GL/glext.h", have_glext_h=yes, have_glext_h=no )
+dnl XXX: which requires GL/gl.h, and autoconf > 2.64 is barfing on this
@ -8,3 +21,5 @@
+dnl AC_CHECK_HEADERS( "GL/glext.h", have_glext_h=yes, have_glext_h=no )
+have_glext_h=yes
if test "x$have_glext_h" = "xno" ; then
AC_MSG_ERROR([