firefox: update to 50.1.0

6 files changed, 3 insertions, 64 deletions

diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 20d01a30e..ccab4fe6b 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		firefox
-PKG_VERSION:=		49.0.2
+PKG_VERSION:=		50.1.0
 PKG_RELEASE:=		1
-PKG_HASH:=		67abe9202958c36bf60454c91065953aa8f6ede83ea1c0e9cdb870c3fc3d56d0
+PKG_HASH:=		54bb9bccbf9eed0c7715ae7f45330bf41ce24b756f5fdecb380e06709a6ac5a4
 PKG_DESCR:=		graphical webbrowser
 PKG_SECTION:=		x11/apps
 PKG_DEPENDS:=		alsa-lib glib libgtk2 libgtk3 libpng libtiff libxcursor libffi
@@ -118,9 +118,6 @@ XAKE_FLAGS+=		CROSS_COMPILE=1 OS_ARCH="Linux" OS_TEST="$(ADK_TARGET_ARCH)" OS_RE
 XAKE_FLAGS+=		HOST_CC=$(HOST_CC) HOST_LDFLAGS=$(HOST_LDFLAGS)
 XAKE_FLAGS+=            ARCHFLAG="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS) -lnss3 -lnssutil3 -lsmime3 -lssl3 -fPIC"
 
-post-extract:
-	rm $(WRKSRC)/image/ClippedImage.cpp.rej
-
 pre-configure:
 	$(SED) '/^freetype\/ftcache.h/a freetype\/ftfntfmt.h' $(WRKSRC)/config/system-headers
 
diff --git a/package/firefox/files/firefox b/package/firefox/files/firefox
index 0ef6ebafa..4b93d8e8d 100755
--- a/package/firefox/files/firefox
+++ b/package/firefox/files/firefox
@@ -1,2 +1,2 @@
 #!/bin/sh
-env LD_LIBRARY_PATH=/usr/lib/firefox-49.0.2 /usr/lib/firefox-49.0.2/firefox
+env LD_LIBRARY_PATH=/usr/lib/firefox-50.1.0 /usr/lib/firefox-50.1.0/firefox
diff --git a/package/firefox/patches/patch-media_libyuv_include_libyuv_row_h b/package/firefox/patches/patch-media_libyuv_include_libyuv_row_h
deleted file mode 100644
index 5f035b27b..000000000
--- a/package/firefox/patches/patch-media_libyuv_include_libyuv_row_h
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
deleted file mode 100644
index f8d8ab6e3..000000000
--- a/package/firefox/patches/patch-media_libyuv_source_rotate_mips_cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
deleted file mode 100644
index 31c499fe2..000000000
--- a/package/firefox/patches/patch-media_libyuv_source_row_mips_cc
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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
deleted file mode 100644
index 1e138e82a..000000000
--- a/package/firefox/patches/patch-media_libyuv_source_scale_mips_cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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) {