[bug#74036] [PATCH 0/2] Remove outdated faust-0.9.67 package.

[bug#74036] [PATCH 0/2] Remove outdated faust-0.9.67 package.

[Nicolas Graves via Guix-patches via]

Nicolas Graves (2):
  gnu: sorcer: Update to 1.1.3-2.94107b2.
  gnu: Remove faust-0.9.67.

 gnu/packages/audio.scm | 34 ----------------------------------
 gnu/packages/music.scm | 14 +++++---------
 2 files changed, 5 insertions(+), 43 deletions(-)

-- 
2.46.0

[bug#74036] [PATCH 1/2] gnu: sorcer: Update to 1.1.3-2.94107b2.

[Nicolas Graves via Guix-patches via]

* gnu/packages/music.scm (sorcer): Update to 1.1.3-2.94107b2.
[arguments]<#:phases>: Remove 'remove-architecture-specific-flags
phase. Adapt 'build-faust-sources to faust-2.
[native-inputs]: Replace faust-0.9.67 by faust-2. Add which.
---
 gnu/packages/music.scm | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 548836abeb..92283d0218 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -5837,11 +5837,11 @@ (define-public fabla
     (license license:gpl2+)))
 
 (define-public sorcer
-  (let ((revision "1")
+  (let ((revision "2")
         ;; The last release was in 2016.  Since then a couple of commits have
         ;; been added to fix build problems, so we take this arbitrary recent
         ;; commit.
-        (commit "cc7f6f58af3188a8620b90fdad6e8ca5d026f543"))
+        (commit "94107b26e3e00e32504c8fb3fbf7572514d3b6bc"))
     (package
       (name "sorcer")
       (version (git-version "1.1.3" revision commit))
@@ -5853,7 +5853,7 @@ (define-public sorcer
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "0ryaglp2pzln2bm0pwc5p9lb2nk0x4wmrs4c4cp6d2m2hhk82yk7"))
+                  "0md3d9h63ngrlh53mj1fmwhmnlxr7bqzpfb3wk9427v5n0y6yn48"))
                 (snippet
                  '(delete-file "faust/main.cpp"))))
       (build-system cmake-build-system)
@@ -5861,18 +5861,14 @@ (define-public sorcer
        `(#:tests? #f                    ;no tests included
          #:phases
          (modify-phases %standard-phases
-           (add-after 'unpack 'remove-architecture-specific-flags
-             (lambda _
-               (substitute* "CMakeLists.txt"
-                 (("-msse2 -mfpmath=sse") ""))))
            (add-after 'unpack 'build-faust-sources
              (lambda* (#:key inputs #:allow-other-keys)
                (with-directory-excursion "faust"
                  (invoke "faust" "-i"
-                         "-a" "lv2synth.cpp"
+                         "-a" "lv2.cpp"
                          "-o" "main.cpp" "main.dsp")))))))
       (inputs (list boost lv2 ntk))
-      (native-inputs (list faust-0.9.67 pkg-config))
+      (native-inputs (list faust-2 pkg-config which))
       (home-page "http://openavproductions.com/sorcer/")
       (synopsis "Wavetable LV2 plugin synth")
       (description "Sorcer is a wavetable LV2 plugin synthesizer, targeted at
-- 
2.46.0

[bug#74036] [PATCH 2/2] gnu: Remove faust-0.9.67.

[Nicolas Graves via Guix-patches via]

* gnu/packages/audio.scm (faust-0.9.67): Delete variable.
---
 gnu/packages/audio.scm | 34 ----------------------------------
 1 file changed, 34 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 1ab0cbdd05..1bb7c1c314 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -2231,40 +2231,6 @@ (define-public faust
      "Faust is a programming language for realtime audio signal processing.")
     (license license:gpl2+)))
 
-;; This version is needed to build older synths that require the lv2synth.cpp
-;; architecture file, such as sorcer.
-(define-public faust-0.9.67
-  (package
-    (inherit faust)
-    (name "faust")
-    (version "0.9.67")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/grame-cncm/faust")
-                    (commit (string-append "v"
-                                           (string-map (lambda (c)
-                                                         (if (char=? c #\.) #\- c))
-                                                       version)))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "0856x666s6ymzk8v15f9gy402dbr8c9v2s40hyfadhraqljmqrm0"))
-              (snippet
-               ;; Remove prebuilt library
-               '(delete-file "architecture/android/libs/armeabi-v7a/libfaust_dsp.so"))))
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:make-flags
-      #~(list (string-append "prefix=" #$output))
-      #:tests? #f
-      #:phases
-      '(modify-phases %standard-phases
-         ;; no "configure" script
-         (delete 'configure))))
-    (native-inputs (list unzip))))
-
 (define-public faust-2
   (package
     (inherit faust)
-- 
2.46.0