From unknown Sun Sep 07 14:55:57 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26365: [PATCH] gnu: Move audacity to audio.scm. Resent-From: Kei Kebreau Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 04 Apr 2017 21:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 26365 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 26365@debbugs.gnu.org Cc: Kei Kebreau X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.149134244513045 (code B ref -1); Tue, 04 Apr 2017 21:48:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 Apr 2017 21:47:25 +0000 Received: from localhost ([127.0.0.1]:32886 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cvWIO-0003OL-Pu for submit@debbugs.gnu.org; Tue, 04 Apr 2017 17:47:25 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41401) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cvWIJ-0003O5-PV for submit@debbugs.gnu.org; Tue, 04 Apr 2017 17:47:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cvWIC-0005Tm-T4 for submit@debbugs.gnu.org; Tue, 04 Apr 2017 17:47:14 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:48635) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cvWIC-0005Tg-PO for submit@debbugs.gnu.org; Tue, 04 Apr 2017 17:47:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60580) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cvWIA-0002Xh-C6 for guix-patches@gnu.org; Tue, 04 Apr 2017 17:47:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cvWI6-0005RK-Cx for guix-patches@gnu.org; Tue, 04 Apr 2017 17:47:10 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:57133 helo=mail.openmailbox.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cvWI5-0005Pz-Vi for guix-patches@gnu.org; Tue, 04 Apr 2017 17:47:06 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id C7F7D505510; Tue, 4 Apr 2017 23:47:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1491342423; bh=aBn1QRCmwiLCqawPAqoXm72RIvAyNmFG7caZpqKmrpY=; h=From:To:Cc:Subject:Date:From; b=llx6zOqUWLyAZelE3nYVvvbt3Gl9VPoUUYSI4vfL4Bj7fXhrx1rO5OyAYuhNc/HGY I+JTpIR6fKHekxZZLNFZi5JdbRScIEoP4kIukjOgZuLH64q0G3zmr+w670kQMo9CS4 7BBCseg1HX9L5z062h5tfbgrvlXuSArqI182785Y= From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1491342421; bh=aBn1QRCmwiLCqawPAqoXm72RIvAyNmFG7caZpqKmrpY=; h=From:To:Cc:Subject:Date:From; b=eQDRX1FAwMw9qozHVjItg3mrZ5K4zEIqYPBVmG0c3jSUabg6KXnUxA5ifiCf3P7R2 zmme6nV/9bu857YmoYCRXkE6zAx7hiPWrZ7PfollVgLHO/W4gwHGPPBcvIU/TloSr4 OBzNx+DvSCQpQliGAKCRFYAkJowjiJUoIYYalV6s= Date: Tue, 4 Apr 2017 17:46:49 -0400 Message-Id: <20170404214649.12074-1-kei@openmailbox.org> X-Mailer: git-send-email 2.12.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) * 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 diff --git a/gnu/local.mk b/gnu/local.mk index 969bcefeb..f54ab2a45 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -53,7 +53,6 @@ GNU_SYSTEM_MODULES =3D \ %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 1ef5048f9..000000000 --- a/gnu/packages/audacity.scm +++ /dev/null @@ -1,112 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright =C2=A9 2015 Taylan Ulrich Bay=C4=B1rl=C4=B1/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 (a= t -;;; 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 fa= ils to - ;; find them. Force their inclusion. - (string-append "ID3TAG_CFLAGS=3D-I" libid3tag "/include") - (string-append "ID3TAG_LIBS=3D-L" libid3tag "/lib -lid3tag -lz= ") - (string-append "LIBMAD_CFLAGS=3D-I" libmad "/include") - (string-append "LIBMAD_LIBS=3D-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 develo= pers, - ;; 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, pla= ying -and editing digital audio. It features digital effects and spectrum ana= lysis -tools.") - (license license:gpl2+))) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index d9fdd6c6b..9dc679734 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -75,6 +75,7 @@ #: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 @@ record, edit, mix and master audio and MIDI projects= . It is targeted at audio engineers, musicians, soundtrack editors and composers.") (license license:gpl2+))) =20 +(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 fa= ils to + ;; find them. Force their inclusion. + (string-append "ID3TAG_CFLAGS=3D-I" libid3tag "/include") + (string-append "ID3TAG_LIBS=3D-L" libid3tag "/lib -lid3tag -lz= ") + (string-append "LIBMAD_CFLAGS=3D-I" libmad "/include") + (string-append "LIBMAD_LIBS=3D-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 develo= pers, + ;; 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, pla= ying +and editing digital audio. It features digital effects and spectrum ana= lysis +tools.") + (license license:gpl2+))) + (define-public azr3 (package (name "azr3") --=20 2.12.2 From unknown Sun Sep 07 14:55:57 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26365: [PATCH] gnu: Move audacity to audio.scm. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 05 Apr 2017 16:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26365 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Kei Kebreau , 26365@debbugs.gnu.org Cc: Kei Kebreau Received: via spool by 26365-submit@debbugs.gnu.org id=B26365.14914084469958 (code B ref 26365); Wed, 05 Apr 2017 16:08:02 +0000 Received: (at 26365) by debbugs.gnu.org; 5 Apr 2017 16:07:26 +0000 Received: from localhost ([127.0.0.1]:33847 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cvnSw-0002aY-8L for submit@debbugs.gnu.org; Wed, 05 Apr 2017 12:07:26 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:33493) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cvnSu-0002aQ-8v for 26365@debbugs.gnu.org; Wed, 05 Apr 2017 12:07:25 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 43E842074E; Wed, 5 Apr 2017 12:07:23 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Wed, 05 Apr 2017 12:07:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=cI4MqZyAfjPtoE3kL+Mk55wGcfRZNVTTFvnOBAV1j F8=; b=zDXHm67uqc7DngGVsm1R0clxw+MlSdYr4TWSklyv5PrlLFXwji7bjU3Mw q2zmajgWXDuRhCsjy90DmOkVVCnpalVnuu15xT23l8wFV/05fyC4rzGIOMvyqiaG TqbXERuOWBXePFCC/WOzJYL43zGT4OTs/bpmLWRkF24e9Yw1HsVlMAY7teb2jIIu csNXCPJ2ebFVqWPpXDPkllmi4xftzqmr/u1g06vdOJG52JuRjFgCmvsmyRot2y7j 6nR7ycQSx5xqg9/65d7qg0G/M1cv3Tx9xYFJmafZxBUUyQzEche8jyALVpuZazfd StdX7hYNSHzPF3RhRxjFnvKQek4Hw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=cI4MqZyAfjPtoE3kL+ Mk55wGcfRZNVTTFvnOBAV1jF8=; b=GF/HRN4CCUu5YeiJgLEVwsEfq5Vh5S0Wut 12IYo6SXXjKL9wBO8+ru8k9ankf3rNDyKpzfm8nbH8D5xj1YsytUOwwR1iwyejYJ kCRbWJW405rAceBmfqvN3eVC3Hg4jl9ggdRF+30WQabmp2TElomDljG4xiakDRHO 9Sra0EK8L1NLAepxFC7DJipcwgeGsSkphSGMu+EgTqNIK++2b6BmFFvk0gyo+pnu MMI4VIcru5X6zopDCvUseBvif44n28RMfYKojqTrn4EuDC/iS1v+K5Jj1uPvukId EP6jGV/sEhpzmsDsVsxNFmAyTDXOCKiqSy28WT+6oSR/FnBkAX8Q== X-ME-Sender: X-Sasl-enc: 1uWnTxySCextQ2Z6c/6PE9i57QJ87HqhCxM4U6QedBHS 1491408442 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id B8F8A24718; Wed, 5 Apr 2017 12:07:22 -0400 (EDT) From: Marius Bakke In-Reply-To: <20170404214649.12074-1-kei@openmailbox.org> References: <20170404214649.12074-1-kei@openmailbox.org> User-Agent: Notmuch/0.24.1 (https://notmuchmail.org) Emacs/25.1.1 (x86_64-unknown-linux-gnu) Date: Wed, 05 Apr 2017 18:07:21 +0200 Message-ID: <87tw62aldy.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain Kei Kebreau writes: > * gnu/packages/audacity.scm: Remove file and move audacity... > * gnu/packages/audio.scm: ...here. > * gnu/local.mk: Remove reference to removed file. LGTM; the copyright header is already present in audio.scm, and audacity.scm is not referred to from anywhere else. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAljlFjkACgkQoqBt8qM6 VPqkgwf8DTqGG2p0jF/RkpO4t+P1OV2wkfwzwOyq1IGCpVM06BITG9WhICL6VJKa Z5nFhAANTl5hpF1GQrZecbZAa1TPU4sxB+1olvEXIQIFv57hLkBJqrOg8my7AUFL 2k7Oqmt/Fkf/lmN8u1hMue6nThSb5AA9zsn3voGXq7OD0iK6qaqa8bOLb2ODkblz wso3gtbYsnWu5cf/C/hJFmBRdeHN8qtM26IDd2uSDLMP5BSwFGxqB5BYDyvAk173 6SEtnA2FASjghZYaJlv6lu62Z5L9ocioz6G5JE7Hw/U6BHMdZL45DCxfmKHw0OkS c1irCGsDw8JIGO9RuexRl0j0XM8adw== =VuBA -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Sep 07 14:55:57 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Kei Kebreau Subject: bug#26365: closed (Re: bug#26365: [PATCH] gnu: Move audacity to audio.scm.) Message-ID: References: <8737dm4qq1.fsf@openmailbox.org> <20170404214649.12074-1-kei@openmailbox.org> X-Gnu-PR-Message: they-closed 26365 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 26365@debbugs.gnu.org Date: Wed, 05 Apr 2017 19:09:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1491419342-28157-1" This is a multi-part message in MIME format... ------------=_1491419342-28157-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #26365: [PATCH] gnu: Move audacity to audio.scm. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 26365@debbugs.gnu.org. --=20 26365: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D26365 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1491419342-28157-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 26365-done) by debbugs.gnu.org; 5 Apr 2017 19:08:52 +0000 Received: from localhost ([127.0.0.1]:33991 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cvqIW-0007Jm-Hu for submit@debbugs.gnu.org; Wed, 05 Apr 2017 15:08:52 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:55744 helo=mail.openmailbox.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cvqIS-0007JY-VD for 26365-done@debbugs.gnu.org; Wed, 05 Apr 2017 15:08:49 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id AD33D501C97; Wed, 5 Apr 2017 21:08:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1491419327; bh=SEBFgOjqfF2niETPSiktd1Dlv5MitcSv7qG0XHeYJ9w=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=n2OYgJz8HYa3egmgtGh/KUNzTFZ6K1ExdaEcW/eKbACsw8KBW8167wlCae1y6js3X A83JEiGpU5U2SL1mWsTYw3/7Al0ODvSKcIKu1mUj0mnmDvxs5/AX0mKS4iEV9zhirP VdM7mG7Vru3yiKwxbDp7/hnJ1TG9EZel95QPzVs8= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ZDZR003 X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=NO_RECEIVED,NO_RELAYS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=disabled version=3.4.0 From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1491419324; bh=SEBFgOjqfF2niETPSiktd1Dlv5MitcSv7qG0XHeYJ9w=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=1HUcmlOf3EQkUIeKabjb7V9ukvESMsrd6mD0ehw2F9AhEsSj6MDLUFQ4wh1UHz1BP MxTgfUSUsdvJ0/5bjFIFBrBMuMKPi5pRGazjd2wz5Q3F2TPzz9Q7YPCK0GMHdvIore YTl5n7tOo0kF8VP2q0NFDpQAectuDMY9ArPGHiG0= To: Marius Bakke Subject: Re: bug#26365: [PATCH] gnu: Move audacity to audio.scm. References: <20170404214649.12074-1-kei@openmailbox.org> <87tw62aldy.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> Date: Wed, 05 Apr 2017 15:08:38 -0400 In-Reply-To: <87tw62aldy.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> (Marius Bakke's message of "Wed, 05 Apr 2017 18:07:21 +0200") Message-ID: <8737dm4qq1.fsf@openmailbox.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 26365-done Cc: 26365-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) --=-=-= Content-Type: text/plain Marius Bakke writes: > Kei Kebreau writes: > >> * gnu/packages/audacity.scm: Remove file and move audacity... >> * gnu/packages/audio.scm: ...here. >> * gnu/local.mk: Remove reference to removed file. > > LGTM; the copyright header is already present in audio.scm, and > audacity.scm is not referred to from anywhere else. Pushed to master. Thanks for the review. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAljlQLcACgkQ5qXuPBlG eg1d9Q//Xn9uylrDUHywmbFoHs+eTZcExZxzwC3RZ8bNkX9N9c3f+wgq9jHIH6xr jcPVy1tD6KiW9gg9mnGRpbfMjNDtTI34tYu9AKmvuHbBDUH5kJyZM9d1enjm/ksv nNk9JH2lz9cTzhBBBs+5IRbOcliSe2Y2u775wehBA0I8FdpBkfz0x0EguDiNd0Kp R7cayznYwBWoxWXTH5KkvYTbndNlXtCN+XiymYROSoF8iiWfjauG7hp9LLGQ35n8 Sl3VbH9t5AO8pABR1XWmbZXr0DPemwDIRmJLJ9YoLWiM1F9cMJJQ1ZO8Dlqp/kCL WXEXd2ecJv9eyqzLLWukJyAbhHaCx5RvJHepCXA9dV0DSIf2AzEb4I0ChMkjJBfl zCwY3XZ+5VHXF71EGNU9QTVCgB5BM7oshSoI6pTPdGsLT+fj6gzCenKTX2fhm1gj PjNI84y3m3tCtqdceSDqDVB83vYkZo8Qxm/BiXLB8aoZktAR0Q7FEe5/w3h/+sWa lm2sDzYt3Qe0AHikIujOg0w7gZW6Pz8Q+DyO9rS+XkZJNtKFQe8fluv01ZPWNURw lfgJdNw+z6qHxxHJZgWhaQRcCHaCv/UnZrmQ9AOPVVDrUOX4XPKOP6mmoobXSKSP 8X9tZ7q/MX1AeN9jZQER/qjEyBIH7ZmARSGS1Cr2E9UjsNY/bPA= =vRi6 -----END PGP SIGNATURE----- --=-=-=-- ------------=_1491419342-28157-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 4 Apr 2017 21:47:25 +0000 Received: from localhost ([127.0.0.1]:32886 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cvWIO-0003OL-Pu for submit@debbugs.gnu.org; Tue, 04 Apr 2017 17:47:25 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41401) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cvWIJ-0003O5-PV for submit@debbugs.gnu.org; Tue, 04 Apr 2017 17:47:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cvWIC-0005Tm-T4 for submit@debbugs.gnu.org; Tue, 04 Apr 2017 17:47:14 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:48635) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cvWIC-0005Tg-PO for submit@debbugs.gnu.org; Tue, 04 Apr 2017 17:47:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60580) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cvWIA-0002Xh-C6 for guix-patches@gnu.org; Tue, 04 Apr 2017 17:47:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cvWI6-0005RK-Cx for guix-patches@gnu.org; Tue, 04 Apr 2017 17:47:10 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:57133 helo=mail.openmailbox.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cvWI5-0005Pz-Vi for guix-patches@gnu.org; Tue, 04 Apr 2017 17:47:06 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id C7F7D505510; Tue, 4 Apr 2017 23:47:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1491342423; bh=aBn1QRCmwiLCqawPAqoXm72RIvAyNmFG7caZpqKmrpY=; h=From:To:Cc:Subject:Date:From; b=llx6zOqUWLyAZelE3nYVvvbt3Gl9VPoUUYSI4vfL4Bj7fXhrx1rO5OyAYuhNc/HGY I+JTpIR6fKHekxZZLNFZi5JdbRScIEoP4kIukjOgZuLH64q0G3zmr+w670kQMo9CS4 7BBCseg1HX9L5z062h5tfbgrvlXuSArqI182785Y= From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1491342421; bh=aBn1QRCmwiLCqawPAqoXm72RIvAyNmFG7caZpqKmrpY=; h=From:To:Cc:Subject:Date:From; b=eQDRX1FAwMw9qozHVjItg3mrZ5K4zEIqYPBVmG0c3jSUabg6KXnUxA5ifiCf3P7R2 zmme6nV/9bu857YmoYCRXkE6zAx7hiPWrZ7PfollVgLHO/W4gwHGPPBcvIU/TloSr4 OBzNx+DvSCQpQliGAKCRFYAkJowjiJUoIYYalV6s= To: guix-patches@gnu.org Subject: [PATCH] gnu: Move audacity to audio.scm. Date: Tue, 4 Apr 2017 17:46:49 -0400 Message-Id: <20170404214649.12074-1-kei@openmailbox.org> X-Mailer: git-send-email 2.12.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit Cc: Kei Kebreau X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) * 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 diff --git a/gnu/local.mk b/gnu/local.mk index 969bcefeb..f54ab2a45 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -53,7 +53,6 @@ GNU_SYSTEM_MODULES =3D \ %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 1ef5048f9..000000000 --- a/gnu/packages/audacity.scm +++ /dev/null @@ -1,112 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright =C2=A9 2015 Taylan Ulrich Bay=C4=B1rl=C4=B1/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 (a= t -;;; 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 fa= ils to - ;; find them. Force their inclusion. - (string-append "ID3TAG_CFLAGS=3D-I" libid3tag "/include") - (string-append "ID3TAG_LIBS=3D-L" libid3tag "/lib -lid3tag -lz= ") - (string-append "LIBMAD_CFLAGS=3D-I" libmad "/include") - (string-append "LIBMAD_LIBS=3D-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 develo= pers, - ;; 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, pla= ying -and editing digital audio. It features digital effects and spectrum ana= lysis -tools.") - (license license:gpl2+))) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index d9fdd6c6b..9dc679734 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -75,6 +75,7 @@ #: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 @@ record, edit, mix and master audio and MIDI projects= . It is targeted at audio engineers, musicians, soundtrack editors and composers.") (license license:gpl2+))) =20 +(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 fa= ils to + ;; find them. Force their inclusion. + (string-append "ID3TAG_CFLAGS=3D-I" libid3tag "/include") + (string-append "ID3TAG_LIBS=3D-L" libid3tag "/lib -lid3tag -lz= ") + (string-append "LIBMAD_CFLAGS=3D-I" libmad "/include") + (string-append "LIBMAD_LIBS=3D-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 develo= pers, + ;; 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, pla= ying +and editing digital audio. It features digital effects and spectrum ana= lysis +tools.") + (license license:gpl2+))) + (define-public azr3 (package (name "azr3") --=20 2.12.2 ------------=_1491419342-28157-1--