pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www/firefox102 firefox102: Sync fixes with www/firefox
details: https://anonhg.NetBSD.org/pkgsrc/rev/7a9061df89e3
branches: trunk
changeset: 382882:7a9061df89e3
user: nia <nia%pkgsrc.org@localhost>
date: Sun Aug 07 18:08:08 2022 +0000
description:
firefox102: Sync fixes with www/firefox
diffstat:
www/firefox102/Makefile | 9 +-
www/firefox102/distinfo | 4 +-
www/firefox102/files/replace-moz.build.awk | 22 +
www/firefox102/mozilla-common.mk | 3 +-
www/firefox102/options.mk | 4 +-
www/firefox102/patches/patch-gfx_webrender__bindings_webrender__ffi.h | 15 +
www/firefox102/patches/patch-libwebrtc.diff | 17439 ----------
7 files changed, 51 insertions(+), 17445 deletions(-)
diffs (truncated from 17578 to 300 lines):
diff -r 1d828d170bab -r 7a9061df89e3 www/firefox102/Makefile
--- a/www/firefox102/Makefile Sun Aug 07 17:38:59 2022 +0000
+++ b/www/firefox102/Makefile Sun Aug 07 18:08:08 2022 +0000
@@ -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 @@
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 @@
-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' \
diff -r 1d828d170bab -r 7a9061df89e3 www/firefox102/distinfo
--- a/www/firefox102/distinfo Sun Aug 07 17:38:59 2022 +0000
+++ b/www/firefox102/distinfo Sun Aug 07 18:08:08 2022 +0000
@@ -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_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_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
diff -r 1d828d170bab -r 7a9061df89e3 www/firefox102/files/replace-moz.build.awk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox102/files/replace-moz.build.awk Sun Aug 07 18:08:08 2022 +0000
@@ -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;
+}
diff -r 1d828d170bab -r 7a9061df89e3 www/firefox102/mozilla-common.mk
--- a/www/firefox102/mozilla-common.mk Sun Aug 07 17:38:59 2022 +0000
+++ b/www/firefox102/mozilla-common.mk Sun Aug 07 18:08:08 2022 +0000
@@ -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 @@
.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
diff -r 1d828d170bab -r 7a9061df89e3 www/firefox102/options.mk
--- a/www/firefox102/options.mk Sun Aug 07 17:38:59 2022 +0000
+++ b/www/firefox102/options.mk Sun Aug 07 18:08:08 2022 +0000
@@ -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+= 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
diff -r 1d828d170bab -r 7a9061df89e3 www/firefox102/patches/patch-gfx_webrender__bindings_webrender__ffi.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox102/patches/patch-gfx_webrender__bindings_webrender__ffi.h Sun Aug 07 18:08:08 2022 +0000
@@ -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<WrPipelineIdAndEpoch>;
+
+-const uint64_t ROOT_CLIP_CHAIN = ~0;
+-
+ } // namespace wr
+ } // namespace mozilla
+
diff -r 1d828d170bab -r 7a9061df89e3 www/firefox102/patches/patch-libwebrtc.diff
--- a/www/firefox102/patches/patch-libwebrtc.diff Sun Aug 07 17:38:59 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17439 +0,0 @@
-$NetBSD: patch-libwebrtc.diff,v 1.2 2022/08/05 08:41:25 nia Exp $
-
-Generated by scripts in http://ftp.netbsd.org/pub/NetBSD/misc/ryoon/firefox-103.0-create-libwebrtc.diff and modified by hand.
-
-diff -ur firefox-103.0.orig/third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build firefox-103.0/third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
---- third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build 2022-07-19 03:44:36.000000000 +0900
-+++ third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build 2022-07-26 23:57:28.491578328 +0900
-@@ -67,14 +67,17 @@
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
--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":
-
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_NSS_CERTS"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_UDEV"] = True
-- DEFINES["WEBRTC_LINUX"] = True
-+ if CONFIG["OS_TARGET"] == "Linux":
-+ DEFINES["WEBRTC_LINUX"] = True
-+ else:
-+ DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
- DEFINES["_LARGEFILE64_SOURCE"] = True
-@@ -147,7 +150,7 @@
-
- DEFINES["_DEBUG"] = True
-
--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"):
-
- DEFINES["_DEBUG"] = True
-
-@@ -200,4 +203,13 @@
-
- DEFINES["_GNU_SOURCE"] = True
-
-+if CONFIG["CPU_ARCH"] == "x86":
-+ CFLAGS += [
-+ "-msse2"
-+ ]
-+
-+ CXXFLAGS += [
-+ "-msse2"
-+ ]
-+
- Library("resource_adaptation_api_gn")
-diff -ur firefox-103.0.orig/third_party/libwebrtc/api/array_view_gn/moz.build firefox-103.0/third_party/libwebrtc/api/array_view_gn/moz.build
---- third_party/libwebrtc/api/array_view_gn/moz.build 2022-07-19 03:44:30.000000000 +0900
-+++ third_party/libwebrtc/api/array_view_gn/moz.build 2022-07-26 23:57:28.411454920 +0900
-@@ -63,14 +63,17 @@
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
--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":
-
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_NSS_CERTS"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_UDEV"] = True
-- DEFINES["WEBRTC_LINUX"] = True
-+ if CONFIG["OS_TARGET"] == "Linux":
-+ DEFINES["WEBRTC_LINUX"] = True
-+ else:
-+ DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
- DEFINES["_LARGEFILE64_SOURCE"] = True
-@@ -135,7 +138,7 @@
-
- DEFINES["_DEBUG"] = True
-
--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"):
-
- DEFINES["_DEBUG"] = True
-
-@@ -180,4 +183,13 @@
-
- DEFINES["_GNU_SOURCE"] = True
-
-+if CONFIG["CPU_ARCH"] == "x86":
-+ CFLAGS += [
-+ "-msse2"
-+ ]
-+
-+ CXXFLAGS += [
-+ "-msse2"
-+ ]
-+
- Library("array_view_gn")
-diff -ur firefox-103.0.orig/third_party/libwebrtc/api/audio/aec3_config_gn/moz.build firefox-103.0/third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
---- third_party/libwebrtc/api/audio/aec3_config_gn/moz.build 2022-07-19 03:44:25.000000000 +0900
-+++ third_party/libwebrtc/api/audio/aec3_config_gn/moz.build 2022-07-26 23:57:28.532316610 +0900
-@@ -67,14 +67,17 @@
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
--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":
-
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_NSS_CERTS"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_UDEV"] = True
-- DEFINES["WEBRTC_LINUX"] = True
-+ if CONFIG["OS_TARGET"] == "Linux":
-+ DEFINES["WEBRTC_LINUX"] = True
-+ else:
-+ DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
- DEFINES["_LARGEFILE64_SOURCE"] = True
-@@ -147,7 +150,7 @@
-
- DEFINES["_DEBUG"] = True
-
--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"):
-
- DEFINES["_DEBUG"] = True
-
-@@ -200,4 +203,13 @@
-
- DEFINES["_GNU_SOURCE"] = True
-
-+if CONFIG["CPU_ARCH"] == "x86":
-+ CFLAGS += [
-+ "-msse2"
-+ ]
-+
-+ CXXFLAGS += [
-+ "-msse2"
-+ ]
-+
- Library("aec3_config_gn")
-diff -ur firefox-103.0.orig/third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build firefox-103.0/third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
---- third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build 2022-07-19 03:44:26.000000000 +0900
-+++ third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build 2022-07-26 23:57:28.536379004 +0900
-@@ -68,14 +68,17 @@
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
--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":
-
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_NSS_CERTS"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_UDEV"] = True
-- DEFINES["WEBRTC_LINUX"] = True
-+ if CONFIG["OS_TARGET"] == "Linux":
-+ DEFINES["WEBRTC_LINUX"] = True
-+ else:
Home |
Main Index |
Thread Index |
Old Index