1 |
ssuominen 10/04/29 17:08:12 |
2 |
|
3 |
Modified: ChangeLog mplayer-1.0_rc4_p20100427.ebuild |
4 |
mplayer-9999.ebuild |
5 |
Log: |
6 |
Fix liba52 handling wrt #317797 by Simone Scanzoni. |
7 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.734 media-video/mplayer/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.734&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.734&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.733&r2=1.734 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v |
19 |
retrieving revision 1.733 |
20 |
retrieving revision 1.734 |
21 |
diff -u -r1.733 -r1.734 |
22 |
--- ChangeLog 28 Apr 2010 17:40:50 -0000 1.733 |
23 |
+++ ChangeLog 29 Apr 2010 17:08:12 -0000 1.734 |
24 |
@@ -1,6 +1,10 @@ |
25 |
# ChangeLog for media-video/mplayer |
26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.733 2010/04/28 17:40:50 ssuominen Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.734 2010/04/29 17:08:12 ssuominen Exp $ |
29 |
+ |
30 |
+ 29 Apr 2010; Samuli Suominen <ssuominen@g.o> |
31 |
+ mplayer-1.0_rc4_p20100427.ebuild, mplayer-9999.ebuild: |
32 |
+ Fix liba52 handling wrt #317797 by Simone Scanzoni. |
33 |
|
34 |
28 Apr 2010; Samuli Suominen <ssuominen@g.o> |
35 |
mplayer-1.0_rc4_p20100427.ebuild, mplayer-9999.ebuild: |
36 |
|
37 |
|
38 |
|
39 |
1.4 media-video/mplayer/mplayer-1.0_rc4_p20100427.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20100427.ebuild?rev=1.4&view=markup |
42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20100427.ebuild?rev=1.4&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20100427.ebuild?r1=1.3&r2=1.4 |
44 |
|
45 |
Index: mplayer-1.0_rc4_p20100427.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20100427.ebuild,v |
48 |
retrieving revision 1.3 |
49 |
retrieving revision 1.4 |
50 |
diff -u -r1.3 -r1.4 |
51 |
--- mplayer-1.0_rc4_p20100427.ebuild 28 Apr 2010 17:40:50 -0000 1.3 |
52 |
+++ mplayer-1.0_rc4_p20100427.ebuild 29 Apr 2010 17:08:12 -0000 1.4 |
53 |
@@ -1,6 +1,6 @@ |
54 |
# Copyright 1999-2010 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20100427.ebuild,v 1.3 2010/04/28 17:40:50 ssuominen Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20100427.ebuild,v 1.4 2010/04/29 17:08:12 ssuominen Exp $ |
58 |
|
59 |
EAPI="2" |
60 |
|
61 |
@@ -38,7 +38,7 @@ |
62 |
if [[ ${PV} == *9999* ]]; then |
63 |
RELEASE_URI="" |
64 |
else |
65 |
- RELEASE_URI="http://dev.gentoo.org/~ssuominen/${P}.tar.bz2" |
66 |
+ RELEASE_URI="mirror://gentoo/${P}.tar.bz2" |
67 |
fi |
68 |
SRC_URI="${RELEASE_URI} |
69 |
!truetype? ( ${FONT_URI} ) |
70 |
@@ -321,10 +321,6 @@ |
71 |
# |
72 |
# internal dvdread and dvdnav use flags enable internal |
73 |
# versions of the libraries, which are snapshots of the fork. |
74 |
- # |
75 |
- # Only check for disabled a52 use flag inside the DVD check, |
76 |
- # since many users were getting confused why there was no |
77 |
- # audio stream. |
78 |
|
79 |
if use dvd; then |
80 |
use dvdnav || myconf+=" --disable-dvdnav" |
81 |
@@ -335,7 +331,6 @@ |
82 |
--disable-dvdread-internal |
83 |
--disable-libdvdcss-internal |
84 |
" |
85 |
- use a52 || myconf+=" --disable-liba52-internal" |
86 |
fi |
87 |
|
88 |
############# |
89 |
@@ -399,6 +394,7 @@ |
90 |
########## |
91 |
# Won't work with external liba52 |
92 |
myconf+=" --disable-liba52" |
93 |
+ use a52 && myconf+=" --enable-liba52-internal" |
94 |
# Use internal musepack codecs for SV7 and SV8 support |
95 |
myconf+=" --disable-musepack" |
96 |
|
97 |
|
98 |
|
99 |
|
100 |
1.54 media-video/mplayer/mplayer-9999.ebuild |
101 |
|
102 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.54&view=markup |
103 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.54&content-type=text/plain |
104 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.53&r2=1.54 |
105 |
|
106 |
Index: mplayer-9999.ebuild |
107 |
=================================================================== |
108 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v |
109 |
retrieving revision 1.53 |
110 |
retrieving revision 1.54 |
111 |
diff -u -r1.53 -r1.54 |
112 |
--- mplayer-9999.ebuild 28 Apr 2010 17:40:50 -0000 1.53 |
113 |
+++ mplayer-9999.ebuild 29 Apr 2010 17:08:12 -0000 1.54 |
114 |
@@ -1,6 +1,6 @@ |
115 |
# Copyright 1999-2010 Gentoo Foundation |
116 |
# Distributed under the terms of the GNU General Public License v2 |
117 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.53 2010/04/28 17:40:50 ssuominen Exp $ |
118 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.54 2010/04/29 17:08:12 ssuominen Exp $ |
119 |
|
120 |
EAPI="2" |
121 |
|
122 |
@@ -321,10 +321,6 @@ |
123 |
# |
124 |
# internal dvdread and dvdnav use flags enable internal |
125 |
# versions of the libraries, which are snapshots of the fork. |
126 |
- # |
127 |
- # Only check for disabled a52 use flag inside the DVD check, |
128 |
- # since many users were getting confused why there was no |
129 |
- # audio stream. |
130 |
|
131 |
if use dvd; then |
132 |
use dvdnav || myconf+=" --disable-dvdnav" |
133 |
@@ -335,7 +331,6 @@ |
134 |
--disable-dvdread-internal |
135 |
--disable-libdvdcss-internal |
136 |
" |
137 |
- use a52 || myconf+=" --disable-liba52-internal" |
138 |
fi |
139 |
|
140 |
############# |
141 |
@@ -399,6 +394,7 @@ |
142 |
########## |
143 |
# Won't work with external liba52 |
144 |
myconf+=" --disable-liba52" |
145 |
+ use a52 && myconf+=" --enable-liba52-internal" |
146 |
# Use internal musepack codecs for SV7 and SV8 support |
147 |
myconf+=" --disable-musepack" |