all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#58613] [PATCH] gnu: ardour: Update to 7.0
@ 2022-10-18 18:59 Sughosha via Guix-patches via
  2022-10-20 11:21 ` [bug#58613] [PATCHES v2] gnu: ardour: Use system libraries and install man page Sughosha via Guix-patches via
  2022-11-13 18:28 ` bug#58613: [PATCH] gnu: ardour: Update to 7.0 Ricardo Wurmus
  0 siblings, 2 replies; 3+ messages in thread
From: Sughosha via Guix-patches via @ 2022-10-18 18:59 UTC (permalink / raw)
  To: 58613

* gnu/packages/audio.scm (ardour): Update to 7.0.
---
 gnu/packages/audio.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 55ef9f7f10..d489733bd1 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -633,7 +633,7 @@ (define (ardour-rpath-phase major-version)
 (define-public ardour
   (package
     (name "ardour")
-    (version "6.9")
+    (version "7.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -651,7 +651,7 @@ (define-public ardour
                     #t)))
               (sha256
                (base32
-                "0vlcbd70y0an881zv87kc3akmaiz4w7whsy3yaiiqqjww35jg1mm"))
+                "1xzgcd2d8zzgx3s9sr3kcxl3vz3vfr5l1xs9qpjplmk22dfj8b08"))
               (file-name (string-append name "-" version))))
     (build-system waf-build-system)
     (arguments
@@ -701,6 +701,7 @@ (define-public ardour
            flac
            glibmm
            gtkmm-2
+           hicolor-icon-theme
            jack-1
            libarchive
            libart-lgpl
-- 
2.38.0





^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [bug#58613] [PATCHES v2] gnu: ardour: Use system libraries and install man page
  2022-10-18 18:59 [bug#58613] [PATCH] gnu: ardour: Update to 7.0 Sughosha via Guix-patches via
@ 2022-10-20 11:21 ` Sughosha via Guix-patches via
  2022-11-13 18:28 ` bug#58613: [PATCH] gnu: ardour: Update to 7.0 Ricardo Wurmus
  1 sibling, 0 replies; 3+ messages in thread
From: Sughosha via Guix-patches via @ 2022-10-20 11:21 UTC (permalink / raw)
  To: 58613@debbugs.gnu.org

[-- Attachment #1: Type: text/plain, Size: 13 bytes --]

Empty Message

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: v2-0001-gnu-Add-qm-dsp.patch --]
[-- Type: text/x-patch; name=v2-0001-gnu-Add-qm-dsp.patch, Size: 3812 bytes --]

From 641a18d7b3e1bd0089b451150ad82417de7d3bb1 Mon Sep 17 00:00:00 2001
From: Sughosha <sughosha@proton.me>
Date: Thu, 20 Oct 2022 08:19:41 +0200
Subject: [PATCH v2 1/2] gnu: Add qm-dsp

* gnu/packages/audio.scm (qm-dsp): New variable.
---
 gnu/packages/audio.scm | 60 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index d489733bd1..516c5d57da 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -144,6 +144,7 @@ (define-module (gnu packages audio)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix utils)
+  #:use-module (ice-9 regex)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-26))
 
@@ -614,6 +615,65 @@ (define-public aubio
 streams from live audio.")
     (license license:gpl3+)))
 
+(define-public qm-dsp
+  (package
+    (name "qm-dsp")
+    (version "1.7.1")
+    (source (origin
+             (method git-fetch)
+             (uri (git-reference
+                   (url "https://github.com/c4dm/qm-dsp")
+                   (commit (string-append "v" version))))
+             (sha256
+              (base32
+               "1vkb1xr2hjcaw88gig7rknlwsx01lm0w94d2z0rk5vz9ih4fslvv"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:make-flags
+       `(,(string-append "-f" (assoc-ref %build-inputs "source") "/build/"
+                         (if ,(string-match "x86_64-linux"
+                                            (or (%current-target-system)
+                                                (%current-system)))
+                           "linux/Makefile.linux64"
+                           (if ,(string-match "i686-linux"
+                                              (or (%current-target-system)
+                                                  (%current-system)))
+                             "linux/Makefile.linux32"
+                             (if ,(string-match "mingw32"
+                                                (or (%current-target-system)
+                                                    (%current-system)))
+                               "mingw32/Makefile.mingw32"
+                               "general/Makefile.inc"))))
+         ,(string-append "CC=" ,(cc-for-target)))
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure) ;no configure script
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (lib (string-append out "/lib"))
+                    (include (string-append out "/include")))
+             (install-file "libqm-dsp.a" lib)
+             (mkdir-p include)
+             (for-each
+               (lambda (dir)
+                 (for-each
+                   (lambda (file)
+                     (if (directory-exists? file)
+                       (mkdir-p (string-append include "/" file))
+                       (if (string-suffix? ".h" file)
+                         (copy-file file (string-append include "/" file))
+                         #t)))
+                   (find-files dir #:directories? #t)))
+               '("base" "dsp" "ext" "hmm" "maths" "thread"))))))
+       #:test-target "tests"))
+    (home-page "https://code.soundsoftware.ac.uk/projects/qm-dsp")
+    (synopsis "C++ library of functions for DSP and Music Informatics purposes")
+    (description
+     "QM-DSP is a C++ library of functions for DSP and Music Informatics
+purposes developed at Queen Mary, University of London.")
+    (license license:gpl2+)))
+
 (define (ardour-rpath-phase major-version)
   `(lambda* (#:key outputs #:allow-other-keys)
      (let ((libdir (string-append (assoc-ref outputs "out")
-- 
2.38.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: v2-0002-gnu-ardour-Use-system-libraries-and-install-man-page.patch --]
[-- Type: text/x-patch; name=v2-0002-gnu-ardour-Use-system-libraries-and-install-man-page.patch, Size: 2944 bytes --]

From 14dd0806ee58cc2b05f06bd28118419ff9623319 Mon Sep 17 00:00:00 2001
From: Sughosha <sughosha@proton.me>
Date: Thu, 20 Oct 2022 13:10:53 +0200
Subject: [PATCH v2 2/2] gnu: ardour: Use system libraries and install man page

* gnu/packages/audio.scm (ardour)
[arguments]: Use external libraries and install man page.
[inputs]: Add fluidsynth, hidapi, libltc and qm-dsp.
---
 gnu/packages/audio.scm | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 516c5d57da..b3e8074f09 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -715,11 +715,12 @@ (define-public ardour
               (file-name (string-append name "-" version))))
     (build-system waf-build-system)
     (arguments
-     `(#:configure-flags '("--cxx11"          ; required by gtkmm
+     `(#:configure-flags '("--cxx11"              ; required by gtkmm
                            "--optimize"
-                           "--no-phone-home"  ; don't contact ardour.org
-                           "--freedesktop"    ; build .desktop file
-                           "--test")          ; build unit tests
+                           "--no-phone-home"      ; don't contact ardour.org
+                           "--freedesktop"        ; build .desktop file
+                           "--test"               ; build unit tests
+                           "--use-external-libs") ; use system libraries
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'set-rpath-in-LDFLAGS
@@ -745,7 +746,11 @@ (define-public ardour
                (install-file (string-append "build/gtk2_ardour/ardour"
                                             ver ".appdata.xml")
                              (string-append share "/appdata/")))
-             #t)))
+             #t))
+         (add-after 'install 'install-man-page
+           (lambda* (#:key outputs #:allow-other-keys)
+             (install-file "ardour.1" (string-append (assoc-ref outputs "out")
+                                                     "/share/man/man1")))))
        #:test-target "test"))
     (inputs
      (list alsa-lib
@@ -759,14 +764,17 @@ (define-public ardour
            fftw
            fftwf
            flac
+           fluidsynth
            glibmm
            gtkmm-2
            hicolor-icon-theme
+           hidapi
            jack-1
            libarchive
            libart-lgpl
            libgnomecanvasmm
            liblo
+           libltc
            libogg
            libsamplerate
            libsndfile
@@ -796,7 +804,8 @@ (define-public ardour
        ("gettext" ,gettext-minimal)
        ("itstool" ,itstool)
        ("perl" ,perl)
-       ("pkg-config" ,pkg-config)))
+       ("pkg-config" ,pkg-config)
+       ("qm-dsp" ,qm-dsp)))
     (home-page "https://ardour.org")
     (synopsis "Digital audio workstation")
     (description
-- 
2.38.0


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* bug#58613: [PATCH] gnu: ardour: Update to 7.0
  2022-10-18 18:59 [bug#58613] [PATCH] gnu: ardour: Update to 7.0 Sughosha via Guix-patches via
  2022-10-20 11:21 ` [bug#58613] [PATCHES v2] gnu: ardour: Use system libraries and install man page Sughosha via Guix-patches via
@ 2022-11-13 18:28 ` Ricardo Wurmus
  1 sibling, 0 replies; 3+ messages in thread
From: Ricardo Wurmus @ 2022-11-13 18:28 UTC (permalink / raw)
  To: 58613-done

Thank you for the patches!  I’ve split the last one and made a few
changes to the qm-dsp package.

All applied, so I’m closing this.

-- 
Ricardo




^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2022-11-13 18:46 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-18 18:59 [bug#58613] [PATCH] gnu: ardour: Update to 7.0 Sughosha via Guix-patches via
2022-10-20 11:21 ` [bug#58613] [PATCHES v2] gnu: ardour: Use system libraries and install man page Sughosha via Guix-patches via
2022-11-13 18:28 ` bug#58613: [PATCH] gnu: ardour: Update to 7.0 Ricardo Wurmus

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.