1 |
ssuominen 09/06/03 00:06:22 |
2 |
|
3 |
Modified: ChangeLog mplayer-1.0_rc2_p20090530.ebuild |
4 |
mplayer-1.0_rc2_p20090322.ebuild |
5 |
Log: |
6 |
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. |
7 |
(Portage version: 2.1.6.13/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.642 media-video/mplayer/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.642&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.642&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.641&r2=1.642 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v |
19 |
retrieving revision 1.641 |
20 |
retrieving revision 1.642 |
21 |
diff -u -r1.641 -r1.642 |
22 |
--- ChangeLog 2 Jun 2009 17:43:43 -0000 1.641 |
23 |
+++ ChangeLog 3 Jun 2009 00:06:21 -0000 1.642 |
24 |
@@ -1,6 +1,14 @@ |
25 |
# ChangeLog for media-video/mplayer |
26 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.641 2009/06/02 17:43:43 beandog Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.642 2009/06/03 00:06:21 ssuominen Exp $ |
29 |
+ |
30 |
+ 03 Jun 2009; Samuli Suominen <ssuominen@g.o> |
31 |
+ mplayer-1.0_rc2_p20090322.ebuild, mplayer-1.0_rc2_p20090530.ebuild, |
32 |
+ -files/mplayer-1.0_rc2_p20090322-fix-mp3lib-use-local-labels.patch, |
33 |
+ +files/mplayer-1.0_rc2_p20090530-fix-mp3lib-use-local-labels-2.patch: |
34 |
+ Modify fix-mp3lib-use-local-labels to use jump 0b and 1b instead of 0 and |
35 |
+ 1 wrt #271906, thanks to Luca Barbato. Remove the broken patch from old |
36 |
+ version. |
37 |
|
38 |
02 Jun 2009; Steve Dibb <beandog@g.o> mplayer-9999.ebuild: |
39 |
Fix skin SRC_URI; Display live ebuild einfo only on live ebuild |
40 |
|
41 |
|
42 |
|
43 |
1.8 media-video/mplayer/mplayer-1.0_rc2_p20090530.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p20090530.ebuild?rev=1.8&view=markup |
46 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p20090530.ebuild?rev=1.8&content-type=text/plain |
47 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p20090530.ebuild?r1=1.7&r2=1.8 |
48 |
|
49 |
Index: mplayer-1.0_rc2_p20090530.ebuild |
50 |
=================================================================== |
51 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p20090530.ebuild,v |
52 |
retrieving revision 1.7 |
53 |
retrieving revision 1.8 |
54 |
diff -u -r1.7 -r1.8 |
55 |
--- mplayer-1.0_rc2_p20090530.ebuild 2 Jun 2009 13:59:50 -0000 1.7 |
56 |
+++ mplayer-1.0_rc2_p20090530.ebuild 3 Jun 2009 00:06:21 -0000 1.8 |
57 |
@@ -1,6 +1,6 @@ |
58 |
# Copyright 1999-2009 Gentoo Foundation |
59 |
# Distributed under the terms of the GNU General Public License v2 |
60 |
-# $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 $ |
61 |
+# $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 $ |
62 |
|
63 |
EAPI="2" |
64 |
|
65 |
@@ -233,8 +233,7 @@ |
66 |
mv "${WORKDIR}/svgalib_helper" "${S}/libdha" |
67 |
fi |
68 |
|
69 |
-# This patch breaks MP3 playing entirely, wrt #271906 |
70 |
-# epatch "${FILESDIR}"/${PN}-1.0_rc2_p20090322-fix-mp3lib-use-local-labels.patch |
71 |
+ epatch "${FILESDIR}"/${PN}-1.0_rc2_p20090530-fix-mp3lib-use-local-labels-2.patch |
72 |
} |
73 |
|
74 |
src_configure() { |
75 |
|
76 |
|
77 |
|
78 |
1.7 media-video/mplayer/mplayer-1.0_rc2_p20090322.ebuild |
79 |
|
80 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p20090322.ebuild?rev=1.7&view=markup |
81 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p20090322.ebuild?rev=1.7&content-type=text/plain |
82 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p20090322.ebuild?r1=1.6&r2=1.7 |
83 |
|
84 |
Index: mplayer-1.0_rc2_p20090322.ebuild |
85 |
=================================================================== |
86 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p20090322.ebuild,v |
87 |
retrieving revision 1.6 |
88 |
retrieving revision 1.7 |
89 |
diff -u -r1.6 -r1.7 |
90 |
--- mplayer-1.0_rc2_p20090322.ebuild 2 Jun 2009 13:59:50 -0000 1.6 |
91 |
+++ mplayer-1.0_rc2_p20090322.ebuild 3 Jun 2009 00:06:21 -0000 1.7 |
92 |
@@ -1,6 +1,6 @@ |
93 |
# Copyright 1999-2009 Gentoo Foundation |
94 |
# Distributed under the terms of the GNU General Public License v2 |
95 |
-# $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 $ |
96 |
+# $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 $ |
97 |
|
98 |
EAPI="1" |
99 |
|
100 |
@@ -234,7 +234,6 @@ |
101 |
[[ -n ${LINGUAS} ]] && sed -e 's:Zarządano:Zażądano:' -i help/help_mp-pl.h |
102 |
|
103 |
epatch "${FILESDIR}"/${P}-fix-undeclared-spudec.patch |
104 |
- epatch "${FILESDIR}"/${P}-fix-mp3lib-use-local-labels.patch |
105 |
} |
106 |
|
107 |
src_compile() { |