audio/audacity: update to 3.5.0
ClosedPublic
Actions

Authored by vvd on Apr 22 2024, 10:38 PM.

Details

Reviewers

arrowd
tcberner
adamw

Commits

R11:0839e30cb3a7: audio/audacity: update to 3.5.0

Summary

PR: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=278538

Changelog:
https://github.com/audacity/audacity/releases/tag/Audacity-3.5.0

Upstream issues:
https://github.com/audacity/audacity/issues/6326
https://github.com/audacity/audacity/issues/6327
https://github.com/audacity/audacity/issues/6328
https://github.com/audacity/audacity/issues/6329

Tested build and run (record from mic and play) on 13.3-p1 amd64.

Don't see maintainer xxjack12xx@gmail.com here.

Diff Detail

Repository

R11 FreeBSD ports repository

Lint

Lint Skipped

Unit

Tests Skipped

Event Timeline

vvd requested review of this revision.Apr 22 2024, 10:38 PM

vvd created this revision.

vvd edited the summary of this revision. (Show Details)Apr 22 2024, 10:48 PM

The change looks fine but remember that maintainer timeouts don't work on Phab. You need to create a bugzilla PR for this.

Removed unused LIB_DEPENDS:

Warning: you might not need LIB_DEPENDS on libasound.so
Warning: you might not need LIB_DEPENDS on libcurl.so
Warning: you might not need LIB_DEPENDS on libopenjp2.so
Warning: you might not need LIB_DEPENDS on libpng.so
Warning: you might not need LIB_DEPENDS on libturbojpeg.so

And pet portclippy.

P.S. I already added link to PR.

Upstream committed our patches to 3.5.1 branch - replaced audio/audacity/files/patch-* with patch from this commit.

This revision was not accepted when it landed; it landed in state Needs Review.Apr 24 2024, 12:24 AM

Closed by commit R11:0839e30cb3a7: audio/audacity: update to 3.5.0 (authored by vvd). · Explain Why

This revision was automatically updated to reflect the committed changes.

vvd added a commit: R11:0839e30cb3a7: audio/audacity: update to 3.5.0.

Revision Contents
Changeset List

Path

Size

audio/

audacity/

Makefile

48 lines

distinfo

8 lines

files/

patch-lib-src_libnyquist_nyquist_cmt_cext.h

patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h

patch-libraries_lib-basic-ui_BasicUI.cpp

patch-src_AboutDialog.cpp

patch-src_ListNavigationPanel.h

patch-src_MIDIPlay.cpp

pkg-plist

11 lines

Diff 137585

View Options

audio/audacity/Makefile

Show First 20 Lines • Show All 562 Lines • ▼ Show 20 Lines	if (oldcred->cr_svuid != oldcred->cr_uid \|\|
vn_lock(imgp->vp, LK_EXCLUSIVE \| LK_RETRY);		vn_lock(imgp->vp, LK_EXCLUSIVE \| LK_RETRY);
change_svuid(imgp->newcred, imgp->newcred->cr_uid);		change_svuid(imgp->newcred, imgp->newcred->cr_uid);
change_svgid(imgp->newcred, imgp->newcred->cr_gid);		change_svgid(imgp->newcred, imgp->newcred->cr_gid);
}		}
}		}
/* The new credentials are installed into the process later. */		/* The new credentials are installed into the process later. */

/*		/*
		* Do the best to calculate the full path to the image file.
		*/
		if (args->fname != NULL && args->fname[0] == '/')
		imgp->execpath = args->fname;
		else {
		VOP_UNLOCK(imgp->vp, 0);
		if (vn_fullpath(td, imgp->vp, &imgp->execpath,
		&imgp->freepath) != 0)
		imgp->execpath = args->fname;
		vn_lock(imgp->vp, LK_EXCLUSIVE \| LK_RETRY);
		}

		/*
* If the current process has a special image activator it		* If the current process has a special image activator it
* wants to try first, call it. For example, emulating shell		* wants to try first, call it. For example, emulating shell
* scripts differently.		* scripts differently.
*/		*/
error = -1;		error = -1;
if ((img_first = imgp->proc->p_sysent->sv_imgact_try) != NULL)		if ((img_first = imgp->proc->p_sysent->sv_imgact_try) != NULL)
error = img_first(imgp);		error = img_first(imgp);

▲ Show 20 Lines • Show All 41 Lines • ▼ Show 20 Lines	#endif
if (imgp->opened) {		if (imgp->opened) {
VOP_CLOSE(newtextvp, FREAD, td->td_ucred, td);		VOP_CLOSE(newtextvp, FREAD, td->td_ucred, td);
imgp->opened = 0;		imgp->opened = 0;
}		}
vput(newtextvp);		vput(newtextvp);
vm_object_deallocate(imgp->object);		vm_object_deallocate(imgp->object);
imgp->object = NULL;		imgp->object = NULL;
/* set new name to that of the interpreter */		/* set new name to that of the interpreter */
NDINIT(&nd, LOOKUP, LOCKLEAF \| FOLLOW \| SAVENAME,		NDINIT(&nd, LOOKUP, LOCKLEAF \| FOLLOW \| SAVENAME,
		kibUnsubmitted Not Done Inline Actions I think you need imgp->execpath = NULL; kib: I think you need imgp->execpath = NULL;
		bdreweryAuthorUnsubmitted Not Done Inline Actions Sure, that would be safest. I think it would always be overwritten above though. I'll add it though. bdrewery: Sure, that would be safest. I think it would always be overwritten above though. I'll add it…
		kibUnsubmitted Not Done Inline Actions At least, it would allow potential imgp consumers to not care about stage of the do_execve() where they act. Either pointer is null, or it points to current path. kib: At least, it would allow potential imgp consumers to not care about stage of the do_execve()…
UIO_SYSSPACE, imgp->interpreter_name, td);		UIO_SYSSPACE, imgp->interpreter_name, td);
args->fname = imgp->interpreter_name;		args->fname = imgp->interpreter_name;
goto interpret;		goto interpret;
}		}

/*		/*
* NB: We unlock the vnode here because it is believed that none		* NB: We unlock the vnode here because it is believed that none
* of the sv_copyout_strings/sv_fixup operations require the vnode.		* of the sv_copyout_strings/sv_fixup operations require the vnode.
*/		*/
VOP_UNLOCK(imgp->vp, 0);		VOP_UNLOCK(imgp->vp, 0);

/*
* Do the best to calculate the full path to the image file.
*/
if (imgp->auxargs != NULL &&
((args->fname != NULL && args->fname[0] == '/') \|\|
vn_fullpath(td, imgp->vp, &imgp->execpath, &imgp->freepath) != 0))
imgp->execpath = args->fname;

if (disallow_high_osrel &&		if (disallow_high_osrel &&
P_OSREL_MAJOR(p->p_osrel) > P_OSREL_MAJOR(__FreeBSD_version)) {		P_OSREL_MAJOR(p->p_osrel) > P_OSREL_MAJOR(__FreeBSD_version)) {
error = ENOEXEC;		error = ENOEXEC;
uprintf("Osrel %d for image %s too high\n", p->p_osrel,		uprintf("Osrel %d for image %s too high\n", p->p_osrel,
imgp->execpath != NULL ? imgp->execpath : "<unresolved>");		imgp->execpath != NULL ? imgp->execpath : "<unresolved>");
vn_lock(imgp->vp, LK_SHARED \| LK_RETRY);		vn_lock(imgp->vp, LK_SHARED \| LK_RETRY);
goto exec_fail_dealloc;		goto exec_fail_dealloc;
▲ Show 20 Lines • Show All 976 Lines • Show Last 20 Lines

View Options

audio/audacity/distinfo

Show First 20 Lines • Show All 562 Lines • ▼ Show 20 Lines	if (oldcred->cr_svuid != oldcred->cr_uid \|\|
vn_lock(imgp->vp, LK_EXCLUSIVE \| LK_RETRY);		vn_lock(imgp->vp, LK_EXCLUSIVE \| LK_RETRY);
change_svuid(imgp->newcred, imgp->newcred->cr_uid);		change_svuid(imgp->newcred, imgp->newcred->cr_uid);
change_svgid(imgp->newcred, imgp->newcred->cr_gid);		change_svgid(imgp->newcred, imgp->newcred->cr_gid);
}		}
}		}
/* The new credentials are installed into the process later. */		/* The new credentials are installed into the process later. */

/*		/*
		* Do the best to calculate the full path to the image file.
		*/
		if (args->fname != NULL && args->fname[0] == '/')
		imgp->execpath = args->fname;
		else {
		VOP_UNLOCK(imgp->vp, 0);
		if (vn_fullpath(td, imgp->vp, &imgp->execpath,
		&imgp->freepath) != 0)
		imgp->execpath = args->fname;
		vn_lock(imgp->vp, LK_EXCLUSIVE \| LK_RETRY);
		}

		/*
* If the current process has a special image activator it		* If the current process has a special image activator it
* wants to try first, call it. For example, emulating shell		* wants to try first, call it. For example, emulating shell
* scripts differently.		* scripts differently.
*/		*/
error = -1;		error = -1;
if ((img_first = imgp->proc->p_sysent->sv_imgact_try) != NULL)		if ((img_first = imgp->proc->p_sysent->sv_imgact_try) != NULL)
error = img_first(imgp);		error = img_first(imgp);

▲ Show 20 Lines • Show All 41 Lines • ▼ Show 20 Lines	#endif
if (imgp->opened) {		if (imgp->opened) {
VOP_CLOSE(newtextvp, FREAD, td->td_ucred, td);		VOP_CLOSE(newtextvp, FREAD, td->td_ucred, td);
imgp->opened = 0;		imgp->opened = 0;
}		}
vput(newtextvp);		vput(newtextvp);
vm_object_deallocate(imgp->object);		vm_object_deallocate(imgp->object);
imgp->object = NULL;		imgp->object = NULL;
/* set new name to that of the interpreter */		/* set new name to that of the interpreter */
NDINIT(&nd, LOOKUP, LOCKLEAF \| FOLLOW \| SAVENAME,		NDINIT(&nd, LOOKUP, LOCKLEAF \| FOLLOW \| SAVENAME,
		kibUnsubmitted Not Done Inline Actions I think you need imgp->execpath = NULL; kib: I think you need imgp->execpath = NULL;
		bdreweryAuthorUnsubmitted Not Done Inline Actions Sure, that would be safest. I think it would always be overwritten above though. I'll add it though. bdrewery: Sure, that would be safest. I think it would always be overwritten above though. I'll add it…
		kibUnsubmitted Not Done Inline Actions At least, it would allow potential imgp consumers to not care about stage of the do_execve() where they act. Either pointer is null, or it points to current path. kib: At least, it would allow potential imgp consumers to not care about stage of the do_execve()…
UIO_SYSSPACE, imgp->interpreter_name, td);		UIO_SYSSPACE, imgp->interpreter_name, td);
args->fname = imgp->interpreter_name;		args->fname = imgp->interpreter_name;
goto interpret;		goto interpret;
}		}

/*		/*
* NB: We unlock the vnode here because it is believed that none		* NB: We unlock the vnode here because it is believed that none
* of the sv_copyout_strings/sv_fixup operations require the vnode.		* of the sv_copyout_strings/sv_fixup operations require the vnode.
*/		*/
VOP_UNLOCK(imgp->vp, 0);		VOP_UNLOCK(imgp->vp, 0);

/*
* Do the best to calculate the full path to the image file.
*/
if (imgp->auxargs != NULL &&
((args->fname != NULL && args->fname[0] == '/') \|\|
vn_fullpath(td, imgp->vp, &imgp->execpath, &imgp->freepath) != 0))
imgp->execpath = args->fname;

if (disallow_high_osrel &&		if (disallow_high_osrel &&
P_OSREL_MAJOR(p->p_osrel) > P_OSREL_MAJOR(__FreeBSD_version)) {		P_OSREL_MAJOR(p->p_osrel) > P_OSREL_MAJOR(__FreeBSD_version)) {
error = ENOEXEC;		error = ENOEXEC;
uprintf("Osrel %d for image %s too high\n", p->p_osrel,		uprintf("Osrel %d for image %s too high\n", p->p_osrel,
imgp->execpath != NULL ? imgp->execpath : "<unresolved>");		imgp->execpath != NULL ? imgp->execpath : "<unresolved>");
vn_lock(imgp->vp, LK_SHARED \| LK_RETRY);		vn_lock(imgp->vp, LK_SHARED \| LK_RETRY);
goto exec_fail_dealloc;		goto exec_fail_dealloc;
▲ Show 20 Lines • Show All 976 Lines • Show Last 20 Lines

View Options

audio/audacity/files/patch-lib-src_libnyquist_nyquist_cmt_cext.h

Show First 20 Lines • Show All 562 Lines • ▼ Show 20 Lines	if (oldcred->cr_svuid != oldcred->cr_uid \|\|
vn_lock(imgp->vp, LK_EXCLUSIVE \| LK_RETRY);		vn_lock(imgp->vp, LK_EXCLUSIVE \| LK_RETRY);
change_svuid(imgp->newcred, imgp->newcred->cr_uid);		change_svuid(imgp->newcred, imgp->newcred->cr_uid);
change_svgid(imgp->newcred, imgp->newcred->cr_gid);		change_svgid(imgp->newcred, imgp->newcred->cr_gid);
}		}
}		}
/* The new credentials are installed into the process later. */		/* The new credentials are installed into the process later. */

/*		/*
		* Do the best to calculate the full path to the image file.
		*/
		if (args->fname != NULL && args->fname[0] == '/')
		imgp->execpath = args->fname;
		else {
		VOP_UNLOCK(imgp->vp, 0);
		if (vn_fullpath(td, imgp->vp, &imgp->execpath,
		&imgp->freepath) != 0)
		imgp->execpath = args->fname;
		vn_lock(imgp->vp, LK_EXCLUSIVE \| LK_RETRY);
		}

		/*
* If the current process has a special image activator it		* If the current process has a special image activator it
* wants to try first, call it. For example, emulating shell		* wants to try first, call it. For example, emulating shell
* scripts differently.		* scripts differently.
*/		*/
error = -1;		error = -1;
if ((img_first = imgp->proc->p_sysent->sv_imgact_try) != NULL)		if ((img_first = imgp->proc->p_sysent->sv_imgact_try) != NULL)
error = img_first(imgp);		error = img_first(imgp);

▲ Show 20 Lines • Show All 41 Lines • ▼ Show 20 Lines	#endif
if (imgp->opened) {		if (imgp->opened) {
VOP_CLOSE(newtextvp, FREAD, td->td_ucred, td);		VOP_CLOSE(newtextvp, FREAD, td->td_ucred, td);
imgp->opened = 0;		imgp->opened = 0;
}		}
vput(newtextvp);		vput(newtextvp);
vm_object_deallocate(imgp->object);		vm_object_deallocate(imgp->object);
imgp->object = NULL;		imgp->object = NULL;
/* set new name to that of the interpreter */		/* set new name to that of the interpreter */
NDINIT(&nd, LOOKUP, LOCKLEAF \| FOLLOW \| SAVENAME,		NDINIT(&nd, LOOKUP, LOCKLEAF \| FOLLOW \| SAVENAME,
		kibUnsubmitted Not Done Inline Actions I think you need imgp->execpath = NULL; kib: I think you need imgp->execpath = NULL;
		bdreweryAuthorUnsubmitted Not Done Inline Actions Sure, that would be safest. I think it would always be overwritten above though. I'll add it though. bdrewery: Sure, that would be safest. I think it would always be overwritten above though. I'll add it…
		kibUnsubmitted Not Done Inline Actions At least, it would allow potential imgp consumers to not care about stage of the do_execve() where they act. Either pointer is null, or it points to current path. kib: At least, it would allow potential imgp consumers to not care about stage of the do_execve()…
UIO_SYSSPACE, imgp->interpreter_name, td);		UIO_SYSSPACE, imgp->interpreter_name, td);
args->fname = imgp->interpreter_name;		args->fname = imgp->interpreter_name;
goto interpret;		goto interpret;
}		}

/*		/*
* NB: We unlock the vnode here because it is believed that none		* NB: We unlock the vnode here because it is believed that none
* of the sv_copyout_strings/sv_fixup operations require the vnode.		* of the sv_copyout_strings/sv_fixup operations require the vnode.
*/		*/
VOP_UNLOCK(imgp->vp, 0);		VOP_UNLOCK(imgp->vp, 0);

/*
* Do the best to calculate the full path to the image file.
*/
if (imgp->auxargs != NULL &&
((args->fname != NULL && args->fname[0] == '/') \|\|
vn_fullpath(td, imgp->vp, &imgp->execpath, &imgp->freepath) != 0))
imgp->execpath = args->fname;

if (disallow_high_osrel &&		if (disallow_high_osrel &&
P_OSREL_MAJOR(p->p_osrel) > P_OSREL_MAJOR(__FreeBSD_version)) {		P_OSREL_MAJOR(p->p_osrel) > P_OSREL_MAJOR(__FreeBSD_version)) {
error = ENOEXEC;		error = ENOEXEC;
uprintf("Osrel %d for image %s too high\n", p->p_osrel,		uprintf("Osrel %d for image %s too high\n", p->p_osrel,
imgp->execpath != NULL ? imgp->execpath : "<unresolved>");		imgp->execpath != NULL ? imgp->execpath : "<unresolved>");
vn_lock(imgp->vp, LK_SHARED \| LK_RETRY);		vn_lock(imgp->vp, LK_SHARED \| LK_RETRY);
goto exec_fail_dealloc;		goto exec_fail_dealloc;
▲ Show 20 Lines • Show All 976 Lines • Show Last 20 Lines

View Options

audio/audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h

Show First 20 Lines • Show All 562 Lines • ▼ Show 20 Lines	if (oldcred->cr_svuid != oldcred->cr_uid \|\|
vn_lock(imgp->vp, LK_EXCLUSIVE \| LK_RETRY);		vn_lock(imgp->vp, LK_EXCLUSIVE \| LK_RETRY);
change_svuid(imgp->newcred, imgp->newcred->cr_uid);		change_svuid(imgp->newcred, imgp->newcred->cr_uid);
change_svgid(imgp->newcred, imgp->newcred->cr_gid);		change_svgid(imgp->newcred, imgp->newcred->cr_gid);
}		}
}		}
/* The new credentials are installed into the process later. */		/* The new credentials are installed into the process later. */

/*		/*
		* Do the best to calculate the full path to the image file.
		*/
		if (args->fname != NULL && args->fname[0] == '/')
		imgp->execpath = args->fname;
		else {
		VOP_UNLOCK(imgp->vp, 0);
		if (vn_fullpath(td, imgp->vp, &imgp->execpath,
		&imgp->freepath) != 0)
		imgp->execpath = args->fname;
		vn_lock(imgp->vp, LK_EXCLUSIVE \| LK_RETRY);
		}

		/*
* If the current process has a special image activator it		* If the current process has a special image activator it
* wants to try first, call it. For example, emulating shell		* wants to try first, call it. For example, emulating shell
* scripts differently.		* scripts differently.
*/		*/
error = -1;		error = -1;
if ((img_first = imgp->proc->p_sysent->sv_imgact_try) != NULL)		if ((img_first = imgp->proc->p_sysent->sv_imgact_try) != NULL)
error = img_first(imgp);		error = img_first(imgp);

▲ Show 20 Lines • Show All 41 Lines • ▼ Show 20 Lines	#endif
if (imgp->opened) {		if (imgp->opened) {
VOP_CLOSE(newtextvp, FREAD, td->td_ucred, td);		VOP_CLOSE(newtextvp, FREAD, td->td_ucred, td);
imgp->opened = 0;		imgp->opened = 0;
}		}
vput(newtextvp);		vput(newtextvp);
vm_object_deallocate(imgp->object);		vm_object_deallocate(imgp->object);
imgp->object = NULL;		imgp->object = NULL;
/* set new name to that of the interpreter */		/* set new name to that of the interpreter */
NDINIT(&nd, LOOKUP, LOCKLEAF \| FOLLOW \| SAVENAME,		NDINIT(&nd, LOOKUP, LOCKLEAF \| FOLLOW \| SAVENAME,
		kibUnsubmitted Not Done Inline Actions I think you need imgp->execpath = NULL; kib: I think you need imgp->execpath = NULL;
		bdreweryAuthorUnsubmitted Not Done Inline Actions Sure, that would be safest. I think it would always be overwritten above though. I'll add it though. bdrewery: Sure, that would be safest. I think it would always be overwritten above though. I'll add it…
		kibUnsubmitted Not Done Inline Actions At least, it would allow potential imgp consumers to not care about stage of the do_execve() where they act. Either pointer is null, or it points to current path. kib: At least, it would allow potential imgp consumers to not care about stage of the do_execve()…
UIO_SYSSPACE, imgp->interpreter_name, td);		UIO_SYSSPACE, imgp->interpreter_name, td);
args->fname = imgp->interpreter_name;		args->fname = imgp->interpreter_name;
goto interpret;		goto interpret;
}		}

/*		/*
* NB: We unlock the vnode here because it is believed that none		* NB: We unlock the vnode here because it is believed that none
* of the sv_copyout_strings/sv_fixup operations require the vnode.		* of the sv_copyout_strings/sv_fixup operations require the vnode.
*/		*/
VOP_UNLOCK(imgp->vp, 0);		VOP_UNLOCK(imgp->vp, 0);

/*
* Do the best to calculate the full path to the image file.
*/
if (imgp->auxargs != NULL &&
((args->fname != NULL && args->fname[0] == '/') \|\|
vn_fullpath(td, imgp->vp, &imgp->execpath, &imgp->freepath) != 0))
imgp->execpath = args->fname;

if (disallow_high_osrel &&		if (disallow_high_osrel &&
P_OSREL_MAJOR(p->p_osrel) > P_OSREL_MAJOR(__FreeBSD_version)) {		P_OSREL_MAJOR(p->p_osrel) > P_OSREL_MAJOR(__FreeBSD_version)) {
error = ENOEXEC;		error = ENOEXEC;
uprintf("Osrel %d for image %s too high\n", p->p_osrel,		uprintf("Osrel %d for image %s too high\n", p->p_osrel,
imgp->execpath != NULL ? imgp->execpath : "<unresolved>");		imgp->execpath != NULL ? imgp->execpath : "<unresolved>");
vn_lock(imgp->vp, LK_SHARED \| LK_RETRY);		vn_lock(imgp->vp, LK_SHARED \| LK_RETRY);
goto exec_fail_dealloc;		goto exec_fail_dealloc;
▲ Show 20 Lines • Show All 976 Lines • Show Last 20 Lines