Fri Jun 2 18:47:20 2023 UTC ()
firefox: switch to ffmpeg6

Still compiles, still doesn't link against ffmpeg, but MOZ_FFMPEG is
defined to 1.

Bump PKGREVISION.

XXX: Update comment about hunspell: it's now perhaps new enough to
be used from pkgsrc instead of using the provided copy.


(wiz)
diff -r1.556 -r1.557 pkgsrc/www/firefox/Makefile
diff -r1.251 -r1.252 pkgsrc/www/firefox/mozilla-common.mk
cvs diff -r1.556 -r1.557 pkgsrc/www/firefox/Makefile (expand / switch to unified diff)

--- pkgsrc/www/firefox/Makefile 2023/05/30 13:26:45 1.556
+++ pkgsrc/www/firefox/Makefile 2023/06/02 18:47:20 1.557
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: Makefile,v 1.556 2023/05/30 13:26:45 abs Exp $ 1# $NetBSD: Makefile,v 1.557 2023/06/02 18:47:20 wiz Exp $
2 2
3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} 3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
4MOZ_BRANCH= 112.0 4MOZ_BRANCH= 112.0
5MOZ_BRANCH_MINOR= .1 5MOZ_BRANCH_MINOR= .1
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= 4 9PKGREVISION= 5
10CATEGORIES= www 10CATEGORIES= www
11MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} 11MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
12MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/} 12MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
13EXTRACT_SUFX= .tar.xz 13EXTRACT_SUFX= .tar.xz
14 14
15NODEJSKIT= nodejs-output-111.0.tgz 15NODEJSKIT= nodejs-output-111.0.tgz
16DISTFILES= ${DEFAULT_DISTFILES} ${NODEJSKIT} 16DISTFILES= ${DEFAULT_DISTFILES} ${NODEJSKIT}
17SITES.${NODEJSKIT}= ${MASTER_SITE_LOCAL} 17SITES.${NODEJSKIT}= ${MASTER_SITE_LOCAL}
18 18
19MAINTAINER= ryoon@NetBSD.org 19MAINTAINER= ryoon@NetBSD.org
20HOMEPAGE= https://www.mozilla.org/en-US/firefox/ 20HOMEPAGE= https://www.mozilla.org/en-US/firefox/
21COMMENT= Web browser with support for extensions (version ${FIREFOX_VER:tu:C/\\.[[:digit:]\.]*//}) 21COMMENT= Web browser with support for extensions (version ${FIREFOX_VER:tu:C/\\.[[:digit:]\.]*//})
22LICENSE= mpl-1.1 22LICENSE= mpl-1.1
cvs diff -r1.251 -r1.252 pkgsrc/www/firefox/mozilla-common.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox/mozilla-common.mk 2023/04/19 14:28:40 1.251
+++ pkgsrc/www/firefox/mozilla-common.mk 2023/06/02 18:47:20 1.252
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mozilla-common.mk,v 1.251 2023/04/19 14:28:40 gutteridge Exp $ 1# $NetBSD: mozilla-common.mk,v 1.252 2023/06/02 18:47:20 wiz Exp $
2# 2#
3# common Makefile fragment for mozilla packages based on gecko 2.0. 3# common Makefile fragment for mozilla packages based on gecko 2.0.
4# 4#
5# used by www/firefox/Makefile 5# used by www/firefox/Makefile
6 6
7.include "../../mk/bsd.prefs.mk" 7.include "../../mk/bsd.prefs.mk"
8 8
9PYTHON_VERSIONS_INCOMPATIBLE= 27 9PYTHON_VERSIONS_INCOMPATIBLE= 27
10PYTHON_FOR_BUILD_ONLY= tool 10PYTHON_FOR_BUILD_ONLY= tool
11ALL_ENV+= PYTHON3=${PYTHONBIN} 11ALL_ENV+= PYTHON3=${PYTHONBIN}
12 12
13REPLACE_PYTHON= build/cargo-linker 13REPLACE_PYTHON= build/cargo-linker
14 14
@@ -204,29 +204,30 @@ BUILDLINK_API_DEPENDS.nss+= nss>=3.89 @@ -204,29 +204,30 @@ BUILDLINK_API_DEPENDS.nss+= nss>=3.89
204.include "../../graphics/MesaLib/buildlink3.mk" 204.include "../../graphics/MesaLib/buildlink3.mk"
205#BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4 205#BUILDLINK_API_DEPENDS.cairo+= cairo>=1.10.2nb4
206#.include "../../graphics/cairo/buildlink3.mk" 206#.include "../../graphics/cairo/buildlink3.mk"
207BUILDLINK_API_DEPENDS.libwebp+= libwebp>=1.0.2 207BUILDLINK_API_DEPENDS.libwebp+= libwebp>=1.0.2
208.include "../../graphics/libwebp/buildlink3.mk" 208.include "../../graphics/libwebp/buildlink3.mk"
209BUILDLINK_DEPMETHOD.clang= build 209BUILDLINK_DEPMETHOD.clang= build
210.include "../../lang/clang/buildlink3.mk" 210.include "../../lang/clang/buildlink3.mk"
211RUST_REQ= 1.65.0 211RUST_REQ= 1.65.0
212.include "../../lang/rust/rust.mk" 212.include "../../lang/rust/rust.mk"
213# webrtc option requires internal libvpx 213# webrtc option requires internal libvpx
214#BUILDLINK_API_DEPENDS.libvpx+= libvpx>=1.3.0 214#BUILDLINK_API_DEPENDS.libvpx+= libvpx>=1.3.0
215#.include "../../multimedia/libvpx/buildlink3.mk" 215#.include "../../multimedia/libvpx/buildlink3.mk"
216.include "../../net/libIDL/buildlink3.mk" 216.include "../../net/libIDL/buildlink3.mk"
217# textproc/hunspell 1.3 is too old 217# TODO: check again, pkgsrc has hunspell 1.7
 218# was: textproc/hunspell 1.3 is too old
218#.include "../../textproc/hunspell/buildlink3.mk" 219#.include "../../textproc/hunspell/buildlink3.mk"
219.include "../../multimedia/ffmpeg5/buildlink3.mk" 220.include "../../multimedia/ffmpeg6/buildlink3.mk"
220.include "../../x11/libXt/buildlink3.mk" 221.include "../../x11/libXt/buildlink3.mk"
221.include "../../x11/libXtst/buildlink3.mk" 222.include "../../x11/libXtst/buildlink3.mk"
222BUILDLINK_API_DEPENDS.pixman+= pixman>=0.25.2 223BUILDLINK_API_DEPENDS.pixman+= pixman>=0.25.2
223.include "../../x11/pixman/buildlink3.mk" 224.include "../../x11/pixman/buildlink3.mk"
224.include "../../x11/gtk3/buildlink3.mk" 225.include "../../x11/gtk3/buildlink3.mk"
225PLIST_VARS+= wayland 226PLIST_VARS+= wayland
226.if ${PKG_BUILD_OPTIONS.gtk3:Mwayland} 227.if ${PKG_BUILD_OPTIONS.gtk3:Mwayland}
227CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk3-x11-wayland 228CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk3-x11-wayland
228PLIST.wayland= yes 229PLIST.wayland= yes
229.else 230.else
230CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk3 231CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk3
231.endif 232.endif
232.include "../../lang/python/application.mk" 233.include "../../lang/python/application.mk"