From nobody Sat May 07 21:05:23 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 0B5F21ABA388; Sat, 7 May 2022 21:05:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Kwg1v6DHZz3QYq; Sat, 7 May 2022 21:05:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651957524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q4ApYIJgrbU/G4bN4QilYiK2h2Ppzafula2wSuts8bk=; b=lj9abXT78momqg8lEytGc4xFMjRkSljcIi4EaTfIlE5s6sMOacXLuPIVoJ5yfKVu4jlpCy hlyL8F02S0/RnTtv7CSbBn+8vzLAFN7F9TaX3Cz6NQLVS5Cky4CZd4zRf76nLW8iY5Hud7 PHfGYtXxYdF2mqBANFAIm7PRSG0jqApyoVtRqdOGXOyh2sXMdgAxX7L2MdesC4/b1GCIxt 2qmbDRPAmXr5q7XOwlkyvMS3euMzFRbKmNnydF2fLiG4in6/pf1Dt0gDQ4JXZg19PioAi3 IAtjFWKXdnabPZwEos+MW3+sqZDRLDotaSfP7L5zelVmHHAV4Wy98lA32DZhMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A709717F80; Sat, 7 May 2022 21:05:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 247L5NL3036261; Sat, 7 May 2022 21:05:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 247L5Nhn036260; Sat, 7 May 2022 21:05:23 GMT (envelope-from git) Date: Sat, 7 May 2022 21:05:23 GMT Message-Id: <202205072105.247L5Nhn036260@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: ec0656982e1c - main - audio/aqualung: Fix build with libmad 0.16 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ec0656982e1c78c5748ec582c1c711f859c9575c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651957523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q4ApYIJgrbU/G4bN4QilYiK2h2Ppzafula2wSuts8bk=; b=m4hB6lonTgMd+g32Kavr+R1MQfhuU0y5YM9ZCGoUCHwhs1rMWaZZYy8Vk4Ia+aMqneO657 7lC+hiXm1NPBXFj9B4WUHzAPO7G3DFTCr1E7qPZC8fiRHjeKBxP1rj4yvKzvAhODTVUeMC b/4C6MAOujlKstKMOg9p8jn0SxT+43oLBOzH822bbX8LVATAGbXbDfuSMmizOECcshbmFT hpH0kbvgWPwFcabiKO9qVFu0ZaW+jVkjyGNjLfmyWpJb1kyhEgkqC3mNSyTHHSSOxrsmaR 5B0WA/VJpf21XDVh8gegQouDfpwCcgNHKB03jh8Es5okyM8ys158ae0LEY6Cfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651957524; a=rsa-sha256; cv=none; b=ZFbrszpQ8GlocXFBIIb8c19WK8XWPDkyfXCbjQoTSCEYffC5lJzzu92niMc43et/y+HGGH 7S2fmUfmWPk8ysuHejV/g2+/Ee2KQO2VsBGRCPY5qATYnBkEHgLbkmSIpqouqNUPfGwqkg nhewl89S9ORqHeNG4bMuhBmWyEgLDz+vXsKPoPE4T7dDEZb+EuD9tYQQ2nlPyasG3JTs7f faouv2cZ7FXHOdM25ttnM2JYLPiZV1lP8MtVVTPgkBNTINzZ2am/C03e+mbA7i4fPjqOTR i01l/cJ9RUkCV3mAl7LpPPIFJB1hRXGLJy4ZMORSFmI5pscuVcufhIQeXcEYKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=ec0656982e1c78c5748ec582c1c711f859c9575c commit ec0656982e1c78c5748ec582c1c711f859c9575c Author: Daniel Engberg AuthorDate: 2022-05-07 21:02:25 +0000 Commit: Daniel Engberg 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