firefox: Use graphics/libv4l1 for NetBSD 9.99.70 or later

* This enables webcam for WebRTC. Bump PKGREVISION.
* And fix rust.mk patch, from Michael Forney on tech-pkg@.

4 files changed, 14 insertions, 18 deletions

diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index f1192b8f5d1..abc6a997d48 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.444 2020/08/25 14:35:24 ryoon Exp $
+# $NetBSD: Makefile,v 1.445 2020/08/29 22:24:27 ryoon Exp $
 
 FIREFOX_VER=		${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=		80.0
@@ -6,6 +6,7 @@ MOZ_BRANCH_MINOR=
 
 DISTNAME=	firefox-${FIREFOX_VER}.source
 PKGNAME=	${DISTNAME:S/.source//:S/b/beta/:S/esr//}
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES+=	${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 23f4c22c412..f30e276aa91 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.408 2020/08/25 14:35:24 ryoon Exp $
+$NetBSD: distinfo,v 1.409 2020/08/29 22:24:27 ryoon Exp $
 
 SHA1 (firefox-80.0.source.tar.xz) = b8ddff1d04932f3c41c8507e6078a867db05a03d
 RMD160 (firefox-80.0.source.tar.xz) = bf1a86dce60fd9f77200e770ab73d6ab140bea5c
@@ -8,7 +8,7 @@ SHA1 (patch-aa) = 11060461fdaca5661e89651b8ded4a59d2abc4d7
 SHA1 (patch-browser_app_profile_firefox.js) = 89cea0a66457c96ad0b94aaa524aa5942ad781d0
 SHA1 (patch-build_moz.configure_rust.configure) = ee9e207e67709f3c9455b4d22f5f254890e99ca8
 SHA1 (patch-config_gcc-stl-wrapper.template.h) = 781a063fa6ab345face53fd88404ead11ab335b2
-SHA1 (patch-config_makefiles_rust.mk) = 68fc83afe7997f26cf87d46836f952cf9bdbb95c
+SHA1 (patch-config_makefiles_rust.mk) = 738b8b54ff2b9849cd8316d8b227b6d067250337
 SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49
 SHA1 (patch-dom_media_CubebUtils.cpp) = 226821d961039ae5c9c50d8615757b73c6bcd80a
 SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = e458c9c8dc66edc69c1874734af28a77fc5e3993
diff --git a/www/firefox/options.mk b/www/firefox/options.mk
index f2723dbe08b..c3e3e85b1ab 100644
--- a/www/firefox/options.mk
+++ b/www/firefox/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.58 2020/08/26 10:27:40 wiz Exp $
+# $NetBSD: options.mk,v 1.59 2020/08/29 22:24:27 ryoon Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.firefox
 
@@ -81,7 +81,12 @@ NO_BIN_ON_FTP=		${RESTRICTED}
 
 PLIST_VARS+=		webrtc
 .if !empty(PKG_OPTIONS:Mwebrtc)
+.if (${OPSYS} == "NetBSD" && !empty(OS_VERSION:M9.99.[7-9]*)) || \
+    (${OPSYS} == "Linux")
+.include "../../graphics/libv4l1/buildlink3.mk"
+.else
 .include "../../graphics/libv4l/buildlink3.mk"
+.endif
 CONFIGURE_ARGS+=	--enable-webrtc
 PLIST.webrtc=		yes
 .else
diff --git a/www/firefox/patches/patch-config_makefiles_rust.mk b/www/firefox/patches/patch-config_makefiles_rust.mk
index d4fbf77c350..329b322f720 100644
--- a/www/firefox/patches/patch-config_makefiles_rust.mk
+++ b/www/firefox/patches/patch-config_makefiles_rust.mk
@@ -1,6 +1,8 @@
-$NetBSD: patch-config_makefiles_rust.mk,v 1.3 2020/08/25 14:35:24 ryoon Exp $
+$NetBSD: patch-config_makefiles_rust.mk,v 1.4 2020/08/29 22:24:27 ryoon Exp $
+
+NetBSD doesn't get along with parallel rust builds (it causes issues
+with ld.so) which are the default. Force -j1.
 
---- config/makefiles/rust.mk.orig	2020-08-19 02:08:50.000000000 +0000
 +++ config/makefiles/rust.mk
 @@ -52,6 +52,9 @@ endif
  ifeq (1,$(MOZ_PARALLEL_BUILD))
@@ -12,15 +14,3 @@ $NetBSD: patch-config_makefiles_rust.mk,v 1.3 2020/08/25 14:35:24 ryoon Exp $
  
  # These flags are passed via `cargo rustc` and only apply to the final rustc
  # invocation (i.e., only the top-level crate, not its dependencies).
-@@ -68,6 +71,11 @@ endif
- ifeq (,$(filter 1.38.% 1.39.% 1.40.% 1.41.% 1.42.% 1.43.% 1.44.%,$(RUSTC_VERSION)))
- RUSTFLAGS += -Cembed-bitcode=yes
- endif
-+# Versions of rust >= 1.45 need -Cembed-bitcode=yes for all crates when
-+# using -Clto.
-+ifeq (,$(filter 1.38.% 1.39.% 1.40.% 1.41.% 1.42.% 1.43.% 1.44.%,$(RUSTC_VERSION)))
-+RUSTFLAGS += -Cembed-bitcode=yes
-+endif
- endif
- endif
-