From ee199369cd8ab56397bd8f520c81015632d5e21d Mon Sep 17 00:00:00 2001 From: Sughosha Date: Fri, 9 Jun 2023 10:35:58 +0000 Subject: [PATCH 1/4] nongnu: reaper: Update to 6.80 and realign definition. * nongnu/packages/music.scm (reaper): Update to 6.80 and realign. [#:patchelf-plan]: Patch all the binary files. [#:phases] (install): Remove adding unneeded "libexec" folder. [inputs]: Add "jack-1" and "pulseaudio". --- nongnu/packages/music.scm | 139 ++++++++++++++++++++++++-------------- 1 file changed, 89 insertions(+), 50 deletions(-) diff --git a/nongnu/packages/music.scm b/nongnu/packages/music.scm index dffd758..9cc4b65 100644 --- a/nongnu/packages/music.scm +++ b/nongnu/packages/music.scm @@ -1,5 +1,5 @@ ;;; SPDX-License-Identifier: GPL-3.0-or-later -;;; Copyright © 2022 Sughosha +;;; Copyright © 2023 Sughosha ;;; Copyright © 2023 Jonathan Brielmaier (define-module (nongnu packages music) @@ -9,6 +9,7 @@ #:use-module (gnu packages freedesktop) #:use-module (gnu packages gcc) #:use-module (gnu packages linux) + #:use-module (gnu packages pulseaudio) #:use-module (guix download) #:use-module (guix gexp) #:use-module (guix packages) @@ -21,7 +22,7 @@ (define-public reaper (package (name "reaper") - (version "6.73") + (version "6.80") (source (origin (method url-fetch) @@ -39,60 +40,98 @@ (sha256 (base32 (match (%current-system) - ("x86_64-linux" "1hd7fbk0px45fxhqa7nqcnij8ls2fhpjp60v840vy2zqs9fkcr52") - ("i686-linux" "11vk32mxyda9xl08pp2ivd1vsahnw6w7d08in4syz6iannfwp19b") - ("aarch64-linux" "0zpkaiwwxn8yh3s1d22qswshbgaxx5d8iy17hb3w256zgb722yjw") - ("armhf-linux" "18174b1lgsk73gxhala471ppzbrpa1cs953b5par998yqgh74znk")))))) + ("x86_64-linux" + "166fj1gy19y3b1q07mwvmdassw34q0q4mws1r2xq7xc224xpnbq7") + ("i686-linux" + "0v5ig2615fh7f2i0pwd65s886zxrixrxyp899nvzjw3ydi7pvq67") + ("aarch64-linux" + "04ky26z92zfx19hjp5iyig5r0zrqna7qcagbnnw8hb4lz8ay4l6p") + ("armhf-linux" + "0gmynv6sj9l6261x0l91j3mvljm739a013v3yvzlvf83fjljzbk6")))))) (build-system binary-build-system) (arguments (list #:strip-binaries? #f ;allocated section `.dynsym' not in segment - #:patchelf-plan #~`(("REAPER/reaper" ("libc" "gcc" "alsa-lib")) - ("REAPER/reamote-server" ("libc" "gcc")) - ("REAPER/Plugins/reaper_host_x86_64" ("libc" "gcc"))) - #:phases #~(modify-phases %standard-phases - (replace 'install - (lambda* (#:key outputs inputs #:allow-other-keys) - (let* ((target (string-append #$output "/opt")) - (bin (string-append #$output "/bin")) - (libexec (string-append #$output "/libexec")) - (data (string-append #$output "/share")) - (doc (string-append data "/doc/reaper-" - #$version))) + #:patchelf-plan + #~(let ((libs (list "libc" "gcc"))) + (list (list "REAPER/reaper" + (append libs + (list "alsa-lib" "jack" "pulseaudio"))) + (list "REAPER/reamote-server" + (append libs + (list "alsa-lib" "jack" "pulseaudio"))) + (list "REAPER/Plugins/reaper_host_x86_64" + (append libs + (list "alsa-lib" "jack" "pulseaudio"))) + (list "REAPER/Plugins/elastique3.so" libs) + (list "REAPER/Plugins/reaper_cd.so" libs) + (list "REAPER/Plugins/reaper_csurf.so" libs) + (list "REAPER/Plugins/jsfx.so" libs) + (list "REAPER/Plugins/reaper_ddp.so" libs) + (list "REAPER/Plugins/reaper_explorer.so" libs) + (list "REAPER/Plugins/reaper_flac.so" libs) + (list "REAPER/Plugins/reaper_midi.so" libs) + (list "REAPER/Plugins/reaper_mp3dec.so" libs) + (list "REAPER/Plugins/reaper_ogg.so" libs) + (list "REAPER/Plugins/reaper_opus.so" libs) + (list "REAPER/Plugins/reaper_wave.so" libs) + (list "REAPER/Plugins/reaper_video.so" libs) + (list "REAPER/Plugins/reaper_wavpack.so" libs) + (list "REAPER/Plugins/rubberband.so" libs) + (list "REAPER/Plugins/soundtouch.so" libs) + (list "REAPER/Plugins/FX/reacast.vst.so" libs) + (list "REAPER/Plugins/FX/reacomp.vst.so" libs) + (list "REAPER/Plugins/FX/reacontrolmidi.vst.so" libs) + (list "REAPER/Plugins/FX/readelay.vst.so" libs) + (list "REAPER/Plugins/FX/reaeq.vst.so" libs) + (list "REAPER/Plugins/FX/reafir.vst.so" libs) + (list "REAPER/Plugins/FX/reagate.vst.so" libs) + (list "REAPER/Plugins/FX/reainsert.vst.so" libs) + (list "REAPER/Plugins/FX/realimit.vst.so" libs) + (list "REAPER/Plugins/FX/reaninjam.vst.so" libs) + (list "REAPER/Plugins/FX/reapitch.vst.so" libs) + (list "REAPER/Plugins/FX/reasamplomatic.vst.so" libs) + (list "REAPER/Plugins/FX/reastream.vst.so" libs) + (list "REAPER/Plugins/FX/reasurround.vst.so" libs) + (list "REAPER/Plugins/FX/reasurround2.vst.so" libs) + (list "REAPER/Plugins/FX/reasyndr.vst.so" libs) + (list "REAPER/Plugins/FX/reacast.vst.so" libs) + (list "REAPER/Plugins/FX/reasynth.vst.so" libs) + (list "REAPER/Plugins/FX/reatune.vst.so" libs) + (list "REAPER/Plugins/FX/reaverb.vst.so" libs) + (list "REAPER/Plugins/FX/reaverbate.vst.so" libs) + (list "REAPER/Plugins/FX/reavocode.vst.so" libs) + (list "REAPER/Plugins/FX/reavoice.vst.so" libs) + (list "REAPER/Plugins/FX/reaxcomp.vst.so" libs))) + #:phases + #~(modify-phases %standard-phases + (replace 'install + (lambda* (#:key outputs inputs #:allow-other-keys) + (let* ((target (string-append #$output "/opt")) + (bin (string-append #$output "/bin")) + (data (string-append #$output "/share")) + (doc (string-append data "/doc/reaper-" #$version))) (setenv "HOME" "/tmp") - (setenv "XDG_DATA_HOME" data) - (invoke "sh" "./install-reaper.sh" "--install" - target "--integrate-user-desktop") - (delete-file (string-append target - "/REAPER/uninstall-reaper.sh")) - (delete-file (string-append target - "/REAPER/libSwell.so")) - (symlink (search-input-file inputs - "/lib/libSwell.so") - (string-append target - "/REAPER/libSwell.so")) - (mkdir-p bin) - (symlink (string-append target "/REAPER/reaper") - (string-append bin "/reaper")) - (mkdir-p libexec) - (symlink (string-append target - "/REAPER/Plugins/reaper_host_x86_64") - (string-append libexec - "/reaper_host_x86_64")) - (mkdir-p doc) - (symlink (string-append target - "/REAPER/EULA.txt") - (string-append doc "/LICENSE")))))))) + (setenv "XDG_DATA_HOME" data) + (invoke "sh" "./install-reaper.sh" "--install" + target "--integrate-user-desktop") + (delete-file (string-append target + "/REAPER/uninstall-reaper.sh")) + (delete-file (string-append target + "/REAPER/libSwell.so")) + (symlink (search-input-file inputs "/lib/libSwell.so") + (string-append target "/REAPER/libSwell.so")) + (mkdir-p bin) + (symlink (string-append target "/REAPER/reaper") + (string-append bin "/reaper")) + (mkdir-p doc) + (symlink (string-append target "/REAPER/EULA.txt") + (string-append doc "/LICENSE")))))))) (native-inputs - (list - which - xdg-utils)) + (list which xdg-utils)) (inputs - (list - alsa-lib - `(,gcc "lib") - wdl)) - (supported-systems '("x86_64-linux" "i686-linux" "aarch64-linux" - "armhf-linux")) + (list alsa-lib `(,gcc "lib") jack-1 pulseaudio wdl)) + (supported-systems + (list "x86_64-linux" "i686-linux" "aarch64-linux" "armhf-linux")) (home-page "https://www.reaper.fm") (synopsis "Digital audio workstation") (description From adbc51b5387890e0585a7b50e7aeb5489b7191ac Mon Sep 17 00:00:00 2001 From: Sughosha Date: Thu, 15 Jun 2023 16:55:21 +0000 Subject: [PATCH 2/4] nongnu: reaper: Remove which from native-inputs. * nongnu/packages/music.scm (reaper)[native-inputs]: Remove which. --- nongnu/packages/music.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nongnu/packages/music.scm b/nongnu/packages/music.scm index 9cc4b65..0c717f0 100644 --- a/nongnu/packages/music.scm +++ b/nongnu/packages/music.scm @@ -4,7 +4,6 @@ (define-module (nongnu packages music) #:use-module (gnu packages audio) - #:use-module (gnu packages base) #:use-module (gnu packages cpp) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gcc) @@ -127,7 +126,7 @@ (symlink (string-append target "/REAPER/EULA.txt") (string-append doc "/LICENSE")))))))) (native-inputs - (list which xdg-utils)) + (list xdg-utils)) (inputs (list alsa-lib `(,gcc "lib") jack-1 pulseaudio wdl)) (supported-systems From 464e836ae80f7aa3a5e9cea183fddd347bd0a458 Mon Sep 17 00:00:00 2001 From: Sughosha Date: Mon, 19 Jun 2023 09:32:35 +0000 Subject: [PATCH 3/4] nongnu/packages/music.scm: Fix copyright message. --- nongnu/packages/music.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nongnu/packages/music.scm b/nongnu/packages/music.scm index 0c717f0..939ca84 100644 --- a/nongnu/packages/music.scm +++ b/nongnu/packages/music.scm @@ -1,5 +1,5 @@ ;;; SPDX-License-Identifier: GPL-3.0-or-later -;;; Copyright © 2023 Sughosha +;;; Copyright © 2022-2023 Sughosha ;;; Copyright © 2023 Jonathan Brielmaier (define-module (nongnu packages music) From 6c8601baa99a97e73939ce4dcf9251002c028c37 Mon Sep 17 00:00:00 2001 From: Sughosha Date: Wed, 1 Nov 2023 18:51:22 +0000 Subject: [PATCH 4/4] nongnu: reaper: Update to 7.02. * nongnu/packages/music.scm (reaper): Update to 7.02. --- nongnu/packages/music.scm | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/nongnu/packages/music.scm b/nongnu/packages/music.scm index 939ca84..907cb26 100644 --- a/nongnu/packages/music.scm +++ b/nongnu/packages/music.scm @@ -21,7 +21,7 @@ (define-public reaper (package (name "reaper") - (version "6.80") + (version "7.02") (source (origin (method url-fetch) @@ -40,13 +40,13 @@ (base32 (match (%current-system) ("x86_64-linux" - "166fj1gy19y3b1q07mwvmdassw34q0q4mws1r2xq7xc224xpnbq7") + "0apnkv28x2vdlh7q26xsrn3b0y06cj4xgwsl1dh4rkkylrcld87k") ("i686-linux" - "0v5ig2615fh7f2i0pwd65s886zxrixrxyp899nvzjw3ydi7pvq67") + "00b4hdk0i4gqlk3h5y9s07fhpvklazl2f2mzbr34m41s7avfnmx5") ("aarch64-linux" - "04ky26z92zfx19hjp5iyig5r0zrqna7qcagbnnw8hb4lz8ay4l6p") + "15skc16w3yl0fbs15h39xzf2xk1y5q1919fqrvwinq5r73ig55wh") ("armhf-linux" - "0gmynv6sj9l6261x0l91j3mvljm739a013v3yvzlvf83fjljzbk6")))))) + "1laaiw4dcmaxzf7g3f0dmlihk53p50xnk8rmj8nw18yf7qhcscbs")))))) (build-system binary-build-system) (arguments (list #:strip-binaries? #f ;allocated section `.dynsym' not in segment @@ -55,16 +55,13 @@ (list (list "REAPER/reaper" (append libs (list "alsa-lib" "jack" "pulseaudio"))) - (list "REAPER/reamote-server" - (append libs - (list "alsa-lib" "jack" "pulseaudio"))) (list "REAPER/Plugins/reaper_host_x86_64" (append libs (list "alsa-lib" "jack" "pulseaudio"))) (list "REAPER/Plugins/elastique3.so" libs) + (list "REAPER/Plugins/jsfx.so" libs) (list "REAPER/Plugins/reaper_cd.so" libs) (list "REAPER/Plugins/reaper_csurf.so" libs) - (list "REAPER/Plugins/jsfx.so" libs) (list "REAPER/Plugins/reaper_ddp.so" libs) (list "REAPER/Plugins/reaper_explorer.so" libs) (list "REAPER/Plugins/reaper_flac.so" libs) @@ -72,8 +69,8 @@ (list "REAPER/Plugins/reaper_mp3dec.so" libs) (list "REAPER/Plugins/reaper_ogg.so" libs) (list "REAPER/Plugins/reaper_opus.so" libs) - (list "REAPER/Plugins/reaper_wave.so" libs) (list "REAPER/Plugins/reaper_video.so" libs) + (list "REAPER/Plugins/reaper_wave.so" libs) (list "REAPER/Plugins/reaper_wavpack.so" libs) (list "REAPER/Plugins/rubberband.so" libs) (list "REAPER/Plugins/soundtouch.so" libs)