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: ChangeLog chromium-26.0.1410.5.ebuild chromium-9999-r1.ebuild
Date: Mon, 25 Feb 2013 21:00:33
Message-Id: 20130225210027.A706B2171D@flycatcher.gentoo.org
1 phajdan.jr 13/02/25 21:00:27
2
3 Modified: ChangeLog chromium-26.0.1410.5.ebuild
4 chromium-9999-r1.ebuild
5 Log:
6 Fixes for ARM, bug #372155. Used parts of Vladimir's patch.
7
8 (Portage version: 2.1.11.50/cvs/Linux i686, signed Manifest commit with key 30427902)
9
10 Revision Changes Path
11 1.814 www-client/chromium/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.814&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.814&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?r1=1.813&r2=1.814
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v
20 retrieving revision 1.813
21 retrieving revision 1.814
22 diff -u -r1.813 -r1.814
23 --- ChangeLog 22 Feb 2013 14:24:57 -0000 1.813
24 +++ ChangeLog 25 Feb 2013 21:00:27 -0000 1.814
25 @@ -1,6 +1,10 @@
26 # ChangeLog for www-client/chromium
27 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.813 2013/02/22 14:24:57 ago Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.814 2013/02/25 21:00:27 phajdan.jr Exp $
30 +
31 + 25 Feb 2013; Pawel Hajdan jr <phajdan.jr@g.o>
32 + chromium-26.0.1410.5.ebuild, chromium-9999-r1.ebuild:
33 + Fixes for ARM, bug #372155. Used parts of Vladimir's patch.
34
35 22 Feb 2013; Agostino Sarubbo <ago@g.o> -chromium-24.0.1312.56.ebuild,
36 -chromium-25.0.1364.68.ebuild, -chromium-25.0.1364.84.ebuild:
37
38
39
40 1.2 www-client/chromium/chromium-26.0.1410.5.ebuild
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-26.0.1410.5.ebuild?rev=1.2&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-26.0.1410.5.ebuild?rev=1.2&content-type=text/plain
44 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-26.0.1410.5.ebuild?r1=1.1&r2=1.2
45
46 Index: chromium-26.0.1410.5.ebuild
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-26.0.1410.5.ebuild,v
49 retrieving revision 1.1
50 retrieving revision 1.2
51 diff -u -r1.1 -r1.2
52 --- chromium-26.0.1410.5.ebuild 18 Feb 2013 21:43:06 -0000 1.1
53 +++ chromium-26.0.1410.5.ebuild 25 Feb 2013 21:00:27 -0000 1.2
54 @@ -1,6 +1,6 @@
55 # Copyright 1999-2013 Gentoo Foundation
56 # Distributed under the terms of the GNU General Public License v2
57 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-26.0.1410.5.ebuild,v 1.1 2013/02/18 21:43:06 phajdan.jr Exp $
58 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-26.0.1410.5.ebuild,v 1.2 2013/02/25 21:00:27 phajdan.jr Exp $
59
60 EAPI="5"
61 PYTHON_COMPAT=( python{2_6,2_7} )
62 @@ -48,7 +48,7 @@
63 >=media-libs/libjpeg-turbo-1.2.0-r1
64 media-libs/libpng
65 >=media-libs/libwebp-0.2.0_rc1
66 - !x86? ( media-libs/mesa[gles2] )
67 + !arm? ( !x86? ( media-libs/mesa[gles2] ) )
68 media-libs/opus
69 media-libs/speex
70 pulseaudio? ( media-sound/pulseaudio )
71 @@ -240,16 +240,21 @@
72 -Duse_system_speex=1
73 -Duse_system_v8=1
74 -Duse_system_xdg_utils=1
75 - -Duse_system_yasm=1
76 -Duse_system_zlib=1
77 $(gyp_use system-ffmpeg use_system_ffmpeg)"
78
79 # TODO: Use system mesa on x86, bug #457130 .
80 - if ! use x86; then
81 + if ! use x86 && ! use arm; then
82 myconf+="
83 -Duse_system_mesa=1"
84 fi
85
86 + # TODO: patch gyp so that this arm conditional is not needed.
87 + if ! use arm; then
88 + myconf+="
89 + -Duse_system_yasm=1"
90 + fi
91 +
92 # Optional dependencies.
93 # TODO: linux_link_kerberos, bug #381289.
94 myconf+="
95 @@ -310,6 +315,7 @@
96 elif [[ $myarch = arm ]] ; then
97 # TODO: re-enable NaCl (NativeClient).
98 myconf+=" -Dtarget_arch=arm
99 + -Dsysroot=
100 -Darmv7=0
101 -Darm_neon=0
102 -Ddisable_nacl=1"
103
104
105
106 1.169 www-client/chromium/chromium-9999-r1.ebuild
107
108 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild?rev=1.169&view=markup
109 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild?rev=1.169&content-type=text/plain
110 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild?r1=1.168&r2=1.169
111
112 Index: chromium-9999-r1.ebuild
113 ===================================================================
114 RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v
115 retrieving revision 1.168
116 retrieving revision 1.169
117 diff -u -r1.168 -r1.169
118 --- chromium-9999-r1.ebuild 18 Feb 2013 21:43:06 -0000 1.168
119 +++ chromium-9999-r1.ebuild 25 Feb 2013 21:00:27 -0000 1.169
120 @@ -1,6 +1,6 @@
121 # Copyright 1999-2013 Gentoo Foundation
122 # Distributed under the terms of the GNU General Public License v2
123 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.168 2013/02/18 21:43:06 phajdan.jr Exp $
124 +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.169 2013/02/25 21:00:27 phajdan.jr Exp $
125
126 EAPI="5"
127 PYTHON_COMPAT=( python{2_6,2_7} )
128 @@ -48,7 +48,7 @@
129 >=media-libs/libjpeg-turbo-1.2.0-r1
130 media-libs/libpng
131 >=media-libs/libwebp-0.2.0_rc1
132 - !x86? ( media-libs/mesa[gles2] )
133 + !arm? ( !x86? ( media-libs/mesa[gles2] ) )
134 media-libs/opus
135 media-libs/speex
136 pulseaudio? ( media-sound/pulseaudio )
137 @@ -298,16 +298,21 @@
138 -Duse_system_speex=1
139 -Duse_system_v8=1
140 -Duse_system_xdg_utils=1
141 - -Duse_system_yasm=1
142 -Duse_system_zlib=1
143 $(gyp_use system-ffmpeg use_system_ffmpeg)"
144
145 # TODO: Use system mesa on x86, bug #457130 .
146 - if ! use x86; then
147 + if ! use x86 && ! use arm; then
148 myconf+="
149 -Duse_system_mesa=1"
150 fi
151
152 + # TODO: patch gyp so that this arm conditional is not needed.
153 + if ! use arm; then
154 + myconf+="
155 + -Duse_system_yasm=1"
156 + fi
157 +
158 # Optional dependencies.
159 # TODO: linux_link_kerberos, bug #381289.
160 myconf+="
161 @@ -368,6 +373,7 @@
162 elif [[ $myarch = arm ]] ; then
163 # TODO: re-enable NaCl (NativeClient).
164 myconf+=" -Dtarget_arch=arm
165 + -Dsysroot=
166 -Darmv7=0
167 -Darm_neon=0
168 -Ddisable_nacl=1"
Report Message
Find on MARC Find on Google Groups