On Fri, Mar 18, 2022 at 01:22:43PM +0000, Stuart Henderson wrote: > > audio/mumble > > plist has lib/mumble/libcelt0.so.0.7.0 > file produced is now lib/mumble/libcelt0.so.0.0
I took this to upstream where a Windows related cmake issue is blocking my progress (also ENOTIME at the moment). BUILD(cmake): Build/install celt as module https://github.com/mumble-voip/mumble/pull/5592 > - fix with "SHARED_LIBS += celt0 X.X" + regen plist + bump? > (seems a good idea to have the version number 'higher' than the > existing one and not the same as the real /usr/local/lib/libcelt0 > so I'd probably go with 1.0 if it works) Could also work but doesn't seem right. I can either apply the upstream commit which works for everything except Windows or I can carry it as a trimmed down local patch until the diff landed upstream. Shipping libcelt0.so works and seems more appropiate. Here's the diff that picks my upstream PR. Index: Makefile =================================================================== RCS file: /cvs/ports/audio/mumble/Makefile,v retrieving revision 1.64 diff -u -p -r1.64 Makefile --- Makefile 11 Mar 2022 18:20:20 -0000 1.64 +++ Makefile 18 Mar 2022 13:41:59 -0000 @@ -4,7 +4,7 @@ COMMENT-server = low-latency voice chat VERSION = 1.4.230 DISTNAME = mumble-${VERSION} PKGNAME-server = murmur-${VERSION} -REVISION-main = 1 +REVISION-main = 2 REVISION-server = 1 CATEGORIES = audio net @@ -21,6 +21,11 @@ PATCHFILES = mumble-kvm_getprocs-ALL_ar mumble-audiowizard-fix_Werror-{}0c769d8.patch:0 \ mumble-use-system-rnnoise-{}d45318d.patch:0 \ mumble-enable-xinput2-{}904bae1.patch:0 + +# pending "BUILD(cmake): Build/install celt as module" +# https://github.com/mumble-voip/mumble/pull/5592 +PATCHFILES += mumble-celt-module-{}43176a1.patch:0 + PATCH_DIST_STRIP = -p1 # BSD3 Index: distinfo =================================================================== RCS file: /cvs/ports/audio/mumble/distinfo,v retrieving revision 1.22 diff -u -p -r1.22 distinfo --- distinfo 21 Jan 2022 20:49:17 -0000 1.22 +++ distinfo 18 Mar 2022 13:42:10 -0000 @@ -1,5 +1,6 @@ SHA256 (mumble-1.4.230.tar.gz) = tn2CtObMWDS5ZcW8JTOeRWU0u9W53abIyVz5y4DkNLA= SHA256 (mumble-audiowizard-fix_Werror-0c769d8.patch) = yE8VQPGskc74dwXR1OnTj+bHsmEsKM0LxqDb6QsxHpA= +SHA256 (mumble-celt-module-43176a1.patch) = jKgGZF1Ern5qiFYQCQxtJ0BAvbw9eq+UFgPsDVj/9oQ= SHA256 (mumble-enable-xinput2-904bae1.patch) = qp+3uz216Y+izrWg1Hh4L+AKLnK9hTv8h0MFVXXUeWE= SHA256 (mumble-kvm_getprocs-ALL_arg-42ad5ed.patch) = cC7hausQhddaotgMf1HJaU9G4MG/O+o9xkTv06NPBrY= SHA256 (mumble-kvm_getprocs-pass-elemsize-ccbacbf.patch) = dXlMiBCNEQ4oS+sxjjr8W7odlm0UuZVGwiHsLytNS84= @@ -7,6 +8,7 @@ SHA256 (mumble-struct_procinfo-member_pr SHA256 (mumble-use-system-rnnoise-d45318d.patch) = NctW70tU5VLFqTJeTcsWPU9YwmTsrbYHN+S7ZpHW06Q= SIZE (mumble-1.4.230.tar.gz) = 9441667 SIZE (mumble-audiowizard-fix_Werror-0c769d8.patch) = 1938 +SIZE (mumble-celt-module-43176a1.patch) = 5162 SIZE (mumble-enable-xinput2-904bae1.patch) = 2023 SIZE (mumble-kvm_getprocs-ALL_arg-42ad5ed.patch) = 1961 SIZE (mumble-kvm_getprocs-pass-elemsize-ccbacbf.patch) = 1418 Index: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/audio/mumble/pkg/PLIST-main,v retrieving revision 1.3 diff -u -p -r1.3 PLIST-main --- pkg/PLIST-main 10 Mar 2022 12:03:30 -0000 1.3 +++ pkg/PLIST-main 18 Mar 2022 13:42:58 -0000 @@ -1,7 +1,7 @@ @pkgpath audio/mumble @bin bin/mumble lib/mumble/ -lib/mumble/libcelt0.so.0.7.0 +@so lib/mumble/libcelt0.so @man man/man1/mumble.1 share/applications/org.mumble_voip.mumble.desktop share/icons/hicolor/256x256/apps/mumble.png