From patchwork Sat Feb 19 15:05:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 37401 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 005CB27BBEA; Tue, 22 Feb 2022 13:38:37 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_PDS_PRO_TLD, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4296327BBE9 for ; Tue, 22 Feb 2022 13:38:37 +0000 (GMT) Received: from localhost ([::1]:46652 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMVNE-0005B9-EV for patchwork@mira.cbaines.net; Tue, 22 Feb 2022 08:38:36 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46400) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMV6G-00014e-16 for guix-patches@gnu.org; Tue, 22 Feb 2022 08:21:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:46397) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nMV6E-0005s2-NW for guix-patches@gnu.org; Tue, 22 Feb 2022 08:21:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nMV6E-0004g9-KL for guix-patches@gnu.org; Tue, 22 Feb 2022 08:21:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54065] [PATCH v2 2/3] gnu: mumble: Update to 1.4.230. References: <2b30b57085cbc6896cd6b609a75a2ac7ad798d82.camel@gmail.com> In-Reply-To: <2b30b57085cbc6896cd6b609a75a2ac7ad798d82.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 22 Feb 2022 13:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54065 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxime Devos , 54065@debbugs.gnu.org Received: via spool by 54065-submit@debbugs.gnu.org id=B54065.164553603717915 (code B ref 54065); Tue, 22 Feb 2022 13:21:02 +0000 Received: (at 54065) by debbugs.gnu.org; 22 Feb 2022 13:20:37 +0000 Received: from localhost ([127.0.0.1]:40291 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nMV5p-0004et-7U for submit@debbugs.gnu.org; Tue, 22 Feb 2022 08:20:37 -0500 Received: from mail-ed1-f66.google.com ([209.85.208.66]:39731) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nMV5k-0004eH-EK for 54065@debbugs.gnu.org; Tue, 22 Feb 2022 08:20:34 -0500 Received: by mail-ed1-f66.google.com with SMTP id u18so36885747edt.6 for <54065@debbugs.gnu.org>; Tue, 22 Feb 2022 05:20:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:mime-version:to:content-transfer-encoding :message-id; bh=n3t2oNXhBGjt4a45dFZWklpuM2aGn3GetrLxlKp5hws=; b=QZTXAgHMQBD08nkNWIIY+XR4+du7GMcwtFQ7Tcd8JuIFMRBP2krDnOQ1nczmrmOaw/ wJZBG1JL/vZeg7wVShuD/vn2QJooDbofaAxT4zcIWYU0TnRt1c9O1KEzXoELzHnhWaqd IcWbcD7g6awztmuoCt5ENwKwZLKbDU2NmAjHCHtedXbmtKlgRBRvm0W7J5pNNHft3H5s x39321JlJIuTZ+1bZmORXgMRjGzE8kqyde3T8Hf3kFvchVUiuhN45O6V62CNioDJ/l3O 55KFmtlq5U3eM0yEuMQ7RvHmmcnrkmtaZtQvKBOwOKU+jPGOC4WgWpaooAUMAilmrkZg RiWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:mime-version:to :content-transfer-encoding:message-id; bh=n3t2oNXhBGjt4a45dFZWklpuM2aGn3GetrLxlKp5hws=; b=wKp7UTCuPJp3AIHHQrOi098msi1uET9i62JFeZn1J/mr6gIrf20u90bsLKIfxNYxPb kNNvEUo8KPCDDhrKt37L387smlGyJgr2G0O1mM8T4ZtOeesuApai0/onSlLG8PK6KuJE UeQOLe0mR6sQNuPhWWfWiHFwdHFlK71avSPrDa91vCAwyMCaH4OB6hX9a/PSAczG9V0+ iDtFzzpq2aF7vEX2BkW0DaAjvONH12YH3UGhQfYs2sLbuGHo5lwb0mhJR184f5dcGRJN 6P80B5hzNuAGHy1d33vqtBBRAzogVGGumKiau0lQsVjABRt+ic3irBkA8kxMRUhDyXYK w+ZA== X-Gm-Message-State: AOAM531nKekKLSSNz2DyToeXswOrC8ePSRDUhiQA7xgsbjlMpJVIYwlp hmADtK+8ho7VnaZEvfIh3q9UShk4IZPPpQ== X-Google-Smtp-Source: ABdhPJwBc4GY0/xEBluo88dSlnkC/YxI7l/ptaM3OZz0ODai1VxnN2JP6oHlm68yoOZmWs9UY0uC7A== X-Received: by 2002:aa7:cd81:0:b0:410:d64e:aa31 with SMTP id x1-20020aa7cd81000000b00410d64eaa31mr26513653edv.167.1645536026652; Tue, 22 Feb 2022 05:20:26 -0800 (PST) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id hs25sm6294874ejc.172.2022.02.22.05.20.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 05:20:26 -0800 (PST) From: Liliana Marie Prikler Date: Sat, 19 Feb 2022 16:05:34 +0100 MIME-Version: 1.0 Message-ID: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/telephony.scm (find-python-interpreter-cmake-modules): New variable. (mumble): Update to 1.4.230. [source]: Adjust uri and snippet accordingly. [arguments]: Change to a list of G-expressions. <#:configure-flags>: New argument. <#:phases>: Drop ‘configure’ (moved to configure-flags). Add ‘unpack-submodules’, ‘fix-settings-crash’ and ‘hardcode-pulseaudio’. [inputs]: Add glib and poco. --- gnu/packages/telephony.scm | 150 ++++++++++++++++--------------------- 1 file changed, 66 insertions(+), 84 deletions(-) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index b4b2585935..effe8d167f 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -50,6 +50,7 @@ (define-module (gnu packages telephony) #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages cpp) #:use-module (gnu packages crypto) #:use-module (gnu packages databases) #:use-module (gnu packages docbook) @@ -91,6 +92,7 @@ (define-module (gnu packages telephony) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix utils) #:use-module (guix packages) + #:use-module (guix gexp) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system cmake) @@ -536,34 +538,48 @@ (define-public seren (home-page "http://holdenc.altervista.org/seren/") (license license:gpl3+))) +(define find-python-interpreter-cmake-modules + (let ((commit "bb4d3ea8434eebef40df35434a9b6ef410fce0b2") + (revision "0")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Krzmbrzl/FindPythonInterpreter") + (commit commit))) + (file-name (git-file-name "find-python-interpreter" + (git-version "0" revision commit))) + (sha256 + (base32 + "1ryhda2yqgrhnwndfg52mscdsclg1ivv746hvalcay5m1wy2h5bm"))))) + (define-public mumble (package (name "mumble") - (version "1.3.4") + (version "1.4.230") (source (origin (method url-fetch) (uri (string-append - "https://github.com/mumble-voip/mumble/releases/download/" + "https://github.com/mumble-voip/mumble/releases/download/v" version "/" name "-" version ".tar.gz")) (sha256 (base32 - "14v0rgy1a5alxmz7ly95y38bdj0hx79yysgkcd8r8p9qqfzlwpv1")) + "1c1lwj0cpyawr74adpdrsnxk8ra5kqrjbg65cnwk8n6cwss84zdn")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet `(begin (let ((keep - '("arc4random-src" + '("arc4random" "celt-0.7.0-build" "celt-0.7.0-src" "celt-0.11.0-build" "celt-0.11.0-src" - "qqbonjour-src" + "qqbonjour" "rnnoise-build" "rnnoise-src" - "smallft-src"))) + "smallft"))) (with-directory-excursion "3rdparty" (for-each delete-file-recursively (lset-difference string=? @@ -572,105 +588,71 @@ (define-public mumble #t))))) (build-system qt-build-system) (arguments - `(#:tests? #f ; no "check" target - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (invoke "qmake" "main.pro" "QMAKE_LRELEASE=lrelease" - (string-append "MUMBLE_PYTHON=" - (search-input-file inputs - "/bin/python3")) - (string-append "CONFIG+=" - (string-join - ;; 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-ice" ; not packaged - "packaged" - "release"))) - (string-append "DEFINES+=" - "PLUGIN_PATH=" - (assoc-ref outputs "out") - "/lib/mumble")))) - (add-before 'configure 'fix-libspeechd-include - (lambda _ - (substitute* "src/mumble/TextToSpeech_unix.cpp" - (("libspeechd.h") "speech-dispatcher/libspeechd.h")) - #t)) - ;; disable statistic gathering by default. see - (add-before 'configure 'fix-statistic-gathering-default - (lambda _ - (substitute* "src/mumble/Settings.cpp" - (("bUsage = true;") "bUsage = false;")) - #t)) - (add-before 'configure 'fix-mumble-overlay - (lambda* (#:key outputs #:allow-other-keys) + (list + #:tests? #f ; no "check" target + #:configure-flags + #~(list "-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 + "-Djackaudio=off" ; use pulse + "-Doss=off" ; use pulse + "-Dpulseaudio=on" + "-Dportaudio=off" ; use pulse + "-Dpipewire=off" ; use pulse + "-Doverlay-xcompile=off" + "-Dupdate=off" ; don't phone home + "-Dbundle-qt-translations=off") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'unpack-submodules + (lambda _ + (copy-recursively #$find-python-interpreter-cmake-modules + "3rdparty/FindPythonInterpreter"))) + (add-after 'unpack 'disable-murmur-ice + (lambda _ + (substitute* "scripts/murmur.ini" + (("^ice=") ";ice=")))) + ;; disable statistic gathering by default. see + (add-after 'unpack 'fix-statistic-gathering-default + (lambda _ + (substitute* "src/mumble/Settings.h" + (("bUsage *= true;") "bUsage = false;")))) + (add-after 'unpack 'fix-mumble-overlay + (lambda* (#:key inputs outputs #:allow-other-keys) (with-output-to-file "scripts/mumble-overlay" (lambda () - (format #t "#!~a~%" (which "bash")) + (format #t "#!~a~%" (search-input-file inputs "/bin/bash")) (format #t "export LD_PRELOAD=\"~a $LD_PRELOAD\"~%" (string-append (assoc-ref outputs "out") "/lib/mumble/libmumble.so.1")) (format #t "exec \"${@}\""))) #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")) - (etc (string-append out "/etc/murmur")) - (dbus (string-append out "/etc/dbus-1/system.d/")) - (bin (string-append out "/bin")) - (services (string-append out "/share/services")) - (applications (string-append out "/share/applications")) - (icons (string-append out "/share/icons/hicolor/scalable/apps")) - (man (string-append out "/share/man/man1")) - (lib (string-append out "/lib/mumble"))) - (install-file "release/mumble" bin) - (install-file "scripts/mumble-overlay" bin) - (install-file "scripts/mumble.protocol" services) - (install-file "scripts/mumble.desktop" applications) - (install-file "icons/mumble.svg" icons) - (install-file "man/mumble-overlay.1" man) - (install-file "man/mumble.1" man) - (install-file "release/murmurd" bin) - (install-file "scripts/murmur.ini.system" etc) - (rename-file (string-append etc "/murmur.ini.system") - (string-append etc "/murmur.ini")) - (install-file "scripts/murmur.conf" dbus) - (install-file "man/murmurd.1" man) - (for-each (lambda (file) (install-file file lib)) - (find-files "." "\\.so\\.")) - (for-each (lambda (file) (install-file file lib)) - (find-files "release/plugins" "\\.so$")) - #t)))))) + (add-after 'unpack 'hardcode-pulseaudio + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/mumble/PulseAudio.cpp" + (("libpulse.so") (search-input-file inputs "/lib/libpulse.so")))))))) (inputs (list avahi boost + glib ; for speech-dispatcher libsndfile libxi mesa ; avoid bundled openssl opus ; avoid bundled + poco protobuf pulseaudio qtbase-5 qtsvg speech-dispatcher speex ; avoid bundled - speexdsp)) ; avoid bundled + speexdsp ; avoid bundled + ;; xiph-rnnoise ; TODO: unbundle rnnoise + )) (native-inputs (list pkg-config python qttools)) (synopsis "Low-latency, high quality voice chat software")