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.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

5 files changed, 18 insertions, 12 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/Manifest b/media-video/mplayer/Manifest
index b36340ab4914..42c37719e57c 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,5 +1,5 @@
-AUX mplayer-1.0_rc2_p20090322-fix-mp3lib-use-local-labels.patch 984 RMD160 8cd43ba4841036f6f8b19605144a8ed5f60065c1 SHA1 faa72c210ccff43b164d69f1e5996600c64a52d2 SHA256 cc87fe132e4494ab1131411a8f342d5589fedd017e227df2fe723686829011c8
 AUX mplayer-1.0_rc2_p20090322-fix-undeclared-spudec.patch 689 RMD160 a2a26ad4129bcfb4330ed6f1ee35e6ee1b73fb0d SHA1 918dee2cdff42297376d1afcb9eb9cff6f6f4094 SHA256 54b129ae19a1728981fef5530ba12828f163079201bb479afba7a74d4425e847
+AUX mplayer-1.0_rc2_p20090530-fix-mp3lib-use-local-labels-2.patch 986 RMD160 4ff6e06c604c3d609d1f4cbdd560577d89f3eabc SHA1 cf26d0c5a6b5ab9a36864cfdfb34106e2676ab2f SHA256 63e43820838365fec77e53d7f2b70091045b350c5c4e7c304c5ca692c20551d7
 AUX mplayer-1.0_rc2_p27725-libx264.patch 785 RMD160 ecbe6e80be98458af0723df6190c52f1e94b862d SHA1 b23ffc9c9563ad026f66ae57a402161be3e8031d SHA256 df837dd739a197e4ab1b7b5121e8e77e6dabc0cc1f53801b9fe6492f28974b47
 AUX mplayer-1.0_rc2_p28058-demux_vqf.patch 2222 RMD160 394776659e36a977916b1058e8db79ad3071fb62 SHA1 87840e958b4a243f15f0626ac788a8c88cfa8600 SHA256 f06d102c1302f513c811d4b442f7e79bb1e6b2261b0fe8113dfe40e003531a4d
 AUX mplayer-libavcodec.patch 318 RMD160 2cc02e45e4c6831f307e0f3aeeaddb9417a443cd SHA1 86bb180e36f520587194b95a34ffe1e3aa3c8741 SHA256 0958056c5e04c8e5f4506385b864af568522d92cc8a9ba762f022bf312023753
@@ -14,9 +14,9 @@ DIST mplayer-1.0_rc2_p20090530.tar.bz2 8207308 RMD160 d76dc6475fdd2892190f900d2d
 DIST mplayer-1.0_rc2_p28450.tar.bz2 8159720 RMD160 3c287a1cc63cc82c686abbe985fa4c46e0541fe3 SHA1 97e286c033a6c514a008a017b8bdd3d2e4327036 SHA256 6e8fb85fcf02161d265a7a081ba17df25fd1dd75f2714f97b240e08a8aa67131
 DIST svgalib_helper-1.9.17-mplayer.tar.bz2 7234 RMD160 e0c4ae039478732404dd743e250e1061cc9cf0a4 SHA1 d2d596f1ddd283188b2990417d22903c0b466d25 SHA256 016edd27d74b5c66481ddb4563c961fbb579e3a95dd846cc857a639df09999e5
 EBUILD mplayer-1.0_rc2_p20090226.ebuild 19095 RMD160 b5897bfb47e8dee7648d0c89aa930e07218b3123 SHA1 aa856fe07ff4def84ded3a871d97b08c903885db SHA256 6482db3ac3ebf58df1a32fcdd49d567856e3880989c811bce439606824468a2f
-EBUILD mplayer-1.0_rc2_p20090322.ebuild 19450 RMD160 3ebcbd8d592405c5b676ba6a8435f568ce066e12 SHA1 73e1248b2fd7dc453402818b9bf20280f5fb0da9 SHA256 f84d490abe43ea7fb7dcf9d38db64021e71fc743eb70825ee4985ae8819d1441
-EBUILD mplayer-1.0_rc2_p20090530.ebuild 19360 RMD160 8dbdbe6c618924fddb7f5ad09ea2c7708c631341 SHA1 df2a857e0a791e41be16f90c0df8a90232966ab7 SHA256 c149eedbd31333c14a685d166472175cb568795996b477a24f4c61d9e6f39f49
+EBUILD mplayer-1.0_rc2_p20090322.ebuild 19391 RMD160 100eacde0024a3f9b85ac8d6eb4c37f13543ffa9 SHA1 217ed4265b7b210bf2a866a8c9b1cf253dc4fa28 SHA256 49ce32caf0fb65a393429ee3cde66eb4a8ed4c4a8b7a2a29cef9efabaf7a9354
+EBUILD mplayer-1.0_rc2_p20090530.ebuild 19309 RMD160 319e9c4dddea3e0d920d0ddf24b40000a96cb949 SHA1 0782bbf4bd9933062208027b5f89fc56fb7b3c4c SHA256 3d6fbe30b93caa4d6833f9a62dd6b13f393929fdacd89cf5234464aa9f31944d
 EBUILD mplayer-1.0_rc2_p28450.ebuild 17831 RMD160 c7fd84a242b9a58b86b9c64a248881d4cab204c7 SHA1 dfb6668cc9058dcf43f89892228f3d476c3987e6 SHA256 fbdaf08ad41c436fe22c6829e4553f425d47ab07ac95d29d721570258825c90e
 EBUILD mplayer-9999.ebuild 19730 RMD160 549891baa484265bd962eded5da388c9fb344fd0 SHA1 18dee386f81b718d736a6f3444c580b9cc41b43a SHA256 9549c45c0668f0b6522a72d69f268cfc5a4f000d83de2b104843d994c197bf73
-MISC ChangeLog 113269 RMD160 daad6b6238ea138d6efc398eea5ce7ebffd3de1a SHA1 df938bc8055efef7dda0849271bfaf6c33aca35f SHA256 8e4d41bbcb1951918c44b40c3302b37206390558f47be2eda33170e8b29a6224
+MISC ChangeLog 113699 RMD160 a1432c365b898934ebe3b55dd1c74cf4d64491db SHA1 7ece3b2161fc0350ef4d278e850775f39b72524f SHA256 9eea838e9c856ac0211b70a9fe40a1fd9fee16eb51a25be5337d74354d51bc5e
 MISC metadata.xml 3684 RMD160 4f44b7003c5e28bbc42263a103d8aa280c7ba14a SHA1 51d846e40fb6e1ec93372a102d127cf5760a401a SHA256 558422f6a79736a0888ad2500e534b1b5c18fc5af1879543ebb007be7d1050c7
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() {