cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

games/scorched3d: 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-06 16:56:30 +02:00
parent 7afea27b6d
commit 9abe0ca321
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
games/scorched3d/Makefile
View File

@ -48,6 +48,8 @@ PLIST_FILES= bin/scorched3d \
bin/scorched3ds
PORTDATA= *
BINARY_ALIAS= freetype-config=true
post-extract:
@${RM} ${WRKSRC}/src/client/GLEXT/[a-z]*

21
games/scorched3d/files/patch-acinclude.m4 Normal file
View File

@ -0,0 +1,21 @@
--- acinclude.m4.orig 2021-08-06 14:48:14 UTC
+++ acinclude.m4
@@ -437,13 +437,13 @@ AC_DEFUN([AC_CHECK_FT2],
if test "$FT2_CONFIG" = "no" ; then
no_ft=yes
else
- FT2_CFLAGS=`$FT2_CONFIG $ft_config_args --cflags`
- FT2_LIBS=`$FT2_CONFIG $ft_config_args --libs`
- ft_config_major_version=`$FT2_CONFIG $ft_config_args --version | \
+ FT2_CFLAGS=`pkg-config freetype2 --cflags`
+ FT2_LIBS=`pkg-config freetype2 --libs`
+ ft_config_major_version=`pkg-config freetype2 --modversion | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- ft_config_minor_version=`$FT2_CONFIG $ft_config_args --version | \
+ ft_config_minor_version=`pkg-config freetype2 --modversion | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- ft_config_micro_version=`$FT2_CONFIG $ft_config_args --version | \
+ ft_config_micro_version=`pkg-config freetype2 --modversion | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
ft_min_major_version=`echo $min_ft_version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`