01/01: gnu: milkytracker: Update to 1.0.0.

[Kei Kebreau]

kkebreau pushed a commit to branch master
in repository guix.

commit e3b2e943b871b26f178cc97a16c9f0cbf595a22a
Author: Kei Kebreau <address@hidden>
Date:   Wed Mar 29 10:45:43 2017 -0400

    gnu: milkytracker: Update to 1.0.0.
    
    * 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 0ad4a2a..3ac5be5 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -5,7 +5,7 @@
 ;;; Copyright © 2016 Al McElrath <address@hidden>
 ;;; Copyright © 2016, 2017 Efraim Flashner <address@hidden>
 ;;; Copyright © 2016 Leo Famulari <address@hidden>
-;;; Copyright © 2016 Kei Kebreau <address@hidden>
+;;; Copyright © 2016, 2017 Kei Kebreau <address@hidden>
 ;;; Copyright © 2016 John J. Foerch <address@hidden>
 ;;; Copyright © 2016 Alex Griffin <address@hidden>
 ;;; Copyright © 2017 ng0 <address@hidden>
@@ -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)))