public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in www-client/chromium: ChangeLog chromium-26.0.1410.5.ebuild chromium-9999-r1.ebuild
@ 2013-02-25 21:00 PaweA Hajdan (phajdan.jr)
  0 siblings, 0 replies; only message in thread
From: PaweA Hajdan (phajdan.jr) @ 2013-02-25 21:00 UTC (permalink / raw
  To: gentoo-commits

phajdan.jr    13/02/25 21:00:27

  Modified:             ChangeLog chromium-26.0.1410.5.ebuild
                        chromium-9999-r1.ebuild
  Log:
  Fixes for ARM, bug #372155. Used parts of Vladimir's patch.
  
  (Portage version: 2.1.11.50/cvs/Linux i686, signed Manifest commit with key 30427902)

Revision  Changes    Path
1.814                www-client/chromium/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.814&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.814&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?r1=1.813&r2=1.814

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v
retrieving revision 1.813
retrieving revision 1.814
diff -u -r1.813 -r1.814
--- ChangeLog	22 Feb 2013 14:24:57 -0000	1.813
+++ ChangeLog	25 Feb 2013 21:00:27 -0000	1.814
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.813 2013/02/22 14:24:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.814 2013/02/25 21:00:27 phajdan.jr Exp $
+
+  25 Feb 2013; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-26.0.1410.5.ebuild, chromium-9999-r1.ebuild:
+  Fixes for ARM, bug #372155. Used parts of Vladimir's patch.
 
   22 Feb 2013; Agostino Sarubbo <ago@gentoo.org> -chromium-24.0.1312.56.ebuild,
   -chromium-25.0.1364.68.ebuild, -chromium-25.0.1364.84.ebuild:



1.2                  www-client/chromium/chromium-26.0.1410.5.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-26.0.1410.5.ebuild?rev=1.2&view=markup
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
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-26.0.1410.5.ebuild?r1=1.1&r2=1.2

Index: chromium-26.0.1410.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-26.0.1410.5.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- chromium-26.0.1410.5.ebuild	18 Feb 2013 21:43:06 -0000	1.1
+++ chromium-26.0.1410.5.ebuild	25 Feb 2013 21:00:27 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -48,7 +48,7 @@
 	>=media-libs/libjpeg-turbo-1.2.0-r1
 	media-libs/libpng
 	>=media-libs/libwebp-0.2.0_rc1
-	!x86? ( media-libs/mesa[gles2] )
+	!arm? ( !x86? ( media-libs/mesa[gles2] ) )
 	media-libs/opus
 	media-libs/speex
 	pulseaudio? ( media-sound/pulseaudio )
@@ -240,16 +240,21 @@
 		-Duse_system_speex=1
 		-Duse_system_v8=1
 		-Duse_system_xdg_utils=1
-		-Duse_system_yasm=1
 		-Duse_system_zlib=1
 		$(gyp_use system-ffmpeg use_system_ffmpeg)"
 
 	# TODO: Use system mesa on x86, bug #457130 .
-	if ! use x86; then
+	if ! use x86 && ! use arm; then
 		myconf+="
 			-Duse_system_mesa=1"
 	fi
 
+	# TODO: patch gyp so that this arm conditional is not needed.
+	if ! use arm; then
+		myconf+="
+			-Duse_system_yasm=1"
+	fi
+
 	# Optional dependencies.
 	# TODO: linux_link_kerberos, bug #381289.
 	myconf+="
@@ -310,6 +315,7 @@
 	elif [[ $myarch = arm ]] ; then
 		# TODO: re-enable NaCl (NativeClient).
 		myconf+=" -Dtarget_arch=arm
+			-Dsysroot=
 			-Darmv7=0
 			-Darm_neon=0
 			-Ddisable_nacl=1"



1.169                www-client/chromium/chromium-9999-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild?rev=1.169&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild?rev=1.169&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild?r1=1.168&r2=1.169

Index: chromium-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- chromium-9999-r1.ebuild	18 Feb 2013 21:43:06 -0000	1.168
+++ chromium-9999-r1.ebuild	25 Feb 2013 21:00:27 -0000	1.169
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.168 2013/02/18 21:43:06 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.169 2013/02/25 21:00:27 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -48,7 +48,7 @@
 	>=media-libs/libjpeg-turbo-1.2.0-r1
 	media-libs/libpng
 	>=media-libs/libwebp-0.2.0_rc1
-	!x86? ( media-libs/mesa[gles2] )
+	!arm? ( !x86? ( media-libs/mesa[gles2] ) )
 	media-libs/opus
 	media-libs/speex
 	pulseaudio? ( media-sound/pulseaudio )
@@ -298,16 +298,21 @@
 		-Duse_system_speex=1
 		-Duse_system_v8=1
 		-Duse_system_xdg_utils=1
-		-Duse_system_yasm=1
 		-Duse_system_zlib=1
 		$(gyp_use system-ffmpeg use_system_ffmpeg)"
 
 	# TODO: Use system mesa on x86, bug #457130 .
-	if ! use x86; then
+	if ! use x86 && ! use arm; then
 		myconf+="
 			-Duse_system_mesa=1"
 	fi
 
+	# TODO: patch gyp so that this arm conditional is not needed.
+	if ! use arm; then
+		myconf+="
+			-Duse_system_yasm=1"
+	fi
+
 	# Optional dependencies.
 	# TODO: linux_link_kerberos, bug #381289.
 	myconf+="
@@ -368,6 +373,7 @@
 	elif [[ $myarch = arm ]] ; then
 		# TODO: re-enable NaCl (NativeClient).
 		myconf+=" -Dtarget_arch=arm
+			-Dsysroot=
 			-Darmv7=0
 			-Darm_neon=0
 			-Ddisable_nacl=1"





^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2013-02-25 21:00 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-25 21:00 [gentoo-commits] gentoo-x86 commit in www-client/chromium: ChangeLog chromium-26.0.1410.5.ebuild chromium-9999-r1.ebuild PaweA Hajdan (phajdan.jr)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox