Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 1 May 2024 00:33:09 GMT
From:      Vladimir Druzenko <vvd@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 7e714b98cfd7 - main - audio/audacity: sort out dependencies
Message-ID:  <202405010033.4410X9D1035589@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7e714b98cfd7f36dcec77e41ea74d6fe55a2b0d0

commit 7e714b98cfd7f36dcec77e41ea74d6fe55a2b0d0
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2024-05-01 00:25:52 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
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
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202405010033.4410X9D1035589>