Merge lp:~rsalveti/firefox/disable-thumb2 into lp:firefox/trunk

[Ricardo Salveti]

As described by bug 789198, THUMB2 breaks WebM functionality on ARM, and as side effect people can't use youtube even with html5 support.

This patch changes it in a way to make it easier to build with thumb2 again, so people can easily try the thumb2 enabled build to debug the issue.

Unmerged revisions

892. By Ricardo Salveti on 2011-06-24

Disable THUMB2 support at ARM by default to have proper WebM support an
let users play html5 videos (LP: #789198)

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-23 16:42:47 +0000
+++ debian/changelog	2011-06-24 02:22:23 +0000
@@ -52,6 +52,10 @@
     - update debian/control.langpacks
     - refresh debian/control
 
+  [ Ricardo Salveti de Araujo <[e-mail] ]
+  * Disable THUMB2 support at ARM by default to have proper WebM support an
+    let users play html5 videos (LP: #789198)
+
  -- Chris Coulson <[e-mail]>  Wed, 22 Jun 2011 23:53:29 +0100
 
 firefox-trunk (6.0~a1~hg20110523r69965+nobinonly-0ubuntu1) oneiric; urgency=low
 
=== modified file 'debian/rules'
--- debian/rules	2011-06-18 20:05:02 +0000
+++ debian/rules	2011-06-24 02:22:23 +0000
@@ -21,6 +21,8 @@
 MOZ_DEBUG		?= 0
 # 1 = Disable optimizations
 MOZ_NO_OPTIMIZE		?= 0
+# 1 = Enable THUMB2 support when building for ARM
+MOZ_THUMB2		?= 0
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -248,9 +250,11 @@
 ifeq (1,$(MOZ_DEBUG))
 	DEB_DEFINES += -DMOZ_DEBUG
 endif
+ifeq (1,$(MOZ_THUMB2))
 ifneq (,$(findstring armel,$(DEB_HOST_ARCH)))
 	DEB_DEFINES += -DDEB_ENABLE_THUMB2
 endif
+endif
 ifeq (1,$(MOZ_ENABLE_GLOBALMENU))
 	DEB_DEFINES += -DMOZ_ENABLE_GLOBALMENU
 endif