From 3086c18324953141cb0f801fb9ef9796e6d715f5 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sun, 7 Apr 2024 13:15:48 +0200 Subject: [PATCH] update to 1.5.613 [release 1.5.613-1mamba;Fri Mar 15 2024] --- ...e-1.3.0-jack-do-not-start-by-default.patch | 23 ----- mumble.spec | 86 +++++++++---------- 2 files changed, 42 insertions(+), 67 deletions(-) delete mode 100644 mumble-1.3.0-jack-do-not-start-by-default.patch diff --git a/mumble-1.3.0-jack-do-not-start-by-default.patch b/mumble-1.3.0-jack-do-not-start-by-default.patch deleted file mode 100644 index 455f043..0000000 --- a/mumble-1.3.0-jack-do-not-start-by-default.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0780d93aab3eec9796e1cb8606c5f3c089d64eca Mon Sep 17 00:00:00 2001 -From: David Runge -Date: Sun, 8 Mar 2020 19:28:59 +0100 -Subject: [PATCH] src/mumble/Settings.cpp: Setting bJackStartServer to false, - so mumble will not unconditionally start a JACK server on start (#3989). - ---- - src/mumble/Settings.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/mumble/Settings.cpp b/src/mumble/Settings.cpp -index 596e772dc2..b2e3990242 100644 ---- a/src/mumble/Settings.cpp -+++ b/src/mumble/Settings.cpp -@@ -322,7 +322,7 @@ Settings::Settings() { - - qsJackClientName = QLatin1String("mumble"); - qsJackAudioOutput = QLatin1String("1"); -- bJackStartServer = true; -+ bJackStartServer = false; - bJackAutoConnect = true; - - bEcho = false; diff --git a/mumble.spec b/mumble.spec index 529e472..f2955f1 100644 --- a/mumble.spec +++ b/mumble.spec @@ -1,5 +1,5 @@ Name: mumble -Version: 1.3.4 +Version: 1.5.613 Release: 1mamba Summary: A voice chat application similar to TeamSpeak Group: Graphical Desktop/Applications/Internet @@ -7,32 +7,32 @@ Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: https://www.mumble.info/ -## GITSOURCE https://github.com/mumble-voip/mumble.git 1.3.0 -Source: https://github.com/mumble-voip/mumble.git/%{version}/mumble-%{version}.tar.bz2 -Patch0: mumble-1.3.0-jack-do-not-start-by-default.patch +Source: https://github.com/mumble-voip/mumble.git/v%{version}/mumble-%{version}.tar.bz2 License: BSD ## AUTOBUILDREQ-BEGIN BuildRequires: avahi-compat-libdns_sd-devel BuildRequires: glibc-devel +BuildRequires: libQt5Svg-devel BuildRequires: libX11-devel +BuildRequires: libXext-devel BuildRequires: libXi-devel +BuildRequires: libabseil-cpp-devel BuildRequires: libalsa-devel -BuildRequires: libavahi-devel +BuildRequires: libcap-devel BuildRequires: libgcc BuildRequires: libglib-devel -BuildRequires: libglvnd-devel -BuildRequires: libjack-devel BuildRequires: libopenssl-devel BuildRequires: libopus-devel +BuildRequires: libpoco-devel BuildRequires: libprotobuf-devel -BuildRequires: libpulseaudio-devel -BuildRequires: libqt5-devel BuildRequires: libsndfile-devel BuildRequires: libspeechd-devel -BuildRequires: libspeex-devel -BuildRequires: libspeexdsp-devel BuildRequires: libstdc++6-devel +BuildRequires: qt5-qtbase-devel +BuildRequires: zeroc-ice-devel ## AUTOBUILDREQ-END +BuildRequires: libpoco-devel +BuildRequires: zeroc-ice-devel %description A voice chat application similar to TeamSpeak. @@ -41,60 +41,58 @@ A voice chat application similar to TeamSpeak. %prep %setup -q -#%patch0 -p1 +# protobuf 23 requires C++17 +sed -i "s|CMAKE_CXX_STANDARD 14|CMAKE_CXX_STANDARD 17|" CMakeLists.txt %build -qmake-qt5 main.pro \ - CONFIG+="no-bundled-opus no-bundled-speex no-g15 no-xevie no-server \ - no-embed-qt-translations no-update packaged bundled-celt" \ - DEFINES+="PLUGIN_PATH=%{_libdir}/mumble" \ - INCLUDEPATH+="%{_includedir}/speech-dispatcher" +%cmake \ + -DMUMBLE_INSTALL_SYSCONFDIR=%{_sysconfdir}/mumble \ + -DMUMBLE_INSTALL_SERVICEFILEDIR=%{_unitdir} \ + -DMUMBLE_INSTALL_SYSUSERSDIR=%{_sysusersdir} \ + -DMUMBLE_INSTALL_TMPFILESDIR=%{_tmpfilesdir} -make release +%cmake_build %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -install -vDm 755 release/mumble -t %{buildroot}%{_bindir} -install -vDm 755 scripts/mumble-overlay -t %{buildroot}%{_bindir} - -# (vendored) libs -install -vdm 755 %{buildroot}%{_libdir}/mumble/ -for _lib in release/*.so*; do - if [ -L "$_lib" ]; then - cp -vP "$_lib" %{buildroot}%{_libdir}/mumble/ - else - install -vDm 755 "$_lib" -t %{buildroot}%{_libdir}/mumble/ - fi -done -install -vDm 755 release/plugins/*.so -t %{buildroot}%{_libdir}/mumble/ -# XDG desktop integration -install -vDm 644 scripts/mumble.desktop -t %{buildroot}%{_datadir}/applications/ -# man page -install -vDm 644 man/mumble*.1 -t %{buildroot}%{_mandir}/man1/ -# XDG desktop icons -install -vDm 644 icons/mumble.svg -t %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ +%cmake_install %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %files %defattr(-,root,root) +%config(noreplace) %{_sysconfdir}/mumble/mumble-server.ini %{_bindir}/mumble %{_bindir}/mumble-overlay +%{_bindir}/mumble-server +%{_bindir}/mumble-server-user-wrapper +%{_unitdir}/mumble-server.service +%{_sysusersdir}/mumble-server.conf +%{_tmpfilesdir}/mumble-server.conf +%{_datadir}/applications/info.mumble.Mumble.desktop +%{_metainfodir}/info.mumble.Mumble.appdata.xml +%{_libdir}/mumble/libmumbleoverlay.x86.so +%{_libdir}/mumble/libmumbleoverlay.x86.so.* +%{_libdir}/mumble/libmumbleoverlay.*.so +%{_libdir}/mumble/libmumbleoverlay.*.so.* %dir %{_libdir}/mumble -%{_libdir}/mumble/libcelt0.so* -%{_libdir}/mumble/libl4d2.so -%{_libdir}/mumble/liblink.so -%{_libdir}/mumble/libmumble.so* -%{_libdir}/mumble/librl.so -%{_datadir}/applications/mumble.desktop +%dir %{_libdir}/mumble/plugins +%{_libdir}/mumble/plugins/lib*.so +%{_datadir}/mumble-server/MumbleServer.ice +%{_datadir}/icons/hicolor/256x256/apps/mumble.png %{_datadir}/icons/hicolor/scalable/apps/mumble.svg %{_mandir}/man1/mumble-overlay.1* %{_mandir}/man1/mumble.1* -%doc AUTHORS LICENSE +%{_mandir}/man1/mumble-server-user-wrapper.1* +%{_mandir}/man1/mumble-server.1* +%doc LICENSE %changelog +* Fri Mar 15 2024 Silvan Calarco 1.5.613-1mamba +- update to 1.5.613 + * Fri Apr 30 2021 Automatic Build System 1.3.4-1mamba - automatic version update by autodist