www-client/firefox: rev bump

- Another Wayland issue fixed [Link 1]

- Fix building on musl

- Add USE=system-av1

Link1: https://bugzilla.mozilla.org/show_bug.cgi?id=1431399
Closes: https://bugs.gentoo.org/680970
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>

3 files changed, 14 insertions, 6 deletions

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 42f3ac7c8f34..3cfe707e0775 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -345,7 +345,7 @@ DIST firefox-66.0-nl.xpi 450940 BLAKE2B 74157e7c506d496c7ba584bf7a10c8feb90beaed
 DIST firefox-66.0-nn-NO.xpi 456715 BLAKE2B f285e3a64f09835d3f99c0ccf2879c2bace730eccf205a500aa8154b9beb8332553bd01ba604621d97001623e8e934e9381c514b42a0f0b4a18d776876eb6001 SHA512 c9f8f42133b3546c6e71859684f022f5ed83bb79633e8284722737fb3de629f6b966b8627aee0036de56e0653a5cc469f0ee46414e978c56eb6ae8bd8084aa3f
 DIST firefox-66.0-or.xpi 475191 BLAKE2B a19ed91cd73b60d81966cff7d3ef567d3d6da3218c167cb49dc38fb7071b197ae49687ba7c0451bfee90e702c8ab75988f8033bcc4aec1ed09e8f3d8725b48b2 SHA512 5808127560a60a880053785399d28753efb6487c7087a3ed34c3714a0fbfdce7bef83a388b93132a2ff30d3da5813091e0a1ecce74e2546176aac1aa53faae59
 DIST firefox-66.0-pa-IN.xpi 508856 BLAKE2B 525bb2d36d2857e084e00b8fb6a3d65681b9a1c18075822a82e599da73e6f1fe80ddf4a1366b94958b8007ad30228bafa76595c7cec19d82c6dda4acacc02da3 SHA512 a97f68306bebca157c28218ad2fb633f91ae92a9233bb31a09caa6d6bb1268f30bef0d7088fbba264b7304a63f142d3a5dac59af0c1135fbb286e3aafd72b151
-DIST firefox-66.0-patches-05.tar.xz 17836 BLAKE2B 971864d5f058ae8f45eab5808051a08fd28b850455295c87886cae3de1a0b7ea16bba58cf929ddbc25700200a7891610c30afa0e7921ac9dad1f7f8cffb5787e SHA512 48a540f17cf468b989cf7a29696668850db5b3f09bfbeaaffda004ecda6ff5a0b5340a0fc663e693a80546b225f61c08e555bfc8960ac2e5f93f51c2df4d42d6
+DIST firefox-66.0-patches-06.tar.xz 19656 BLAKE2B 46025017c2388b1f4aaff1735dc3552b355df08ae5e69a0c00e9c5a41e060ab54d7e726659db8e4e9d951422dddfb5436a8af29ab67e7b06b8f7e9d548c4f8a6 SHA512 a1068d1765ffc3bca428a8534167ee0aa93acc079b834a746072c0aa3e87975e8bebedd5f5ca9ff848458aef3989f137feb0040814cb35380f6cc682ae54d0c4
 DIST firefox-66.0-pl.xpi 442205 BLAKE2B c23501dd0d78fca453baa655de2379afa837743620d6c8f31481e3a735c7749b6d151d9527d7b8d307f35b18f5c71857ec7f9b14374122bd04b83ed84d742603 SHA512 8bb603e00b5d9ba1c1bbe1a88eaaf8db2a4eb8f5d2a0077edf7bd73b7d592e3b3670f0bd7056785a2141c6193665631c02ccc3aaa8fd0d00cdea06952ab27877
 DIST firefox-66.0-pt-BR.xpi 459333 BLAKE2B f38077ce286090ea915477691bfdf2a90cb7fd46fa32365d80aa1f5beb036ff839908c72d6d2af47772b72a76e21bbb9b23413f1211d2147ef80c21b0cddb686 SHA512 71aa445f6880f28f756ecffd427b68210d3b8f778794e648b60016e7101f36d9374aa4514e6e349874eded9aa3b4929549c4021de5802c0a0a2c38ef6bddbe69
 DIST firefox-66.0-pt-PT.xpi 469364 BLAKE2B 4036f2ec8bcdbfe50715990ba2447693fd56cd56784ac264a77d7d1871c413c0ccb56d519ffd36ed5c85006afce1a6b66d8f1473753b460d487c8d2c585935e3 SHA512 849bd7e2eddc38d46f7e97e4b9b78cfeb4e2d66238e7d0e897479248fb33054afb1f8f37776f83513c76515f893e284c234504f181b74e16aff4819ce869ddc2
diff --git a/www-client/firefox/firefox-66.0.ebuild b/www-client/firefox/firefox-66.0-r1.ebuild
index 769592273cd1..32eef983d32c 100644
--- a/www-client/firefox/firefox-66.0.ebuild
+++ b/www-client/firefox/firefox-66.0-r1.ebuild
@@ -27,7 +27,7 @@ if [[ ${MOZ_ESR} == 1 ]] ; then
 fi
 
 # Patch version
-PATCH="${PN}-66.0-patches-05"
+PATCH="${PN}-66.0-patches-06"
 
 MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
 MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
@@ -53,9 +53,9 @@ SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 IUSE="bindist clang cpu_flags_x86_avx2 dbus debug eme-free geckodriver
 	+gmp-autoupdate hardened hwaccel jack lto neon pgo pulseaudio
-	+screenshot selinux startup-notification +system-harfbuzz
-	+system-icu +system-jpeg +system-libevent +system-sqlite
-	+system-libvpx +system-webp test wayland wifi"
+	+screenshot selinux startup-notification +system-av1
+	+system-harfbuzz +system-icu +system-jpeg +system-libevent
+	+system-sqlite +system-libvpx +system-webp test wayland wifi"
 RESTRICT="!bindist? ( bindist )"
 
 PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/${PATCH}.tar.xz )
@@ -95,6 +95,10 @@ CDEPEND="
 	x11-libs/libXfixes
 	x11-libs/libXrender
 	x11-libs/libXt
+	system-av1? (
+		>=media-libs/dav1d-0.2.0:=
+		>=media-libs/libaom-1.0.0:=
+	)
 	system-harfbuzz? ( >=media-libs/harfbuzz-2.3.1:0= >=media-gfx/graphite2-1.3.13 )
 	system-icu? ( >=dev-libs/icu-63.1:= )
 	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
@@ -158,7 +162,8 @@ DEPEND="${CDEPEND}
 	>=virtual/rust-1.30.0
 	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
 	amd64? ( >=dev-lang/yasm-1.1 virtual/opengl )
-	x86? ( >=dev-lang/yasm-1.1 virtual/opengl )"
+	x86? ( >=dev-lang/yasm-1.1 virtual/opengl )
+	!system-av1? ( dev-lang/nasm )"
 
 # Due to a bug in GCC, profile guided optimization will produce
 # AVX2 instructions, bug #677052
@@ -489,6 +494,7 @@ src_configure() {
 
 	mozconfig_use_enable startup-notification
 	mozconfig_use_enable system-sqlite
+	mozconfig_use_with system-av1
 	mozconfig_use_with system-harfbuzz
 	mozconfig_use_with system-harfbuzz system-graphite2
 	mozconfig_use_with system-icu
diff --git a/www-client/firefox/metadata.xml b/www-client/firefox/metadata.xml
index 1032b6edb789..2d7503a1a8c8 100644
--- a/www-client/firefox/metadata.xml
+++ b/www-client/firefox/metadata.xml
@@ -23,6 +23,8 @@
 		for faster binaries. This option will double the compile time.</flag>
 	<flag name="rust">Enable support for using rust compiler  (experimental)</flag>
 	<flag name="screenshot">Allow to disable screenshot extension in global profile</flag>
+	<flag name="system-av1">Use the system-wide <pkg>media-libs/dav1d</pkg>
+		and <pkg>media-libs/libaom</pkg> library instead of bundled.</flag>
 	<flag name="system-cairo">Use the system-wide <pkg>x11-libs/cairo</pkg>
 		instead of bundled.</flag>
 	<flag name="system-harfbuzz">Use the system-wide <pkg>media-libs/harfbuzz</pkg>