| 1 |
floppym 13/11/22 01:07:42 |
| 2 |
|
| 3 |
Modified: chromium-33.0.1711.3.ebuild |
| 4 |
chromium-32.0.1700.19.ebuild ChangeLog |
| 5 |
Log: |
| 6 |
Fix ffmpeg configuration on ARM, thanks to Michael Kurinnov on bug 491466. Enable gold linker for ffmpeg, bug 491850 by mgorny. |
| 7 |
|
| 8 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.2 www-client/chromium/chromium-33.0.1711.3.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-33.0.1711.3.ebuild?rev=1.2&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-33.0.1711.3.ebuild?rev=1.2&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-33.0.1711.3.ebuild?r1=1.1&r2=1.2 |
| 16 |
|
| 17 |
Index: chromium-33.0.1711.3.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-33.0.1711.3.ebuild,v |
| 20 |
retrieving revision 1.1 |
| 21 |
retrieving revision 1.2 |
| 22 |
diff -u -r1.1 -r1.2 |
| 23 |
--- chromium-33.0.1711.3.ebuild 20 Nov 2013 21:34:47 -0000 1.1 |
| 24 |
+++ chromium-33.0.1711.3.ebuild 22 Nov 2013 01:07:41 -0000 1.2 |
| 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-33.0.1711.3.ebuild,v 1.1 2013/11/20 21:34:47 phajdan.jr Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-33.0.1711.3.ebuild,v 1.2 2013/11/22 01:07:41 floppym Exp $ |
| 30 |
|
| 31 |
EAPI="5" |
| 32 |
PYTHON_COMPAT=( python{2_6,2_7} ) |
| 33 |
@@ -346,10 +346,13 @@ |
| 34 |
local myarch="$(tc-arch)" |
| 35 |
if [[ $myarch = amd64 ]] ; then |
| 36 |
target_arch=x64 |
| 37 |
+ ffmpeg_target_arch=x64 |
| 38 |
elif [[ $myarch = x86 ]] ; then |
| 39 |
target_arch=ia32 |
| 40 |
+ ffmpeg_target_arch=ia32 |
| 41 |
elif [[ $myarch = arm ]] ; then |
| 42 |
target_arch=arm |
| 43 |
+ ffmpeg_target_arch=$(usex neon arm-neon arm) |
| 44 |
# TODO: re-enable NaCl (NativeClient). |
| 45 |
local CTARGET=${CTARGET:-${CHOST}} |
| 46 |
if [[ $(tc-is-softfloat) == "no" ]]; then |
| 47 |
@@ -401,7 +404,7 @@ |
| 48 |
# Re-configure bundled ffmpeg. See bug #491378 for example reasons. |
| 49 |
einfo "Configuring bundled ffmpeg..." |
| 50 |
pushd third_party/ffmpeg > /dev/null || die |
| 51 |
- chromium/scripts/build_ffmpeg.sh linux ${target_arch} "${PWD}" config-only || die |
| 52 |
+ chromium/scripts/build_ffmpeg.sh linux ${ffmpeg_target_arch} "${PWD}" config-only || die |
| 53 |
chromium/scripts/copy_config.sh || die |
| 54 |
popd > /dev/null || die |
| 55 |
|
| 56 |
|
| 57 |
|
| 58 |
|
| 59 |
1.2 www-client/chromium/chromium-32.0.1700.19.ebuild |
| 60 |
|
| 61 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-32.0.1700.19.ebuild?rev=1.2&view=markup |
| 62 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-32.0.1700.19.ebuild?rev=1.2&content-type=text/plain |
| 63 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-32.0.1700.19.ebuild?r1=1.1&r2=1.2 |
| 64 |
|
| 65 |
Index: chromium-32.0.1700.19.ebuild |
| 66 |
=================================================================== |
| 67 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-32.0.1700.19.ebuild,v |
| 68 |
retrieving revision 1.1 |
| 69 |
retrieving revision 1.2 |
| 70 |
diff -u -r1.1 -r1.2 |
| 71 |
--- chromium-32.0.1700.19.ebuild 21 Nov 2013 03:40:12 -0000 1.1 |
| 72 |
+++ chromium-32.0.1700.19.ebuild 22 Nov 2013 01:07:42 -0000 1.2 |
| 73 |
@@ -1,6 +1,6 @@ |
| 74 |
# Copyright 1999-2013 Gentoo Foundation |
| 75 |
# Distributed under the terms of the GNU General Public License v2 |
| 76 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-32.0.1700.19.ebuild,v 1.1 2013/11/21 03:40:12 floppym Exp $ |
| 77 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-32.0.1700.19.ebuild,v 1.2 2013/11/22 01:07:42 floppym Exp $ |
| 78 |
|
| 79 |
EAPI="5" |
| 80 |
PYTHON_COMPAT=( python{2_6,2_7} ) |
| 81 |
@@ -344,10 +344,13 @@ |
| 82 |
local myarch="$(tc-arch)" |
| 83 |
if [[ $myarch = amd64 ]] ; then |
| 84 |
target_arch=x64 |
| 85 |
+ ffmpeg_target_arch=x64 |
| 86 |
elif [[ $myarch = x86 ]] ; then |
| 87 |
target_arch=ia32 |
| 88 |
+ ffmpeg_target_arch=ia32 |
| 89 |
elif [[ $myarch = arm ]] ; then |
| 90 |
target_arch=arm |
| 91 |
+ ffmpeg_target_arch=$(usex neon arm-neon arm) |
| 92 |
# TODO: re-enable NaCl (NativeClient). |
| 93 |
local CTARGET=${CTARGET:-${CHOST}} |
| 94 |
if [[ $(tc-is-softfloat) == "no" ]]; then |
| 95 |
@@ -399,7 +402,7 @@ |
| 96 |
# Re-configure bundled ffmpeg. See bug #491378 for example reasons. |
| 97 |
einfo "Configuring bundled ffmpeg..." |
| 98 |
pushd third_party/ffmpeg > /dev/null || die |
| 99 |
- chromium/scripts/build_ffmpeg.sh linux ${target_arch} "${PWD}" config-only || die |
| 100 |
+ chromium/scripts/build_ffmpeg.sh linux ${ffmpeg_target_arch} "${PWD}" config-only || die |
| 101 |
chromium/scripts/copy_config.sh || die |
| 102 |
popd > /dev/null || die |
| 103 |
|
| 104 |
|
| 105 |
|
| 106 |
|
| 107 |
1.991 www-client/chromium/ChangeLog |
| 108 |
|
| 109 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.991&view=markup |
| 110 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.991&content-type=text/plain |
| 111 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?r1=1.990&r2=1.991 |
| 112 |
|
| 113 |
Index: ChangeLog |
| 114 |
=================================================================== |
| 115 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v |
| 116 |
retrieving revision 1.990 |
| 117 |
retrieving revision 1.991 |
| 118 |
diff -u -r1.990 -r1.991 |
| 119 |
--- ChangeLog 21 Nov 2013 03:40:12 -0000 1.990 |
| 120 |
+++ ChangeLog 22 Nov 2013 01:07:42 -0000 1.991 |
| 121 |
@@ -1,6 +1,11 @@ |
| 122 |
# ChangeLog for www-client/chromium |
| 123 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 124 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.990 2013/11/21 03:40:12 floppym Exp $ |
| 125 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.991 2013/11/22 01:07:42 floppym Exp $ |
| 126 |
+ |
| 127 |
+ 22 Nov 2013; Mike Gilbert <floppym@g.o> chromium-32.0.1700.19.ebuild, |
| 128 |
+ chromium-33.0.1711.3.ebuild, files/chromium-build_ffmpeg-r0.patch: |
| 129 |
+ Fix ffmpeg configuration on ARM, thanks to Michael Kurinnov on bug 491466. |
| 130 |
+ Enable gold linker for ffmpeg, bug 491850 by mgorny. |
| 131 |
|
| 132 |
*chromium-32.0.1700.19 (21 Nov 2013) |
Archives