[tor-commits] [tor-messenger-build/master] Add another patch to fix windows cross compilation

[arlo at torproject.org]

commit 0668923492d7b81292138b7c10b2f7093236a592
Author: Arlo Breault <arlolra at gmail.com>
Date:   Wed Sep 30 13:36:02 2015 +0200

    Add another patch to fix windows cross compilation
    
     * https://bugzilla.mozilla.org/show_bug.cgi?id=1197282
---
 ...1197282-include-atomic-in-videodecoder.mozpatch |   53 ++++++++++++++++++++
 projects/instantbird/config                        |    2 +
 2 files changed, 55 insertions(+)

diff --git a/projects/instantbird/bug-1197282-include-atomic-in-videodecoder.mozpatch b/projects/instantbird/bug-1197282-include-atomic-in-videodecoder.mozpatch
new file mode 100644
index 0000000..c6e3b3c
--- /dev/null
+++ b/projects/instantbird/bug-1197282-include-atomic-in-videodecoder.mozpatch
@@ -0,0 +1,53 @@
+
+# HG changeset patch
+# User Jacek Caban <jacek at codeweavers.com>
+# Date 1440499220 -7200
+# Node ID 0d3b1fd5f2d10562fec06f21f7297c0722159a6b
+# Parent  c4b66462595789190a33a11b211e3977ecc7c5f6
+Bug 1197282 - Include <atomic> in VideoDecoder.h. r=cpearce
+
+diff --git a/media/gmp-clearkey/0.1/AnnexB.cpp b/media/gmp-clearkey/0.1/AnnexB.cpp
+--- a/media/gmp-clearkey/0.1/AnnexB.cpp
++++ b/media/gmp-clearkey/0.1/AnnexB.cpp
+@@ -12,16 +12,18 @@
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */
+ 
+ #include "AnnexB.h"
+ #include "Endian.h"
+ 
++#include <cstring>
++
+ using mozilla::BigEndian;
+ 
+ static const uint8_t kAnnexBDelimiter[] = { 0, 0, 0, 1 };
+ 
+ /* static */ void
+ AnnexB::ConvertFrameInPlace(std::vector<uint8_t>& aBuffer)
+ {
+   for (size_t i = 0; i < aBuffer.size() - 4 - sizeof(kAnnexBDelimiter) + 1; ) {
+diff --git a/media/gmp-clearkey/0.1/VideoDecoder.h b/media/gmp-clearkey/0.1/VideoDecoder.h
+--- a/media/gmp-clearkey/0.1/VideoDecoder.h
++++ b/media/gmp-clearkey/0.1/VideoDecoder.h
+@@ -12,16 +12,18 @@
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */
+ 
+ #ifndef __VideoDecoder_h__
+ #define __VideoDecoder_h__
+ 
++#include <atomic>
++
+ #include "gmp-task-utils.h"
+ #include "gmp-video-decode.h"
+ #include "gmp-video-host.h"
+ #include "WMFH264Decoder.h"
+ 
+ #include "mfobjects.h"
+ 
+ class VideoDecoder : public GMPVideoDecoder
+
diff --git a/projects/instantbird/config b/projects/instantbird/config
index cf4274f..d5fec05 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -120,6 +120,8 @@ input_files:
     enable: '[% c("var/windows") %]'
   - filename: 0001-Bug-1192248-Fixed-WinIMEHandler.cpp-cross-compilatio.mozpatch
     enable: '[% c("var/windows") %]'
+  - filename: bug-1197282-include-atomic-in-videodecoder.mozpatch
+    enable: '[% c("var/windows") %]'
   - filename: Bug-9173-Change-the-default-Firefox-profile-director.mozpatch
   - filename: block-plugins.mozpatch
   - filename: OSX-package-as-tar.bz2.mozpatch