From 399fdcf75c55e6d3cc5587313ead5930a5945b3a Mon Sep 17 00:00:00 2001 From: Jason Self Date: Mon, 14 Jul 2014 20:22:28 -0700 Subject: [PATCH] gnu: flac: Upgrade to 1.3.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xiph.scm (flac): Update to version 1.3.0. Remove 'patches' field. * gnu/packages/patches/flac-fix-memcmp-not-declared.patch: Remove. * gnu-system.am (dist_patch_DATA): Adjust accordingly. Signed-off-by: Jason Self Signed-off-by: Ludovic Courtès --- gnu-system.am | 1 - .../patches/flac-fix-memcmp-not-declared.patch | 13 ------------- gnu/packages/xiph.scm | 8 +++----- 3 files changed, 3 insertions(+), 19 deletions(-) delete mode 100644 gnu/packages/patches/flac-fix-memcmp-not-declared.patch diff --git a/gnu-system.am b/gnu-system.am index 22bb4ef70d..7d2fbcce89 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -297,7 +297,6 @@ dist_patch_DATA = \ gnu/packages/patches/doxygen-tmake.patch \ gnu/packages/patches/emacs-configure-sh.patch \ gnu/packages/patches/findutils-absolute-paths.patch \ - gnu/packages/patches/flac-fix-memcmp-not-declared.patch \ gnu/packages/patches/flex-bison-tests.patch \ gnu/packages/patches/gawk-shell.patch \ gnu/packages/patches/gcc-cross-environment-variables.patch \ diff --git a/gnu/packages/patches/flac-fix-memcmp-not-declared.patch b/gnu/packages/patches/flac-fix-memcmp-not-declared.patch deleted file mode 100644 index 9dd5c81ba5..0000000000 --- a/gnu/packages/patches/flac-fix-memcmp-not-declared.patch +++ /dev/null @@ -1,13 +0,0 @@ -See http://sourceforge.net/p/flac/bugs/364/ - -diff -Naur flac-1.2.1-orig/examples/cpp/encode/file/main.cpp flac-1.2.1-ae/examples/cpp/encode/file/main.cpp ---- flac-1.2.1-orig/examples/cpp/encode/file/main.cpp 2012-12-27 20:15:11.000000000 +0100 -+++ flac-1.2.1-ae/examples/cpp/encode/file/main.cpp 2012-12-27 20:25:01.000000000 +0100 -@@ -30,6 +30,7 @@ - - #include - #include -+#include - #include "FLAC++/metadata.h" - #include "FLAC++/encoder.h" - diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index 03cf0e49d2..6df16e366f 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -192,16 +192,14 @@ OpenBSD's sndio.") (define flac (package (name "flac") - (version "1.2.1") + (version "1.3.0") (source (origin (method url-fetch) (uri (string-append "http://downloads.xiph.org/releases/flac/flac-" - version ".tar.gz")) + version ".tar.xz")) (sha256 (base32 - "1pry5lgzfg57pga1zbazzdd55fkgk3v5qy4axvrbny5lrr5s8dcn")) - (patches - (list (search-patch "flac-fix-memcmp-not-declared.patch"))))) + "1p0hh190kqvpkbk1bbajd81jfbmkyl4fn2i7pggk2zppq6m68bgs")))) (build-system gnu-build-system) (arguments `(#:parallel-tests? #f