[Pkg-chromium-commit] chromium-browser/chromium-browser.sid: 639 Remove armv6 and armv7 support from ffmpeg internal copy

[Giuseppe Iuculano]

Branch name: chromium-browser/chromium-browser.sid
Branch location : bzr+ssh://bzr.debian.org/bzr/pkg-chromium/chromium-browser/chromium-browser.sid
Browse location: http://bzr.debian.org/loggerhead/pkg-chromium
Revision No: 639
Revision Id: iuculano at debian.org-20100703111640-udfan4pg7b8ojz84
Committer: Giuseppe Iuculano <iuculano at debian.org>
Message : Remove armv6 and armv7 support from ffmpeg internal copy


--------------------------------------------------------
  ** Added :
        - debian/patches/ffmpeg_arm.patch

  ** Modified :
        - debian/changelog
        - debian/patches/series

-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2010-07-03 09:50:45 +0000
+++ b/debian/changelog	2010-07-03 11:16:40 +0000
@@ -18,8 +18,9 @@
       team509.
     - [46575] Low Annoyance with print dialogs. Credit to Mats Ahlgren.
     - [47056] Low Crash with modal dialogs. Credit to Aki Helin of OUSPG.
+  * Remove armv6 and armv7 support from ffmpeg internal copy
 
- -- Giuseppe Iuculano <iuculano at debian.org>  Sat, 03 Jul 2010 11:46:34 +0200
+ -- Giuseppe Iuculano <iuculano at debian.org>  Sat, 03 Jul 2010 13:12:17 +0200
 
 chromium-browser (5.0.375.86~r49890-4) unstable; urgency=low
 

=== added file 'debian/patches/ffmpeg_arm.patch'
--- a/debian/patches/ffmpeg_arm.patch	1970-01-01 00:00:00 +0000
+++ b/debian/patches/ffmpeg_arm.patch	2010-07-03 11:16:40 +0000
@@ -0,0 +1,17 @@
+Index: chromium-browser-5.0.375.86~r49890/src/third_party/ffmpeg/source/config/Chrome/linux/arm/config.h
+===================================================================
+--- chromium-browser-5.0.375.86~r49890.orig/src/third_party/ffmpeg/source/config/Chrome/linux/arm/config.h	2010-06-29 10:02:42.000000000 +0000
++++ chromium-browser-5.0.375.86~r49890/src/third_party/ffmpeg/source/config/Chrome/linux/arm/config.h	2010-06-29 10:03:23.000000000 +0000
+@@ -35,9 +35,9 @@
+ #define HAVE_AMD3DNOW 0
+ #define HAVE_AMD3DNOWEXT 0
+ #define HAVE_ARMV5TE 1
+-#define HAVE_ARMV6 1
+-#define HAVE_ARMV6T2 1
+-#define HAVE_ARMVFP 1
++#define HAVE_ARMV6 0
++#define HAVE_ARMV6T2 0
++#define HAVE_ARMVFP 0
+ #define HAVE_IWMMXT 0
+ #define HAVE_MMI 0
+ #define HAVE_MMX 0

=== modified file 'debian/patches/series'
--- a/debian/patches/series	2010-06-28 08:43:52 +0000
+++ b/debian/patches/series	2010-07-03 11:16:40 +0000
@@ -16,3 +16,4 @@
 glew.patch
 webkit-recursion.patch
 VP8.patch
+ffmpeg_arm.patch