Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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)
- Loading branch information
Daniel Engberg
authored and
Daniel Engberg
committed
May 9, 2022
1 parent
728c11b
commit 2ef5e06
Showing
1 changed file
with
46 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |