pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/firefox52 Allow WebRTC option to build.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5e3cccbc8119
branches:  trunk
changeset: 396973:5e3cccbc8119
user:      rjs <rjs%pkgsrc.org@localhost>
date:      Thu Jun 13 19:02:37 2019 +0000

description:
Allow WebRTC option to build.

diffstat:

 www/firefox52/PLIST                                                                            |   3 +-
 www/firefox52/distinfo                                                                         |   6 +-
 www/firefox52/options.mk                                                                       |   3 +-
 www/firefox52/patches/patch-media_webrtc_trunk_webrtc_modules_audio__device_audio__device.gypi |  13 ++
 www/firefox52/patches/patch-netwerk_sctp_src_netinet6_sctp6__usrreq.c                          |  13 ++
 www/firefox52/patches/patch-netwerk_srtp_src_crypto_hash_hmac.c                                |  56 ++++++++++
 www/firefox52/patches/patch-netwerk_srtp_src_crypto_kernel_crypto__kernel.c                    |  22 +++
 7 files changed, 113 insertions(+), 3 deletions(-)

diffs (181 lines):

diff -r 6a06f5057bc6 -r 5e3cccbc8119 www/firefox52/PLIST
--- a/www/firefox52/PLIST       Thu Jun 13 14:16:37 2019 +0000
+++ b/www/firefox52/PLIST       Thu Jun 13 19:02:37 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2018/11/24 01:53:57 mrg Exp $
+@comment $NetBSD: PLIST,v 1.7 2019/06/13 19:02:37 rjs Exp $
 bin/firefox52
 lib/firefox52/application.ini
 lib/firefox52/browser/blocklist.xml
@@ -3391,6 +3391,7 @@
 lib/firefox52/components/NotificationStorage.js
 lib/firefox52/components/PageIconProtocolHandler.js
 lib/firefox52/components/PageThumbsProtocol.js
+${PLIST.webrtc}lib/firefox52/components/PeerConnection.js
 lib/firefox52/components/PermissionSettings.js
 lib/firefox52/components/PlacesCategoriesStarter.js
 lib/firefox52/components/PresentationControlService.js
diff -r 6a06f5057bc6 -r 5e3cccbc8119 www/firefox52/distinfo
--- a/www/firefox52/distinfo    Thu Jun 13 14:16:37 2019 +0000
+++ b/www/firefox52/distinfo    Thu Jun 13 19:02:37 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2019/06/01 19:11:28 maya Exp $
+$NetBSD: distinfo,v 1.20 2019/06/13 19:02:37 rjs Exp $
 
 SHA1 (firefox-52.9.0esr.source.tar.xz) = df3d47518b380fe934e32a288515c25435fd82a7
 RMD160 (firefox-52.9.0esr.source.tar.xz) = 8940269f0a515c0066b6ab2eea1da8963d27617b
@@ -77,6 +77,7 @@
 SHA1 (patch-media_libyuv_source_mjpeg__decoder.cc) = d3b301dcec965b8f3efdd202db07fd75b503bc20
 SHA1 (patch-media_openmax__dl_dl_api_armCOMM__s.h) = 40b3fa8aaec77d3bfec810f0bc4e76eae449d7c7
 SHA1 (patch-media_webrtc_signaling_test_common.build) = 75729fb2983b272e433ff07853902f4b8d363ba6
+SHA1 (patch-media_webrtc_trunk_webrtc_modules_audio__device_audio__device.gypi) = b77deffe9a084f51d3166cf96dfae2c53f8bfd30
 SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = 22f4d0bb290f02bf6158facc1e47354dc8a0b211
 SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc) = 07158ae777fc4743f17cedc106cc9c85fb327d55
 SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_video__capture.gypi) = 9fb89480e47fce4df99a82fe90259bf444bd2e11
@@ -87,6 +88,9 @@
 SHA1 (patch-mozglue_build_arm.cpp) = f41ace63b3f1d2a8ccaffc98c3c64d1e22af5249
 SHA1 (patch-mozglue_build_arm.h) = 5e272f4e19b9681d43a63c45d78b0e44a392c7dc
 SHA1 (patch-netwerk_dns_moz.build) = d4ad35ee7152ca206156403954cbd247d1252ab0
+SHA1 (patch-netwerk_sctp_src_netinet6_sctp6__usrreq.c) = 8608c2745a28a35c9e47288a6c01cae0cd7793c7
+SHA1 (patch-netwerk_srtp_src_crypto_hash_hmac.c) = d381ac61f78616213565357d4e95c5bdc1c7c444
+SHA1 (patch-netwerk_srtp_src_crypto_kernel_crypto__kernel.c) = b7a6d9a6ed7fd41b50b2330665e1bf30cafdb367
 SHA1 (patch-rc) = 9628b038f036f3fc0e37bdf84fa0abf99dbc8d2a
 SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__back.jsm) = 27e90fdfd5587f670958d832cd56107740b226ee
 SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__front.jsm) = 4e5dc7cf11ea3d48cca86b5d21158d676ebd8957
diff -r 6a06f5057bc6 -r 5e3cccbc8119 www/firefox52/options.mk
--- a/www/firefox52/options.mk  Thu Jun 13 14:16:37 2019 +0000
+++ b/www/firefox52/options.mk  Thu Jun 13 19:02:37 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2018/07/23 04:56:12 maya Exp $
+# $NetBSD: options.mk,v 1.3 2019/06/13 19:02:37 rjs Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.firefox
 
@@ -121,6 +121,7 @@
 
 PLIST_VARS+=           webrtc
 .if !empty(PKG_OPTIONS:Mwebrtc)
+PLIST.webrtc=          yes
 .include "../../graphics/libv4l/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-webrtc
 .else
diff -r 6a06f5057bc6 -r 5e3cccbc8119 www/firefox52/patches/patch-media_webrtc_trunk_webrtc_modules_audio__device_audio__device.gypi
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox52/patches/patch-media_webrtc_trunk_webrtc_modules_audio__device_audio__device.gypi    Thu Jun 13 19:02:37 2019 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-media_webrtc_trunk_webrtc_modules_audio__device_audio__device.gypi,v 1.1 2019/06/13 19:02:37 rjs Exp $
+
+--- media/webrtc/trunk/webrtc/modules/audio_device/audio_device.gypi.orig      2017-10-02 22:22:28.086479246 +0000
++++ media/webrtc/trunk/webrtc/modules/audio_device/audio_device.gypi
+@@ -66,7 +66,7 @@
+             'sndio',
+           ],
+         }], # include_sndio_audio==1
+-        ['OS=="linux" or include_alsa_audio==1 or include_pulse_audio==1', {
++        ['OS=="linux" or OS=="netbsd" or include_alsa_audio==1 or include_pulse_audio==1', {
+           'include_dirs': [
+             'linux',
+           ],
diff -r 6a06f5057bc6 -r 5e3cccbc8119 www/firefox52/patches/patch-netwerk_sctp_src_netinet6_sctp6__usrreq.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox52/patches/patch-netwerk_sctp_src_netinet6_sctp6__usrreq.c     Thu Jun 13 19:02:37 2019 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-netwerk_sctp_src_netinet6_sctp6__usrreq.c,v 1.1 2019/06/13 19:02:37 rjs Exp $
+
+--- netwerk/sctp/src/netinet6/sctp6_usrreq.c.orig      2017-04-11 02:13:21.000000000 +0000
++++ netwerk/sctp/src/netinet6/sctp6_usrreq.c
+@@ -471,8 +471,6 @@ sctp6_notify(struct sctp_inpcb *inp,
+           (icmph->icmp6_code == ICMP_UNREACH_HOST_PROHIB) ||
+ #if defined(__Panda__)
+             (icmph->icmp6_code == ICMP_UNREACH_ADMIN)) {
+-#elif defined(__Userspace_os_NetBSD)
+-            (icmph->icmp6_code == ICMP_UNREACH_ADMIN_PROHIBIT)) {
+ #else
+             (icmph->icmp6_code == ICMP_UNREACH_FILTER_PROHIB)) {
+ #endif
diff -r 6a06f5057bc6 -r 5e3cccbc8119 www/firefox52/patches/patch-netwerk_srtp_src_crypto_hash_hmac.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox52/patches/patch-netwerk_srtp_src_crypto_hash_hmac.c   Thu Jun 13 19:02:37 2019 +0000
@@ -0,0 +1,56 @@
+$NetBSD: patch-netwerk_srtp_src_crypto_hash_hmac.c,v 1.1 2019/06/13 19:02:37 rjs Exp $
+
+--- netwerk/srtp/src/crypto/hash/hmac.c.orig   2017-04-11 02:13:21.000000000 +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 hmac_auth;
+   uint8_t *pointer;
+ 
+   debug_print(mod_hmac, "allocating auth func with key length %d", key_len);
+@@ -79,21 +79,21 @@ hmac_alloc(auth_t **a, int key_len, int 
+ 
+   /* set pointers */
+   *a = (auth_t *)pointer;
+-  (*a)->type = &hmac;
++  (*a)->type = &hmac_auth;
+   (*a)->state = pointer + sizeof(auth_t);  
+   (*a)->out_len = out_len;
+   (*a)->key_len = key_len;
+   (*a)->prefix_len = 0;
+ 
+   /* increment global count of all hmac uses */
+-  hmac.ref_count++;
++  hmac_auth.ref_count++;
+ 
+   return err_status_ok;
+ }
+ 
+ err_status_t
+ hmac_dealloc(auth_t *a) {
+-  extern auth_type_t hmac;
++  extern auth_type_t hmac_auth;
+   
+   /* 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--;
++  hmac_auth.ref_count--;
+ 
+   return err_status_ok;
+ }
+@@ -252,7 +252,7 @@ char hmac_description[] = "hmac sha-1 au
+  */
+ 
+ auth_type_t
+-hmac  = {
++hmac_auth  = {
+   (auth_alloc_func)      hmac_alloc,
+   (auth_dealloc_func)    hmac_dealloc,
+   (auth_init_func)       hmac_init,
diff -r 6a06f5057bc6 -r 5e3cccbc8119 www/firefox52/patches/patch-netwerk_srtp_src_crypto_kernel_crypto__kernel.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox52/patches/patch-netwerk_srtp_src_crypto_kernel_crypto__kernel.c       Thu Jun 13 19:02:37 2019 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-netwerk_srtp_src_crypto_kernel_crypto__kernel.c,v 1.1 2019/06/13 19:02:37 rjs Exp $
+
+--- netwerk/srtp/src/crypto/kernel/crypto_kernel.c.orig        2017-04-11 02:13:21.000000000 +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 hmac_auth;
+ 
+ /* 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(&hmac_auth, HMAC_SHA1);
+   if (status)
+     return status;
+ 



Home | Main Index | Thread Index | Old Index