Modify fix-mp3lib-use-local-labels to use jump 0b and 1b instead of 0 and 1 wrt #271906, thanks to Luca Barbato. Remove the broken patch from old version.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

4 files changed, 14 insertions, 8 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 7d3a097af4e0..e81808cbe47f 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.641 2009/06/02 17:43:43 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.642 2009/06/03 00:06:21 ssuominen Exp $
+
+  03 Jun 2009; Samuli Suominen <ssuominen@gentoo.org>
+  mplayer-1.0_rc2_p20090322.ebuild, mplayer-1.0_rc2_p20090530.ebuild,
+  -files/mplayer-1.0_rc2_p20090322-fix-mp3lib-use-local-labels.patch,
+  +files/mplayer-1.0_rc2_p20090530-fix-mp3lib-use-local-labels-2.patch:
+  Modify fix-mp3lib-use-local-labels to use jump 0b and 1b instead of 0 and
+  1 wrt #271906, thanks to Luca Barbato. Remove the broken patch from old
+  version.
 
   02 Jun 2009; Steve Dibb <beandog@gentoo.org> mplayer-9999.ebuild:
   Fix skin SRC_URI; Display live ebuild einfo only on live ebuild
diff --git a/media-video/mplayer/files/mplayer-1.0_rc2_p20090322-fix-mp3lib-use-local-labels.patch b/media-video/mplayer/files/mplayer-1.0_rc2_p20090530-fix-mp3lib-use-local-labels-2.patch
index a41835760c43..be56a445085b 100644
--- a/media-video/mplayer/files/mplayer-1.0_rc2_p20090322-fix-mp3lib-use-local-labels.patch
+++ b/media-video/mplayer/files/mplayer-1.0_rc2_p20090530-fix-mp3lib-use-local-labels-2.patch
@@ -16,7 +16,7 @@ Index: mp3lib/decode_mmx.c
  
  	"decl %0\n\t"
 -        "jnz  .L03\n\t"
-+        "jnz  0\n\t"
++        "jnz  0b\n\t"
  
          "movq  (%1),%%mm0\n\t"
          "pmaddwd (%2),%%mm0\n\t"
@@ -34,7 +34,7 @@ Index: mp3lib/decode_mmx.c
          "add $8,%3\n\t"
          "decl %0\n\t"
 -	"jnz  .L04\n\t"
-+	"jnz  1\n\t"
++	"jnz  1b\n\t"
  
          "movq  (%1),%%mm0\n\t"
          "pmaddwd (%2),%%mm0\n\t"
diff --git a/media-video/mplayer/mplayer-1.0_rc2_p20090322.ebuild b/media-video/mplayer/mplayer-1.0_rc2_p20090322.ebuild
index 5193bd41df86..653eaa272ab6 100644
--- a/media-video/mplayer/mplayer-1.0_rc2_p20090322.ebuild
+++ b/media-video/mplayer/mplayer-1.0_rc2_p20090322.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p20090322.ebuild,v 1.6 2009/06/02 13:59:50 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p20090322.ebuild,v 1.7 2009/06/03 00:06:21 ssuominen Exp $
 
 EAPI="1"
 
@@ -234,7 +234,6 @@ src_unpack() {
 	[[ -n ${LINGUAS} ]] && sed -e 's:Zarządano:Zażądano:' -i help/help_mp-pl.h
 
 	epatch "${FILESDIR}"/${P}-fix-undeclared-spudec.patch
-	epatch "${FILESDIR}"/${P}-fix-mp3lib-use-local-labels.patch
 }
 
 src_compile() {
diff --git a/media-video/mplayer/mplayer-1.0_rc2_p20090530.ebuild b/media-video/mplayer/mplayer-1.0_rc2_p20090530.ebuild
index 7e1c37796d4d..5f91e010287b 100644
--- a/media-video/mplayer/mplayer-1.0_rc2_p20090530.ebuild
+++ b/media-video/mplayer/mplayer-1.0_rc2_p20090530.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p20090530.ebuild,v 1.7 2009/06/02 13:59:50 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p20090530.ebuild,v 1.8 2009/06/03 00:06:21 ssuominen Exp $
 
 EAPI="2"
 
@@ -233,8 +233,7 @@ src_unpack() {
 		mv "${WORKDIR}/svgalib_helper" "${S}/libdha"
 	fi
 
-# This patch breaks MP3 playing entirely, wrt #271906
-#	epatch "${FILESDIR}"/${PN}-1.0_rc2_p20090322-fix-mp3lib-use-local-labels.patch
+	epatch "${FILESDIR}"/${PN}-1.0_rc2_p20090530-fix-mp3lib-use-local-labels-2.patch
 }
 
 src_configure() {