From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49824) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ctawk-0006kL-S0 for guix-patches@gnu.org; Thu, 30 Mar 2017 10:21:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ctawg-0001Ia-VA for guix-patches@gnu.org; Thu, 30 Mar 2017 10:21:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:54821) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ctawg-0001IS-Qz for guix-patches@gnu.org; Thu, 30 Mar 2017 10:21:02 -0400 Subject: bug#26300: [PATCH] gnu: milkytracker: Update to 1.0.0. References: <20170329145250.3913-1-kei@openmailbox.org> In-Reply-To: <20170329145250.3913-1-kei@openmailbox.org> Resent-Message-ID: From: Kei Kebreau Date: Thu, 30 Mar 2017 10:20:12 -0400 Message-Id: <20170330142012.17391-1-kei@openmailbox.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: 26300@debbugs.gnu.org Cc: Kei Kebreau * gnu/packages/music.scm (milkytracker): Update to 1.0.0. [source]: Change uri; add file-name; add snippet to remove non-FSDG compliant data. [build-system]: Change from gnu-build-system to cmake-build-system. [arguments]: Remove #:make-flags; disable tests (which are no longer present). [inputs]: Change sdl to sdl2. --- gnu/packages/music.scm | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 0ad4a2a6c..3ac5be5c8 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016 Al McElrath ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016 Leo Famulari -;;; Copyright © 2016 Kei Kebreau +;;; Copyright © 2016, 2017 Kei Kebreau ;;; Copyright © 2016 John J. Foerch ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2017 ng0 @@ -2131,21 +2131,29 @@ of tools for manipulating and accessing your music.") (define-public milkytracker (package (name "milkytracker") - (version "0.90.86") + (version "1.0.0") (source (origin (method url-fetch) - (uri (string-append "http://milkytracker.titandemo.org/files/" - name "-" version ".tar.bz2")) + (uri (string-append "https://github.com/milkytracker/" + "MilkyTracker/archive/v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1v9vp8vi24lkagfpr92c128whvakwgrm9pq2zf6ijpl5sh7014zb")))) - (build-system gnu-build-system) + "1p1jd4h274jvcvl05l01v9bj19zhq4sjag92v1zawyi93ib85abz")) + (modules '((guix build utils))) + ;; Remove non-FSDG compliant sample songs. + (snippet + '(begin + (delete-file-recursively "resources/music") + (substitute* "CMakeLists.txt" + (("add_subdirectory\\(resources/music\\)") "")))))) + (build-system cmake-build-system) (arguments - `(#:make-flags '("CXXFLAGS=-lasound"))) + '(#:tests? #f)) ; no check target (inputs `(("alsa-lib" ,alsa-lib) ("jack" ,jack-1) - ("sdl" ,sdl) + ("sdl" ,sdl2) ("zlib" ,zlib))) (native-inputs `(("pkg-config" ,pkg-config))) -- 2.12.0