From unknown Sun Jun 15 09:00:05 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#38042] [PATCH] gnu: lmms: Update to 1.2.1. Resent-From: Kei Kebreau Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 03 Nov 2019 04:52:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 38042 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38042@debbugs.gnu.org Cc: Kei Kebreau X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.157275670015897 (code B ref -1); Sun, 03 Nov 2019 04:52:01 +0000 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 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-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 From unknown Sun Jun 15 09:00:05 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#38042] [PATCH] gnu: lmms: Update to 1.2.1. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 03 Nov 2019 16:23:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38042 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Kei Kebreau , 38042@debbugs.gnu.org Cc: Kei Kebreau Received: via spool by 38042-submit@debbugs.gnu.org id=B38042.157279818129267 (code B ref 38042); Sun, 03 Nov 2019 16:23:01 +0000 Received: (at 38042) by debbugs.gnu.org; 3 Nov 2019 16:23:01 +0000 Received: from localhost ([127.0.0.1]:34903 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iRIea-0007by-UW for submit@debbugs.gnu.org; Sun, 03 Nov 2019 11:23:01 -0500 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:49443) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iRIeY-0007bk-Vi for 38042@debbugs.gnu.org; Sun, 03 Nov 2019 11:22:59 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 8D3AA21391; Sun, 3 Nov 2019 11:22:53 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sun, 03 Nov 2019 11:22:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm1; bh=WWDH8HSCdF2d1puc9U+PyDF7gP pKq2uqbqfJGZXwrII=; b=YBLulbZh+SvOjv63P1fGwiuAs6xxes2Um8NBXXXMz4 66eyO0F96mNA7PMcL3ppMLj3Ub+DeWc7vNOYt02F8j+TZ25pijsETsIrTg7iEn4H e8HUHJhjXHeaS3P1xFTpGdK9GVKt7ZkY4iYGObAc5DZgkUNIwCzLGtEDExYG7FK7 ilFSmS+6J9zj/hKNAonCeVbKTdit+MoSw2HCwXx7S12dj4qvHP9FYgcYltFvBDBh EvTf4tPYvNY1Je6xNuztQbLfzNDfB27F9sgqsy2sia6PL/eATwDPACimBEtp6XRi nsI1R0jGrz8r1SoEdri1+VmMnssKZD/nFEI1NpIV115w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=WWDH8H SCdF2d1puc9U+PyDF7gPpKq2uqbqfJGZXwrII=; b=Ho4FDyI39sHY/tpv9tQL5w +W4lhiz2tTMhIQovT8LCwQnR3trkHLjnGB0xf6M2kZ7mkpzehlxdTWbR6Q0oPjFX P4algjd8GiiBF7yQtAeOWH0DqEdM5dNhPwYpXKjhDL/DGgW98DrGYnwPZlbiEiJJ 3stLsMBiba0qQes8D8kOMV7XLI8PDQSrwwXW5Q0BJLxyzWYlUpc4B+P7HxNMXt/x 6ke8V2feIjp3BEuq5iCqbwpBDDYdK5qizOmnVUJv+mbwx7Csw9s1Aj9oerj87fTc 2gc04Z0obJtaUHltY21VeETES7QNqbNVJGaVszPmg2LVTxngpNCdYSDxQrUFppRg == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedufedrudduuddgkeelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufgjfhgffffkgggtsehgtderredtredtnecuhfhrohhmpeforghrihhu shcuuegrkhhkvgcuoehmsggrkhhkvgesfhgrshhtmhgrihhlrdgtohhmqeenucfkphepie dvrdduiedrudelvddrudehtdenucfrrghrrghmpehmrghilhhfrhhomhepmhgsrghkkhgv sehfrghsthhmrghilhdrtghomhenucevlhhushhtvghrufhiiigvpedt X-ME-Proxy: Received: from localhost (ti0006q161-0149.bb.online.no [62.16.192.150]) by mail.messagingengine.com (Postfix) with ESMTPA id A1A1180059; Sun, 3 Nov 2019 11:22:52 -0500 (EST) From: Marius Bakke In-Reply-To: <20191103045127.27469-1-kkebreau@posteo.net> References: <20191103045127.27469-1-kkebreau@posteo.net> User-Agent: Notmuch/0.29.1 (https://notmuchmail.org) Emacs/26.3 (x86_64-pc-linux-gnu) Date: Sun, 03 Nov 2019 17:22:51 +0100 Message-ID: <87eeyporok.fsf@devup.no> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) 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: -1.7 (-) --=-=-= Content-Type: text/plain Kei Kebreau writes: > * gnu/packages/music.scm (lmms): Update to 1.2.1. > [arguments]: Enable Qt 5 support and disbale VST support in configure-flags. > 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. Can you add a comment about what rpmalloc is, and how to tell which version to pick? Otherwise LGTM, thanks! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl2+/tsACgkQoqBt8qM6 VPpaOAf/W3pDOY4M4CvYW0ngnmCM8fJSy/78PYMl/eF7m73CVR7tIHghFa5gPiv4 niaJpJMHu8S7u+BZpMuS0Rc/cbnq6lT8vlPnxHuubbBxil712sDK6a1ZD+NoO0T8 +AIBoCtfb+Wla8X97r6ZcdqOMwqANOu7a0xgF0w9gcFqzgAcUwlRlJmgo1gLItt5 f5PxrhgNdfs18VAefGrM1ByJpjxnNFLO9q1yQOZGeygukSDWEq0NtUykQ9ZMi+3/ VaAnQbm1eUwNxHcavDduVfiu1GA9NqWrjOFrObnY3UenTEMausGvbFiugTYqNZL0 hCM6n3BCNI5KNZcgISjpwh1tvR26RA== =qC3m -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Jun 15 09:00:05 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Kei Kebreau Subject: bug#38042: closed (Re: [bug#38042] [PATCH] gnu: lmms: Update to 1.2.1.) Message-ID: References: <87k18gqvr9.fsf@posteo.net> <20191103045127.27469-1-kkebreau@posteo.net> X-Gnu-PR-Message: they-closed 38042 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 38042@debbugs.gnu.org Date: Mon, 04 Nov 2019 01:25:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1572830702-15143-1" This is a multi-part message in MIME format... ------------=_1572830702-15143-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #38042: [PATCH] gnu: lmms: Update to 1.2.1. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 38042@debbugs.gnu.org. --=20 38042: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D38042 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1572830702-15143-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 38042-done) by debbugs.gnu.org; 4 Nov 2019 01:24:23 +0000 Received: from localhost ([127.0.0.1]:35666 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iRR6U-0003vA-VV for submit@debbugs.gnu.org; Sun, 03 Nov 2019 20:24:23 -0500 Received: from mout01.posteo.de ([185.67.36.65]:48389) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iRR6S-0003ur-Eu for 38042-done@debbugs.gnu.org; Sun, 03 Nov 2019 20:24:21 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id D35A316005E for <38042-done@debbugs.gnu.org>; Mon, 4 Nov 2019 02:24:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1572830653; bh=VSP43r5vPIyvoWZnF8gqpKvmMywAUThhV7Q29BjJzMA=; h=From:To:Cc:Subject:Date:From; b=mIpO3ah5zRYNLflcrCA9RxuCmjjsASON5viISbVhHTREV0/CpAQYZ4c1dsCRmUOD1 nHNZBcIB+CWxveFm6ib+jKw+G3sj3X1ORVzgrhBKJ/0J4sMein70W120MPc3PjKB4B Nw/TslCMULSPyKZhDStRptU66B8JhPvTZQp0M0m4nQqYRF3YnjTEDPuE0xD45cpQO6 rt22xNJBfAr9APSa+WXirTtQ57i5j3Fb9+DQCxFxvl0fvUTAKnyWDF03G4eOANbtkO yC/EtGqPpf01/8vE2hz7CFqn9jOWR8ZGNZElTrDKZToIeLBKypy8gJUhqTvSwxOJ2o FjnGZ4eJxOKnA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 475w7J1bMfz6tm8; Mon, 4 Nov 2019 02:24:11 +0100 (CET) From: Kei Kebreau To: Marius Bakke Subject: Re: [bug#38042] [PATCH] gnu: lmms: Update to 1.2.1. References: <20191103045127.27469-1-kkebreau@posteo.net> <87eeyporok.fsf@devup.no> Date: Sun, 03 Nov 2019 20:24:10 -0500 In-Reply-To: <87eeyporok.fsf@devup.no> (Marius Bakke's message of "Sun, 03 Nov 2019 17:22:51 +0100") Message-ID: <87k18gqvr9.fsf@posteo.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 38042-done Cc: 38042-done@debbugs.gnu.org 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: -3.3 (---) --=-=-= Content-Type: text/plain Marius Bakke writes: > Kei Kebreau writes: > >> * gnu/packages/music.scm (lmms): Update to 1.2.1. >> [arguments]: Enable Qt 5 support and disbale VST support in configure-flags. >> 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. > > Can you add a comment about what rpmalloc is, and how to tell which > version to pick? > I included the following comment and pushed to the master branch: rpmalloc is a public domain memory allocator. This version specified below is the version required by LMMS. To get the new commit of rpmalloc to use here, run `git submodule--helper list | grep rpmalloc | cut -f2 -d' '` in the cloned LMMS repository. > Otherwise LGTM, thanks! Thanks for reviewing! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAl2/fboACgkQ5qXuPBlG eg287Q//cMpbLWyCEl8kl4ibrnduhAKu/UA451IbxJocrS5sCYKeKpLLozHULXY5 lCwgH66FAs/N4kmxMKdOhNLlhx3loLTM8PYxaHdJzZfFVQaJbm1gp0BzTjGF3B/o 5eEDJczHbsLZ1xe+iXTArcMLkrye6QkU2bxLIGQIy+M+J5Vr905Hw3NDRYTIs5Xb B3/dNkO7YRlJCEuKpF7ji80Zo8f8v3eNa42mQtv7MASmlzS43xXT/GeDlNzFrVhA MOUiK3wIHLl3AFxTTQhwP9GBO08yRtPYXuTpuYnamD+Cl/pJBAqFn4O71FYczY8d JMvNTk2hAReL5SDhHCDBE4seYjvqeWnmCRGoEf8v1P3L4fCD3v6lg3KBKMliOF7r E3VnY2wTFwuMiNwPiqXRBEtcwsb/ULbJIUjMRX7aQJJBG+A7hdb6mRsoUx8HqqTe Ip2s1b3s4qL08VAGpKnhromrab7GzKsqwwMdt6o4TwlSHRZuGdPMl2piQd4nsm3l NeexTkGEGu/aaYaf/kvpyYzJTPeHxSzhfG1b3uODnyhKr54ZJ/TZDrjOLhBqjhw2 Kta9xlrWtQ/ob3AMYAxC/8VESOyQTGvSOXzLGQzSZ3OBYwl2h/0RdjQqpP+Jidjl raVYBVrAHXIgvcesb1puIXYR5AavKuvt6cckRVo9Ft/2XTbG1UU= =F9c/ -----END PGP SIGNATURE----- --=-=-=-- ------------=_1572830702-15143-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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 ------------=_1572830702-15143-1--