--- a/components/desktop/thunderbird/patches/firefox-18-libvpx_compile.patch	Fri Sep 30 21:33:56 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-Can probably send upstream. 
-
---- a/media/libvpx/moz.build
-+++ b/media/libvpx/moz.build
-@@ -97,3 +97,8 @@ if CONFIG['OS_TARGET'] == 'Android':
-     ASFLAGS += [
-         '-D__ANDROID__'
-     ]
-+
-+if CONFIG['OS_TARGET'] == 'SunOS':
-+    ASFLAGS += [
-+        '-DSOLARIS'
-+    ]
-diff --git a/media/libvpx/Makefile.in b/media/libvpx/Makefile.in
---- a/media/libvpx/Makefile.in
-+++ b/media/libvpx/Makefile.in
-@@ -121,7 +125,7 @@
- # Workaround a bug of Sun Studio (CR 6963410)
- ifdef SOLARIS_SUNPRO_CC
- ifeq (86,$(findstring 86,$(OS_TEST)))
--filter.o: filter.c Makefile.in
-+filter.o: vp8/common/filter.c Makefile.in
- 	$(REPORT_BUILD)
- 	@$(MAKE_DEPS_AUTO_CC)
- 	$(CC) -o $@ -c $(patsubst -xO[45],-xO3,$(COMPILE_CFLAGS)) $<
-diff --git a/media/libvpx/vpx_ports/x86_abi_support.asm b/media/libvpx/vpx_ports/x86_abi_support.asm
---- a/media/libvpx/vpx_ports/x86_abi_support.asm
-+++ b/media/libvpx/vpx_ports/x86_abi_support.asm
-@@ -225,9 +225,13 @@
-   %ifdef CHROMIUM
-     %ifidn __OUTPUT_FORMAT__,macho32
-       %define HIDDEN_DATA(x) x:private_extern
-+    %elifidn SOLARIS,1
-+      %define HIDDEN_DATA(x) x:data hidden
-     %else
-       %define HIDDEN_DATA(x) x
-     %endif
-+  %elifidn SOLARIS,1
-+    %define HIDDEN_DATA(x) x:data hidden
-   %else
-     %define HIDDEN_DATA(x) x
-   %endif
-@@ -244,9 +248,13 @@
-   %elifidn __OUTPUT_FORMAT__,macho64
-     %ifdef CHROMIUM
-       %define HIDDEN_DATA(x) x:private_extern
-+    %elifidn SOLARIS,1
-+      %define HIDDEN_DATA(x) x:data hidden
-     %else
-       %define HIDDEN_DATA(x) x
-     %endif
-+  %elifidn SOLARIS,1
-+    %define HIDDEN_DATA(x) x:data hidden
-   %else
-     %define HIDDEN_DATA(x) x
-   %endif