From: Kei Kebreau <kei@openmailbox.org>
To: Marius Bakke <mbakke@fastmail.com>
Cc: 26343@debbugs.gnu.org
Subject: bug#26343: [PATCH] gnu: audacity: Update to 2.1.3.
Date: Sun, 02 Apr 2017 21:48:20 -0400 [thread overview]
Message-ID: <87pogu45y3.fsf@openmailbox.org> (raw)
In-Reply-To: <87y3viv55d.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> (Marius Bakke's message of "Mon, 03 Apr 2017 00:03:26 +0200")
[-- Attachment #1: Type: text/plain, Size: 5041 bytes --]
Marius Bakke <mbakke@fastmail.com> writes:
> Kei Kebreau <kei@openmailbox.org> writes:
>
>> * gnu/packages/audacity.scm (audacity): Update to 2.1.3.
>> [source]: Fetch gzipped tar archive instead of a zip archive; add
>> snippet to remove time-dependent code; remove unnecessary patch.
>> [native-inputs]: Add autoconf, automake and libtool.
>> [arguments]: Add autoreconf phase to detect system libraries.
>> * gnu/packages/patches/audacity-fix-ffmpeg-binding.patch: Delete patch.
>> * gnu/local.mk: Remove reference to removed patch.
>> ---
>> gnu/local.mk | 1 -
>> gnu/packages/audacity.scm | 25 +++++++++++++----
>> .../patches/audacity-fix-ffmpeg-binding.patch | 32 ----------------------
>> 3 files changed, 20 insertions(+), 38 deletions(-)
>> delete mode 100644 gnu/packages/patches/audacity-fix-ffmpeg-binding.patch
>>
>> diff --git a/gnu/local.mk b/gnu/local.mk
>> index 68f561e95..f03f50855 100644
>> --- a/gnu/local.mk
>> +++ b/gnu/local.mk
>> @@ -494,7 +494,6 @@ dist_patch_DATA = \
>> %D%/packages/patches/ath9k-htc-firmware-binutils.patch \
>> %D%/packages/patches/ath9k-htc-firmware-gcc.patch \
>> %D%/packages/patches/ath9k-htc-firmware-objcopy.patch \
>> - %D%/packages/patches/audacity-fix-ffmpeg-binding.patch \
>> %D%/packages/patches/automake-skip-amhello-tests.patch \
>> %D%/packages/patches/automake-regexp-syntax.patch \
>> %D%/packages/patches/automake-test-gzip-warning.patch \
>> diff --git a/gnu/packages/audacity.scm b/gnu/packages/audacity.scm
>> index a70d0e3a6..a4ac2a6ff 100644
>> --- a/gnu/packages/audacity.scm
>> +++ b/gnu/packages/audacity.scm
>> @@ -23,6 +23,7 @@
>> #: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)
>> @@ -39,15 +40,20 @@
>> (define-public audacity
>> (package
>> (name "audacity")
>> - (version "2.1.2")
>> + (version "2.1.3")
>> (source
>> (origin
>> (method url-fetch)
>> (uri (string-append "https://github.com/audacity/audacity/archive"
>> - "/Audacity-" version ".zip"))
>> + "/Audacity-" version ".tar.gz"))
>> (sha256
>> - (base32 "1642i9d5cdmqzj6r0qdl2ldnqsvpb08znnczncysi72x6zpvb5qq"))
>> - (patches (search-patches "audacity-fix-ffmpeg-binding.patch"))))
>> + (base32 "11mx7gb4dbqrgfp7hm0154x3m76ddnmhf2675q5zkxn7jc5qfc6b"))
>> + ;; Replace time-dependent strings.
>> + (modules '((guix build utils)))
>> + (snippet
>> + '(substitute* "src/AboutDialog.cpp"
>> + (("__DATE__") "\"2017\"")
>> + (("__TIME__") "\"00:00\"")))))
>
> Now that we're merging core-updates where GCC have been patched to
> respect SOURCE_DATE_EPOCH in these macros, this substitution should no
> longer be necessary. Can you verify? :)
>
It works! \o/
>> (build-system gnu-build-system)
>> (inputs
>> ;; TODO: Add portSMF and libwidgetextra once they're packaged. In-tree
>> @@ -73,7 +79,10 @@
>> ("lilv" ,lilv)
>> ("portaudio" ,portaudio)))
>> (native-inputs
>> - `(("gettext" ,gettext-minimal) ;for msgfmt
>> + `(("autoconf" ,autoconf)
>> + ("automake" ,automake)
>> + ("gettext" ,gettext-minimal) ;for msgfmt
>> + ("libtool" ,libtool)
>> ("pkg-config" ,pkg-config)
>> ("python" ,python-2)
>> ("which" ,which)))
>> @@ -90,6 +99,12 @@
>> (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
>> + ;; Ensure the usage of system libraries.
>> + (add-before 'configure 'autoreconf
>> + (lambda _
>> + (zero? (system* "autoreconf" "-vfi")))))
>
> Can you clarify how autoreconf ensures usage of system libraries?
> Usually it just re-generates configure scripts and Makefiles from
> templates, but should not make any functional difference.
>
> Thanks!
FFmpeg is not detected if autoreconf doesn't run for some reason. With
this phase, everything is detected like normal.
Also, the audacityteam.org URL leads to another webpage with a seemingly
impermanent link to the tarball*. I get the following:
https://download.fosshub.com/Protected/expiretime=1491206292;badurl=aHR0cDovL3d3dy5mb3NzaHViLmNvbS9BdWRhY2l0eS5odG1s/c9aee3215609f12a03856bbf4732fa9ddcaf0424361dc96c6919a3b6543265bb/Audacity/audacity-minsrc-2.1.3.tar.xz
* Take a look at the following thread to see what happened last time
with this topic. I'm not getting the 403 errors that I was getting
before though:
https://lists.gnu.org/archive/html/guix-devel/2017-01/msg01093.html
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
next prev parent reply other threads:[~2017-04-03 1:49 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-02 15:52 bug#26343: [PATCH] gnu: audacity: Update to 2.1.3 Kei Kebreau
2017-04-02 22:03 ` Marius Bakke
2017-04-02 22:07 ` Marius Bakke
2017-04-03 1:48 ` Kei Kebreau [this message]
2017-04-03 12:40 ` Marius Bakke
2017-04-03 15:52 ` Kei Kebreau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87pogu45y3.fsf@openmailbox.org \
--to=kei@openmailbox.org \
--cc=26343@debbugs.gnu.org \
--cc=mbakke@fastmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).