21 files changed, 3025 insertions, 387 deletions

diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 47089609a0c7..c762f4c01e47 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	seamonkey
-DISTVERSION=	2.24
+DISTVERSION=	2.25
 CATEGORIES?=	www mail news editors irc ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
 		https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/
@@ -12,18 +12,23 @@ EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	The open source, standards compliant web browser
 
-BUILD_DEPENDS=	nspr>=4.10.2:${PORTSDIR}/devel/nspr \
+BUILD_DEPENDS=	nspr>=4.10.3:${PORTSDIR}/devel/nspr \
 		nss>=3.15.4:${PORTSDIR}/security/nss \
-		sqlite3>=3.8.0.2:${PORTSDIR}/databases/sqlite3 \
+		harfbuzz>=0.9.25:${PORTSDIR}/print/harfbuzz \
+		libvorbis>=1.3.4:${PORTSDIR}/audio/libvorbis \
+		opus>=1.1:${PORTSDIR}/audio/opus \
+		libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \
+		sqlite3>=3.8.1:${PORTSDIR}/databases/sqlite3 \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
 		v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
+		zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip
 #		cairo>=1.12.16,2:${PORTSDIR}/graphics/cairo \
 
 LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
 
 EM_VERSION=	1.6.1_pre20140112
-L_VERSION=	2.9b1
+L_VERSION=	3.0b1
 
 SSP_UNSAFE=	yes
 USE_AUTOTOOLS=	autoconf213:env
@@ -78,6 +83,23 @@ MOZSRC:=	${WRKSRC}/mozilla
 
 XPI_LIBDIR=	${PREFIX}/lib/xpi
 
+# avoid clang 3.2/3.3 crash in js/src/jsgc.cpp on refillFreeList<(js::AllowGC)1>
+# http://svnweb.freebsd.org/changeset/base/255804
+.if ${CHOSEN_COMPILER_TYPE} == clang && ${ARCH} == i386 && ${OSVERSION} < 1000056
+. if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
+BROKEN=		Cannot build with OPTIMIZED_CFLAGS option due to \
+		a ${CHOSEN_COMPILER_TYPE} bug: unset the option or \
+		use FAVORITE_COMPILER=gcc in Makefile.local/make.conf
+# apply workaround only for -O2 or greater
+. elif ${CXXFLAGS:M-O*} && ! ${CXXFLAGS:M-O[01]}
+.  if ${MACHINE_CPU:Msse2}
+CXXFLAGS+=	-msse2
+.  else
+CXXFLAGS+=	-O1
+.  endif
+. endif
+.endif
+
 .if ${PORT_OPTIONS:MALSA}
 BUILD_DEPENDS+=	alsa-lib>=1.0.27.2_1:${PORTSDIR}/audio/alsa-lib
 .endif
diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo
index fa0381f1d79e..3caacf29929f 100644
--- a/www/seamonkey/distinfo
+++ b/www/seamonkey/distinfo
@@ -1,4 +1,4 @@
-SHA256 (seamonkey-2.24.source.tar.bz2) = 63855265b4754dd056af8d611b50219577a592466cdf1d3865028d86ed680474
-SIZE (seamonkey-2.24.source.tar.bz2) = 149845514
+SHA256 (seamonkey-2.25.source.tar.bz2) = d99c19338737d75016561340c4bfa0087e13d055971579135eb205ae975c022a
+SIZE (seamonkey-2.25.source.tar.bz2) = 155695615
 SHA256 (enigmail-1.6.1_pre20140112.tar.xz) = 2d89a9186c3ccfc9397c933c6f63c0518224fea0096d7a292dba3765de088149
 SIZE (enigmail-1.6.1_pre20140112.tar.xz) = 916028
diff --git a/www/seamonkey/files/extra-patch-mailnews-extensions-enigmail-config-getOsTarget.pl b/www/seamonkey/files/extra-patch-mailnews-extensions-enigmail-config-getOsTarget.pl
index c96f7ee2063d..06cc849dd649 100644
--- a/www/seamonkey/files/extra-patch-mailnews-extensions-enigmail-config-getOsTarget.pl
+++ b/www/seamonkey/files/extra-patch-mailnews-extensions-enigmail-config-getOsTarget.pl
@@ -41,3 +41,13 @@ index 91285cd..cf4a233 100755
    if ($targetOs eq "SunOS") {
      $targetComp = "sunc";
    }
+@@ -107,6 +109,9 @@ elsif ($srcComp =~ /cc/) {
+   elsif ($targetOs eq "AIX") {
+     $targetComp = "ibmc";
+   }
++  else {
++    $targetComp = "gcc3";
++  }
+ }
+ else {
+   $targetComp = $srcComp;
diff --git a/www/seamonkey/files/patch-bug806917 b/www/seamonkey/files/patch-bug806917
new file mode 100644
index 000000000000..76874da3314a
--- /dev/null
+++ b/www/seamonkey/files/patch-bug806917
@@ -0,0 +1,1996 @@
+commit cb40a26
+Author: Alessandro Decina <alessandro.d@gmail.com>
+Date:   Fri Jan 03 08:16:54 2014 -0800
+
+    Bug 806917 - support GStreamer 1.0
+---
+ configure.in                                      |  66 ++-
+ content/media/gstreamer/GStreamerAllocator.cpp    | 198 +++++++
+ content/media/gstreamer/GStreamerAllocator.h      |  25 +
+ content/media/gstreamer/GStreamerFormatHelper.cpp |  13 +-
+ content/media/gstreamer/GStreamerFunctionList.h   |  93 +++-
+ content/media/gstreamer/GStreamerLoader.cpp       |  48 +-
+ content/media/gstreamer/GStreamerLoader.h         |   8 +
+ content/media/gstreamer/GStreamerReader-0.10.cpp  | 203 +++++++
+ content/media/gstreamer/GStreamerReader.cpp       | 632 ++++++++++++++--------
+ content/media/gstreamer/GStreamerReader.h         |  42 +-
+ content/media/gstreamer/moz.build                 |  11 +-
+ content/media/test/manifest.js                    |   6 +-
+ 12 files changed, 1061 insertions(+), 284 deletions(-)
+
+diff --git configure.in configure.in
+index 9776b8d..0b1698d 100644
+--- mozilla/configure.in
++++ mozilla/configure.in
+@@ -3955,6 +3955,7 @@ MOZ_SAMPLE_TYPE_FLOAT32=
+ MOZ_SAMPLE_TYPE_S16=
+ MOZ_OPUS=1
+ MOZ_WEBM=1
++MOZ_GSTREAMER=
+ MOZ_DIRECTSHOW=
+ MOZ_WMF=
+ MOZ_FMP4=
+@@ -5606,43 +5607,60 @@ dnl = Enable GStreamer
+ dnl ========================================================
+ if test "$OS_TARGET" = "Linux"; then
+   MOZ_GSTREAMER=1
++  GST_API_VERSION=0.10
+ fi
+ 
+-MOZ_ARG_ENABLE_BOOL(gstreamer,
+-[  --enable-gstreamer           Enable GStreamer support],
+-MOZ_GSTREAMER=1,
+-MOZ_GSTREAMER=)
+-
+-if test "$MOZ_GSTREAMER"; then
+-    # API version, eg 0.10, 1.0 etc
++MOZ_ARG_ENABLE_STRING(gstreamer,
++[  --enable-gstreamer[=0.10]           Enable GStreamer support],
++[ MOZ_GSTREAMER=1
++  # API version, eg 0.10, 1.0 etc
++  if test -z "$enableval" -o "$enableval" = "yes"; then
+     GST_API_VERSION=0.10
++  elif test "$enableval" = "no"; then
++    MOZ_GSTREAMER=
++  else
++    GST_API_VERSION=$enableval
++  fi],
++)
++
++if test -n "$MOZ_GSTREAMER"; then
+     # core/base release number
+-    GST_VERSION=0.10.25
++    if test "$GST_API_VERSION" = "1.0"; then
++      GST_VERSION=1.0
++    else
++      GST_VERSION=0.10.25
++    fi
++
+     PKG_CHECK_MODULES(GSTREAMER,
+                       gstreamer-$GST_API_VERSION >= $GST_VERSION
+                       gstreamer-app-$GST_API_VERSION
+-                      gstreamer-plugins-base-$GST_API_VERSION, ,
+-                      AC_MSG_ERROR([gstreamer and gstreamer-plugins-base development packages are needed to build gstreamer backend. Install them or disable gstreamer support with --disable-gstreamer]))
+-    if test -n "$GSTREAMER_LIBS"; then
+-       _SAVE_LDFLAGS=$LDFLAGS
+-       LDFLAGS="$LDFLAGS $GSTREAMER_LIBS -lgstvideo-$GST_API_VERSION"
+-       AC_TRY_LINK(,[return 0;],_HAVE_LIBGSTVIDEO=1,_HAVE_LIBGSTVIDEO=)
+-       if test -n "$_HAVE_LIBGSTVIDEO" ; then
+-          GSTREAMER_LIBS="$GSTREAMER_LIBS -lgstvideo-$GST_API_VERSION"
+-       else
+-          AC_MSG_ERROR([gstreamer-plugins-base found, but no libgstvideo. Something has gone terribly wrong. Try reinstalling gstreamer-plugins-base; failing that, disable the gstreamer backend with --disable-gstreamer.])
+-       fi
+-       LDFLAGS=$_SAVE_LDFLAGS
++                      gstreamer-plugins-base-$GST_API_VERSION,
++                      [_HAVE_GSTREAMER=1],
++                      [_HAVE_GSTREAMER=])
++    if test -z "$_HAVE_GSTREAMER"; then
++        AC_MSG_ERROR([gstreamer and gstreamer-plugins-base development packages are needed to build gstreamer backend. Install them or disable gstreamer support with --disable-gstreamer])
++    fi
++
++    _SAVE_LDFLAGS=$LDFLAGS
++    LDFLAGS="$LDFLAGS $GSTREAMER_LIBS -lgstvideo-$GST_API_VERSION"
++    AC_TRY_LINK(,[return 0;],_HAVE_LIBGSTVIDEO=1,_HAVE_LIBGSTVIDEO=)
++    if test -n "$_HAVE_LIBGSTVIDEO" ; then
++        GSTREAMER_LIBS="$GSTREAMER_LIBS -lgstvideo-$GST_API_VERSION"
+     else
+-       AC_MSG_ERROR([gstreamer and gstreamer-plugins-base development packages are needed to build gstreamer backend. Install them or disable gstreamer support with --disable-gstreamer])
++        AC_MSG_ERROR([gstreamer-plugins-base found, but no libgstvideo. Something has gone terribly wrong. Try reinstalling gstreamer-plugins-base; failing that, disable the gstreamer backend with --disable-gstreamer.])
+     fi
++    LDFLAGS=$_SAVE_LDFLAGS
++
++    AC_SUBST(GSTREAMER_CFLAGS)
++    AC_SUBST(GSTREAMER_LIBS)
+ fi
+-AC_SUBST(GSTREAMER_CFLAGS)
+-AC_SUBST(GSTREAMER_LIBS)
++
+ AC_SUBST(MOZ_GSTREAMER)
++AC_SUBST(GST_API_VERSION)
+ 
+ if test -n "$MOZ_GSTREAMER"; then
+-   AC_DEFINE(MOZ_GSTREAMER)
++     AC_DEFINE(MOZ_GSTREAMER)
++     AC_DEFINE_UNQUOTED(GST_API_VERSION, "$GST_API_VERSION")
+ fi
+ 
+ 
+diff --git content/media/gstreamer/GStreamerAllocator.cpp content/media/gstreamer/GStreamerAllocator.cpp
+new file mode 100644
+index 0000000..69d0385
+--- /dev/null
++++ mozilla/content/media/gstreamer/GStreamerAllocator.cpp
+@@ -0,0 +1,198 @@
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
++#include "GStreamerAllocator.h"
++
++#include <gst/video/video.h>
++#include <gst/video/gstvideometa.h>
++
++#include "GStreamerLoader.h"
++
++using namespace mozilla::layers;
++
++namespace mozilla {
++
++typedef struct
++{
++  GstAllocator parent;
++  GStreamerReader *reader;
++} MozGfxMemoryAllocator;
++
++typedef struct
++{
++  GstAllocatorClass parent;
++} MozGfxMemoryAllocatorClass;
++
++typedef struct
++{
++  GstMemory memory;
++  PlanarYCbCrImage* image;
++  guint8* data;
++} MozGfxMemory;
++
++typedef struct
++{
++  GstMeta meta;
++} MozGfxMeta;
++
++typedef struct
++{
++  GstVideoBufferPoolClass parent_class;
++} MozGfxBufferPoolClass;
++
++typedef struct
++{
++  GstVideoBufferPool pool;
++} MozGfxBufferPool;
++
++G_DEFINE_TYPE(MozGfxMemoryAllocator, moz_gfx_memory_allocator, GST_TYPE_ALLOCATOR);
++G_DEFINE_TYPE(MozGfxBufferPool, moz_gfx_buffer_pool, GST_TYPE_VIDEO_BUFFER_POOL);
++
++void
++moz_gfx_memory_reset(MozGfxMemory *mem)
++{
++  if (mem->image)
++    mem->image->Release();
++
++  ImageContainer* container = ((MozGfxMemoryAllocator*) mem->memory.allocator)->reader->GetImageContainer();
++  ImageFormat format = PLANAR_YCBCR;
++  mem->image = reinterpret_cast<PlanarYCbCrImage*>(container->CreateImage(&format, 1).get());
++  mem->data = mem->image->AllocateAndGetNewBuffer(mem->memory.size);
++}
++
++static GstMemory*
++moz_gfx_memory_allocator_alloc(GstAllocator* aAllocator, gsize aSize,
++    GstAllocationParams* aParams)
++{
++  MozGfxMemory* mem = g_slice_new (MozGfxMemory);
++  gsize maxsize = aSize + aParams->prefix + aParams->padding;
++  gst_memory_init(GST_MEMORY_CAST (mem),
++                  (GstMemoryFlags)aParams->flags,
++                  aAllocator, NULL, maxsize, aParams->align,
++                  aParams->prefix, aSize);
++  mem->image = NULL;
++  moz_gfx_memory_reset(mem);
++
++  return (GstMemory *) mem;
++}
++
++static void
++moz_gfx_memory_allocator_free (GstAllocator * allocator, GstMemory * gmem)
++{
++  MozGfxMemory *mem = (MozGfxMemory *) gmem;
++
++  if (mem->memory.parent)
++    goto sub_mem;
++
++  if (mem->image)
++    mem->image->Release();
++
++sub_mem:
++  g_slice_free (MozGfxMemory, mem);
++}
++
++static gpointer
++moz_gfx_memory_map (MozGfxMemory * mem, gsize maxsize, GstMapFlags flags)
++{
++  // check that the allocation didn't fail
++  if (mem->data == nullptr)
++    return nullptr;
++
++  return mem->data + mem->memory.offset;
++}
++
++static gboolean
++moz_gfx_memory_unmap (MozGfxMemory * mem)
++{
++  return TRUE;
++}
++
++static MozGfxMemory *
++moz_gfx_memory_share (MozGfxMemory * mem, gssize offset, gsize size)
++{
++  MozGfxMemory *sub;
++  GstMemory *parent;
++
++  /* find the real parent */
++  if ((parent = mem->memory.parent) == NULL)
++    parent = (GstMemory *) mem;
++
++  if (size == (gsize) -1)
++    size = mem->memory.size - offset;
++
++  /* the shared memory is always readonly */
++  sub = g_slice_new (MozGfxMemory);
++
++  gst_memory_init (GST_MEMORY_CAST (sub),
++      (GstMemoryFlags) (GST_MINI_OBJECT_FLAGS (parent) | GST_MINI_OBJECT_FLAG_LOCK_READONLY),
++      mem->memory.allocator, &mem->memory, mem->memory.maxsize, mem->memory.align,
++      mem->memory.offset + offset, size);
++
++  sub->image = mem->image;
++  sub->data = mem->data;
++
++  return sub;
++}
++
++static void
++moz_gfx_memory_allocator_class_init (MozGfxMemoryAllocatorClass * klass)
++{
++  GstAllocatorClass *allocator_class;
++
++  allocator_class = (GstAllocatorClass *) klass;
++
++  allocator_class->alloc = moz_gfx_memory_allocator_alloc;
++  allocator_class->free = moz_gfx_memory_allocator_free;
++}
++
++static void
++moz_gfx_memory_allocator_init (MozGfxMemoryAllocator * allocator)
++{
++  GstAllocator *alloc = GST_ALLOCATOR_CAST (allocator);
++
++  alloc->mem_type = "moz-gfx-image";
++  alloc->mem_map = (GstMemoryMapFunction) moz_gfx_memory_map;
++  alloc->mem_unmap = (GstMemoryUnmapFunction) moz_gfx_memory_unmap;
++  alloc->mem_share = (GstMemoryShareFunction) moz_gfx_memory_share;
++  /* fallback copy and is_span */
++}
++
++void
++moz_gfx_memory_allocator_set_reader(GstAllocator* aAllocator, GStreamerReader* aReader)
++{
++  MozGfxMemoryAllocator *allocator = (MozGfxMemoryAllocator *) aAllocator;
++  allocator->reader = aReader;
++}
++
++nsRefPtr<PlanarYCbCrImage>
++moz_gfx_memory_get_image(GstMemory *aMemory)
++{
++  NS_ASSERTION(GST_IS_MOZ_GFX_MEMORY_ALLOCATOR(aMemory->allocator), "Should be a gfx image");
++
++  return ((MozGfxMemory *) aMemory)->image;
++}
++
++void
++moz_gfx_buffer_pool_reset_buffer (GstBufferPool* aPool, GstBuffer* aBuffer)
++{
++  GstMemory* mem = gst_buffer_peek_memory(aBuffer, 0);
++
++  NS_ASSERTION(GST_IS_MOZ_GFX_MEMORY_ALLOCATOR(mem->allocator), "Should be a gfx image");
++  moz_gfx_memory_reset((MozGfxMemory *) mem);
++  GST_BUFFER_POOL_CLASS(moz_gfx_buffer_pool_parent_class)->reset_buffer(aPool, aBuffer);
++}
++
++static void
++moz_gfx_buffer_pool_class_init (MozGfxBufferPoolClass * klass)
++{
++  GstBufferPoolClass *pool_class = (GstBufferPoolClass *) klass;
++  pool_class->reset_buffer = moz_gfx_buffer_pool_reset_buffer;
++}
++
++static void
++moz_gfx_buffer_pool_init (MozGfxBufferPool * pool)
++{
++}
++
++} // namespace mozilla
+diff --git content/media/gstreamer/GStreamerAllocator.h content/media/gstreamer/GStreamerAllocator.h
+new file mode 100644
+index 0000000..05a4412
+--- /dev/null
++++ mozilla/content/media/gstreamer/GStreamerAllocator.h
+@@ -0,0 +1,25 @@
++/* This Source Code Form is subject to the terms of the Mozilla Public
++ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
++ * You can obtain one at http://mozilla.org/MPL/2.0/. */
++
++#if !defined(GStreamerAllocator_h_)
++#define GStreamerAllocator_h_
++
++#include "GStreamerReader.h"
++
++#define GST_TYPE_MOZ_GFX_MEMORY_ALLOCATOR   (moz_gfx_memory_allocator_get_type())
++#define GST_IS_MOZ_GFX_MEMORY_ALLOCATOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_MOZ_GFX_MEMORY_ALLOCATOR))
++#define GST_TYPE_MOZ_GFX_BUFFER_POOL   (moz_gfx_buffer_pool_get_type())
++#define GST_IS_MOZ_GFX_BUFFER_POOL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_MOZ_GFX_BUFFER_POOL))
++
++namespace mozilla {
++
++GType moz_gfx_memory_allocator_get_type();
++void moz_gfx_memory_allocator_set_reader(GstAllocator *aAllocator, GStreamerReader* aReader);
++nsRefPtr<layers::PlanarYCbCrImage> moz_gfx_memory_get_image(GstMemory *aMemory);
++
++GType moz_gfx_buffer_pool_get_type();
++
++} // namespace mozilla
++
++#endif
+diff --git content/media/gstreamer/GStreamerFormatHelper.cpp content/media/gstreamer/GStreamerFormatHelper.cpp
+index be71331..a5e5db8 100644
+--- mozilla/content/media/gstreamer/GStreamerFormatHelper.cpp
++++ mozilla/content/media/gstreamer/GStreamerFormatHelper.cpp
+@@ -294,12 +294,23 @@ bool GStreamerFormatHelper::CanHandleCodecCaps(GstCaps* aCaps)
+ GList* GStreamerFormatHelper::GetFactories() {
+   NS_ASSERTION(sLoadOK, "GStreamer library not linked");
+ 
+-  uint32_t cookie = gst_default_registry_get_feature_list_cookie ();
++#if GST_VERSION_MAJOR >= 1
++  uint32_t cookie = gst_registry_get_feature_list_cookie(gst_registry_get());
++#else
++  uint32_t cookie = gst_default_registry_get_feature_list_cookie();
++#endif
+   if (cookie != mCookie) {
+     g_list_free(mFactories);
++#if GST_VERSION_MAJOR >= 1
++    mFactories =
++      gst_registry_feature_filter(gst_registry_get(),
++                                  (GstPluginFeatureFilter)FactoryFilter,
++                                  false, nullptr);
++#else
+     mFactories =
+       gst_default_registry_feature_filter((GstPluginFeatureFilter)FactoryFilter,
+                                           false, nullptr);
++#endif
+     mCookie = cookie;
+   }
+ 
+diff --git content/media/gstreamer/GStreamerFunctionList.h content/media/gstreamer/GStreamerFunctionList.h
+index 56877c0..e169449 100644
+--- mozilla/content/media/gstreamer/GStreamerFunctionList.h
++++ mozilla/content/media/gstreamer/GStreamerFunctionList.h
+@@ -9,7 +9,6 @@
+  * List of symbol names we need to dlsym from the gstreamer library.
+  */
+ GST_FUNC(LIBGSTAPP, gst_app_sink_get_type)
+-GST_FUNC(LIBGSTAPP, gst_app_sink_pull_buffer)
+ GST_FUNC(LIBGSTAPP, gst_app_sink_set_callbacks)
+ GST_FUNC(LIBGSTAPP, gst_app_src_end_of_stream)
+ GST_FUNC(LIBGSTAPP, gst_app_src_get_size)
+@@ -22,10 +21,8 @@ GST_FUNC(LIBGSTAPP, gst_app_src_set_stream_type)
+ GST_FUNC(LIBGSTREAMER, gst_bin_get_by_name)
+ GST_FUNC(LIBGSTREAMER, gst_bin_get_type)
+ GST_FUNC(LIBGSTREAMER, gst_bin_iterate_recurse)
+-GST_FUNC(LIBGSTREAMER, gst_buffer_copy_metadata)
+ GST_FUNC(LIBGSTREAMER, gst_buffer_get_type)
+ GST_FUNC(LIBGSTREAMER, gst_buffer_new)
+-GST_FUNC(LIBGSTREAMER, gst_buffer_new_and_alloc)
+ GST_FUNC(LIBGSTREAMER, gst_bus_set_sync_handler)
+ GST_FUNC(LIBGSTREAMER, gst_bus_timed_pop_filtered)
+ GST_FUNC(LIBGSTREAMER, gst_caps_append)
+@@ -37,47 +34,37 @@ GST_FUNC(LIBGSTREAMER, gst_caps_new_any)
+ GST_FUNC(LIBGSTREAMER, gst_caps_new_empty)
+ GST_FUNC(LIBGSTREAMER, gst_caps_new_full)
+ GST_FUNC(LIBGSTREAMER, gst_caps_new_simple)
+-GST_FUNC(LIBGSTREAMER, gst_caps_unref)
+-GST_FUNC(LIBGSTREAMER, gst_element_factory_get_klass)
++GST_FUNC(LIBGSTREAMER, gst_caps_set_simple)
+ GST_FUNC(LIBGSTREAMER, gst_element_factory_get_static_pad_templates)
+ GST_FUNC(LIBGSTREAMER, gst_element_factory_get_type)
+ GST_FUNC(LIBGSTREAMER, gst_element_factory_make)
+ GST_FUNC(LIBGSTREAMER, gst_element_get_factory)
+-GST_FUNC(LIBGSTREAMER, gst_element_get_pad)
++GST_FUNC(LIBGSTREAMER, gst_element_get_static_pad)
+ GST_FUNC(LIBGSTREAMER, gst_element_get_type)
+ GST_FUNC(LIBGSTREAMER, gst_element_query_convert)
+ GST_FUNC(LIBGSTREAMER, gst_element_query_duration)
+ GST_FUNC(LIBGSTREAMER, gst_element_seek_simple)
+ GST_FUNC(LIBGSTREAMER, gst_element_set_state)
+-GST_FUNC(LIBGSTREAMER, gst_event_parse_new_segment)
+ GST_FUNC(LIBGSTREAMER, gst_flow_get_name)
+ GST_FUNC(LIBGSTREAMER, gst_init)
+ GST_FUNC(LIBGSTREAMER, gst_init_check)
+ GST_FUNC(LIBGSTREAMER, gst_iterator_next)
+ GST_FUNC(LIBGSTREAMER, gst_message_parse_error)
+ GST_FUNC(LIBGSTREAMER, gst_message_type_get_name)
+-GST_FUNC(LIBGSTREAMER, gst_mini_object_get_type)
+-GST_FUNC(LIBGSTREAMER, gst_mini_object_new)
+ GST_FUNC(LIBGSTREAMER, gst_mini_object_ref)
+ GST_FUNC(LIBGSTREAMER, gst_mini_object_unref)
+ GST_FUNC(LIBGSTREAMER, gst_object_get_name)
+ GST_FUNC(LIBGSTREAMER, gst_object_get_parent)
+ GST_FUNC(LIBGSTREAMER, gst_object_unref)
+-GST_FUNC(LIBGSTREAMER, gst_pad_add_event_probe)
+-GST_FUNC(LIBGSTREAMER, gst_pad_alloc_buffer)
+ GST_FUNC(LIBGSTREAMER, gst_pad_get_element_private)
+-GST_FUNC(LIBGSTREAMER, gst_pad_get_negotiated_caps)
+-GST_FUNC(LIBGSTREAMER, gst_pad_set_bufferalloc_function)
+ GST_FUNC(LIBGSTREAMER, gst_pad_set_element_private)
+ GST_FUNC(LIBGSTREAMER, gst_parse_bin_from_description)
+ GST_FUNC(LIBGSTREAMER, gst_pipeline_get_bus)
+ GST_FUNC(LIBGSTREAMER, gst_pipeline_get_type)
+ GST_FUNC(LIBGSTREAMER, gst_plugin_feature_get_rank)
+ GST_FUNC(LIBGSTREAMER, gst_registry_feature_filter)
+-GST_FUNC(LIBGSTREAMER, gst_registry_get_default)
+ GST_FUNC(LIBGSTREAMER, gst_registry_get_feature_list_cookie)
+ GST_FUNC(LIBGSTREAMER, gst_segment_init)
+-GST_FUNC(LIBGSTREAMER, gst_segment_set_newsegment)
+ GST_FUNC(LIBGSTREAMER, gst_segment_to_stream_time)
+ GST_FUNC(LIBGSTREAMER, gst_static_caps_get)
+ GST_FUNC(LIBGSTREAMER, gst_structure_copy)
+@@ -85,11 +72,82 @@ GST_FUNC(LIBGSTREAMER, gst_structure_get_int)
+ GST_FUNC(LIBGSTREAMER, gst_structure_get_value)
+ GST_FUNC(LIBGSTREAMER, gst_structure_new)
+ GST_FUNC(LIBGSTREAMER, gst_util_uint64_scale)
++
++#if GST_VERSION_MAJOR == 0
++GST_FUNC(LIBGSTAPP, gst_app_sink_pull_buffer)
++GST_FUNC(LIBGSTREAMER, gst_buffer_copy_metadata)
++GST_FUNC(LIBGSTREAMER, gst_buffer_new_and_alloc)
++GST_FUNC(LIBGSTREAMER, gst_caps_unref)
++GST_FUNC(LIBGSTREAMER, gst_element_factory_get_klass)
++GST_FUNC(LIBGSTREAMER, gst_element_get_pad)
++GST_FUNC(LIBGSTREAMER, gst_event_parse_new_segment)
++GST_FUNC(LIBGSTREAMER, gst_mini_object_get_type)
++GST_FUNC(LIBGSTREAMER, gst_mini_object_new)
++GST_FUNC(LIBGSTREAMER, gst_pad_add_event_probe)
++GST_FUNC(LIBGSTREAMER, gst_pad_alloc_buffer)
++GST_FUNC(LIBGSTREAMER, gst_pad_get_negotiated_caps)
++GST_FUNC(LIBGSTREAMER, gst_pad_set_bufferalloc_function)
++GST_FUNC(LIBGSTREAMER, gst_registry_get_default)
++GST_FUNC(LIBGSTREAMER, gst_segment_set_newsegment)
+ GST_FUNC(LIBGSTVIDEO, gst_video_format_get_component_height)
+ GST_FUNC(LIBGSTVIDEO, gst_video_format_get_component_offset)
+ GST_FUNC(LIBGSTVIDEO, gst_video_format_get_component_width)
++GST_FUNC(LIBGSTVIDEO, gst_video_format_get_pixel_stride)
+ GST_FUNC(LIBGSTVIDEO, gst_video_format_get_row_stride)
+ GST_FUNC(LIBGSTVIDEO, gst_video_format_parse_caps)
++#else
++
++GST_FUNC(LIBGSTAPP, gst_app_sink_pull_sample)
++GST_FUNC(LIBGSTREAMER, _gst_caps_any)
++GST_FUNC(LIBGSTREAMER, gst_allocator_get_type)
++GST_FUNC(LIBGSTREAMER, gst_buffer_copy_into)
++GST_FUNC(LIBGSTREAMER, gst_buffer_extract)
++GST_FUNC(LIBGSTREAMER, gst_buffer_get_meta)
++GST_FUNC(LIBGSTREAMER, gst_buffer_get_size)
++GST_FUNC(LIBGSTREAMER, gst_buffer_map)
++GST_FUNC(LIBGSTREAMER, gst_buffer_new_allocate)
++GST_FUNC(LIBGSTREAMER, gst_buffer_n_memory)
++GST_FUNC(LIBGSTREAMER, gst_buffer_peek_memory)
++GST_FUNC(LIBGSTREAMER, gst_buffer_pool_acquire_buffer)
++GST_FUNC(LIBGSTREAMER, gst_buffer_pool_config_set_allocator)
++GST_FUNC(LIBGSTREAMER, gst_buffer_pool_config_set_params)
++GST_FUNC(LIBGSTREAMER, gst_buffer_pool_get_config)
++GST_FUNC(LIBGSTREAMER, gst_buffer_pool_get_type)
++GST_FUNC(LIBGSTREAMER, gst_buffer_pool_is_active)
++GST_FUNC(LIBGSTREAMER, gst_buffer_pool_set_active)
++GST_FUNC(LIBGSTREAMER, gst_buffer_pool_set_config)
++GST_FUNC(LIBGSTREAMER, gst_buffer_set_size)
++GST_FUNC(LIBGSTREAMER, gst_buffer_unmap)
++GST_FUNC(LIBGSTREAMER, gst_element_factory_get_metadata)
++GST_FUNC(LIBGSTREAMER, gst_event_parse_segment)
++GST_FUNC(LIBGSTREAMER, gst_memory_init)
++GST_FUNC(LIBGSTREAMER, gst_memory_map)
++GST_FUNC(LIBGSTREAMER, gst_memory_unmap)
++GST_FUNC(LIBGSTREAMER, gst_object_get_type)
++GST_FUNC(LIBGSTREAMER, gst_pad_add_probe)
++GST_FUNC(LIBGSTREAMER, gst_pad_get_current_caps)
++GST_FUNC(LIBGSTREAMER, gst_pad_probe_info_get_query)
++GST_FUNC(LIBGSTREAMER, gst_query_add_allocation_meta)
++GST_FUNC(LIBGSTREAMER, gst_query_add_allocation_param)
++GST_FUNC(LIBGSTREAMER, gst_query_add_allocation_pool)
++GST_FUNC(LIBGSTREAMER, gst_query_parse_allocation)
++GST_FUNC(LIBGSTREAMER, gst_registry_get)
++GST_FUNC(LIBGSTREAMER, gst_sample_get_buffer)
++GST_FUNC(LIBGSTREAMER, gst_segment_copy_into)
++GST_FUNC(LIBGSTREAMER, gst_structure_free)
++GST_FUNC(LIBGSTVIDEO, gst_buffer_pool_config_get_video_alignment)
++GST_FUNC(LIBGSTVIDEO, gst_buffer_pool_has_option)
++GST_FUNC(LIBGSTVIDEO, gst_video_buffer_pool_get_type)
++GST_FUNC(LIBGSTVIDEO, gst_video_frame_map)
++GST_FUNC(LIBGSTVIDEO, gst_video_frame_unmap)
++GST_FUNC(LIBGSTVIDEO, gst_video_info_align)
++GST_FUNC(LIBGSTVIDEO, gst_video_info_from_caps)
++GST_FUNC(LIBGSTVIDEO, gst_video_info_init)
++GST_FUNC(LIBGSTVIDEO, gst_video_meta_api_get_type)
++GST_FUNC(LIBGSTVIDEO, gst_video_meta_map)
++GST_FUNC(LIBGSTVIDEO, gst_video_meta_unmap)
++
++#endif
+ 
+ /*
+  * Functions that have been defined in the header file. We replace them so that
+@@ -99,6 +157,11 @@ GST_FUNC(LIBGSTVIDEO, gst_video_format_parse_caps)
+ REPLACE_FUNC(gst_buffer_ref);
+ REPLACE_FUNC(gst_buffer_unref);
+ REPLACE_FUNC(gst_message_unref);
++
++#if GST_VERSION_MAJOR == 1
++REPLACE_FUNC(gst_caps_unref);
++REPLACE_FUNC(gst_sample_unref);
++#endif
+ #endif
+ 
+ #endif // !defined(__APPLE__)
+diff --git content/media/gstreamer/GStreamerLoader.cpp content/media/gstreamer/GStreamerLoader.cpp
+index 5961b23..e6457e0 100644
+--- mozilla/content/media/gstreamer/GStreamerLoader.cpp
++++ mozilla/content/media/gstreamer/GStreamerLoader.cpp
+@@ -6,13 +6,21 @@
+ #include <dlfcn.h>
+ #include <stdio.h>
+ 
+-#include "GStreamerLoader.h"
++#include "nsDebug.h"
+ #include "mozilla/NullPtr.h"
+ 
++#include "GStreamerLoader.h"
++
+ #define LIBGSTREAMER 0
+ #define LIBGSTAPP 1
+ #define LIBGSTVIDEO 2
+ 
++#ifdef __OpenBSD__
++#define LIB_GST_SUFFIX ".so"
++#else
++#define LIB_GST_SUFFIX ".so.0"
++#endif
++
+ namespace mozilla {
+ 
+ /*
+@@ -32,6 +40,11 @@ namespace mozilla {
+ GstBuffer * gst_buffer_ref_impl(GstBuffer *buf);
+ void gst_buffer_unref_impl(GstBuffer *buf);
+ void gst_message_unref_impl(GstMessage *msg);
++void gst_caps_unref_impl(GstCaps *caps);
++
++#if GST_VERSION_MAJOR == 1
++void gst_sample_unref_impl(GstSample *sample);
++#endif
+ 
+ bool
+ load_gstreamer()
+@@ -58,32 +71,25 @@ load_gstreamer()
+   if (major == GST_VERSION_MAJOR && minor == GST_VERSION_MINOR) {
+     gstreamerLib = RTLD_DEFAULT;
+   } else {
+-#ifdef __OpenBSD__
+-    gstreamerLib = dlopen("libgstreamer-0.10.so", RTLD_NOW | RTLD_LOCAL);
+-#else
+-    gstreamerLib = dlopen("libgstreamer-0.10.so.0", RTLD_NOW | RTLD_LOCAL);
+-#endif
++    gstreamerLib = dlopen("libgstreamer-" GST_API_VERSION LIB_GST_SUFFIX, RTLD_NOW | RTLD_LOCAL);
+   }
+ 
+-  void *handles[] = {
++  void *handles[3] = {
+     gstreamerLib,
+-#ifdef __OpenBSD__
+-    dlopen("libgstapp-0.10.so", RTLD_NOW | RTLD_LOCAL),
+-    dlopen("libgstvideo-0.10.so", RTLD_NOW | RTLD_LOCAL)
+-#else
+-    dlopen("libgstapp-0.10.so.0", RTLD_NOW | RTLD_LOCAL),
+-    dlopen("libgstvideo-0.10.so.0", RTLD_NOW | RTLD_LOCAL)
+-#endif
++    dlopen("libgstapp-" GST_API_VERSION LIB_GST_SUFFIX, RTLD_NOW | RTLD_LOCAL),
++    dlopen("libgstvideo-" GST_API_VERSION LIB_GST_SUFFIX, RTLD_NOW | RTLD_LOCAL)
+   };
+ 
+   for (size_t i = 0; i < sizeof(handles) / sizeof(handles[0]); i++) {
+     if (!handles[i]) {
++      NS_WARNING("Couldn't link gstreamer libraries");
+       goto fail;
+     }
+   }
+ 
+ #define GST_FUNC(lib, symbol) \
+   if (!(symbol = (typeof(symbol))dlsym(handles[lib], #symbol))) { \
++    NS_WARNING("Couldn't link symbol " #symbol); \
+     goto fail; \
+   }
+ #define REPLACE_FUNC(symbol) symbol = symbol##_impl;
+@@ -123,4 +129,18 @@ gst_message_unref_impl(GstMessage *msg)
+   gst_mini_object_unref(GST_MINI_OBJECT_CAST(msg));
+ }
+ 
++#if GST_VERSION_MAJOR == 1
++void
++gst_sample_unref_impl(GstSample *sample)
++{
++  gst_mini_object_unref(GST_MINI_OBJECT_CAST(sample));
++}
++#endif
++
++void
++gst_caps_unref_impl(GstCaps *caps)
++{
++  gst_mini_object_unref(GST_MINI_OBJECT_CAST(caps));
++}
++
+ }
+diff --git content/media/gstreamer/GStreamerLoader.h content/media/gstreamer/GStreamerLoader.h
+index 2d801722..cd7fe6d 100644
+--- mozilla/content/media/gstreamer/GStreamerLoader.h
++++ mozilla/content/media/gstreamer/GStreamerLoader.h
+@@ -22,6 +22,11 @@
+ #include <gst/video/video.h>
+ #pragma GCC diagnostic pop
+ 
++#if GST_VERSION_MAJOR == 1
++#include <gst/video/gstvideometa.h>
++#include <gst/video/gstvideopool.h>
++#endif
++
+ namespace mozilla {
+ 
+ /*
+@@ -42,4 +47,7 @@ bool load_gstreamer();
+ 
+ }
+ 
++#undef GST_CAPS_ANY
++#define GST_CAPS_ANY (*_gst_caps_any)
++
+ #endif // GStreamerLoader_h_
+diff --git content/media/gstreamer/GStreamerReader-0.10.cpp content/media/gstreamer/GStreamerReader-0.10.cpp
+new file mode 100644
+index 0000000..fb98bde
+--- /dev/null
++++ mozilla/content/media/gstreamer/GStreamerReader-0.10.cpp
+@@ -0,0 +1,203 @@
++#include "nsError.h"
++#include "MediaDecoderStateMachine.h"
++#include "AbstractMediaDecoder.h"
++#include "MediaResource.h"
++#include "GStreamerReader.h"
++#include "GStreamerMozVideoBuffer.h"
++#include "GStreamerFormatHelper.h"
++#include "VideoUtils.h"
++#include "mozilla/dom/TimeRanges.h"
++#include "mozilla/Preferences.h"
++
++using namespace mozilla;
++using mozilla::layers::PlanarYCbCrImage;
++using mozilla::layers::ImageContainer;
++
++GstFlowReturn GStreamerReader::AllocateVideoBufferCb(GstPad* aPad,
++                                                     guint64 aOffset,
++                                                     guint aSize,
++                                                     GstCaps* aCaps,
++                                                     GstBuffer** aBuf)
++{
++  GStreamerReader* reader = reinterpret_cast<GStreamerReader*>(gst_pad_get_element_private(aPad));
++  return reader->AllocateVideoBuffer(aPad, aOffset, aSize, aCaps, aBuf);
++}
++
++GstFlowReturn GStreamerReader::AllocateVideoBuffer(GstPad* aPad,
++                                                   guint64 aOffset,
++                                                   guint aSize,
++                                                   GstCaps* aCaps,
++                                                   GstBuffer** aBuf)
++{
++  nsRefPtr<PlanarYCbCrImage> image;
++  return AllocateVideoBufferFull(aPad, aOffset, aSize, aCaps, aBuf, image);
++}
++
++GstFlowReturn GStreamerReader::AllocateVideoBufferFull(GstPad* aPad,
++                                                       guint64 aOffset,
++                                                       guint aSize,
++                                                       GstCaps* aCaps,
++                                                       GstBuffer** aBuf,
++                                                       nsRefPtr<PlanarYCbCrImage>& aImage)
++{
++  /* allocate an image using the container */
++  ImageContainer* container = mDecoder->GetImageContainer();
++  if (!container) {
++    // We don't have an ImageContainer. We probably belong to an <audio>
++    // element.
++    return GST_FLOW_NOT_SUPPORTED;
++  }
++  ImageFormat format = PLANAR_YCBCR;
++  PlanarYCbCrImage* img = reinterpret_cast<PlanarYCbCrImage*>(container->CreateImage(&format, 1).get());
++  nsRefPtr<PlanarYCbCrImage> image = dont_AddRef(img);
++
++  /* prepare a GstBuffer pointing to the underlying PlanarYCbCrImage buffer */
++  GstBuffer* buf = GST_BUFFER(gst_moz_video_buffer_new());
++  GST_BUFFER_SIZE(buf) = aSize;
++  /* allocate the actual YUV buffer */
++  GST_BUFFER_DATA(buf) = image->AllocateAndGetNewBuffer(aSize);
++
++  aImage = image;
++
++  /* create a GstMozVideoBufferData to hold the image */
++  GstMozVideoBufferData* bufferdata = new GstMozVideoBufferData(image);
++
++  /* Attach bufferdata to our GstMozVideoBuffer, it will take care to free it */
++  gst_moz_video_buffer_set_data(GST_MOZ_VIDEO_BUFFER(buf), bufferdata);
++
++  *aBuf = buf;
++  return GST_FLOW_OK;
++}
++
++gboolean GStreamerReader::EventProbe(GstPad* aPad, GstEvent* aEvent)
++{
++  GstElement* parent = GST_ELEMENT(gst_pad_get_parent(aPad));
++  switch(GST_EVENT_TYPE(aEvent)) {
++    case GST_EVENT_NEWSEGMENT:
++    {
++      gboolean update;
++      gdouble rate;
++      GstFormat format;
++      gint64 start, stop, position;
++      GstSegment* segment;
++
++      /* Store the segments so we can convert timestamps to stream time, which
++       * is what the upper layers sync on.
++       */
++      ReentrantMonitorAutoEnter mon(mGstThreadsMonitor);
++      gst_event_parse_new_segment(aEvent, &update, &rate, &format,
++          &start, &stop, &position);
++      if (parent == GST_ELEMENT(mVideoAppSink))
++        segment = &mVideoSegment;
++      else
++        segment = &mAudioSegment;
++      gst_segment_set_newsegment(segment, update, rate, format,
++          start, stop, position);
++      break;
++    }
++    case GST_EVENT_FLUSH_STOP:
++      /* Reset on seeks */
++      ResetDecode();
++      break;
++    default:
++      break;
++  }
++  gst_object_unref(parent);
++
++  return TRUE;
++}
++
++gboolean GStreamerReader::EventProbeCb(GstPad* aPad,
++                                         GstEvent* aEvent,
++                                         gpointer aUserData)
++{
++  GStreamerReader* reader = reinterpret_cast<GStreamerReader*>(aUserData);
++  return reader->EventProbe(aPad, aEvent);
++}
++
++nsRefPtr<PlanarYCbCrImage> GStreamerReader::GetImageFromBuffer(GstBuffer* aBuffer)
++{
++  if (!GST_IS_MOZ_VIDEO_BUFFER (aBuffer))
++    return nullptr;
++
++  nsRefPtr<PlanarYCbCrImage> image;
++  GstMozVideoBufferData* bufferdata = reinterpret_cast<GstMozVideoBufferData*>(gst_moz_video_buffer_get_data(GST_MOZ_VIDEO_BUFFER(aBuffer)));
++  image = bufferdata->mImage;
++
++  PlanarYCbCrImage::Data data;
++  data.mPicX = data.mPicY = 0;
++  data.mPicSize = nsIntSize(mPicture.width, mPicture.height);
++  data.mStereoMode = STEREO_MODE_MONO;
++
++  data.mYChannel = GST_BUFFER_DATA(aBuffer);
++  data.mYStride = gst_video_format_get_row_stride(mFormat, 0, mPicture.width);
++  data.mYSize = nsIntSize(data.mYStride,
++      gst_video_format_get_component_height(mFormat, 0, mPicture.height));
++  data.mYSkip = 0;
++  data.mCbCrStride = gst_video_format_get_row_stride(mFormat, 1, mPicture.width);
++  data.mCbCrSize = nsIntSize(data.mCbCrStride,
++      gst_video_format_get_component_height(mFormat, 1, mPicture.height));
++  data.mCbChannel = data.mYChannel + gst_video_format_get_component_offset(mFormat, 1,
++      mPicture.width, mPicture.height);
++  data.mCrChannel = data.mYChannel + gst_video_format_get_component_offset(mFormat, 2,
++      mPicture.width, mPicture.height);
++  data.mCbSkip = 0;
++  data.mCrSkip = 0;
++
++  image->SetDataNoCopy(data);
++
++  return image;
++}
++
++void GStreamerReader::CopyIntoImageBuffer(GstBuffer* aBuffer,
++                                          GstBuffer** aOutBuffer,
++                                          nsRefPtr<PlanarYCbCrImage> &aImage)
++{
++  AllocateVideoBufferFull(nullptr, GST_BUFFER_OFFSET(aBuffer),
++      GST_BUFFER_SIZE(aBuffer), nullptr, aOutBuffer, aImage);
++
++  gst_buffer_copy_metadata(*aOutBuffer, aBuffer, (GstBufferCopyFlags)GST_BUFFER_COPY_ALL);
++  memcpy(GST_BUFFER_DATA(*aOutBuffer), GST_BUFFER_DATA(aBuffer), GST_BUFFER_SIZE(*aOutBuffer));
++
++  aImage = GetImageFromBuffer(*aOutBuffer);
++}
++
++GstCaps* GStreamerReader::BuildAudioSinkCaps()
++{
++  GstCaps* caps;
++#ifdef IS_LITTLE_ENDIAN
++  int endianness = 1234;
++#else
++  int endianness = 4321;
++#endif
++  gint width;
++#ifdef MOZ_SAMPLE_TYPE_FLOAT32
++  caps = gst_caps_from_string("audio/x-raw-float, channels={1,2}");
++  width = 32;
++#else /* !MOZ_SAMPLE_TYPE_FLOAT32 */
++  caps = gst_caps_from_string("audio/x-raw-int, channels={1,2}");
++  width = 16;
++#endif
++  gst_caps_set_simple(caps,
++      "width", G_TYPE_INT, width,
++      "endianness", G_TYPE_INT, endianness,
++      NULL);
++
++  return caps;
++}
++
++void GStreamerReader::InstallPadCallbacks()
++{
++  GstPad* sinkpad = gst_element_get_static_pad(GST_ELEMENT(mVideoAppSink), "sink");
++  gst_pad_add_event_probe(sinkpad,
++                          G_CALLBACK(&GStreamerReader::EventProbeCb), this);
++
++  gst_pad_set_bufferalloc_function(sinkpad, GStreamerReader::AllocateVideoBufferCb);
++  gst_pad_set_element_private(sinkpad, this);
++  gst_object_unref(sinkpad);
++
++  sinkpad = gst_element_get_static_pad(GST_ELEMENT(mAudioAppSink), "sink");
++  gst_pad_add_event_probe(sinkpad,
++                          G_CALLBACK(&GStreamerReader::EventProbeCb), this);
++  gst_object_unref(sinkpad);
++}
+diff --git content/media/gstreamer/GStreamerReader.cpp content/media/gstreamer/GStreamerReader.cpp
+index 2be45dc..54509e3 100644
+--- mozilla/content/media/gstreamer/GStreamerReader.cpp
++++ mozilla/content/media/gstreamer/GStreamerReader.cpp
+@@ -10,8 +10,10 @@
+ #include "AbstractMediaDecoder.h"
+ #include "MediaResource.h"
+ #include "GStreamerReader.h"
++#if GST_VERSION_MAJOR >= 1
++#include "GStreamerAllocator.h"
++#endif
+ #include "GStreamerFormatHelper.h"
+-#include "GStreamerMozVideoBuffer.h"
+ #include "VideoUtils.h"
+ #include "mozilla/dom/TimeRanges.h"
+ #include "mozilla/Preferences.h"
+@@ -31,14 +33,16 @@ extern PRLogModuleInfo* gMediaDecoderLog;
+ #define LOG(type, msg, ...)
+ #endif
+ 
+-extern bool
+-IsYV12Format(const VideoData::YCbCrBuffer::Plane& aYPlane,
+-             const VideoData::YCbCrBuffer::Plane& aCbPlane,
+-             const VideoData::YCbCrBuffer::Plane& aCrPlane);
+-
++#if DEBUG
+ static const unsigned int MAX_CHANNELS = 4;
+-// Let the demuxer work in pull mode for short files
+-static const int SHORT_FILE_SIZE = 1024 * 1024;
++#endif
++// Let the demuxer work in pull mode for short files. This used to be a micro
++// optimization to have more accurate durations for ogg files in mochitests.
++// Since as of today we aren't using gstreamer to demux ogg, and having demuxers
++// work in pull mode over http makes them slower (since they really assume
++// near-zero latency in pull mode) set the constant to 0 for now, which
++// effectively disables it.
++static const int SHORT_FILE_SIZE = 0;
+ // The default resource->Read() size when working in push mode
+ static const int DEFAULT_SOURCE_READ_SIZE = 50 * 1024;
+ 
+@@ -60,6 +62,10 @@ GStreamerReader::GStreamerReader(AbstractMediaDecoder* aDecoder)
+   : MediaDecoderReader(aDecoder),
+   mMP3FrameParser(aDecoder->GetResource()->GetLength()),
+   mUseParserDuration(false),
++#if GST_VERSION_MAJOR >= 1
++  mAllocator(nullptr),
++  mBufferPool(nullptr),
++#endif
+   mPlayBin(nullptr),
+   mBus(nullptr),
+   mSource(nullptr),
+@@ -72,6 +78,9 @@ GStreamerReader::GStreamerReader(AbstractMediaDecoder* aDecoder)
+   mAudioSinkBufferCount(0),
+   mGstThreadsMonitor("media.gst.threads"),
+   mReachedEos(false),
++#if GST_VERSION_MAJOR >= 1
++  mConfigureAlignment(true),
++#endif
+   fpsNum(0),
+   fpsDen(0)
+ {
+@@ -83,8 +92,12 @@ GStreamerReader::GStreamerReader(AbstractMediaDecoder* aDecoder)
+ 
+   mSinkCallbacks.eos = GStreamerReader::EosCb;
+   mSinkCallbacks.new_preroll = GStreamerReader::NewPrerollCb;
++#if GST_VERSION_MAJOR >= 1
++  mSinkCallbacks.new_sample = GStreamerReader::NewBufferCb;
++#else
+   mSinkCallbacks.new_buffer = GStreamerReader::NewBufferCb;
+   mSinkCallbacks.new_buffer_list = nullptr;
++#endif
+ 
+   gst_segment_init(&mVideoSegment, GST_FORMAT_UNDEFINED);
+   gst_segment_init(&mAudioSegment, GST_FORMAT_UNDEFINED);
+@@ -108,65 +121,59 @@ GStreamerReader::~GStreamerReader()
+     mAudioAppSink = nullptr;
+     gst_object_unref(mBus);
+     mBus = nullptr;
++#if GST_VERSION_MAJOR >= 1
++    g_object_unref(mAllocator);
++    g_object_unref(mBufferPool);
++#endif
+   }
+ }
+ 
+ nsresult GStreamerReader::Init(MediaDecoderReader* aCloneDonor)
+ {
+-  GError* error = nullptr;
+-  if (!gst_init_check(0, 0, &error)) {
+-    LOG(PR_LOG_ERROR, "gst initialization failed: %s", error->message);
+-    g_error_free(error);
+-    return NS_ERROR_FAILURE;
+-  }
++  GStreamerFormatHelper::Instance();
++
++#if GST_VERSION_MAJOR >= 1
++  mAllocator = static_cast<GstAllocator*>(g_object_new(GST_TYPE_MOZ_GFX_MEMORY_ALLOCATOR, nullptr));
++  moz_gfx_memory_allocator_set_reader(mAllocator, this);
++
++  mBufferPool = static_cast<GstBufferPool*>(g_object_new(GST_TYPE_MOZ_GFX_BUFFER_POOL, nullptr));
++#endif
+ 
++#if GST_VERSION_MAJOR >= 1
++  mPlayBin = gst_element_factory_make("playbin", nullptr);
++#else
+   mPlayBin = gst_element_factory_make("playbin2", nullptr);
++#endif
+   if (!mPlayBin) {
+-    LOG(PR_LOG_ERROR, "couldn't create playbin2");
++    LOG(PR_LOG_ERROR, "couldn't create playbin");
+     return NS_ERROR_FAILURE;
+   }
+   g_object_set(mPlayBin, "buffer-size", 0, nullptr);
+   mBus = gst_pipeline_get_bus(GST_PIPELINE(mPlayBin));
+ 
+   mVideoSink = gst_parse_bin_from_description("capsfilter name=filter ! "
+-      "appsink name=videosink sync=true max-buffers=1 "
++      "appsink name=videosink sync=false max-buffers=1 "
++#if GST_VERSION_MAJOR >= 1
++      "caps=video/x-raw,format=I420"
++#else
+       "caps=video/x-raw-yuv,format=(fourcc)I420"
++#endif
+       , TRUE, nullptr);
+   mVideoAppSink = GST_APP_SINK(gst_bin_get_by_name(GST_BIN(mVideoSink),
+         "videosink"));
+-  gst_app_sink_set_callbacks(mVideoAppSink, &mSinkCallbacks,
+-      (gpointer) this, nullptr);
+-  GstPad* sinkpad = gst_element_get_pad(GST_ELEMENT(mVideoAppSink), "sink");
+-  gst_pad_add_event_probe(sinkpad,
+-      G_CALLBACK(&GStreamerReader::EventProbeCb), this);
+-  gst_object_unref(sinkpad);
+-  gst_pad_set_bufferalloc_function(sinkpad, GStreamerReader::AllocateVideoBufferCb);
+-  gst_pad_set_element_private(sinkpad, this);
+-
+   mAudioSink = gst_parse_bin_from_description("capsfilter name=filter ! "
+-#ifdef MOZ_SAMPLE_TYPE_FLOAT32
+-        "appsink name=audiosink max-buffers=2 sync=false caps=audio/x-raw-float,"
+-#ifdef IS_LITTLE_ENDIAN
+-        "channels={1,2},width=32,endianness=1234", TRUE, nullptr);
+-#else
+-        "channels={1,2},width=32,endianness=4321", TRUE, nullptr);
+-#endif
+-#else
+-        "appsink name=audiosink max-buffers=2 sync=false caps=audio/x-raw-int,"
+-#ifdef IS_LITTLE_ENDIAN
+-        "channels={1,2},width=16,endianness=1234", TRUE, nullptr);
+-#else
+-        "channels={1,2},width=16,endianness=4321", TRUE, nullptr);
+-#endif
+-#endif
++        "appsink name=audiosink sync=false max-buffers=1", TRUE, nullptr);
+   mAudioAppSink = GST_APP_SINK(gst_bin_get_by_name(GST_BIN(mAudioSink),
+                                                    "audiosink"));
++  GstCaps* caps = BuildAudioSinkCaps();
++  g_object_set(mAudioAppSink, "caps", caps, nullptr);
++  gst_caps_unref(caps);
++
++  gst_app_sink_set_callbacks(mVideoAppSink, &mSinkCallbacks,
++      (gpointer) this, nullptr);
+   gst_app_sink_set_callbacks(mAudioAppSink, &mSinkCallbacks,
+                              (gpointer) this, nullptr);
+-  sinkpad = gst_element_get_pad(GST_ELEMENT(mAudioAppSink), "sink");
+-  gst_pad_add_event_probe(sinkpad,
+-                          G_CALLBACK(&GStreamerReader::EventProbeCb), this);
+-  gst_object_unref(sinkpad);
++  InstallPadCallbacks();
+ 
+   g_object_set(mPlayBin, "uri", "appsrc://",
+                "video-sink", mVideoSink,
+@@ -331,7 +340,7 @@ nsresult GStreamerReader::ReadMetadata(MediaInfo* aInfo,
+       /* Little trick: set the target caps to "skip" so that playbin2 fails to
+        * find a decoder for the stream we want to skip.
+        */
+-      GstCaps* filterCaps = gst_caps_new_simple ("skip", nullptr);
++      GstCaps* filterCaps = gst_caps_new_simple ("skip", nullptr, nullptr);
+       g_object_set(filter, "caps", filterCaps, nullptr);
+       gst_caps_unref(filterCaps);
+       gst_object_unref(filter);
+@@ -358,6 +367,7 @@ nsresult GStreamerReader::ReadMetadata(MediaInfo* aInfo,
+       gst_message_unref(message);
+       ret = NS_ERROR_FAILURE;
+     } else {
++      LOG(PR_LOG_DEBUG, "read metadata pipeline prerolled");
+       gst_message_unref(message);
+       ret = NS_OK;
+       break;
+@@ -373,21 +383,24 @@ nsresult GStreamerReader::ReadMetadata(MediaInfo* aInfo,
+ 
+   /* FIXME: workaround for a bug in matroskademux. This seek makes matroskademux
+    * parse the index */
++  LOG(PR_LOG_DEBUG, "doing matroskademux seek hack");
+   if (gst_element_seek_simple(mPlayBin, GST_FORMAT_TIME,
+         GST_SEEK_FLAG_FLUSH, 0)) {
+     /* after a seek we need to wait again for ASYNC_DONE */
+-    message = gst_bus_timed_pop_filtered(mBus, GST_CLOCK_TIME_NONE,
++    message = gst_bus_timed_pop_filtered(mBus, 5 * GST_SECOND,
+        (GstMessageType)(GST_MESSAGE_ASYNC_DONE | GST_MESSAGE_ERROR));
+-    if (GST_MESSAGE_TYPE(message) == GST_MESSAGE_ERROR) {
++    LOG(PR_LOG_DEBUG, "matroskademux seek hack done");
++    if (GST_MESSAGE_TYPE(message) != GST_MESSAGE_ASYNC_DONE) {
+       gst_element_set_state(mPlayBin, GST_STATE_NULL);
+       gst_message_unref(message);
+       return NS_ERROR_FAILURE;
+     }
++  } else {
++    LOG(PR_LOG_DEBUG, "matroskademux seek hack failed (non fatal)");
+   }
+ 
+   /* report the duration */
+   gint64 duration;
+-  GstFormat format = GST_FORMAT_TIME;
+ 
+   if (isMP3 && mMP3FrameParser.IsMP3()) {
+     // The MP3FrameParser has reported a duration; use that over the gstreamer
+@@ -396,17 +409,25 @@ nsresult GStreamerReader::ReadMetadata(MediaInfo* aInfo,
+     mUseParserDuration = true;
+     mLastParserDuration = mMP3FrameParser.GetDuration();
+     mDecoder->SetMediaDuration(mLastParserDuration);
+-
+-  } else if (gst_element_query_duration(GST_ELEMENT(mPlayBin),
+-      &format, &duration) && format == GST_FORMAT_TIME) {
+-    // Otherwise use the gstreamer duration.
+-    ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
+-    LOG(PR_LOG_DEBUG, "returning duration %" GST_TIME_FORMAT, GST_TIME_ARGS(duration));
+-    duration = GST_TIME_AS_USECONDS (duration);
+-    mDecoder->SetMediaDuration(duration);
+-
+   } else {
+-    mDecoder->SetMediaSeekable(false);
++    LOG(PR_LOG_DEBUG, "querying duration");
++    // Otherwise use the gstreamer duration.
++#if GST_VERSION_MAJOR >= 1
++    if (gst_element_query_duration(GST_ELEMENT(mPlayBin),
++          GST_FORMAT_TIME, &duration)) {
++#else
++    GstFormat format = GST_FORMAT_TIME;
++    if (gst_element_query_duration(GST_ELEMENT(mPlayBin),
++      &format, &duration) && format == GST_FORMAT_TIME) {
++#endif
++      ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
++      LOG(PR_LOG_DEBUG, "have duration %" GST_TIME_FORMAT,
++            GST_TIME_ARGS (duration));
++      duration = GST_TIME_AS_USECONDS (duration);
++      mDecoder->SetMediaDuration(duration);
++    } else {
++      mDecoder->SetMediaSeekable(false);
++    }
+   }
+ 
+   int n_video = 0, n_audio = 0;
+@@ -410,7 +428,11 @@ nsresult GStreamerReader::ReadMetadata(MediaInfo* aInfo,
+   *aTags = nullptr;
+ 
+   // Watch the pipeline for fatal errors
++#if GST_VERSION_MAJOR >= 1
++  gst_bus_set_sync_handler(mBus, GStreamerReader::ErrorCb, this, nullptr);
++#else
+   gst_bus_set_sync_handler(mBus, GStreamerReader::ErrorCb, this);
++#endif
+ 
+   /* set the pipeline to PLAYING so that it starts decoding and queueing data in
+    * the appsinks */
+@@ -424,19 +446,35 @@ nsresult GStreamerReader::CheckSupportedFormats()
+   bool done = false;
+   bool unsupported = false;
+ 
+-  GstIterator *it = gst_bin_iterate_recurse(GST_BIN(mPlayBin));
++  GstIterator* it = gst_bin_iterate_recurse(GST_BIN(mPlayBin));
+   while (!done) {
++    GstIteratorResult res;
+     GstElement* element;
+-    GstIteratorResult res = gst_iterator_next(it, (void **)&element);
++
++#if GST_VERSION_MAJOR >= 1
++    GValue value = {0,};
++    res = gst_iterator_next(it, &value);
++#else
++    res = gst_iterator_next(it, (void **) &element);
++#endif
+     switch(res) {
+       case GST_ITERATOR_OK:
+       {
++#if GST_VERSION_MAJOR >= 1
++        element = GST_ELEMENT (g_value_get_object (&value));
++#endif
+         GstElementFactory* factory = gst_element_get_factory(element);
+         if (factory) {
+           const char* klass = gst_element_factory_get_klass(factory);
+-          GstPad* pad = gst_element_get_pad(element, "sink");
++          GstPad* pad = gst_element_get_static_pad(element, "sink");
+           if (pad) {
+-            GstCaps* caps = gst_pad_get_negotiated_caps(pad);
++            GstCaps* caps;
++
++#if GST_VERSION_MAJOR >= 1
++            caps = gst_pad_get_current_caps(pad);
++#else
++            caps = gst_pad_get_negotiated_caps(pad);
++#endif
+ 
+             if (caps) {
+               /* check for demuxers but ignore elements like id3demux */
+@@ -451,7 +489,11 @@ nsresult GStreamerReader::CheckSupportedFormats()
+           }
+         }
+ 
++#if GST_VERSION_MAJOR >= 1
++        g_value_unset (&value);
++#else
+         gst_object_unref(element);
++#endif
+         done = unsupported;
+         break;
+       }
+@@ -475,6 +517,8 @@ nsresult GStreamerReader::ResetDecode()
+ {
+   nsresult res = NS_OK;
+ 
++  LOG(PR_LOG_DEBUG, "reset decode");
++
+   if (NS_FAILED(MediaDecoderReader::ResetDecode())) {
+     res = NS_ERROR_FAILURE;
+   }
+@@ -485,6 +529,11 @@ nsresult GStreamerReader::ResetDecode()
+   mVideoSinkBufferCount = 0;
+   mAudioSinkBufferCount = 0;
+   mReachedEos = false;
++#if GST_VERSION_MAJOR >= 1
++  mConfigureAlignment = true;
++#endif
++
++  LOG(PR_LOG_DEBUG, "reset decode done");
+ 
+   return res;
+ }
+@@ -508,11 +557,11 @@ bool GStreamerReader::DecodeAudioData()
+         /* We have nothing decoded so it makes no sense to return to the state machine
+          * as it will call us back immediately, we'll return again and so on, wasting
+          * CPU cycles for no job done. So, block here until there is either video or
+-         * audio data available 
++         * audio data available
+         */
+         mon.Wait();
+         if (!mAudioSinkBufferCount) {
+-          /* There is still no audio data available, so either there is video data or 
++          /* There is still no audio data available, so either there is video data or
+            * something else has happened (Eos, etc...). Return to the state machine
+            * to process it.
+            */
+@@ -524,24 +573,43 @@ bool GStreamerReader::DecodeAudioData()
+       }
+     }
+ 
++#if GST_VERSION_MAJOR >= 1
++    GstSample *sample = gst_app_sink_pull_sample(mAudioAppSink);
++    buffer = gst_buffer_ref(gst_sample_get_buffer(sample));
++    gst_sample_unref(sample);
++#else
+     buffer = gst_app_sink_pull_buffer(mAudioAppSink);
++#endif
++
+     mAudioSinkBufferCount--;
+   }
+ 
+   int64_t timestamp = GST_BUFFER_TIMESTAMP(buffer);
+   timestamp = gst_segment_to_stream_time(&mAudioSegment,
+       GST_FORMAT_TIME, timestamp);
++  
+   timestamp = GST_TIME_AS_USECONDS(timestamp);
+   int64_t duration = 0;
+   if (GST_CLOCK_TIME_IS_VALID(GST_BUFFER_DURATION(buffer)))
+     duration = GST_TIME_AS_USECONDS(GST_BUFFER_DURATION(buffer));
+ 
+   int64_t offset = GST_BUFFER_OFFSET(buffer);
++#if GST_VERSION_MAJOR >= 1
++  GstMapInfo info;
++  gst_buffer_map(buffer, &info, GST_MAP_READ);
++  unsigned int size = info.size;
++#else
+   unsigned int size = GST_BUFFER_SIZE(buffer);
++#endif
+   int32_t frames = (size / sizeof(AudioDataValue)) / mInfo.mAudio.mChannels;
+   ssize_t outSize = static_cast<size_t>(size / sizeof(AudioDataValue));
+   nsAutoArrayPtr<AudioDataValue> data(new AudioDataValue[outSize]);
++#if GST_VERSION_MAJOR >= 1
++  memcpy(data, info.data, info.size);
++  gst_buffer_unmap(buffer, &info);
++#else
+   memcpy(data, GST_BUFFER_DATA(buffer), GST_BUFFER_SIZE(buffer));
++#endif
+   AudioData* audio = new AudioData(offset, timestamp, duration,
+       frames, data.forget(), mInfo.mAudio.mChannels);
+ 
+@@ -552,7 +620,7 @@ bool GStreamerReader::DecodeAudioData()
+ }
+ 
+ bool GStreamerReader::DecodeVideoFrame(bool &aKeyFrameSkip,
+-                                         int64_t aTimeThreshold)
++                                       int64_t aTimeThreshold)
+ {
+   NS_ASSERTION(mDecoder->OnDecodeThread(), "Should be on decode thread.");
+ 
+@@ -571,11 +639,11 @@ bool GStreamerReader::DecodeVideoFrame(bool &aKeyFrameSkip,
+         /* We have nothing decoded so it makes no sense to return to the state machine
+          * as it will call us back immediately, we'll return again and so on, wasting
+          * CPU cycles for no job done. So, block here until there is either video or
+-         * audio data available 
++         * audio data available
+         */
+         mon.Wait();
+         if (!mVideoSinkBufferCount) {
+-          /* There is still no video data available, so either there is audio data or 
++          /* There is still no video data available, so either there is audio data or
+            * something else has happened (Eos, etc...). Return to the state machine
+            * to process it
+            */
+@@ -589,11 +657,17 @@ bool GStreamerReader::DecodeVideoFrame(bool &aKeyFrameSkip,
+ 
+     mDecoder->NotifyDecodedFrames(0, 1);
+ 
++#if GST_VERSION_MAJOR >= 1
++    GstSample *sample = gst_app_sink_pull_sample(mVideoAppSink);
++    buffer = gst_buffer_ref(gst_sample_get_buffer(sample));
++    gst_sample_unref(sample);
++#else
+     buffer = gst_app_sink_pull_buffer(mVideoAppSink);
++#endif
+     mVideoSinkBufferCount--;
+   }
+ 
+-  bool isKeyframe = !GST_BUFFER_FLAG_IS_SET(buffer, GST_BUFFER_FLAG_DISCONT);
++  bool isKeyframe = !GST_BUFFER_FLAG_IS_SET(buffer, GST_BUFFER_FLAG_DELTA_UNIT);
+   if ((aKeyFrameSkip && !isKeyframe)) {
+     gst_buffer_unref(buffer);
+     return true;
+@@ -618,73 +695,55 @@ bool GStreamerReader::DecodeVideoFrame(bool &aKeyFrameSkip,
+                "frame has invalid timestamp");
+ 
+   timestamp = GST_TIME_AS_USECONDS(timestamp);
++  int64_t duration;
++  if (GST_CLOCK_TIME_IS_VALID(GST_BUFFER_DURATION(buffer)))
++    duration = GST_TIME_AS_USECONDS(GST_BUFFER_DURATION(buffer));
++  else if (fpsNum && fpsDen)
++    /* add 1-frame duration */
++    duration = gst_util_uint64_scale(GST_USECOND, fpsDen, fpsNum);
++
+   if (timestamp < aTimeThreshold) {
+     LOG(PR_LOG_DEBUG, "skipping frame %" GST_TIME_FORMAT
+-                      " threshold %" GST_TIME_FORMAT,
+-                      GST_TIME_ARGS(timestamp), GST_TIME_ARGS(aTimeThreshold));
++                       " threshold %" GST_TIME_FORMAT,
++                       GST_TIME_ARGS(timestamp * 1000),
++                       GST_TIME_ARGS(aTimeThreshold * 1000));
+     gst_buffer_unref(buffer);
+     return true;
+   }
+-
+   if (!buffer)
+     /* no more frames */
+     return false;
+ 
+-  int64_t duration = 0;
+-  if (GST_CLOCK_TIME_IS_VALID(GST_BUFFER_DURATION(buffer)))
+-    duration = GST_TIME_AS_USECONDS(GST_BUFFER_DURATION(buffer));
+-  else if (fpsNum && fpsDen)
+-    /* 1-frame duration */
+-    duration = gst_util_uint64_scale(GST_USECOND, fpsNum, fpsDen);
+-
+-  nsRefPtr<PlanarYCbCrImage> image;
+-  GstMozVideoBufferData* bufferdata = reinterpret_cast<GstMozVideoBufferData*>
+-      GST_IS_MOZ_VIDEO_BUFFER(buffer)?gst_moz_video_buffer_get_data(GST_MOZ_VIDEO_BUFFER(buffer)):nullptr;
+-
+-  if(bufferdata)
+-    image = bufferdata->mImage;
++#if GST_VERSION_MAJOR >= 1
++  if (mConfigureAlignment && buffer->pool) {
++    GstStructure *config = gst_buffer_pool_get_config(buffer->pool);
++    GstVideoAlignment align;
++    if (gst_buffer_pool_config_get_video_alignment(config, &align))
++      gst_video_info_align(&mVideoInfo, &align);
++    gst_structure_free(config);
++    mConfigureAlignment = false;
++  }
++#endif
+ 
++  nsRefPtr<PlanarYCbCrImage> image = GetImageFromBuffer(buffer);
+   if (!image) {
+     /* Ugh, upstream is not calling gst_pad_alloc_buffer(). Fallback to
+      * allocating a PlanarYCbCrImage backed GstBuffer here and memcpy.
+      */
+     GstBuffer* tmp = nullptr;
+-    AllocateVideoBufferFull(nullptr, GST_BUFFER_OFFSET(buffer),
+-        GST_BUFFER_SIZE(buffer), nullptr, &tmp, image);
+-
+-    /* copy */
+-    gst_buffer_copy_metadata(tmp, buffer, (GstBufferCopyFlags)GST_BUFFER_COPY_ALL);
+-    memcpy(GST_BUFFER_DATA(tmp), GST_BUFFER_DATA(buffer),
+-        GST_BUFFER_SIZE(tmp));
++    CopyIntoImageBuffer(buffer, &tmp, image);
+     gst_buffer_unref(buffer);
+     buffer = tmp;
+   }
+ 
+-  guint8* data = GST_BUFFER_DATA(buffer);
+-
+-  int width = mPicture.width;
+-  int height = mPicture.height;
+-  GstVideoFormat format = mFormat;
+-
+-  VideoData::YCbCrBuffer b;
+-  for(int i = 0; i < 3; i++) {
+-    b.mPlanes[i].mData = data + gst_video_format_get_component_offset(format, i,
+-        width, height);
+-    b.mPlanes[i].mStride = gst_video_format_get_row_stride(format, i, width);
+-    b.mPlanes[i].mHeight = gst_video_format_get_component_height(format,
+-        i, height);
+-    b.mPlanes[i].mWidth = gst_video_format_get_component_width(format,
+-        i, width);
+-    b.mPlanes[i].mOffset = 0;
+-    b.mPlanes[i].mSkip = 0;
+-  }
+-
+-  isKeyframe = !GST_BUFFER_FLAG_IS_SET(buffer, GST_BUFFER_FLAG_DELTA_UNIT);
+   int64_t offset = mDecoder->GetResource()->Tell(); // Estimate location in media.
+-  VideoData* video = VideoData::Create(mInfo.mVideo, image, offset,
+-                                       timestamp, duration, b,
+-                                       isKeyframe, -1, mPicture);
++  VideoData* video = VideoData::CreateFromImage(mInfo.mVideo,
++                                                mDecoder->GetImageContainer(),
++                                                offset, timestamp, duration,
++                                                static_cast<Image*>(image.get()),
++                                                isKeyframe, -1, mPicture);
+   mVideoQueue.Push(video);
++
+   gst_buffer_unref(buffer);
+ 
+   return true;
+@@ -698,6 +755,10 @@ nsresult GStreamerReader::Seek(int64_t aTarget,
+     return NS_ERROR_FAILURE;
+   }
+   LOG(PR_LOG_DEBUG, "seek succeeded");
++  GstMessage* message = gst_bus_timed_pop_filtered(mBus, GST_CLOCK_TIME_NONE,
++               (GstMessageType)(GST_MESSAGE_ASYNC_DONE | GST_MESSAGE_ERROR));
++  gst_message_unref(message);
++  LOG(PR_LOG_DEBUG, "seek completed");
+ 
+   return DecodeToTarget(aTarget);
+ }
+@@ -709,7 +770,9 @@ nsresult GStreamerReader::GetBuffered(dom::TimeRanges* aBuffered,
+     return NS_OK;
+   }
+ 
++#if GST_VERSION_MAJOR == 0
+   GstFormat format = GST_FORMAT_TIME;
++#endif
+   MediaResource* resource = mDecoder->GetResource();
+   nsTArray<MediaByteRange> ranges;
+   resource->GetCachedRanges(ranges);
+@@ -731,12 +794,21 @@ nsresult GStreamerReader::GetBuffered(dom::TimeRanges* aBuffered,
+     int64_t endOffset = ranges[index].mEnd;
+     gint64 startTime, endTime;
+ 
++#if GST_VERSION_MAJOR >= 1
++    if (!gst_element_query_convert(GST_ELEMENT(mPlayBin), GST_FORMAT_BYTES,
++      startOffset, GST_FORMAT_TIME, &startTime))
++      continue;
++    if (!gst_element_query_convert(GST_ELEMENT(mPlayBin), GST_FORMAT_BYTES,
++      endOffset, GST_FORMAT_TIME, &endTime))
++      continue;
++#else
+     if (!gst_element_query_convert(GST_ELEMENT(mPlayBin), GST_FORMAT_BYTES,
+       startOffset, &format, &startTime) || format != GST_FORMAT_TIME)
+       continue;
+     if (!gst_element_query_convert(GST_ELEMENT(mPlayBin), GST_FORMAT_BYTES,
+       endOffset, &format, &endTime) || format != GST_FORMAT_TIME)
+       continue;
++#endif
+ 
+     double start = (double) GST_TIME_AS_USECONDS (startTime) / GST_MSECOND;
+     double end = (double) GST_TIME_AS_USECONDS (endTime) / GST_MSECOND;
+@@ -755,7 +827,13 @@ void GStreamerReader::ReadAndPushData(guint aLength)
+   nsresult rv = NS_OK;
+ 
+   GstBuffer* buffer = gst_buffer_new_and_alloc(aLength);
++#if GST_VERSION_MAJOR >= 1
++  GstMapInfo info;
++  gst_buffer_map(buffer, &info, GST_MAP_WRITE);
++  guint8 *data = info.data;
++#else
+   guint8* data = GST_BUFFER_DATA(buffer);
++#endif
+   uint32_t size = 0, bytesRead = 0;
+   while(bytesRead < aLength) {
+     rv = resource->Read(reinterpret_cast<char*>(data + bytesRead),
+@@ -780,7 +860,12 @@ void GStreamerReader::ReadAndPushData(guint aLength)
+   int64_t offset2 = resource->Tell();
+   unused << offset2;
+ 
++#if GST_VERSION_MAJOR >= 1
++  gst_buffer_unmap(buffer, &info);
++  gst_buffer_set_size(buffer, bytesRead);
++#else
+   GST_BUFFER_SIZE(buffer) = bytesRead;
++#endif
+ 
+   GstFlowReturn ret = gst_app_src_push_buffer(mSource, gst_buffer_ref(buffer));
+   if (ret != GST_FLOW_OK) {
+@@ -786,8 +869,13 @@ int64_t GStreamerReader::QueryDuration()
+   gint64 duration = 0;
+   GstFormat format = GST_FORMAT_TIME;
+ 
++#if GST_VERSION_MAJOR >= 1
++  if (gst_element_query_duration(GST_ELEMENT(mPlayBin),
++      format, &duration)) {
++#else
+   if (gst_element_query_duration(GST_ELEMENT(mPlayBin),
+       &format, &duration)) {
++#endif
+     if (format == GST_FORMAT_TIME) {
+       LOG(PR_LOG_DEBUG, "pipeline duration %" GST_TIME_FORMAT,
+             GST_TIME_ARGS (duration));
+@@ -866,108 +954,6 @@ gboolean GStreamerReader::SeekData(GstAppSrc* aSrc, guint64 aOffset)
+   return NS_SUCCEEDED(rv);
+ }
+ 
+-gboolean GStreamerReader::EventProbeCb(GstPad* aPad,
+-                                         GstEvent* aEvent,
+-                                         gpointer aUserData)
+-{
+-  GStreamerReader* reader = reinterpret_cast<GStreamerReader*>(aUserData);
+-  return reader->EventProbe(aPad, aEvent);
+-}
+-
+-gboolean GStreamerReader::EventProbe(GstPad* aPad, GstEvent* aEvent)
+-{
+-  GstElement* parent = GST_ELEMENT(gst_pad_get_parent(aPad));
+-  switch(GST_EVENT_TYPE(aEvent)) {
+-    case GST_EVENT_NEWSEGMENT:
+-    {
+-      gboolean update;
+-      gdouble rate;
+-      GstFormat format;
+-      gint64 start, stop, position;
+-      GstSegment* segment;
+-
+-      /* Store the segments so we can convert timestamps to stream time, which
+-       * is what the upper layers sync on.
+-       */
+-      ReentrantMonitorAutoEnter mon(mGstThreadsMonitor);
+-      gst_event_parse_new_segment(aEvent, &update, &rate, &format,
+-          &start, &stop, &position);
+-      if (parent == GST_ELEMENT(mVideoAppSink))
+-        segment = &mVideoSegment;
+-      else
+-        segment = &mAudioSegment;
+-      gst_segment_set_newsegment(segment, update, rate, format,
+-          start, stop, position);
+-      break;
+-    }
+-    case GST_EVENT_FLUSH_STOP:
+-      /* Reset on seeks */
+-      ResetDecode();
+-      break;
+-    default:
+-      break;
+-  }
+-  gst_object_unref(parent);
+-
+-  return TRUE;
+-}
+-
+-GstFlowReturn GStreamerReader::AllocateVideoBufferFull(GstPad* aPad,
+-                                                       guint64 aOffset,
+-                                                       guint aSize,
+-                                                       GstCaps* aCaps,
+-                                                       GstBuffer** aBuf,
+-                                                       nsRefPtr<PlanarYCbCrImage>& aImage)
+-{
+-  /* allocate an image using the container */
+-  ImageContainer* container = mDecoder->GetImageContainer();
+-  if (!container) {
+-    // We don't have an ImageContainer. We probably belong to an <audio>
+-    // element.
+-    return GST_FLOW_NOT_SUPPORTED;
+-  }
+-  ImageFormat format = PLANAR_YCBCR;
+-  PlanarYCbCrImage* img = reinterpret_cast<PlanarYCbCrImage*>(container->CreateImage(&format, 1).get());
+-  nsRefPtr<PlanarYCbCrImage> image = dont_AddRef(img);
+-
+-  /* prepare a GstBuffer pointing to the underlying PlanarYCbCrImage buffer */
+-  GstBuffer* buf = GST_BUFFER(gst_moz_video_buffer_new());
+-  GST_BUFFER_SIZE(buf) = aSize;
+-  /* allocate the actual YUV buffer */
+-  GST_BUFFER_DATA(buf) = image->AllocateAndGetNewBuffer(aSize);
+-
+-  aImage = image;
+-
+-  /* create a GstMozVideoBufferData to hold the image */
+-  GstMozVideoBufferData* bufferdata = new GstMozVideoBufferData(image);
+-
+-  /* Attach bufferdata to our GstMozVideoBuffer, it will take care to free it */
+-  gst_moz_video_buffer_set_data(GST_MOZ_VIDEO_BUFFER(buf), bufferdata);
+-
+-  *aBuf = buf;
+-  return GST_FLOW_OK;
+-}
+-
+-GstFlowReturn GStreamerReader::AllocateVideoBufferCb(GstPad* aPad,
+-                                                     guint64 aOffset,
+-                                                     guint aSize,
+-                                                     GstCaps* aCaps,
+-                                                     GstBuffer** aBuf)
+-{
+-  GStreamerReader* reader = reinterpret_cast<GStreamerReader*>(gst_pad_get_element_private(aPad));
+-  return reader->AllocateVideoBuffer(aPad, aOffset, aSize, aCaps, aBuf);
+-}
+-
+-GstFlowReturn GStreamerReader::AllocateVideoBuffer(GstPad* aPad,
+-                                                   guint64 aOffset,
+-                                                   guint aSize,
+-                                                   GstCaps* aCaps,
+-                                                   GstBuffer** aBuf)
+-{
+-  nsRefPtr<PlanarYCbCrImage> image;
+-  return AllocateVideoBufferFull(aPad, aOffset, aSize, aCaps, aBuf, image);
+-}
+-
+ GstFlowReturn GStreamerReader::NewPrerollCb(GstAppSink* aSink,
+                                               gpointer aUserData)
+ {
+@@ -979,8 +970,12 @@ void GStreamerReader::AudioPreroll()
+ {
+   /* The first audio buffer has reached the audio sink. Get rate and channels */
+   LOG(PR_LOG_DEBUG, "Audio preroll");
+-  GstPad* sinkpad = gst_element_get_pad(GST_ELEMENT(mAudioAppSink), "sink");
++  GstPad* sinkpad = gst_element_get_static_pad(GST_ELEMENT(mAudioAppSink), "sink");
++#if GST_VERSION_MAJOR >= 1
++  GstCaps *caps = gst_pad_get_current_caps(sinkpad);
++#else
+   GstCaps* caps = gst_pad_get_negotiated_caps(sinkpad);
++#endif
+   GstStructure* s = gst_caps_get_structure(caps, 0);
+   mInfo.mAudio.mRate = mInfo.mAudio.mChannels = 0;
+   gst_structure_get_int(s, "rate", (gint*) &mInfo.mAudio.mRate);
+@@ -998,9 +993,18 @@ void GStreamerReader::VideoPreroll()
+ {
+   /* The first video buffer has reached the video sink. Get width and height */
+   LOG(PR_LOG_DEBUG, "Video preroll");
+-  GstPad* sinkpad = gst_element_get_pad(GST_ELEMENT(mVideoAppSink), "sink");
++  GstPad* sinkpad = gst_element_get_static_pad(GST_ELEMENT(mVideoAppSink), "sink");
++#if GST_VERSION_MAJOR >= 1
++  GstCaps* caps = gst_pad_get_current_caps(sinkpad);
++  memset (&mVideoInfo, 0, sizeof (mVideoInfo));
++  gst_video_info_from_caps(&mVideoInfo, caps);
++  mFormat = mVideoInfo.finfo->format;
++  mPicture.width = mVideoInfo.width;
++  mPicture.height = mVideoInfo.height;
++#else
+   GstCaps* caps = gst_pad_get_negotiated_caps(sinkpad);
+   gst_video_format_parse_caps(caps, &mFormat, &mPicture.width, &mPicture.height);
++#endif
+   GstStructure* structure = gst_caps_get_structure(caps, 0);
+   gst_structure_get_fraction(structure, "framerate", &fpsNum, &fpsDen);
+   NS_ASSERTION(mPicture.width && mPicture.height, "invalid video resolution");
+@@ -1029,6 +1033,7 @@ void GStreamerReader::NewVideoBuffer()
+   /* We have a new video buffer queued in the video sink. Increment the counter
+    * and notify the decode thread potentially blocked in DecodeVideoFrame
+    */
++
+   mDecoder->NotifyDecodedFrames(1, 0);
+   mVideoSinkBufferCount++;
+   mon.NotifyAll();
+@@ -1095,5 +1100,199 @@ void GStreamerReader::NotifyDataArrived(const char *aBuffer,
+   }
+ }
+ 
++#if GST_VERSION_MAJOR >= 1
++GstCaps* GStreamerReader::BuildAudioSinkCaps()
++{
++  GstCaps* caps = gst_caps_from_string("audio/x-raw, channels={1,2}");
++  const char* format;
++#ifdef MOZ_SAMPLE_TYPE_FLOAT32
++#ifdef IS_LITTLE_ENDIAN
++  format = "F32LE";
++#else
++  format = "F32BE";
++#endif
++#else /* !MOZ_SAMPLE_TYPE_FLOAT32 */
++#ifdef IS_LITTLE_ENDIAN
++  format = "S16LE";
++#else
++  format = "S16BE";
++#endif
++#endif
++  gst_caps_set_simple(caps, "format", G_TYPE_STRING, format, nullptr);
++
++  return caps;
++}
++
++void GStreamerReader::InstallPadCallbacks()
++{
++  GstPad* sinkpad = gst_element_get_static_pad(GST_ELEMENT(mVideoAppSink), "sink");
++
++  gst_pad_add_probe(sinkpad,
++      (GstPadProbeType) (GST_PAD_PROBE_TYPE_SCHEDULING |
++        GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM |
++        GST_PAD_PROBE_TYPE_EVENT_UPSTREAM |
++        GST_PAD_PROBE_TYPE_EVENT_FLUSH),
++      &GStreamerReader::EventProbeCb, this, nullptr);
++  gst_pad_add_probe(sinkpad, GST_PAD_PROBE_TYPE_QUERY_DOWNSTREAM,
++      GStreamerReader::QueryProbeCb, nullptr, nullptr);
++
++  gst_pad_set_element_private(sinkpad, this);
++  gst_object_unref(sinkpad);
++
++  sinkpad = gst_element_get_static_pad(GST_ELEMENT(mAudioAppSink), "sink");
++  gst_pad_add_probe(sinkpad,
++      (GstPadProbeType) (GST_PAD_PROBE_TYPE_SCHEDULING |
++        GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM |
++        GST_PAD_PROBE_TYPE_EVENT_UPSTREAM |
++        GST_PAD_PROBE_TYPE_EVENT_FLUSH),
++      &GStreamerReader::EventProbeCb, this, nullptr);
++  gst_object_unref(sinkpad);
++}
++
++GstPadProbeReturn GStreamerReader::EventProbeCb(GstPad *aPad,
++                                                GstPadProbeInfo *aInfo,
++                                                gpointer aUserData)
++{
++  GStreamerReader *reader = (GStreamerReader *) aUserData;
++  GstEvent *aEvent = (GstEvent *)aInfo->data;
++  return reader->EventProbe(aPad, aEvent);
++}
++
++GstPadProbeReturn GStreamerReader::EventProbe(GstPad *aPad, GstEvent *aEvent)
++{
++  GstElement* parent = GST_ELEMENT(gst_pad_get_parent(aPad));
++
++  LOG(PR_LOG_DEBUG, "event probe %s", GST_EVENT_TYPE_NAME (aEvent));
++
++  switch(GST_EVENT_TYPE(aEvent)) {
++    case GST_EVENT_SEGMENT:
++    {
++      const GstSegment *newSegment;
++      GstSegment* segment;
++
++      /* Store the segments so we can convert timestamps to stream time, which
++       * is what the upper layers sync on.
++       */
++      ReentrantMonitorAutoEnter mon(mGstThreadsMonitor);
++#if GST_VERSION_MINOR <= 1 && GST_VERSION_MICRO < 1
++      ResetDecode();
++#endif
++      gst_event_parse_segment(aEvent, &newSegment);
++      if (parent == GST_ELEMENT(mVideoAppSink))
++        segment = &mVideoSegment;
++      else
++        segment = &mAudioSegment;
++      gst_segment_copy_into (newSegment, segment);
++      break;
++    }
++    case GST_EVENT_FLUSH_STOP:
++      /* Reset on seeks */
++      ResetDecode();
++      break;
++    default:
++      break;
++  }
++  gst_object_unref(parent);
++
++  return GST_PAD_PROBE_OK;
++}
++
++GstPadProbeReturn GStreamerReader::QueryProbeCb(GstPad* aPad, GstPadProbeInfo* aInfo, gpointer aUserData)
++{
++  GStreamerReader* reader = reinterpret_cast<GStreamerReader*>(gst_pad_get_element_private(aPad));
++  return reader->QueryProbe(aPad, aInfo, aUserData);
++}
++
++GstPadProbeReturn GStreamerReader::QueryProbe(GstPad* aPad, GstPadProbeInfo* aInfo, gpointer aUserData)
++{
++  GstQuery *query = gst_pad_probe_info_get_query(aInfo);
++  GstPadProbeReturn ret = GST_PAD_PROBE_OK;
++
++  switch (GST_QUERY_TYPE (query)) {
++    case GST_QUERY_ALLOCATION:
++      GstCaps *caps;
++      GstVideoInfo info;
++      gboolean need_pool;
++
++      gst_query_parse_allocation(query, &caps, &need_pool);
++      gst_video_info_init(&info);
++      gst_video_info_from_caps(&info, caps);
++      gst_query_add_allocation_param(query, mAllocator, nullptr);
++      gst_query_add_allocation_pool(query, mBufferPool, info.size, 0, 0);
++      gst_query_add_allocation_meta(query, GST_VIDEO_META_API_TYPE, nullptr);
++      break;
++    default:
++      break;
++  }
++
++  return ret;
++}
++
++void GStreamerReader::ImageDataFromVideoFrame(GstVideoFrame *aFrame,
++                                              PlanarYCbCrImage::Data *aData)
++{
++  NS_ASSERTION(GST_VIDEO_INFO_IS_YUV(&mVideoInfo),
++               "Non-YUV video frame formats not supported");
++  NS_ASSERTION(GST_VIDEO_FRAME_N_COMPONENTS(aFrame) == 3,
++               "Unsupported number of components in video frame");
++
++  aData->mPicX = aData->mPicY = 0;
++  aData->mPicSize = nsIntSize(mPicture.width, mPicture.height);
++  aData->mStereoMode = STEREO_MODE_MONO;
++
++  aData->mYChannel = GST_VIDEO_FRAME_COMP_DATA(aFrame, 0);
++  aData->mYStride = GST_VIDEO_FRAME_COMP_STRIDE(aFrame, 0);
++  aData->mYSize = nsIntSize(GST_VIDEO_FRAME_COMP_WIDTH(aFrame, 0),
++                          GST_VIDEO_FRAME_COMP_HEIGHT(aFrame, 0));
++  aData->mYSkip = GST_VIDEO_FRAME_COMP_PSTRIDE(aFrame, 0) - 1;
++  aData->mCbCrStride = GST_VIDEO_FRAME_COMP_STRIDE(aFrame, 1);
++  aData->mCbCrSize = nsIntSize(GST_VIDEO_FRAME_COMP_WIDTH(aFrame, 1),
++                             GST_VIDEO_FRAME_COMP_HEIGHT(aFrame, 1));
++  aData->mCbChannel = GST_VIDEO_FRAME_COMP_DATA(aFrame, 1);
++  aData->mCrChannel = GST_VIDEO_FRAME_COMP_DATA(aFrame, 2);
++  aData->mCbSkip = GST_VIDEO_FRAME_COMP_PSTRIDE(aFrame, 1) - 1;
++  aData->mCrSkip = GST_VIDEO_FRAME_COMP_PSTRIDE(aFrame, 2) - 1;
++}
++
++nsRefPtr<PlanarYCbCrImage> GStreamerReader::GetImageFromBuffer(GstBuffer* aBuffer)
++{
++  nsRefPtr<PlanarYCbCrImage> image = nullptr;
++
++  if (gst_buffer_n_memory(aBuffer) == 1) {
++    GstMemory* mem = gst_buffer_peek_memory(aBuffer, 0);
++    if (GST_IS_MOZ_GFX_MEMORY_ALLOCATOR(mem->allocator)) {
++      image = moz_gfx_memory_get_image(mem);
++
++      GstVideoFrame frame;
++      gst_video_frame_map(&frame, &mVideoInfo, aBuffer, GST_MAP_READ);
++      PlanarYCbCrImage::Data data;
++      ImageDataFromVideoFrame(&frame, &data);
++      image->SetDataNoCopy(data);
++      gst_video_frame_unmap(&frame);
++    }
++  }
++
++  return image;
++}
++
++void GStreamerReader::CopyIntoImageBuffer(GstBuffer* aBuffer,
++                                          GstBuffer** aOutBuffer,
++                                          nsRefPtr<PlanarYCbCrImage> &image)
++{
++  *aOutBuffer = gst_buffer_new_allocate(mAllocator, gst_buffer_get_size(aBuffer), nullptr);
++  GstMemory *mem = gst_buffer_peek_memory(*aOutBuffer, 0);
++  GstMapInfo map_info;
++  gst_memory_map(mem, &map_info, GST_MAP_WRITE);
++  gst_buffer_extract(aBuffer, 0, map_info.data, gst_buffer_get_size(aBuffer));
++  gst_memory_unmap(mem, &map_info);
++
++  /* create a new gst buffer with the newly created memory and copy the
++   * metadata over from the incoming buffer */
++  gst_buffer_copy_into(*aOutBuffer, aBuffer,
++      (GstBufferCopyFlags)(GST_BUFFER_COPY_METADATA), 0, -1);
++  image = GetImageFromBuffer(*aOutBuffer);
++}
++#endif
++
+ } // namespace mozilla
+ 
+diff --git content/media/gstreamer/GStreamerReader.h content/media/gstreamer/GStreamerReader.h
+index 1e30bed..6a90702 100644
+--- mozilla/content/media/gstreamer/GStreamerReader.h
++++ mozilla/content/media/gstreamer/GStreamerReader.h
+@@ -22,6 +22,7 @@
+ 
+ #include "MediaDecoderReader.h"
+ #include "MP3FrameParser.h"
++#include "ImageContainer.h"
+ #include "nsRect.h"
+ 
+ namespace mozilla {
+@@ -30,10 +31,6 @@ namespace dom {
+ class TimeRanges;
+ }
+ 
+-namespace layers {
+-class PlanarYCbCrImage;
+-}
+-
+ class AbstractMediaDecoder;
+ 
+ class GStreamerReader : public MediaDecoderReader
+@@ -67,10 +64,20 @@ public:
+     return mInfo.HasVideo();
+   }
+ 
++  layers::ImageContainer* GetImageContainer() { return mDecoder->GetImageContainer(); }
++
+ private:
+ 
+   void ReadAndPushData(guint aLength);
+   int64_t QueryDuration();
++  nsRefPtr<layers::PlanarYCbCrImage> GetImageFromBuffer(GstBuffer* aBuffer);
++  void CopyIntoImageBuffer(GstBuffer *aBuffer, GstBuffer** aOutBuffer, nsRefPtr<layers::PlanarYCbCrImage> &image);
++  GstCaps* BuildAudioSinkCaps();
++  void InstallPadCallbacks();
++
++#if GST_VERSION_MAJOR >= 1
++  void ImageDataFromVideoFrame(GstVideoFrame *aFrame, layers::PlanarYCbCrImage::Data *aData);
++#endif
+ 
+   /* Called once the pipeline is setup to check that the stream only contains
+    * supported formats
+@@ -105,20 +112,31 @@ private:
+   gboolean SeekData(GstAppSrc* aSrc, guint64 aOffset);
+ 
+   /* Called when events reach the sinks. See inline comments */
++#if GST_VERSION_MAJOR == 1
++  static GstPadProbeReturn EventProbeCb(GstPad *aPad, GstPadProbeInfo *aInfo, gpointer aUserData);
++  GstPadProbeReturn EventProbe(GstPad *aPad, GstEvent *aEvent);
++#else
+   static gboolean EventProbeCb(GstPad* aPad, GstEvent* aEvent, gpointer aUserData);
+   gboolean EventProbe(GstPad* aPad, GstEvent* aEvent);
++#endif
+ 
+-  /* Called when elements in the video branch of the pipeline call
+-   * gst_pad_alloc_buffer(). Used to provide PlanarYCbCrImage backed GstBuffers
+-   * to the pipeline so that a memory copy can be avoided when handling YUV
+-   * buffers from the pipeline to the gfx side.
++  /* Called when the video part of the pipeline allocates buffers. Used to
++   * provide PlanarYCbCrImage backed GstBuffers to the pipeline so that a memory
++   * copy can be avoided when handling YUV buffers from the pipeline to the gfx
++   * side.
+    */
++#if GST_VERSION_MAJOR == 1
++  static GstPadProbeReturn QueryProbeCb(GstPad *aPad, GstPadProbeInfo *aInfo, gpointer aUserData);
++  GstPadProbeReturn QueryProbe(GstPad *aPad, GstPadProbeInfo *aInfo, gpointer aUserData);
++#else
+   static GstFlowReturn AllocateVideoBufferCb(GstPad* aPad, guint64 aOffset, guint aSize,
+                                              GstCaps* aCaps, GstBuffer** aBuf);
+   GstFlowReturn AllocateVideoBufferFull(GstPad* aPad, guint64 aOffset, guint aSize,
+                                      GstCaps* aCaps, GstBuffer** aBuf, nsRefPtr<layers::PlanarYCbCrImage>& aImage);
+   GstFlowReturn AllocateVideoBuffer(GstPad* aPad, guint64 aOffset, guint aSize,
+                                      GstCaps* aCaps, GstBuffer** aBuf);
++#endif
++
+ 
+   /* Called when the pipeline is prerolled, that is when at start or after a
+    * seek, the first audio and video buffers are queued in the sinks.
+@@ -150,6 +168,11 @@ private:
+   bool mUseParserDuration;
+   int64_t mLastParserDuration;
+ 
++#if GST_VERSION_MAJOR >= 1
++  GstAllocator *mAllocator;
++  GstBufferPool *mBufferPool;
++  GstVideoInfo mVideoInfo;
++#endif
+   GstElement* mPlayBin;
+   GstBus* mBus;
+   GstAppSrc* mSource;
+@@ -180,6 +203,9 @@ private:
+    * DecodeAudioData and DecodeVideoFrame should not expect any more data
+    */
+   bool mReachedEos;
++#if GST_VERSION_MAJOR >= 1
++  bool mConfigureAlignment;
++#endif
+   int fpsNum;
+   int fpsDen;
+ };
+diff --git content/media/gstreamer/moz.build content/media/gstreamer/moz.build
+index 7d51bf5..a3c1856 100644
+--- mozilla/content/media/gstreamer/moz.build
++++ mozilla/content/media/gstreamer/moz.build
+@@ -15,10 +15,19 @@ SOURCES += [
+     'GStreamerDecoder.cpp',
+     'GStreamerFormatHelper.cpp',
+     'GStreamerLoader.cpp',
+-    'GStreamerMozVideoBuffer.cpp',
+     'GStreamerReader.cpp',
+ ]
+ 
++if CONFIG['GST_API_VERSION'] == '1.0':
++    SOURCES += [
++        'GStreamerAllocator.cpp',
++    ]
++else:
++    SOURCES += [
++        'GStreamerMozVideoBuffer.cpp',
++        'GStreamerReader-0.10.cpp',
++    ]
++
+ FAIL_ON_WARNINGS = True
+ 
+ FINAL_LIBRARY = 'gklayout'
+diff --git content/media/test/manifest.js content/media/test/manifest.js
+index 6e39753..3c8c3b9 100644
+--- mozilla/content/media/test/manifest.js
++++ mozilla/content/media/test/manifest.js
+@@ -357,9 +357,9 @@ var gUnseekableTests = [
+   { name:"bogus.duh", type:"bogus/duh"}
+ ];
+ // Unfortunately big-buck-bunny-unseekable.mp4 is doesn't play on Windows 7, so
+-// only include it in the unseekable tests if we're on later versions of Windows.
+-if (navigator.userAgent.indexOf("Windows") == -1 ||
+-    IsWindows8OrLater()) {
++// only include it in the unseekable tests if we're on later versions of Windows. 
++// This test actually only passes on win8 at the moment.
++if (navigator.userAgent.indexOf("Windows") != -1 && IsWindows8OrLater()) {
+   gUnseekableTests = gUnseekableTests.concat([
+     { name:"big-buck-bunny-unseekable.mp4", type:"video/mp4" }
+   ]);
diff --git a/www/seamonkey/files/patch-bug810716 b/www/seamonkey/files/patch-bug810716
deleted file mode 100644
index 05637dc71251..000000000000
--- a/www/seamonkey/files/patch-bug810716
+++ /dev/null
@@ -1,68 +0,0 @@
-diff --git configure.in configure.in
-index 2084be9..eb6eeb2 100644
---- mozilla/configure.in
-+++ mozilla/configure.in
-@@ -3369,14 +3369,19 @@ fi
- AC_CACHE_CHECK(
-     [for res_ninit()],
-     ac_cv_func_res_ninit,
--    [AC_TRY_LINK([
-+    [AC_TRY_RUN([
-         #ifdef linux
-         #define _BSD_SOURCE 1
-         #endif
-+        #include <sys/types.h>
-+        #include <netinet/in.h>
-+        #include <arpa/nameser.h>
-         #include <resolv.h>
--        ],
--        [int foo = res_ninit(&_res);],
-+        int main(int argc, char **argv){
-+            int foo = res_ninit(&_res);
-+        }],
-         [ac_cv_func_res_ninit=yes],
-+        [ac_cv_func_res_ninit=no],
-         [ac_cv_func_res_ninit=no])
-     ])
- 
-diff --git extensions/auth/nsAuthGSSAPI.cpp extensions/auth/nsAuthGSSAPI.cpp
-index e828beb..6444246 100644
---- mozilla/extensions/auth/nsAuthGSSAPI.cpp
-+++ mozilla/extensions/auth/nsAuthGSSAPI.cpp
-@@ -39,6 +39,9 @@ typedef KLStatus (*KLCacheHasValidTickets_type)(
- #endif
- 
- #if defined(HAVE_RES_NINIT)
-+#include <sys/types.h>
-+#include <netinet/in.h>
-+#include <arpa/nameser.h>
- #include <resolv.h>
- #endif
- 
-diff --git js/src/configure.in js/src/configure.in
-index e25f569..b9722f9 100644
---- mozilla/js/src/configure.in
-+++ mozilla/js/src/configure.in
-@@ -2797,14 +2797,19 @@ fi
- AC_CACHE_CHECK(
-     [for res_ninit()],
-     ac_cv_func_res_ninit,
--    [AC_TRY_LINK([
-+    [AC_TRY_RUN([
-         #ifdef linux
-         #define _BSD_SOURCE 1
-         #endif
-+        #include <sys/types.h>
-+        #include <netinet/in.h>
-+        #include <arpa/nameser.h>
-         #include <resolv.h>
--        ],
--        [int foo = res_ninit(&_res);],
-+        int main(int argc, char **argv){
-+            int foo = res_ninit(&_res);
-+        }],
-         [ac_cv_func_res_ninit=yes],
-+        [ac_cv_func_res_ninit=no],
-         [ac_cv_func_res_ninit=no])
-     ])
- 
diff --git a/www/seamonkey/files/patch-bug826985 b/www/seamonkey/files/patch-bug826985
index c7bd5a99a7f9..abc31e2e9cfd 100644
--- a/www/seamonkey/files/patch-bug826985
+++ b/www/seamonkey/files/patch-bug826985
@@ -42,9 +42,9 @@ index b483cd1..f1dd1f0 100644
 --- mozilla/media/webrtc/signaling/test/Makefile.in
 +++ mozilla/media/webrtc/signaling/test/Makefile.in
 @@ -17,6 +17,7 @@ LIBS = \
-   $(NSPR_LIBS) \
    $(NSS_LIBS) \
    $(REALTIME_LIBS) \
+   $(MOZ_JS_LIBS) \
 +  $(MOZ_LIBV4L2_LIBS) \
    $(DEPTH)/xpcom/glue/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
    $(DEPTH)/media/mtransport/standalone/$(LIB_PREFIX)mtransport_s.$(LIB_SUFFIX) \
@@ -53,7 +53,7 @@ diff --git media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_lin
 index 239a292..bab496c 100644
 --- mozilla/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc
 +++ mozilla/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc
-@@ -26,11 +26,23 @@
+@@ -25,10 +25,21 @@
  #else
  #include <linux/videodev2.h>
  #endif
@@ -61,9 +61,8 @@ index 239a292..bab496c 100644
 +#include <libv4l2.h>
 +#endif
  
- #include "ref_count.h"
- #include "trace.h"
- 
+ #include "webrtc/system_wrappers/interface/ref_count.h"
+ #include "webrtc/system_wrappers/interface/trace.h"
  
 +#ifdef HAVE_LIBV4L2
 +#define open	v4l2_open
@@ -73,10 +72,9 @@ index 239a292..bab496c 100644
 +#define mmap	v4l2_mmap
 +#define munmap	v4l2_munmap
 +#endif
-+
+ 
  namespace webrtc
  {
- namespace videocapturemodule
 @@ -130,6 +142,11 @@ WebRtc_Word32 DeviceInfoLinux::GetDeviceName(
      memset(deviceNameUTF8, 0, deviceNameLength);
      memcpy(cameraName, cap.card, sizeof(cap.card));
@@ -154,11 +152,11 @@ diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in
 index 9c16ffa..1db3794 100644
 --- mozilla/toolkit/library/Makefile.in
 +++ mozilla/toolkit/library/Makefile.in
-@@ -405,6 +405,7 @@ endif
+@@ -121,6 +121,7 @@ endif
  EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DIST)/lib)
  
  ifdef MOZ_WEBRTC
 +EXTRA_DSO_LDOPTS += $(MOZ_LIBV4L2_LIBS)
- ifdef MOZ_PEERCONNECTION
- COMPONENT_LIBS += peerconnection
- endif
+ ifdef MOZ_WEBRTC_SIGNALING
+ SHARED_LIBRARY_LIBS += \
+   $(DEPTH)/media/webrtc/signaling/signaling_ecc/$(LIB_PREFIX)ecc.$(LIB_SUFFIX) \
diff --git a/www/seamonkey/files/patch-bug847568 b/www/seamonkey/files/patch-bug847568
new file mode 100644
index 000000000000..e3c35c9606b3
--- /dev/null
+++ b/www/seamonkey/files/patch-bug847568
@@ -0,0 +1,188 @@
+# Allow building against system-wide graphite2/harfbuzz.
+
+diff --git config/Makefile.in config/Makefile.in
+index 14bfc0d..5383399 100644
+--- mozilla/config/Makefile.in
++++ mozilla/config/Makefile.in
+@@ -77,6 +77,8 @@ export:: $(export-preqs)
+ 		-DMOZ_NATIVE_LIBEVENT=$(MOZ_NATIVE_LIBEVENT) \
+ 		-DMOZ_NATIVE_LIBVPX=$(MOZ_NATIVE_LIBVPX) \
+ 		-DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \
++		-DMOZ_NATIVE_GRAPHITE2=$(MOZ_NATIVE_GRAPHITE2) \
++		-DMOZ_NATIVE_HARFBUZZ=$(MOZ_NATIVE_HARFBUZZ) \
+ 		$(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
+ 	$(INSTALL) system_wrappers $(DIST)
+ 
+diff --git config/system-headers config/system-headers
+index 126391e..b711fc3 100644
+--- mozilla/config/system-headers
++++ mozilla/config/system-headers
+@@ -1144,3 +1144,11 @@ unicode/utypes.h
+ #endif
+ libutil.h
+ unwind.h
++#if MOZ_NATIVE_GRAPHITE2==1
++graphite2/Font.h
++graphite2/Segment.h
++#endif
++#if MOZ_NATIVE_HARFBUZZ==1
++harfbuzz/hb-ot.h
++harfbuzz/hb.h
++#endif
+diff --git configure.in configure.in
+index bbc7b40..1747206 100644
+--- mozilla/configure.in
++++ mozilla/configure.in
+@@ -7848,6 +7848,34 @@ if test "$USE_FC_FREETYPE"; then
+ fi
+ 
+ dnl ========================================================
++dnl Check for graphite2 and harfbuzz
++dnl ========================================================
++
++MOZ_ARG_WITH_BOOL(system-harfbuzz,
++[  --with-system-harfbuzz  Use system harfbuzz (located with pkgconfig)],
++MOZ_NATIVE_HARFBUZZ=1,
++MOZ_NATIVE_HARFBUZZ= )
++
++if test -n "$MOZ_NATIVE_HARFBUZZ"; then
++    PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 0.9.25)
++fi
++AC_SUBST(MOZ_NATIVE_HARFBUZZ)
++AC_SUBST(MOZ_HARFBUZZ_CFLAGS)
++AC_SUBST(MOZ_HARFBUZZ_LIBS)
++
++MOZ_ARG_WITH_BOOL(system-graphite2,
++[  --with-system-graphite2 Use system graphite2 (located with pkgconfig)],
++MOZ_NATIVE_GRAPHITE2=1,
++MOZ_NATIVE_GRAPHITE2= )
++
++if test -n "$MOZ_NATIVE_GRAPHITE2"; then
++    PKG_CHECK_MODULES(MOZ_GRAPHITE2, graphite2 >= 1.2.4)
++fi
++AC_SUBST(MOZ_NATIVE_GRAPHITE2)
++AC_SUBST(MOZ_GRAPHITE2_CFLAGS)
++AC_SUBST(MOZ_GRAPHITE2_LIBS)
++
++dnl ========================================================
+ dnl Check for pixman and cairo
+ dnl ========================================================
+ 
+diff --git content/base/src/Makefile.in content/base/src/Makefile.in
+index a618096..596901a 100644
+--- mozilla/content/base/src/Makefile.in
++++ mozilla/content/base/src/Makefile.in
+@@ -5,6 +5,10 @@
+ 
+ include $(topsrcdir)/config/rules.mk
+ 
++ifdef MOZ_NATIVE_HARFBUZZ
++nsContentUtils.$(OBJ_SUFFIX): CXXFLAGS+=$(MOZ_HARFBUZZ_CFLAGS)
++endif
++
+ # gcc requires -msse2 for this file since it uses SSE2 intrinsics.  (See bug
+ # 585538 comment 12.)
+ ifneq (,$(INTEL_ARCHITECTURE))
+diff --git gfx/moz.build gfx/moz.build
+index 519aa46..6929751 100644
+--- mozilla/gfx/moz.build
++++ mozilla/gfx/moz.build
+@@ -7,6 +7,12 @@
+ if CONFIG['MOZ_TREE_CAIRO']:
+     DIRS += ['cairo']
+ 
++if not CONFIG['MOZ_NATIVE_GRAPHITE2']:
++    DIRS += ['graphite2/src' ]
++
++if not CONFIG['MOZ_NATIVE_HARFBUZZ']:
++    DIRS += ['harfbuzz/src']
++
+ DIRS += [
+     '2d',
+     'ycbcr',
+@@ -15,8 +21,6 @@ DIRS += [
+     'qcms',
+     'gl',
+     'layers',
+-    'graphite2/src',
+-    'harfbuzz/src',
+     'ots/src',
+     'thebes',
+     'ipc',
+diff --git gfx/skia/Makefile.in gfx/skia/Makefile.in
+index 07a77a3..067f7bd 100644
+--- mozilla/gfx/skia/Makefile.in
++++ mozilla/gfx/skia/Makefile.in
+@@ -15,6 +15,10 @@ ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
+ OS_CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PANGO_CFLAGS) $(CAIRO_FT_CFLAGS)
+ endif
+ 
++ifdef MOZ_NATIVE_HARFBUZZ
++OS_CXXFLAGS += $(MOZ_HARFBUZZ_CFLAGS)
++endif
++
+ include $(topsrcdir)/config/rules.mk
+ 
+ ifneq (,$(INTEL_ARCHITECTURE))
+diff --git gfx/thebes/Makefile.in gfx/thebes/Makefile.in
+index e9f6b6c..0df2d8d 100644
+--- mozilla/gfx/thebes/Makefile.in
++++ mozilla/gfx/thebes/Makefile.in
+@@ -13,6 +13,14 @@ DEFINES := $(filter-out -DUNICODE,$(DEFINES))
+ CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)
+ CFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)
+ 
++ifdef MOZ_NATIVE_GRAPHITE2
++CXXFLAGS += $(MOZ_GRAPHITE2_CFLAGS)
++endif
++
++ifdef MOZ_NATIVE_HARFBUZZ
++CXXFLAGS += $(MOZ_HARFBUZZ_CFLAGS)
++endif
++
+ ifeq ($(MOZ_WIDGET_TOOLKIT),android)
+ CXXFLAGS += $(CAIRO_FT_CFLAGS)
+ endif
+diff --git intl/unicharutil/util/Makefile.in intl/unicharutil/util/Makefile.in
+index f6b9f7c..11c44f4 100644
+--- mozilla/intl/unicharutil/util/Makefile.in
++++ mozilla/intl/unicharutil/util/Makefile.in
+@@ -21,3 +21,7 @@ ifdef _MSC_VER
+ OS_COMPILE_CXXFLAGS += -Zl
+ OS_COMPILE_CFLAGS += -Zl
+ endif
++
++ifdef MOZ_NATIVE_HARFBUZZ
++nsUnicodePropertyData.$(OBJ_SUFFIX): CXXFLAGS+=$(MOZ_HARFBUZZ_CFLAGS)
++endif
+diff --git netwerk/dns/Makefile.in netwerk/dns/Makefile.in
+index 1cacbd7..a8cd156 100644
+--- mozilla/netwerk/dns/Makefile.in
++++ mozilla/netwerk/dns/Makefile.in
+@@ -9,3 +9,7 @@ include $(topsrcdir)/config/rules.mk
+ # for effective TLD data.
+ etld_data.inc: $(srcdir)/prepare_tlds.py $(srcdir)/effective_tld_names.dat
+ 	$(PYTHON) $(srcdir)/prepare_tlds.py $(srcdir)/effective_tld_names.dat > etld_data.inc
++
++ifdef MOZ_NATIVE_HARFBUZZ
++nsIDNService.$(OBJ_SUFFIX): CXXFLAGS+=$(MOZ_HARFBUZZ_CFLAGS)
++endif
+diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in
+index 007f272..27f488e 100644
+--- mozilla/toolkit/library/Makefile.in
++++ mozilla/toolkit/library/Makefile.in
+@@ -103,6 +103,14 @@ ifndef MOZ_TREE_PIXMAN
+ EXTRA_DSO_LDOPTS += $(MOZ_PIXMAN_LIBS)
+ endif
+ 
++ifdef MOZ_NATIVE_GRAPHITE2
++EXTRA_DSO_LDOPTS += $(MOZ_GRAPHITE2_LIBS)
++endif
++
++ifdef MOZ_NATIVE_HARFBUZZ
++EXTRA_DSO_LDOPTS += $(MOZ_HARFBUZZ_LIBS)
++endif
++
+ ifdef MOZ_DMD
+ EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,dmd,$(DIST)/lib)
+ endif
diff --git a/www/seamonkey/files/patch-bug893397 b/www/seamonkey/files/patch-bug893397
index 0815e8ba400f..989430c379d0 100644
--- a/www/seamonkey/files/patch-bug893397
+++ b/www/seamonkey/files/patch-bug893397
@@ -2,7 +2,7 @@ diff --git configure.in configure.in
 index 549ad06..2878d9f 100644
 --- mozilla/configure.in
 +++ mozilla/configure.in
-@@ -8491,7 +8491,7 @@ case "$OS_TARGET" in
+@@ -8091,7 +8091,7 @@ case "$OS_TARGET" in
        NECKO_WIFI=1
      fi
      ;;
@@ -15,23 +15,23 @@ diff --git netwerk/wifi/moz.build netwerk/wifi/moz.build
 index 07b01de..11706af 100644
 --- mozilla/netwerk/wifi/moz.build
 +++ mozilla/netwerk/wifi/moz.build
-@@ -34,6 +34,10 @@ if CONFIG['OS_ARCH'] == 'Darwin':
-     CMMSRCS += [
+@@ -35,6 +35,10 @@ if CONFIG['OS_ARCH'] == 'Darwin':
+     UNIFIED_SOURCES += [
          'osx_corewlan.mm',
      ]
 +elif CONFIG['OS_ARCH'] == 'FreeBSD':
-+    SOURCES += [
++    UNIFIED_SOURCES += [
 +        'nsWifiScannerFreeBSD.cpp',
 +    ]
  elif CONFIG['OS_ARCH'] == 'WINNT':
-     CPP_SOURCES += [
+     UNIFIED_SOURCES += [
          'nsWifiScannerWin.cpp',
 diff --git netwerk/wifi/nsWifiScannerFreeBSD.cpp netwerk/wifi/nsWifiScannerFreeBSD.cpp
 new file mode 100644
 index 0000000..80d4cb6
 --- /dev/null
 +++ mozilla/netwerk/wifi/nsWifiScannerFreeBSD.cpp
-@@ -0,0 +1,172 @@
+@@ -0,0 +1,167 @@
 +/* This Source Code Form is subject to the terms of the Mozilla Public
 + * License, v. 2.0. If a copy of the MPL was not distributed with this
 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -60,43 +60,39 @@ index 0000000..80d4cb6
 +static nsresult
 +FreeBSDGetAccessPointData(nsCOMArray<nsWifiAccessPoint> &accessPoints)
 +{
-+  bool res = false;
-+  char *dupn = NULL;
-+  struct ifaddrs *ifal, *ifa;
-+  unsigned len;
-+
 +  // get list of interfaces
-+  if (getifaddrs(&ifal) < 0)
++  struct ifaddrs *ifal;
++  if (getifaddrs(&ifal) < 0) {
 +    return NS_ERROR_FAILURE;
++  }
 +
 +  accessPoints.Clear();
 +
 +  // loop through the interfaces
++  nsresult rv = NS_ERROR_FAILURE;
++  struct ifaddrs *ifa;
 +  for (ifa = ifal; ifa; ifa = ifa->ifa_next) {
-+    int s;
-+    struct ifreq ifr;
-+    struct ifmediareq ifmr;
-+    struct ieee80211req i802r;
-+    char iscanbuf[32*1024], *vsr;
-+
-+    memset(&ifr, 0, sizeof(ifr));
-+
-+    // list can contain duplicates, so ignore those
-+    if (dupn != NULL && strcmp(dupn, ifa->ifa_name) == 0)
++    // limit to one interface per address
++    if (ifa->ifa_addr->sa_family != AF_LINK) {
 +      continue;
-+    dupn = ifa->ifa_name;
++    }
 +
 +    // store interface name in socket structure
++    struct ifreq ifr;
++    memset(&ifr, 0, sizeof(ifr));
 +    strncpy(ifr.ifr_name, ifa->ifa_name, sizeof(ifr.ifr_name));
 +    ifr.ifr_addr.sa_family = AF_LOCAL;
 +
 +    // open socket to interface
-+    if ((s = socket(ifr.ifr_addr.sa_family, SOCK_DGRAM, 0)) < 0)
++    int s = socket(ifr.ifr_addr.sa_family, SOCK_DGRAM, 0);
++    if (s < 0) {
 +      continue;
++    }
 +
 +    // clear interface media structure
-+    (void) memset(&ifmr, 0, sizeof(ifmr));
-+    (void) strncpy(ifmr.ifm_name, ifa->ifa_name, sizeof(ifmr.ifm_name));
++    struct ifmediareq ifmr;
++    memset(&ifmr, 0, sizeof(ifmr));
++    strncpy(ifmr.ifm_name, ifa->ifa_name, sizeof(ifmr.ifm_name));
 +
 +    // get interface media information
 +    if (ioctl(s, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) {
@@ -111,8 +107,10 @@ index 0000000..80d4cb6
 +    }
 +
 +    // perform WiFi scan
-+    (void) memset(&i802r, 0, sizeof(i802r));
-+    (void) strncpy(i802r.i_name, ifa->ifa_name, sizeof(i802r.i_name));
++    struct ieee80211req i802r;
++    char iscanbuf[32*1024];
++    memset(&i802r, 0, sizeof(i802r));
++    strncpy(i802r.i_name, ifa->ifa_name, sizeof(i802r.i_name));
 +    i802r.i_type = IEEE80211_IOC_SCAN_RESULTS;
 +    i802r.i_data = iscanbuf;
 +    i802r.i_len = sizeof(iscanbuf);
@@ -125,36 +123,33 @@ index 0000000..80d4cb6
 +    close(s);
 +
 +    // loop through WiFi networks and build geoloc-lookup structure
-+    vsr = (char *) i802r.i_data;
-+    len = i802r.i_len;
++    char *vsr = (char *) i802r.i_data;
++    unsigned len = i802r.i_len;
 +    while (len >= sizeof(struct ieee80211req_scan_result)) {
-+      struct ieee80211req_scan_result *isr;
-+      char *id;
-+      int idlen;
-+      char ssid[IEEE80211_NWID_LEN+1];
-+      nsWifiAccessPoint *ap;
-+
-+      isr = (struct ieee80211req_scan_result *) vsr;
++      struct ieee80211req_scan_result *isr =
++        (struct ieee80211req_scan_result *) vsr;
 +
 +      // determine size of this entry
++      char *id;
++      int idlen;
 +      if (isr->isr_meshid_len) {
 +        id = vsr + isr->isr_ie_off + isr->isr_ssid_len;
 +        idlen = isr->isr_meshid_len;
-+      }
-+      else {
++      } else {
 +        id = vsr + isr->isr_ie_off;
 +        idlen = isr->isr_ssid_len;
 +      }
 +
 +      // copy network data
++      char ssid[IEEE80211_NWID_LEN+1];
 +      strncpy(ssid, id, idlen);
 +      ssid[idlen] = '\0';
-+      ap = new nsWifiAccessPoint();
++      nsWifiAccessPoint *ap = new nsWifiAccessPoint();
 +      ap->setSSID(ssid, strlen(ssid));
 +      ap->setMac(isr->isr_bssid);
 +      ap->setSignal(isr->isr_rssi);
 +      accessPoints.AppendObject(ap);
-+      res = true;
++      rv = NS_OK;
 +
 +      // log the data
 +      LOG(( "FreeBSD access point: "
@@ -172,7 +167,7 @@ index 0000000..80d4cb6
 +
 +  freeifaddrs(ifal);
 +
-+  return res ? NS_OK : NS_ERROR_FAILURE;
++  return rv;
 +}
 +
 +nsresult
diff --git a/www/seamonkey/files/patch-bug945046 b/www/seamonkey/files/patch-bug945046
deleted file mode 100644
index 51ea60ea499f..000000000000
--- a/www/seamonkey/files/patch-bug945046
+++ /dev/null
@@ -1,160 +0,0 @@
-diff --git config/system-headers config/system-headers
-index 432cba6..18a9627 100644
---- mozilla/config/system-headers
-+++ mozilla/config/system-headers
-@@ -1131,3 +1131,4 @@ unicode/unum.h
- unicode/ustring.h
- unicode/utypes.h
- #endif
-+libutil.h
-diff --git js/src/config/system-headers js/src/config/system-headers
-index 432cba6..18a9627 100644
---- mozilla/js/src/config/system-headers
-+++ mozilla/js/src/config/system-headers
-@@ -1131,3 +1131,4 @@ unicode/unum.h
- unicode/ustring.h
- unicode/utypes.h
- #endif
-+libutil.h
-diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in
-index 9975621..b4b037d 100644
---- mozilla/toolkit/library/Makefile.in
-+++ mozilla/toolkit/library/Makefile.in
-@@ -289,6 +289,10 @@ OS_LIBS += $(call EXPAND_LIBNAME,kvm)
- EXTRA_DSO_LDOPTS += -Wl,--warn-unresolved-symbols
- endif
- 
-+ifeq ($(OS_ARCH),FreeBSD)
-+OS_LIBS += $(call EXPAND_LIBNAME,util)
-+endif
-+
- ifeq ($(OS_ARCH),WINNT)
- OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32 version winspool comdlg32 imm32 msimg32 shlwapi psapi ws2_32 dbghelp rasapi32 rasdlg iphlpapi uxtheme setupapi secur32 sensorsapi portabledeviceguids windowscodecs wininet wbemuuid)
- ifdef ACCESSIBILITY
-diff --git xpcom/base/nsMemoryReporterManager.cpp xpcom/base/nsMemoryReporterManager.cpp
-index b8147c8..0ffb34e 100644
---- mozilla/xpcom/base/nsMemoryReporterManager.cpp
-+++ mozilla/xpcom/base/nsMemoryReporterManager.cpp
-@@ -204,6 +204,61 @@ ResidentFastDistinguishedAmount(int64_t* aN)
-     return ResidentDistinguishedAmount(aN);
- }
- 
-+#ifdef __FreeBSD__
-+#include <libutil.h>
-+#include <algorithm>
-+
-+static nsresult
-+GetKinfoVmentrySelf(int64_t* prss, uint64_t* maxreg)
-+{
-+    int cnt;
-+    struct kinfo_vmentry *vmmap, *kve;
-+    if ((vmmap = kinfo_getvmmap(getpid(), &cnt)) == NULL)
-+        return NS_ERROR_FAILURE;
-+
-+    if (prss)
-+        *prss = 0;
-+    if (maxreg)
-+        *maxreg = 0;
-+
-+    for (int i = 0; i < cnt; i++) {
-+        kve = &vmmap[i];
-+        if (prss)
-+            *prss += kve->kve_private_resident;
-+        if (maxreg)
-+            *maxreg = std::max(*maxreg,
-+                               kve->kve_end - kve->kve_start);
-+    }
-+
-+    free(vmmap);
-+    return NS_OK;
-+}
-+
-+#define HAVE_PRIVATE_REPORTER
-+static nsresult
-+PrivateDistinguishedAmount(int64_t* aN)
-+{
-+    int64_t priv;
-+    nsresult rv = GetKinfoVmentrySelf(&priv, NULL);
-+    if (NS_SUCCEEDED(rv))
-+        *aN = priv * getpagesize();
-+
-+    return NS_OK;
-+}
-+
-+#define HAVE_VSIZE_MAX_CONTIGUOUS_REPORTER 1
-+static nsresult
-+VsizeMaxContiguousDistinguishedAmount(int64_t* aN)
-+{
-+    uint64_t biggestRegion;
-+    nsresult rv = GetKinfoVmentrySelf(NULL, &biggestRegion);
-+    if (NS_SUCCEEDED(rv))
-+        *aN = biggestRegion;
-+
-+    return NS_OK;
-+}
-+#endif // FreeBSD
-+
- #elif defined(SOLARIS)
- 
- #include <procfs.h>
-@@ -416,6 +470,25 @@ VsizeMaxContiguousDistinguishedAmount(int64_t* aN)
-     return NS_OK;
- }
- 
-+#define HAVE_PRIVATE_REPORTER
-+static nsresult
-+PrivateDistinguishedAmount(int64_t* aN)
-+{
-+    PROCESS_MEMORY_COUNTERS_EX pmcex;
-+    pmcex.cb = sizeof(PROCESS_MEMORY_COUNTERS_EX);
-+
-+    if (!GetProcessMemoryInfo(
-+            GetCurrentProcess(),
-+            (PPROCESS_MEMORY_COUNTERS) &pmcex, sizeof(pmcex))) {
-+        return NS_ERROR_FAILURE;
-+    }
-+
-+    *aN = pmcex.PrivateUsage;
-+    return NS_OK;
-+}
-+#endif  // XP_<PLATFORM>
-+
-+#ifdef HAVE_VSIZE_MAX_CONTIGUOUS_REPORTER
- class VsizeMaxContiguousReporter MOZ_FINAL : public MemoryUniReporter
- {
- public:
-@@ -429,8 +502,9 @@ public:
-         return VsizeMaxContiguousDistinguishedAmount(aAmount);
-     }
- };
-+#endif
- 
--#define HAVE_PRIVATE_REPORTER
-+#ifdef HAVE_PRIVATE_REPORTER
- class PrivateReporter MOZ_FINAL : public MemoryUniReporter
- {
- public:
-@@ -443,21 +517,10 @@ public:
- 
-     NS_IMETHOD GetAmount(int64_t* aAmount)
-     {
--        PROCESS_MEMORY_COUNTERS_EX pmcex;
--        pmcex.cb = sizeof(PROCESS_MEMORY_COUNTERS_EX);
--
--        if (!GetProcessMemoryInfo(
--                GetCurrentProcess(),
--                (PPROCESS_MEMORY_COUNTERS) &pmcex, sizeof(pmcex))) {
--            return NS_ERROR_FAILURE;
--        }
--
--        *aAmount = pmcex.PrivateUsage;
--        return NS_OK;
-+        return PrivateDistinguishedAmount(aAmount);
-     }
- };
--
--#endif  // XP_<PLATFORM>
-+#endif
- 
- #ifdef HAVE_VSIZE_AND_RESIDENT_REPORTERS
- class VsizeReporter MOZ_FINAL : public MemoryUniReporter
diff --git a/www/seamonkey/files/patch-bug946560 b/www/seamonkey/files/patch-bug946560
deleted file mode 100644
index 7ef52a57a6b7..000000000000
--- a/www/seamonkey/files/patch-bug946560
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git xpcom/base/nsMemoryInfoDumper.cpp xpcom/base/nsMemoryInfoDumper.cpp
-index 0b2f78c..d857374 100644
---- mozilla/xpcom/base/nsMemoryInfoDumper.cpp
-+++ mozilla/xpcom/base/nsMemoryInfoDumper.cpp
-@@ -6,7 +6,7 @@
- 
- #include "mozilla/nsMemoryInfoDumper.h"
- 
--#ifdef XP_LINUX
-+#if defined(XP_LINUX) || defined(__FreeBSD__)
- #include "mozilla/Preferences.h"
- #endif
- #include "mozilla/unused.h"
-@@ -31,7 +31,7 @@
- #include <unistd.h>
- #endif
- 
--#ifdef XP_LINUX
-+#if defined(XP_LINUX) || defined(__FreeBSD__)
- #include <fcntl.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -110,7 +110,7 @@ private:
- 
- } // anonymous namespace
- 
--#ifdef XP_LINUX // {
-+#if defined(XP_LINUX) || defined(__FreeBSD__) // {
- namespace {
- 
- /*
-@@ -552,7 +552,7 @@ nsMemoryInfoDumper::~nsMemoryInfoDumper()
- /* static */ void
- nsMemoryInfoDumper::Initialize()
- {
--#ifdef XP_LINUX
-+#if defined(XP_LINUX) || defined(__FreeBSD__)
-   SignalPipeWatcher::Create();
-   FifoWatcher::MaybeCreate();
- #endif
-diff --git xpcom/base/nsMemoryReporterManager.cpp xpcom/base/nsMemoryReporterManager.cpp
-index 1252e27..6f22093 100644
---- mozilla/xpcom/base/nsMemoryReporterManager.cpp
-+++ mozilla/xpcom/base/nsMemoryReporterManager.cpp
-@@ -17,7 +17,7 @@
- #include "nsPIDOMWindow.h"
- #include "nsIObserverService.h"
- #include "nsIGlobalObject.h"
--#if defined(XP_LINUX)
-+#if defined(XP_LINUX) || defined(__FreeBSD__)
- #include "nsMemoryInfoDumper.h"
- #endif
- #include "mozilla/Attributes.h"
-@@ -898,7 +898,7 @@ nsMemoryReporterManager::Init()
-     RegisterStrongReporter(new mozilla::dmd::DMDReporter());
- #endif
- 
--#if defined(XP_LINUX)
-+#if defined(XP_LINUX) || defined(__FreeBSD__)
-     nsMemoryInfoDumper::Initialize();
- #endif
- 
diff --git a/www/seamonkey/files/patch-bug961264 b/www/seamonkey/files/patch-bug961264
new file mode 100644
index 000000000000..00d077b235db
--- /dev/null
+++ b/www/seamonkey/files/patch-bug961264
@@ -0,0 +1,266 @@
+commit d099acd
+Author: Trevor Saunders <trev.saunders@gmail.com>
+Date:   Fri Jan 17 15:08:00 2014 -0800
+
+    Bug 961264 - Remove obsolete checks for gcc visibility stuff.
+---
+ configure.in        | 115 +++-------------------------------------------------
+ js/src/configure.in | 111 ++------------------------------------------------
+ 2 files changed, 8 insertions(+), 218 deletions(-)
+
+diff --git configure.in configure.in
+index dfb8193..33d71b3 100644
+--- mozilla/configure.in
++++ mozilla/configure.in
+@@ -2507,118 +2507,15 @@ MOZ_CXX11
+ 
+ AC_LANG_C
+ 
+-dnl Check for .hidden assembler directive and visibility attribute.
+-dnl Borrowed from glibc configure.in
++dnl Setup default hidden visibility and wrapped system headers.
+ dnl ===============================================================
+ if test "$GNU_CC"; then
+-  AC_CACHE_CHECK(for visibility(hidden) attribute,
+-                 ac_cv_visibility_hidden,
+-                 [cat > conftest.c <<EOF
+-                  int foo __attribute__ ((visibility ("hidden"))) = 1;
+-EOF
+-                  ac_cv_visibility_hidden=no
+-                  if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
+-                    if egrep '\.(hidden|private_extern).*foo' conftest.s >/dev/null; then
+-                      ac_cv_visibility_hidden=yes
+-                    fi
+-                  fi
+-                  rm -f conftest.[cs]
+-                 ])
+-  if test "$ac_cv_visibility_hidden" = "yes"; then
+-    AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE)
+-
+-    AC_CACHE_CHECK(for visibility(default) attribute,
+-                   ac_cv_visibility_default,
+-                   [cat > conftest.c <<EOF
+-                    int foo __attribute__ ((visibility ("default"))) = 1;
+-EOF
+-                    ac_cv_visibility_default=no
+-                    if ${CC-cc} -fvisibility=hidden -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
+-                      if ! egrep '\.(hidden|private_extern).*foo' conftest.s >/dev/null; then
+-                        ac_cv_visibility_default=yes
+-                      fi
+-                    fi
+-                    rm -f conftest.[cs]
+-                   ])
+-    if test "$ac_cv_visibility_default" = "yes"; then
+-      AC_DEFINE(HAVE_VISIBILITY_ATTRIBUTE)
+-
+-      AC_CACHE_CHECK(for visibility pragma support,
+-                     ac_cv_visibility_pragma,
+-                     [cat > conftest.c <<EOF
+-#pragma GCC visibility push(hidden)
+-                      int foo_hidden = 1;
+-#pragma GCC visibility push(default)
+-                      int foo_default = 1;
+-EOF
+-                      ac_cv_visibility_pragma=no
+-                      if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
+-                        if egrep '\.(hidden|private_extern).*foo_hidden' conftest.s >/dev/null; then
+-                          if ! egrep '\.(hidden|private_extern).*foo_default' conftest.s > /dev/null; then
+-                            ac_cv_visibility_pragma=yes
+-                          fi
+-                        fi
+-                      fi
+-                      rm -f conftest.[cs]
+-                    ])
+-      if test "$ac_cv_visibility_pragma" = "yes"; then
+-        AC_CACHE_CHECK(For gcc visibility bug with class-level attributes (GCC bug 26905),
+-                       ac_cv_have_visibility_class_bug,
+-                       [cat > conftest.c <<EOF
+-#pragma GCC visibility push(hidden)
+-struct __attribute__ ((visibility ("default"))) TestStruct {
+-  static void Init();
+-};
+-__attribute__ ((visibility ("default"))) void TestFunc() {
+-  TestStruct::Init();
+-}
+-EOF
+-                       ac_cv_have_visibility_class_bug=no
+-                       if ! ${CXX-g++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
+-                         ac_cv_have_visibility_class_bug=yes
+-                       else
+-                         if test `egrep -c '@PLT|\\$stub' conftest.S` = 0; then
+-                           ac_cv_have_visibility_class_bug=yes
+-                         fi
+-                       fi
+-                       rm -rf conftest.{c,S}
+-                       ])
+-
+-        AC_CACHE_CHECK(For x86_64 gcc visibility bug with builtins (GCC bug 20297),
+-                       ac_cv_have_visibility_builtin_bug,
+-                       [cat > conftest.c <<EOF
+-#pragma GCC visibility push(hidden)
+-#pragma GCC visibility push(default)
+-#include <string.h>
+-#pragma GCC visibility pop
+-
+-__attribute__ ((visibility ("default"))) void Func() {
+-  char c[[100]];
+-  memset(c, 0, sizeof(c));
+-}
+-EOF
+-                       ac_cv_have_visibility_builtin_bug=no
+-                       if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
+-                         ac_cv_have_visibility_builtin_bug=yes
+-                       else
+-                         if test `grep -c "@PLT" conftest.S` = 0; then
+-                           ac_cv_visibility_builtin_bug=yes
+-                         fi
+-                       fi
+-                       rm -f conftest.{c,S}
+-                       ])
+-        if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \
+-                "$ac_cv_have_visibility_class_bug" = "no"; then
+-          VISIBILITY_FLAGS='-I$(DIST)/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h'
+-          WRAP_SYSTEM_INCLUDES=1
+-          STL_FLAGS='-I$(DIST)/stl_wrappers'
+-          WRAP_STL_INCLUDES=1
+-        else
+-          VISIBILITY_FLAGS='-fvisibility=hidden'
+-        fi # have visibility pragma bug
+-      fi   # have visibility pragma
+-    fi     # have visibility(default) attribute
+-  fi       # have visibility(hidden) attribute
++  AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE)
++  AC_DEFINE(HAVE_VISIBILITY_ATTRIBUTE)
++  VISIBILITY_FLAGS='-I$(DIST)/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h'
++  WRAP_SYSTEM_INCLUDES=1
++  STL_FLAGS='-I$(DIST)/stl_wrappers'
++  WRAP_STL_INCLUDES=1
+ fi         # GNU_CC
+ 
+ # visibility hidden flag for Sun Studio on Solaris
+diff --git js/src/configure.in js/src/configure.in
+index bddd46d..d4b522e 100644
+--- mozilla/js/src/configure.in
++++ mozilla/js/src/configure.in
+@@ -2348,116 +2348,13 @@ fi
+ 
+ AC_LANG_C
+ 
+-dnl Check for .hidden assembler directive and visibility attribute.
+-dnl Borrowed from glibc configure.in
++dnl Setup default hidden visibility and wrapped system headers.
+ dnl ===============================================================
+ if test "$GNU_CC"; then
+-  AC_CACHE_CHECK(for visibility(hidden) attribute,
+-                 ac_cv_visibility_hidden,
+-                 [cat > conftest.c <<EOF
+-                  int foo __attribute__ ((visibility ("hidden"))) = 1;
+-EOF
+-                  ac_cv_visibility_hidden=no
+-                  if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
+-                    if egrep '\.(hidden|private_extern).*foo' conftest.s >/dev/null; then
+-                      ac_cv_visibility_hidden=yes
+-                    fi
+-                  fi
+-                  rm -f conftest.[cs]
+-                 ])
+-  if test "$ac_cv_visibility_hidden" = "yes"; then
+-    AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE)
+-
+-    AC_CACHE_CHECK(for visibility(default) attribute,
+-                   ac_cv_visibility_default,
+-                   [cat > conftest.c <<EOF
+-                    int foo __attribute__ ((visibility ("default"))) = 1;
+-EOF
+-                    ac_cv_visibility_default=no
+-                    if ${CC-cc} -fvisibility=hidden -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
+-                      if ! egrep '\.(hidden|private_extern).*foo' conftest.s >/dev/null; then
+-                        ac_cv_visibility_default=yes
+-                      fi
+-                    fi
+-                    rm -f conftest.[cs]
+-                   ])
+-    if test "$ac_cv_visibility_default" = "yes"; then
+-      AC_DEFINE(HAVE_VISIBILITY_ATTRIBUTE)
+-
+-      AC_CACHE_CHECK(for visibility pragma support,
+-                     ac_cv_visibility_pragma,
+-                     [cat > conftest.c <<EOF
+-#pragma GCC visibility push(hidden)
+-                      int foo_hidden = 1;
+-#pragma GCC visibility push(default)
+-                      int foo_default = 1;
+-EOF
+-                      ac_cv_visibility_pragma=no
+-                      if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
+-                        if egrep '\.(hidden|private_extern).*foo_hidden' conftest.s >/dev/null; then
+-                          if ! egrep '\.(hidden|private_extern).*foo_default' conftest.s > /dev/null; then
+-                            ac_cv_visibility_pragma=yes
+-                          fi
+-                        fi
+-                      fi
+-                      rm -f conftest.[cs]
+-                    ])
+-      if test "$ac_cv_visibility_pragma" = "yes"; then
+-        AC_CACHE_CHECK(For gcc visibility bug with class-level attributes (GCC bug 26905),
+-                       ac_cv_have_visibility_class_bug,
+-                       [cat > conftest.c <<EOF
+-#pragma GCC visibility push(hidden)
+-struct __attribute__ ((visibility ("default"))) TestStruct {
+-  static void Init();
+-};
+-__attribute__ ((visibility ("default"))) void TestFunc() {
+-  TestStruct::Init();
+-}
+-EOF
+-                       ac_cv_have_visibility_class_bug=no
+-                       if ! ${CXX-g++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
+-                         ac_cv_have_visibility_class_bug=yes
+-                       else
+-                         if test `egrep -c '@PLT|\\$stub' conftest.S` = 0; then
+-                           ac_cv_have_visibility_class_bug=yes
+-                         fi
+-                       fi
+-                       rm -rf conftest.{c,S}
+-                       ])
+-
+-        AC_CACHE_CHECK(For x86_64 gcc visibility bug with builtins (GCC bug 20297),
+-                       ac_cv_have_visibility_builtin_bug,
+-                       [cat > conftest.c <<EOF
+-#pragma GCC visibility push(hidden)
+-#pragma GCC visibility push(default)
+-#include <string.h>
+-#pragma GCC visibility pop
+-
+-__attribute__ ((visibility ("default"))) void Func() {
+-  char c[[100]];
+-  memset(c, 0, sizeof(c));
+-}
+-EOF
+-                       ac_cv_have_visibility_builtin_bug=no
+-                       if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
+-                         ac_cv_have_visibility_builtin_bug=yes
+-                       else
+-                         if test `grep -c "@PLT" conftest.S` = 0; then
+-                           ac_cv_visibility_builtin_bug=yes
+-                         fi
+-                       fi
+-                       rm -f conftest.{c,S}
+-                       ])
+-        if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \
+-                "$ac_cv_have_visibility_class_bug" = "no"; then
+-          VISIBILITY_FLAGS='-I$(DIST)/system_wrappers_js -include $(topsrcdir)/config/gcc_hidden.h'
+-          WRAP_SYSTEM_INCLUDES=1
+-        else
+-          VISIBILITY_FLAGS='-fvisibility=hidden'
+-        fi # have visibility pragma bug
+-      fi   # have visibility pragma
+-    fi     # have visibility(default) attribute
+-  fi       # have visibility(hidden) attribute
++  AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE)
++  AC_DEFINE(HAVE_VISIBILITY_ATTRIBUTE)
++  VISIBILITY_FLAGS='-I$(DIST)/system_wrappers_js -include $(topsrcdir)/config/gcc_hidden.h'
++  WRAP_SYSTEM_INCLUDES=1
+ fi         # GNU_CC
+ 
+ # visibility hidden flag for Sun Studio on Solaris
diff --git a/www/seamonkey/files/patch-bug961816 b/www/seamonkey/files/patch-bug961816
new file mode 100644
index 000000000000..f4316f625838
--- /dev/null
+++ b/www/seamonkey/files/patch-bug961816
@@ -0,0 +1,48 @@
+diff --git config/system-headers config/system-headers
+index 8803150..ae38d68 100644
+--- mozilla/config/system-headers
++++ mozilla/config/system-headers
+@@ -1145,3 +1145,4 @@ unicode/ustring.h
+ unicode/utypes.h
+ #endif
+ libutil.h
++unwind.h
+diff --git configure.in configure.in
+index f452a5e..a1ebbcc 100644
+--- mozilla/configure.in
++++ mozilla/configure.in
+@@ -7455,7 +7455,10 @@ dnl ========================================================
+ dnl = Support for gcc stack unwinding (from gcc 3.3)
+ dnl ========================================================
+ if test -z "$SKIP_LIBRARY_CHECKS"; then
++    AC_LANG_SAVE
++    AC_LANG_CPLUSPLUS
+     MOZ_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace))
++    AC_LANG_RESTORE
+ fi
+ 
+ dnl ========================================================
+diff --git config/system-headers config/system-headers
+index 8803150..ae38d68 100644
+--- mozilla/js/src/config/system-headers
++++ mozilla/js/src/config/system-headers
+@@ -1145,3 +1145,4 @@ unicode/ustring.h
+ unicode/utypes.h
+ #endif
+ libutil.h
++unwind.h
+diff --git configure.in configure.in
+index f452a5e..a1ebbcc 100644
+--- mozilla/js/src/configure.in
++++ mozilla/js/src/configure.in
+@@ -7455,7 +7455,10 @@ dnl ========================================================
+ dnl = Support for gcc stack unwinding (from gcc 3.3)
+ dnl ========================================================
+ if test -z "$SKIP_LIBRARY_CHECKS"; then
++    AC_LANG_SAVE
++    AC_LANG_CPLUSPLUS
+     MOZ_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace))
++    AC_LANG_RESTORE
+ fi
+ 
+ dnl ========================================================
diff --git a/www/seamonkey/files/patch-bug962345 b/www/seamonkey/files/patch-bug962345
new file mode 100644
index 000000000000..07292e6fbfa9
--- /dev/null
+++ b/www/seamonkey/files/patch-bug962345
@@ -0,0 +1,18 @@
+diff --git config/system-headers config/system-headers
+index 8803150..ae38d68 100644
+--- mozilla/config/system-headers
++++ mozilla/config/system-headers
+@@ -1144,3 +1144,4 @@ unicode/utypes.h
+ #endif
+ libutil.h
+ unwind.h
++cairo-qt.h
+diff --git config/system-headers config/system-headers
+index 8803150..ae38d68 100644
+--- mozilla/js/src/config/system-headers
++++ mozilla/js/src/config/system-headers
+@@ -1144,3 +1144,4 @@ unicode/utypes.h
+ #endif
+ libutil.h
+ unwind.h
++cairo-qt.h
diff --git a/www/seamonkey/files/patch-bug973744 b/www/seamonkey/files/patch-bug973744
new file mode 100644
index 000000000000..d1acf2a3ffb0
--- /dev/null
+++ b/www/seamonkey/files/patch-bug973744
@@ -0,0 +1,38 @@
+commit 2506904
+Author: Alessandro Decina <alessandro.d@gmail.com>
+Date:   Wed Feb 19 11:30:09 2014 -0500
+
+    Bug 973744 - Remove matroska seek hack in the gstreamer media backend. r=edwin
+---
+ content/media/gstreamer/GStreamerReader.cpp | 21 ---------------------
+ 1 file changed, 21 deletions(-)
+
+diff --git content/media/gstreamer/GStreamerReader.cpp content/media/gstreamer/GStreamerReader.cpp
+index e21ffdd..82dadeb 100644
+--- mozilla/content/media/gstreamer/GStreamerReader.cpp
++++ mozilla/content/media/gstreamer/GStreamerReader.cpp
+@@ -381,24 +381,6 @@ nsresult GStreamerReader::ReadMetadata(MediaInfo* aInfo,
+     /* we couldn't get this to play */
+     return ret;
+ 
+-  /* FIXME: workaround for a bug in matroskademux. This seek makes matroskademux
+-   * parse the index */
+-  LOG(PR_LOG_DEBUG, "doing matroskademux seek hack");
+-  if (gst_element_seek_simple(mPlayBin, GST_FORMAT_TIME,
+-        GST_SEEK_FLAG_FLUSH, 0)) {
+-    /* after a seek we need to wait again for ASYNC_DONE */
+-    message = gst_bus_timed_pop_filtered(mBus, 5 * GST_SECOND,
+-       (GstMessageType)(GST_MESSAGE_ASYNC_DONE | GST_MESSAGE_ERROR));
+-    LOG(PR_LOG_DEBUG, "matroskademux seek hack done");
+-    if (GST_MESSAGE_TYPE(message) != GST_MESSAGE_ASYNC_DONE) {
+-      gst_element_set_state(mPlayBin, GST_STATE_NULL);
+-      gst_message_unref(message);
+-      return NS_ERROR_FAILURE;
+-    }
+-  } else {
+-    LOG(PR_LOG_DEBUG, "matroskademux seek hack failed (non fatal)");
+-  }
+-
+   /* report the duration */
+   gint64 duration;
+ 
diff --git a/www/seamonkey/files/patch-bug975634 b/www/seamonkey/files/patch-bug975634
new file mode 100644
index 000000000000..97f770d09757
--- /dev/null
+++ b/www/seamonkey/files/patch-bug975634
@@ -0,0 +1,63 @@
+diff --git configure.in configure.in
+index 0d9236a..0447104 100644
+--- mozilla/configure.in
++++ mozilla/configure.in
+@@ -8670,6 +8670,20 @@ fi
+ AC_SUBST(MOZ_EM_DEBUG)
+ 
+ if test -n "$COMPILE_ENVIRONMENT"; then
++AC_MSG_CHECKING([for posix_fadvise])
++AC_TRY_LINK([#define _XOPEN_SOURCE 600
++  #include <fcntl.h>],
++                 [posix_fadvise(0, 0, 0, 0);],
++                 [ac_cv___posix_fadvise=true],
++                 [ac_cv___posix_fadvise=false])
++
++if test "$ac_cv___posix_fadvise" = true ; then
++  AC_DEFINE(HAVE_POSIX_FADVISE)
++  AC_MSG_RESULT(yes)
++else
++  AC_MSG_RESULT(no)
++fi
++
+ AC_MSG_CHECKING([for posix_fallocate])
+ AC_TRY_LINK([#define _XOPEN_SOURCE 600
+   #include <fcntl.h>],
+diff --git js/src/configure.in js/src/configure.in
+index da9767c..352ba14 100644
+--- mozilla/js/src/configure.in
++++ mozilla/js/src/configure.in
+@@ -4025,6 +4025,20 @@ AC_SUBST(CXX_VERSION)
+ AC_SUBST(MSMANIFEST_TOOL)
+ AC_SUBST(MOZ_LINKER)
+ 
++AC_MSG_CHECKING([for posix_fadvise])
++AC_TRY_LINK([#define _XOPEN_SOURCE 600
++  #include <fcntl.h>],
++                 [posix_fadvise(0, 0, 0, 0);],
++                 [ac_cv___posix_fadvise=true],
++                 [ac_cv___posix_fadvise=false])
++
++if test "$ac_cv___posix_fadvise" = true ; then
++  AC_DEFINE(HAVE_POSIX_FADVISE)
++  AC_MSG_RESULT(yes)
++else
++  AC_MSG_RESULT(no)
++fi
++
+ AC_MSG_CHECKING([for posix_fallocate])
+ AC_TRY_LINK([#define _XOPEN_SOURCE 600
+   #include <fcntl.h>],
+diff --git xpcom/io/nsLocalFileUnix.cpp xpcom/io/nsLocalFileUnix.cpp
+index bacf06c..0e46e4a 100644
+--- mozilla/xpcom/io/nsLocalFileUnix.cpp
++++ mozilla/xpcom/io/nsLocalFileUnix.cpp
+@@ -382,7 +382,7 @@ nsLocalFile::OpenNSPRFileDesc(int32_t flags, int32_t mode, PRFileDesc **_retval)
+         PR_Delete(mPath.get());
+     }
+ 
+-#if defined(LINUX) && !defined(ANDROID)
++#if defined(HAVE_POSIX_FADVISE)
+     if (flags & OS_READAHEAD) {
+         posix_fadvise(PR_FileDesc2NativeHandle(*_retval), 0, 0,
+                       POSIX_FADV_SEQUENTIAL);
diff --git a/www/seamonkey/files/patch-bug977457 b/www/seamonkey/files/patch-bug977457
new file mode 100644
index 000000000000..82209ce2ec29
--- /dev/null
+++ b/www/seamonkey/files/patch-bug977457
@@ -0,0 +1,27 @@
+diff --git xpcom/base/nsStackWalk.cpp xpcom/base/nsStackWalk.cpp
+index bb0e15b..7641267 100644
+--- mozilla/xpcom/base/nsStackWalk.cpp
++++ mozilla/xpcom/base/nsStackWalk.cpp
+@@ -23,6 +23,12 @@ struct CriticalAddress {
+ };
+ static CriticalAddress gCriticalAddress;
+ 
++// for _Unwind_Backtrace from libcxxrt or libunwind
++// cxxabi.h from libcxxrt implicitly includes unwind.h first
++#if defined(HAVE__UNWIND_BACKTRACE) && !defined(_GNU_SOURCE)
++#define _GNU_SOURCE
++#endif
++
+ #if defined(HAVE_DLOPEN) || defined(XP_MACOSX)
+ #include <dlfcn.h>
+ #endif
+@@ -1222,9 +1228,6 @@ NS_StackWalk(NS_WalkStackCallback aCallback, uint32_t aSkipFrames,
+ #elif defined(HAVE__UNWIND_BACKTRACE)
+ 
+ // libgcc_s.so symbols _Unwind_Backtrace@@GCC_3.3 and _Unwind_GetIP@@GCC_3.0
+-#ifndef _GNU_SOURCE
+-#define _GNU_SOURCE
+-#endif
+ #include <unwind.h>
+ 
+ struct unwind_info {
diff --git a/www/seamonkey/files/patch-clang32-libc++-visibility-hack b/www/seamonkey/files/patch-clang32-libc++-visibility-hack
deleted file mode 100644
index 881e4ed94b5a..000000000000
--- a/www/seamonkey/files/patch-clang32-libc++-visibility-hack
+++ /dev/null
@@ -1,38 +0,0 @@
---- mozilla/configure.in~
-+++ mozilla/configure.in
-@@ -2855,6 +2855,7 @@ EOF
- #pragma GCC visibility push(hidden)
- #pragma GCC visibility push(default)
- #include <string.h>
-+#include <iterator>
- #pragma GCC visibility pop
- 
- __attribute__ ((visibility ("default"))) void Func() {
-@@ -2863,7 +2864,7 @@ __attribute__ ((visibility ("default"))) void Func() {
- }
- EOF
-                        ac_cv_have_visibility_builtin_bug=no
--                       if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
-+                       if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
-                          ac_cv_have_visibility_builtin_bug=yes
-                        else
-                          if test `grep -c "@PLT" conftest.S` = 0; then
---- mozilla/js/src/configure.in~
-+++ mozilla/js/src/configure.in
-@@ -2855,6 +2855,7 @@ EOF
- #pragma GCC visibility push(hidden)
- #pragma GCC visibility push(default)
- #include <string.h>
-+#include <iterator>
- #pragma GCC visibility pop
- 
- __attribute__ ((visibility ("default"))) void Func() {
-@@ -2863,7 +2864,7 @@ __attribute__ ((visibility ("default"))) void Func() {
- }
- EOF
-                        ac_cv_have_visibility_builtin_bug=no
--                       if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
-+                       if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
-                          ac_cv_have_visibility_builtin_bug=yes
-                        else
-                          if test `grep -c "@PLT" conftest.S` = 0; then
diff --git a/www/seamonkey/files/patch-clang34-disable-stdcall b/www/seamonkey/files/patch-clang34-disable-stdcall
new file mode 100644
index 000000000000..6abb13eb72ef
--- /dev/null
+++ b/www/seamonkey/files/patch-clang34-disable-stdcall
@@ -0,0 +1,13 @@
+# http://llvm.org/bugs/show_bug.cgi?id=19007
+
+--- mozilla/xpcom/base/nscore.h~
++++ mozilla/xpcom/base/nscore.h
+@@ -110,7 +110,7 @@
+  *           NS_HIDDEN_(int) NS_FASTCALL func2(char *foo);
+  */
+ 
+-#if defined(__i386__) && defined(__GNUC__) && !defined(XP_OS2)
++#if defined(__i386__) && defined(__GNUC__) && !defined(XP_OS2) && !(defined(__clang__) && __clang_major__ == 3 && __clang_minor__ == 4 && __clang_patchlevel__ == 0)
+ #define NS_FASTCALL __attribute__ ((regparm (3), stdcall))
+ #define NS_CONSTRUCTOR_FASTCALL __attribute__ ((regparm (3), stdcall))
+ #elif defined(XP_WIN) && !defined(_WIN64)
diff --git a/www/seamonkey/files/patch-mozilla-js-src-Makefile.in b/www/seamonkey/files/patch-mozilla-js-src-Makefile.in
new file mode 100644
index 000000000000..885d6602fa5b
--- /dev/null
+++ b/www/seamonkey/files/patch-mozilla-js-src-Makefile.in
@@ -0,0 +1,11 @@
+--- mozilla/js/src/Makefile.in~
++++ mozilla/js/src/Makefile.in
+@@ -373,7 +373,7 @@ endif
+ ifdef MOZ_SHARED_ICU
+ EXTRA_DSO_LDOPTS += $(MOZ_ICU_LIBS)
+ else
+-SHARED_LIBRARY_LIBS += $(MOZ_ICU_LIBS)
++SHARED_LIBRARY_LIBS += $(filter-out -L% -l%,$(MOZ_ICU_LIBS))
+ endif
+ 
+ # Prevent floating point errors caused by VC++ optimizations
diff --git a/www/seamonkey/files/patch-mozilla-memory-jemalloc-Makefile.in b/www/seamonkey/files/patch-mozilla-memory-jemalloc-Makefile.in
new file mode 100644
index 000000000000..eb7ba7283a2e
--- /dev/null
+++ b/www/seamonkey/files/patch-mozilla-memory-jemalloc-Makefile.in
@@ -0,0 +1,10 @@
+--- mozilla/memory/jemalloc/Makefile.in~
++++ mozilla/memory/jemalloc/Makefile.in
+@@ -12,3 +12,7 @@ include $(topsrcdir)/config/rules.mk
+ ifdef GNU_CC
+ CFLAGS += -std=gnu99
+ endif
++
++# XXX startup crash workaround for gcc47 on amd64
++jemalloc.$(OBJ_SUFFIX): OS_CFLAGS := $(filter-out -O3 -Ofast,$(OS_CFLAGS))
++jemalloc.$(OBJ_SUFFIX): MOZ_OPTIMIZE_FLAGS=
diff --git a/www/seamonkey/files/patch-z-bug517422 b/www/seamonkey/files/patch-z-bug517422
new file mode 100644
index 000000000000..490da806c8f5
--- /dev/null
+++ b/www/seamonkey/files/patch-z-bug517422
@@ -0,0 +1,263 @@
+# Allow building against system-wide ogg/vorbis/opus.
+
+diff --git config/Makefile.in config/Makefile.in
+index 5383399..4393ae8 100644
+--- mozilla/config/Makefile.in
++++ mozilla/config/Makefile.in
+@@ -79,6 +79,9 @@ export:: $(export-preqs)
+ 		-DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \
+ 		-DMOZ_NATIVE_GRAPHITE2=$(MOZ_NATIVE_GRAPHITE2) \
+ 		-DMOZ_NATIVE_HARFBUZZ=$(MOZ_NATIVE_HARFBUZZ) \
++		-DMOZ_NATIVE_OGG=$(MOZ_NATIVE_OGG) \
++		-DMOZ_NATIVE_VORBIS=$(MOZ_NATIVE_VORBIS) \
++		-DMOZ_NATIVE_OPUS=$(MOZ_NATIVE_OPUS) \
+ 		$(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
+ 	$(INSTALL) system_wrappers $(DIST)
+ 
+diff --git config/external/moz.build config/external/moz.build
+index c22a36c..740402e 100644
+--- mozilla/config/external/moz.build
++++ mozilla/config/external/moz.build
+@@ -15,13 +15,13 @@ if CONFIG['MOZ_UPDATER']:
+     if not CONFIG['MOZ_NATIVE_BZ2']:
+         external_dirs += ['modules/libbz2']
+ 
+-if CONFIG['MOZ_VORBIS']:
++if CONFIG['MOZ_VORBIS'] and not CONFIG['MOZ_NATIVE_VORBIS']:
+     external_dirs += ['media/libvorbis']
+ 
+ if CONFIG['MOZ_TREMOR']:
+     external_dirs += ['media/libtremor']
+ 
+-if CONFIG['MOZ_OPUS']:
++if CONFIG['MOZ_OPUS'] and not CONFIG['MOZ_NATIVE_OPUS']:
+     external_dirs += ['media/libopus']
+ 
+ if CONFIG['MOZ_WEBM']:
+@@ -34,7 +34,9 @@ if CONFIG['MOZ_VPX'] and not CONFIG['MOZ_NATIVE_LIBVPX']:
+     external_dirs += ['media/libvpx']
+ 
+ if CONFIG['MOZ_OGG']:
+-    external_dirs += ['media/libogg', 'media/libtheora']
++    if not CONFIG['MOZ_NATIVE_OGG']:
++        external_dirs += ['media/libogg']
++    external_dirs += ['media/libtheora']
+ 
+ if not CONFIG['MOZ_NATIVE_PNG']:
+     external_dirs += ['media/libpng']
+diff --git config/system-headers config/system-headers
+index b711fc3..fd3c14f 100644
+--- mozilla/config/system-headers
++++ mozilla/config/system-headers
+@@ -1153,3 +1153,17 @@ graphite2/Segment.h
+ harfbuzz/hb-ot.h
+ harfbuzz/hb.h
+ #endif
++#if MOZ_NATIVE_OGG==1
++ogg/ogg.h
++ogg/os_types.h
++#endif
++#if MOZ_NATIVE_VORBIS==1
++vorbis/codec.h
++vorbis/vorbisenc.h
++#endif
++#if MOZ_NATIVE_OPUS==1
++opus.h
++opus_multistream.h
++opus/opus.h
++opus/opus_multistream.h
++#endif
+diff --git configure.in configure.in
+index df49287..05e97ff 100644
+--- mozilla/configure.in
++++ mozilla/configure.in
+@@ -5130,6 +5130,40 @@ if test "${ac_cv_c_attribute_aligned}" != "0"; then
+ fi
+ 
+ dnl ========================================================
++dnl Check for libogg
++dnl ========================================================
++
++MOZ_ARG_WITH_BOOL(system-ogg,
++[  --with-system-ogg       Use system libogg (located with pkgconfig)],
++MOZ_NATIVE_OGG=1,
++MOZ_NATIVE_OGG= )
++
++if test -n "$MOZ_NATIVE_OGG"; then
++    PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.2.1)
++fi
++
++AC_SUBST(MOZ_NATIVE_OGG)
++AC_SUBST(MOZ_OGG_CFLAGS)
++AC_SUBST(MOZ_OGG_LIBS)
++
++dnl ========================================================
++dnl Check for libvorbis
++dnl ========================================================
++
++MOZ_ARG_WITH_BOOL(system-vorbis,
++[  --with-system-vorbis    Use system libvorbis (located with pkgconfig)],
++MOZ_NATIVE_VORBIS=1,
++MOZ_NATIVE_VORBIS= )
++
++if test -n "$MOZ_NATIVE_VORBIS"; then
++    PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.4)
++fi
++
++AC_SUBST(MOZ_NATIVE_VORBIS)
++AC_SUBST(MOZ_VORBIS_CFLAGS)
++AC_SUBST(MOZ_VORBIS_LIBS)
++
++dnl ========================================================
+ dnl = Disable Opus audio codec support
+ dnl ========================================================
+ MOZ_ARG_DISABLE_BOOL(opus,
+@@ -5138,6 +5172,25 @@ MOZ_ARG_DISABLE_BOOL(opus,
+     MOZ_OPUS=1)
+ 
+ dnl ========================================================
++dnl Check for libopus
++dnl ========================================================
++
++MOZ_ARG_WITH_BOOL(system-opus,
++[  --with-system-opus      Use system libopus (located with pkgconfig)],
++MOZ_NATIVE_OPUS=1,
++MOZ_NATIVE_OPUS= )
++
++if test -n "$MOZ_NATIVE_OPUS"; then
++    PKG_CHECK_MODULES(MOZ_OPUS, opus >= 1.1)
++else
++    MOZ_OPUS_CFLAGS='-I$(topsrcdir)/media/libopus/include'
++fi
++
++AC_SUBST(MOZ_NATIVE_OPUS)
++AC_SUBST(MOZ_OPUS_CFLAGS)
++AC_SUBST(MOZ_OPUS_LIBS)
++
++dnl ========================================================
+ dnl = Disable VP8 decoder support
+ dnl ========================================================
+ MOZ_ARG_DISABLE_BOOL(webm,
+diff --git content/media/Makefile.in content/media/Makefile.in
+index 68f360e..76f2d57 100644
+--- mozilla/content/media/Makefile.in
++++ mozilla/content/media/Makefile.in
+@@ -7,4 +7,16 @@ include $(topsrcdir)/config/rules.mk
+ CFLAGS   += $(GSTREAMER_CFLAGS)
+ CXXFLAGS += $(GSTREAMER_CFLAGS)
+ 
++ifdef MOZ_NATIVE_OGG
++CXXFLAGS += $(MOZ_OGG_CFLAGS)
++endif
++
++ifdef MOZ_NATIVE_VORBIS
++CXXFLAGS += $(MOZ_VORBIS_CFLAGS)
++endif
++
++ifdef MOZ_NATIVE_OPUS
++CXXFLAGS += $(MOZ_OPUS_CFLAGS)
++endif
++
+ AudioNodeEngineNEON.$(OBJ_SUFFIX): CXXFLAGS += -mfpu=neon
+diff --git media/libtheora/Makefile.in media/libtheora/Makefile.in
+new file mode 100644
+index 0000000..1f02dc0
+--- /dev/null
++++ mozilla/media/libtheora/Makefile.in
+@@ -0,0 +1,9 @@
++# This Source Code Form is subject to the terms of the Mozilla Public
++# License, v. 2.0. If a copy of the MPL was not distributed with this
++# file, You can obtain one at http://mozilla.org/MPL/2.0/.
++
++include $(topsrcdir)/config/rules.mk
++
++ifdef MOZ_NATIVE_OGG
++CFLAGS += $(MOZ_OGG_CFLAGS)
++endif
+diff --git media/libtremor/Makefile.in media/libtremor/Makefile.in
+new file mode 100644
+index 0000000..1f02dc0
+--- /dev/null
++++ mozilla/media/libtremor/Makefile.in
+@@ -0,0 +1,9 @@
++# This Source Code Form is subject to the terms of the Mozilla Public
++# License, v. 2.0. If a copy of the MPL was not distributed with this
++# file, You can obtain one at http://mozilla.org/MPL/2.0/.
++
++include $(topsrcdir)/config/rules.mk
++
++ifdef MOZ_NATIVE_OGG
++CFLAGS += $(MOZ_OGG_CFLAGS)
++endif
+diff --git media/libvorbis/Makefile.in media/libvorbis/Makefile.in
+new file mode 100644
+index 0000000..1f02dc0
+--- /dev/null
++++ mozilla/media/libvorbis/Makefile.in
+@@ -0,0 +1,9 @@
++# This Source Code Form is subject to the terms of the Mozilla Public
++# License, v. 2.0. If a copy of the MPL was not distributed with this
++# file, You can obtain one at http://mozilla.org/MPL/2.0/.
++
++include $(topsrcdir)/config/rules.mk
++
++ifdef MOZ_NATIVE_OGG
++CFLAGS += $(MOZ_OGG_CFLAGS)
++endif
+diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in
+index c5e82c4..91ef86a 100644
+--- mozilla/media/webrtc/signaling/test/Makefile.in
++++ mozilla/media/webrtc/signaling/test/Makefile.in
+@@ -48,6 +48,12 @@ LIBS += \
+   $(NULL)
+ endif
+ 
++ifdef MOZ_NATIVE_OPUS
++LIBS += \
++  $(MOZ_OPUS_LIBS) \
++  $(NULL)
++endif
++
+ ifdef MOZ_NATIVE_LIBVPX
+ LIBS += \
+   $(MOZ_LIBVPX_LIBS) \
+diff --git media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi
+index 00e77e7..55f48ab 100644
+--- mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi
++++ mozilla/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/opus/opus.gypi
+@@ -14,9 +14,9 @@
+       'conditions': [
+         ['build_with_mozilla==1', {
+           # Mozilla provides its own build of the opus library.
+-          'include_dirs': [
+-            '$(DIST)/include/opus',
+-           ]
++          'cflags_mozilla': [
++            '$(MOZ_OPUS_CFLAGS)',
++          ],
+         }, {
+           'dependencies': [
+             '<(DEPTH)/third_party/opus/opus.gyp:opus'
+diff --git toolkit/library/Makefile.in toolkit/library/Makefile.in
+index 27f488e..cd27084 100644
+--- mozilla/toolkit/library/Makefile.in
++++ mozilla/toolkit/library/Makefile.in
+@@ -91,6 +91,18 @@ ifdef MOZ_NATIVE_HUNSPELL
+ EXTRA_DSO_LDOPTS += $(MOZ_HUNSPELL_LIBS)
+ endif
+ 
++ifdef MOZ_NATIVE_OGG
++EXTRA_DSO_LDOPTS += $(MOZ_OGG_LIBS)
++endif
++
++ifdef MOZ_NATIVE_VORBIS
++EXTRA_DSO_LDOPTS += $(MOZ_VORBIS_LIBS)
++endif
++
++ifdef MOZ_NATIVE_OPUS
++EXTRA_DSO_LDOPTS += $(MOZ_OPUS_LIBS)
++endif
++
+ ifdef MOZ_NATIVE_LIBEVENT
+ EXTRA_DSO_LDOPTS += $(MOZ_LIBEVENT_LIBS)
+ endif