From nobody Thu Apr 27 12:03:51 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 4Q6ZCD04Rqz474K0; Thu, 27 Apr 2023 12:03:52 +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 4Q6ZCC3sQ8z3kgb; Thu, 27 Apr 2023 12:03:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597031; 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=cH0LGBzGpgObIWRF9q6CzWsw5U1lkavlKLFw78z0DeU=; b=eYqo6S9l+afdDXDU/rF1D+qzFAZB4CZYld3rTqQ+JIK4SNkiO9LZbQdRsqNtBdx7HftMge 9v1X9o8J4EiHHXSTpLeAVz7gK2fKzDYlG8p0qn50S92jmL+JSOyafZoCdDohUUNmHwLwty VzEk3z0bsB1VcM8Banrmio/rotiGMU8b35KW4FvKFuiQPZE31JG2N2lVwAS6ksa8zte23G ebQTnxU6TuagH+2MiQrcDTy+pWbI805B+HIqM3WDqlRy8FnBd8a6CfcbmFJu5v/dLRrEU8 OOQe/ejsPP9kB7MnyyNWrGxDD55VjsZEPySMOvY7rb5FCOZw6w2rsHIHl2YuDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597031; 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=cH0LGBzGpgObIWRF9q6CzWsw5U1lkavlKLFw78z0DeU=; b=WPpqXpvezyK10+AtQLuLyAKoniJw7pfh9sX4ziJ4rBMISrPFoHZms/QuQLpCc88A7cXfXd aBhePOZgeITd4nsps/du4c9Gik2ZFeOBHzzg0COFxrjvurtygZF1FomiwMYjEWlsq3tjn2 eEx4PZvct7gIufM8a464dXF9wtr+LyxdyOrwy4QTuVkIDwCWEdOD22tJenkiJHVEWIkKLy VB/NGNrAEs3GXI/oB6hoZZlm66cDGHDyxC3Y4/u0o3Ut4/em2KCzt4N0dBqqa5Fddh17Pm Xr0L/DpEAx847YKfUAa/E+k4hiy8B4GHTh8iarU/V/7uBAk1itDEUmwpAt2iNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682597031; a=rsa-sha256; cv=none; b=eelh0LExMBfPEFbqeZxDf8apxZUtFcRN1aboISNga928MwkW5+0cAJtotCtzIIunZ1hGvK irz2oml5M8i+93g1R6mi62y3Ac3KnxTQxirxIlwJs5uxFwo/PF1e7YBlPWzN8nG0h/UkfS VPFaNHzr4v+fnCwCKrlmhFk+49TuZyd1VFQtAyh3XNr31dkUYSEM1aQoYtxR42rso1q1AP EMEHAXhl8thF/QRPQVMcRFrEHLsx//RZQ+fr3rb2ssBSOp1KawpJ68fBU1FplG9izdEfwW oWFzVHqAKEfg66GwCyjF/6YXeNsq2nblc9JwMkllm3MbcEIrxcAxfhZnAmQ6wQ== 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 4Q6ZCC2PW2zGVB; Thu, 27 Apr 2023 12:03:51 +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 33RC3pEc046005; Thu, 27 Apr 2023 12:03:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RC3pOp046004; Thu, 27 Apr 2023 12:03:51 GMT (envelope-from git) Date: Thu, 27 Apr 2023 12:03:51 GMT Message-Id: <202304271203.33RC3pOp046004@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: 6fcbf43cefc8 - main - audio/libgroove: Move to FFmpeg 4 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: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6fcbf43cefc8f75d0ef55ef154e86bc566c6f0dd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=6fcbf43cefc8f75d0ef55ef154e86bc566c6f0dd commit 6fcbf43cefc8f75d0ef55ef154e86bc566c6f0dd Author: Daniel Engberg AuthorDate: 2023-04-27 09:19:36 +0000 Commit: Daniel Engberg CommitDate: 2023-04-27 12:01:41 +0000 audio/libgroove: Move to FFmpeg 4 Fails to build with FFmpeg 6 PR: 261302 Reported by: antoine (via exp-run) Approved by: portmgr (blanket, build fix) Sponsored by: Blinkinblox --- audio/libgroove/Makefile | 6 +++++- audio/libgroove/files/patch-cmake_FindLibAV.cmake | 11 +++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/audio/libgroove/Makefile b/audio/libgroove/Makefile index 981f194809cc..9bb0857f1732 100644 --- a/audio/libgroove/Makefile +++ b/audio/libgroove/Makefile @@ -10,7 +10,7 @@ WWW= https://github.com/andrewrk/libgroove LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ +LIB_DEPENDS= libavcodec.so.58:multimedia/ffmpeg4 \ libchromaprint.so:audio/chromaprint \ libebur128.so:audio/libebur128 \ libspeexdsp.so:audio/speexdsp @@ -26,4 +26,8 @@ CFLAGS+= -Wno-error=deprecated-declarations # ffmpeg 3.1 PLIST_SUB+= VER1=${PORTVERSION:R:R} \ VER3=${PORTVERSION} +post-patch: + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${PATCH_WRKSRC}/cmake/FindLibAV.cmake + .include diff --git a/audio/libgroove/files/patch-cmake_FindLibAV.cmake b/audio/libgroove/files/patch-cmake_FindLibAV.cmake new file mode 100644 index 000000000000..5fb4bb9d5bd9 --- /dev/null +++ b/audio/libgroove/files/patch-cmake_FindLibAV.cmake @@ -0,0 +1,11 @@ +--- cmake/FindLibAV.cmake.orig 2023-04-25 13:56:57 UTC ++++ cmake/FindLibAV.cmake +@@ -22,6 +22,8 @@ + # AVUTIL_INCLUDE_DIRS + # AVUTIL_LIBRARIES + ++set(CMAKE_PREFIX_PATH "%%LOCALBASE%%/ffmpeg4;%%LOCALBASE%%/ffmpeg4/include;%%LOCALBASE%%/ffmpeg4/libexec") ++ + find_path(AVFILTER_INCLUDE_DIRS NAMES libavfilter/avfilter.h) + find_library(AVFILTER_LIBRARIES NAMES avfilter) + if(AVFILTER_LIBRARIES AND AVFILTER_INCLUDE_DIRS)