From debbugs-submit-bounces@debbugs.gnu.org Sun Nov 03 00:51:40 2019 Received: (at submit) by debbugs.gnu.org; 3 Nov 2019 04:51:40 +0000 Received: from localhost ([127.0.0.1]:33334 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iR7rX-00048J-Vx for submit@debbugs.gnu.org; Sun, 03 Nov 2019 00:51:40 -0400 Received: from lists.gnu.org ([209.51.188.17]:54856) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iR7rV-00048B-V6 for submit@debbugs.gnu.org; Sun, 03 Nov 2019 00:51:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53316) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iR7rU-0004hy-3D for guix-patches@gnu.org; Sun, 03 Nov 2019 00:51:37 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iR7rS-0008NW-EQ for guix-patches@gnu.org; Sun, 03 Nov 2019 00:51:35 -0400 Received: from mout02.posteo.de ([185.67.36.66]:46275) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iR7rR-0008Mz-SH for guix-patches@gnu.org; Sun, 03 Nov 2019 00:51:34 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 078652400E6 for ; Sun, 3 Nov 2019 05:51:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1572756691; bh=FaffjWYLXyu5NmxDHaD6IAzDAttJMsJMUb2QophGKCI=; h=From:To:Cc:Subject:Date:From; b=BBJUhe1nGzHqROLY0dZfmvwQzaq8yqHnVH7enOp8SVaMsDe/pqzdnh/RWjVO2PX31 g/cPZpLIAJmJ4d67eZSMiovWAGVjVQ1UMD0cYw0ov3mpDia1Sa58pdwwyALdG1V0lL BWWN+9hHf20yqNH/eZiPR9uNjtA+qx6THmNOfoNl3xr16sxxn0+Kj5HDMYJk4c6g7S 14pEwhLz9pFG7E7/4hXjOfj44EvoLV6mhl1VZ/ry3/rUWr98wKvrXEcWXaVcfVZTFu rqSsSEOLseR09JJppMqUhRlFHFsvtrvBPhMg0afAkXFbxy42JYK2lYWnKLTLS65FX0 F8HQDdXQqeF6g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 475Nmx55Chz9rxH; Sun, 3 Nov 2019 05:51:29 +0100 (CET) From: Kei Kebreau To: guix-patches@gnu.org Subject: [PATCH] gnu: lmms: Update to 1.2.1. Date: Sun, 3 Nov 2019 00:51:27 -0400 Message-Id: <20191103045127.27469-1-kkebreau@posteo.net> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 185.67.36.66 X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Kei Kebreau X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * gnu/packages/music.scm (lmms): Update to 1.2.1. [arguments]: Enable Qt 5 support and disbale VST support in configure-fla= gs. Add 'unpack-rpmalloc' phase and remove 'remove-Werror' phase. [native-inputs]: Add qttools and rpmalloc. [inputs]: Replace qt-4 and fluidsynth-1 with qtbase and fluidsynth, respectively; add qtx11extras. --- gnu/packages/music.scm | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index c14055cd5d..c219113867 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3707,7 +3707,7 @@ are a C compiler and glib. Full API documentation = and examples are included.") (define-public lmms (package (name "lmms") - (version "1.1.3") + (version "1.2.1") (source (origin (method git-fetch) @@ -3717,12 +3717,23 @@ are a C compiler and glib. Full API documentatio= n and examples are included.") (file-name (git-file-name name version)) (sha256 (base32 - "03hhymc6d73fa3wbcqb7rm1l03zkw605k5i9kvkvjmv488bqh3pd")))) + "1gx730z361xx30iqbsm99aam1k2c8yf561gcay6sryyjksb4w1wy")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; no tests + ;; Qt 5 support must be explicitly enabled in the 1.2 stable vers= ions of + ;; LMMS, so try removing "-DWANT_QT5=3DON" in later versions. + ;; Also, explicitly disabling VST support gets rid of the in-tree + ;; dependency on qt5-x11embed. + #:configure-flags '("-DWANT_QT5=3DON" + "-DWANT_VST=3DOFF") #:phases (modify-phases %standard-phases + (add-after 'unpack 'unpack-rpmalloc + (lambda* (#:key inputs #:allow-other-keys) + (copy-recursively (assoc-ref inputs "rpmalloc") + "src/3rdparty/rpmalloc/rpmalloc") + #t)) (add-before 'configure 'set-ldflags (lambda* (#:key outputs #:allow-other-keys) (setenv "LDFLAGS" @@ -3733,12 +3744,6 @@ are a C compiler and glib. Full API documentation= and examples are included.") (assoc-ref outputs "out") "/lib/lmms/ladspa" "\"")) #t)) - (add-before 'configure 'remove-Werror - (lambda _ - (substitute* "CMakeLists.txt" - (("SET\\(WERROR_FLAGS \"\\$\\{WERROR_FLAGS\\} -Werror") - "SET(WERROR_FLAGS \"${WERROR_FLAGS}")) - #t)) (add-before 'reset-gzip-timestamps 'make-manpages-writable (lambda* (#:key outputs #:allow-other-keys) (map (lambda (file) @@ -3748,14 +3753,25 @@ are a C compiler and glib. Full API documentatio= n and examples are included.") ".*\\.gz$")) #t))))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("qttools" ,qttools) + ("rpmalloc" + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mjansson/rpmalloc.git") + (commit "b5bdc18051bb74a22f0bde4bcc90b01cf590b496"))) + (sha256 + (base32 + "0g9pls46iggg7rdm65vzfj8nyr3v2n5xkp54c4qbh9hhalpsw4ay")))))= ) (inputs `(("sdl" ,sdl) - ("qt" ,qt-4) + ("qtbase" ,qtbase) + ("qtx11extras" ,qtx11extras) ("fltk" ,fltk) ("libogg" ,libogg) ("libsamplerate" ,libsamplerate) - ("fluidsynth" ,fluidsynth-1) ;XXX: try using 2.x when upd= ating + ("fluidsynth" ,fluidsynth) ("libvorbis" ,libvorbis) ("alsa-lib" ,alsa-lib) ("portaudio" ,portaudio) --=20 2.23.0