mykola/freebsd-ports
1
0
Fork 0
forked from Lainports/freebsd-ports
Code Pull requests Activity

graphics/ming: Replace configure.in patch with upstream one

Browse source 
- Remove no-op BINARY_ALIAS

Obtained from:	a89a619e18
This commit is contained in:
Po-Chuan Hsieh 2021-08-08 22:34:23 +08:00
parent 489eee26b8
commit cf08ab4fff
No known key found for this signature in database
GPG key ID: 9A4BD10F002DD04B
2 changed files with 65 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
graphics/ming/Makefile
View file

@ -40,8 +40,6 @@ SHEBANG_FILES= util/cws2fws
OPTIONS_DEFINE= DOCS
BINARY_ALIAS= freetype-config=true
post-install:
${MKDIR} ${STAGEDIR}${PREFIX}/include/ming/ ${STAGEDIR}${PREFIX}/include/ming/blocks/ ${STAGEDIR}${PREFIX}/include/ming/util/
cd ${WRKSRC}/util/ && ${INSTALL_SCRIPT} cws2fws ming-config ${STAGEDIR}${PREFIX}/bin/

73
graphics/ming/files/patch-configure.in
View file

@ -1,13 +1,70 @@
--- configure.in.orig 2021-08-07 06:13:17 UTC
Obtained from: https://github.com/libming/libming/commit/a89a619e187ebe070db2a1760f3b90489bfff382
--- configure.in.orig 2017-04-07 08:12:56 UTC
+++ configure.in
@@ -272,8 +272,8 @@ if test "$freetype_support" = "yes"; then
ft_config="$freetype_config"
fi
@@ -247,7 +247,7 @@ AC_CHECK_LIB(X11, XGetImage, XLIB="-lX11", XLIB="")
AC_ARG_ENABLE(
[freetype],
-[ --enable-freetype Enable freetype support (default: enabled)],
+[ --disable-freetype Disable freetype support (default: enabled)],
[case "${enableval}" in
yes) freetype_support=yes ;;
no) freetype_support=no ;;
@@ -257,26 +257,10 @@ freetype_support=yes)
if test "$freetype_support" = "yes"; then
dnl Check for the freetype library
- AC_ARG_WITH(freetype-config, [ --with-freetype-config=PROG Use FreeType configuration program PROG], freetype_config=$withval, freetype_config=yes)
- if test "$freetype_config" = "yes"; then
- AC_PATH_PROG(ft_config,freetype-config,no)
- if test "$ft_config" = "no"; then
- echo "To compile ming please install freetype:"
- echo " as .deb user: sudo apt-get install libfreetype6 libfreetype6-dev"
- echo ""
- echo "or disable the freetype configuration option:"
- echo " --disable-freetype"
- AC_MSG_ERROR([Could not detect freetype-config!])
- fi
- else
- ft_config="$freetype_config"
- fi
-
- FREETYPE_CFLAGS="`$ft_config --cflags`"
- FREETYPE_LIBS="`$ft_config --libs`"
+ FREETYPE_CFLAGS="`pkg-config freetype2 --cflags`"
+ FREETYPE_LIBS="`pkg-config freetype2 --libs`"
-
- AC_SUBST(FREETYPE_LIBS)
- AC_SUBST(FREETYPE_CFLAGS)
+ PKG_PROG_PKG_CONFIG
+ PKG_CHECK_MODULES(FREETYPE, freetype2, HAS_FREETYPE=true,
+ AC_MSG_ERROR([Could not find freetype])
+ )
fi
AC_SUBST(FREETYPE_LIBS)
AC_SUBST(FREETYPE_CFLAGS)
dnl Check for the ungif or gif (new or old) libraries
@@ -334,9 +318,9 @@ if test -n "${ZLIB}" -a -n "${ZLIB_INC}"; then
AC_DEFINE([USE_ZLIB], [1], [Use zlib])
fi
-AM_CONDITIONAL(USE_FREETYPE, test x${ft_config} != x)
-if test -n "${ft_config}"; then
- AC_DEFINE(USE_FREETYPE, [1], [Use freetype library])
+AM_CONDITIONAL(USE_FREETYPE, test x${HAS_FREETYPE} != x)
+if test x${HAS_FREETYPE} = xtrue ; then
+ AC_DEFINE(USE_FREETYPE, [1], [Use freetype library])
fi
AM_CONDITIONAL(GIFLIB_GIFERRORSTRING, test x"$ac_cv_lib_gif_GifErrorString" = xyes)
@@ -504,10 +488,10 @@ else
echo " ZLIB enabled ($ZLIB)"
fi
-if test x"$ft_config" = "x"; then
+if test x"$HAS_FREETYPE" = "x"; then
echo " Freetype library disabled"
else
- echo " Freetype library enabled ($ft_config)"
+ echo " Freetype library enabled ($FREETYPE_LIBS)"
fi
if test x"$GIFLIB" = "x" -o x"$GIFINC" = "x"; then