From mboxrd@z Thu Jan 1 00:00:00 1970 From: Efraim Flashner Subject: hydrogen Date: Tue, 16 Feb 2016 14:20:03 +0200 Message-ID: <20160216142003.22ab067b@debian-netbook> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/4XRkIYVdmYJHolbgcDh7d_s"; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:53247) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVec4-0005Dj-Mf for guix-devel@gnu.org; Tue, 16 Feb 2016 07:20:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aVec0-0006oK-48 for guix-devel@gnu.org; Tue, 16 Feb 2016 07:20:16 -0500 Received: from flashner.co.il ([178.62.234.194]:38999) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVebz-0006oB-PU for guix-devel@gnu.org; Tue, 16 Feb 2016 07:20:12 -0500 List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org, Ricardo Wurmus --Sig_/4XRkIYVdmYJHolbgcDh7d_s Content-Type: multipart/mixed; boundary="MP_/McQkIbdiMhhUtq76b54ik3a" --MP_/McQkIbdiMhhUtq76b54ik3a Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline I was working on changing the packages that use qt-4 to using qt-5, and I came across hydrogen. I've updated it from 0.9.5.1 to 0.9.7-beta1 and made some changes. Considering I don't actually use hydrogen, I thought someone who did could take a look at it first to make sure everything looked good before I push it to master. --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --MP_/McQkIbdiMhhUtq76b54ik3a Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0001-gnu-hydrogen-Update-to-0.9.7-beta1.patch =46rom a3ab16d92dc8f9d2bb47f03287b96235272a20ac Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 16 Feb 2016 14:16:16 +0200 Subject: [PATCH] gnu: hydrogen: Update to 0.9.7-beta1. * gnu/packages/music.scm (hydrogen): Update to 0.9.7-beta1. [build-system]: Switch to cmake-build-system. [arguments]: Enable configure and tests, remove custom phases. [native-inputs]: Remove python-2, scons. Add cppunit. [inputs]: Add ladspa, libarchive, lrdf, pulseaudio. --- gnu/packages/music.scm | 65 ++++++++++++++--------------------------------= ---- 1 file changed, 18 insertions(+), 47 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 262d4eb..cffbc7c 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3,6 +3,7 @@ ;;; Copyright =C2=A9 2015, 2016 Ricardo Wurmus ;;; Copyright =C2=A9 2015 Paul van der Walt ;;; Copyright =C2=A9 2016 Al McElrath +;;; Copyright =C2=A9 2016 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,9 +34,10 @@ #:use-module (gnu packages algebra) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) + #:use-module (gnu packages backup) #:use-module (gnu packages base) ;libbdf - #:use-module (gnu packages boost) #:use-module (gnu packages bison) + #:use-module (gnu packages boost) #:use-module (gnu packages cdrom) #:use-module (gnu packages code) #:use-module (gnu packages check) @@ -148,64 +150,33 @@ many input formats and provides a customisable Vi-sty= le user interface.") (define-public hydrogen (package (name "hydrogen") - (version "0.9.5.1") + (version "0.9.7-beta1") (source (origin (method url-fetch) (uri (string-append - "mirror://sourceforge/hydrogen/Hydrogen/" - (version-prefix version 3) "%20Sources/" - "hydrogen-" version ".tar.gz")) + "https://github.com/hydrogen-music/hydrogen/archive/" + version ".tar.gz")) (sha256 (base32 - "1fvyp6gfzcqcc90dmaqbm11p272zczz5pfz1z4lj33nfr7z0bqgb")))) - (build-system gnu-build-system) + "1qs35fa5b4ysvd7pm68i86h30z198pav7kl0hhjsvs420wfxiwdh")))) + (build-system cmake-build-system) (arguments - `(#:tests? #f ;no "check" target - #:phases - ;; TODO: Add scons-build-system and use it here. - (modify-phases %standard-phases - (delete 'configure) - (add-after 'unpack 'scons-propagate-environment - (lambda _ - ;; By design, SCons does not, by default, propagate - ;; environment variables to subprocesses. See: - ;; - ;; Here, we modify the Sconstruct file to arrange for - ;; environment variables to be propagated. - (substitute* "Sconstruct" - (("^env =3D Environment\\(") - "env =3D Environment(ENV=3Dos.environ, ")))) - (replace 'build - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (zero? (system* "scons" - (string-append "prefix=3D" out) - "lrdf=3D0" ; cannot be found - "lash=3D1"))))) - (add-before - 'install - 'fix-img-install - (lambda _ - ;; The whole ./data/img directory is copied to the target firs= t. - ;; Scons complains about existing files when we try to install= all - ;; images a second time. - (substitute* "Sconstruct" - (("os.path.walk\\(\"./data/img/\",install_images,env\\)") ""= )) - #t)) - (replace 'install (lambda _ (zero? (system* "scons" "install"))))= ))) + `(#:test-target "tests")) (native-inputs - `(("scons" ,scons) - ("python" ,python-2) + `(("cppunit" ,cppunit) ("pkg-config" ,pkg-config))) (inputs - `(("zlib" ,zlib) - ("libtar" ,libtar) - ("alsa-lib" ,alsa-lib) + `(("alsa-lib" ,alsa-lib) ("jack" ,jack-1) + ("ladspa" ,ladspa) ("lash" ,lash) - ;;("lrdf" ,lrdf) ;FIXME: cannot be found by scons + ("libarchive" ,libarchive) + ("libsndfile" ,libsndfile) + ("libtar" ,libtar) + ("lrdf" ,lrdf) + ("pulseaudio" ,pulseaudio) ("qt" ,qt-4) - ("libsndfile" ,libsndfile))) + ("zlib" ,zlib))) (home-page "http://www.hydrogen-music.org") (synopsis "Drum machine") (description --=20 2.7.0 --MP_/McQkIbdiMhhUtq76b54ik3a-- --Sig_/4XRkIYVdmYJHolbgcDh7d_s Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCgAGBQJWwxPzAAoJEPTB05F+rO6TxMIQAI+NP4RZmLyAnn4Qf61uIBoR bDEOzybr3L3IATxVvWMSjIKhu1QE1nVCGtSpYMAWlaKV9ARlYTtw9OAgVtReFhYO UThhdrbRmosB9pSL8MjF80PwRiBXQv0LO+dv7iKwBtA6LLZod2wo5kLuBMI1mmve d8b0lO42de9N0xp7KRWugot+fsapYY6j3tEEiJuNSbJnBKOg8PFpTNjJmdgdClU7 7TP5NazTJsCzqDpOL9EuiiKXFFoWL4fkOjUpnzo8lvH0js0+f6CTLF78ClSRp6UN dOJ9u0i2jOpeK2FCQjh+SDOpsih6DCrlTvZi8TIXU3UcSaC5ZLmsHQCOwPrqs9H2 PK3Ndn6JSZbRETtpADQ81AP9+8s+afZkqkCkIuwOsgICv7Z5jgV/r/pGzHldiC/1 AMmsgNcXLkCW24yE8FPQIWavAvs98WxtxGQzM/f705KU2WU77T23hPp22anKymPd lgGZtHKmP5hz8tANhVYZseDjLa2kHk1iQkxx3MgLoVHl9Daz24s1rR855HvmTAPr AH+TEfIEHgWxLZaxVAZJmK2MYCnYDhUICk0uW82qgQzafVfspOZFav9vwACaWDgS tCQBI83yop9pC2mCqeFimbYhzvJT7wKeacLvOG0SrZAjjbqgWfVZY+/fA/j0Mn/p vSGzC61kQ+gU1BjFXYyH =otPP -----END PGP SIGNATURE----- --Sig_/4XRkIYVdmYJHolbgcDh7d_s--