From nobody Mon May 09 00:01:15 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 8AA011AC087A; Mon, 9 May 2022 00:01:16 +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 4KxLtN24wbz55HC; Mon, 9 May 2022 00:01:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652054476; 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=bcjyqX/MlVldWYbjnaZprfFJHc9KXczggV1ojP+uoT4=; b=xPmNmUtJFvGX/KDauGgippc7f3+N/+B14rlISDuxDPWEbZsqjgywp6jhYbtUvMPG5buciI 9I4fgqP7Y8fzJ3E/yHUj3rpmdqysIGyUMK4s1PNb+VBIWTKbaPbTh2V7z7NDXXg0+rhmF6 OquXA3NYxT8cqQ/05vF6547PCKfwXIxO4A72vKb0zlxyr56YoopAnzHBE+nnHMxPgivpZG yTQIqANQncyVUT2PYb7GV9mTeFw3b5UhjfloLBj5Z7nS86YuurzRbVi4Csq/43FRhGkiUw OR3C0CAhu1VAr1i2EWH0V1p5uUMAZda8GR/s8dY055R58NYaqSZ+gpXjywRvdQ== 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 84AB92E4C2; Mon, 9 May 2022 00:01:15 +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 24901FhJ015768; Mon, 9 May 2022 00:01:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24901F8N015765; Mon, 9 May 2022 00:01:15 GMT (envelope-from git) Date: Mon, 9 May 2022 00:01:15 GMT Message-Id: <202205090001.24901F8N015765@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: f33bae87bb39 - main - audio/ocp: Fix detection using pkg-config 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: f33bae87bb39ae853b2e268a459e8900135d2029 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652054476; 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=bcjyqX/MlVldWYbjnaZprfFJHc9KXczggV1ojP+uoT4=; b=J/QbnOaw45YfZ8n0k058mr+SAtKFN2hySsw9m1iE90hw8kwDBJ2sHT1Rz7gIFHpsnqEitm fwgfTnXCjgnS0bH1X9S4ts3Xjg2LlhBWpzp6cEjTKlp2LdXDxELKu8Dywu6AXl8DqcrdSz iyQAN9m18G9+nh4eZVSf3ODiQ+JIk4SC1GXfeR8rEiLjLzJIRaco6riqGKUL52kzOGmWSX sjPObiDMZnXt4wjqdBIVAr5svVhdNwS3X0irpKOjfws2dvvd8Umn+ykngnxPhXwTp+KYyP iogQ/79GpXwcetooF5jOB2GO/luodB2nwrHBqsPtk6WEURoN5hGr+KnB6vz0hA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652054476; a=rsa-sha256; cv=none; b=tt+8PmtffL5smPDy2bnYZmNju70f59MxXVJ0JcZhzd6tb3fAyBX3djvg/XVxqMIbR9hzON b+FfV1T1UB/9zsbbdoBs4/GbwvH/wH74YlHtiANAhaYKNuTe+cLT2Eh8kzFzMRcB+qWaet a/1FYSUtny4MSaKc6Y2sJ7DWsV7GD9mf3pZ4CDaNdr7e/VpjxLJMbburwZhnrWOxcT8FnV cWwTKsSGfDH/zrSTynNULFm/lnq4mw3YUAjHwvxb92C3hmfAwenWYaVlp9sLmiHaFJqqoo Ip44gSC6/P/Q0oZibW42zVIGxHeSe5lMDIVlk9nMQbGuhPPM8YBMCh/b0R37yA== 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=f33bae87bb39ae853b2e268a459e8900135d2029 commit f33bae87bb39ae853b2e268a459e8900135d2029 Author: Daniel Engberg AuthorDate: 2022-05-08 23:59:19 +0000 Commit: Daniel Engberg CommitDate: 2022-05-09 00:01:00 +0000 audio/ocp: Fix detection using pkg-config with 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) --- audio/ocp/files/patch-configure | 46 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/audio/ocp/files/patch-configure b/audio/ocp/files/patch-configure new file mode 100644 index 000000000000..95716fbbddfd --- /dev/null +++ b/audio/ocp/files/patch-configure @@ -0,0 +1,46 @@ +--- configure.orig 2022-05-08 19:20:04 UTC ++++ configure +@@ -8815,12 +8815,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 +@@ -8832,12 +8832,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 +@@ -8858,9 +8858,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