| 1 |
floppym 13/11/22 01:07:42 |
| 2 |
|
| 3 |
Modified: chromium-build_ffmpeg-r0.patch |
| 4 |
Log: |
| 5 |
Fix ffmpeg configuration on ARM, thanks to Michael Kurinnov on bug 491466. Enable gold linker for ffmpeg, bug 491850 by mgorny. |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 www-client/chromium/files/chromium-build_ffmpeg-r0.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-build_ffmpeg-r0.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-build_ffmpeg-r0.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-build_ffmpeg-r0.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: chromium-build_ffmpeg-r0.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/files/chromium-build_ffmpeg-r0.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- chromium-build_ffmpeg-r0.patch 17 Nov 2013 17:36:38 -0000 1.1 |
| 23 |
+++ chromium-build_ffmpeg-r0.patch 22 Nov 2013 01:07:42 -0000 1.2 |
| 24 |
@@ -1,7 +1,9 @@ |
| 25 |
Fix HOST_OS detection in build_ffpeg.sh |
| 26 |
- |
| 27 |
https://bugs.gentoo.org/show_bug.cgi?id=491466 |
| 28 |
|
| 29 |
+Enable gold linker |
| 30 |
+https://bugs.gentoo.org/show_bug.cgi?id=491850 |
| 31 |
+ |
| 32 |
--- a/third_party/ffmpeg/chromium/scripts/build_ffmpeg.sh |
| 33 |
+++ b/third_party/ffmpeg/chromium/scripts/build_ffmpeg.sh |
| 34 |
@@ -75,7 +75,7 @@ |
| 35 |
@@ -13,3 +15,73 @@ |
| 36 |
HOST_OS=linux |
| 37 |
HOST_ARCH=ia32 |
| 38 |
JOBS=$(grep processor /proc/cpuinfo | wc -l) |
| 39 |
+@@ -85,6 +85,11 @@ |
| 40 |
+ HOST_ARCH=x64 |
| 41 |
+ JOBS=$(grep processor /proc/cpuinfo | wc -l) |
| 42 |
+ ;; |
| 43 |
++ Linux\ arm*) |
| 44 |
++ HOST_OS=linux |
| 45 |
++ HOST_ARCH=arm |
| 46 |
++ JOBS=$(grep processor /proc/cpuinfo | wc -l) |
| 47 |
++ ;; |
| 48 |
+ Darwin\ i386) |
| 49 |
+ HOST_OS=mac |
| 50 |
+ HOST_ARCH=ia32 |
| 51 |
+@@ -117,14 +122,6 @@ |
| 52 |
+ echo "LD = $(ld --version | head -n1)" |
| 53 |
+ echo |
| 54 |
+ |
| 55 |
+-# As of this writing gold 2.20.1-system.20100303 is unable to link FFmpeg. |
| 56 |
+-if ld --version | grep -q gold; then |
| 57 |
+- echo "gold is unable to link FFmpeg" |
| 58 |
+- echo |
| 59 |
+- echo "Switch /usr/bin/ld to the regular binutils ld and try again" |
| 60 |
+- exit 1 |
| 61 |
+-fi |
| 62 |
+- |
| 63 |
+ # We want to use a sufficiently recent version of yasm on Windows. |
| 64 |
+ if [[ "$TARGET_OS" == "win" || "$TARGET_OS" == "win-vs2013" ]]; then |
| 65 |
+ if !(which yasm 2>&1 > /dev/null); then |
| 66 |
+@@ -292,14 +289,16 @@ |
| 67 |
+ add_flag_common --extra-cflags=-m32 |
| 68 |
+ add_flag_common --extra-ldflags=-m32 |
| 69 |
+ elif [ "$TARGET_ARCH" = "arm" ]; then |
| 70 |
+- # This if-statement essentially is for chroot tegra2. |
| 71 |
+- add_flag_common --enable-cross-compile |
| 72 |
++ if [ "$HOST_ARCH" != "arm" ]; then |
| 73 |
++ # This if-statement essentially is for chroot tegra2. |
| 74 |
++ add_flag_common --enable-cross-compile |
| 75 |
+ |
| 76 |
+- # Location is for CrOS chroot. If you want to use this, enter chroot |
| 77 |
+- # and copy ffmpeg to a location that is reachable. |
| 78 |
+- add_flag_common --cross-prefix=/usr/bin/armv7a-cros-linux-gnueabi- |
| 79 |
+- add_flag_common --target-os=linux |
| 80 |
+- add_flag_common --arch=arm |
| 81 |
++ # Location is for CrOS chroot. If you want to use this, enter chroot |
| 82 |
++ # and copy ffmpeg to a location that is reachable. |
| 83 |
++ add_flag_common --cross-prefix=/usr/bin/armv7a-cros-linux-gnueabi- |
| 84 |
++ add_flag_common --target-os=linux |
| 85 |
++ add_flag_common --arch=arm |
| 86 |
++ fi |
| 87 |
+ |
| 88 |
+ # TODO(ihf): ARM compile flags are tricky. The final options |
| 89 |
+ # overriding everything live in chroot /build/*/etc/make.conf |
| 90 |
+@@ -322,11 +321,13 @@ |
| 91 |
+ # NOTE: softfp/hardfp selected at gyp time. |
| 92 |
+ add_flag_common --extra-cflags=-mfloat-abi=hard |
| 93 |
+ elif [ "$TARGET_ARCH" = "arm-neon" ]; then |
| 94 |
+- # This if-statement is for chroot arm-generic. |
| 95 |
+- add_flag_common --enable-cross-compile |
| 96 |
+- add_flag_common --cross-prefix=/usr/bin/armv7a-cros-linux-gnueabi- |
| 97 |
+- add_flag_common --target-os=linux |
| 98 |
+- add_flag_common --arch=arm |
| 99 |
++ if [ "$HOST_ARCH" != "arm" ]; then |
| 100 |
++ # This if-statement is for chroot arm-generic. |
| 101 |
++ add_flag_common --enable-cross-compile |
| 102 |
++ add_flag_common --cross-prefix=/usr/bin/armv7a-cros-linux-gnueabi- |
| 103 |
++ add_flag_common --target-os=linux |
| 104 |
++ add_flag_common --arch=arm |
| 105 |
++ fi |
| 106 |
+ add_flag_common --enable-armv6 |
| 107 |
+ add_flag_common --enable-armv6t2 |
| 108 |
+ add_flag_common --enable-vfp |
Archives