From 0fe041bd9fa87d23b44969a3bcd99b1165a0f06e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 20 Oct 2019 13:31:19 +0200 Subject: gnu: Remove more GCC < 7 workarounds. * gnu/packages/abiword.scm (abiword)[arguments]: Do not pass "-std=c++11" to the GCC command line. * gnu/packages/aidc.scm (zbar)[arguments]: Likewise. * gnu/packages/android.scm (android-libbase, android-libcutils, android-libziparchive, fastboot)[arguments]: Likewise. * gnu/packages/audio.scm (azr3, guitarix, suil)[arguments]: Likewise. * gnu/packages/bioinformatics.scm (bless)[arguments]: Likewise. * gnu/packages/bittorrent.scm (libtorrent-rasterbar)[arguments]: Likewise. * gnu/packages/code.scm (rtags)[arguments]: Likewise. * gnu/packages/coq.scm (coq-gappa)[arguments]: Likewise. * gnu/packages/emulators.scm (dolphin-emu)[arguments]: Likewise. * gnu/packages/engineering.scm (xyce-serial, xyce-parallel)[arguments]: Likewise. * gnu/packages/gnupg.scm (pinentry-qt)[arguments]: Likewise. * gnu/packages/gobby.scm (libnet6, obby)[arguments]: Likewise. * gnu/packages/graph.scm (python-faiss)[arguments]: Likewise. * gnu/packages/graphics.scm (povray)[arguments]: Likewise. * gnu/packages/image-processing.scm (opencv, itk-snap)[arguments]: Likewise. * gnu/packages/image.scm (freeimage)[arguments]: Likewise. * gnu/packages/kodi.scm (crossguid)[arguments]: Likewise. * gnu/packages/music.scm (amsynth, qmidiarp, qmidiroute, seq24)[arguments]: Likewise. * gnu/packages/pdf.scm (python-poppler-qt5)[arguments]: Likewise. * gnu/packages/sagemath.scm (lcalc)[arguments]: Likewise. * gnu/packages/video.scm (vlc, mlt, v4l-utils)[arguments]: Likewise. --- gnu/packages/audio.scm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 88f3b5eccd..110903e2fe 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -521,8 +521,6 @@ formant warp.") `(#:tests? #f ; no check target #:make-flags (list "LV2PEG=ttl2c" - "CXXFLAGS=-std=gnu++11" - "CFLAGS=-std=gnu++11" (string-append "prefix=" %output) (string-append "pkgdatadir=" %output "/share/azr3-jack")) #:phases @@ -1328,8 +1326,7 @@ patches that can be used with softsynths such as Timidity and WildMidi.") #:configure-flags (list ;; Add the output lib directory to the RUNPATH. - (string-append "--ldflags=-Wl,-rpath=" %output "/lib") - "--cxxflags=-std=c++11") + (string-append "--ldflags=-Wl,-rpath=" %output "/lib")) #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-boost-includes @@ -2427,9 +2424,7 @@ the Turtle syntax.") "0ay7hl6nr6ip1nn9k2m8ri3b52b6sx9mhixmcy4fy3kr2a88ksd1")))) (build-system waf-build-system) (arguments - `(#:tests? #f ; no check target - #:configure-flags - '("CXXFLAGS=-std=gnu++11"))) + `(#:tests? #f)) ;no check target (inputs `(("lv2" ,lv2) ("gtk+" ,gtk+-2) -- cgit 1.4.1 From 5c4772d7be030cec97df8e6545465cbcc033f5ac Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 28 Oct 2019 23:10:08 +0100 Subject: gnu: fluidsynth: Update to 2.0.8. * gnu/packages/audio.scm (fluidsynth): Update to 2.0.8. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 110903e2fe..88b5696a9b 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1107,7 +1107,7 @@ follower.") (define-public fluidsynth (package (name "fluidsynth") - (version "2.0.7") + (version "2.0.8") (source (origin (method git-fetch) (uri (git-reference @@ -1116,7 +1116,7 @@ follower.") (file-name (git-file-name name version)) (sha256 (base32 - "1h1dj3wmjwzny2hgr41k3p67w4kxvzn365kkqwyfd6yk0v3rahic")))) + "1s32c0jxjica2agy0mp36vgvpgj2vl5i5zvacd6igmbam0x4gs7c")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no check target -- cgit 1.4.1 From 6833c7a1b3752a28737541bbbdcb357888512bfe Mon Sep 17 00:00:00 2001 From: FPS Date: Fri, 1 Nov 2019 14:35:49 +0100 Subject: gnu: lilv: Enable python bindings. * gnu/packages/audio.scm (lilv)[arguments]: Add #:configure-flags. Add phase to embed full path to liblilv-0.so. [native-inputs]: Add PYTHON. [home-page]: Follow redirect. Signed-off-by: Marius Bakke --- gnu/packages/audio.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 88b5696a9b..28dbf06f3b 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1825,6 +1825,7 @@ included are the command line utilities @code{send_osc} and @code{dump_osc}.") (build-system waf-build-system) (arguments `(#:tests? #f ; no check target + #:configure-flags (list "--bindings") #:phases (modify-phases %standard-phases (add-before @@ -1833,7 +1834,14 @@ included are the command line utilities @code{send_osc} and @code{dump_osc}.") (setenv "LDFLAGS" (string-append "-Wl,-rpath=" (assoc-ref outputs "out") "/lib")) - #t))))) + #t)) + (add-after 'unpack 'full-store-path-to-shared-library + (lambda* (#:key outputs #:allow-other-keys) + (with-directory-excursion "bindings/python" + (substitute* "lilv.py" + (("liblilv-0.so") (string-append (assoc-ref outputs "out") + "/lib/liblilv-0.so")))) + #t))))) ;; Required by lilv-0.pc. (propagated-inputs `(("lv2" ,lv2) @@ -1841,8 +1849,9 @@ included are the command line utilities @code{send_osc} and @code{dump_osc}.") ("sord" ,sord) ("sratom" ,sratom))) (native-inputs - `(("pkg-config" ,pkg-config))) - (home-page "https://drobilla.net/software/lilv/") + `(("python" ,python) + ("pkg-config" ,pkg-config))) + (home-page "https://drobilla.net/software/lilv") (synopsis "Library to simplify use of LV2 plugins in applications") (description "Lilv is a C library to make the use of LV2 plugins as simple as possible -- cgit 1.4.1 From 747dc4b9404ed1a8d266422508eaf016868b336e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 10 Nov 2019 00:57:08 +0100 Subject: gnu: faad2: Update to 2.8.6. * gnu/packages/audio.scm (faad2): Update to 2.8.6. [native-inputs, arguments]: Remove obsolete fields. --- gnu/packages/audio.scm | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 28dbf06f3b..991e54a813 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1167,27 +1167,16 @@ also play midifiles using a Soundfont.") (define-public faad2 (package (name "faad2") - (version "2.7") + (version "2.8.6") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/faac/faad2-src/faad2-" - version "/faad2-" version ".zip")) + (version-major+minor version) ".0/" + "faad2-" version ".tar.gz")) (sha256 (base32 - "16f3l16c00sg0wkrkm3vzv0gy3g97x309vw788igs0cap2x1ak3z")))) + "089zqykqgmmysznvk0bi2pfvdqwclnn540d0zks83sv2pynpfjb5")))) (build-system gnu-build-system) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) - ("unzip" ,unzip))) - (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'bootstrap - (lambda _ - (substitute* "bootstrap" (("\r\n") "\n")) - (invoke "sh" "bootstrap")))))) (home-page "http://www.audiocoding.com/faad2.html") (synopsis "MPEG-4 and MPEG-2 AAC decoder") (description -- cgit 1.4.1 From 43999c61093c6b7c933e213c8bbfaee8d6ab6980 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 10 Nov 2019 00:57:47 +0100 Subject: gnu: faad2: Use HTTPS home page. * gnu/packages/audio.scm (faad2)[home-page]: Use HTTPS. --- gnu/packages/audio.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 991e54a813..f037dd1713 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1177,7 +1177,7 @@ also play midifiles using a Soundfont.") (base32 "089zqykqgmmysznvk0bi2pfvdqwclnn540d0zks83sv2pynpfjb5")))) (build-system gnu-build-system) - (home-page "http://www.audiocoding.com/faad2.html") + (home-page "https://www.audiocoding.com/faad2.html") (synopsis "MPEG-4 and MPEG-2 AAC decoder") (description "FAAD2 is an MPEG-4 and MPEG-2 AAC decoder supporting LC, Main, LTP, SBR, -- cgit 1.4.1 From 1c1ce52aa9d2d1349c32d02632a002e1589c6089 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Fri, 8 Nov 2019 11:25:37 +0100 Subject: gnu: zita-convolver: Update to 4.0.3. * gnu/packages/audio.scm (zita-convolver): Update to 4.0.3. Signed-off-by: Marius Bakke --- gnu/packages/audio.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index f037dd1713..aa54f94ed7 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2944,7 +2944,7 @@ result.") (define-public zita-convolver (package (name "zita-convolver") - (version "3.1.0") + (version "4.0.3") (source (origin (method url-fetch) (uri (string-append @@ -2954,31 +2954,33 @@ result.") (snippet ;; Don't optimize for a specific processor architecture. '(begin - (substitute* "libs/Makefile" + (substitute* "source/Makefile" (("^CXXFLAGS \\+= -march=native") "")) #t)) (modules '((guix build utils))) (sha256 (base32 - "14qrnczhp5mbwhky64il7kxc4hl1mmh495v60va7i2qnhasr6zmz")))) + "0prji66p86z2bzminywkwchr5bfgxcg2i8y803pydd1hzf2198cs")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no "check" target - #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:make-flags + (list (string-append "PREFIX=" (assoc-ref %outputs "out")) + (string-append "SUFFIX=")) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-makefile-and-enter-directory (lambda _ - (substitute* "libs/Makefile" + (substitute* "source/Makefile" (("ldconfig") "true") (("^LIBDIR =.*") "LIBDIR = lib\n")) - (chdir "libs") + (chdir "source") #t)) (add-after 'install 'install-symlink (lambda _ (symlink "libzita-convolver.so" (string-append (assoc-ref %outputs "out") - "/lib/libzita-convolver.so.3")) + "/lib/libzita-convolver.so.4")) #t)) ;; no configure script (delete 'configure)))) -- cgit 1.4.1 From 9e4e66c4ae5f22f95a976476a879fe776d143f74 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Fri, 8 Nov 2019 10:14:10 +0100 Subject: gnu: jalv: Fix gtkmm, add gtk+-2 and qtbase. The gtkmm passed to inputs was unused. Jalv does not support gtkmm 3 at the moment. * gnu/packages/audio.scm (jalv)[inputs]: Add gtk+-2 and qtbase. Change unused gtkmm to gtkmm-2. Signed-off-by: Marius Bakke --- gnu/packages/audio.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index aa54f94ed7..bc79225115 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1588,8 +1588,10 @@ synchronous execution of all clients, and low latency operation.") `(("lv2" ,lv2) ("lilv" ,lilv) ("suil" ,suil) - ("gtk" ,gtk+) - ("gtkmm" ,gtkmm) + ("gtk2" ,gtk+-2) + ("gtk3" ,gtk+) + ("gtkmm" ,gtkmm-2) + ("qtbase" ,qtbase) ("jack" ,jack-1))) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit 1.4.1 From 2d91e5968f66bd71f272d90d0bdea9611448d2fc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Nov 2019 00:11:35 +0100 Subject: gnu: lilv: Update to 0.24.6. * gnu/packages/audio.scm (lilv): Update to 0.24.6. [arguments]: Remove obsolete #:configure-flags. --- gnu/packages/audio.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index bc79225115..1ef59bbe66 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1805,22 +1805,20 @@ included are the command line utilities @code{send_osc} and @code{dump_osc}.") (define-public lilv (package (name "lilv") - (version "0.24.4") + (version "0.24.6") (source (origin (method url-fetch) (uri (string-append "https://download.drobilla.net/lilv-" version ".tar.bz2")) (sha256 (base32 - "0f24cd7wkk5l969857g2ydz2kjjrkvvddg1g87xzzs78lsvq8fy3")))) + "1p3hafsxgs5d4za7n66lf5nz74qssfqpmk520cm7iq2njvvlqm2z")))) (build-system waf-build-system) (arguments `(#:tests? #f ; no check target - #:configure-flags (list "--bindings") #:phases (modify-phases %standard-phases - (add-before - 'configure 'set-ldflags + (add-before 'configure 'set-ldflags (lambda* (#:key outputs #:allow-other-keys) (setenv "LDFLAGS" (string-append "-Wl,-rpath=" -- cgit 1.4.1 From 9dd6b8d132ac1b229df3e4a254db08f3e633e1e1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Nov 2019 03:30:29 +0100 Subject: gnu: sratom: Update to 0.6.4. * gnu/packages/audio.scm (sratom): Update to 0.6.4. --- gnu/packages/audio.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 1ef59bbe66..0f606403e2 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2386,16 +2386,16 @@ input/output.") (define-public sratom (package (name "sratom") - (version "0.6.2") + (version "0.6.4") (source (origin (method url-fetch) (uri (string-append "https://download.drobilla.net/sratom-" version ".tar.bz2")) (sha256 (base32 - "0lz883ravxjf7r9wwbx2gx9m8vhyiavxrl9jdxfppjxnsralll8a")))) + "0vh0biy3ngpzzgdml309c2mqz8xq9q0hlblczb4c6alhp0a8yv0l")))) (build-system waf-build-system) - (arguments `(#:tests? #f)) ; no check target + (arguments `(#:tests? #f)) ; no check target (inputs `(("lv2" ,lv2) ("serd" ,serd) -- cgit 1.4.1 From 4e385d2a00beb84fd2549633527e9b6d42c4750c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Nov 2019 03:48:25 +0100 Subject: gnu: jalv: Update to 1.6.4. * gnu/packages/audio.scm (jalv): Update to 1.6.4. --- gnu/packages/audio.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 0f606403e2..e2d551248b 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1572,17 +1572,17 @@ synchronous execution of all clients, and low latency operation.") (define-public jalv (package (name "jalv") - (version "1.6.0") + (version "1.6.4") (source (origin (method url-fetch) (uri (string-append "https://download.drobilla.net/jalv-" version ".tar.bz2")) (sha256 (base32 - "1x2wpzzx2cgvz3dgdcgsj8dr0w3zsasy62mvl199bsdj5fbjaili")))) + "1wwfn7yzbs37s2rdlfjgks63svd5g14yyzd2gdl7h0z12qncwsy2")))) (build-system waf-build-system) (arguments - `(#:tests? #f ; no check target + `(#:tests? #f ; no check target #:python ,python-2)) (inputs `(("lv2" ,lv2) -- cgit 1.4.1 From 9bc06860220bd7e7640cd43b7dc5585d60c3721b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Nov 2019 03:52:30 +0100 Subject: gnu: suil: Update to 0.10.6. * gnu/packages/audio.scm (suil): Update to 0.10.6. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index e2d551248b..b71e913406 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2412,14 +2412,14 @@ the Turtle syntax.") (define-public suil (package (name "suil") - (version "0.10.4") + (version "0.10.6") (source (origin (method url-fetch) (uri (string-append "https://download.drobilla.net/suil-" version ".tar.bz2")) (sha256 (base32 - "0ay7hl6nr6ip1nn9k2m8ri3b52b6sx9mhixmcy4fy3kr2a88ksd1")))) + "0z4v01pjw4wh65x38w6icn28wdwxz13ayl8hvn4p1g9kmamp1z06")))) (build-system waf-build-system) (arguments `(#:tests? #f)) ;no check target -- cgit 1.4.1 From c44db46f12914215cf78886f529f9ac4fb9d564b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Nov 2019 15:03:30 +0100 Subject: gnu: faudio: Update to 19.11. * gnu/packages/audio.scm (faudio): Update to 19.11. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index b71e913406..7cad591fd2 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3680,7 +3680,7 @@ library.") (define-public faudio (package (name "faudio") - (version "19.09") + (version "19.11") (source (origin (method git-fetch) @@ -3689,7 +3689,7 @@ library.") (commit version))) (file-name (string-append name "-" version "-checkout")) (sha256 - (base32 "0fagik55jmy3qmb27nhg0zxash1ahfkxphx8m8gs0pimqqrdrd9d")))) + (base32 "0ckpr6ffz8ssfh1y850dhip5s5jv0j6n90qz5yx1v9d6gpwf08rp")))) (arguments '(#:tests? #f ; No tests. #:configure-flags '("-DFFMPEG=ON"))) -- cgit 1.4.1 From 543f7ad14b12736e883868778aee33e1d8757b94 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Nov 2019 15:03:59 +0100 Subject: gnu: faudio: Use GIT-FILE-NAME. * gnu/packages/audio.scm (faudio)[source]: Use GIT-FILE-NAME. --- gnu/packages/audio.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 7cad591fd2..92fec12598 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3687,7 +3687,7 @@ library.") (uri (git-reference (url "https://github.com/FNA-XNA/FAudio.git") (commit version))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0ckpr6ffz8ssfh1y850dhip5s5jv0j6n90qz5yx1v9d6gpwf08rp")))) (arguments -- cgit 1.4.1 From 6e0b18bf09622fe1ac3e7674867946395c3e024a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 13 Nov 2019 20:55:04 +0100 Subject: gnu: sratom: Propagate required inputs. * gnu/packages/audio.scm (sratom)[inputs]: Change to ... [propagated-inputs]: ... this. --- gnu/packages/audio.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 92fec12598..c87a4964d7 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2396,7 +2396,8 @@ input/output.") "0vh0biy3ngpzzgdml309c2mqz8xq9q0hlblczb4c6alhp0a8yv0l")))) (build-system waf-build-system) (arguments `(#:tests? #f)) ; no check target - (inputs + (propagated-inputs + ;; In Requires of sratom-0.pc. `(("lv2" ,lv2) ("serd" ,serd) ("sord" ,sord))) -- cgit 1.4.1 From 95f6e6dad80aa198b5b8d02851050bcfe0928c26 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 13 Nov 2019 23:04:08 +0100 Subject: gnu: sratom: Adjust indentation. * gnu/packages/audio.scm (sratom): Re-indent. --- gnu/packages/audio.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index c87a4964d7..7288fa1b46 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2388,14 +2388,14 @@ input/output.") (name "sratom") (version "0.6.4") (source (origin - (method url-fetch) - (uri (string-append "https://download.drobilla.net/sratom-" - version ".tar.bz2")) - (sha256 - (base32 - "0vh0biy3ngpzzgdml309c2mqz8xq9q0hlblczb4c6alhp0a8yv0l")))) + (method url-fetch) + (uri (string-append "https://download.drobilla.net/sratom-" + version ".tar.bz2")) + (sha256 + (base32 + "0vh0biy3ngpzzgdml309c2mqz8xq9q0hlblczb4c6alhp0a8yv0l")))) (build-system waf-build-system) - (arguments `(#:tests? #f)) ; no check target + (arguments `(#:tests? #f)) ;no check target (propagated-inputs ;; In Requires of sratom-0.pc. `(("lv2" ,lv2) -- cgit 1.4.1 From 0f2ce4480049469332d3f2e6a4df8d4c3ebb0560 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Fri, 8 Nov 2019 10:45:11 +0000 Subject: gnu: Add libltc. * gnu/packages/audio.scm: (libltc): New variable. Signed-off-by: Marius Bakke --- gnu/packages/audio.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 7288fa1b46..93e004f31f 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -23,6 +23,7 @@ ;;; Copyright © 2019 Rutger Helling ;;; Copyright © 2019 Arun Isaac ;;; Copyright © 2019 Mathieu Othacehe +;;; Copyright © 2019 Alexandros Theodotou ;;; ;;; This file is part of GNU Guix. ;;; @@ -63,6 +64,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages dbm) + #:use-module (gnu packages documentation) #:use-module (gnu packages emacs) #:use-module (gnu packages file) #:use-module (gnu packages flex) @@ -3765,3 +3767,28 @@ other Gnaural instances, allowing synchronous sessions between many users.") a sound card, encodes it into Ogg Vorbis and/or mp3, and sends the audio stream to one or more IceCast and/or ShoutCast servers.") (license license:gpl3+))) + +(define-public libltc + (package + (name "libltc") + (version "1.3.1") + (source + (origin + (method url-fetch) + (uri + (string-append "https://github.com/x42/libltc/releases/download/v" + version "/libltc-" version ".tar.gz")) + (sha256 + (base32 + "173h9dgmain3nyrwk6q2d7yl4fnh4vacag4s2p01n5b7nyrkxrjh")))) + (build-system gnu-build-system) + (arguments + `(#:parallel-tests? #f)) ;tests fail otherwise + (native-inputs + `(("doxygen" ,doxygen) + ("pkg-config" ,pkg-config))) + (synopsis "Encode or decode Linear/Longitudinal Time Code (LTC) audio") + (description "Libltc is a POSIX-C Library for handling +@dfn{Linear/Longitudinal Time Code} (LTC) data.") + (home-page "https://x42.github.io/libltc/") + (license license:lgpl3+))) -- cgit 1.4.1 From 74f9a8fbbeb176f71dedce088910c0495e7848eb Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Fri, 8 Nov 2019 09:47:25 +0000 Subject: gnu: Add redkite. * gnu/packages/audio.scm: (redkite): New variable. Signed-off-by: Marius Bakke --- gnu/packages/audio.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 93e004f31f..291b5544cc 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3792,3 +3792,31 @@ stream to one or more IceCast and/or ShoutCast servers.") @dfn{Linear/Longitudinal Time Code} (LTC) data.") (home-page "https://x42.github.io/libltc/") (license license:lgpl3+))) + +(define-public redkite + (package + (name "redkite") + (version "0.6.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://gitlab.com/geontime/redkite/-/archive/v" + version "/redkite-v" version ".tar.gz")) + (sha256 + (base32 + "0qif1x3s96zi81zkg11zkszf2i5mvfyrg9b3z2lr0jpzihgblk7y")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f)) ;no tests included + (inputs + `(("cairo" ,cairo))) + (native-inputs + `(("pkg-config", pkg-config))) + (synopsis "Small GUI toolkit") + (description "Redkite is a small GUI toolkit developed in C++17 and +inspired from other well known GUI toolkits such as Qt and GTK. It is +minimal on purpose and is intended to be statically linked to applications, +therefore satisfying any requirements they may have to be self contained, +as is the case with audio plugins.") + (home-page "https://gitlab.com/geontime/redkite") + (license license:gpl3+))) -- cgit 1.4.1 From 83ba0e429101d5ab5cfa2f09a3e0441657b59fe0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 13 Nov 2019 22:18:41 +0100 Subject: gnu: redkite: Do not use unstable tarball. * gnu/packages/audio.scm (redkite)[source]: Change to GIT-FETCH. --- gnu/packages/audio.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 291b5544cc..15ba454edd 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3799,12 +3799,14 @@ stream to one or more IceCast and/or ShoutCast servers.") (version "0.6.2") (source (origin - (method url-fetch) - (uri (string-append "https://gitlab.com/geontime/redkite/-/archive/v" - version "/redkite-v" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/geontime/redkite.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0qif1x3s96zi81zkg11zkszf2i5mvfyrg9b3z2lr0jpzihgblk7y")))) + "1i874izajbdhlfacwwj84qrsxf7g4y6nblzxalrkzaap9sa7d1r6")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ;no tests included -- cgit 1.4.1 From 37d473c5d1132caed5b133f381cc60c0fd63a1d6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Nov 2019 18:01:05 +0100 Subject: gnu: fluidsynth: Update to 2.0.9. * gnu/packages/audio.scm (fluidsynth): Update to 2.0.9. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 15ba454edd..3c7a882404 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1109,7 +1109,7 @@ follower.") (define-public fluidsynth (package (name "fluidsynth") - (version "2.0.8") + (version "2.0.9") (source (origin (method git-fetch) (uri (git-reference @@ -1118,7 +1118,7 @@ follower.") (file-name (git-file-name name version)) (sha256 (base32 - "1s32c0jxjica2agy0mp36vgvpgj2vl5i5zvacd6igmbam0x4gs7c")))) + "08bhwv0gw7zq1z0b36m2dzxl6zcgvmvaa60nly2wif7rinkprp5n")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no check target -- cgit 1.4.1 From bcdf11d6ffd8cc55653ff0257f7a832aaa385c60 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Fri, 15 Nov 2019 09:31:11 +0000 Subject: gnu: rtmidi: Update to 4.0.0. * gnu/packages/audio.scm (rtmidi): Update to 4.0.0. [source]: Download tarball from upstream URL rather than the powertab github fork. [arguments]: Enable tests. Remove 'build and 'install phases and add a new 'noconfigure phase to prevent the bootstrap script from invoking configure. [home-page]: Update homepage to upstream URL. * gnu/packages/music.scm (powertabeditor)[arguments]: Add phase that substitutes the rtmidi #include directive to find the header. Signed-off-by: Mathieu Othacehe --- gnu/packages/audio.scm | 31 ++++++++++--------------------- gnu/packages/music.scm | 8 ++++++++ 2 files changed, 18 insertions(+), 21 deletions(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 3c7a882404..d59b4eb87e 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2341,33 +2341,22 @@ tempo and pitch of an audio recording independently of one another.") (define-public rtmidi (package (name "rtmidi") - (version "2.1.0") + (version "4.0.0") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/powertab/rtmidi.git") - (commit version))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (string-append "https://www.music.mcgill.ca/~gary/rtmidi" + "/release/rtmidi-" version ".tar.gz")) + (file-name (string-append "rtmidi-" version ".tar.gz")) (sha256 (base32 - "106v177y3nrjv2l1yskch4phpqd8h97b67zj0jiq9pc3c69jr1ay")))) + "1k962ljpnwyjw9jjiky2372khhri1wqvrj5qsalfpys31xqzw31p")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ;no "check" target - #:phases + `(#:phases (modify-phases %standard-phases - (add-before 'build 'fix-makefile - (lambda _ - (substitute* "Makefile" - (("/bin/ln") "ln") - (("RtMidi.h RtError.h") "RtMidi.h")) - #t)) - (add-before 'install 'make-target-dirs + (add-before 'bootstrap 'noconfigure (lambda _ - (let ((out (assoc-ref %outputs "out"))) - (mkdir-p (string-append out "/bin")) - (mkdir (string-append out "/lib")) - (mkdir (string-append out "/include"))) + (setenv "NOCONFIGURE" "yes") #t))))) (inputs `(("jack" ,jack-1) @@ -2377,7 +2366,7 @@ tempo and pitch of an audio recording independently of one another.") ("automake" ,automake) ("libtool" ,libtool) ("pkg-config" ,pkg-config))) - (home-page "https://github.com/powertab/rtmidi") + (home-page "https://www.music.mcgill.ca/~gary/rtmidi") (synopsis "Cross-platform MIDI library for C++") (description "RtMidi is a set of C++ classes (RtMidiIn, RtMidiOut, and API specific diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 3373b4c0a3..241ede58d8 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1284,6 +1284,14 @@ add_library( rapidjson INTERFACE IMPORTED )")) (("#include " m) (string-append m "\n#include \n#include "))) #t)) + ;; FIXME: Finding RtMidi was fixed upstream so we should be able to + ;; remove this hack when a release is made. + ;; See https://github.com/powertab/powertabeditor/issues/255 + (add-after 'unpack 'fix-rtmidi-header + (lambda _ + (substitute* "source/audio/midioutputdevice.cpp" + (("#include ") "#include ")) + #t)) (add-before 'configure 'remove-third-party-libs (lambda* (#:key inputs #:allow-other-keys) ;; Link with required static libraries, because we're not -- cgit 1.4.1