Fix build with gcc 4.9

https://bugzilla.mozilla.org/show_bug.cgi?id=999496

3 files changed, 49 insertions, 1 deletions

diff --git a/www/firefox31/distinfo b/www/firefox31/distinfo
index 56804c6a7b9..18295b1fb05 100644
--- a/www/firefox31/distinfo
+++ b/www/firefox31/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2014/11/06 12:26:50 joerg Exp $
+$NetBSD: distinfo,v 1.3 2014/11/30 10:34:56 markd Exp $
 
 SHA1 (firefox-31.2.0esr.source.tar.bz2) = 9ddfde95fcd19633446f859c5bca77c62815d390
 RMD160 (firefox-31.2.0esr.source.tar.bz2) = 51d1600f1f2ee84cdef97a343b0ab03c8a0e4859
@@ -35,6 +35,8 @@ SHA1 (patch-content_base_src_moz.build) = fc2660dcc82f11c89d6d5a5772f27c9827f58f
 SHA1 (patch-content_media_AudioStream.cpp) = 70021dfd1cc86e8999f144b49a23bfb27dd24157
 SHA1 (patch-content_media_AudioStream.h) = 11cd8649f35c001fa0bf9e0f6119e49bd41ab9b4
 SHA1 (patch-content_media_Makefile.in) = 54c8c5e41eb36bae0ce544360ded9f75ba3acc13
+SHA1 (patch-content_media_MediaData.cpp) = 150a29b046a964f939c5401cfbb9f36ae7a64459
+SHA1 (patch-content_media_MediaData.h) = dc1ba6c0e0b62fb4213531e75be7d47cd7d71dd2
 SHA1 (patch-content_media_fmp4_demuxer_bit_reader.cc) = 6d87cd7231e61a12396d15dd2fa3d1a51051e8ee
 SHA1 (patch-content_media_gstreamer_GStreamerAllocator.cpp) = 524a669e411189926e142912b6d94d3d8dbdb0eb
 SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = 69b0a51d733cd52e7d200052362e0faf4ec918f1
diff --git a/www/firefox31/patches/patch-content_media_MediaData.cpp b/www/firefox31/patches/patch-content_media_MediaData.cpp
new file mode 100644
index 00000000000..b15c3031ace
--- /dev/null
+++ b/www/firefox31/patches/patch-content_media_MediaData.cpp
@@ -0,0 +1,24 @@
+$NetBSD: patch-content_media_MediaData.cpp,v 1.1 2014/11/30 10:34:56 markd Exp $
+
+Fix build with gcc 4.9
+https://bugzilla.mozilla.org/show_bug.cgi?id=999496
+
+--- content/media/MediaData.cpp.orig	2014-07-18 00:05:12.000000000 +0000
++++ content/media/MediaData.cpp
+@@ -38,6 +38,16 @@ AudioData::EnsureAudioBuffer()
+   }
+ }
+ 
++size_t
++AudioData::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const
++{
++  size_t size = aMallocSizeOf(this) + aMallocSizeOf(mAudioData);
++  if (mAudioBuffer) {
++    size += mAudioBuffer->SizeOfIncludingThis(aMallocSizeOf);
++  }
++  return size;
++}
++
+ static bool
+ ValidatePlane(const VideoData::YCbCrBuffer::Plane& aPlane)
+ {
diff --git a/www/firefox31/patches/patch-content_media_MediaData.h b/www/firefox31/patches/patch-content_media_MediaData.h
new file mode 100644
index 00000000000..741ffca5b8f
--- /dev/null
+++ b/www/firefox31/patches/patch-content_media_MediaData.h
@@ -0,0 +1,22 @@
+$NetBSD: patch-content_media_MediaData.h,v 1.1 2014/11/30 10:34:56 markd Exp $
+
+Fix build with gcc 4.9 
+https://bugzilla.mozilla.org/show_bug.cgi?id=999496 
+
+--- content/media/MediaData.h.orig	2014-07-18 00:05:12.000000000 +0000
++++ content/media/MediaData.h
+@@ -80,13 +80,7 @@ public:
+     MOZ_COUNT_DTOR(AudioData);
+   }
+ 
+-  size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const {
+-    size_t size = aMallocSizeOf(this) + aMallocSizeOf(mAudioData);
+-    if (mAudioBuffer) {
+-      size += mAudioBuffer->SizeOfIncludingThis(aMallocSizeOf);
+-    }
+-    return size;
+-  }
++  size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const;
+ 
+   // If mAudioBuffer is null, creates it from mAudioData.
+   void EnsureAudioBuffer();