* bug#26300: [PATCH] gnu: milkytracker: Update to 1.0.0.
@ 2017-03-29 14:52 Kei Kebreau
2017-03-29 15:04 ` ng0
2017-03-30 14:20 ` Kei Kebreau
0 siblings, 2 replies; 10+ messages in thread
From: Kei Kebreau @ 2017-03-29 14:52 UTC (permalink / raw)
To: 26300; +Cc: Kei Kebreau
* 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.
(license (list license:bsd-3 license:gpl3+))))
(define-public schismtracker
--
2.12.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* bug#26300: [PATCH] gnu: milkytracker: Update to 1.0.0.
2017-03-29 14:52 bug#26300: [PATCH] gnu: milkytracker: Update to 1.0.0 Kei Kebreau
@ 2017-03-29 15:04 ` ng0
2017-03-29 16:01 ` Kei Kebreau
2017-03-30 14:20 ` Kei Kebreau
1 sibling, 1 reply; 10+ messages in thread
From: ng0 @ 2017-03-29 15:04 UTC (permalink / raw)
To: Kei Kebreau; +Cc: 26300
Kei Kebreau transcribed 2.7K bytes:
> * 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?
> (license (list license:bsd-3 license:gpl3+))))
>
> (define-public schismtracker
> --
> 2.12.0
>
>
>
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* bug#26300: [PATCH] gnu: milkytracker: Update to 1.0.0.
2017-03-29 15:04 ` ng0
@ 2017-03-29 16:01 ` Kei Kebreau
2017-03-29 16:08 ` ng0
0 siblings, 1 reply; 10+ messages in thread
From: Kei Kebreau @ 2017-03-29 16:01 UTC (permalink / raw)
To: 26300
[-- Attachment #1: Type: text/plain, Size: 340 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.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 818 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* bug#26300: [PATCH] gnu: milkytracker: Update to 1.0.0.
2017-03-29 16:01 ` Kei Kebreau
@ 2017-03-29 16:08 ` ng0
2017-03-29 16:23 ` Kei Kebreau
0 siblings, 1 reply; 10+ messages in thread
From: ng0 @ 2017-03-29 16:08 UTC (permalink / raw)
To: Kei Kebreau; +Cc: 26300
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.
^ permalink raw reply [flat|nested] 10+ messages in thread
* bug#26300: [PATCH] gnu: milkytracker: Update to 1.0.0.
2017-03-29 16:08 ` ng0
@ 2017-03-29 16:23 ` Kei Kebreau
2017-03-30 13:37 ` Ricardo Wurmus
0 siblings, 1 reply; 10+ messages in thread
From: Kei Kebreau @ 2017-03-29 16:23 UTC (permalink / raw)
To: 26300
[-- Attachment #1: Type: text/plain, Size: 951 bytes --]
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?
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 818 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* bug#26300: [PATCH] gnu: milkytracker: Update to 1.0.0.
2017-03-29 16:23 ` Kei Kebreau
@ 2017-03-30 13:37 ` Ricardo Wurmus
2017-03-30 14:20 ` Kei Kebreau
0 siblings, 1 reply; 10+ messages in thread
From: Ricardo Wurmus @ 2017-03-30 13:37 UTC (permalink / raw)
To: Kei Kebreau; +Cc: 26300
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
^ permalink raw reply [flat|nested] 10+ messages in thread
* bug#26300: [PATCH] gnu: milkytracker: Update to 1.0.0.
2017-03-30 13:37 ` Ricardo Wurmus
@ 2017-03-30 14:20 ` Kei Kebreau
0 siblings, 0 replies; 10+ messages in thread
From: Kei Kebreau @ 2017-03-30 14:20 UTC (permalink / raw)
To: Ricardo Wurmus; +Cc: 26300
[-- Attachment #1: Type: text/plain, Size: 1982 bytes --]
Ricardo Wurmus <rekado@elephly.net> writes:
> 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.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* bug#26300: [PATCH] gnu: milkytracker: Update to 1.0.0.
2017-03-29 14:52 bug#26300: [PATCH] gnu: milkytracker: Update to 1.0.0 Kei Kebreau
2017-03-29 15:04 ` ng0
@ 2017-03-30 14:20 ` Kei Kebreau
2017-03-30 14:58 ` Ricardo Wurmus
1 sibling, 1 reply; 10+ messages in thread
From: Kei Kebreau @ 2017-03-30 14:20 UTC (permalink / raw)
To: 26300; +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 <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
^ permalink raw reply related [flat|nested] 10+ messages in thread
* bug#26300: [PATCH] gnu: milkytracker: Update to 1.0.0.
2017-03-30 14:20 ` Kei Kebreau
@ 2017-03-30 14:58 ` Ricardo Wurmus
2017-03-30 16:02 ` Kei Kebreau
0 siblings, 1 reply; 10+ messages in thread
From: Ricardo Wurmus @ 2017-03-30 14:58 UTC (permalink / raw)
To: Kei Kebreau; +Cc: 26300
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!
--
Ricardo
GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC
https://elephly.net
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2017-03-30 16:03 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-29 14:52 bug#26300: [PATCH] gnu: milkytracker: Update to 1.0.0 Kei Kebreau
2017-03-29 15:04 ` ng0
2017-03-29 16:01 ` Kei Kebreau
2017-03-29 16:08 ` ng0
2017-03-29 16:23 ` Kei Kebreau
2017-03-30 13:37 ` Ricardo Wurmus
2017-03-30 14:20 ` Kei Kebreau
2017-03-30 14:20 ` Kei Kebreau
2017-03-30 14:58 ` Ricardo Wurmus
2017-03-30 16:02 ` Kei Kebreau
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.