Attach the patch this time..
diff -Nru chromium-browser-16.0.912.75~r116452/debian/changelog chromium-browser-16.0.912.75~r116452/debian/changelog
--- chromium-browser-16.0.912.75~r116452/debian/changelog 2012-01-09 13:16:17.000000000 +0200
+++ chromium-browser-16.0.912.75~r116452/debian/changelog 2012-01-24 12:25:39.000000000 +0200
@@ -1,3 +1,9 @@
+chromium-browser (16.0.912.75~r116452-1linaro1) unstable; urgency=low
+
+ * build fixes for arm
+
+ -- Riku Voipio <riku.voi...@linaro.org> Tue, 24 Jan 2012 12:25:07 +0200
+
chromium-browser (16.0.912.75~r116452-1) unstable; urgency=low
* New stable version:
diff -Nru chromium-browser-16.0.912.75~r116452/debian/control chromium-browser-16.0.912.75~r116452/debian/control
--- chromium-browser-16.0.912.75~r116452/debian/control 2012-01-09 13:16:17.000000000 +0200
+++ chromium-browser-16.0.912.75~r116452/debian/control 2012-01-24 09:28:37.000000000 +0200
@@ -75,7 +75,9 @@
libavutil-dev (>= 4:0.7.1),
scons,
libelf-dev,
- python-simplejson
+ python-simplejson,
+ libegl1-mesa-dev [armel armhf],
+ libgles2-mesa-dev [armel armhf]
Standards-Version: 3.9.2
Package: chromium-browser
@@ -130,7 +132,7 @@
This package contains 'inspector', transitional dummy package.
Package: chromium
-Architecture: i386 amd64 armel
+Architecture: i386 amd64 armel armhf
Depends: ${shlibs:Depends}, ${misc:Depends},
libnss3-1d (>= 3.12.3),
libvpx0 (>= 0.9.6),
@@ -151,7 +153,7 @@
This package contains the Chromium browser.
Package: chromium-dbg
-Architecture: i386 amd64 armel
+Architecture: i386 amd64 armel armhf
Section: debug
Priority: extra
Depends: ${shlibs:Depends}, ${misc:Depends}, chromium (= ${binary:Version})
diff -Nru chromium-browser-16.0.912.75~r116452/debian/patches/fix-armv4-skia.patch chromium-browser-16.0.912.75~r116452/debian/patches/fix-armv4-skia.patch
--- chromium-browser-16.0.912.75~r116452/debian/patches/fix-armv4-skia.patch 1970-01-01 02:00:00.000000000 +0200
+++ chromium-browser-16.0.912.75~r116452/debian/patches/fix-armv4-skia.patch 2012-01-24 12:46:30.000000000 +0200
@@ -0,0 +1,13 @@
+Index: chromium-browser-16.0.912.75~r116452.real/src/skia/skia.gyp
+===================================================================
+--- chromium-browser-16.0.912.75~r116452.real.orig/src/skia/skia.gyp 2012-01-24 12:44:55.916402001 +0200
++++ chromium-browser-16.0.912.75~r116452.real/src/skia/skia.gyp 2012-01-24 12:46:21.100402002 +0200
+@@ -985,7 +985,7 @@
+ '../third_party/skia/src/opts/opts_check_arm.cpp',
+ ],
+ }],
+- [ 'armv7 == 1 and arm_neon == 0', {
++ [ 'target_arch == "arm" and arm_neon == 0', {
+ 'sources': [
+ '../third_party/skia/src/opts/memset.arm.S',
+ ],
diff -Nru chromium-browser-16.0.912.75~r116452/debian/patches/fix-libav.patch chromium-browser-16.0.912.75~r116452/debian/patches/fix-libav.patch
--- chromium-browser-16.0.912.75~r116452/debian/patches/fix-libav.patch 1970-01-01 02:00:00.000000000 +0200
+++ chromium-browser-16.0.912.75~r116452/debian/patches/fix-libav.patch 2012-01-20 13:01:05.000000000 +0200
@@ -0,0 +1,12 @@
+Index: chromium-browser-16.0.912.75~r116452/src/media/ffmpeg/ffmpeg_common.h
+===================================================================
+--- chromium-browser-16.0.912.75~r116452.orig/src/media/ffmpeg/ffmpeg_common.h 2012-01-20 13:00:29.195257001 +0200
++++ chromium-browser-16.0.912.75~r116452/src/media/ffmpeg/ffmpeg_common.h 2012-01-20 13:00:58.103257001 +0200
+@@ -26,6 +26,7 @@
+ #include <libavformat/avformat.h>
+ #include <libavformat/avio.h>
+ #include <libavutil/avutil.h>
++#include <libavutil/mathematics.h>
+ #include <libavutil/log.h>
+ MSVC_POP_WARNING();
+ } // extern "C"
diff -Nru chromium-browser-16.0.912.75~r116452/debian/patches/series chromium-browser-16.0.912.75~r116452/debian/patches/series
--- chromium-browser-16.0.912.75~r116452/debian/patches/series 2012-01-09 13:16:17.000000000 +0200
+++ chromium-browser-16.0.912.75~r116452/debian/patches/series 2012-01-24 12:44:45.000000000 +0200
@@ -19,3 +19,6 @@
system_v8.patch
#protobuf.patch
nss-workaround.patch
+system-vpx.patch
+fix-libav.patch
+fix-armv4-skia.patch
diff -Nru chromium-browser-16.0.912.75~r116452/debian/patches/system-vpx.patch chromium-browser-16.0.912.75~r116452/debian/patches/system-vpx.patch
--- chromium-browser-16.0.912.75~r116452/debian/patches/system-vpx.patch 1970-01-01 02:00:00.000000000 +0200
+++ chromium-browser-16.0.912.75~r116452/debian/patches/system-vpx.patch 2012-01-24 11:06:59.000000000 +0200
@@ -0,0 +1,26 @@
+Index: chromium-browser-16.0.912.75~r116452/src/remoting/remoting.gyp
+===================================================================
+--- chromium-browser-16.0.912.75~r116452.orig/src/remoting/remoting.gyp 2012-01-19 17:32:12.490537001 +0200
++++ chromium-browser-16.0.912.75~r116452/src/remoting/remoting.gyp 2012-01-19 17:38:38.000000000 +0200
+@@ -378,7 +378,7 @@
+ '../ui/ui.gyp:ui',
+ '../net/net.gyp:net',
+ '../skia/skia.gyp:skia',
+- '../third_party/libvpx/libvpx.gyp:libvpx',
++ '../third_party/libvpx/libvpx.gyp:libvpx_include',
+ '../third_party/protobuf/protobuf.gyp:protobuf_lite',
+ '../third_party/zlib/zlib.gyp:zlib',
+ '../media/media.gyp:yuv_convert',
+Index: chromium-browser-16.0.912.75~r116452/src/third_party/ffmpeg/ffmpeg.gyp
+===================================================================
+--- chromium-browser-16.0.912.75~r116452.orig/src/third_party/ffmpeg/ffmpeg.gyp 2012-01-24 10:04:55.899931002 +0200
++++ chromium-browser-16.0.912.75~r116452/src/third_party/ffmpeg/ffmpeg.gyp 2012-01-24 10:21:46.519931001 +0200
+@@ -490,7 +490,7 @@
+ ['OS == "linux" or OS == "solaris"', {
+ 'link_settings': {
+ 'libraries': [
+- '-ldl',
++ '-ldl', '-lvpx',
+ ],
+ },
+ }],
diff -Nru chromium-browser-16.0.912.75~r116452/debian/rules chromium-browser-16.0.912.75~r116452/debian/rules
--- chromium-browser-16.0.912.75~r116452/debian/rules 2012-01-09 13:16:17.000000000 +0200
+++ chromium-browser-16.0.912.75~r116452/debian/rules 2012-01-25 10:49:36.000000000 +0200
@@ -73,17 +73,30 @@
endif
DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
ifeq (arm,$(DEB_HOST_ARCH_CPU))
-AVOID_GCC_44 := 0
GYP_DEFINES += \
- arm_thumb=0 \
target_arch=arm \
disable_nacl=1 \
linux_use_tcmalloc=0 \
+ enable_webrtc=0 \
+ use_cups=1
+ifeq (armel,$(DEB_HOST_ARCH))
+AVOID_GCC_44 := 0
+GYP_DEFINES += \
+ arm_thumb=0 \
armv7=0 \
arm_neon=0 \
$(NULL)
+endif
+ifeq (armhf,$(DEB_HOST_ARCH))
+GYP_DEFINES += \
+ arm_thumb=1 \
+ armv7=1 \
+ arm_neon=0 \
+ $(NULL)
+endif
WANT_LZMA_DEBS := 0
WANT_TESTS := 0
else
