From nobody Wed May 01 00:33:09 2024 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 4VTdMV0tWcz5Hk5h; Wed, 1 May 2024 00:33:10 +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 4VTdMV0MVRz4nq7; Wed, 1 May 2024 00:33:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714523590; 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=EOJAWBopzKII9BXTbvIfVyZB5fq/O01WKY9VaSg3J60=; b=DeweocL7uuZa8an3iPMc7JE08KSqfUhPRmyQi/tKkhgnyDhlZ+WSPh6xItwM5R+L9CJ5pv TF1u1PUlhWjqz93g1P54S5vU2or1FaDR4gQ1WcoUePLU0Zzf9z8sNijgbaSWBMg9BQ8RBu YV0YJ6eiRE0715WvqxOlPAaLWDGA4Fcj+U/cjWUDIG/KQ6vnQDZ/214BNvFr3iMJA+USo7 GsRnQY2GcsvyEnIm+3qTWdCpRddknrpsk1dnoitpNXkBAoKcVze4NKG469PZBh8JFSWt87 y/QrgVRPeoUXrj7jemmk/0rUVsFNaxFNN/ZxW6C4n1Ut94ElXkT75PXfqt/b/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714523590; a=rsa-sha256; cv=none; b=tbAnnd/R5XQeo4obCFPWDJ4bdrw4TCW8xEulDj78XyHsR7H9GcGV0nKFqPQjFQSQRH3Y+t gMTzQcdvozWiupxy8ROnYJUNv1zbCzKKjCl7FfYP3wLj/9n5vOJiEAFezBq6Ehm4MJprG7 Pi79AHDTA48MQaa8B/o427lOUQ1PNRlvZFZwDlsD58ce1ERuvs4iROXX/dV+hjkSAbcHHe 6EwQ9Ba55P9zCVB7yyMbnM4eXgEJyLBHwij36Xe2Gzvaf2sEbyx+VlM1gwhKDBQ+AOWhvA +eb3bptUTR/koKGXyybxsZyXCgx5ZezBt4jUL+6aE5+lb7Kl1hxlnaYeh5pgBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714523590; 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=EOJAWBopzKII9BXTbvIfVyZB5fq/O01WKY9VaSg3J60=; b=aBZkHtJbSGAtMF2wDNlj3j6FvgZJqvIRNSaS9HzPmAu3UtCsZMwHPkcuYFk8YM4u/Qv6xh 2V8Q43/j41ri0phhyByCT6MBqPADklKfLGj/9hkr+86s5kHGN2Lw7Fr7TdNFf5JooiZcZz NmJ0EgPIR3gd2DVNgWg13XelxbmkJVx/9ZOqreLrKJiMjPJlOnQxS8qnVpMKIb0/kjb/SW LkTZ4edLbDSfwhSNg8d41GcMhsWs7gGCsDIy/V/nHt2rrWfe7yIGi/BCGnuO2PDr9rMr0c P0uk1gTEE3h1gY0jGZAdZsgANOtMbdbOShHZA+ZWOu5hpkCwjM5fcvGD3nTDig== 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 4VTdMT74c3zxVR; Wed, 1 May 2024 00:33:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4410X98e035592; Wed, 1 May 2024 00:33:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4410X9D1035589; Wed, 1 May 2024 00:33:09 GMT (envelope-from git) Date: Wed, 1 May 2024 00:33:09 GMT Message-Id: <202405010033.4410X9D1035589@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 7e714b98cfd7 - main - audio/audacity: sort out dependencies 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7e714b98cfd7f36dcec77e41ea74d6fe55a2b0d0 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=7e714b98cfd7f36dcec77e41ea74d6fe55a2b0d0 commit 7e714b98cfd7f36dcec77e41ea74d6fe55a2b0d0 Author: Vladimir Druzenko AuthorDate: 2024-05-01 00:25:52 +0000 Commit: Vladimir Druzenko CommitDate: 2024-05-01 00:25:52 +0000 audio/audacity: sort out dependencies * Linked with libharfbuzz.so:print/harfbuzz if installed - make it mandatory * Used libavformat.so:multimedia/ffmpeg instead of libavcodec.so and load it at runtime, not linked with it * Sort records in LIB_DEPENDS PR: 278585 Approved by: xxjack12xx@gmail.com (maintainer) --- audio/audacity/Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile index fff9d5c59d80..2066cd6f58b3 100644 --- a/audio/audacity/Makefile +++ b/audio/audacity/Makefile @@ -13,6 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= conan:sysutils/conan \ rapidjson>0:devel/rapidjson LIB_DEPENDS= libexpat.so:textproc/expat2 \ + libharfbuzz.so:print/harfbuzz \ liblilv-0.so:audio/lilv \ libmp3lame.so:audio/lame \ libmpg123.so:audio/mpg123 \ @@ -27,8 +28,8 @@ LIB_DEPENDS= libexpat.so:textproc/expat2 \ libsratom-0.so:audio/sratom \ libsqlite3.so:databases/sqlite3 \ libsuil-0.so:audio/suil \ - libwavpack.so:audio/wavpack \ - libuuid.so:misc/e2fsprogs-libuuid + libuuid.so:misc/e2fsprogs-libuuid \ + libwavpack.so:audio/wavpack USES= cmake compiler:c++20-lang cpe desktop-file-utils gettext \ gnome libtool python:build pkgconfig shared-mime-info @@ -72,8 +73,7 @@ PLIST_SUB+= NLS="" PORTDOCS= README.md OPTIONS_DEFINE= DEBUG DOCS FFMPEG FLAC ID3TAG LADSPA MANUAL \ - OGG SBSMS SOUNDTOUCH TWOLAME VAMP \ - VORBIS VST + OGG SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST OPTIONS_DEFAULT= FFMPEG FLAC ID3TAG LADSPA OGG SBSMS \ SOUNDTOUCH TWOLAME VAMP VORBIS VST OPTIONS_EXCLUDE_i386= SBSMS @@ -90,10 +90,9 @@ DEBUG_CMAKE_ON= wxWidgets_USE_DEBUG DOCS_BUILD_DEPENDS= docbook-to-man:textproc/docbook-to-man \ docbook2man:textproc/docbook-utils -DOCS_LIB_DEPENDS= libharfbuzz.so:print/harfbuzz FFMPEG_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/libavcodec.pc:multimedia/ffmpeg -FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg +FFMPEG_RUN_DEPENDS= ${LOCALBASE}/lib/libavformat.so:multimedia/ffmpeg FFMPEG_CMAKE_ON= -Daudacity_use_ffmpeg:STRING=loaded FFMPEG_CMAKE_OFF= -Daudacity_use_ffmpeg:STRING=off