Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "PaweA Hajdan (phajdan.jr)" <phajdan.jr@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-client/chromium: chromium-27.0.1425.0.ebuild ChangeLog chromium-9999-r1.ebuild
Date: Tue, 05 Mar 2013 01:27:51
Message-Id: 20130305012748.48EA92171D@flycatcher.gentoo.org
1 phajdan.jr 13/03/05 01:27:48
2
3 Modified: chromium-27.0.1425.0.ebuild ChangeLog
4 chromium-9999-r1.ebuild
5 Log:
6 Enable system ffmpeg by default.
7
8 (Portage version: 2.1.11.50/cvs/Linux i686, signed Manifest commit with key 30427902)
9
10 Revision Changes Path
11 1.3 www-client/chromium/chromium-27.0.1425.0.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-27.0.1425.0.ebuild?rev=1.3&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-27.0.1425.0.ebuild?rev=1.3&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-27.0.1425.0.ebuild?r1=1.2&r2=1.3
16
17 Index: chromium-27.0.1425.0.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-27.0.1425.0.ebuild,v
20 retrieving revision 1.2
21 retrieving revision 1.3
22 diff -u -r1.2 -r1.3
23 --- chromium-27.0.1425.0.ebuild 3 Mar 2013 23:46:22 -0000 1.2
24 +++ chromium-27.0.1425.0.ebuild 5 Mar 2013 01:27:48 -0000 1.3
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2013 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-27.0.1425.0.ebuild,v 1.2 2013/03/03 23:46:22 phajdan.jr Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-27.0.1425.0.ebuild,v 1.3 2013/03/05 01:27:48 phajdan.jr Exp $
30
31 EAPI="5"
32 PYTHON_COMPAT=( python{2_6,2_7} )
33 @@ -19,7 +19,7 @@
34 LICENSE="BSD"
35 SLOT="0"
36 KEYWORDS="~amd64 ~x86"
37 -IUSE="bindist cups gnome gnome-keyring gps kerberos pulseaudio selinux system-ffmpeg tcmalloc"
38 +IUSE="cups gnome gnome-keyring gps kerberos pulseaudio selinux tcmalloc"
39
40 # Native Client binaries are compiled with different set of flags, bug #452066.
41 QA_FLAGS_IGNORED=".*\.nexe"
42 @@ -56,7 +56,7 @@
43 media-libs/opus
44 media-libs/speex
45 pulseaudio? ( media-sound/pulseaudio )
46 - system-ffmpeg? ( >=media-video/ffmpeg-1.0[opus] )
47 + >=media-video/ffmpeg-1.0[opus]
48 >=net-libs/libsrtp-1.4.4_p20121108
49 sys-apps/dbus
50 sys-apps/pciutils
51 @@ -112,12 +112,12 @@
52 chromium_suid_sandbox_check_kernel_config
53 fi
54
55 - if use bindist && ! use system-ffmpeg; then
56 - elog "bindist enabled: H.264 video support will be disabled."
57 - fi
58 - if ! use bindist; then
59 - elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
60 - fi
61 + # if use bindist && ! use system-ffmpeg; then
62 + # elog "bindist enabled: H.264 video support will be disabled."
63 + # fi
64 + # if ! use bindist; then
65 + # elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
66 + # fi
67 }
68
69 src_prepare() {
70 @@ -219,6 +219,7 @@
71 myconf+="
72 -Duse_system_bzip2=1
73 -Duse_system_flac=1
74 + -Duse_system_ffmpeg=1
75 -Duse_system_harfbuzz=1
76 -Duse_system_icu=1
77 -Duse_system_jsoncpp=1
78 @@ -238,8 +239,7 @@
79 -Duse_system_speex=1
80 -Duse_system_v8=1
81 -Duse_system_xdg_utils=1
82 - -Duse_system_zlib=1
83 - $(gyp_use system-ffmpeg use_system_ffmpeg)"
84 + -Duse_system_zlib=1"
85
86 # TODO: Use system mesa on x86, bug #457130 .
87 if ! use x86 && ! use arm; then
88 @@ -296,10 +296,10 @@
89 # Always support proprietary codecs.
90 myconf+=" -Dproprietary_codecs=1"
91
92 - if ! use bindist && ! use system-ffmpeg; then
93 - # Enable H.624 support in bundled ffmpeg.
94 - myconf+=" -Dffmpeg_branding=Chrome"
95 - fi
96 + # if ! use bindist && ! use system-ffmpeg; then
97 + # # Enable H.624 support in bundled ffmpeg.
98 + # myconf+=" -Dffmpeg_branding=Chrome"
99 + # fi
100
101 # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
102 # Note: these are for Gentoo use ONLY. For your own distribution,
103 @@ -481,9 +481,9 @@
104 newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
105 newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
106
107 - if ! use system-ffmpeg; then
108 - doexe out/Release/libffmpegsumo.so || die
109 - fi
110 + # if ! use system-ffmpeg; then
111 + # doexe out/Release/libffmpegsumo.so || die
112 + # fi
113
114 # Install icons and desktop entry.
115 local branding size
116
117
118
119 1.827 www-client/chromium/ChangeLog
120
121 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.827&view=markup
122 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.827&content-type=text/plain
123 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?r1=1.826&r2=1.827
124
125 Index: ChangeLog
126 ===================================================================
127 RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v
128 retrieving revision 1.826
129 retrieving revision 1.827
130 diff -u -r1.826 -r1.827
131 --- ChangeLog 4 Mar 2013 20:31:07 -0000 1.826
132 +++ ChangeLog 5 Mar 2013 01:27:48 -0000 1.827
133 @@ -1,6 +1,10 @@
134 # ChangeLog for www-client/chromium
135 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
136 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.826 2013/03/04 20:31:07 floppym Exp $
137 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.827 2013/03/05 01:27:48 phajdan.jr Exp $
138 +
139 + 05 Mar 2013; Pawel Hajdan jr <phajdan.jr@g.o>
140 + chromium-27.0.1425.0.ebuild, chromium-9999-r1.ebuild:
141 + Enable system ffmpeg by default.
142
143 *chromium-25.0.1364.152 (04 Mar 2013)
144
145
146
147
148 1.176 www-client/chromium/chromium-9999-r1.ebuild
149
150 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild?rev=1.176&view=markup
151 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild?rev=1.176&content-type=text/plain
152 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild?r1=1.175&r2=1.176
153
154 Index: chromium-9999-r1.ebuild
155 ===================================================================
156 RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v
157 retrieving revision 1.175
158 retrieving revision 1.176
159 diff -u -r1.175 -r1.176
160 --- chromium-9999-r1.ebuild 3 Mar 2013 23:46:22 -0000 1.175
161 +++ chromium-9999-r1.ebuild 5 Mar 2013 01:27:48 -0000 1.176
162 @@ -1,6 +1,6 @@
163 # Copyright 1999-2013 Gentoo Foundation
164 # Distributed under the terms of the GNU General Public License v2
165 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.175 2013/03/03 23:46:22 phajdan.jr Exp $
166 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.176 2013/03/05 01:27:48 phajdan.jr Exp $
167
168 EAPI="5"
169 PYTHON_COMPAT=( python{2_6,2_7} )
170 @@ -19,7 +19,7 @@
171 LICENSE="BSD"
172 SLOT="live"
173 KEYWORDS=""
174 -IUSE="bindist cups gnome gnome-keyring gps kerberos pulseaudio selinux system-ffmpeg tcmalloc"
175 +IUSE="cups gnome gnome-keyring gps kerberos pulseaudio selinux tcmalloc"
176
177 # Native Client binaries are compiled with different set of flags, bug #452066.
178 QA_FLAGS_IGNORED=".*\.nexe"
179 @@ -56,7 +56,7 @@
180 media-libs/opus
181 media-libs/speex
182 pulseaudio? ( media-sound/pulseaudio )
183 - system-ffmpeg? ( >=media-video/ffmpeg-1.0[opus] )
184 + >=media-video/ffmpeg-1.0[opus]
185 >=net-libs/libsrtp-1.4.4_p20121108
186 sys-apps/dbus
187 sys-apps/pciutils
188 @@ -170,12 +170,12 @@
189 chromium_suid_sandbox_check_kernel_config
190 fi
191
192 - if use bindist && ! use system-ffmpeg; then
193 - elog "bindist enabled: H.264 video support will be disabled."
194 - fi
195 - if ! use bindist; then
196 - elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
197 - fi
198 + # if use bindist && ! use system-ffmpeg; then
199 + # elog "bindist enabled: H.264 video support will be disabled."
200 + # fi
201 + # if ! use bindist; then
202 + # elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
203 + # fi
204 }
205
206 src_prepare() {
207 @@ -278,6 +278,7 @@
208 myconf+="
209 -Duse_system_bzip2=1
210 -Duse_system_flac=1
211 + -Duse_system_ffmpeg=1
212 -Duse_system_harfbuzz=1
213 -Duse_system_icu=1
214 -Duse_system_jsoncpp=1
215 @@ -297,8 +298,7 @@
216 -Duse_system_speex=1
217 -Duse_system_v8=1
218 -Duse_system_xdg_utils=1
219 - -Duse_system_zlib=1
220 - $(gyp_use system-ffmpeg use_system_ffmpeg)"
221 + -Duse_system_zlib=1"
222
223 # TODO: Use system mesa on x86, bug #457130 .
224 if ! use x86 && ! use arm; then
225 @@ -355,10 +355,10 @@
226 # Always support proprietary codecs.
227 myconf+=" -Dproprietary_codecs=1"
228
229 - if ! use bindist && ! use system-ffmpeg; then
230 - # Enable H.624 support in bundled ffmpeg.
231 - myconf+=" -Dffmpeg_branding=Chrome"
232 - fi
233 + # if ! use bindist && ! use system-ffmpeg; then
234 + # # Enable H.624 support in bundled ffmpeg.
235 + # myconf+=" -Dffmpeg_branding=Chrome"
236 + # fi
237
238 # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
239 # Note: these are for Gentoo use ONLY. For your own distribution,
240 @@ -540,9 +540,9 @@
241 newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
242 newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
243
244 - if ! use system-ffmpeg; then
245 - doexe out/Release/libffmpegsumo.so || die
246 - fi
247 + # if ! use system-ffmpeg; then
248 + # doexe out/Release/libffmpegsumo.so || die
249 + # fi
250
251 # Install icons and desktop entry.
252 local branding size
Report Message
Find on MARC Find on Google Groups