firefox-hg: add patches to progress build.

[Thomas Klausner <wiz%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Fri Sep 2 10:11:41 2016 +0200
Changeset:	aa07d394b61a01f11c6bd23eba38ca69092b85a5

Modified Files:
	firefox-hg/distinfo
Added Files:
	firefox-hg/patches/patch-media_libyuv_source_mjpeg__decoder.cc
	firefox-hg/patches/patch-netwerk_srtp_src_crypto_hash_hmac.c
	firefox-hg/patches/patch-netwerk_srtp_src_crypto_kernel_crypto__kernel.c

Log Message:
firefox-hg: add patches to progress build.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=aa07d394b61a01f11c6bd23eba38ca69092b85a5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 firefox-hg/distinfo                                |  3 ++
 .../patch-media_libyuv_source_mjpeg__decoder.cc    | 15 +++++++
 .../patch-netwerk_srtp_src_crypto_hash_hmac.c      | 51 ++++++++++++++++++++++
 ...netwerk_srtp_src_crypto_kernel_crypto__kernel.c | 24 ++++++++++
 4 files changed, 93 insertions(+)

diffs:
diff --git a/firefox-hg/distinfo b/firefox-hg/distinfo
index 6a60ecc..c29cf3e 100644
--- a/firefox-hg/distinfo
+++ b/firefox-hg/distinfo
@@ -7,9 +7,12 @@ SHA1 (patch-aa) = 12baede30120947ffae5cf1aed2886943548b46a
 SHA1 (patch-ao) = fd708563f119823f5634ecd57e5a2089682040e0
 SHA1 (patch-build_gyp.mozbuild) = b811edb2f76fdd241edff0b4945977c810a987b8
 SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = 2be8b355ef1de83371e6b3a15216b1eaf4ae58cf
+SHA1 (patch-media_libyuv_source_mjpeg__decoder.cc) = 13656013a84a8c2be2df24d3e7c425b374587ec9
 SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = 37c5750a2994d338de2c3e729be0360ad1da9b95
 SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc) = ba581d0edc7cfa4a43e6f0dc8a75a914fef18ea9
 SHA1 (patch-modules_libpref_init_all.js) = 73dbe0c7001f9bfadb6ff7b50c340f7d135cb42a
+SHA1 (patch-netwerk_srtp_src_crypto_hash_hmac.c) = 7c41842734db27e7d98bbeb8a5dcc29d8878f370
+SHA1 (patch-netwerk_srtp_src_crypto_kernel_crypto__kernel.c) = c9db6b5183524ce353e9267c230adff4c147bb55
 SHA1 (patch-toolkit_components_protobuf_src_google_protobuf_stubs_platform_macros.h) = 4abe361ffcab9f923e9ae7b9bdc0dfdb9ddce820
 SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = a8cbba3cea0987291aed3646196b3a9c72dc0342
 SHA1 (patch-toolkit_library_moz.build) = 3f65d42f4e8a3a11c9411a7b1b7315a410fc051f
diff --git a/firefox-hg/patches/patch-media_libyuv_source_mjpeg__decoder.cc b/firefox-hg/patches/patch-media_libyuv_source_mjpeg__decoder.cc
new file mode 100644
index 0000000..d82c104
--- /dev/null
+++ b/firefox-hg/patches/patch-media_libyuv_source_mjpeg__decoder.cc
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix conflict with stdio.h.
+
+--- media/libyuv/source/mjpeg_decoder.cc.orig	2016-09-02 05:50:23.394938860 +0000
++++ media/libyuv/source/mjpeg_decoder.cc
+@@ -25,7 +25,7 @@
+ #endif
+ 
+ #endif
+-struct FILE;  // For jpeglib.h.
++#include <stdio.h> # for FILE
+ 
+ // C++ build requires extern C for jpeg internals.
+ #ifdef __cplusplus
diff --git a/firefox-hg/patches/patch-netwerk_srtp_src_crypto_hash_hmac.c b/firefox-hg/patches/patch-netwerk_srtp_src_crypto_hash_hmac.c
new file mode 100644
index 0000000..15a59c1
--- /dev/null
+++ b/firefox-hg/patches/patch-netwerk_srtp_src_crypto_hash_hmac.c
@@ -0,0 +1,51 @@
+$NetBSD$
+
+Fix conflict with libc's hmac().
+
+--- netwerk/srtp/src/crypto/hash/hmac.c.orig	2016-09-02 05:50:27.185056234 +0000
++++ netwerk/srtp/src/crypto/hash/hmac.c
+@@ -55,7 +55,7 @@ debug_module_t mod_hmac = {
+ 
+ err_status_t
+ hmac_alloc(auth_t **a, int key_len, int out_len) {
+-  extern auth_type_t hmac;
++  extern auth_type_t hmacv;
+   uint8_t *pointer;
+ 
+   debug_print(mod_hmac, "allocating auth func with key length %d", key_len);
+@@ -79,7 +79,7 @@ hmac_alloc(auth_t **a, int key_len, int 
+ 
+   /* set pointers */
+   *a = (auth_t *)pointer;
+-  (*a)->type = &hmac;
++  (*a)->type = &hmacv;
+   (*a)->state = pointer + sizeof(auth_t);  
+   (*a)->out_len = out_len;
+   (*a)->key_len = key_len;
+@@ -93,7 +93,7 @@ hmac_alloc(auth_t **a, int key_len, int 
+ 
+ err_status_t
+ hmac_dealloc(auth_t *a) {
+-  extern auth_type_t hmac;
++  extern auth_type_t hmacv;
+   
+   /* zeroize entire state*/
+   octet_string_set_to_zero((uint8_t *)a, 
+@@ -103,7 +103,7 @@ hmac_dealloc(auth_t *a) {
+   crypto_free(a);
+   
+   /* decrement global count of all hmac uses */
+-  hmac.ref_count--;
++  hmacv.ref_count--;
+ 
+   return err_status_ok;
+ }
+@@ -252,7 +252,7 @@ char hmac_description[] = "hmac sha-1 au
+  */
+ 
+ auth_type_t
+-hmac  = {
++hmacv  = {
+   (auth_alloc_func)      hmac_alloc,
+   (auth_dealloc_func)    hmac_dealloc,
+   (auth_init_func)       hmac_init,
diff --git a/firefox-hg/patches/patch-netwerk_srtp_src_crypto_kernel_crypto__kernel.c b/firefox-hg/patches/patch-netwerk_srtp_src_crypto_kernel_crypto__kernel.c
new file mode 100644
index 0000000..9b57c21
--- /dev/null
+++ b/firefox-hg/patches/patch-netwerk_srtp_src_crypto_kernel_crypto__kernel.c
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Fix conflict with libc's hmac().
+
+--- netwerk/srtp/src/crypto/kernel/crypto_kernel.c.orig	2016-09-02 05:50:26.917287944 +0000
++++ netwerk/srtp/src/crypto/kernel/crypto_kernel.c
+@@ -77,7 +77,7 @@ extern cipher_type_t aes_cbc;
+  */
+ 
+ extern auth_type_t null_auth;
+-extern auth_type_t hmac;
++extern auth_type_t hmacv;
+ 
+ /* crypto_kernel is a global variable, the only one of its datatype */
+ 
+@@ -162,7 +162,7 @@ crypto_kernel_init() {
+   status = crypto_kernel_load_auth_type(&null_auth, NULL_AUTH);
+   if (status)
+     return status;
+-  status = crypto_kernel_load_auth_type(&hmac, HMAC_SHA1);
++  status = crypto_kernel_load_auth_type(&hmacv, HMAC_SHA1);
+   if (status)
+     return status;
+