Skip to content

Commit

Permalink
www/firefox-esr: update to 102.2.0
Browse files Browse the repository at this point in the history
Release Notes:
  https://www.mozilla.org/en-US/firefox/102.2.0/releasenotes/

(cherry picked from commit 0f60b8e)
  • Loading branch information
moench-tegeder committed Sep 11, 2022
1 parent ab6bc1d commit 8f34660
Show file tree
Hide file tree
Showing 20 changed files with 71,494 additions and 26,276 deletions.
22 changes: 17 additions & 5 deletions www/firefox-esr/Makefile
@@ -1,7 +1,7 @@
# Created by: Alan Eldridge <alane@FreeBSD.org>

PORTNAME= firefox
DISTVERSION= 91.13.0
DISTVERSION= 102.2.0
PORTEPOCH= 1
CATEGORIES= www wayland
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
Expand All @@ -13,14 +13,14 @@ MAINTAINER= gecko@FreeBSD.org
COMMENT= Web browser based on the browser portion of Mozilla

BUILD_DEPENDS= nspr>=4.32:devel/nspr \
nss>=3.68:security/nss \
icu>=67.1,1:devel/icu \
nss>=3.79.1:security/nss \
icu>=71.1,1:devel/icu \
libevent>=2.1.8:devel/libevent \
harfbuzz>=2.8.1:print/harfbuzz \
harfbuzz>=4.1.0:print/harfbuzz \
graphite2>=1.3.14:graphics/graphite2 \
png>=1.6.37:graphics/png \
dav1d>=1.0.0:multimedia/dav1d \
libvpx>=1.8.2:multimedia/libvpx \
libvpx>=1.11.0:multimedia/libvpx \
${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
v4l_compat>0:multimedia/v4l_compat \
autoconf2.13:devel/autoconf2.13 \
Expand All @@ -33,6 +33,7 @@ CPE_PRODUCT= ${PORTNAME}_esr
CONFLICTS_INSTALL= firefox
USE_MOZILLA= -sqlite
CFLAGS_powerpc64le= -DSQLITE_BYTEORDER=1234
CONFIGURE_ENV+= BINDGEN_CFLAGS="-I${LOCALBASE}/include"

USES= tar:xz

Expand All @@ -44,6 +45,17 @@ MOZ_OPTIONS= --enable-application=browser \

.include "${.CURDIR}/../../www/firefox/Makefile.options"

.include <bsd.port.options.mk>

.if ${ARCH} == powerpc64
MOZ_OPTIONS+= --disable-webrtc --without-wasm-sandboxed-libraries
.else
BUILD_DEPENDS+= ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libcxx \
${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc \
${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/clang/${LLVM_VERSION}/lib/wasi/libclang_rt.builtins-wasm32.a:devel/wasi-compiler-rt${LLVM_DEFAULT}
MOZ_OPTIONS+= --with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot
.endif

post-patch:
@${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \
-e '/^Icon/s/=.*/=${FIREFOX_ICON:R}/' \
Expand Down
6 changes: 3 additions & 3 deletions www/firefox-esr/distinfo
@@ -1,3 +1,3 @@
TIMESTAMP = 1660589043
SHA256 (firefox-91.13.0esr.source.tar.xz) = 53be2bcde0b5ee3ec106bd8ba06b8ae95e7d489c484e881dfbe5360e4c920762
SIZE (firefox-91.13.0esr.source.tar.xz) = 380053584
TIMESTAMP = 1662823213
SHA256 (firefox-102.2.0esr.source.tar.xz) = 014d91d14ab4f53e93728273b45ac6022813d5ade35f842e722bf87b747c97ff
SIZE (firefox-102.2.0esr.source.tar.xz) = 479840072
37 changes: 0 additions & 37 deletions www/firefox-esr/files/patch-bug1288587

This file was deleted.

10 changes: 6 additions & 4 deletions www/firefox-esr/files/patch-bug1504834_comment10
Expand Up @@ -14,10 +14,11 @@ Solution: This is not a real solution, but a hack. The real solution would have
are readable, albeit not as pretty to look at as they could be.
Side-effects: I have not yet found an unwanted side-effect.

diff -r 46ea866ca3ac -r 6ef20eee3f8f gfx/2d/DrawTargetSkia.cpp
--- gfx/2d/DrawTargetSkia.cpp Tue Oct 22 12:27:22 2019 +0200
+++ gfx/2d/DrawTargetSkia.cpp Thu Oct 31 09:11:56 2019 +0100
@@ -1861,6 +1861,14 @@
diff --git gfx/2d/DrawTargetSkia.cpp gfx/2d/DrawTargetSkia.cpp
index 6bbef8d..161b96f 100644
--- gfx/2d/DrawTargetSkia.cpp
+++ gfx/2d/DrawTargetSkia.cpp
@@ -1903,6 +1903,14 @@ void DrawTargetSkia::PushLayerWithBlend(bool aOpaque, Float aOpacity,
SkCanvas::kPreserveLCDText_SaveLayerFlag |
(aCopyBackground ? SkCanvas::kInitWithPrevious_SaveLayerFlag : 0));

Expand All @@ -32,3 +33,4 @@ diff -r 46ea866ca3ac -r 6ef20eee3f8f gfx/2d/DrawTargetSkia.cpp
mCanvas->saveLayer(saveRec);

SetPermitSubpixelAA(aOpaque);

46 changes: 34 additions & 12 deletions www/firefox-esr/files/patch-bug1559213
Expand Up @@ -11,10 +11,10 @@ Date: Thu Jun 13 11:53:00 2019 -0700
4 files changed, 34 insertions(+), 3 deletions(-)

diff --git config/external/moz.build config/external/moz.build
index 03e4fa143bd1..a67d10b11fe6 100644
index ab77121..75595d9 100644
--- config/external/moz.build
+++ config/external/moz.build
@@ -40,8 +40,9 @@ if not CONFIG["MOZ_SYSTEM_LIBVPX"]:
@@ -49,8 +49,9 @@ if not CONFIG["MOZ_SYSTEM_LIBVPX"]:
external_dirs += ["media/libvpx"]

if CONFIG["MOZ_AV1"]:
Expand All @@ -27,11 +27,11 @@ index 03e4fa143bd1..a67d10b11fe6 100644
if not CONFIG["MOZ_SYSTEM_PNG"]:
external_dirs += ["media/libpng"]
diff --git config/system-headers.mozbuild config/system-headers.mozbuild
index bcf5c4925564..48964a999a9b 100644
index a1b58eb..65729f9 100644
--- config/system-headers.mozbuild
+++ config/system-headers.mozbuild
@@ -1305,6 +1305,14 @@ if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
'harfbuzz/hb.h',
@@ -1289,6 +1289,14 @@ if CONFIG['MOZ_ENABLE_LIBPROXY']:
'proxy.h',
]

+if CONFIG['MOZ_SYSTEM_AV1']:
Expand All @@ -46,7 +46,7 @@ index bcf5c4925564..48964a999a9b 100644
system_headers += [
'vpx_mem/vpx_mem.h',
diff --git dom/media/platforms/moz.build dom/media/platforms/moz.build
index 092cee0c9b66..38e45de5b5f0 100644
index 8509aec..eb6f129 100644
--- dom/media/platforms/moz.build
+++ dom/media/platforms/moz.build
@@ -78,6 +78,11 @@ if CONFIG["MOZ_AV1"]:
Expand All @@ -61,11 +61,33 @@ index 092cee0c9b66..38e45de5b5f0 100644

if CONFIG["MOZ_OMX"]:
EXPORTS += [
diff --git media/ffvpx/libavcodec/moz.build media/ffvpx/libavcodec/moz.build
index 0069865..e806fc8 100644
--- media/ffvpx/libavcodec/moz.build
+++ media/ffvpx/libavcodec/moz.build
@@ -112,9 +112,15 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']:
'vaapi_vp8.c',
'vaapi_vp9.c',
]
+ if CONFIG["MOZ_SYSTEM_AV1"]:
+ CFLAGS += CONFIG['MOZ_SYSTEM_LIBDAV1D_CFLAGS']
+ OS_LIBS += CONFIG['MOZ_SYSTEM_LIBDAV1D_LIBS']
+ else:
+ USE_LIBS += [
+ 'dav1d',
+ 'media_libdav1d_asm',
+ ]
USE_LIBS += [
- 'dav1d',
- 'media_libdav1d_asm',
'mozva'
]

diff --git toolkit/moz.configure toolkit/moz.configure
index 82b5a59acf42..e2329560b42b 100644
--- toolkit/moz.configure.orig 2021-04-13 16:12:34.770032000 +0200
+++ toolkit/moz.configure 2021-04-18 00:03:41.432698000 +0200
@@ -538,7 +538,23 @@
index 0069865..e806fc8 100644
--- toolkit/moz.configure
+++ toolkit/moz.configure
@@ -523,7 +523,23 @@ def av1(value):
return True


Expand All @@ -90,11 +112,11 @@ index 82b5a59acf42..e2329560b42b 100644
def dav1d_asm(target):
if target.cpu in ("aarch64", "x86", "x86_64"):
return True
@@ -554,6 +570,7 @@
@@ -539,6 +555,7 @@ set_config("MOZ_DAV1D_ASM", dav1d_asm)
set_define("MOZ_DAV1D_ASM", dav1d_asm)
set_config("MOZ_AV1", av1)
set_define("MOZ_AV1", av1)
+set_config("MOZ_SYSTEM_AV1", depends_if(system_av1)(lambda _: True))

# Built-in fragmented MP4 support.
# JXL Image Codec Support
# ==============================================================
24 changes: 0 additions & 24 deletions www/firefox-esr/files/patch-bug1602730_comment5

This file was deleted.

0 comments on commit 8f34660

Please sign in to comment.