From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:51942) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1igfSX-0004tT-S0 for guix-patches@gnu.org; Sun, 15 Dec 2019 20:46:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1igfSV-000828-Cy for guix-patches@gnu.org; Sun, 15 Dec 2019 20:46:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59807) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1igfST-00080j-Si for guix-patches@gnu.org; Sun, 15 Dec 2019 20:46:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1igfST-0005Zs-Qw for guix-patches@gnu.org; Sun, 15 Dec 2019 20:46:01 -0500 Subject: [bug#38395] Acknowledgement ([PATCH] gnu: mumble: Update to 1.3.0.) Resent-Message-ID: Date: Sun, 15 Dec 2019 20:44:11 -0500 From: Ivan Vilata i Balaguer Message-ID: <20191216014411.GC1392584@sax.terramar.selidor.net> References: <20191127014038.GD17004@sax.terramar.selidor.net> <20191204201718.GA17141@sax.terramar.selidor.net> <20191205090236.GQ15280@E5400> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="Km1U/tdNT/EmXiR1" Content-Disposition: inline In-Reply-To: <20191205090236.GQ15280@E5400> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Efraim Flashner Cc: 38395@debbugs.gnu.org, Ivan Vilata i Balaguer --Km1U/tdNT/EmXiR1 Content-Type: multipart/mixed; boundary="qjNfmADvan18RZcF" Content-Disposition: inline --qjNfmADvan18RZcF Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Efraim Flashner (2019-12-05 11:02:36 +0200) wrote: > With the 'staging' branch being merged into master the patch no longer > cleanly applies. >=20 > Also, since you've removed a patch from the gnu/packages/patches folder > you need to remove it also from gnu/local.mk. The two other things are > the commit message doesn't list all of the changes and with the new > qt-build-system that would probably be a better choice than wrapping the > binaries yourself, but with an updated patch without that I can help > work on that since it is such a new change. Hi! I'm attaching a reviewed set of patches. The first patch updates the original one to fix the copyright line (so it applies cleanly again), the `local.mk` line removal and commit message completeness. The second patch adds the update to `qt-build-system`. From the comments in `guix/build-system/qt.scm` I gather that no other changes are missing, but I may be wrong. Thanks! --=20 Ivan Vilata i Balaguer -- https://elvil.net/ --qjNfmADvan18RZcF Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: attachment; filename="0001-gnu-mumble-Update-to-1.3.0.patch" Content-Transfer-Encoding: quoted-printable =46rom aea8a70894c170d3c825c26d25f83b3ef05f2820 Mon Sep 17 00:00:00 2001 =46rom: Ivan Vilata-i-Balaguer Date: Sun, 15 Dec 2019 14:22:08 -0500 Subject: [PATCH 1/2] gnu: mumble: Update to 1.3.0. Besides the update in itself, bundled software components are enabled as lo= ng as they are not already implemented in an existing package (in which case t= he package is used instead). Some comments were added to indicate why bundled software components are kept or removed, why features are disabled, and the reason to include each license. * gnu/packages/telephony.scm: Add import of (gnu packages gl). * gnu/packages/telephony.scm (mumble): Update to 1.3.0. * gnu/packages/patches/mumble-1.2.19-abs.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/patches/mumble-1.2.19-abs.patch | 31 ----- gnu/packages/telephony.scm | 114 ++++++++++++------- 3 files changed, 70 insertions(+), 76 deletions(-) delete mode 100644 gnu/packages/patches/mumble-1.2.19-abs.patch diff --git a/gnu/local.mk b/gnu/local.mk index 32b2c141fa..1034e0198d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1158,7 +1158,6 @@ dist_patch_DATA =3D \ %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/pa= tches/mumble-1.2.19-abs.patch deleted file mode 100644 index 683325f4bc..0000000000 --- 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 -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 nsam= p) { - top[2] =3D 0.0f; - } -=20 -- if (std::abs(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. -=20 - float azimuth =3D 0.0f; diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 5b6c578fce..53911f4a94 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -13,6 +13,7 @@ ;;; Copyright =A9 2018 Tim Gesthuizen ;;; Copyright =A9 2019 Pierre Neidhardt ;;; Copyright =A9 2019 Jan Wielkiewicz +;;; Copyright =A9 2019 Ivan Vilata i Balaguer ;;; ;;; 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) @@ -379,30 +381,34 @@ 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 + ;; Keep arc4random, celt-0.7.0, celt-0.11.0, qqbonjour, = rnnoise, smallft. + (for-each delete-file-recursively '("3rdparty/GL" ; in m= esa + "3rdparty/mach-overr= ide-build" ; for macx + "3rdparty/mach-overr= ide-src" + "3rdparty/minhook-bu= ild" ; for win32 + "3rdparty/minhook-sr= c" + "3rdparty/opus-build= " ; in opus + "3rdparty/opus-src" + "3rdparty/sbcelt-hel= per-build" ; not enabled + "3rdparty/sbcelt-lib= -build" + "3rdparty/sbcelt-src" + "3rdparty/speex-buil= d" ; in speex + "3rdparty/speex-src" + "3rdparty/speexdsp-s= rc" ; in speexdsp + "3rdparty/xinputchec= k-build" ; for win32 + "3rdparty/xinputchec= k-src")) #t)))) (build-system gnu-build-system) (arguments @@ -410,23 +416,25 @@ address of one of the participants.") #: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=3Dlrelease" + (string-append "MUMBLE_PYTHON=3D" + (string-append (assoc-ref inputs "pyth= on") "/bin/python3")) (string-append "CONFIG+=3D" (string-join - (list "no-update" - "no-ice" + ;; Options used are listed in the sam= e order + ;; as in the "INSTALL" file + ;; (plus the final "packaged" and "re= lease"). + (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+=3D" "PLUGIN_PATH=3D" @@ -436,6 +444,10 @@ address of one of the participants.") (lambda _ (substitute* "src/mumble/TextToSpeech_unix.cpp" (("libspeechd.h") "speech-dispatcher/libspeechd.h")))) + (add-before 'install 'disable-murmur-ice + (lambda _ + (substitute* "scripts/murmur.ini.system" + (("^ice=3D") ";ice=3D")))) (replace 'install ; install phase does not exist (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -463,24 +475,38 @@ address of one of the participants.") (for-each (lambda (file) (install-file file lib)) (find-files "." "\\.so\\.")) (for-each (lambda (file) (install-file file lib)) - (find-files "release/plugins" "\\.so$")))))))) + (find-files "release/plugins" "\\.so$"))))) + (add-after 'install 'wrap-executable + ;; Add path to plugins for SVG support (otherwise many icons ar= e not shown). + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (for-each (lambda (program) + (wrap-program (string-append out "/bin/" progra= m) + `("QT_PLUGIN_PATH" ":" prefix + ,(map (lambda (label) + (string-append (assoc-ref inputs la= bel) + "/lib/qt5/plugins")) + '("qtbase" "qtsvg"))))) + '("mumble" "mumble-overlay")))))))) (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 +514,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 sma= llft + license:bsd-2 ; celt-0.11.0 + license:isc)))) ; arc4random =20 (define-public twinkle (package --=20 2.24.0 --qjNfmADvan18RZcF Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0002-gnu-mumble-Use-qt-build-system.patch" Content-Transfer-Encoding: quoted-printable =46rom b94d83ed7b9ed7fe009e6aa4920970a8ebfa4276 Mon Sep 17 00:00:00 2001 =46rom: Ivan Vilata-i-Balaguer Date: Sun, 15 Dec 2019 20:12:34 -0500 Subject: [PATCH 2/2] gnu: mumble: Use qt-build-system. * gnu/packages/telephony.scm: Add import of (guix build-system qt). * gnu/packages/telephony.scm (mumble): Use qt-build-system. : Base on phases from qt-build-system. {wrap-executable}: Remove. --- gnu/packages/telephony.scm | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 53911f4a94..e0168d2345 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -79,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)) =20 (define-public commoncpp (package @@ -410,11 +411,11 @@ address of one of the participants.") "3rdparty/xinputchec= k-build" ; for win32 "3rdparty/xinputchec= k-src")) #t)))) - (build-system gnu-build-system) + (build-system qt-build-system) (arguments `(#:tests? #f ; no "check" target #:phases - (modify-phases %standard-phases + (modify-phases (@ (guix build qt-build-system) %standard-phases) (replace 'configure (lambda* (#:key inputs outputs #:allow-other-keys) (invoke "qmake" "main.pro" "QMAKE_LRELEASE=3Dlrelease" @@ -475,19 +476,7 @@ address of one of the participants.") (for-each (lambda (file) (install-file file lib)) (find-files "." "\\.so\\.")) (for-each (lambda (file) (install-file file lib)) - (find-files "release/plugins" "\\.so$"))))) - (add-after 'install 'wrap-executable - ;; Add path to plugins for SVG support (otherwise many icons ar= e not shown). - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (for-each (lambda (program) - (wrap-program (string-append out "/bin/" progra= m) - `("QT_PLUGIN_PATH" ":" prefix - ,(map (lambda (label) - (string-append (assoc-ref inputs la= bel) - "/lib/qt5/plugins")) - '("qtbase" "qtsvg"))))) - '("mumble" "mumble-overlay")))))))) + (find-files "release/plugins" "\\.so$")))))))) (inputs `(("avahi" ,avahi) ("boost" ,boost) --=20 2.24.0 --qjNfmADvan18RZcF-- --Km1U/tdNT/EmXiR1 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEHpvwBPZcchIQr6TuPezBBfXdI4IFAl324VwACgkQPezBBfXd I4Lmqg/+IE+UzySJJr63bIzcjP/eSLA8TGEBN6ToM6YF0/lGstEIQZbfvTiC130l uPQw4LAFX3GUxF+YFpKXL992mvRnh03zGIhno/ClVPLsW05NF6N3SGmUoe1uVWAw +58G9dWrJTDTInIQ0/jB8OTechYf23RjBRYmkn7W4Vh8cUQveVCoUgFBzaDqS/BH Ii4X7SoK8ZBcWbPspmOxhMvEEF4YdLRZpgcbra8mjBvVjCjSm7ZQD9W2V/E0EE3q lSAvUDEuGgOGcpHpo9qfTOw54pFt2iLtQQx0M7mSFE1dpWennFQdpRO3UZzwuWm1 W3xEtlQGXrVfazh/ztiXiA4PZiJ6UBhXazkJmBvduwSaLpBNOBmWHyxiE3hvtusw R2z4NhekYOl9ZXZf7TtrnEcR8Ld0EFx7AiET4DDOET6ZHx4n0Kp0a6WatRIqJksY t6Y57gXGpHAftUVPaflSM9gyRNrvwiGOXO0X3qXGdB/AZsAmmG0OIZR2kDO4SRUC BCca9KhcJzjnFXA76uBuuuzuQ5AsfqFbe8545demag5aCtcfPkTL1CWg065KYd7g N6I85NnyGEY8GyPFOjr2BEQkhdj2OT95T+PuBiOaaqmdjSAeJBraWuufuMJJMocG K3IR3F4mZ49Kpjn1pGSusU4NR0zAcZW3+JjM/jb9AvKWMDzDqSU= =NWTE -----END PGP SIGNATURE----- --Km1U/tdNT/EmXiR1--