From nobody Thu Apr 27 12:03:50 2023 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 4Q6ZCB4YmRz474Jy; Thu, 27 Apr 2023 12:03:50 +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 4Q6ZCB3Qtbz3kjL; Thu, 27 Apr 2023 12:03:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597030; 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=R124ZIxhdLbrJL9ncl/Dh+xsnc6yeOmtOnsASKR/1vI=; b=IzKd+B1KvJ7H/vZD4wmvpsvlHv0bppjbcgIvoFDP+vpJQ4lxuhD7w4u2uV4wHX9B6uaR5f lgeGzS2sclbRheJlOyaKxSARd4itxKe9pAhRAhwdXiSNHbPk2sdei82YGnL/oNYeTAEks6 l78e6S3ipsazJgyzAkeQGSKumI61HbC4qI7MdKHmwsjEqksoo19t2IgSBqNvVYPQRqOA0K tyQxmErDU/qJSy5Iiu17sw+YL6UBw6ujyBpInv8+yPHsdPoLSa0zLdFCRohVgER4ie9kKB hFTjuxx6nX6bbToG+0HFO9aHIyCECiEG8+IDeHz5KgSUvD9YTPJc9Q50dRfPOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597030; 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=R124ZIxhdLbrJL9ncl/Dh+xsnc6yeOmtOnsASKR/1vI=; b=HGTXghlv6nVf7wPjdscoyzt8fiVCncoQKQm/Mf0MRIONa6jQ3sSvOTPOR+5kE4Sv9hlC1D aG8cEMsHoIRPNzFho6dchw9iadpOvCHe0US04Ak2mrBDxZi9qQrmXfvW4puYpDfAcG5mqX BWvRal4GaXU6wdlHguLFFznrlGRKSi2mFd7eAtM9v4/ex9i5cjK85J1TjloUN4p/5PVZtq NneoKy9BvdyOjKeyIdikGnw9dHJZquUyZsZM4dkIAe641SXQo0w3sERtRZgXeChPgKoWKx pbLXtRDTen6j/Bu5hgtQBKDw4GhES0LpI9TMgv1hRZ8nMuO+6JsFfUeHT/zhpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682597030; a=rsa-sha256; cv=none; b=ekfWihPzG/c4Tg7nfT6QP1K89/2vjP/MQevD/E/IPjRCdrgkpQQJ0qCkb1Mln8NnShMDHZ O/5NchJUh8Itml6fmTycumwp3HXtMeFhDZZKVFfPd+6gluq0Bbt2Quhhrrg7eKCIpMrT+5 0YB1cL61HPmZAEs9bTXLcuBIDwlg5ddgpEb8FBPBmUBwXHNGthsQ7M3WT+nJjliVZ+BaRD XxSptE2NCn5mOA02YF5WkMkjCewqg9FFv2HKrpNTthTYxmAO6CuLiPQFjYXi0+lfuDPLDL PEfV4on22g9/Qog9vvunsjPGmCSEq08NMKhIZBmPzto2M1nxYADayDuGKRYNsg== 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 4Q6ZCB1Pn6zH69; Thu, 27 Apr 2023 12:03:50 +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 33RC3oHD045982; Thu, 27 Apr 2023 12:03:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RC3oTD045981; Thu, 27 Apr 2023 12:03:50 GMT (envelope-from git) Date: Thu, 27 Apr 2023 12:03:50 GMT Message-Id: <202304271203.33RC3oTD045981@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: de595bdfccf4 - main - audio/essentia: Move to FFmpeg 4 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: de595bdfccf4c7a80a67ff947705cdd6bdb4a7d8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=de595bdfccf4c7a80a67ff947705cdd6bdb4a7d8 commit de595bdfccf4c7a80a67ff947705cdd6bdb4a7d8 Author: Daniel Engberg AuthorDate: 2023-04-27 09:15:52 +0000 Commit: Daniel Engberg CommitDate: 2023-04-27 12:01:40 +0000 audio/essentia: 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/essentia/Makefile | 6 +++++- audio/essentia/files/patch-wscript | 11 +++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/audio/essentia/Makefile b/audio/essentia/Makefile index 6f63e9759484..1ae34872057f 100644 --- a/audio/essentia/Makefile +++ b/audio/essentia/Makefile @@ -13,13 +13,17 @@ LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/COPYING.txt BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:math/fftw3 -LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ +LIB_DEPENDS= libavcodec.so.58:multimedia/ffmpeg4 \ libchromaprint.so:audio/chromaprint \ libfftw3f.so:math/fftw3-float \ libsamplerate.so:audio/libsamplerate \ libtag.so:audio/taglib \ libyaml.so:textproc/libyaml +CFLAGS+= -I${LOCALBASE}/ffmpeg4/include +CONFIGURE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg4/libdata/pkgconfig" +MAKE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg4/libdata/pkgconfig" + USES= compiler:c++11-lib eigen:3 pkgconfig waf USE_GITHUB= yes diff --git a/audio/essentia/files/patch-wscript b/audio/essentia/files/patch-wscript new file mode 100644 index 000000000000..be5d4746c647 --- /dev/null +++ b/audio/essentia/files/patch-wscript @@ -0,0 +1,11 @@ +--- wscript.orig 2022-11-03 19:50:02 UTC ++++ wscript +@@ -148,6 +148,8 @@ def configure(ctx): + elif ctx.options.MODE == 'release': + print ('→ Building in release mode') + ctx.env.CXXFLAGS += ['-O2'] # '-march=native' ] # '-msse3', '-mfpmath=sse' ] ++ ctx.env.LINKFLAGS += ['-L/usr/local/ffmpeg4/lib'] ++ ctx.env.LDFLAGS += ['-L/usr/local/ffmpeg4/lib'] + + elif ctx.options.MODE == 'default': + pass