Date: Fri, 6 Aug 2021 14:30:02 GMT From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 950ca76de36a - main - games/ponscripter-sekai: prepare for freetype2 update Message-ID: <202108061430.176EU2ne046086@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=950ca76de36ae7b413c90eacd787bf6a2978aff5 commit 950ca76de36ae7b413c90eacd787bf6a2978aff5 Author: Tobias C. Berner <tcberner@FreeBSD.org> AuthorDate: 2021-08-06 14:27:54 +0000 Commit: Tobias C. Berner <tcberner@FreeBSD.org> CommitDate: 2021-08-06 14:29:54 +0000 games/ponscripter-sekai: 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 --- games/ponscripter-sekai/Makefile | 2 +- games/ponscripter-sekai/files/patch-configure | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/games/ponscripter-sekai/Makefile b/games/ponscripter-sekai/Makefile index 8860a051b270..3349d6855b0b 100644 --- a/games/ponscripter-sekai/Makefile +++ b/games/ponscripter-sekai/Makefile @@ -21,7 +21,7 @@ USE_GITHUB= yes GH_ACCOUNT= sekaiproject GH_PROJECT= ${PORTNAME:S/sekai/fork/} -USES= compiler:c++11-lang gmake sdl shebangfix +USES= compiler:c++11-lang gmake pkgconfig sdl shebangfix USE_SDL= image2 mixer2 EXTRACT_AFTER_ARGS=--exclude src/extlib SHEBANG_FILES= util/xml-template diff --git a/games/ponscripter-sekai/files/patch-configure b/games/ponscripter-sekai/files/patch-configure index f019ce7692d0..3b7dc5733174 100644 --- a/games/ponscripter-sekai/files/patch-configure +++ b/games/ponscripter-sekai/files/patch-configure @@ -1,5 +1,14 @@ ---- configure.orig 2019-02-08 19:59:55 UTC +--- configure.orig 2021-08-06 14:18:09 UTC +++ configure +@@ -53,7 +53,7 @@ EXPLICIT_OGGLIBS=false + + SDL_CONFIG=sdl2-config + SMPEG_CONFIG=smpeg2-config +-FREETYPE_CONFIG=freetype-config ++FREETYPE_CONFIG="pkg-config freetype2" + EXTLIB=./extlib + SRC=src + MAKEFILE=$SRC/Makefile @@ -606,7 +606,7 @@ then _EOF INTERNAL_SDL_MIXER=true @@ -9,3 +18,12 @@ case $? in 0) echo "yes"; INTERNAL_SDL_MIXER=false ;; 1) echo "no MP3" ;; 2) echo "no Ogg" ;; 3) echo "no Ogg or MP3" ;; +@@ -694,7 +694,7 @@ then + FREETYPE_CONFIG=$EXTLIB/bin/freetype-config + else + $echo_n "Checking for system Freetype... ${nobr}" +- VER=`($FREETYPE_CONFIG --ftversion) 2>/dev/null` ++ VER=2 + if [ -z "$VER" ]; then + FREETYPE_CONFIG=freetype2-config + VER=`($FREETYPE_CONFIG --ftversion) 2>/dev/null`
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202108061430.176EU2ne046086>