Added a better patch to fix mp3 header thanks to Heikki Orsila <heikki.orsila@iki.fi>. Closes bug #114473.

(Portage version: 2.0.53)

5 files changed, 94 insertions, 13 deletions

diff --git a/media-plugins/xmms-mad/ChangeLog b/media-plugins/xmms-mad/ChangeLog
index 783c7fa4ea3b..afa730e1fd0b 100644
--- a/media-plugins/xmms-mad/ChangeLog
+++ b/media-plugins/xmms-mad/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/xmms-mad
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-mad/ChangeLog,v 1.39 2005/04/15 00:14:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-mad/ChangeLog,v 1.40 2005/12/05 22:32:21 metalgod Exp $
+
+*xmms-mad-0.8-r1 (05 Dec 2005)
+
+  05 Dec 2005; Luis Medinas <metalgod@gentoo.org>
+  +files/xmms-mad-0.8-mp3-header.patch, +xmms-mad-0.8-r1.ebuild:
+  Added a better patch to fix mp3 header thanks to Heikki Orsila
+  <heikki.orsila@iki.fi>. Closes bug #114473.
 
   15 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
   -xmms-mad-0.5.6-r1.ebuild, -xmms-mad-0.7.ebuild:
diff --git a/media-plugins/xmms-mad/Manifest b/media-plugins/xmms-mad/Manifest
index 224229b96f66..46333755a9f6 100644
--- a/media-plugins/xmms-mad/Manifest
+++ b/media-plugins/xmms-mad/Manifest
@@ -1,15 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 fd8ac321f4ba9055382804e5e956fe9d ChangeLog 5717
-MD5 05ab4d4775083f0930841e415df18ad6 metadata.xml 160
-MD5 5c64e095db682235fe51b946799dc0f2 xmms-mad-0.8.ebuild 822
 MD5 fd47546527740710d5314aff9bc28f6e files/digest-xmms-mad-0.8 64
+MD5 fd47546527740710d5314aff9bc28f6e files/digest-xmms-mad-0.8-r1 64
 MD5 a67a8be5b9a6f622f7edea90002e7bf7 files/xmms-mad-0.5.6-mp3header.patch 448
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCXwd9ArHZZzCEUG0RArEbAJsFKYjTYiMXtv7G8O8u4j5ZIYv0vQCcDoYB
-LvcpSNIlzNsX9+2+uhRCiLE=
-=phAD
------END PGP SIGNATURE-----
+MD5 302fc0b4331d282a51ef5d1bcbbcecf9 files/xmms-mad-0.8-mp3-header.patch 1547
+MD5 05ab4d4775083f0930841e415df18ad6 metadata.xml 160
+MD5 a869b962a6adda8137e7523dc5858b55 xmms-mad-0.8-r1.ebuild 816
+MD5 5c64e095db682235fe51b946799dc0f2 xmms-mad-0.8.ebuild 822
diff --git a/media-plugins/xmms-mad/files/digest-xmms-mad-0.8-r1 b/media-plugins/xmms-mad/files/digest-xmms-mad-0.8-r1
new file mode 100644
index 000000000000..41b5b0cfeece
--- /dev/null
+++ b/media-plugins/xmms-mad/files/digest-xmms-mad-0.8-r1
@@ -0,0 +1 @@
+MD5 9013cd4d924209ce74a682dda771d087 xmms-mad-0.8.tar.gz 315069
diff --git a/media-plugins/xmms-mad/files/xmms-mad-0.8-mp3-header.patch b/media-plugins/xmms-mad/files/xmms-mad-0.8-mp3-header.patch
new file mode 100644
index 000000000000..bea8e118d28b
--- /dev/null
+++ b/media-plugins/xmms-mad/files/xmms-mad-0.8-mp3-header.patch
@@ -0,0 +1,47 @@
+diff -urp xmms-mad-0.8-org/src/xmms-mad.c xmms-mad-0.8/src/xmms-mad.c
+--- xmms-mad-0.8-org/src/xmms-mad.c	2005-12-04 23:18:21.000000000 +0200
++++ xmms-mad-0.8/src/xmms-mad.c	2005-12-04 23:34:53.000000000 +0200
+@@ -76,6 +76,31 @@ xmmsmad_set_eq (int on, float preamp, fl
+   //printf("set_eq\n");
+ }
+ 
++
++/* Following mp3 header check has been copied from XMMS mp3 input plugin. */
++static int mpg123_head_check(unsigned char *buffer)
++{
++  unsigned int head = (buffer[0] << 24) + (buffer[1] << 16) + (buffer[2] << 8) + buffer[3];
++  if ((head & 0xffe00000) != 0xffe00000)
++    return FALSE;
++  if (!((head >> 17) & 3))
++    return FALSE;
++  if (((head >> 12) & 0xf) == 0xf)
++    return FALSE;
++  if (!((head >> 12) & 0xf))
++    return FALSE;
++  if (((head >> 10) & 0x3) == 0x3)
++    return FALSE;
++  if (((head >> 19) & 1) == 1 &&
++      ((head >> 17) & 3) == 3 &&
++      ((head >> 16) & 1) == 1)
++    return FALSE;
++  if ((head & 0xffff0000) == 0xfffe0000)
++    return FALSE;
++  return TRUE;
++}
++
++
+ static int
+ xmmsmad_is_our_file (char *filename)
+ {
+@@ -96,9 +121,8 @@ xmmsmad_is_our_file (char *filename)
+       fin = open (filename, O_RDONLY);
+       if (fin >= 0 && read (fin, check, 4) == 4)
+ 	{
+-	  /* If first two bytes are a sync header or three bytes are "ID3" */
+-	  if ( (check[0] == 0xff && (check[1] & 0x70) == 0x70) 
+-	       || memcmp (check, "ID3", 3) == 0) 
++	  /* If first 4 bytes are a sync header or three bytes are "ID3" */
++	  if (mpg123_head_check(check) || memcmp (check, "ID3", 3) == 0) 
+ 	    {
+ 	      rtn = 1;
+ 	    }
diff --git a/media-plugins/xmms-mad/xmms-mad-0.8-r1.ebuild b/media-plugins/xmms-mad/xmms-mad-0.8-r1.ebuild
new file mode 100644
index 000000000000..f45ad6269f5c
--- /dev/null
+++ b/media-plugins/xmms-mad/xmms-mad-0.8-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-mad/xmms-mad-0.8-r1.ebuild,v 1.1 2005/12/05 22:32:21 metalgod Exp $
+
+inherit eutils
+
+DESCRIPTION="A XMMS plugin for MAD"
+HOMEPAGE="http://xmms-mad.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xmms-mad/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 -mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="media-sound/xmms
+	 media-libs/libid3tag
+	 media-libs/libmad"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-mp3-header.patch
+	touch configure
+}
+
+src_install() {
+	exeinto `xmms-config --input-plugin-dir`
+	doexe src/.libs/libxmmsmad.so || die
+	dodoc AUTHORS ChangeLog NEWS README
+}