[PATCH] gnu: milkytracker: Update to 1.0.0.

Done

Details

3 participants

ng0
Kei Kebreau
Ricardo Wurmus

Owner: Somebody

Submitted by: Kei Kebreau

Severity: normal

Debbugs page

Kei Kebreau wrote 8 years ago

Recipients:(address . guix-patches@gnu.org)(name . Kei Kebreau)(address . kei@openmailbox.org)

Message-ID:20170329145250.3913-1-kei@openmailbox.org

* gnu/packages/music.scm (milkytracker): Update to 1.0.0.
[source]: Change uri; add file-name.
[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 | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

Toggle diff (55 lines)diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 2f70945c6..f1914fefe 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -5,7 +5,7 @@
 ;;; Copyright © 2016 Al McElrath <hello@yrns.org>
 ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
-;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
+;;; Copyright © 2016, 2017 Kei Kebreau <kei@openmailbox.org>
 ;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net>
 ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
 ;;; Copyright © 2017 ng0 <contact.ng0@cryptolab.net>
@@ -2132,21 +2132,22 @@ 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"))))
+    (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)))
@@ -2157,6 +2158,9 @@ the popular DOS program Fasttracker II, with special playback modes available
 for improved Amiga ProTracker 2/3 compatibility.")
     (home-page "http://milkytracker.titandemo.org/")
     ;; 'src/milkyplay' is under Modified BSD, the rest is under GPL3 or later.
+    ;; Also, songs installed in share/milkytracker/songs are licensed under the
+    ;; Creative Commons Attribution-Noncommericial-Share Alike 3.0 Unported
+    ;; License.
     (license (list license:bsd-3 license:gpl3+))))
 
 (define-public schismtracker
-- 
2.12.0

ng0 wrote 8 years ago

Recipients:(name . Kei Kebreau)(address . kei@openmailbox.org)(address . 26300@debbugs.gnu.org)

Message-ID:20170329150419.ytsjr7hndor7qjiv@abyayala

Kei Kebreau transcribed 2.7K bytes:

Toggle quote (61 lines)> * gnu/packages/music.scm (milkytracker): Update to 1.0.0.
> [source]: Change uri; add file-name.
> [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 | 20 ++++++++++++--------
>  1 file changed, 12 insertions(+), 8 deletions(-)
> 
> diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
> index 2f70945c6..f1914fefe 100644
> --- a/gnu/packages/music.scm
> +++ b/gnu/packages/music.scm
> @@ -5,7 +5,7 @@
>  ;;; Copyright © 2016 Al McElrath <hello@yrns.org>
>  ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
>  ;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
> -;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
> +;;; Copyright © 2016, 2017 Kei Kebreau <kei@openmailbox.org>
>  ;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net>
>  ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
>  ;;; Copyright © 2017 ng0 <contact.ng0@cryptolab.net>
> @@ -2132,21 +2132,22 @@ 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"))))
> +    (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)))
> @@ -2157,6 +2158,9 @@ the popular DOS program Fasttracker II, with special playback modes available
>  for improved Amiga ProTracker 2/3 compatibility.")
>      (home-page "http://milkytracker.titandemo.org/")
>      ;; 'src/milkyplay' is under Modified BSD, the rest is under GPL3 or later.
> +    ;; Also, songs installed in share/milkytracker/songs are licensed under the
> +    ;; Creative Commons Attribution-Noncommericial-Share Alike 3.0 Unported
> +    ;; License.

Attribution-Noncommericial… doesn't that make them a candidate for

exclusion in systems like Guix?

Toggle quote (9 lines)>      (license (list license:bsd-3 license:gpl3+))))
>  
>  (define-public schismtracker
> -- 
> 2.12.0
> 
> 
> 
>

Kei Kebreau wrote 8 years ago

Recipients:(address . 26300@debbugs.gnu.org)

Message-ID:871stgoyw1.fsf@openmailbox.org

ng0 <contact.ng0@cryptolab.net> writes:

Toggle quote (5 lines)

> Attribution-Noncommericial… doesn't that make them a candidate for

> exclusion in systems like Guix?

Considering that the songs are data files and non-executable, the
software is still free. If the sample songs turn out to be a problem, I
can attempt to remove them in a snippet.

ng0 wrote 8 years ago

Recipients:(name . Kei Kebreau)(address . kei@openmailbox.org)(address . 26300@debbugs.gnu.org)

Message-ID:20170329160821.3hdsx2pdevub6wtg@abyayala

Kei Kebreau transcribed 1.3K bytes:

Toggle quote (11 lines)> ng0 <contact.ng0@cryptolab.net> writes:
> 
> >
> > Attribution-Noncommericial… doesn't that make them a candidate for
> > exclusion in systems like Guix?
> >
> 
> Considering that the songs are data files and non-executable, the
> software is still free. If the sample songs turn out to be a problem, I
> can attempt to remove them in a snippet.

It would help if we could document this. I don't think everyone will review
upstream material (FSDG and similar) for data files (music, images).
I would exclude CC licensed material which says "Noncommercial", but I'm
not a lawyer.

Kei Kebreau wrote 8 years ago

Recipients:(address . 26300@debbugs.gnu.org)

Message-ID:87y3vonjbj.fsf@openmailbox.org

ng0 <contact.ng0@cryptolab.net> writes:

Toggle quote (17 lines)> Kei Kebreau transcribed 1.3K bytes:
>> ng0 <contact.ng0@cryptolab.net> writes:
>> 
>> >
>> > Attribution-Noncommericial… doesn't that make them a candidate for
>> > exclusion in systems like Guix?
>> >
>> 
>> Considering that the songs are data files and non-executable, the
>> software is still free. If the sample songs turn out to be a problem, I
>> can attempt to remove them in a snippet.
>
> It would help if we could document this. I don't think everyone will review
> upstream material (FSDG and similar) for data files (music, images).
> I would exclude CC licensed material which says "Noncommercial", but I'm
> not a lawyer.

It may also cause problems upstream as well. The software is under licenses
with no commerical restrictions and the sample songs are under a
noncommericial restriction, but they are shared in one tarball. That
would constitute a conflict, right?

Ricardo Wurmus wrote 8 years ago

Recipients:(name . Kei Kebreau)(address . kei@openmailbox.org)

Message-ID:87efxe51j2.fsf@elephly.net

Kei Kebreau <kei@openmailbox.org> writes:

Toggle quote (24 lines)> ng0 <contact.ng0@cryptolab.net> writes:
>
>> Kei Kebreau transcribed 1.3K bytes:
>>> ng0 <contact.ng0@cryptolab.net> writes:
>>>
>>> >
>>> > Attribution-Noncommericial… doesn't that make them a candidate for
>>> > exclusion in systems like Guix?
>>> >
>>>
>>> Considering that the songs are data files and non-executable, the
>>> software is still free. If the sample songs turn out to be a problem, I
>>> can attempt to remove them in a snippet.
>>
>> It would help if we could document this. I don't think everyone will review
>> upstream material (FSDG and similar) for data files (music, images).
>> I would exclude CC licensed material which says "Noncommercial", but I'm
>> not a lawyer.
>
> It may also cause problems upstream as well. The software is under licenses
> with no commerical restrictions and the sample songs are under a
> noncommericial restriction, but they are shared in one tarball. That
> would constitute a conflict, right?

If my understanding of the FSDG is correct we cannot distribute these

files. The FSDG says this about non-functional data:

Non-functional Data

Data that isn't functional, that doesn't do a practical job, is more

of an adornment to the system's software than a part of it. Thus, we

don't insist on the free license criteria for non-functional

data. It can be included in a free system distribution as long as

its license gives you permission to copy and redistribute, both for

commercial and non-commercial purposes.

In this case the commercial restriction means that we cannot distribute

it. You can remove these files in a snippet. Could you send an updated

patch please?

Ricardo

GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC

https://elephly.net

Ricardo Wurmus wrote 8 years ago

control message for bug #26300

Recipients:(address . control@debbugs.gnu.org)

Message-ID:E1ctZm8-0000Mp-3a@debbugs.gnu.org

owner 26300 !

Ricardo Wurmus wrote 8 years ago

Recipients:(address . control@debbugs.gnu.org)

Message-ID:E1ctZmE-0000N7-A9@debbugs.gnu.org

tags 26300 moreinfo

Kei Kebreau wrote 8 years ago

[PATCH] gnu: milkytracker: Update to 1.0.0.

Recipients:(address . 26300@debbugs.gnu.org)(name . Kei Kebreau)(address . kei@openmailbox.org)

Message-ID:20170330142012.17391-1-kei@openmailbox.org

* 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(-)

Toggle diff (52 lines)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 <hello@yrns.org>
 ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
-;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
+;;; Copyright © 2016, 2017 Kei Kebreau <kei@openmailbox.org>
 ;;; Copyright © 2016 John J. Foerch <jjfoerch@earthlink.net>
 ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
 ;;; Copyright © 2017 ng0 <contact.ng0@cryptolab.net>
@@ -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

Kei Kebreau wrote 8 years ago

Recipients:(name . Ricardo Wurmus)(address . rekado@elephly.net)

Message-ID:87vaqqu9qa.fsf@openmailbox.org

Ricardo Wurmus <rekado@elephly.net> writes:

Toggle quote (48 lines)> Kei Kebreau <kei@openmailbox.org> writes:
>
>> ng0 <contact.ng0@cryptolab.net> writes:
>>
>>> Kei Kebreau transcribed 1.3K bytes:
>>>> ng0 <contact.ng0@cryptolab.net> writes:
>>>>
>>>> >
>>>> > Attribution-Noncommericial… doesn't that make them a candidate for
>>>> > exclusion in systems like Guix?
>>>> >
>>>>
>>>> Considering that the songs are data files and non-executable, the
>>>> software is still free. If the sample songs turn out to be a problem, I
>>>> can attempt to remove them in a snippet.
>>>
>>> It would help if we could document this. I don't think everyone will review
>>> upstream material (FSDG and similar) for data files (music, images).
>>> I would exclude CC licensed material which says "Noncommercial", but I'm
>>> not a lawyer.
>>
>> It may also cause problems upstream as well. The software is under licenses
>> with no commerical restrictions and the sample songs are under a
>> noncommericial restriction, but they are shared in one tarball. That
>> would constitute a conflict, right?
>
> If my understanding of the FSDG is correct we cannot distribute these
> files.  The FSDG says this about non-functional data:
>
>     Non-functional Data
>
>     Data that isn't functional, that doesn't do a practical job, is more
>     of an adornment to the system's software than a part of it. Thus, we
>     don't insist on the free license criteria for non-functional
>     data. It can be included in a free system distribution as long as
>     its license gives you permission to copy and redistribute, both for
>     commercial and non-commercial purposes.
>
> In this case the commercial restriction means that we cannot distribute
> it.  You can remove these files in a snippet.  Could you send an updated
> patch please?
>
> --
> Ricardo
>
> GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
> https://elephly.net

A new patch has been sent.

Ricardo Wurmus wrote 8 years ago

Recipients:(name . Kei Kebreau)(address . kei@openmailbox.org)(address . 26300@debbugs.gnu.org)

Message-ID:87d1cy4xqn.fsf@elephly.net

Kei Kebreau <kei@openmailbox.org> writes:

Toggle quote (9 lines)

> * 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.

> ---

Excellent. Please push!

Ricardo

GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC

https://elephly.net

Kei Kebreau wrote 8 years ago

Recipients:(name . Ricardo Wurmus)(address . rekado@elephly.net)(address . 26300-done@debbugs.gnu.org)

Message-ID:87r31eu50w.fsf@openmailbox.org

Ricardo Wurmus <rekado@elephly.net> writes:

Toggle quote (13 lines)> Kei Kebreau <kei@openmailbox.org> writes:
>
>> * 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.
>> ---
>
> Excellent.  Please push!

Pushed as e3b2e943b871b26f178cc97a16c9f0cbf595a22a. Thanks for clearing

up the licensing issue.

Closed

Your comment

This issue is archived.

To comment on this conversation send an email to 26300@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it

mumi current 26300

Then, you may apply the latest patchset in this issue (with sign off)

mumi am -- -s

Or, compose a reply to this issue

mumi compose

Or, send patches to this issue

mumi send-email *.patch

You may also tag this issue. See list of standard tags. For example, to set the confirmed and easy tags

mumi command -t +confirmed -t +easy

Or, remove the moreinfo tag and set the help tag

mumi command -t -moreinfo -t +help

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date