diff --git a/audio/mumble/Makefile b/audio/mumble/Makefile index 3ed1133d695..268b5a6b798 100644 --- a/audio/mumble/Makefile +++ b/audio/mumble/Makefile @@ -1,11 +1,9 @@ COMMENT-main = low-latency voice chat client COMMENT-server = low-latency voice chat server -VERSION = 1.4.230 +VERSION = 1.4.274 DISTNAME = mumble-${VERSION} PKGNAME-server = murmur-${VERSION} -REVISION-main = 2 -REVISION-server = 2 CATEGORIES = audio net @@ -14,12 +12,11 @@ HOMEPAGE = https://www.mumble.info/ MASTER_SITES = https://github.com/mumble-voip/mumble/releases/download/v${VERSION}/ MASTER_SITES0 = https://github.com/mumble-voip/mumble/commit/ -# all merged into master but not released yet +# all merged into master but not released/merged into 1.4.x branch yet PATCHFILES = mumble-kvm_getprocs-ALL_arg-{}42ad5ed.patch:0 \ mumble-kvm_getprocs-pass-elemsize-{}ccbacbf.patch:0 \ mumble-struct_procinfo-member_prefix-{}a707213.patch:0 \ 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" @@ -36,7 +33,7 @@ MAINTAINER = Klemens Nanni WANTLIB-main += ${COMPILER_LIBCXX} PocoFoundation PocoUtil PocoXML WANTLIB-main += PocoZip Qt5Concurrent Qt5Core Qt5DBus Qt5Gui Qt5Network WANTLIB-main += Qt5Sql Qt5Svg Qt5Widgets Qt5Xml X11 Xext Xi c crypto kvm -WANTLIB-main += m protobuf rnnoise sndfile speex speexdsp ssl +WANTLIB-main += m protobuf sndfile speex speexdsp ssl # dlopen()'ed WANTLIB-main += opus portaudio @@ -44,7 +41,7 @@ WANTLIB-main += opus portaudio WANTLIB-server += ${COMPILER_LIBCXX} Qt5Core Qt5DBus Qt5Network Qt5Sql WANTLIB-server += Qt5Xml c crypto m protobuf ssl -WRKDIST = ${WRKDIR}/${DISTNAME}.src +WRKDIST = ${WRKDIR}/mumble-src MULTI_PACKAGES = -main -server @@ -59,7 +56,6 @@ BUILD_DEPENDS = devel/boost LIB_DEPENDS-main = audio/libsndfile>=1.0.25p0 \ audio/opus \ audio/portaudio-svn \ - audio/rnnoise \ audio/speex \ devel/protobuf \ net/poco \ @@ -76,7 +72,6 @@ CONFIGURE_ARGS += -Wno-dev # ${WRKSRC}/docs/dev/build-instructions/cmake_options.md CONFIGURE_ARGS += -Dbundled-opus=OFF \ - -Dbundled-rnnoise=OFF \ -Dbundled-speex=OFF \ -Dice=OFF \ -Djackaudio=OFF \ diff --git a/audio/mumble/distinfo b/audio/mumble/distinfo index 0eee59fbafe..815a8f4d767 100644 --- a/audio/mumble/distinfo +++ b/audio/mumble/distinfo @@ -1,16 +1,14 @@ -SHA256 (mumble-1.4.230.tar.gz) = tn2CtObMWDS5ZcW8JTOeRWU0u9W53abIyVz5y4DkNLA= +SHA256 (mumble-1.4.274.tar.gz) = fsh93MzYkp5ABi6m6Gjyh1CdRDbGC7x1YGy/W2swO4s= 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= SHA256 (mumble-struct_procinfo-member_prefix-a707213.patch) = 9+fCD2/g+OqQVNfHhQ6r3qRL8cVLpd0bxK37baAwXlA= -SHA256 (mumble-use-system-rnnoise-d45318d.patch) = NctW70tU5VLFqTJeTcsWPU9YwmTsrbYHN+S7ZpHW06Q= -SIZE (mumble-1.4.230.tar.gz) = 9441667 +SIZE (mumble-1.4.274.tar.gz) = 9446657 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 SIZE (mumble-struct_procinfo-member_prefix-a707213.patch) = 1250 -SIZE (mumble-use-system-rnnoise-d45318d.patch) = 4172 diff --git a/audio/mumble/patches/patch-scripts_murmur_ini b/audio/mumble/patches/patch-scripts_murmur_ini index 042cf57ed9a..a7f939403bc 100644 --- a/audio/mumble/patches/patch-scripts_murmur_ini +++ b/audio/mumble/patches/patch-scripts_murmur_ini @@ -48,7 +48,7 @@ Index: scripts/murmur.ini ; If set, Murmur will write its process ID to this file ; when running in daemon mode (when the -fg flag is not -@@ -409,6 +409,6 @@ allowping=true +@@ -438,6 +438,6 @@ allowping=true ; leave the defaults as they are. ; Please note that this section has to be last in the configuration file. ; diff --git a/audio/mumble/patches/patch-src_mumble_Settings_cpp b/audio/mumble/patches/patch-src_mumble_Settings_cpp index 51d48e8c05b..5a638200b17 100644 --- a/audio/mumble/patches/patch-src_mumble_Settings_cpp +++ b/audio/mumble/patches/patch-src_mumble_Settings_cpp @@ -3,7 +3,7 @@ Disable submitting anonymous statistics by default Index: src/mumble/Settings.cpp --- src/mumble/Settings.cpp.orig +++ src/mumble/Settings.cpp -@@ -393,7 +393,7 @@ Settings::Settings() { +@@ -389,7 +389,7 @@ Settings::Settings() { bHideInTray = !isUnityDesktop && QSystemTrayIcon::isSystemTrayAvailable(); #endif bStateInTray = true; diff --git a/audio/mumble/pkg/PLIST-main b/audio/mumble/pkg/PLIST-main index 8a2c0c29261..0c5f1856f10 100644 --- a/audio/mumble/pkg/PLIST-main +++ b/audio/mumble/pkg/PLIST-main @@ -3,10 +3,10 @@ lib/mumble/ @so lib/mumble/libcelt0.so @man man/man1/mumble.1 -share/applications/org.mumble_voip.mumble.desktop +share/applications/info.mumble.Mumble.desktop share/icons/hicolor/256x256/apps/mumble.png share/icons/hicolor/scalable/apps/mumble.svg @tag gtk-update-icon-cache %D/share/icons/hicolor @tag update-desktop-database share/metainfo/ -share/metainfo/org.mumble_voip.mumble.appdata.xml +share/metainfo/info.mumble.Mumble.appdata.xml diff --git a/audio/mumble/pkg/PLIST-server b/audio/mumble/pkg/PLIST-server index fe77d5c97ff..1f7b0013ee5 100644 --- a/audio/mumble/pkg/PLIST-server +++ b/audio/mumble/pkg/PLIST-server @@ -3,8 +3,8 @@ @rcscript ${RCDIR}/murmurd @bin bin/mumble-server @bin bin/murmurd -@man man/man1/murmur-user-wrapper.1 -@man man/man1/murmurd.1 +@man man/man1/mumble-server-user-wrapper.1 +@man man/man1/mumble-server.1 share/examples/murmur/ share/examples/murmur/murmur.ini @sample ${SYSCONFDIR}/murmur.ini