From nobody Mon May 09 00:01:13 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 C74B61AC08EE; Mon, 9 May 2022 00:01:13 +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 4KxLtK30Rdz55SK; Mon, 9 May 2022 00:01:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652054473; 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=KKzPXLkwrQPUfVRdxZ5lZemBttCP1J+pvBFeQdptrGs=; b=ft/Y10RWS8tiJW5uAocMb7ZiTcM6dK/CrFWZJLhLZ0B8KseTYnMgzIr3JrW4rM//2YWZfT hB12crVCG8kZH8pPitUmZ0Jb3qPcOhgB2oWgircKXYmBrdGJh+anffdkfQyJJV6nphnNWN cJp03qGRXnIuoj8XakKOp3BYw6v1madcL1/Jgnzi3/9BuDwzukzH6WN+L+z7Gy3vuSqkot AS+uR7roqJsooE+p5cGCfteIO3ONKn/JokSqdOPoh42nW0v+YsvumZ3K9W3nX7FYYy+i4z KYOKzWe0vUUkXzvO3iEPdsu0cu4r6K2xcjz1ek6PE4xP0Lmg0yO+owBeyMoyKw== 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 3BECD2E80A; Mon, 9 May 2022 00:01:13 +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 24901Dbm015716; Mon, 9 May 2022 00:01:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24901D49015715; Mon, 9 May 2022 00:01:13 GMT (envelope-from git) Date: Mon, 9 May 2022 00:01:13 GMT Message-Id: <202205090001.24901D49015715@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: 2ef5e0683259 - main - audio/cdrdao: Fix pkg-config detection of 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: 2ef5e0683259ee7d7695222535ec1632a066c9f0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652054473; 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=KKzPXLkwrQPUfVRdxZ5lZemBttCP1J+pvBFeQdptrGs=; b=DoVyMSACF7Zb0d1J0Q5qD+tUr5CEbPu/AIRRElD9DyN+XEYSbkFDwtMJvXTKeVr1hYOJrU GcxIiM3fZgt6UT49UNjiesbBjovZ0gkLQQECaJt6QlEVTRTAJQHHHMTL/ccNO4xaVpRARE QXYYZbC/0DehkncdvRlmrHVyYzUlA5OvUyApDT8LL09q762w0BNM0n5IRgGnHdInq8qVP7 Ug3mPZKJVHJCUj/qVGynAVTTZQBVuHvqsU8OvKEjOwGYMiPuaesjPYXZ1d6qE+eY2w6hHh olrZ4OOFQOOnFLSklBs0ml3O8vWo8o/QHLDHbOZ7OpLzq1CrYXWfA6ht2xB0kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652054473; a=rsa-sha256; cv=none; b=jRGKr6shqrBp6TtPMTmch0M3OEGoMOxAKYALst3+xX4NdyWohOXlazfU9tmNInk3XxZ7kp pB7pOvP7GkkfIC/Qa7TNMKZJV2NCth9WLgDLkpDwFtU8vFlsCh9MBfppWy/PV1kJSVH1ib MzKCm9AA8+zHVvXbE7Ds7YFCeEvkxVRUTGNWCPdvhkOD2s64td4Mm96wCgv4uZCN8skkyW 34X1KHoha0/IVlLnwCXR/LbYpnZ1pSGvD3oeP16WvMKLdmb66VsOZMDYlGMyuOSePsf0IH 1KqnOq1xjMDno9BgoSIsT83dgTW7b5Clp1gIBMA75EI3UVa8II7o+C3SQ4A1tQ== 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=2ef5e0683259ee7d7695222535ec1632a066c9f0 commit 2ef5e0683259ee7d7695222535ec1632a066c9f0 Author: Daniel Engberg AuthorDate: 2022-05-08 23:47:45 +0000 Commit: Daniel Engberg 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