CVS commit: pkgsrc/www/firefox

["Robert Swindells" <rjs%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rjs
Date:           Sun Jul 24 16:33:09 UTC 2022

Modified Files:
        pkgsrc/www/firefox: distinfo options.mk
        pkgsrc/www/firefox/patches: patch-libwebrtc.diff

Log Message:
Fix build on NetBSD/aarch64 with webrtc.


To generate a diff of this commit:
cvs rdiff -u -r1.476 -r1.477 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r1.68 -r1.69 pkgsrc/www/firefox/options.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/firefox/patches/patch-libwebrtc.diff

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

Modified files:

Index: pkgsrc/www/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.476 pkgsrc/www/firefox/distinfo:1.477
--- pkgsrc/www/firefox/distinfo:1.476   Wed Jul 20 22:09:32 2022
+++ pkgsrc/www/firefox/distinfo Sun Jul 24 16:33:09 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.476 2022/07/20 22:09:32 wiz Exp $
+$NetBSD: distinfo,v 1.477 2022/07/24 16:33:09 rjs Exp $
 
 BLAKE2s (firefox-102.0.1.source.tar.xz) = 43e2f34c0e39d1a3d3d341e55d474a9e5551865ace57f9f0fd1d7eb16676ef64
 SHA512 (firefox-102.0.1.source.tar.xz) = a930d359fb81e473b963a93f6db5110871e9fd57f6d0f352513047d363d930dd4811e8dd786c2f6f3541c3871eb1c0169b718652d9ee076fd13a20f52af30417
@@ -23,7 +23,7 @@ SHA1 (patch-js_src_jit_ProcessExecutable
 SHA1 (patch-js_src_jit_arm64_vixl_MozCpu-vixl.cpp) = fdc522e3fb626b1b8a2ebf19ad60bfc25dfa4183
 SHA1 (patch-js_src_util_NativeStack.cpp) = a0a16d8d8d78d3cc3f4d2a508586f1a7821f7dba
 SHA1 (patch-js_src_vm_ArrayBufferObject.cpp) = 0501fdcae11568ae4ea78e0d2f6b3750b7a67d47
-SHA1 (patch-libwebrtc.diff) = 0506b1e8fc0bc42e24f45d13194536aa7ad7eeba
+SHA1 (patch-libwebrtc.diff) = 74e110546874446cad066a15614af5e96e1f7fe8
 SHA1 (patch-media_ffvpx_libavutil_arm_bswap.h) = de58daa0fd23d4fec50426602b65c9ea5862558a
 SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 2ef11da83c90c41490db4c0d9809c3e1826b488a
 SHA1 (patch-media_libcubeb_src_cubeb__jack.cpp) = fc546c5e6582fd5eda64ba83287dfbbb3c9e229f

Index: pkgsrc/www/firefox/options.mk
diff -u pkgsrc/www/firefox/options.mk:1.68 pkgsrc/www/firefox/options.mk:1.69
--- pkgsrc/www/firefox/options.mk:1.68  Wed Jul 20 22:09:56 2022
+++ pkgsrc/www/firefox/options.mk       Sun Jul 24 16:33:09 2022
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.68 2022/07/20 22:09:56 wiz Exp $
+# $NetBSD: options.mk,v 1.69 2022/07/24 16:33:09 rjs Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.firefox
 
@@ -17,7 +17,7 @@ PKG_SUGGESTED_OPTIONS+=       pulseaudio mozil
 PKG_SUGGESTED_OPTIONS+=        sunaudio
 .endif
 
-.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000 && (${MACHINE_ARCH} == x86_64 || ${MACHINE_ARCH} == i386)
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000
 PKG_SUGGESTED_OPTIONS+=        webrtc
 .endif
 

Index: pkgsrc/www/firefox/patches/patch-libwebrtc.diff
diff -u pkgsrc/www/firefox/patches/patch-libwebrtc.diff:1.5 pkgsrc/www/firefox/patches/patch-libwebrtc.diff:1.6
--- pkgsrc/www/firefox/patches/patch-libwebrtc.diff:1.5 Mon Jul  4 14:34:08 2022
+++ pkgsrc/www/firefox/patches/patch-libwebrtc.diff     Sun Jul 24 16:33:09 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-libwebrtc.diff,v 1.5 2022/07/04 14:34:08 ryoon Exp $
+$NetBSD: patch-libwebrtc.diff,v 1.6 2022/07/24 16:33:09 rjs Exp $
 
 diff -ur firefox-102.0.orig/third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build firefox-102.0/third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
 --- third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build  2022-06-17 06:35:29.000000000 +0900
@@ -15288,6 +15288,15 @@ _+++ third_party/libwebrtc/moz.build   202
  
      DIRS += [
          "/third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_float_gn",
+@@ -497,7 +497,7 @@
+         "/third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn"
+     ]
+ 
+-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
++if CONFIG["CPU_ARCH"] == "aarch64" and (CONFIG["OS_TARGET"] == "Linux" or CONFIG["OS_TARGET"] == "NetBSD" or CONFIG["OS_TARGET"] == "OpenBSD" or CONFIG["OS_TARGET"] == "FreeBSD"):
+ 
+     DIRS += [
+         "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn",
 @@ -505,7 +505,7 @@
          "/third_party/libwebrtc/modules/video_processing/video_processing_neon_gn"
      ]