1 |
phajdan.jr 10/10/09 14:01:25 |
2 |
|
3 |
Modified: metadata.xml ChangeLog chromium-9999.ebuild |
4 |
Added: chromium-7.0.544.0-r1.ebuild |
5 |
Log: |
6 |
Add optional support for www-plugins/gecko-mediaplayer, as suggested by sandrain in Gentoo Forums. |
7 |
(Portage version: 2.1.8.3/cvs/Linux i686) |
8 |
|
9 |
Revision Changes Path |
10 |
1.10 www-client/chromium/metadata.xml |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/metadata.xml?rev=1.10&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/metadata.xml?rev=1.10&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/metadata.xml?r1=1.9&r2=1.10 |
15 |
|
16 |
Index: metadata.xml |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/metadata.xml,v |
19 |
retrieving revision 1.9 |
20 |
retrieving revision 1.10 |
21 |
diff -u -r1.9 -r1.10 |
22 |
--- metadata.xml 1 Oct 2010 08:34:59 -0000 1.9 |
23 |
+++ metadata.xml 9 Oct 2010 14:00:14 -0000 1.10 |
24 |
@@ -4,6 +4,8 @@ |
25 |
<herd>chromium</herd> |
26 |
<longdescription>Chromium is the open-source web browser project behind Google Chrome</longdescription> |
27 |
<use> |
28 |
+ <flag name="gecko-mediaplayer">Allow the browser to load |
29 |
+ <pkg>www-plugins/gecko-mediaplayer</pkg></flag> |
30 |
<flag name="system-sqlite">Use the system-wide <pkg>dev-db/sqlite</pkg> |
31 |
installation with secure-delete enabled</flag> |
32 |
</use> |
33 |
|
34 |
|
35 |
|
36 |
1.199 www-client/chromium/ChangeLog |
37 |
|
38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.199&view=markup |
39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.199&content-type=text/plain |
40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?r1=1.198&r2=1.199 |
41 |
|
42 |
Index: ChangeLog |
43 |
=================================================================== |
44 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v |
45 |
retrieving revision 1.198 |
46 |
retrieving revision 1.199 |
47 |
diff -u -r1.198 -r1.199 |
48 |
--- ChangeLog 8 Oct 2010 12:11:06 -0000 1.198 |
49 |
+++ ChangeLog 9 Oct 2010 14:00:16 -0000 1.199 |
50 |
@@ -1,6 +1,14 @@ |
51 |
# ChangeLog for www-client/chromium |
52 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
53 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.198 2010/10/08 12:11:06 phajdan.jr Exp $ |
54 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.199 2010/10/09 14:00:16 phajdan.jr Exp $ |
55 |
+ |
56 |
+*chromium-7.0.544.0-r1 (09 Oct 2010) |
57 |
+ |
58 |
+ 09 Oct 2010; Pawel Hajdan jr <phajdan.jr@g.o> |
59 |
+ +files/chromium-gecko-mediaplayer-r0.patch, +chromium-7.0.544.0-r1.ebuild, |
60 |
+ chromium-9999.ebuild, metadata.xml: |
61 |
+ Add optional support for www-plugins/gecko-mediaplayer, as suggested by |
62 |
+ sandrain in Gentoo Forums. |
63 |
|
64 |
*chromium-7.0.517.36 (08 Oct 2010) |
65 |
|
66 |
|
67 |
|
68 |
|
69 |
1.93 www-client/chromium/chromium-9999.ebuild |
70 |
|
71 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999.ebuild?rev=1.93&view=markup |
72 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999.ebuild?rev=1.93&content-type=text/plain |
73 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999.ebuild?r1=1.92&r2=1.93 |
74 |
|
75 |
Index: chromium-9999.ebuild |
76 |
=================================================================== |
77 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v |
78 |
retrieving revision 1.92 |
79 |
retrieving revision 1.93 |
80 |
diff -u -r1.92 -r1.93 |
81 |
--- chromium-9999.ebuild 7 Oct 2010 15:20:09 -0000 1.92 |
82 |
+++ chromium-9999.ebuild 9 Oct 2010 14:00:31 -0000 1.93 |
83 |
@@ -1,6 +1,6 @@ |
84 |
# Copyright 1999-2010 Gentoo Foundation |
85 |
# Distributed under the terms of the GNU General Public License v2 |
86 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.92 2010/10/07 15:20:09 phajdan.jr Exp $ |
87 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.93 2010/10/09 14:00:31 phajdan.jr Exp $ |
88 |
|
89 |
EAPI="2" |
90 |
|
91 |
@@ -15,7 +15,7 @@ |
92 |
LICENSE="BSD" |
93 |
SLOT="0" |
94 |
KEYWORDS="" |
95 |
-IUSE="cups gnome gnome-keyring system-sqlite" |
96 |
+IUSE="cups +gecko-mediaplayer gnome gnome-keyring system-sqlite" |
97 |
|
98 |
RDEPEND="app-arch/bzip2 |
99 |
system-sqlite? ( |
100 |
@@ -49,7 +49,8 @@ |
101 |
) |
102 |
x11-apps/xmessage |
103 |
x11-misc/xdg-utils |
104 |
- virtual/ttf-fonts" |
105 |
+ virtual/ttf-fonts |
106 |
+ gecko-mediaplayer? ( !www-plugins/gecko-mediaplayer[gnome] )" |
107 |
|
108 |
src_unpack() { |
109 |
subversion_src_unpack |
110 |
@@ -113,6 +114,9 @@ |
111 |
# to be upstreamed. |
112 |
epatch "${FILESDIR}"/${PN}-system-icu-r0.patch |
113 |
|
114 |
+ # Enable optional support for gecko-mediaplayer. |
115 |
+ epatch "${FILESDIR}"/${PN}-gecko-mediaplayer-r0.patch |
116 |
+ |
117 |
remove_bundled_lib "third_party/bzip2" |
118 |
remove_bundled_lib "third_party/codesighs" |
119 |
remove_bundled_lib "third_party/cros" |
120 |
@@ -189,6 +193,14 @@ |
121 |
myconf+=" -Dv8_use_snapshot=0" |
122 |
fi |
123 |
|
124 |
+ if use gecko-mediaplayer; then |
125 |
+ # Disable hardcoded blacklist for gecko-mediaplayer. |
126 |
+ # When www-plugins/gecko-mediaplayer is compiled with USE=gnome, it causes |
127 |
+ # the browser to hang. We can handle the situation via dependencies, |
128 |
+ # thus making it possible to use gecko-mediaplayer. |
129 |
+ append-flags -DGENTOO_CHROMIUM_ENABLE_GECKO_MEDIAPLAYER |
130 |
+ fi |
131 |
+ |
132 |
# Use target arch detection logic from bug #296917. |
133 |
local myarch="$ABI" |
134 |
[[ $myarch = "" ]] && myarch="$ARCH" |
135 |
|
136 |
|
137 |
|
138 |
1.1 www-client/chromium/chromium-7.0.544.0-r1.ebuild |
139 |
|
140 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-7.0.544.0-r1.ebuild?rev=1.1&view=markup |
141 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-7.0.544.0-r1.ebuild?rev=1.1&content-type=text/plain |
142 |
|
143 |
Index: chromium-7.0.544.0-r1.ebuild |
144 |
=================================================================== |
145 |
# Copyright 1999-2010 Gentoo Foundation |
146 |
# Distributed under the terms of the GNU General Public License v2 |
147 |
# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-7.0.544.0-r1.ebuild,v 1.1 2010/10/09 14:00:27 phajdan.jr Exp $ |
148 |
|
149 |
EAPI="2" |
150 |
|
151 |
inherit eutils flag-o-matic multilib pax-utils toolchain-funcs |
152 |
|
153 |
DESCRIPTION="Open-source version of Google Chrome web browser" |
154 |
HOMEPAGE="http://chromium.org/" |
155 |
SRC_URI="http://build.chromium.org/buildbot/official/${P}.tar.bz2" |
156 |
|
157 |
LICENSE="BSD" |
158 |
SLOT="0" |
159 |
KEYWORDS="~amd64 ~arm ~x86" |
160 |
IUSE="cups +gecko-mediaplayer gnome gnome-keyring system-sqlite" |
161 |
|
162 |
RDEPEND="app-arch/bzip2 |
163 |
system-sqlite? ( |
164 |
>=dev-db/sqlite-3.6.23.1[fts3,icu,secure-delete,threadsafe] |
165 |
) |
166 |
>=dev-libs/icu-4.4.1 |
167 |
>=dev-libs/libevent-1.4.13 |
168 |
dev-libs/libxml2 |
169 |
dev-libs/libxslt |
170 |
>=dev-libs/nss-3.12.3 |
171 |
>=gnome-base/gconf-2.24.0 |
172 |
gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) |
173 |
>=media-libs/alsa-lib-1.0.19 |
174 |
media-libs/jpeg:0 |
175 |
media-libs/libpng |
176 |
cups? ( >=net-print/cups-1.4.4 ) |
177 |
sys-libs/zlib |
178 |
>=x11-libs/gtk+-2.14.7 |
179 |
x11-libs/libXScrnSaver" |
180 |
DEPEND="${RDEPEND} |
181 |
dev-lang/perl |
182 |
>=dev-util/gperf-3.0.3 |
183 |
>=dev-util/pkgconfig-0.23 |
184 |
sys-devel/flex" |
185 |
RDEPEND+=" |
186 |
|| ( |
187 |
x11-themes/gnome-icon-theme |
188 |
x11-themes/oxygen-molecule |
189 |
x11-themes/tango-icon-theme |
190 |
x11-themes/xfce4-icon-theme |
191 |
) |
192 |
x11-apps/xmessage |
193 |
x11-misc/xdg-utils |
194 |
virtual/ttf-fonts |
195 |
gecko-mediaplayer? ( !www-plugins/gecko-mediaplayer[gnome] )" |
196 |
|
197 |
remove_bundled_lib() { |
198 |
einfo "Removing bundled library $1 ..." |
199 |
local out |
200 |
out="$(find $1 -mindepth 1 \! -iname '*.gyp' -print -delete)" \ |
201 |
|| die "failed to remove bundled library $1" |
202 |
if [[ -z $out ]]; then |
203 |
die "no files matched when removing bundled library $1" |
204 |
fi |
205 |
} |
206 |
|
207 |
pkg_setup() { |
208 |
CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser" |
209 |
} |
210 |
|
211 |
src_prepare() { |
212 |
# Small fixes to the system-provided sqlite support, |
213 |
# to be upstreamed. |
214 |
epatch "${FILESDIR}"/${PN}-system-sqlite-r0.patch |
215 |
|
216 |
# Small fix to the system-provided icu support, |
217 |
# to be upstreamed. |
218 |
epatch "${FILESDIR}"/${PN}-system-icu-r0.patch |
219 |
|
220 |
# Enable optional support for gecko-mediaplayer. |
221 |
epatch "${FILESDIR}"/${PN}-gecko-mediaplayer-r0.patch |
222 |
|
223 |
remove_bundled_lib "third_party/bzip2" |
224 |
remove_bundled_lib "third_party/codesighs" |
225 |
remove_bundled_lib "third_party/cros" |
226 |
remove_bundled_lib "third_party/icu" |
227 |
remove_bundled_lib "third_party/jemalloc" |
228 |
remove_bundled_lib "third_party/lcov" |
229 |
remove_bundled_lib "third_party/libevent" |
230 |
remove_bundled_lib "third_party/libjpeg" |
231 |
remove_bundled_lib "third_party/libpng" |
232 |
remove_bundled_lib "third_party/libxml" |
233 |
remove_bundled_lib "third_party/libxslt" |
234 |
remove_bundled_lib "third_party/lzma_sdk" |
235 |
remove_bundled_lib "third_party/molokocacao" |
236 |
remove_bundled_lib "third_party/ocmock" |
237 |
remove_bundled_lib "third_party/pyftpdlib" |
238 |
remove_bundled_lib "third_party/simplejson" |
239 |
remove_bundled_lib "third_party/tlslite" |
240 |
# TODO: also remove third_party/zlib. For now the compilation fails if we |
241 |
# remove it (minizip-related). |
242 |
|
243 |
if use system-sqlite; then |
244 |
remove_bundled_lib "third_party/sqlite/src" |
245 |
remove_bundled_lib "third_party/sqlite/preprocessed" |
246 |
fi |
247 |
} |
248 |
|
249 |
src_configure() { |
250 |
local myconf="" |
251 |
|
252 |
# Never tell the build system to "enable" SSE2, it has a few unexpected |
253 |
# additions, bug #336871. |
254 |
myconf+=" -Ddisable_sse2=1" |
255 |
|
256 |
# Use system-provided libraries. |
257 |
# TODO: use_system_ffmpeg (http://crbug.com/50678). |
258 |
# TODO: use_system_hunspell (upstream changes needed). |
259 |
# TODO: use_system_ssl (need to consult upstream). |
260 |
myconf+=" |
261 |
-Duse_system_bzip2=1 |
262 |
-Duse_system_icu=1 |
263 |
-Duse_system_libevent=1 |
264 |
-Duse_system_libjpeg=1 |
265 |
-Duse_system_libpng=1 |
266 |
-Duse_system_libxml=1 |
267 |
-Duse_system_zlib=1" |
268 |
|
269 |
if use system-sqlite; then |
270 |
myconf+=" -Duse_system_sqlite=1" |
271 |
fi |
272 |
|
273 |
# The dependency on cups is optional, see bug #324105. |
274 |
if use cups; then |
275 |
myconf+=" -Duse_cups=1" |
276 |
else |
277 |
myconf+=" -Duse_cups=0" |
278 |
fi |
279 |
|
280 |
if use "gnome-keyring"; then |
281 |
myconf+=" -Duse_gnome_keyring=1 -Dlinux_link_gnome_keyring=1" |
282 |
else |
283 |
# TODO: we should also disable code trying to dlopen |
284 |
# gnome-keyring in that case. |
285 |
myconf+=" -Duse_gnome_keyring=0 -Dlinux_link_gnome_keyring=0" |
286 |
fi |
287 |
|
288 |
# Enable sandbox. |
289 |
myconf+=" |
290 |
-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox |
291 |
-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome" |
292 |
|
293 |
if host-is-pax; then |
294 |
# Prevent the build from failing (bug #301880). The performance |
295 |
# difference is very small. |
296 |
myconf+=" -Dv8_use_snapshot=0" |
297 |
fi |
298 |
|
299 |
if use gecko-mediaplayer; then |
300 |
# Disable hardcoded blacklist for gecko-mediaplayer. |
301 |
# When www-plugins/gecko-mediaplayer is compiled with USE=gnome, it causes |
302 |
# the browser to hang. We can handle the situation via dependencies, |
303 |
# thus making it possible to use gecko-mediaplayer. |
304 |
append-flags -DGENTOO_CHROMIUM_ENABLE_GECKO_MEDIAPLAYER |
305 |
fi |
306 |
|
307 |
# Use target arch detection logic from bug #296917. |
308 |
local myarch="$ABI" |
309 |
[[ $myarch = "" ]] && myarch="$ARCH" |
310 |
|
311 |
if [[ $myarch = amd64 ]] ; then |
312 |
myconf+=" -Dtarget_arch=x64" |
313 |
elif [[ $myarch = x86 ]] ; then |
314 |
myconf+=" -Dtarget_arch=ia32" |
315 |
elif [[ $myarch = arm ]] ; then |
316 |
# TODO: check this again after |
317 |
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39509 is fixed. |
318 |
append-flags -fno-tree-sink |
319 |
|
320 |
myconf+=" -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0" |
321 |
else |
322 |
die "Failed to determine target arch, got '$myarch'." |
323 |
fi |
324 |
|
325 |
if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then |
326 |
myconf+=" -Dno_strict_aliasing=1 -Dgcc_version=44" |
327 |
fi |
328 |
|
329 |
# Work around a likely GCC bug, see bug #331945. |
330 |
if [[ "$(gcc-major-version)$(gcc-minor-version)" == "45" ]]; then |
331 |
append-flags -fno-ipa-cp |
332 |
fi |
333 |
|
334 |
# Make sure that -Werror doesn't get added to CFLAGS by the build system. |
335 |
# Depending on GCC version the warnings are different and we don't want |
336 |
# the build to fail because of that. |
337 |
myconf+=" -Dwerror=" |
338 |
|
339 |
build/gyp_chromium --depth=. ${myconf} || die |
340 |
} |
341 |
|
342 |
src_compile() { |
343 |
emake chrome chrome_sandbox BUILDTYPE=Release V=1 || die |
344 |
} |
345 |
|
346 |
src_install() { |
347 |
exeinto "${CHROMIUM_HOME}" |
348 |
pax-mark m out/Release/chrome |
349 |
doexe out/Release/chrome |
350 |
doexe out/Release/chrome_sandbox || die |
351 |
fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox" |
352 |
doexe out/Release/xdg-settings || die |
353 |
doexe "${FILESDIR}"/chromium-launcher.sh || die |
354 |
|
355 |
insinto "${CHROMIUM_HOME}" |
356 |
doins out/Release/chrome.pak || die |
357 |
doins out/Release/resources.pak || die |
358 |
|
359 |
doins -r out/Release/locales || die |
360 |
doins -r out/Release/resources || die |
361 |
|
362 |
# chrome.1 is for chromium --help |
363 |
newman out/Release/chrome.1 chrome.1 || die |
364 |
newman out/Release/chrome.1 chromium.1 || die |
365 |
|
366 |
doexe out/Release/ffmpegsumo_nolink || die |
367 |
doexe out/Release/libffmpegsumo.so || die |
368 |
|
369 |
# Install icon and desktop entry. |
370 |
newicon out/Release/product_logo_48.png ${PN}-browser.png || die |
371 |
dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium || die |
372 |
make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser" \ |
373 |
"MimeType=text/html;text/xml;application/xhtml+xml;" |
374 |
sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop || die |
375 |
|
376 |
# Install GNOME default application entry (bug #303100). |
377 |
if use gnome; then |
378 |
dodir /usr/share/gnome-control-center/default-apps || die |
379 |
insinto /usr/share/gnome-control-center/default-apps |
380 |
doins "${FILESDIR}"/chromium.xml || die |
381 |
fi |
382 |
} |