Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-video/mplayer/files: mplayer-1.0_rc2_p20090530-fix-mp3lib-use-local-labels-2.patch mplayer-1.0_rc2_p20090322-fix-mp3lib-use-local-labels.patch
Date: Wed, 03 Jun 2009 00:06:35
Message-Id: E1MBdzq-0007GL-Gr@stork.gentoo.org
1 ssuominen 09/06/03 00:06:22
2
3 Added:
4 mplayer-1.0_rc2_p20090530-fix-mp3lib-use-local-labels-2.patch
5 Removed:
6 mplayer-1.0_rc2_p20090322-fix-mp3lib-use-local-labels.patch
7 Log:
8 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.
9 (Portage version: 2.1.6.13/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.1 media-video/mplayer/files/mplayer-1.0_rc2_p20090530-fix-mp3lib-use-local-labels-2.patch
13
14 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/files/mplayer-1.0_rc2_p20090530-fix-mp3lib-use-local-labels-2.patch?rev=1.1&view=markup
15 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/files/mplayer-1.0_rc2_p20090530-fix-mp3lib-use-local-labels-2.patch?rev=1.1&content-type=text/plain
16
17 Index: mplayer-1.0_rc2_p20090530-fix-mp3lib-use-local-labels-2.patch
18 ===================================================================
19 Index: mp3lib/decode_mmx.c
20 ===================================================================
21 --- mp3lib/decode_mmx.c (revision 29321)
22 +++ mp3lib/decode_mmx.c (working copy)
23 @@ -219,7 +219,7 @@
24 //printf("DEBUG: channel %d, bo %d, off %d\n", channel, bo, 16 - bo1);
25 __asm__ volatile(
26 ASMALIGN(4)
27 -".L03:\n\t"
28 +"0:\n\t"
29 "movq (%1),%%mm0\n\t"
30 "movq 64(%1),%%mm4\n\t"
31 "pmaddwd (%2),%%mm0\n\t"
32 @@ -265,7 +265,7 @@
33 "add $8,%3\n\t"
34
35 "decl %0\n\t"
36 - "jnz .L03\n\t"
37 + "jnz 0b\n\t"
38
39 "movq (%1),%%mm0\n\t"
40 "pmaddwd (%2),%%mm0\n\t"
41 @@ -291,7 +291,7 @@
42
43 "movl $7,%0\n\t"
44 ASMALIGN(4)
45 -".L04:\n\t"
46 +"1:\n\t"
47 "movq (%1),%%mm0\n\t"
48 "movq 64(%1),%%mm4\n\t"
49 "pmaddwd (%2),%%mm0\n\t"
50 @@ -340,7 +340,7 @@
51 "add $128,%1\n\t"
52 "add $8,%3\n\t"
53 "decl %0\n\t"
54 - "jnz .L04\n\t"
55 + "jnz 1b\n\t"
56
57 "movq (%1),%%mm0\n\t"
58 "pmaddwd (%2),%%mm0\n\t"