[Pkg-chromium-commit] chromium-browser/chromium-browser.experimental: 672 Backport arm ffmpeg fix from unstable (v5)

[Giuseppe Iuculano]

Branch name: chromium-browser/chromium-browser.experimental
Branch location : bzr+ssh://bzr.debian.org/bzr/pkg-chromium/chromium-browser/chromium-browser.experimental
Browse location: http://bzr.debian.org/loggerhead/pkg-chromium
Revision No: 672
Revision Id: iuculano at debian.org-20100901133634-2m64l7ok9o5h3b9p
Committer: Giuseppe Iuculano <iuculano at debian.org>
Message : Backport arm ffmpeg fix from unstable (v5)


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

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

-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2010-09-01 09:06:26 +0000
+++ b/debian/changelog	2010-09-01 13:36:34 +0000
@@ -2,8 +2,9 @@
 
   * New upstream release
   * Merge the unstable branch
+  * Backport arm ffmpeg fix from unstable (v5)
 
- -- Giuseppe Iuculano <iuculano at debian.org>  Wed, 01 Sep 2010 09:22:50 +0200
+ -- Giuseppe Iuculano <iuculano at debian.org>  Wed, 01 Sep 2010 15:24:17 +0200
 
 chromium-browser (6.0.472.36~r55963-1) experimental; 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-09-01 13:36:34 +0000
@@ -0,0 +1,30 @@
+--- a/src/third_party/ffmpeg/config/Chrome/linux/arm/config.h
++++ b/src/third_party/ffmpeg/config/Chrome/linux/arm/config.h
+@@ -34,10 +34,10 @@
+ #define HAVE_ALTIVEC 0
+ #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_ARMV5TE 0
++#define HAVE_ARMV6 0
++#define HAVE_ARMV6T2 0
++#define HAVE_ARMVFP 0
+ #define HAVE_IWMMXT 0
+ #define HAVE_MMI 0
+ #define HAVE_MMX 0
+--- a/src/third_party/ffmpeg/ffmpeg.gyp
++++ b/src/third_party/ffmpeg/ffmpeg.gyp
+@@ -333,10 +333,7 @@
+                 'patched-ffmpeg-mt/libavcodec/arm/dsputil_arm.S',
+                 'patched-ffmpeg-mt/libavcodec/arm/dsputil_armv6.S',
+                 'patched-ffmpeg-mt/libavcodec/arm/dsputil_init_arm.c',
+-                'patched-ffmpeg-mt/libavcodec/arm/dsputil_init_armv5te.c',
+                 'patched-ffmpeg-mt/libavcodec/arm/dsputil_init_armv6.c',
+-                'patched-ffmpeg-mt/libavcodec/arm/dsputil_init_vfp.c',
+-                'patched-ffmpeg-mt/libavcodec/arm/dsputil_vfp.S',
+                 'patched-ffmpeg-mt/libavcodec/arm/fft_init_arm.c',
+                 'patched-ffmpeg-mt/libavcodec/arm/jrevdct_arm.S',
+                 'patched-ffmpeg-mt/libavcodec/arm/simple_idct_arm.S',

=== modified file 'debian/patches/series'
--- a/debian/patches/series	2010-09-01 09:06:26 +0000
+++ b/debian/patches/series	2010-09-01 13:36:34 +0000
@@ -14,3 +14,4 @@
 icu44.patch
 armv4.patch
 gecko-mediaplayer.patch
+ffmpeg_arm.patch