Skip to content

Commit

Permalink
gnu: mumble: Update to 1.5.634, fix aarch64 build.
Browse files Browse the repository at this point in the history
[[PGP Signed Part:No public key for 3DECC105F5DD2382 created at 2024-10-28T20:22:22+0100 using RSA]]
TestPacketDataStream failed to pass for aarch64 under 1.4.287 as described in
<mumble-voip/mumble#3845>.  The new release fixes
that.

The new version changes some bundled dependencies.  Some of them are only kept
during the build for the sake of generating the text shown for third-party
licenses under the "About" dialog.

* gnu/packages/telephony.scm (mumble): Update to 1.5.634.
[source]: Update 3rd party dirs kept during build.
[arguments]: Update build options for bundled dependencies.
[inputs]: Depend on OpenSSL 3 and N. Lohmann's JSON lib.
[license]: Update licenses for bundled dependencies.

Change-Id: I39498ffa143e4416b06a6aa1a31fd46cd0ba2e3b
Signed-off-by: Ludovic Courtès <[email protected]>
  • Loading branch information
ivilata authored and civodul committed Nov 14, 2024
1 parent 2d46a1b commit 62b0d90
Showing 1 changed file with 22 additions and 17 deletions.
39 changes: 22 additions & 17 deletions gnu/packages/telephony.scm
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
;;; Copyright © 2018 Tim Gesthuizen <[email protected]>
;;; Copyright © 2019 Pierre Neidhardt <[email protected]>
;;; Copyright © 2019 Jan Wielkiewicz <[email protected]>
;;; Copyright © 2019 Ivan Vilata i Balaguer <[email protected]>
;;; Copyright © 2019, 2024 Ivan Vilata i Balaguer <[email protected]>
;;; Copyright © 2020 Brett Gilio <[email protected]>
;;; Copyright © 2020, 2022 Michael Rohleder <[email protected]>
;;; Copyright © 2020 Raghav Gururajan <[email protected]>
Expand Down Expand Up @@ -557,7 +557,7 @@ address of one of the participants.")
(define-public mumble
(package
(name "mumble")
(version "1.4.287")
(version "1.5.634")
(source (origin
(method url-fetch)
(uri
Expand All @@ -566,22 +566,24 @@ address of one of the participants.")
version "/" name "-" version ".tar.gz"))
(sha256
(base32
"0iq54011jgrc5ipk16x05n3sj54j8mzhcidnzcdsb2x5pzan33ip"))
"0aar5if80w8ay9i03lpnznz6ln1gh1jjrzxfbj9fdc4as8rkckwh"))
(modules '((guix build utils)
(ice-9 ftw)
(srfi srfi-1)))
(snippet
`(begin
(let ((keep
'("arc4random"
"celt-0.7.0-build"
"celt-0.7.0-src"
"celt-0.11.0-build"
"celt-0.11.0-src"
"cmake-compiler-flags"
"flag-icons"
"minhook" ; unused, reqd for licenses
"qqbonjour"
"rnnoise-build"
"rnnoise-src"
"smallft")))
"renamenoise"
"smallft"
"speexdsp" ; unbundled, reqd for licenses
"tracy" ; disabled below, reqd by cmake
"xinputcheck-src" ; reqd for licenses
)))
(with-directory-excursion "3rdparty"
(for-each delete-file-recursively
(lset-difference string=?
Expand All @@ -592,9 +594,10 @@ address of one of the participants.")
(arguments
(list
#:configure-flags
#~(list "-Dbundled-speex=off"
#~(list "-Dbundled-gsl=off"
"-Dbundled-json=off"
"-Dbundled-speex=off"
"-Dbundled-opus=off"
;; "-Dbundled-rnnoise=off" ; XXX: not yet in release
"-Dalsa=off" ; use pulse
"-Dcoreaudio=off" ; use pulse
"-Dice=off" ; not packaged
Expand All @@ -606,6 +609,7 @@ address of one of the participants.")
"-Doverlay-xcompile=off"
"-Dupdate=off" ; don't phone home
"-Dtests=on"
"-Dtracy=off" ; no profiling
"-Dbundle-qt-translations=off")
#:phases
#~(modify-phases %standard-phases
Expand All @@ -615,7 +619,7 @@ address of one of the participants.")
"3rdparty/FindPythonInterpreter")))
(add-after 'unpack 'disable-murmur-ice
(lambda _
(substitute* "scripts/murmur.ini"
(substitute* "auxiliary_files/mumble-server.ini"
(("^ice=") ";ice="))))
;; disable statistic gathering by default. see <https://bugs.gnu.org/25201>
(add-after 'unpack 'fix-statistic-gathering-default
Expand All @@ -638,11 +642,13 @@ address of one of the participants.")
(inputs
(list avahi
boost
c++-gsl ; avoid bundled
glib ; for speech-dispatcher
libsndfile
libxi
mesa ; avoid bundled
openssl-1.1 ; 1.5.x works with openssl-3.x
nlohmann-json ; avoid bundled
openssl
opus ; avoid bundled
poco
protobuf
Expand All @@ -652,7 +658,6 @@ address of one of the participants.")
speech-dispatcher
speex ; avoid bundled
speexdsp ; avoid bundled
;; rnnoise ; TODO: unbundle rnnoise
))
(native-inputs
(list pkg-config python qttools-5))
Expand All @@ -663,8 +668,8 @@ software primarily intended for use while gaming.
Mumble consists of two applications for separate usage:
@code{mumble} for the client, and @code{murmur} for the server.")
(home-page "https://wiki.mumble.info/wiki/Main_Page")
(license (list license:bsd-3 ; mumble celt-0.7.0 qqbonjour rnnoise smallft
license:bsd-2 ; celt-0.11.0
(license (list license:bsd-3 ; mumble cmake-compiler-flags qqbonjour smallft
license:expat ; flag-icons
license:isc)))) ; arc4random

(define-public twinkle
Expand Down

0 comments on commit 62b0d90

Please sign in to comment.