From nobody Mon Mar 6 09:24:08 2023 X-Original-To: dev-commits-ports-main@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 4PVY6x1P7Jz3wg71; Mon, 6 Mar 2023 09:24:09 +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 4PVY6x0W3gz4CjM; Mon, 6 Mar 2023 09:24:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678094649; 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=UHfKCoKS4VRvKMXiADmdu6qAZQg3xVKNm10kceNR11c=; b=xoftkT5MFs1ZpoCcpo5cHYYxmbBRKo7lLFGBK5PNBGj//uEbAH/qbQVWY75D3tEeG7XLPZ S51RVZwJBmIV6MpvYrPTFDRHJ0mi8eF4zSNM3khXDnljcCLUws7a8a60x5Nd3Ieky5MWCL Z9Gj6PUK51NCkBsHtYGQYGNWwQjAOP7+BSTvbUeIH+I/67nhSEtLFgVKo8EdjqZ03yoxE9 9jgW3sC/Urk/W/jJIAGRBFHVftZSi4RAWXis3NY3hjCrzCIYi+fQz+NsMyGhnQwvklQxDB qwvaZPG25rPC71c9FIvUsXL2+TVwzcSt/fHljPvK5LArkl0M1WnA/n+nn1Gwgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678094649; 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=UHfKCoKS4VRvKMXiADmdu6qAZQg3xVKNm10kceNR11c=; b=jStdYtRlm2+M5IXt5zc1lxQHVIF+p8zjIstFNwjUuPSg1NRGKVUaR0XnTsvl8C99Zv+gIY AUSqi0LgU0GK391rLg3YT7lD22TrSgI3VwVN7qv3hXtLiSTQSbOABIv0GGoedYiuN8SBZD Ya7WFHJRHhy7KZr3TIs5JiNThOQj8JzG5vAaQ4GOE/pcKp2P1ndFM7TlyVIbO9BQ//Yk7X 5wO9Ys08MpvXD6pojrpqB9C1D5jbqlz3Tv8l62lbJonn8rjTLqECmmDCeDD4lImr/JN5Nv uiKOwJiIxma4Q0OnuHK8P4d4n2nruzJExXXcT57W0xy8sl2nj4jT78HPgiQFWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678094649; a=rsa-sha256; cv=none; b=BesVeRHTi6xW8WmotKMdm42wSaxIzMO4NV5ba5iRfFlUhE09MaGigBpRe1rb/4a1FaY3iy qJCnlRD/DzwNmdETCAfizdDpIr1C7GWtnNWEVhCPWYo14cLtXW8lU1sFm+WMchRxd0mOuk w7aTF0AVgekrgs8rF9Dp2mwrq7YPAHPDNSuU1Iu7sfzE+MVXtrqVPKVQqdsNM3UKRC0gKh nQy/XhqJ7dCK1/G0okXJOURGkOLDJHJuhNrKgVimX0TKeLXTlydTU2EY8htYqvlorQ2IEX DgBWFf77K4GPBDx0+w4bL078NQICIKfJvCKGclhxchJeMVvAtI/xQOLha9dIoQ== 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 4PVY6w6h16zwvR; Mon, 6 Mar 2023 09:24:08 +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 3269O8HJ018113; Mon, 6 Mar 2023 09:24:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3269O8uJ018112; Mon, 6 Mar 2023 09:24:08 GMT (envelope-from git) Date: Mon, 6 Mar 2023 09:24:08 GMT Message-Id: <202303060924.3269O8uJ018112@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emanuel Haupt Subject: git: 273c18c504ce - main - audio/ocp: Workaround regression in audio/libdiscid List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ehaupt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 273c18c504ce483fa775964be6a7011ed938dfdc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ehaupt: URL: https://cgit.FreeBSD.org/ports/commit/?id=273c18c504ce483fa775964be6a7011ed938dfdc commit 273c18c504ce483fa775964be6a7011ed938dfdc Author: Emanuel Haupt AuthorDate: 2023-03-06 09:23:57 +0000 Commit: Emanuel Haupt CommitDate: 2023-03-06 09:24:03 +0000 audio/ocp: Workaround regression in audio/libdiscid Workaround regression in audio/libdiscid. This can be removed once https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=269990 is committed. Notified by: pkg-fallout --- audio/ocp/Makefile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/audio/ocp/Makefile b/audio/ocp/Makefile index 633cc8ee0918..291f2a1207aa 100644 --- a/audio/ocp/Makefile +++ b/audio/ocp/Makefile @@ -1,5 +1,6 @@ PORTNAME= ocp PORTVERSION= 0.2.103 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= audio MASTER_SITES= https://stian.cubic.org/ocp/ @@ -88,6 +89,15 @@ X11_PLIST_SUB_OFF= DESKTOP='@comment ' \ TIMIDITY_CFG= ${LOCALBASE}/share/timidity/timidity.cfg +# Workaround regression in audio/libdiscid +# See also: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=269990 +# (remove once it's fixed) +post-patch: + @${REINPLACE_CMD} \ + -e "s|^\(LIBDISCID_CFLAGS=\).*|\1-I${LOCALBASE}/include|" \ + -e "s|^\(LIBDISCID_LIBS=\).*|\1-L${LOCALBASE}/lib -ldiscid|" \ + ${WRKSRC}/Rules.make.in + post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ocp @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocp/*.so