Sat Aug 29 22:24:27 2020 UTC ()
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@.


(ryoon)
diff -r1.444 -r1.445 pkgsrc/www/firefox/Makefile
diff -r1.408 -r1.409 pkgsrc/www/firefox/distinfo
diff -r1.58 -r1.59 pkgsrc/www/firefox/options.mk
diff -r1.3 -r1.4 pkgsrc/www/firefox/patches/patch-config_makefiles_rust.mk
cvs diff -r1.444 -r1.445 pkgsrc/www/firefox/Makefile (expand / switch to unified diff)

--- pkgsrc/www/firefox/Makefile 2020/08/25 14:35:24 1.444
+++ pkgsrc/www/firefox/Makefile 2020/08/29 22:24:27 1.445
@@ -1,21 +1,22 @@ @@ -1,21 +1,22 @@
1# $NetBSD: Makefile,v 1.444 2020/08/25 14:35:24 ryoon Exp $ 1# $NetBSD: Makefile,v 1.445 2020/08/29 22:24:27 ryoon Exp $
2 2
3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} 3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
4MOZ_BRANCH= 80.0 4MOZ_BRANCH= 80.0
5MOZ_BRANCH_MINOR=  5MOZ_BRANCH_MINOR=
6 6
7DISTNAME= firefox-${FIREFOX_VER}.source 7DISTNAME= firefox-${FIREFOX_VER}.source
8PKGNAME= ${DISTNAME:S/.source//:S/b/beta/:S/esr//} 8PKGNAME= ${DISTNAME:S/.source//:S/b/beta/:S/esr//}
 9PKGREVISION= 1
9CATEGORIES= www 10CATEGORIES= www
10MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} 11MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
11EXTRACT_SUFX= .tar.xz 12EXTRACT_SUFX= .tar.xz
12 13
13MAINTAINER= ryoon@NetBSD.org 14MAINTAINER= ryoon@NetBSD.org
14HOMEPAGE= https://www.mozilla.org/en-US/firefox/ 15HOMEPAGE= https://www.mozilla.org/en-US/firefox/
15COMMENT= Web browser with support for extensions (version ${FIREFOX_VER:tu:C/\\.[[:digit:]\.]*//}) 16COMMENT= Web browser with support for extensions (version ${FIREFOX_VER:tu:C/\\.[[:digit:]\.]*//})
16LICENSE= mpl-1.1 17LICENSE= mpl-1.1
17 18
18UNLIMIT_RESOURCES+= datasize virtualsize 19UNLIMIT_RESOURCES+= datasize virtualsize
19 20
20WRKSRC= ${WRKDIR}/firefox-${FIREFOX_VER:C/b.*//} 21WRKSRC= ${WRKDIR}/firefox-${FIREFOX_VER:C/b.*//}
21 22
cvs diff -r1.408 -r1.409 pkgsrc/www/firefox/distinfo (expand / switch to unified diff)

--- pkgsrc/www/firefox/distinfo 2020/08/25 14:35:24 1.408
+++ pkgsrc/www/firefox/distinfo 2020/08/29 22:24:27 1.409
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1$NetBSD: distinfo,v 1.408 2020/08/25 14:35:24 ryoon Exp $ 1$NetBSD: distinfo,v 1.409 2020/08/29 22:24:27 ryoon Exp $
2 2
3SHA1 (firefox-80.0.source.tar.xz) = b8ddff1d04932f3c41c8507e6078a867db05a03d 3SHA1 (firefox-80.0.source.tar.xz) = b8ddff1d04932f3c41c8507e6078a867db05a03d
4RMD160 (firefox-80.0.source.tar.xz) = bf1a86dce60fd9f77200e770ab73d6ab140bea5c 4RMD160 (firefox-80.0.source.tar.xz) = bf1a86dce60fd9f77200e770ab73d6ab140bea5c
5SHA512 (firefox-80.0.source.tar.xz) = 6cfba55615d032e77f973ffdb1d4bb27c3c00d1ef642521284afa3e01a1bd29c6db963181e9ebefb0a44e49b96c3f93e57ce49541eae7e5a54d3360ffa81c1f3 5SHA512 (firefox-80.0.source.tar.xz) = 6cfba55615d032e77f973ffdb1d4bb27c3c00d1ef642521284afa3e01a1bd29c6db963181e9ebefb0a44e49b96c3f93e57ce49541eae7e5a54d3360ffa81c1f3
6Size (firefox-80.0.source.tar.xz) = 335316448 bytes 6Size (firefox-80.0.source.tar.xz) = 335316448 bytes
7SHA1 (patch-aa) = 11060461fdaca5661e89651b8ded4a59d2abc4d7 7SHA1 (patch-aa) = 11060461fdaca5661e89651b8ded4a59d2abc4d7
8SHA1 (patch-browser_app_profile_firefox.js) = 89cea0a66457c96ad0b94aaa524aa5942ad781d0 8SHA1 (patch-browser_app_profile_firefox.js) = 89cea0a66457c96ad0b94aaa524aa5942ad781d0
9SHA1 (patch-build_moz.configure_rust.configure) = ee9e207e67709f3c9455b4d22f5f254890e99ca8 9SHA1 (patch-build_moz.configure_rust.configure) = ee9e207e67709f3c9455b4d22f5f254890e99ca8
10SHA1 (patch-config_gcc-stl-wrapper.template.h) = 781a063fa6ab345face53fd88404ead11ab335b2 10SHA1 (patch-config_gcc-stl-wrapper.template.h) = 781a063fa6ab345face53fd88404ead11ab335b2
11SHA1 (patch-config_makefiles_rust.mk) = 68fc83afe7997f26cf87d46836f952cf9bdbb95c 11SHA1 (patch-config_makefiles_rust.mk) = 738b8b54ff2b9849cd8316d8b227b6d067250337
12SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49 12SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49
13SHA1 (patch-dom_media_CubebUtils.cpp) = 226821d961039ae5c9c50d8615757b73c6bcd80a 13SHA1 (patch-dom_media_CubebUtils.cpp) = 226821d961039ae5c9c50d8615757b73c6bcd80a
14SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = e458c9c8dc66edc69c1874734af28a77fc5e3993 14SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = e458c9c8dc66edc69c1874734af28a77fc5e3993
15SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = 2f73c76c48852613e0c55c1680fcc2a9eb3cf4ef 15SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = 2f73c76c48852613e0c55c1680fcc2a9eb3cf4ef
16SHA1 (patch-gfx_cairo_cairo_src_cairo-type1-subset.c) = 89a9d934ef76706c552c0b81e6cbc0f45b1ffd2c 16SHA1 (patch-gfx_cairo_cairo_src_cairo-type1-subset.c) = 89a9d934ef76706c552c0b81e6cbc0f45b1ffd2c
17SHA1 (patch-gfx_skia_skia_src_core_SkCpu.cpp) = 36218819254f3681b9c717d652ea78c9f20d49ad 17SHA1 (patch-gfx_skia_skia_src_core_SkCpu.cpp) = 36218819254f3681b9c717d652ea78c9f20d49ad
18SHA1 (patch-gfx_thebes_gfxPlatform.cpp) = f6f8996f0818a1b890698c7cc5054d49cb1e8924 18SHA1 (patch-gfx_thebes_gfxPlatform.cpp) = f6f8996f0818a1b890698c7cc5054d49cb1e8924
19SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 4a6606da590cfb8d855bde58b9c6f90e98d0870c 19SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 4a6606da590cfb8d855bde58b9c6f90e98d0870c
20SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 35d20981d33ccdb1d8ffb8039e48798777f11658 20SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 35d20981d33ccdb1d8ffb8039e48798777f11658
21SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 260c29bacd8bf265951b7a412f850bf2b292c836 21SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 260c29bacd8bf265951b7a412f850bf2b292c836
22SHA1 (patch-js_src_jsfriendapi.h) = 6bbb895b882ee24929f011751c42732215e153a2 22SHA1 (patch-js_src_jsfriendapi.h) = 6bbb895b882ee24929f011751c42732215e153a2
23SHA1 (patch-js_src_util_NativeStack.cpp) = a0a16d8d8d78d3cc3f4d2a508586f1a7821f7dba 23SHA1 (patch-js_src_util_NativeStack.cpp) = a0a16d8d8d78d3cc3f4d2a508586f1a7821f7dba
24SHA1 (patch-media_ffvpx_libavutil_arm_bswap.h) = de58daa0fd23d4fec50426602b65c9ea5862558a 24SHA1 (patch-media_ffvpx_libavutil_arm_bswap.h) = de58daa0fd23d4fec50426602b65c9ea5862558a
cvs diff -r1.58 -r1.59 pkgsrc/www/firefox/options.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox/options.mk 2020/08/26 10:27:40 1.58
+++ pkgsrc/www/firefox/options.mk 2020/08/29 22:24:27 1.59
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.58 2020/08/26 10:27:40 wiz Exp $ 1# $NetBSD: options.mk,v 1.59 2020/08/29 22:24:27 ryoon Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.firefox 3PKG_OPTIONS_VAR= PKG_OPTIONS.firefox
4 4
5PKG_SUPPORTED_OPTIONS= official-mozilla-branding 5PKG_SUPPORTED_OPTIONS= official-mozilla-branding
6PKG_SUPPORTED_OPTIONS+= debug debug-info mozilla-jemalloc webrtc 6PKG_SUPPORTED_OPTIONS+= debug debug-info mozilla-jemalloc webrtc
7PKG_SUPPORTED_OPTIONS+= alsa pulseaudio dbus 7PKG_SUPPORTED_OPTIONS+= alsa pulseaudio dbus
8PLIST_VARS+= jemalloc debug 8PLIST_VARS+= jemalloc debug
9 9
10.if ${OPSYS} == "Linux" 10.if ${OPSYS} == "Linux"
11PKG_SUGGESTED_OPTIONS+= pulseaudio mozilla-jemalloc dbus webrtc 11PKG_SUGGESTED_OPTIONS+= pulseaudio mozilla-jemalloc dbus webrtc
12.else 12.else
13PKG_SUGGESTED_OPTIONS+= dbus 13PKG_SUGGESTED_OPTIONS+= dbus
14.endif 14.endif
@@ -71,19 +71,24 @@ CONFIGURE_ARGS+= --disable-dbus @@ -71,19 +71,24 @@ CONFIGURE_ARGS+= --disable-dbus
71.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding) 71.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
72CONFIGURE_ARGS+= --enable-official-branding 72CONFIGURE_ARGS+= --enable-official-branding
73LICENSE= mozilla-trademark-license 73LICENSE= mozilla-trademark-license
74RESTRICTED= Trademark holder prohibits distribution of modified versions. 74RESTRICTED= Trademark holder prohibits distribution of modified versions.
75NO_BIN_ON_CDROM= ${RESTRICTED} 75NO_BIN_ON_CDROM= ${RESTRICTED}
76NO_BIN_ON_FTP= ${RESTRICTED} 76NO_BIN_ON_FTP= ${RESTRICTED}
77#PLIST.branding= yes 77#PLIST.branding= yes
78.else 78.else
79#PLIST.nobranding= yes 79#PLIST.nobranding= yes
80.endif 80.endif
81 81
82PLIST_VARS+= webrtc 82PLIST_VARS+= webrtc
83.if !empty(PKG_OPTIONS:Mwebrtc) 83.if !empty(PKG_OPTIONS:Mwebrtc)
 84.if (${OPSYS} == "NetBSD" && !empty(OS_VERSION:M9.99.[7-9]*)) || \
 85 (${OPSYS} == "Linux")
 86.include "../../graphics/libv4l1/buildlink3.mk"
 87.else
84.include "../../graphics/libv4l/buildlink3.mk" 88.include "../../graphics/libv4l/buildlink3.mk"
 89.endif
85CONFIGURE_ARGS+= --enable-webrtc 90CONFIGURE_ARGS+= --enable-webrtc
86PLIST.webrtc= yes 91PLIST.webrtc= yes
87.else 92.else
88CONFIGURE_ARGS+= --disable-webrtc 93CONFIGURE_ARGS+= --disable-webrtc
89.endif 94.endif
cvs diff -r1.3 -r1.4 pkgsrc/www/firefox/patches/patch-config_makefiles_rust.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox/patches/patch-config_makefiles_rust.mk 2020/08/25 14:35:24 1.3
+++ pkgsrc/www/firefox/patches/patch-config_makefiles_rust.mk 2020/08/29 22:24:27 1.4
@@ -1,26 +1,16 @@ @@ -1,26 +1,16 @@
1$NetBSD: patch-config_makefiles_rust.mk,v 1.3 2020/08/25 14:35:24 ryoon Exp $ 1$NetBSD: patch-config_makefiles_rust.mk,v 1.4 2020/08/29 22:24:27 ryoon Exp $
 2
 3NetBSD doesn't get along with parallel rust builds (it causes issues
 4with ld.so) which are the default. Force -j1.
2 5
3--- config/makefiles/rust.mk.orig 2020-08-19 02:08:50.000000000 +0000 
4+++ config/makefiles/rust.mk 6+++ config/makefiles/rust.mk
5@@ -52,6 +52,9 @@ endif 7@@ -52,6 +52,9 @@ endif
6 ifeq (1,$(MOZ_PARALLEL_BUILD)) 8 ifeq (1,$(MOZ_PARALLEL_BUILD))
7 cargo_build_flags += -j1 9 cargo_build_flags += -j1
8 endif 10 endif
9+ifeq ($(OS_ARCH),NetBSD) 11+ifeq ($(OS_ARCH),NetBSD)
10+cargo_build_flags += -j1 12+cargo_build_flags += -j1
11+endif 13+endif
12  14
13 # These flags are passed via `cargo rustc` and only apply to the final rustc 15 # These flags are passed via `cargo rustc` and only apply to the final rustc
14 # invocation (i.e., only the top-level crate, not its dependencies). 16 # invocation (i.e., only the top-level crate, not its dependencies).
15@@ -68,6 +71,11 @@ endif 
16 ifeq (,$(filter 1.38.% 1.39.% 1.40.% 1.41.% 1.42.% 1.43.% 1.44.%,$(RUSTC_VERSION))) 
17 RUSTFLAGS += -Cembed-bitcode=yes 
18 endif 
19+# Versions of rust >= 1.45 need -Cembed-bitcode=yes for all crates when 
20+# using -Clto. 
21+ifeq (,$(filter 1.38.% 1.39.% 1.40.% 1.41.% 1.42.% 1.43.% 1.44.%,$(RUSTC_VERSION))) 
22+RUSTFLAGS += -Cembed-bitcode=yes 
23+endif 
24 endif 
25 endif 
26