Merge lp:~rsalveti/firefox/natty-fix-thumb2 into lp:~mozillateam/firefox/firefox.natty

[Ricardo Salveti]

Including patch debian/patches/firefox-webm-thumb2-fix.patch:
Description: Enforce alignment for ARM code in Thumb mode in libvpx.
Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=666931
Forwarded: Yes, and already upstream.

Patch already applied upstream, at http://hg.mozilla.org/mozilla-central/rev/938c253f031c

[lp:~rsalveti/firefox/natty-fix-thumb2]

857. By Micah Gersten on 2011-06-28

No change rebuild to pick up LP: #800857 on armel and powerpc

858. By Micah Gersten on 2011-06-28

releasing version 5.0+build1+nobinonly-0ubuntu0.11.04.3

859. By Ricardo Salveti on 2011-07-06

* debian/patches/firefox-webm-thumb2-fix.patch:
  - Fix to make webm work when build with thumb2 support (LP: #789198)

[Micah Gersten (micahg)]

Thanks, but Firefox 7 comes out on Tuesday, so we won't be respinning for this alone, I've added the bug to my changelog for Firefox 7.

review: Disapprove

Unmerged revisions

859. By Ricardo Salveti on 2011-07-06

* debian/patches/firefox-webm-thumb2-fix.patch:
  - Fix to make webm work when build with thumb2 support (LP: #789198)

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-28 22:45:31 +0000
+++ debian/changelog	2011-07-06 23:52:42 +0000
@@ -1,3 +1,10 @@
+firefox (5.0+build1+nobinonly-0ubuntu0.11.04.4) UNRELEASED; urgency=low
+
+  * debian/patches/firefox-webm-thumb2-fix.patch:
+    - Fix to make webm work when build with thumb2 support (LP: #789198)
+
+ -- Ricardo Salveti de Araujo <[e-mail]>  Fri, 24 Jun 2011 17:43:08 -0300
+
 firefox (5.0+build1+nobinonly-0ubuntu0.11.04.3) natty-security; urgency=low
 
   * No change rebuild to pick up LP: #800857 on armel and powerpc
 
=== added file 'debian/patches/firefox-webm-thumb2-fix.patch'
--- debian/patches/firefox-webm-thumb2-fix.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/firefox-webm-thumb2-fix.patch	2011-07-06 23:52:42 +0000
@@ -0,0 +1,73 @@
+
+# HG changeset patch
+# User Timothy B. Terriberry <[e-mail]>
+# Date 1309201530 25200
+# Node ID 938c253f031cdffd490289d134f704570bc39400
+# Parent  45aa79639b58b88210529f05ce40e0dca747fbba
+Bug 666931 - Enforce alignment for ARM code in Thumb mode in libvpx. r=cpearce
+
+diff --git a/media/libvpx/bug666931.patch b/media/libvpx/bug666931.patch
+new file mode 100644
+--- /dev/null
++++ b/media/libvpx/bug666931.patch
+@@ -0,0 +1,25 @@
++diff --git a/media/libvpx/build/make/ads2gas.pl b/media/libvpx/build/make/ads2gas.pl
++--- a/media/libvpx/build/make/ads2gas.pl
+++++ b/media/libvpx/build/make/ads2gas.pl
++@@ -74,17 +74,20 @@ while (<STDIN>)
++ 
++     # Convert INCLUDE to .INCLUDE "file"
++     s/INCLUDE(\s*)(.*)$/.include $1\"$2\"/;
++ 
++     # Code directive (ARM vs Thumb)
++     s/CODE([0-9][0-9])/.code $1/;
++ 
++     # No AREA required
++-    s/^\s*AREA.*$/.text/;
+++    # But ALIGNs in AREA must be obeyed
+++    s/^\s*AREA.*ALIGN=([0-9])$/.text\n.p2align $1/;
+++    # If no ALIGN, strip the AREA and align to 4 bytes
+++    s/^\s*AREA.*$/.text\n.p2align 2/;
++ 
++     # DCD to .word
++     # This one is for incoming symbols
++     s/DCD\s+\|(\w*)\|/.long $1/;
++ 
++     # DCW to .short
++     s/DCW\s+\|(\w*)\|/.short $1/;
++     s/DCW(.*)/.short $1/;
+diff --git a/media/libvpx/build/make/ads2gas.pl b/media/libvpx/build/make/ads2gas.pl
+--- a/media/libvpx/build/make/ads2gas.pl
++++ b/media/libvpx/build/make/ads2gas.pl
+@@ -74,17 +74,20 @@ while (<STDIN>)
+ 
+     # Convert INCLUDE to .INCLUDE "file"
+     s/INCLUDE(\s*)(.*)$/.include $1\"$2\"/;
+ 
+     # Code directive (ARM vs Thumb)
+     s/CODE([0-9][0-9])/.code $1/;
+ 
+     # No AREA required
+-    s/^\s*AREA.*$/.text/;
++    # But ALIGNs in AREA must be obeyed
++    s/^\s*AREA.*ALIGN=([0-9])$/.text\n.p2align $1/;
++    # If no ALIGN, strip the AREA and align to 4 bytes
++    s/^\s*AREA.*$/.text\n.p2align 2/;
+ 
+     # DCD to .word
+     # This one is for incoming symbols
+     s/DCD\s+\|(\w*)\|/.long $1/;
+ 
+     # DCW to .short
+     s/DCW\s+\|(\w*)\|/.short $1/;
+     s/DCW(.*)/.short $1/;
+diff --git a/media/libvpx/update.sh b/media/libvpx/update.sh
+--- a/media/libvpx/update.sh
++++ b/media/libvpx/update.sh
+@@ -323,3 +323,6 @@
+ 
+ # Patch to fix data race on global function pointers
+ patch -p1 < bug640935.patch
++
++# Patch to fix alignment problems with using ARM asm in Thumb mode.
++patch -p3 < bug666931.patch
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2011-06-10 13:18:29 +0000
+++ debian/patches/series	2011-07-06 23:52:42 +0000
@@ -20,3 +20,4 @@
 fix-selection-drag-autoscroll.patch
 ubuntu-codes-baidu.patch
 powerpc-build-fix.patch
+firefox-webm-thumb2-fix.patch