From nobody Thu Apr 27 12:03:48 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 4Q6ZC933Dgz474fm; Thu, 27 Apr 2023 12:03:49 +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 4Q6ZC91YKJz3kJx; Thu, 27 Apr 2023 12:03:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597029; 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=R7jNr0ygWy9JenvBvOe4IBBxjKZlG7x0PPY5fOgwBlM=; b=ZT/qGohUrpslQJlbR4fcLW2W4LE52gcjjN8BHh9AMBPyK9AGzoe5YA6QwzeVVa3WpdB0Zd oU1j+wWGvOGb/n00fOx3v8S8s/3ufezFDlBdFvj02d/xsQOJliioke65rl0ny8QieiIfdO FIoQYl92deggSsztgkt7DDVzxgW4Mjwuv86LW7rxE3UTN6zFgIVIkoH5uMmBndk0swphgi gxtm468bx05A5NEEIjGZ49DDIuxXZtbVj4fzkfvOtRD5gQZ76qkk2I4DdnU8Qs9V+kvsl5 b8ijSq3GB6DnT/MqdDw6Mi4Nlolc6CJ/xH95u3SMe00kDVD6/gZnKhzHWxFJUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597029; 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=R7jNr0ygWy9JenvBvOe4IBBxjKZlG7x0PPY5fOgwBlM=; b=GizPsdCl4OQVC0wLYa3D/xXuoTXuLEhyZWpgGrgtHhLjQucMMbhbRBfFVfUf+ctQtup67Z icc/MVvF7IQ7tgT86o06DSLxNCpBe8jsVOShIs0GZEfrM62mKyLt/rxmxJWw1icdDXyj27 rvnyybk9GC66kHM0cJTBufS2sAMiP/RF3MFBrCn0A45nOeQ762aQ50wdjcWmGp1DBcLSQm 5LlP30v556HzEzmsboFeBILmFJGZhST+F6hJskIMbPU6fte7tN2deyjwE+3ByFspFa1nb4 ogJxP/X99AaD6Es4X9rVu8AjAciRjijttv+eYw5wVDOQHgjq9Sz2+FfTqijvaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682597029; a=rsa-sha256; cv=none; b=E7oGxt+PHv6+b0+O0IIurZ3Cmc0168Lh0nOou/oUVJRaK0BJzLCuuxKEAPrx1S9+0UKVqY AWC8T7igX4crpO21q4J9CbHCbeZXmldwmEUYPz3yfD5YpYBW4L0r8PMUVaRPAuem8eKqn9 qopaOGUWCKAgaILT6Cz/eLOdZkkZnWeiJvwBt3WF4Gy4E+aoblgXa7yGDbRxhgZBRLXno9 +T5A58Sn2kwQge0ZjVEtocTBNm6w97391bW8rT2wq4xUsIlT4IeigHkoys6gGsh0+fsrAg ZiAIplE7+gnSCrjkuZRYle41u/zpZg39o1UsxIopvAVTpeJH3be9yD29J2rxDA== 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 4Q6ZC90TkWzG66; Thu, 27 Apr 2023 12:03:49 +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 33RC3mp4045958; Thu, 27 Apr 2023 12:03:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RC3m7m045957; Thu, 27 Apr 2023 12:03:48 GMT (envelope-from git) Date: Thu, 27 Apr 2023 12:03:48 GMT Message-Id: <202304271203.33RC3m7m045957@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: 7e01d5dc02bc - main - audio/aqualung: 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: 7e01d5dc02bc2662339a6e81cd6940ca1d56a217 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=7e01d5dc02bc2662339a6e81cd6940ca1d56a217 commit 7e01d5dc02bc2662339a6e81cd6940ca1d56a217 Author: Daniel Engberg AuthorDate: 2023-04-27 09:10:39 +0000 Commit: Daniel Engberg CommitDate: 2023-04-27 12:01:40 +0000 audio/aqualung: Move to FFmpeg 4 Fails to build with FFmpeg 6 PR: 270194 Approved by: portmgr (blanket, build fix) Sponsored by: Blinkinblox --- audio/aqualung/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/audio/aqualung/Makefile b/audio/aqualung/Makefile index c813fe26cc60..075f095f03c9 100644 --- a/audio/aqualung/Makefile +++ b/audio/aqualung/Makefile @@ -24,13 +24,18 @@ LIB_DEPENDS= libFLAC.so:audio/flac \ libmpcdec.so:audio/musepack \ libspeex.so:audio/speex \ libwavpack.so:audio/wavpack \ - libavcodec.so:multimedia/ffmpeg \ + libavcodec.so.58:multimedia/ffmpeg4 \ libcdio_paranoia.so:sysutils/libcdio-paranoia \ liblrdf.so:textproc/liblrdf USES= compiler:c++11-lang cpe gettext gnome localbase lua:52 pkgconfig USE_GNOME= gtk20 libxml2 libxslt GNU_CONFIGURE= yes + +LDFLAGS+= -L${LOCALBASE}/ffmpeg4/lib +CONFIGURE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg4/libdata/pkgconfig" +MAKE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg4/libdata/pkgconfig" + CONFIGURE_ARGS= --with-ifp=no DESKTOP_ENTRIES="Aqualung" "" "${DATADIR}/general.png" "aqualung" \