diff options
| author | Stanislav Brabec <utx@penguin.cz> | 2009-05-26 19:03:43 +0000 |
|---|---|---|
| committer | utx@penguin.cz <utx@penguin.cz> | 2009-05-26 19:03:43 +0000 |
| commit | 09e27e7990ab6e72cd117eb9f2f6184ae2f7edbe (patch) | |
| tree | 07403a83d4dfe4bd6aee01486eb721e606912d5d /recipes/flac | |
| parent | 3ac37564039127c80eb5cf109fddf23a8e438bf8 (diff) | |
flac: Fixed build. Added printf format fix.
Diffstat (limited to 'recipes/flac')
| -rw-r--r-- | recipes/flac/files/flac-gcc43-fixes.diff | 10 | ||||
| -rw-r--r-- | recipes/flac/files/flac-printf-format-fix.diff | 43 | ||||
| -rw-r--r-- | recipes/flac/flac_1.2.1.bb | 6 |
3 files changed, 58 insertions, 1 deletions
diff --git a/recipes/flac/files/flac-gcc43-fixes.diff b/recipes/flac/files/flac-gcc43-fixes.diff new file mode 100644 index 0000000000..8d41490975 --- /dev/null +++ b/recipes/flac/files/flac-gcc43-fixes.diff @@ -0,0 +1,10 @@ +--- examples/cpp/encode/file/main.cpp-dist 2007-10-22 15:14:12.000000000 +0200 ++++ examples/cpp/encode/file/main.cpp 2007-10-22 15:14:41.000000000 +0200 +@@ -30,6 +30,7 @@ + + #include <stdio.h> + #include <stdlib.h> ++#include <string.h> + #include "FLAC++/metadata.h" + #include "FLAC++/encoder.h" + diff --git a/recipes/flac/files/flac-printf-format-fix.diff b/recipes/flac/files/flac-printf-format-fix.diff new file mode 100644 index 0000000000..2296cdbe91 --- /dev/null +++ b/recipes/flac/files/flac-printf-format-fix.diff @@ -0,0 +1,43 @@ +--- src/test_grabbag/cuesheet/main.c-dist 2007-04-10 19:14:42.000000000 +0200 ++++ src/test_grabbag/cuesheet/main.c 2007-04-10 19:15:33.000000000 +0200 +@@ -115,12 +115,12 @@ int main(int argc, char *argv[]) + const char *usage = "usage: test_cuesheet cuesheet_file lead_out_offset [ cdda ]\n"; + + if(argc > 1 && 0 == strcmp(argv[1], "-h")) { +- printf(usage); ++ fputs(usage, stdout); + return 0; + } + + if(argc < 3 || argc > 4) { +- fprintf(stderr, usage); ++ fputs(usage, stderr); + return 255; + } + +@@ -129,7 +129,7 @@ int main(int argc, char *argv[]) + if(0 == strcmp(argv[3], "cdda")) + is_cdda = true; + else { +- fprintf(stderr, usage); ++ fputs(usage, stderr); + return 255; + } + } +--- src/test_grabbag/picture/main.c-dist 2007-04-10 19:15:47.000000000 +0200 ++++ src/test_grabbag/picture/main.c 2007-04-10 19:16:02.000000000 +0200 +@@ -211,12 +211,12 @@ int main(int argc, char *argv[]) + const char *usage = "usage: test_pictures path_prefix\n"; + + if(argc > 1 && 0 == strcmp(argv[1], "-h")) { +- printf(usage); ++ fputs(usage, stdout); + return 0; + } + + if(argc != 2) { +- fprintf(stderr, usage); ++ fputs(usage, stderr); + return 255; + } + diff --git a/recipes/flac/flac_1.2.1.bb b/recipes/flac/flac_1.2.1.bb index 94f24fc169..eea1cbb9a5 100644 --- a/recipes/flac/flac_1.2.1.bb +++ b/recipes/flac/flac_1.2.1.bb @@ -1,3 +1,7 @@ require flac.inc -PR = "r0" +PR = "r1" + +# fixes from openSUSE: +SRC_URI += "file://flac-gcc43-fixes.diff;patch=1;pnum=0 \ + file://flac-printf-format-fix.diff;patch=1;pnum=0" |