From 769833dbb6a0fe2645361defabb27c7681858563a3404fc09f68796b7e2cee3d Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Mon, 22 Aug 2022 08:44:51 +0000 Subject: [PATCH 1/3] Accepting request 998520 from home:iDesmI:Wayland MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Update to 1.4.274: - Client: * Changed: Disable RNNoise by default * Changed: Don’t hard block shortcuts on Wayland * Fixed: Context and identity not getting cleared * Fixed: Don’t display unsupported ACL * Fixed: Fix PipeWire not being usable in Flatpaks * Fixed: Icon not used on Plasma Wayland session * Fixed: Improve appstream metadata * Fixed: Minimal view not always working * Fixed: PFS information being incorrect * Fixed: Percent encoded links not clickable * Fixed: Prefer selected tree item for context menu creation * Fixed: Prevent endless loop when disconnecting PipeWire stream * Fixed: Register simultaneous mouse button presses separately * Fixed: Show friendlier text when displaying notifications * Fixed: Properly verify certificates when SRV records are used * Fixed: Resolve list tags, etc. polluting log * Fixed: Remove duplicate entry for “What’s this?” in UserModel * Fixed: User and channel status icons now take display scaling into account - Server: * Fixed: Add missing line breaks to –help output * Fixed: Improve rememberchannelduration compare logic * Fixed: Update suppress state on ACL change - Positional audio plugins: * Fixed: Fix Quake Live plugin * Fixed: Update Among Us plugin to work with v2022.3.29s (1864) OBS-URL: https://build.opensuse.org/request/show/998520 OBS-URL: https://build.opensuse.org/package/show/games:tools/mumble?expand=0&rev=146 --- 36398fb.patch | 33 --------------------------------- 73d8a4d5.patch | 22 ---------------------- mumble-1.4.230.tar.gz | 3 --- mumble-1.4.230.tar.gz.sig | 7 ------- mumble-1.4.274.tar.gz | 3 +++ mumble-1.4.274.tar.gz.sig | Bin 0 -> 119 bytes mumble.changes | 31 +++++++++++++++++++++++++++++++ mumble.spec | 14 +++++--------- 8 files changed, 39 insertions(+), 74 deletions(-) delete mode 100644 36398fb.patch delete mode 100644 73d8a4d5.patch delete mode 100644 mumble-1.4.230.tar.gz delete mode 100644 mumble-1.4.230.tar.gz.sig create mode 100644 mumble-1.4.274.tar.gz create mode 100644 mumble-1.4.274.tar.gz.sig diff --git a/36398fb.patch b/36398fb.patch deleted file mode 100644 index c4b752f..0000000 --- a/36398fb.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 36398fb3b293fc889bbc38df29665359f5c2a0ca Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Sun, 27 Feb 2022 10:59:57 +0000 -Subject: [PATCH] BUILD(positional-audio): Fix missing include - -Without the change the build fails on upcoming gcc-12 as: - - /build/mumble/plugins/gtav/gtav.cpp:13:13: - error: 'unique_ptr' in namespace 'std' does not name a template type - 13 | static std::unique_ptr< Game > game; - | ^~~~~~~~~~ - /build/mumble/plugins/gtav/gtav.cpp:12:1: - note: 'std::unique_ptr' is defined in header ''; - did you forget to '#include '? - 11 | #include - +++ |+#include - 12 | ---- - plugins/gtav/gtav.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/plugins/gtav/gtav.cpp b/plugins/gtav/gtav.cpp -index ebaf12929f..6c8af41c71 100644 ---- a/plugins/gtav/gtav.cpp -+++ b/plugins/gtav/gtav.cpp -@@ -9,6 +9,7 @@ - #include "mumble_positional_audio_utils.h" - - #include -+#include - - static std::unique_ptr< Game > game; - diff --git a/73d8a4d5.patch b/73d8a4d5.patch deleted file mode 100644 index c9a5b8f..0000000 --- a/73d8a4d5.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Nur mumble-1.4.230.src/src/mumble/CMakeLists.txt new/src/mumble/CMakeLists.txt ---- mumble-1.4.230.src/src/mumble/CMakeLists.txt 2022-01-18 02:00:00.342013800 +0100 -+++ new/src/mumble/CMakeLists.txt 2022-05-08 22:19:05.007999852 +0200 -@@ -383,12 +383,17 @@ - "${PLUGINS_DIR}" - ) - --find_pkg(Poco COMPONENTS Zip) -+find_pkg(Poco -+ COMPONENTS -+ XML -+ Zip -+) - - if(TARGET Poco::Zip) - target_link_libraries(mumble - PRIVATE - Poco::Zip -+ Poco::XML - ) - else() - message(STATUS "Regular Poco search failed - looking for Poco include dir manually...") diff --git a/mumble-1.4.230.tar.gz b/mumble-1.4.230.tar.gz deleted file mode 100644 index 1429ddc..0000000 --- a/mumble-1.4.230.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b67d82b4e6cc5834b965c5bc25339e456534bbd5b9dda6c8c95cf9cb80e434b0 -size 9441667 diff --git a/mumble-1.4.230.tar.gz.sig b/mumble-1.4.230.tar.gz.sig deleted file mode 100644 index 40262ed..0000000 --- a/mumble-1.4.230.tar.gz.sig +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iHUEABYIAB0WIQQe3r4qk8uX+pkD1S4l9jxmJF38YAUCYeYSsQAKCRAl9jxmJF38 -YHpdAQCzpcwRS1i73yVR+iYzce7kanCZxw2siQcORfq4RhMulwEA3bR+PiB8MNxe -zrQhs/lH3y3U/UEu6SpQxDymOJqH2wg= -=gtrl ------END PGP SIGNATURE----- diff --git a/mumble-1.4.274.tar.gz b/mumble-1.4.274.tar.gz new file mode 100644 index 0000000..7598aea --- /dev/null +++ b/mumble-1.4.274.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ec87ddcccd8929e40062ea6e868f287509d4436c60bbc75606cbf5b6b303b8b +size 9446657 diff --git a/mumble-1.4.274.tar.gz.sig b/mumble-1.4.274.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..ceb577742fc3ec32f02f711948c20cade7f0dcf540dd8eae4ae02b533537cd6a GIT binary patch literal 119 zcmeAuWnmEGV2~A4WRbhKPiyk&>Az+&U)59nW|O88`zL{wDVZsqm4S;>047p7kCEYq zmTkR#*JA62^6#>NKkXQGw`U)$nV`q + +- Update to 1.4.274: + - Client: + * Changed: Disable RNNoise by default + * Changed: Don’t hard block shortcuts on Wayland + * Fixed: Context and identity not getting cleared + * Fixed: Don’t display unsupported ACL + * Fixed: Fix PipeWire not being usable in Flatpaks + * Fixed: Icon not used on Plasma Wayland session + * Fixed: Improve appstream metadata + * Fixed: Minimal view not always working + * Fixed: PFS information being incorrect + * Fixed: Percent encoded links not clickable + * Fixed: Prefer selected tree item for context menu creation + * Fixed: Prevent endless loop when disconnecting PipeWire stream + * Fixed: Register simultaneous mouse button presses separately + * Fixed: Show friendlier text when displaying notifications + * Fixed: Properly verify certificates when SRV records are used + * Fixed: Resolve list tags, etc. polluting log + * Fixed: Remove duplicate entry for “What’s this?” in UserModel + * Fixed: User and channel status icons now take display scaling into account + - Server: + * Fixed: Add missing line breaks to –help output + * Fixed: Improve rememberchannelduration compare logic + * Fixed: Update suppress state on ACL change + - Positional audio plugins: + * Fixed: Fix Quake Live plugin + * Fixed: Update Among Us plugin to work with v2022.3.29s (1864) + ------------------------------------------------------------------- Wed May 11 09:42:59 UTC 2022 - Ferdinand Thiessen diff --git a/mumble.spec b/mumble.spec index 883dc64..a546e43 100644 --- a/mumble.spec +++ b/mumble.spec @@ -28,7 +28,7 @@ # versions. %bcond_with system_celt Name: mumble -Version: 1.4.230 +Version: 1.4.274 Release: 0 Summary: Voice Communication Client for Gamers # For Legal: the bundled opus and speex subdirectories are not built. @@ -43,9 +43,6 @@ Source3: murmur.apparmor Source4: https://raw.githubusercontent.com/mumble-voip/mumble-gpg-signatures/master/mumble-auto-build-2022.asc#/%{name}.keyring Source5: mumble-server.service Source6: baselibs.conf -#PATCH-FIX-UPSTREAM 73d8a4d5.patch -- https://github.com/mumble-voip/mumble/commit/73d8a4d5 -Patch0: 73d8a4d5.patch -Patch1: https://github.com/mumble-voip/mumble/commit/36398fb.patch BuildRequires: cmake >= 3.15 BuildRequires: gcc-c++ BuildRequires: libcap-devel @@ -136,7 +133,7 @@ characters, and has echo cancellation so the sound from your loudspeakers won't be audible to other players. %prep -%autosetup -p1 -n %{name}-%{version}.src +%autosetup -p1 -n %{name}-src %build %cmake \ @@ -205,7 +202,6 @@ systemd-tmpfiles --create %{_tmpfilesdir}/mumble-server.conf || true %files %exclude %{_docdir}/%{name}/scripts/murmur.ini -%exclude %{_docdir}/%{name}/scripts/org.mumble_voip.mumble.desktop %doc %{_docdir}/%{name} %{_bindir}/mumble %{_bindir}/mumble-overlay @@ -225,9 +221,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/mumble-server.conf || true %config(noreplace) %{_sysconfdir}/mumble-server.ini %{_tmpfilesdir}/mumble-server.conf %{_unitdir}/mumble-server.service -%{_mandir}/man1/murmurd.* -%{_mandir}/man1/murmur-user-wrapper.* -%{_datadir}/metainfo/org.mumble_voip.mumble.appdata.xml +%{_mandir}/man1/mumble-server.* +%{_mandir}/man1/mumble-server-user-wrapper.* +%{_datadir}/metainfo/info.mumble.Mumble.appdata.xml %dir %{_sysconfdir}/apparmor.d %config %{_sysconfdir}/apparmor.d/usr.sbin.murmurd From a9045c100b256b139cb290e13d6ab5386b9b6de3c523cd18fbf9548799342d12 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Thu, 25 Aug 2022 08:54:24 +0000 Subject: [PATCH 2/3] - Remove upstreamed: * 36398fb.patch * 73d8a4d5.patch OBS-URL: https://build.opensuse.org/package/show/games:tools/mumble?expand=0&rev=147 --- mumble.changes | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mumble.changes b/mumble.changes index b9c675d..df99da2 100644 --- a/mumble.changes +++ b/mumble.changes @@ -28,6 +28,9 @@ Sun Aug 21 21:03:15 UTC 2022 - Enrico Belleri - Positional audio plugins: * Fixed: Fix Quake Live plugin * Fixed: Update Among Us plugin to work with v2022.3.29s (1864) +- Remove upstreamed: + * 36398fb.patch + * 73d8a4d5.patch ------------------------------------------------------------------- Wed May 11 09:42:59 UTC 2022 - Ferdinand Thiessen From 68f24c8b3ffcb98516c6b72ff69445866d00c61efe9c19178d574fd28f07675f Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Thu, 1 Sep 2022 14:55:04 +0000 Subject: [PATCH 3/3] Accepting request 1000657 from home:susnux:branches:games:tools Fix i586 build for Factory submission OBS-URL: https://build.opensuse.org/request/show/1000657 OBS-URL: https://build.opensuse.org/package/show/games:tools/mumble?expand=0&rev=148 --- fix-64bit-only-plugins.patch | 13 +++++++++++++ mumble.changes | 5 +++++ mumble.spec | 2 ++ 3 files changed, 20 insertions(+) create mode 100644 fix-64bit-only-plugins.patch diff --git a/fix-64bit-only-plugins.patch b/fix-64bit-only-plugins.patch new file mode 100644 index 0000000..5b9bb5d --- /dev/null +++ b/fix-64bit-only-plugins.patch @@ -0,0 +1,13 @@ +diff -Nur mumble-src/plugins/CMakeLists.txt new/plugins/CMakeLists.txt +--- mumble-src/plugins/CMakeLists.txt 2022-08-21 18:52:23.000000000 +0200 ++++ new/plugins/CMakeLists.txt 2022-09-01 12:24:10.507433751 +0200 +@@ -24,6 +24,9 @@ + + foreach(ITEM ${ITEMS}) + if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${ITEM}") ++ if (ITEM STREQUAL "gtav" AND CMAKE_SIZEOF_VOID_P LESS 8) ++ continue() ++ endif() + set(PLUGIN_RETRACTED OFF) + + # If the plugin is retracted the corresponding CMakeLists.txt is supposed to set the diff --git a/mumble.changes b/mumble.changes index df99da2..27809b3 100644 --- a/mumble.changes +++ b/mumble.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 1 09:11:05 UTC 2022 - Ferdinand Thiessen + +- Add fix-64bit-only-plugins.patch to fix build on i586 + ------------------------------------------------------------------- Sun Aug 21 21:03:15 UTC 2022 - Enrico Belleri diff --git a/mumble.spec b/mumble.spec index a546e43..439cb50 100644 --- a/mumble.spec +++ b/mumble.spec @@ -43,6 +43,8 @@ Source3: murmur.apparmor Source4: https://raw.githubusercontent.com/mumble-voip/mumble-gpg-signatures/master/mumble-auto-build-2022.asc#/%{name}.keyring Source5: mumble-server.service Source6: baselibs.conf +# PATCH-FIX-UPSTREAM fix-64bit-only-plugins.patch -- Requires 64bit memory alignment ( https://github.com/mumble-voip/mumble/issues/5849 ) +Patch0: fix-64bit-only-plugins.patch BuildRequires: cmake >= 3.15 BuildRequires: gcc-c++ BuildRequires: libcap-devel