diff options
Diffstat (limited to 'media-libs/libid3tag/files/0.15.1b')
8 files changed, 0 insertions, 196 deletions
diff --git a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-64bit-long.patch b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-64bit-long.patch deleted file mode 100644 index bb320c7aa70b..000000000000 --- a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-64bit-long.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/id3tag.h -+++ b/id3tag.h -@@ -25,6 +25,8 @@ - # ifndef LIBID3TAG_ID3TAG_H - # define LIBID3TAG_ID3TAG_H - -+#include <stdint.h> -+ - # ifdef __cplusplus - extern "C" { - # endif -@@ -36,10 +38,10 @@ - typedef unsigned char id3_byte_t; - typedef unsigned long id3_length_t; - --typedef unsigned long id3_ucs4_t; -+typedef uint32_t id3_ucs4_t; - - typedef unsigned char id3_latin1_t; --typedef unsigned short id3_utf16_t; -+typedef uint16_t id3_utf16_t; - typedef signed char id3_utf8_t; - - struct id3_tag { diff --git a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-a_capella.patch b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-a_capella.patch deleted file mode 100644 index e196cb4df269..000000000000 --- a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-a_capella.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/genre.dat -+++ b/genre.dat -@@ -277,8 +277,8 @@ - { 'P', 'u', 'n', 'k', ' ', 'R', 'o', 'c', 'k', 0 }; - static id3_ucs4_t const genre_DRUM_SOLO[] = - { 'D', 'r', 'u', 'm', ' ', 'S', 'o', 'l', 'o', 0 }; --static id3_ucs4_t const genre_A_CAPPELLA[] = -- { 'A', ' ', 'C', 'a', 'p', 'p', 'e', 'l', 'l', 'a', 0 }; -+static id3_ucs4_t const genre_A_CAPELLA[] = -+ { 'A', ' ', 'C', 'a', 'p', 'e', 'l', 'l', 'a', 0 }; - static id3_ucs4_t const genre_EURO_HOUSE[] = - { 'E', 'u', 'r', 'o', '-', 'H', 'o', 'u', 's', 'e', 0 }; - static id3_ucs4_t const genre_DANCE_HALL[] = -@@ -452,7 +452,7 @@ - genre_DUET, - genre_PUNK_ROCK, - genre_DRUM_SOLO, -- genre_A_CAPPELLA, -+ genre_A_CAPELLA, - genre_EURO_HOUSE, - genre_DANCE_HALL, - genre_GOA, ---- a/genre.dat.in -+++ b/genre.dat.in -@@ -153,7 +153,7 @@ - Duet - Punk Rock - Drum Solo --A Cappella -+A Capella - Euro-House - Dance Hall - Goa diff --git a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-compat.patch b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-compat.patch deleted file mode 100644 index 6ef1a22d5a64..000000000000 --- a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-compat.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ur libid3tag-0.15.1b/compat.gperf libid3tag-0.15.1b.fixed/compat.gperf ---- libid3tag-0.15.1b/compat.gperf Fri Jan 23 01:41:32 2004 -+++ libid3tag-0.15.1b.fixed/compat.gperf Thu Oct 19 12:21:10 2006 -@@ -237,6 +237,9 @@ - encoding = id3_parse_uint(&data, 1); - string = id3_parse_string(&data, end - data, encoding, 0); - -+ if (string == 0) -+ continue; -+ - if (id3_ucs4_length(string) < 4) { - free(string); - continue; diff --git a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-file-write.patch b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-file-write.patch deleted file mode 100644 index aa61d09f8748..000000000000 --- a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-file-write.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -ur -x '*.lo' -x '*.o' -x config.h -x config.log libid3tag-0.15.1b/file.c libid3tag-0.15.1b-fixed/file.c ---- libid3tag-0.15.1b/file.c 2004-01-23 12:41:32.000000000 +0300 -+++ libid3tag-0.15.1b-fixed/file.c 2005-05-24 23:34:08.000000000 +0400 -@@ -37,6 +37,10 @@ - # include <assert.h> - # endif - -+# ifdef HAVE_SYS_STAT_H -+# include <sys/stat.h> -+# endif -+ - # include "id3tag.h" - # include "file.h" - # include "tag.h" -@@ -575,6 +579,10 @@ - int v2_write(struct id3_file *file, - id3_byte_t const *data, id3_length_t length) - { -+ struct stat st; -+ char *buffer; -+ id3_length_t datalen, offset; -+ - assert(!data || length > 0); - - if (data && -@@ -592,9 +600,25 @@ - } - - /* hard general case: rewrite entire file */ -+ if (stat(file->path, &st) == -1) -+ return -1; - -- /* ... */ -+ offset = file->tags ? file->tags[0].length : 0; -+ datalen = st.st_size - offset; -+ if ((buffer = (char *) malloc(datalen)) == NULL) -+ return -1; - -+ if (fseek(file->iofile, offset, SEEK_SET) == -1 || -+ fread(buffer, datalen, 1, file->iofile) != 1 || -+ fseek(file->iofile, 0, SEEK_SET) == -1 || -+ fwrite(data, length, 1, file->iofile) != 1 || -+ fwrite(buffer, datalen, 1, file->iofile) != 1 || -+ fflush(file->iofile) == EOF) { -+ free(buffer); -+ return -1; -+ } -+ free(buffer); -+ - done: - return 0; - } diff --git a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-fix_overflow.patch b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-fix_overflow.patch deleted file mode 100644 index 5e0a1f60e7aa..000000000000 --- a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-fix_overflow.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/field.c -+++ b/field.c -@@ -291,7 +291,7 @@ - - end = *ptr + length; - -- while (end - *ptr > 0) { -+ while (end - *ptr > 0 && **ptr != '\0') { - ucs4 = id3_parse_string(ptr, end - *ptr, *encoding, 0); - if (ucs4 == 0) - goto fail; diff --git a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-tag.patch b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-tag.patch deleted file mode 100644 index 4d13e47018c7..000000000000 --- a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-tag.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/tag.c -+++ b/tag.c -@@ -714,9 +714,12 @@ - - frame = id3_tag_findframe(tag, ID3_FRAME_TRACK, 0); - if (frame) { -- unsigned int track; -+ id3_ucs4_t const *string; -+ unsigned int track = 0; - -- track = id3_ucs4_getnumber(id3_field_getstrings(&frame->fields[1], 0)); -+ string = id3_field_getstrings(&frame->fields[1], 0); -+ if (string) -+ track = id3_ucs4_getnumber(string); - if (track > 0 && track <= 0xff) { - ptr[-2] = 0; - ptr[-1] = track; diff --git a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-unknown-encoding.patch b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-unknown-encoding.patch deleted file mode 100644 index 91b3d2a5eb06..000000000000 --- a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-unknown-encoding.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/compat.gperf -+++ b/compat.gperf -@@ -236,6 +236,10 @@ - - encoding = id3_parse_uint(&data, 1); - string = id3_parse_string(&data, end - data, encoding, 0); -+ if (!string) -+ { -+ continue; -+ } - - if (string == 0) - continue; ---- a/parse.c -+++ b/parse.c -@@ -165,6 +165,9 @@ - case ID3_FIELD_TEXTENCODING_UTF_8: - ucs4 = id3_utf8_deserialize(ptr, length); - break; -+ default: -+ /* FIXME: Unknown encoding! Print warning? */ -+ return NULL; - } - - if (ucs4 && !full) { diff --git a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-utf16.patchlibid3tag-0.15.1b-utf16.patch b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-utf16.patchlibid3tag-0.15.1b-utf16.patch deleted file mode 100644 index e2e6eaeb6dfe..000000000000 --- a/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-utf16.patchlibid3tag-0.15.1b-utf16.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- libid3tag-0.15.1b/utf16.c -+++ libid3tag-0.15.1b/utf16.c -@@ -282,5 +282,18 @@ - - free(utf16); - -+ if (end == *ptr && length % 2 != 0) -+ { -+ /* We were called with a bogus length. It should always -+ * be an even number. We can deal with this in a few ways: -+ * - Always give an error. -+ * - Try and parse as much as we can and -+ * - return an error if we're called again when we -+ * already tried to parse everything we can. -+ * - tell that we parsed it, which is what we do here. -+ */ -+ (*ptr)++; -+ } -+ - return ucs4; - } |