From 0d78e3774616d71c6929c48ce0253088d201957c Mon Sep 17 00:00:00 2001 From: Mark Meyer Date: Mon, 3 Apr 2017 19:58:49 +0200 Subject: gnu: Add qjackctl. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/audio.scm (qjackctl): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/audio.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 86a149b1d3..d9fdd6c6b3 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1792,6 +1792,36 @@ (define-public patchage and ALSA.") (license license:gpl3+))) +(define-public qjackctl + (package + (name "qjackctl") + (version "0.4.4") + (source (origin + (method url-fetch) + (uri + (string-append + "https://downloads.sourceforge.net/project/qjackctl/qjackctl/" + version "/qjackctl-" version ".tar.gz")) + (sha256 + (base32 + "19bbljb3iz5ss4s5fmra1dxabg2fnp61sa51d63zsm56xkvv47ak")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f)) ; no check target + + (inputs + `(("jack-2" ,jack-2) + ("qt" ,qt))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("qttools" ,qttools))) + (home-page "https://qjackctl.sourceforge.io/") + (synopsis "Jack server control application") + (description "Control a Jack server. Allows you to plug various sources +into various outputs and to start, stop and configure jackd") + (license license:gpl2+))) + + (define-public raul (package (name "raul") -- cgit v1.2.3 From cd381c317b03d7ff4936e0006c277e7126500602 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Tue, 4 Apr 2017 16:08:15 -0400 Subject: gnu: Move audacity to audio.scm. * gnu/packages/audacity.scm: Remove file and move audacity... * gnu/packages/audio.scm: ...here. * gnu/local.mk: Remove reference to removed file. --- gnu/local.mk | 1 - gnu/packages/audacity.scm | 112 ---------------------------------------------- gnu/packages/audio.scm | 75 +++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+), 113 deletions(-) delete mode 100644 gnu/packages/audacity.scm (limited to 'gnu/packages/audio.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 969bcefeb1..f54ab2a455 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -53,7 +53,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/assembly.scm \ %D%/packages/astronomy.scm \ %D%/packages/attr.scm \ - %D%/packages/audacity.scm \ %D%/packages/audio.scm \ %D%/packages/augeas.scm \ %D%/packages/autogen.scm \ diff --git a/gnu/packages/audacity.scm b/gnu/packages/audacity.scm deleted file mode 100644 index 1ef5048f9e..0000000000 --- a/gnu/packages/audacity.scm +++ /dev/null @@ -1,112 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu packages audacity) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix build-system gnu) - #:use-module (gnu packages) - #:use-module (gnu packages audio) - #:use-module (gnu packages autotools) - #:use-module (gnu packages base) - #:use-module (gnu packages gettext) - #:use-module (gnu packages gtk) - #:use-module (gnu packages linux) - #:use-module (gnu packages mp3) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages pulseaudio) - #:use-module (gnu packages python) - #:use-module (gnu packages xiph) - #:use-module (gnu packages xml) - #:use-module (gnu packages video) - #:use-module (gnu packages wxwidgets)) - -(define-public audacity - (package - (name "audacity") - (version "2.1.3") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/audacity/audacity/archive" - "/Audacity-" version ".tar.gz")) - (sha256 - (base32 "11mx7gb4dbqrgfp7hm0154x3m76ddnmhf2675q5zkxn7jc5qfc6b")))) - (build-system gnu-build-system) - (inputs - ;; TODO: Add portSMF and libwidgetextra once they're packaged. In-tree - ;; versions shipping with Audacity are used for now. - `(("wxwidgets" ,wxwidgets-gtk2) - ("gtk" ,gtk+-2) - ("alsa-lib" ,alsa-lib) - ("jack" ,jack-1) - ("expat" ,expat) - ("ffmpeg" ,ffmpeg) - ("lame" ,lame) - ("flac" ,flac) - ("libid3tag" ,libid3tag) - ("libmad" ,libmad) - ("libsbsms" ,libsbsms) - ("libsndfile" ,libsndfile) - ("soundtouch" ,soundtouch) - ("soxr" ,soxr) ;replaces libsamplerate - ("twolame" ,twolame) - ("vamp" ,vamp) - ("libvorbis" ,libvorbis) - ("lv2" ,lv2) - ("lilv" ,lilv) - ("portaudio" ,portaudio))) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("gettext" ,gettext-minimal) ;for msgfmt - ("libtool" ,libtool) - ("pkg-config" ,pkg-config) - ("python" ,python-2) - ("which" ,which))) - (arguments - '(#:configure-flags - (let ((libid3tag (assoc-ref %build-inputs "libid3tag")) - (libmad (assoc-ref %build-inputs "libmad"))) - (list - ;; Loading FFmpeg dynamically is problematic. - "--disable-dynamic-loading" - ;; libid3tag and libmad provide no .pc files, so pkg-config fails to - ;; find them. Force their inclusion. - (string-append "ID3TAG_CFLAGS=-I" libid3tag "/include") - (string-append "ID3TAG_LIBS=-L" libid3tag "/lib -lid3tag -lz") - (string-append "LIBMAD_CFLAGS=-I" libmad "/include") - (string-append "LIBMAD_LIBS=-L" libmad "/lib -lmad"))) - #:phases - (modify-phases %standard-phases - ;; FFmpeg is only detected if autoreconf runs. - (add-before 'configure 'autoreconf - (lambda _ - (zero? (system* "autoreconf" "-vfi"))))) - ;; The test suite is not "well exercised" according to the developers, - ;; and fails with various errors. See - ;; . - #:tests? #f)) - (home-page "http://audacity.sourceforge.net/") - (synopsis "Software for recording and editing sounds") - (description - "Audacity is a multi-track audio editor designed for recording, playing -and editing digital audio. It features digital effects and spectrum analysis -tools.") - (license license:gpl2+))) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index d9fdd6c6b3..9dc6797343 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -75,6 +75,7 @@ (define-module (gnu packages audio) #:use-module (gnu packages video) #:use-module (gnu packages vim) ;xxd #:use-module (gnu packages webkit) + #:use-module (gnu packages wxwidgets) #:use-module (gnu packages xiph) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) @@ -269,6 +270,80 @@ (define-public ardour engineers, musicians, soundtrack editors and composers.") (license license:gpl2+))) +(define-public audacity + (package + (name "audacity") + (version "2.1.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/audacity/audacity/archive" + "/Audacity-" version ".tar.gz")) + (sha256 + (base32 "11mx7gb4dbqrgfp7hm0154x3m76ddnmhf2675q5zkxn7jc5qfc6b")))) + (build-system gnu-build-system) + (inputs + ;; TODO: Add portSMF and libwidgetextra once they're packaged. In-tree + ;; versions shipping with Audacity are used for now. + `(("wxwidgets" ,wxwidgets-gtk2) + ("gtk" ,gtk+-2) + ("alsa-lib" ,alsa-lib) + ("jack" ,jack-1) + ("expat" ,expat) + ("ffmpeg" ,ffmpeg) + ("lame" ,lame) + ("flac" ,flac) + ("libid3tag" ,libid3tag) + ("libmad" ,libmad) + ("libsbsms" ,libsbsms) + ("libsndfile" ,libsndfile) + ("soundtouch" ,soundtouch) + ("soxr" ,soxr) ;replaces libsamplerate + ("twolame" ,twolame) + ("vamp" ,vamp) + ("libvorbis" ,libvorbis) + ("lv2" ,lv2) + ("lilv" ,lilv) + ("portaudio" ,portaudio))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("gettext" ,gettext-minimal) ;for msgfmt + ("libtool" ,libtool) + ("pkg-config" ,pkg-config) + ("python" ,python-2) + ("which" ,which))) + (arguments + '(#:configure-flags + (let ((libid3tag (assoc-ref %build-inputs "libid3tag")) + (libmad (assoc-ref %build-inputs "libmad"))) + (list + ;; Loading FFmpeg dynamically is problematic. + "--disable-dynamic-loading" + ;; libid3tag and libmad provide no .pc files, so pkg-config fails to + ;; find them. Force their inclusion. + (string-append "ID3TAG_CFLAGS=-I" libid3tag "/include") + (string-append "ID3TAG_LIBS=-L" libid3tag "/lib -lid3tag -lz") + (string-append "LIBMAD_CFLAGS=-I" libmad "/include") + (string-append "LIBMAD_LIBS=-L" libmad "/lib -lmad"))) + #:phases + (modify-phases %standard-phases + ;; FFmpeg is only detected if autoreconf runs. + (add-before 'configure 'autoreconf + (lambda _ + (zero? (system* "autoreconf" "-vfi"))))) + ;; The test suite is not "well exercised" according to the developers, + ;; and fails with various errors. See + ;; . + #:tests? #f)) + (home-page "http://audacity.sourceforge.net/") + (synopsis "Software for recording and editing sounds") + (description + "Audacity is a multi-track audio editor designed for recording, playing +and editing digital audio. It features digital effects and spectrum analysis +tools.") + (license license:gpl2+))) + (define-public azr3 (package (name "azr3") -- cgit v1.2.3 From 6cfb860a7ae623f03f14dc3b6b2bed61b84558b4 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 7 Apr 2017 07:44:05 -0400 Subject: gnu: guitarix: Disable webkit features. The only version of webkit supported by guitarix is unmaintained and contains a large number of security vulnerabilities, and should be removed from Guix. * gnu/packages/audio.scm (guitarix)[inputs]: Remove webkitgtk/gtk+-2. --- gnu/packages/audio.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 9dc6797343..9acccaf113 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1166,7 +1166,6 @@ (define-public guitarix ("jack" ,jack-1) ("gtkmm" ,gtkmm-2) ("gtk+" ,gtk+-2) - ("webkitgtk/gtk+-2" ,webkitgtk/gtk+-2) ("fftwf" ,fftwf) ("lrdf" ,lrdf) ("zita-resampler" ,zita-resampler) -- cgit v1.2.3 From a3c57693e42ff9bba088af50b7472d981e6ac387 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 9 Apr 2017 05:30:43 +0300 Subject: gnu: qjackctl: Build with modular Qt. * gnu/packages/audio.scm (qjackctl)[source]: Use sourceforge mirror. [inputs]: Remove qt, add qtbase, qtx11extras. --- gnu/packages/audio.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 9acccaf113..2d2417abb0 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2015 Alex Kost ;;; Copyright © 2015, 2016 Mark H Weaver -;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016, 2017 Alex Griffin ;;; Copyright © 2016 ng0 ;;; Copyright © 2016 Lukas Gradl @@ -1874,18 +1874,18 @@ (define-public qjackctl (method url-fetch) (uri (string-append - "https://downloads.sourceforge.net/project/qjackctl/qjackctl/" + "mirror://sourceforge/qjackctl/qjackctl/" version "/qjackctl-" version ".tar.gz")) (sha256 (base32 "19bbljb3iz5ss4s5fmra1dxabg2fnp61sa51d63zsm56xkvv47ak")))) (build-system gnu-build-system) (arguments - `(#:tests? #f)) ; no check target - + '(#:tests? #f)) ; no check target (inputs `(("jack-2" ,jack-2) - ("qt" ,qt))) + ("qtbase" ,qtbase) + ("qtx11extras" ,qtx11extras))) (native-inputs `(("pkg-config" ,pkg-config) ("qttools" ,qttools))) -- cgit v1.2.3 From 31b7af7659cf3840f6038f76feab8e1b6a4bfaa7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 10 Apr 2017 14:50:18 +0200 Subject: gnu: jack-1: Update to 0.125.0. * gnu/packages/audio.scm (jack-1): Update to 0.125.0. --- 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 2d2417abb0..1f8361a084 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1301,7 +1301,7 @@ (define-public ir (define-public jack-1 (package (name "jack") - (version "0.124.1") + (version "0.125.0") (source (origin (method url-fetch) (uri (string-append @@ -1310,7 +1310,7 @@ (define-public jack-1 ".tar.gz")) (sha256 (base32 - "1mk1wnx33anp6haxfjjkfhwbaknfblsvj35nxvz0hvspcmhdyhpb")))) + "0i6l25dmfk2ji2lrakqq9icnwjxklgcjzzk65dmsff91z2zva5rm")))) (build-system gnu-build-system) (inputs `(("alsa-lib" ,alsa-lib) -- cgit v1.2.3 From 7181981fd8dfb3cf36e44e2d85084cc39eaa7a2c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 10 Apr 2017 18:36:38 +0200 Subject: gnu: sratom: Update to 0.6.0. * gnu/packages/audio.scm (sratom): Update to 0.6.0. --- gnu/packages/audio.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 1f8361a084..5a9508993d 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2022,15 +2022,14 @@ (define-public rtmidi (define-public sratom (package (name "sratom") - (version "0.4.6") + (version "0.6.0") (source (origin (method url-fetch) (uri (string-append "http://download.drobilla.net/sratom-" - version - ".tar.bz2")) + version ".tar.bz2")) (sha256 (base32 - "080jjiyxjnj7hf25844hd9rb01grvzz1rk8mxcdnakywmspbxfd4")))) + "0hrxd9i66s06bpn6i3s9ka95134g3sm8yscmif7qgdzhyjqw42j4")))) (build-system waf-build-system) (arguments `(#:tests? #f)) ; no check target (inputs -- cgit v1.2.3 From b1d3bb765fb5a3a53956ba69296d65c0289d0319 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 10 Apr 2017 18:39:29 +0200 Subject: gnu: suil: Update to 0.8.4. * gnu/packages/audio.scm (suil): Update to 0.8.4. --- gnu/packages/audio.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 5a9508993d..e3f73f272f 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2048,15 +2048,14 @@ (define-public sratom (define-public suil (package (name "suil") - (version "0.8.2") + (version "0.8.4") (source (origin (method url-fetch) (uri (string-append "http://download.drobilla.net/suil-" - version - ".tar.bz2")) + version ".tar.bz2")) (sha256 (base32 - "1s3adyiw7sa5gfvm5wasa61qa23629kprxyv6w8hbxdiwp0hhxkq")))) + "1kji3lhha26qr6xm9j8ic5c40zbrrb5qnwm2qxzmsfxgmrz29wkf")))) (build-system waf-build-system) (arguments `(#:tests? #f)) ; no check target (inputs -- cgit v1.2.3 From d4d3df82bcea1bb78dbbf07f33a42cfc1c50dd71 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 10 Apr 2017 18:43:07 +0200 Subject: gnu: lilv: Update to 0.24.2. * gnu/packages/audio.scm (lilv): Update to 0.24.2. --- gnu/packages/audio.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index e3f73f272f..861179bca3 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1600,15 +1600,14 @@ (define-public python2-pyliblo (define-public lilv (package (name "lilv") - (version "0.22.0") + (version "0.24.2") (source (origin (method url-fetch) (uri (string-append "http://download.drobilla.net/lilv-" - version - ".tar.bz2")) + version ".tar.bz2")) (sha256 (base32 - "1d3ss7vv8drf1c5340lyd0gv736n2qy7sxji2nh1rw9y48hr69yd")))) + "08m5a372pr1l7aii9s3pic5nm68gynx1n1bc7bnlswziq6qnbv7p")))) (build-system waf-build-system) (arguments `(#:tests? #f ; no check target -- cgit v1.2.3 From f1d81568b5d837da4d5099e38114fd4adf25ed41 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 10 Apr 2017 18:45:40 +0200 Subject: gnu: jalv: Update to 1.6.0. * gnu/packages/audio.scm (jalv): Update to 1.6.0. [inputs]: Replace "gtk+-2" with "gtk+" and "gtkmm-2" with "gtkmm". --- gnu/packages/audio.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 861179bca3..f4421df18a 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1402,14 +1402,14 @@ (define-public jack-2 (define-public jalv (package (name "jalv") - (version "1.4.6") + (version "1.6.0") (source (origin (method url-fetch) (uri (string-append "http://download.drobilla.net/jalv-" version ".tar.bz2")) (sha256 (base32 - "1f1hcq74n3ziw8bk97mn5a1vgw028dxikv3fchaxd430pbbhqgl9")))) + "1x2wpzzx2cgvz3dgdcgsj8dr0w3zsasy62mvl199bsdj5fbjaili")))) (build-system waf-build-system) (arguments `(#:tests? #f ; no check target @@ -1425,8 +1425,8 @@ (define-public jalv `(("lv2" ,lv2) ("lilv" ,lilv) ("suil" ,suil) - ("gtk" ,gtk+-2) - ("gtkmm" ,gtkmm-2) + ("gtk" ,gtk+) + ("gtkmm" ,gtkmm) ("jack" ,jack-1))) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From eb3574fb7d20a3769972c3ce31a0891ce9347225 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 21 Apr 2017 14:25:40 +0200 Subject: gnu: soxr: Update to 0.1.2. * gnu/packages/audio.scm (soxr): Update to 0.1.2. --- 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 f4421df18a..4eebbdb615 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2379,7 +2379,7 @@ (define-public sox (define-public soxr (package (name "soxr") - (version "0.1.1") + (version "0.1.2") (source (origin (method url-fetch) @@ -2387,7 +2387,7 @@ (define-public soxr (string-append "mirror://sourceforge/soxr/soxr-" version "-Source.tar.xz")) (sha256 - (base32 "1hmadwqfpg15vhwq9pa1sl5xslibrjpk6hpq2s9hfmx1s5l6ihfw")))) + (base32 "0xf2w3piwz9gfr1xqyrj4k685q5dy53kq3igv663i4f4y4sg9rjl")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ;no 'check' target (home-page "https://sourceforge.net/p/soxr/wiki/Home/") -- cgit v1.2.3 From 80420acb5e0243c5355d069d09756a8bc06ff451 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 21 Apr 2017 14:44:07 +0200 Subject: gnu: portaudio: Update to 190600.20161030. * gnu/packages/audio.scm (portaudio): Update to 190600.20161030. * gnu/packages/patches/portaudio-audacity-compat.patch: Adjust line endings. --- gnu/packages/audio.scm | 4 +- .../patches/portaudio-audacity-compat.patch | 60 +++++++++++----------- 2 files changed, 32 insertions(+), 32 deletions(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 4eebbdb615..5b2d971953 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2433,7 +2433,7 @@ (define-public twolame (define-public portaudio (package (name "portaudio") - (version "19.20140130") + (version "190600.20161030") (source (origin (method url-fetch) @@ -2442,7 +2442,7 @@ (define-public portaudio (string-map (lambda (c) (if (char=? c #\.) #\_ c)) version) ".tgz")) (sha256 - (base32 "0mwddk4qzybaf85wqfhxqlf0c5im9il8z03rd4n127k8y2jj9q4g")) + (base32 "04qmin6nj144b8qb9kkd9a52xfvm0qdgm8bg8jbl7s3frmyiv8pm")) (patches (search-patches "portaudio-audacity-compat.patch")))) (build-system gnu-build-system) (inputs diff --git a/gnu/packages/patches/portaudio-audacity-compat.patch b/gnu/packages/patches/portaudio-audacity-compat.patch index 9f239ada35..513d08bcea 100644 --- a/gnu/packages/patches/portaudio-audacity-compat.patch +++ b/gnu/packages/patches/portaudio-audacity-compat.patch @@ -7,27 +7,27 @@ See . --- a/include/pa_win_ds.h +++ b/include/pa_win_ds.h @@ -89,6 +89,21 @@ - - }PaWinDirectSoundStreamInfo; - -+/** Retrieve the GUID of the input device. -+ -+ @param stream The stream to query. -+ -+ @return A pointer to the GUID, or NULL if none. -+*/ -+LPGUID PaWinDS_GetStreamInputGUID( PaStream* s ); -+ -+/** Retrieve the GUID of the output device. -+ -+ @param stream The stream to query. -+ -+ @return A pointer to the GUID, or NULL if none. -+*/ -+LPGUID PaWinDS_GetStreamOutputGUID( PaStream* s ); - - - #ifdef __cplusplus + + }PaWinDirectSoundStreamInfo; + ++/** Retrieve the GUID of the input device. ++ ++ @param stream The stream to query. ++ ++ @return A pointer to the GUID, or NULL if none. ++*/ ++LPGUID PaWinDS_GetStreamInputGUID( PaStream* s ); ++ ++/** Retrieve the GUID of the output device. ++ ++ @param stream The stream to query. ++ ++ @return A pointer to the GUID, or NULL if none. ++*/ ++LPGUID PaWinDS_GetStreamOutputGUID( PaStream* s ); + + + #ifdef __cplusplus --- a/include/portaudio.h +++ b/include/portaudio.h @@ -1146,6 +1146,15 @@ @@ -224,15 +224,15 @@ See . --- a/src/hostapi/coreaudio/pa_mac_core_blocking.c +++ b/src/hostapi/coreaudio/pa_mac_core_blocking.c @@ -66,6 +66,9 @@ - #ifdef MOSX_USE_NON_ATOMIC_FLAG_BITS - # define OSAtomicOr32( a, b ) ( (*(b)) |= (a) ) - # define OSAtomicAnd32( a, b ) ( (*(b)) &= (a) ) -+#elif MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_3 -+# define OSAtomicOr32( a, b ) BitOrAtomic( a, (UInt32 *) b ) -+# define OSAtomicAnd32( a, b ) BitAndAtomic( a, (UInt32 *) b ) - #else - # include - #endif + #ifdef MOSX_USE_NON_ATOMIC_FLAG_BITS + # define OSAtomicOr32( a, b ) ( (*(b)) |= (a) ) + # define OSAtomicAnd32( a, b ) ( (*(b)) &= (a) ) ++#elif MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_3 ++# define OSAtomicOr32( a, b ) BitOrAtomic( a, (UInt32 *) b ) ++# define OSAtomicAnd32( a, b ) BitAndAtomic( a, (UInt32 *) b ) + #else + # include + #endif --- a/src/hostapi/alsa/pa_linux_alsa.c +++ b/src/hostapi/alsa/pa_linux_alsa.c @@ -611,6 +611,7 @@ -- cgit v1.2.3 From 1538bc33cd6ac07d9d22bb6a7990c4422c827e43 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 5 May 2017 09:20:38 +0200 Subject: gnu: qjackctl: Update to 0.4.5. * gnu/packages/audio.scm (qjackctl): Update to 0.4.5. --- gnu/packages/audio.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 5b2d971953..0f1a0d1a17 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1868,16 +1868,14 @@ (define-public patchage (define-public qjackctl (package (name "qjackctl") - (version "0.4.4") + (version "0.4.5") (source (origin (method url-fetch) - (uri - (string-append - "mirror://sourceforge/qjackctl/qjackctl/" - version "/qjackctl-" version ".tar.gz")) + (uri (string-append "mirror://sourceforge/qjackctl/qjackctl/" + version "/qjackctl-" version ".tar.gz")) (sha256 (base32 - "19bbljb3iz5ss4s5fmra1dxabg2fnp61sa51d63zsm56xkvv47ak")))) + "1dsavjfzz5bpzc80mvfs940w9f9f47cf4r9cqxnaqrl4xilsa3f5")))) (build-system gnu-build-system) (arguments '(#:tests? #f)) ; no check target -- cgit v1.2.3 From 5ffa7cb1f3eff505e5c06a79a6ddef9ec158f8b2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 5 May 2017 09:21:14 +0200 Subject: gnu: qjackctl: Build with JACK 1. We build all packages with JACK 1. It is compatible with JACK 2, which users may install to get additional features. * gnu/packages/audio.scm (qjackctl)[inputs]: Replace "jack-2" with "jack-1". --- 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 0f1a0d1a17..8e328d8f7e 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1880,7 +1880,7 @@ (define-public qjackctl (arguments '(#:tests? #f)) ; no check target (inputs - `(("jack-2" ,jack-2) + `(("jack" ,jack-1) ("qtbase" ,qtbase) ("qtx11extras" ,qtx11extras))) (native-inputs -- cgit v1.2.3 From e13fff2cf40be07e5e946149b197c4ec86302f52 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 5 May 2017 09:23:27 +0200 Subject: gnu: qsynth: Update to 0.4.4. * gnu/packages/audio.scm (qsynth): Update to 0.4.4. --- gnu/packages/audio.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/audio.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 8e328d8f7e..497f20538d 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2473,14 +2473,15 @@ (define-public portaudio (define-public qsynth (package (name "qsynth") - (version "0.4.3") + (version "0.4.4") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/qsynth/qsynth/" version "/qsynth-" version ".tar.gz")) (sha256 - (base32 "1j5hm99fjrnaw8wbmlh4qixkv3rw5dl429mp1ag7js2ydrx0j9yy")))) + (base32 + "0qhfnikx3xcllkvs60kj6vcf2rwwzh31y41qkk6kwfhzgd219y8f")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no "check" phase -- cgit v1.2.3