diff options
| author | Jason Self <j@jxself.org> | 2014-07-14 20:22:28 -0700 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-07-15 22:42:42 +0200 |
| commit | 399fdcf75c55e6d3cc5587313ead5930a5945b3a (patch) | |
| tree | 23da272b2e00d0ad2526b4428c605a0f7b2c6124 /gnu | |
| parent | 49d91de7635adfd269d0108def2df70e2c1832d6 (diff) | |
gnu: flac: Upgrade to 1.3.0.
* 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 <j@jxself.org>
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/patches/flac-fix-memcmp-not-declared.patch | 13 | ||||
| -rw-r--r-- | gnu/packages/xiph.scm | 8 |
2 files changed, 3 insertions, 18 deletions
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 9dd5c81ba5d..00000000000 --- a/gnu/packages/patches/flac-fix-memcmp-not-declared.patch +++ /dev/null | |||
| @@ -1,13 +0,0 @@ | |||
| 1 | See http://sourceforge.net/p/flac/bugs/364/ | ||
| 2 | |||
| 3 | diff -Naur flac-1.2.1-orig/examples/cpp/encode/file/main.cpp flac-1.2.1-ae/examples/cpp/encode/file/main.cpp | ||
| 4 | --- flac-1.2.1-orig/examples/cpp/encode/file/main.cpp 2012-12-27 20:15:11.000000000 +0100 | ||
| 5 | +++ flac-1.2.1-ae/examples/cpp/encode/file/main.cpp 2012-12-27 20:25:01.000000000 +0100 | ||
| 6 | @@ -30,6 +30,7 @@ | ||
| 7 | |||
| 8 | #include <stdio.h> | ||
| 9 | #include <stdlib.h> | ||
| 10 | +#include <string.h> | ||
| 11 | #include "FLAC++/metadata.h" | ||
| 12 | #include "FLAC++/encoder.h" | ||
| 13 | |||
diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index 03cf0e49d29..6df16e366f7 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm | |||
| @@ -192,16 +192,14 @@ OpenBSD's sndio.") | |||
| 192 | (define flac | 192 | (define flac |
| 193 | (package | 193 | (package |
| 194 | (name "flac") | 194 | (name "flac") |
| 195 | (version "1.2.1") | 195 | (version "1.3.0") |
| 196 | (source (origin | 196 | (source (origin |
| 197 | (method url-fetch) | 197 | (method url-fetch) |
| 198 | (uri (string-append "http://downloads.xiph.org/releases/flac/flac-" | 198 | (uri (string-append "http://downloads.xiph.org/releases/flac/flac-" |
| 199 | version ".tar.gz")) | 199 | version ".tar.xz")) |
| 200 | (sha256 | 200 | (sha256 |
| 201 | (base32 | 201 | (base32 |
| 202 | "1pry5lgzfg57pga1zbazzdd55fkgk3v5qy4axvrbny5lrr5s8dcn")) | 202 | "1p0hh190kqvpkbk1bbajd81jfbmkyl4fn2i7pggk2zppq6m68bgs")))) |
| 203 | (patches | ||
| 204 | (list (search-patch "flac-fix-memcmp-not-declared.patch"))))) | ||
| 205 | (build-system gnu-build-system) | 203 | (build-system gnu-build-system) |
| 206 | (arguments | 204 | (arguments |
| 207 | `(#:parallel-tests? #f | 205 | `(#:parallel-tests? #f |
