Bug 278585
| Summary: | audio/audacity: Update to 3.5.1 | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Jack <xxjack12xx> | ||||||
| Component: | Individual Port(s) | Assignee: | Vladimir Druzenko <vvd> | ||||||
| Status: | Closed FIXED | ||||||||
| Severity: | Affects Some People | CC: | vvd, xxjack12xx | ||||||
| Priority: | --- | ||||||||
| Version: | Latest | ||||||||
| Hardware: | Any | ||||||||
| OS: | Any | ||||||||
| URL: | https://support.audacityteam.org/additional-resources/changelog/audacity-3.5.1 | ||||||||
| Attachments: |
|
||||||||
You forgot to remove 4191cfb8376d19d044cadaf31214182375a9af55.patch from distinfo. Also why do you want merge-quarterly? Is it have CVE fixed or some another important fixes? (In reply to Vladimir Druzenko from comment #2) Looks like no CVE, just hotfix for 3.5.0 so if 3.5.0 not in, then don't need to merge-quarterly (In reply to Jack from comment #3) Yes, in 2024Q2 3.4.x. Also update distinfo plz. Created attachment 250241 [details]
Updated distinfo
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=816237e277ac09e1a9181250ee1f1385a8f64f85 commit 816237e277ac09e1a9181250ee1f1385a8f64f85 Author: Jack <xxjack12xx@gmail.com> AuthorDate: 2024-04-26 20:19:14 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2024-04-26 20:19:14 +0000 audio/audacity: update to 3.5.1 Changelog: https://support.audacityteam.org/additional-resources/changelog/audacity-3.5.1 PR: 278585 Approved by: arrowd (mentor, implicit) audio/audacity/Makefile | 6 +----- audio/audacity/distinfo | 8 +++----- 2 files changed, 4 insertions(+), 10 deletions(-) Tested build in poudriere 13.2, 13.3, amd64, i386. I got this during make stage-qa on live system:
====> Running Q/A tests (stage-qa)
Error: /usr/local/bin/audacity is linked to /usr/local/lib/libharfbuzz.so.0 from print/harfbuzz but it is not declared as a dependency
Warning: you need LIB_DEPENDS+=libharfbuzz.so:print/harfbuzz
Look like it grab silently libharfbuzz.so probably as nested deps.
$ readelf -d /usr/local/bin/audacity | grep harf
0x0000000000000001 NEEDED Shared library: [libharfbuzz.so.0]
To prevent this behavior I suggest add libharfbuzz.so:print/harfbuzz as mandatory dependency (also sort LIB_DEPENDS):
--- Makefile.orig 2024-04-26 23:19:14.000000000 +0300
+++ Makefile 2024-04-30 16:36:39.446160000 +0300
@@ -13,6 +13,7 @@
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 @@
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
@@ -90,7 +91,6 @@
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
In any case, print/harfbuzz is not a big dependency and is installed on any desktop.
Jack, do you agree with this patch?
P.S. Don't want create separate PR for "oneliners".
2. Also I think this is more correct:
-FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg
+FFMPEG_RUN_DEPENDS= ${LOCALBASE}/lib/libavformat.so:multimedia/ffmpeg
Both patches look ok, thanks for checking. A commit in branch main references this bug: 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(-) |
Created attachment 250230 [details] Patch to upgrade to audacity 3.5.1 Hotfix release