Date: Mon, 9 May 2022 00:01:13 GMT From: Daniel Engberg <diizzy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 2ef5e0683259 - main - audio/cdrdao: Fix pkg-config detection of libmad 0.16 Message-ID: <202205090001.24901D49015715@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=2ef5e0683259ee7d7695222535ec1632a066c9f0 commit 2ef5e0683259ee7d7695222535ec1632a066c9f0 Author: Daniel Engberg <diizzy@FreeBSD.org> AuthorDate: 2022-05-08 23:47:45 +0000 Commit: Daniel Engberg <diizzy@FreeBSD.org> CommitDate: 2022-05-09 00:01:00 +0000 audio/cdrdao: Fix pkg-config detection of libmad 0.16 Filename for libmad's pc file is now libmad.pc, this broke pkg-config check however fallback detection code still worked. Approved by: portmgr (blanket) --- sysutils/cdrdao/files/patch-configure | 46 +++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/sysutils/cdrdao/files/patch-configure b/sysutils/cdrdao/files/patch-configure new file mode 100644 index 000000000000..8cce3abb0058 --- /dev/null +++ b/sysutils/cdrdao/files/patch-configure @@ -0,0 +1,46 @@ +--- configure.orig 2022-05-08 06:17:09 UTC ++++ configure +@@ -7601,12 +7601,12 @@ if test -n "$MAD_CFLAGS"; then + pkg_cv_MAD_CFLAGS="$MAD_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mad >= 0.10\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "mad >= 0.10") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmad >= 0.10\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libmad >= 0.10") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_MAD_CFLAGS=`$PKG_CONFIG --cflags "mad >= 0.10" 2>/dev/null` ++ pkg_cv_MAD_CFLAGS=`$PKG_CONFIG --cflags "libmad >= 0.10" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -7618,12 +7618,12 @@ if test -n "$MAD_LIBS"; then + pkg_cv_MAD_LIBS="$MAD_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mad >= 0.10\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "mad >= 0.10") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmad >= 0.10\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libmad >= 0.10") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_MAD_LIBS=`$PKG_CONFIG --libs "mad >= 0.10" 2>/dev/null` ++ pkg_cv_MAD_LIBS=`$PKG_CONFIG --libs "libmad >= 0.10" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -7644,9 +7644,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- MAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mad >= 0.10" 2>&1` ++ MAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmad >= 0.10" 2>&1` + else +- MAD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mad >= 0.10" 2>&1` ++ MAD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmad >= 0.10" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$MAD_PKG_ERRORS" >&5
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202205090001.24901D49015715>