Received: by mail.netbsd.org (Postfix, from userid 605) id 7C09284E6C; Sun, 7 Aug 2022 18:08:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B3F9384D4B for ; Sun, 7 Aug 2022 18:08:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id vfWPNSKmzvQY for ; Sun, 7 Aug 2022 18:08:08 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id B63DC84D0E for ; Sun, 7 Aug 2022 18:08:08 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id A5487FB1A; Sun, 7 Aug 2022 18:08:08 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_165989568825320" MIME-Version: 1.0 Date: Sun, 7 Aug 2022 18:08:08 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/www/firefox102 To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20220807180808.A5487FB1A@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_165989568825320 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Sun Aug 7 18:08:08 UTC 2022 Modified Files: pkgsrc/www/firefox102: Makefile distinfo mozilla-common.mk options.mk Added Files: pkgsrc/www/firefox102/files: replace-moz.build.awk pkgsrc/www/firefox102/patches: patch-gfx_webrender__bindings_webrender__ffi.h Removed Files: pkgsrc/www/firefox102/patches: patch-libwebrtc.diff Log Message: firefox102: Sync fixes with www/firefox To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/firefox102/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/firefox102/distinfo \ pkgsrc/www/firefox102/options.mk cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/firefox102/mozilla-common.mk cvs rdiff -u -r0 -r1.1 pkgsrc/www/firefox102/files/replace-moz.build.awk cvs rdiff -u -r0 -r1.1 \ pkgsrc/www/firefox102/patches/patch-gfx_webrender__bindings_webrender__ffi.h cvs rdiff -u -r1.2 -r0 pkgsrc/www/firefox102/patches/patch-libwebrtc.diff Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_165989568825320 Content-Disposition: inline Content-Length: 7992 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/firefox102/Makefile diff -u pkgsrc/www/firefox102/Makefile:1.3 pkgsrc/www/firefox102/Makefile:1.4 --- pkgsrc/www/firefox102/Makefile:1.3 Fri Aug 5 08:41:25 2022 +++ pkgsrc/www/firefox102/Makefile Sun Aug 7 18:08:08 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2022/08/05 08:41:25 nia Exp $ +# $NetBSD: Makefile,v 1.4 2022/08/07 18:08:08 nia Exp $ FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} MOZ_BRANCH= 102.1 @@ -6,6 +6,7 @@ MOZ_BRANCH_MINOR= .0esr DISTNAME= firefox-${FIREFOX_VER}.source PKGNAME= ${DISTNAME:S/.source//:S/b/beta/:S/esr//:S/firefox-/firefox102-/g} +PKGREVISION= 1 CATEGORIES= www MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} EXTRACT_SUFX= .tar.xz @@ -148,6 +149,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/firefox102/distinfo diff -u pkgsrc/www/firefox102/distinfo:1.2 pkgsrc/www/firefox102/distinfo:1.3 --- pkgsrc/www/firefox102/distinfo:1.2 Fri Aug 5 08:41:25 2022 +++ pkgsrc/www/firefox102/distinfo Sun Aug 7 18:08:08 2022 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2022/08/05 08:41:25 nia Exp $ +$NetBSD: distinfo,v 1.3 2022/08/07 18:08:08 nia Exp $ BLAKE2s (firefox-102.1.0esr.source.tar.xz) = 1ec004de7f7edb8e9e1ba7dc45a150cffeab907a48e4a617407152309c1c299d SHA512 (firefox-102.1.0esr.source.tar.xz) = 2505b87ce4115445568eb6b7d8af41678bd787fd07f3f79e9f0a22d90cdf752ae5d4371856cf9c56e2d9da7d5b7c3939dc2aab5753fcc017398e7d65260f6f03 @@ -15,6 +15,7 @@ SHA1 (patch-gfx_angle_checkout_src_commo SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = b2adce9e65662283a11b6dcff40e95523e940045 SHA1 (patch-gfx_skia_skia_src_core_SkCpu.cpp) = 36218819254f3681b9c717d652ea78c9f20d49ad SHA1 (patch-gfx_skia_skia_src_core_SkVM.cpp) = cdb2c2b0d512c0eb8403abba9b74c218d3a306ea +SHA1 (patch-gfx_webrender__bindings_webrender__ffi.h) = 44e73ff006ca1a4bbd42e15a09d7577bfa774353 SHA1 (patch-gfx_wr_swgl_build.rs) = df6ebfaabb4d27994e59a9d0eaf12c7cf08415fb SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 298642a3527804115b398fb7904a3596962932e3 SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 35d20981d33ccdb1d8ffb8039e48798777f11658 @@ -23,7 +24,6 @@ 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-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/firefox102/options.mk diff -u pkgsrc/www/firefox102/options.mk:1.2 pkgsrc/www/firefox102/options.mk:1.3 --- pkgsrc/www/firefox102/options.mk:1.2 Fri Aug 5 08:41:25 2022 +++ pkgsrc/www/firefox102/options.mk Sun Aug 7 18:08:08 2022 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2022/08/05 08:41:25 nia Exp $ +# $NetBSD: options.mk,v 1.3 2022/08/07 18:08:08 nia 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 && (!empty(MACHINE_ARCH:Mx86_64) || !empty(MACHINE_ARCH:Mi386)) +.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000 PKG_SUGGESTED_OPTIONS+= webrtc .endif Index: pkgsrc/www/firefox102/mozilla-common.mk diff -u pkgsrc/www/firefox102/mozilla-common.mk:1.1 pkgsrc/www/firefox102/mozilla-common.mk:1.2 --- pkgsrc/www/firefox102/mozilla-common.mk:1.1 Thu Jul 21 23:56:38 2022 +++ pkgsrc/www/firefox102/mozilla-common.mk Sun Aug 7 18:08:08 2022 @@ -1,4 +1,4 @@ -# $NetBSD: mozilla-common.mk,v 1.1 2022/07/21 23:56:38 nia Exp $ +# $NetBSD: mozilla-common.mk,v 1.2 2022/08/07 18:08:08 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/firefox102/files/replace-moz.build.awk diff -u /dev/null pkgsrc/www/firefox102/files/replace-moz.build.awk:1.1 --- /dev/null Sun Aug 7 18:08:08 2022 +++ pkgsrc/www/firefox102/files/replace-moz.build.awk Sun Aug 7 18:08:08 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; +} Index: pkgsrc/www/firefox102/patches/patch-gfx_webrender__bindings_webrender__ffi.h diff -u /dev/null pkgsrc/www/firefox102/patches/patch-gfx_webrender__bindings_webrender__ffi.h:1.1 --- /dev/null Sun Aug 7 18:08:08 2022 +++ pkgsrc/www/firefox102/patches/patch-gfx_webrender__bindings_webrender__ffi.h Sun Aug 7 18:08:08 2022 @@ -0,0 +1,15 @@ +$NetBSD: patch-gfx_webrender__bindings_webrender__ffi.h,v 1.1 2022/08/07 18:08:08 nia Exp $ + +https://bugzilla.mozilla.org/show_bug.cgi?id=1773259 + +--- gfx/webrender_bindings/webrender_ffi.h.orig 2022-07-18 18:14:25.000000000 +0000 ++++ gfx/webrender_bindings/webrender_ffi.h +@@ -73,8 +73,6 @@ struct WrPipelineInfo; + struct WrPipelineIdAndEpoch; + using WrPipelineIdEpochs = nsTArray; + +-const uint64_t ROOT_CLIP_CHAIN = ~0; +- + } // namespace wr + } // namespace mozilla + --_----------=_165989568825320--