firefox: use CXXFLAGS from buildsystem, try to resurrect lemote support

5 files changed, 67 insertions, 2 deletions

diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 947e35f15..2bfb74a82 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -42,7 +42,11 @@ else
 CONFIGURE_ARGS+=	--disable-debug
 endif
 
-CONFIGURE_ENV+=		CROSS_COMPILE=1 OS_ARCH=Linux OS_TARGET=Linux OS_TEST=$(ADK_TARGET_ARCH) \
+CONFIGURE_ENV+=		CROSS_COMPILE=1 \
+			OS_ARCH=Linux \
+			OS_TARGET=Linux \
+			OS_TEST="$(ADK_TARGET_ARCH)" \
+			OS_CXXFLAGS="$(TARGET_CXXFLAGS)" \
 			PYTHON="$(PYTHON)" \
 			HOST_CC="$(HOST_CC)" \
 			HOST_CPPFLAGS="$(HOST_CPPFLAGS)" \
@@ -74,7 +78,6 @@ CONFIGURE_ARGS+=	--prefix=/usr \
 			--disable-tree-freetype \
 			--enable-system-ffi \
 			--enable-system-sqlite \
-			--enable-webrtc \
 			--enable-chrome-format=jar \
 			--enable-necko-protocols=all \
 			--enable-alsa \
@@ -104,7 +107,11 @@ CONFIGURE_ARGS+=	--prefix=/usr \
 			--disable-elf-hack 
 
 ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y)
+CONFIGURE_ARGS+=	--disable-ion \
+			--disable-webrtc
 TARGET_CFLAGS:=		$(subst Os,g3,$(TARGET_CFLAGS))
+else
+CONFIGURE_ARGS+=	--enable-webrtc
 endif
 
 XAKE_FLAGS+=		CROSS_COMPILE=1 OS_ARCH="Linux" OS_TEST="$(ADK_TARGET_ARCH)" OS_RELEASE="2.6" 
diff --git a/package/firefox/patches/patch-media_libyuv_include_libyuv_row_h b/package/firefox/patches/patch-media_libyuv_include_libyuv_row_h
new file mode 100644
index 000000000..5f035b27b
--- /dev/null
+++ b/package/firefox/patches/patch-media_libyuv_include_libyuv_row_h
@@ -0,0 +1,12 @@
+--- firefox-49.0.2.orig/media/libyuv/include/libyuv/row.h	2016-05-12 19:13:17.000000000 +0200
++++ firefox-49.0.2/media/libyuv/include/libyuv/row.h	2016-11-11 18:20:11.589488367 +0100
+@@ -332,7 +332,8 @@ extern "C" {
+ // The following are available on Mips platforms:
+ #if !defined(LIBYUV_DISABLE_MIPS) && defined(__mips__)
+ #define HAS_COPYROW_MIPS
+-#if defined(__mips_dsp) && (__mips_dsp_rev >= 2)
++#if defined(__mips_dsp) && (__mips_dsp_rev >= 2) && \
++    (_MIPS_SIM == _MIPS_SIM_ABI32)
+ #define HAS_I422TOABGRROW_MIPS_DSPR2
+ #define HAS_I422TOARGBROW_MIPS_DSPR2
+ #define HAS_I422TOBGRAROW_MIPS_DSPR2
diff --git a/package/firefox/patches/patch-media_libyuv_source_rotate_mips_cc b/package/firefox/patches/patch-media_libyuv_source_rotate_mips_cc
new file mode 100644
index 000000000..f8d8ab6e3
--- /dev/null
+++ b/package/firefox/patches/patch-media_libyuv_source_rotate_mips_cc
@@ -0,0 +1,12 @@
+--- firefox-49.0.2.orig/media/libyuv/source/rotate_mips.cc	2016-05-12 19:13:17.000000000 +0200
++++ firefox-49.0.2/media/libyuv/source/rotate_mips.cc	2016-11-11 18:20:57.559265197 +0100
+@@ -18,7 +18,8 @@ extern "C" {
+ #endif
+ 
+ #if !defined(LIBYUV_DISABLE_MIPS) && \
+-    defined(__mips_dsp) && (__mips_dsp_rev >= 2)
++    defined(__mips_dsp) && (__mips_dsp_rev >= 2) && \
++    (_MIPS_SIM == _MIPS_SIM_ABI32)
+ 
+ void TransposeWx8_MIPS_DSPR2(const uint8* src, int src_stride,
+                              uint8* dst, int dst_stride,
diff --git a/package/firefox/patches/patch-media_libyuv_source_row_mips_cc b/package/firefox/patches/patch-media_libyuv_source_row_mips_cc
new file mode 100644
index 000000000..31c499fe2
--- /dev/null
+++ b/package/firefox/patches/patch-media_libyuv_source_row_mips_cc
@@ -0,0 +1,22 @@
+--- firefox-49.0.2.orig/media/libyuv/source/row_mips.cc	2016-05-12 19:13:17.000000000 +0200
++++ firefox-49.0.2/media/libyuv/source/row_mips.cc	2016-11-11 18:22:43.471358929 +0100
+@@ -16,7 +16,8 @@ extern "C" {
+ #endif
+ 
+ // The following are available on Mips platforms:
+-#if !defined(LIBYUV_DISABLE_MIPS) && defined(__mips__)
++#if !defined(LIBYUV_DISABLE_MIPS) && defined(__mips__) && \
++    (_MIPS_SIM == _MIPS_SIM_ABI32)
+ 
+ #include <sgidefs.h>
+ 
+@@ -414,7 +415,8 @@ void CopyRow_MIPS(const uint8* src, uint
+ 
+ // MIPS DSPR2 functions
+ #if !defined(LIBYUV_DISABLE_MIPS) && defined(__mips_dsp) && \
+-    (__mips_dsp_rev >= 2)
++    (__mips_dsp_rev >= 2) && \
++    (_MIPS_SIM == _MIPS_SIM_ABI32)
+ void SplitUVRow_MIPS_DSPR2(const uint8* src_uv, uint8* dst_u, uint8* dst_v,
+                            int width) {
+   __asm__ __volatile__ (
diff --git a/package/firefox/patches/patch-media_libyuv_source_scale_mips_cc b/package/firefox/patches/patch-media_libyuv_source_scale_mips_cc
new file mode 100644
index 000000000..1e138e82a
--- /dev/null
+++ b/package/firefox/patches/patch-media_libyuv_source_scale_mips_cc
@@ -0,0 +1,12 @@
+--- firefox-49.0.2.orig/media/libyuv/source/scale_mips.cc	2016-05-12 19:13:17.000000000 +0200
++++ firefox-49.0.2/media/libyuv/source/scale_mips.cc	2016-11-11 18:23:07.984306408 +0100
+@@ -18,7 +18,8 @@ extern "C" {
+ 
+ // This module is for GCC MIPS DSPR2
+ #if !defined(LIBYUV_DISABLE_MIPS) && \
+-    defined(__mips_dsp) && (__mips_dsp_rev >= 2)
++    defined(__mips_dsp) && (__mips_dsp_rev >= 2) && \
++    (_MIPS_SIM == _MIPS_SIM_ABI32)
+ 
+ void ScaleRowDown2_MIPS_DSPR2(const uint8* src_ptr, ptrdiff_t src_stride,
+                               uint8* dst, int dst_width) {