Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 7 May 2022 21:05:23 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: ec0656982e1c - main - audio/aqualung: Fix build with libmad 0.16
Message-ID:  <202205072105.247L5Nhn036260@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=ec0656982e1c78c5748ec582c1c711f859c9575c

commit ec0656982e1c78c5748ec582c1c711f859c9575c
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2022-05-07 21:02:25 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2022-05-07 21:04:46 +0000

    audio/aqualung: Fix build with libmad 0.16
    
    Filename for libmad's pc file is now libmad.pc
    
    Approved by:    portmgr (blanket)
---
 audio/aqualung/files/patch-configure | 46 ++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/audio/aqualung/files/patch-configure b/audio/aqualung/files/patch-configure
new file mode 100644
index 000000000000..9868a1bc3b4a
--- /dev/null
+++ b/audio/aqualung/files/patch-configure
@@ -0,0 +1,46 @@
+--- configure.orig	2022-05-07 20:29:57 UTC
++++ configure
+@@ -9665,12 +9665,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\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "mad") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmad\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "libmad") 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" 2>/dev/null`
++  pkg_cv_mad_CFLAGS=`$PKG_CONFIG --cflags "libmad" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -9682,12 +9682,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\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "mad") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmad\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "libmad") 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" 2>/dev/null`
++  pkg_cv_mad_LIBS=`$PKG_CONFIG --libs "libmad" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -9708,9 +9708,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" 2>&1`
++	        mad_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmad" 2>&1`
+         else
+-	        mad_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mad" 2>&1`
++	        mad_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmad" 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?202205072105.247L5Nhn036260>