CVS commit: pkgsrc/www/firefox

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Aug  6 20:47:52 UTC 2022

Modified Files:
        pkgsrc/www/firefox: Makefile distinfo mozilla-common.mk
Added Files:
        pkgsrc/www/firefox/files: replace-moz.build.awk
Removed Files:
        pkgsrc/www/firefox/patches: patch-libwebrtc.diff

Log Message:
firefox: Instead of including an autogenerated patch for libwebrtc,
do the automagic inside pre-patch. Also handle aarch64.

Require SSE2. It's probably not reasonable to patch -msse2 in everywhere,
and upstream has required SSE2 on x86 for years.


To generate a diff of this commit:
cvs rdiff -u -r1.531 -r1.532 pkgsrc/www/firefox/Makefile
cvs rdiff -u -r1.478 -r1.479 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r1.237 -r1.238 pkgsrc/www/firefox/mozilla-common.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/www/firefox/files/replace-moz.build.awk
cvs rdiff -u -r1.7 -r0 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/Makefile
diff -u pkgsrc/www/firefox/Makefile:1.531 pkgsrc/www/firefox/Makefile:1.532
--- pkgsrc/www/firefox/Makefile:1.531   Wed Aug  3 17:09:26 2022
+++ pkgsrc/www/firefox/Makefile Sat Aug  6 20:47:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.531 2022/08/03 17:09:26 ryoon Exp $
+# $NetBSD: Makefile,v 1.532 2022/08/06 20:47:51 nia Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            103.0
@@ -145,6 +145,12 @@ maintainer-files:
            -f ${FILESDIR}/nodejs-output-${PKGVERSION_NOREV}.tgz
 .endif
 
+pre-patch:
+       for f in $$(find ${WRKSRC}/third_party/libwebrtc -name moz.build -type f) ; \
+       do \
+               ${AWK} -f ${FILESDIR}/replace-moz.build.awk $$f > $$f.new; mv $$f.new $$f ; \
+       done
+
 post-build:
        ${SED} -e 's|@MOZILLA@|${MOZILLA}|g'                            \
          -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g'                       \

Index: pkgsrc/www/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.478 pkgsrc/www/firefox/distinfo:1.479
--- pkgsrc/www/firefox/distinfo:1.478   Wed Aug  3 17:09:26 2022
+++ pkgsrc/www/firefox/distinfo Sat Aug  6 20:47:51 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.478 2022/08/03 17:09:26 ryoon Exp $
+$NetBSD: distinfo,v 1.479 2022/08/06 20:47:51 nia Exp $
 
 BLAKE2s (firefox-103.0.1.source.tar.xz) = 5128a952e6957b1b808dd5c513848706937e6943639d64ac6856858ae8564cb1
 SHA512 (firefox-103.0.1.source.tar.xz) = cb487e1d5d602e6b07093b5e722c4e70b9bf39f42c13c25642f263f90f9d3940d02e6fdbab9e8f41b66a50f81d70300acf81c222f08a26eed3ae55777fdc6303
@@ -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) = e007fe7dd2fd16e7d0ac4a35f9a006db4e24eb7e
+SHA1 (patch-libwebrtc.diff) = 2f83e71f95397260ec20bced3724fa5f9259765b
 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/mozilla-common.mk
diff -u pkgsrc/www/firefox/mozilla-common.mk:1.237 pkgsrc/www/firefox/mozilla-common.mk:1.238
--- pkgsrc/www/firefox/mozilla-common.mk:1.237  Fri Aug  5 09:52:10 2022
+++ pkgsrc/www/firefox/mozilla-common.mk        Sat Aug  6 20:47:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.237 2022/08/05 09:52:10 nia Exp $
+# $NetBSD: mozilla-common.mk,v 1.238 2022/08/06 20:47:51 nia Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -35,6 +35,7 @@ TOOL_DEPENDS+=                ${PYPKGPREFIX}-expat-[0-
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 TOOL_DEPENDS+=         nasm>=2.14:../../devel/nasm
 TOOL_DEPENDS+=         yasm>=1.1:../../devel/yasm
+CFLAGS+=               -msse2
 .endif
 
 # This is to work around build failures where an upstream configuration script

Added files:

Index: pkgsrc/www/firefox/files/replace-moz.build.awk
diff -u /dev/null pkgsrc/www/firefox/files/replace-moz.build.awk:1.1
--- /dev/null   Sat Aug  6 20:47:52 2022
+++ pkgsrc/www/firefox/files/replace-moz.build.awk      Sat Aug  6 20:47:51 2022
@@ -0,0 +1,22 @@
+/^if CONFIG\[\"OS_TARGET\"\] == \"Android\":/{
+       flag = 1;
+       print $0;
+       next;
+}
+/^if CONFIG\[\"OS_TARGET\"\] == \"Linux\":/{
+       flag = 0;
+       sub(/^if CONFIG\[\"OS_TARGET\"\] == \"Linux\":/, "if CONFIG[\"OS_TARGET\"] == \"Linux\" or CONFIG[\"OS_TARGET\"] == \"NetBSD\" or CONFIG[\"OS_TARGET\"] == \"OpenBSD\" or CONFIG[\"OS_TARGET\"] 
== \"FreeBSD\":");
+       print $0;
+       next;
+}
+{
+       if (flag != 1) {
+               sub(/^    DEFINES\[\"WEBRTC_LINUX\"\] = True/, "    if CONFIG\[\"OS_TARGET\"\] == \"Linux\":\n        DEFINES\[\"WEBRTC_LINUX\"\] = True\n    else:\n        DEFINES\[\"WEBRTC_BSD\"\] 
= True");
+               sub(/^if not CONFIG\[\"MOZ_DEBUG\"\] and CONFIG\[\"OS_TARGET\"\] == \"Linux\":/, "if not CONFIG[\"MOZ_DEBUG\"] and (CONFIG[\"OS_TARGET\"] == \"Linux\" or CONFIG[\"OS_TARGET\"] == 
\"NetBSD\" or CONFIG[\"OS_TARGET\"] == \"OpenBSD\" or CONFIG[\"OS_TARGET\"] == \"FreeBSD\"):");
+               sub(/^if CONFIG\[\"MOZ_DEBUG\"\] == \"1\" and CONFIG\[\"OS_TARGET\"\] == \"Linux\":/, "if CONFIG[\"MOZ_DEBUG\"] == \"1\" and (CONFIG[\"OS_TARGET\"] == \"Linux\" or 
CONFIG[\"OS_TARGET\"] == \"NetBSD\" or CONFIG[\"OS_TARGET\"] == \"OpenBSD\" or CONFIG[\"OS_TARGET\"] == \"FreeBSD\"):");
+               sub(/^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\"):");
+               sub(/^if CONFIG\[\"CPU_ARCH\"\] == \"x86\" and CONFIG\[\"OS_TARGET\"\] == \"Linux\":/, "if CONFIG[\"CPU_ARCH\"] == \"x86\" and (CONFIG[\"OS_TARGET\"] == \"Linux\" or 
CONFIG[\"OS_TARGET\"] == \"NetBSD\" or CONFIG[\"OS_TARGET\"] == \"OpenBSD\" or CONFIG[\"OS_TARGET\"] == \"FreeBSD\"):");
+               sub(/^if CONFIG\[\"CPU_ARCH\"\] == \"x86_64\" and CONFIG\[\"OS_TARGET\"\] == \"Linux\":/, "if CONFIG[\"CPU_ARCH\"] == \"x86_64\" and (CONFIG[\"OS_TARGET\"] == \"Linux\" or 
CONFIG[\"OS_TARGET\"] == \"NetBSD\" or CONFIG[\"OS_TARGET\"] == \"OpenBSD\" or CONFIG[\"OS_TARGET\"] == \"FreeBSD\"):");
+       }
+       print $0;
+}