[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: mumble: Update to 1.3.0.
|
From: |
guix-commits |
|
Subject: |
01/01: gnu: mumble: Update to 1.3.0. |
|
Date: |
Thu, 19 Dec 2019 08:03:05 -0500 (EST) |
efraim pushed a commit to branch master
in repository guix.
commit a21d9b8d5c15f200f3c71cfb86207dbefcff6c80
Author: Ivan Vilata-i-Balaguer <address@hidden>
Date: Sun Dec 15 14:22:08 2019 -0500
gnu: mumble: Update to 1.3.0.
* gnu/packages/telephony.scm (mumble): Update to 1.3.0.
[source]: Remove patch. Update snippet.
[build-system]: Switch to qt-build-system.
[arguments]: Update custom 'configure phase. Add custom phase to disable
murmur ice.
[inputs]: Remove protobuf-3.5, libx11, qt-4, alsa-lib. Add protobuf,
mesa, qtbase, qtsvg.
[native-inputs]: Add python, qttools.
[license]: Update license info.
* gnu/packages/patches/mumble-1.2.19-abs.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Remove it.
Signed-off-by: Efraim Flashner <address@hidden>
---
gnu/local.mk | 1 -
gnu/packages/patches/mumble-1.2.19-abs.patch | 31 --------
gnu/packages/telephony.scm | 114 ++++++++++++++++-----------
3 files changed, 67 insertions(+), 79 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index e83c556..0f62c8e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1157,7 +1157,6 @@ dist_patch_DATA =
\
%D%/packages/patches/mrrescue-support-love-11.patch \
%D%/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch \
%D%/packages/patches/mtools-mformat-uninitialized.patch \
- %D%/packages/patches/mumble-1.2.19-abs.patch \
%D%/packages/patches/mumps-build-parallelism.patch \
%D%/packages/patches/mumps-shared-libseq.patch \
%D%/packages/patches/mumps-shared-mumps.patch \
diff --git a/gnu/packages/patches/mumble-1.2.19-abs.patch
b/gnu/packages/patches/mumble-1.2.19-abs.patch
deleted file mode 100644
index 683325f..0000000
--- a/gnu/packages/patches/mumble-1.2.19-abs.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ea861fe86743c8402bbad77d8d1dd9de8dce447e Mon Sep 17 00:00:00 2001
-From: Mikkel Krautz <address@hidden>
-Date: Fri, 29 Dec 2017 14:47:25 +0100
-Subject: [PATCH] AudioOutput: do not use non-existant template version of
- std::abs.
-
-This change fixes AudioOutput to use the float overload of std::abs:
-
- float std::abs(float);
-
-instead of a non-existant template version (for newer Boost 1.66).
-
-Fixes mumble-voip/mumble#3281
-
----
- src/mumble/AudioOutput.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/mumble/AudioOutput.cpp b/src/mumble/AudioOutput.cpp
-index cbe0c0e2b..7a0a5e2ab 100644
---- a/src/mumble/AudioOutput.cpp
-+++ b/src/mumble/AudioOutput.cpp
-@@ -437,7 +437,7 @@ bool AudioOutput::mix(void *outbuff, unsigned int nsamp) {
- top[2] = 0.0f;
- }
-
-- if (std::abs<float>(front[0] * top[0] +
front[1] * top[1] + front[2] * top[2]) > 0.01f) {
-+ if (std::abs(front[0] * top[0] + front[1] *
top[1] + front[2] * top[2]) > 0.01f) {
- // Not perpendicular. Assume Y up and
rotate 90 degrees.
-
- float azimuth = 0.0f;
diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index 5b6c578..0c9de8b 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -13,6 +13,7 @@
;;; Copyright © 2018 Tim Gesthuizen <address@hidden>
;;; Copyright © 2019 Pierre Neidhardt <address@hidden>
;;; Copyright © 2019 Jan Wielkiewicz <address@hidden>
+;;; Copyright © 2019 Ivan Vilata i Balaguer <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -44,6 +45,7 @@
#:use-module (gnu packages file)
#:use-module (gnu packages protobuf)
#:use-module (gnu packages gettext)
+ #:use-module (gnu packages gl)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
@@ -77,7 +79,8 @@
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system cmake)
- #:use-module (guix build-system gnu))
+ #:use-module (guix build-system gnu)
+ #:use-module (guix build-system qt))
(define-public commoncpp
(package
@@ -379,54 +382,63 @@ address of one of the participants.")
(define-public mumble
(package
(name "mumble")
- (version "1.2.19")
+ (version "1.3.0")
(source (origin
(method url-fetch)
(uri (string-append "https://mumble.info/snapshot/";
name "-" version ".tar.gz"))
(sha256
(base32
- "1s60vaici3v034jzzi20x23hsj6mkjlc0glipjq4hffrg9qgnizh"))
- (patches (search-patches "mumble-1.2.19-abs.patch"))
+ "03dqg5yf6d7ilc1wydpshnv1ndssppcbadqcq20jm5j4fdaf53cs"))
(modules '((guix build utils)))
(snippet
`(begin
- ;; Remove bundled software.
- (for-each delete-file-recursively '("3rdparty"
- "speex"
- "speexbuild"
- "opus-build"
- "opus-src"
- "sbcelt-helper-build"
- "sbcelt-lib-build"
- "sbcelt-src"))
- ;; TODO: Celt is still bundled. It has been merged into Opus
- ;; and will be removed after 1.3.0.
- ;; https://github.com/mumble-voip/mumble/issues/1999
+ ;; Remove bundled software. Keep arc4random, celt-0.7.0,
+ ;; celt-0.11.0, qqbonjour, rnnoise, smallft.
+ (for-each
+ delete-file-recursively
+ '("3rdparty/GL" ; in mesa
+ "3rdparty/mach-override-build" ; for macx
+ "3rdparty/mach-override-src"
+ "3rdparty/minhook-build" ; for win32
+ "3rdparty/minhook-src"
+ "3rdparty/opus-build" ; in opus
+ "3rdparty/opus-src"
+ "3rdparty/sbcelt-helper-build" ; not enabled
+ "3rdparty/sbcelt-lib-build"
+ "3rdparty/sbcelt-src"
+ "3rdparty/speex-build" ; in speex
+ "3rdparty/speex-src"
+ "3rdparty/speexdsp-src" ; in speexdsp
+ "3rdparty/xinputcheck-build" ; for win32
+ "3rdparty/xinputcheck-src"))
#t))))
- (build-system gnu-build-system)
+ (build-system qt-build-system)
(arguments
`(#:tests? #f ; no "check" target
#:phases
(modify-phases %standard-phases
(replace 'configure
- (lambda* (#:key outputs #:allow-other-keys)
- (invoke "qmake" "main.pro" "-recursive"
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (invoke "qmake" "main.pro" "QMAKE_LRELEASE=lrelease"
+ (string-append "MUMBLE_PYTHON="
+ (string-append (assoc-ref inputs "python")
+ "/bin/python3"))
(string-append "CONFIG+="
(string-join
- (list "no-update"
- "no-ice"
+ ;; Options used are listed in the same
order
+ ;; as in the "INSTALL" file
+ ;; (plus the final "packaged" and
"release").
+ (list "no-bundled-speex" ; in speex
+ "no-bundled-opus" ; in opus
+ "no-g15" ; not packaged
+ "no-jackaudio" ; use pulse
+ "no-oss" ; use pulse
+ "no-alsa" ; use pulse
+ "no-update"
"no-embed-qt-translations"
- "no-bundled-speex"
- "pch"
- "no-bundled-opus"
- "no-celt"
- "no-alsa"
- "no-oss"
- "no-portaudio"
- "speechd"
- "no-g15"
- "no-bonjour"
+ "no-ice" ; not packaged
+ "packaged"
"release")))
(string-append "DEFINES+="
"PLUGIN_PATH="
@@ -435,7 +447,13 @@ address of one of the participants.")
(add-before 'configure 'fix-libspeechd-include
(lambda _
(substitute* "src/mumble/TextToSpeech_unix.cpp"
- (("libspeechd.h") "speech-dispatcher/libspeechd.h"))))
+ (("libspeechd.h") "speech-dispatcher/libspeechd.h"))
+ #t))
+ (add-before 'install 'disable-murmur-ice
+ (lambda _
+ (substitute* "scripts/murmur.ini.system"
+ (("^ice=") ";ice="))
+ #t))
(replace 'install ; install phase does not exist
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
@@ -466,21 +484,23 @@ address of one of the participants.")
(find-files "release/plugins" "\\.so$"))))))))
(inputs
`(("avahi" ,avahi)
- ("protobuf" ,protobuf-3.5)
- ("openssl" ,openssl)
- ("libsndfile" ,libsndfile)
("boost" ,boost)
- ("opus" ,opus)
- ("speex" ,speex)
- ("speexdsp" ,speexdsp)
- ("speech-dispatcher" ,speech-dispatcher)
- ("libx11" ,libx11)
+ ("libsndfile" ,libsndfile)
("libxi" ,libxi)
- ("qt-4" ,qt-4)
- ("alsa-lib" ,alsa-lib)
- ("pulseaudio" ,pulseaudio)))
+ ("mesa" ,mesa) ; avoid bundled
+ ("openssl" ,openssl)
+ ("opus" ,opus) ; avoid bundled
+ ("protobuf" ,protobuf)
+ ("pulseaudio" ,pulseaudio)
+ ("qtbase" ,qtbase)
+ ("qtsvg" ,qtsvg)
+ ("speech-dispatcher" ,speech-dispatcher)
+ ("speex" ,speex) ; avoid bundled
+ ("speexdsp" ,speexdsp))) ; avoid bundled
(native-inputs
- `(("pkg-config" ,pkg-config)))
+ `(("pkg-config" ,pkg-config)
+ ("python" ,python)
+ ("qttools" ,qttools)))
(synopsis "Low-latency, high quality voice chat software")
(description
"Mumble is an low-latency, high quality voice chat
@@ -488,9 +508,9 @@ 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
- ;; The bundled celt is bsd-2. Remove after 1.3.0.
- license:bsd-2))))
+ (license (list license:bsd-3 ; mumble celt-0.7.0 qqbonjour rnnoise smallft
+ license:bsd-2 ; celt-0.11.0
+ license:isc)))) ; arc4random
(define-public twinkle
(package