Better fix for libid3tag pkg-config file handling.

11 files changed, 288 insertions, 0 deletions

diff --git a/media-libs/libid3tag/Manifest b/media-libs/libid3tag/Manifest
new file mode 100644
index 0000000..732047b
--- /dev/null
+++ b/media-libs/libid3tag/Manifest
@@ -0,0 +1,11 @@
+AUX 0.15.1b/libid3tag-0.15.1b-64bit-long.patch 567 RMD160 b045933419998fb569f5be661b03e7bc5d862003 SHA1 f9778590811a050384b9bf8827345b61999f0da3 SHA256 5f8b3d3419addf90977832b0a6e563acc2c8e243bb826ebb6d0ec573ec122e1b
+AUX 0.15.1b/libid3tag-0.15.1b-a_capella.patch 1303 RMD160 538f0dd11797a47f9e2d8219f8ee67d00afe991f SHA1 f4c4a728e7e36b6396c5b4d5841728b89e6f2fe7 SHA256 5e86270ebb179d82acee686700d203e90f42e82beeed455b0163d8611657d395
+AUX 0.15.1b/libid3tag-0.15.1b-compat.patch 452 RMD160 e8a422004935e18c2217c9ac623d4895c17ad471 SHA1 8c179b10bf49385e4334aab141e4cf270cb02182 SHA256 88f486c3d263a4dd5bb556232dcfe2fba175b5124bcdd72aa6c30f562fc87d53
+AUX 0.15.1b/libid3tag-0.15.1b-file-write.patch 1344 RMD160 4f3179f4164559a64339ceaa522b6643d999332d SHA1 b7baae1c87f90aac64a4d17725b2eaad521e42af SHA256 eff855cabd8a51866a29246a1b257da64f46aab72d4b8e163e2a4c0d15165bf1
+AUX 0.15.1b/libid3tag-0.15.1b-fix_overflow.patch 324 RMD160 d6ecbbb97a76872791447102da61748b1ccdca7a SHA1 ed80bc74bd81caa225952f72a1a28d54300e43e3 SHA256 43ea3e0b324fb25802dae6410564c947ce1982243c781ef54b023f060c3b0ac4
+AUX 0.15.1b/libid3tag-0.15.1b-tag.patch 527 RMD160 5ec862828df4fe66e47047f135d2b52aba285a29 SHA1 b7ef9a41a31a37b8bb6d8e064b0c0ba618d3fa03 SHA256 ca7262ddad158ab0be804429d705f8c6a1bb120371dec593323fa4876c1b277f
+AUX 0.15.1b/libid3tag-0.15.1b-unknown-encoding.patch 879 RMD160 c4b4ac0a7d013fe06075ae7ebb7b7a9f93805159 SHA1 093def535edb3d2f5be6b173eedf0f93a1c0314c SHA256 8b695c9c05e3885655b2e798326b804011615bc6c831cd55cdbacc456a6b9494
+AUX 0.15.1b/libid3tag-0.15.1b-utf16.patchlibid3tag-0.15.1b-utf16.patch 583 RMD160 1232e4208b883575f6faabc6f11831264e8af0c9 SHA1 daf621e8123530fdab5193099031074666fc7330 SHA256 487d0c531f3653f8e754d720729cf1cec1bce6e897b845fa61adaaf2668d1568
+AUX 0.15.1b/libid3tag-pkg-config.patch 1001 RMD160 1e107ef195b44c234709f18fd477b2aa6884f370 SHA1 6749adc4c364b3cb4c013e14dba817e40dcf571e SHA256 88e303a209ea2a66dc260a9f34232bbd329522011a85e79e4b7efb6547b4d54e
+DIST libid3tag-0.15.1b.tar.gz 338143 RMD160 31a69b8ad7684aefdb675acc8ebf89bd6f432095 SHA1 4d867e8a8436e73cd7762fe0e85958e35f1e4306 SHA256 63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151
+EBUILD libid3tag-0.15.1b-r2.ebuild 989 RMD160 5bfc724f5b82e2f478f0dff5c5a951bf2d74f0d8 SHA1 03e5e86a203111edf903810516fdaf6fd0b6fd5a SHA256 bdc5ddce40c18cab2908b3fb9b8b342aadaf32b654571ef4315b19ec37eb65d3
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
new file mode 100644
index 0000000..852d9ef
--- /dev/null
+++ b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-64bit-long.patch
@@ -0,0 +1,24 @@
+--- id3tag.h.orig	2004-01-23 18:22:46.000000000 -0500
++++ id3tag.h	2008-05-04 19:46:33.000000000 -0400
+@@ -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
new file mode 100644
index 0000000..2adc2e6
--- /dev/null
+++ b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-a_capella.patch
@@ -0,0 +1,35 @@
+diff -urNad /home/debian/mad/libid3tag-0.15.1b/libid3tag-0.15.1b/genre.dat libid3tag-0.15.1b/genre.dat
+--- a/libid3tag-0.15.1b/genre.dat	2004-02-16 21:34:39.000000000 -0500
++++ b/libid3tag-0.15.1b/genre.dat	2004-09-06 09:50:33.000000000 -0400
+@@ -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,
+diff -urNad /home/debian/mad/libid3tag-0.15.1b/libid3tag-0.15.1b/genre.dat.in libid3tag-0.15.1b/genre.dat.in
+--- a/libid3tag-0.15.1b/genre.dat.in	2004-01-23 04:41:32.000000000 -0500
++++ b/libid3tag-0.15.1b/genre.dat.in	2004-09-06 09:50:33.000000000 -0400
+@@ -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
new file mode 100644
index 0000000..6ef1a22
--- /dev/null
+++ b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-compat.patch
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 0000000..aa61d09
--- /dev/null
+++ b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-file-write.patch
@@ -0,0 +1,52 @@
+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
new file mode 100644
index 0000000..26c54c5
--- /dev/null
+++ b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-fix_overflow.patch
@@ -0,0 +1,11 @@
+--- field.c.orig	2008-05-05 09:49:15.000000000 -0400
++++ field.c	2008-05-05 09:49:25.000000000 -0400
+@@ -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
new file mode 100644
index 0000000..2badfb3
--- /dev/null
+++ b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-tag.patch
@@ -0,0 +1,17 @@
+--- tag.c.orig	Fri Apr 18 18:14:33 2003
++++ tag.c	Mon Sep 26 22:29:24 2005
+@@ -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
new file mode 100644
index 0000000..7c70d00
--- /dev/null
+++ b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-unknown-encoding.patch
@@ -0,0 +1,27 @@
+diff -urNad libid3tag-0.15.1b~/compat.gperf libid3tag-0.15.1b/compat.gperf
+--- libid3tag-0.15.1b~/compat.gperf	2004-01-23 09:41:32.000000000 +0000
++++ libid3tag-0.15.1b/compat.gperf	2007-01-14 14:36:53.000000000 +0000
+@@ -236,6 +236,10 @@
+ 
+     encoding = id3_parse_uint(&data, 1);
+     string   = id3_parse_string(&data, end - data, encoding, 0);
++    if (!string)
++    {
++	continue;
++    }
+ 
+     if (id3_ucs4_length(string) < 4) {
+       free(string);
+diff -urNad libid3tag-0.15.1b~/parse.c libid3tag-0.15.1b/parse.c
+--- libid3tag-0.15.1b~/parse.c	2004-01-23 09:41:32.000000000 +0000
++++ libid3tag-0.15.1b/parse.c	2007-01-14 14:37:34.000000000 +0000
+@@ -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
new file mode 100644
index 0000000..e2e6eae
--- /dev/null
+++ b/media-libs/libid3tag/files/0.15.1b/libid3tag-0.15.1b-utf16.patchlibid3tag-0.15.1b-utf16.patch
@@ -0,0 +1,21 @@
+--- 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;
+ }
diff --git a/media-libs/libid3tag/files/0.15.1b/libid3tag-pkg-config.patch b/media-libs/libid3tag/files/0.15.1b/libid3tag-pkg-config.patch
new file mode 100644
index 0000000..3b89f29
--- /dev/null
+++ b/media-libs/libid3tag/files/0.15.1b/libid3tag-pkg-config.patch
@@ -0,0 +1,35 @@
+--- /dev/null	2009-07-02 12:43:53.540375369 +0200
++++ id3tag.pc.in	2009-07-02 16:19:21.000000000 +0200
+@@ -0,0 +1,11 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: id3tag
++Description: ID3 tag reading library
++Requires:
++Version: @VERSION@
++Libs: -L${libdir} -lid3tag -lz
++Cflags: -I${includedir}
+--- Makefile.am	2004-02-17 03:11:28.000000000 +0100
++++ Makefile.am.new	2009-07-02 16:17:35.000000000 +0200
+@@ -94,6 +94,9 @@
+ 
+ BUILT_SOURCES =		frametype.c compat.c genre.dat
+ 
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = id3tag.pc
++
+ $(srcdir)/frametype.c: $(srcdir)/frametype.gperf Makefile.am
+ 	cd $(srcdir) &&  \
+ 	gperf -tCcTonD -K id -N id3_frametype_lookup -s -3 -k '*'  \
+--- configure.ac	2004-01-24 00:22:46.000000000 +0100
++++ configure.ac.new	2009-07-02 16:19:00.000000000 +0200
+@@ -201,5 +201,5 @@
+ dnl AC_SUBST(LTLIBOBJS)
+ 
+ AC_CONFIG_FILES([Makefile msvc++/Makefile  \
+-	libid3tag.list])
++	libid3tag.list id3tag.pc])
+ AC_OUTPUT
diff --git a/media-libs/libid3tag/libid3tag-0.15.1b-r2.ebuild b/media-libs/libid3tag/libid3tag-0.15.1b-r2.ebuild
new file mode 100644
index 0000000..4c4fb8a
--- /dev/null
+++ b/media-libs/libid3tag/libid3tag-0.15.1b-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libid3tag/libid3tag-0.15.1b-r2.ebuild,v 1.7 2008/12/07 11:51:40 vapier Exp $
+
+inherit autotools eutils multilib
+
+DESCRIPTION="The MAD id3tag library"
+HOMEPAGE="http://www.underbit.com/products/mad/"
+SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+IUSE="debug"
+
+DEPEND="dev-util/gperf"
+
+RDEPEND="${DEPEND}
+	>=sys-libs/zlib-1.1.3"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epunt_cxx #74489
+
+	epatch "${FILESDIR}/${PV}"/*.patch
+
+	# This is required for the pkg-config file to be
+	# generated.
+	eautoreconf
+}
+
+src_compile() {
+	econf $(use_enable debug debugging) || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die "make install failed"
+
+	dodoc CHANGES CREDITS README TODO VERSION
+}