sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (054f325131ec0249dd8b5ec17058e473316c1882)
- From: Pavel Vinogradov <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (054f325131ec0249dd8b5ec17058e473316c1882)
- Date: Tue, 8 Mar 2022 02:29:23 +0000
GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemaage.org>:
crypto/nss/DETAILS
| 4
crypto/nss/HISTORY
| 3
crypto/nss/PREPARE
| 2
http/firefox/DEPENDS
| 6
http/firefox/DETAILS
| 4
http/firefox/HISTORY
| 5
http/firefox/patches/0007-Support-sndio-audio-framework.patch
| 50 +----
http/firefox/patches/0026-Disable-FFVPX-with-VA-API.patch
| 91 +++++++++
http/firefox/patches/0026-Make-elfhack-use-toolchain.patch
| 23 --
http/firefox/patches/0027-Disable-FFVPX-with-VA-API.patch
| 91 ---------
http/firefox/patches/0027-Enable-FLAC-on-platforms-without-ffvpx-via-ffmpeg.patch
| 36 +++
http/firefox/patches/0028-Enable-FLAC-on-platforms-without-ffvpx-via-ffmpeg.patch
| 36 ---
http/firefox/patches/0028-bmo-1670333-OpenH264-Fix-decoding-if-it-starts-on-no.patch
| 96 ++++++++++
http/firefox/patches/0029-bmo-1663844-OpenH264-Allow-using-OpenH264-GMP-decode.patch
| 55 +++++
http/firefox/patches/0029-bmo-1670333-OpenH264-Fix-decoding-if-it-starts-on-no.patch
| 96 ----------
http/firefox/patches/0030-bgo-816975-fix-build-on-x86.patch
| 16 +
http/firefox/patches/0030-bmo-1663844-OpenH264-Allow-using-OpenH264-GMP-decode.patch
| 55 -----
http/firefox/patches/0031-bgo-831903-pip-dont-fail-with-optional-deps.patch
| 14 +
http/firefox/patches/0032-skip-pip-check.patch
| 14 +
http/firefox/patches/0033-resolve-fs-symlinks-bmo1753182.patch
| 18 +
20 files changed, 373 insertions(+), 342 deletions(-)
New commits:
commit 054f325131ec0249dd8b5ec17058e473316c1882
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>
http/firefox: version 98.0, SECURITY_PATCH++
commit ce02d63fe3eafeba0a29cf894c16692fbd6dedc3
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>
crypto/nss: added 3.76 branch
diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS
index e91063c..b98b650 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -120,6 +120,10 @@ case $NSS_BRANCH in
3.75)
VERSION=3.75
SOURCE_HASH=sha512:0ad42f663b48649d7d16dc8b8956d2971a9566c0f7f655dd0609b94877f400977e5ad693f2eb44e1e277e55d1669294f07b3ba7a32573d3d72837b3944adf86d
+ ;;
+ 3.76)
+ VERSION=3.76
+
SOURCE_HASH=sha512:ffbdd8a27f60b796e1204912cde2fa62ac99747ce550258ccdd6fe96d60a46c6ac3f82758a7aba3c7ee58da4e7bf09f1bf817fb9f0fa4e62faaea08a6301b8bd
esac
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://ftp.mozilla.org/pub/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index 4610996..c22f508 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,6 @@
+2022-03-07 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS, PREPARE: added 3.76 branch
+
2022-02-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.74
* PREPARE: added 3.74 branch
diff --git a/crypto/nss/PREPARE b/crypto/nss/PREPARE
index b394359..0411a05 100755
--- a/crypto/nss/PREPARE
+++ b/crypto/nss/PREPARE
@@ -1,5 +1,5 @@
. "${GRIMOIRE}/FUNCTIONS" &&
-prepare_select_branch DEFAULT 3.17 3.20 3.45 3.46 3.47 3.48 3.49 3.51 3.53
3.54 3.55 3.56 3.57 3.58 3.59 3.60 3.61 3.62 3.63 3.65 3.66 3.67 3.68 3.69
3.70 3.71 3.72 3.73 3.74 3.75 &&
+prepare_select_branch DEFAULT 3.17 3.20 3.45 3.46 3.47 3.48 3.49 3.51 3.53
3.54 3.55 3.56 3.57 3.58 3.59 3.60 3.61 3.62 3.63 3.65 3.66 3.67 3.68 3.69
3.70 3.71 3.72 3.73 3.74 3.75 3.76 &&
if [[ -z "$NSS_BRANCH" ]] || [[ "$NSS_BRANCH" == "DEFAULT" ]]; then
NSS_BRANCH=3.56
diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index 881cd72..80475a1 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -35,7 +35,7 @@ depends libwebp "--with-system-webp"
&&
depends nspr "--with-system-nspr" &&
-local NSS_BRANCH="3.74" &&
+local NSS_BRANCH="3.75" &&
if spell_ok nss &&
is_version_less "$(installed_version nss)" "${NSS_BRANCH}"; then
depends -sub "${NSS_BRANCH}" nss "--with-system-nss"
@@ -133,8 +133,8 @@ optional_depends harfbuzz \
"for system harfbuzz" &&
optional_depends dav1d \
- "--enable-av1" \
- "--disable-av1" \
+ "--with-system-av1" \
+ "--without-system-av1" \
"for AV1 video support" &&
if is_depends_enabled $SPELL dav1d; then
depends nasm
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index cd6c1de..bd77d86 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,6 +1,6 @@
SPELL=firefox
- VERSION=97.0.2
- SECURITY_PATCH=159
+ VERSION=98.0
+ SECURITY_PATCH=160
SOURCE="${SPELL}-${VERSION}.source.tar.xz"
SOURCE_URL[0]="http://releases.mozilla.org/pub/${SPELL}/releases/${VERSION}/source/${SOURCE}";
SOURCE2="${SOURCE}.asc"
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 9a489b3..9494cfb 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,8 @@
+2022-03-07 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 98.0, SECURITY_PATCH++
+ * DEPENDS: nss >= 3.75, adapted dav1d flags
+ * patches/*: updated
+
2022-03-04 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 97.0.2, SECURITY_PATCH++
diff --git a/http/firefox/patches/0007-Support-sndio-audio-framework.patch
b/http/firefox/patches/0007-Support-sndio-audio-framework.patch
index 6c7df89..66816f8 100644
--- a/http/firefox/patches/0007-Support-sndio-audio-framework.patch
+++ b/http/firefox/patches/0007-Support-sndio-audio-framework.patch
@@ -1,33 +1,18 @@
-From c6f2bf5c250fec953c853a941ad0d9d0606255b0 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi AT gentoo.org>
-Date: Thu, 29 Apr 2021 18:54:42 +0200
-Subject: [PATCH 07/30] Support sndio audio framework
-
-Bug: https://bugs.gentoo.org/785613
-Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
----
- build/moz.configure/old.configure | 1 +
- media/libcubeb/src/moz.build | 4 +++-
- old-configure.in | 17 +++++++++++++++++
- 3 files changed, 21 insertions(+), 1 deletion(-)
-
-diff --git a/build/moz.configure/old.configure
b/build/moz.configure/old.configure
-index e3974613d6..235abf1a8c 100644
---- a/build/moz.configure/old.configure
-+++ b/build/moz.configure/old.configure
-@@ -94,6 +94,7 @@ def old_configure_options(*options):
+diff -Naur a/build/moz.configure/old.configure
b/build/moz.configure/old.configure
+--- a/build/moz.configure/old.configure 2022-02-02 23:01:47.000000000
+0200
++++ b/build/moz.configure/old.configure 2022-02-08 14:50:27.884361381
+0200
+@@ -94,6 +94,7 @@
@old_configure_options(
"--cache-file",
"--datadir",
-+ "--enable-sndio",
++ "--enable-sndio",
"--enable-official-branding",
"--includedir",
"--libdir",
-diff --git a/media/libcubeb/src/moz.build b/media/libcubeb/src/moz.build
-index 872484c311..28994a693d 100644
---- a/media/libcubeb/src/moz.build
-+++ b/media/libcubeb/src/moz.build
-@@ -46,11 +46,13 @@ if CONFIG['OS_ARCH'] in ('DragonFly', 'FreeBSD',
'SunOS'):
+diff -Naur a/media/libcubeb/src/moz.build b/media/libcubeb/src/moz.build
+--- a/media/libcubeb/src/moz.build 2022-02-02 19:32:39.000000000 +0200
++++ b/media/libcubeb/src/moz.build 2022-02-08 14:52:52.627441128 +0200
+@@ -46,11 +46,13 @@
]
DEFINES['USE_OSS'] = True
@@ -42,15 +27,13 @@ index 872484c311..28994a693d 100644
DEFINES['DISABLE_LIBSNDIO_DLOPEN'] = True
if CONFIG['OS_TARGET'] == 'Darwin':
-diff --git a/old-configure.in b/old-configure.in
-index 1c1c8ecef3..b63dc03cc6 100644
---- a/old-configure.in
-+++ b/old-configure.in
-@@ -2325,6 +2325,23 @@ fi
- AC_SUBST(NECKO_WIFI)
- AC_SUBST(NECKO_WIFI_DBUS)
+diff -Naur a/old-configure.in b/old-configure.in
+--- a/old-configure.in 2022-02-02 23:01:47.000000000 +0200
++++ b/old-configure.in 2022-02-08 14:54:31.843933969 +0200
+@@ -1281,6 +1281,22 @@
+ esac
+ AC_SUBST(MOZ_ENABLE_D3D10_LAYER)
-+
+dnl ==================================
+dnl = Check sndio availability
+dnl ==================================
@@ -70,6 +53,3 @@ index 1c1c8ecef3..b63dc03cc6 100644
dnl ========================================================
dnl =
dnl = Maintainer debug option (no --enable equivalent)
---
-2.34.1
-
diff --git a/http/firefox/patches/0026-Disable-FFVPX-with-VA-API.patch
b/http/firefox/patches/0026-Disable-FFVPX-with-VA-API.patch
new file mode 100644
index 0000000..42d639f
--- /dev/null
+++ b/http/firefox/patches/0026-Disable-FFVPX-with-VA-API.patch
@@ -0,0 +1,91 @@
+From 38068d0801ad85ba36673ab2ad6a53e0fd3ffdde Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi AT gentoo.org>
+Date: Thu, 29 Apr 2021 18:22:48 +0200
+Subject: [PATCH 27/30] Disable FFVPX with VA-API
+
+Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
+---
+ dom/media/platforms/PDMFactory.cpp | 32 +++++++++++++++---------------
+ 1 file changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/dom/media/platforms/PDMFactory.cpp
b/dom/media/platforms/PDMFactory.cpp
+index 9b0342ce82..4e377082ae 100644
+--- a/dom/media/platforms/PDMFactory.cpp
++++ b/dom/media/platforms/PDMFactory.cpp
+@@ -486,12 +486,6 @@ void PDMFactory::CreateRddPDMs() {
+ CreateAndStartupPDM<AppleDecoderModule>();
+ }
+ #endif
+-#ifdef MOZ_FFVPX
+- if (StaticPrefs::media_ffvpx_enabled() &&
+- StaticPrefs::media_rdd_ffvpx_enabled()) {
+- CreateAndStartupPDM<FFVPXRuntimeLinker>();
+- }
+-#endif
+ #ifdef MOZ_FFMPEG
+ if (StaticPrefs::media_ffmpeg_enabled() &&
+ StaticPrefs::media_rdd_ffmpeg_enabled() &&
+@@ -499,6 +493,12 @@ void PDMFactory::CreateRddPDMs() {
+ mFailureFlags += GetFailureFlagBasedOnFFmpegStatus(
+ FFmpegRuntimeLinker::LinkStatusCode());
+ }
++#endif
++#ifdef MOZ_FFVPX
++ if (StaticPrefs::media_ffvpx_enabled() &&
++ StaticPrefs::media_rdd_ffvpx_enabled()) {
++ CreateAndStartupPDM<FFVPXRuntimeLinker>();
++ }
+ #endif
+ CreateAndStartupPDM<AgnosticDecoderModule>();
+ }
+@@ -535,11 +535,6 @@ void PDMFactory::CreateContentPDMs() {
+ CreateAndStartupPDM<OmxDecoderModule>();
+ }
+ #endif
+-#ifdef MOZ_FFVPX
+- if (StaticPrefs::media_ffvpx_enabled()) {
+- CreateAndStartupPDM<FFVPXRuntimeLinker>();
+- }
+-#endif
+ #ifdef MOZ_FFMPEG
+ if (StaticPrefs::media_ffmpeg_enabled() &&
+ !CreateAndStartupPDM<FFmpegRuntimeLinker>()) {
+@@ -547,6 +542,11 @@ void PDMFactory::CreateContentPDMs() {
+ FFmpegRuntimeLinker::LinkStatusCode());
+ }
+ #endif
++#ifdef MOZ_FFVPX
++ if (StaticPrefs::media_ffvpx_enabled()) {
++ CreateAndStartupPDM<FFVPXRuntimeLinker>();
++ }
++#endif
+ #ifdef MOZ_WIDGET_ANDROID
+ if (StaticPrefs::media_android_media_codec_enabled()) {
+ StartupPDM(AndroidDecoderModule::Create(),
+@@ -581,11 +581,6 @@ void PDMFactory::CreateDefaultPDMs() {
+ CreateAndStartupPDM<OmxDecoderModule>();
+ }
+ #endif
+-#ifdef MOZ_FFVPX
+- if (StaticPrefs::media_ffvpx_enabled()) {
+- CreateAndStartupPDM<FFVPXRuntimeLinker>();
+- }
+-#endif
+ #ifdef MOZ_FFMPEG
+ if (StaticPrefs::media_ffmpeg_enabled() &&
+ !CreateAndStartupPDM<FFmpegRuntimeLinker>()) {
+@@ -593,6 +588,11 @@ void PDMFactory::CreateDefaultPDMs() {
+ FFmpegRuntimeLinker::LinkStatusCode());
+ }
+ #endif
++#ifdef MOZ_FFVPX
++ if (StaticPrefs::media_ffvpx_enabled()) {
++ CreateAndStartupPDM<FFVPXRuntimeLinker>();
++ }
++#endif
+ #ifdef MOZ_WIDGET_ANDROID
+ if (StaticPrefs::media_android_media_codec_enabled()) {
+ StartupPDM(AndroidDecoderModule::Create(),
+--
+2.34.1
+
diff --git a/http/firefox/patches/0026-Make-elfhack-use-toolchain.patch
b/http/firefox/patches/0026-Make-elfhack-use-toolchain.patch
deleted file mode 100644
index bd0ebbd..0000000
--- a/http/firefox/patches/0026-Make-elfhack-use-toolchain.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From cc2320222520ceda6578b476b6696aba29f250ac Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi AT gentoo.org>
-Date: Mon, 28 Sep 2020 20:52:24 +0200
-Subject: [PATCH 26/30] Make elfhack use toolchain
-
-Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
----
- build/unix/elfhack/Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/build/unix/elfhack/Makefile.in b/build/unix/elfhack/Makefile.in
-index 57ad54f113..ec991fa648 100644
---- a/build/unix/elfhack/Makefile.in
-+++ b/build/unix/elfhack/Makefile.in
-@@ -21,7 +21,7 @@ test-array$(DLL_SUFFIX) test-ctors$(DLL_SUFFIX):
%$(DLL_SUFFIX): %.$(OBJ_SUFFIX)
- # Fail if the backup file doesn't exist
- [ -f '$@.bak' ]
- # Fail if the new library doesn't contain less relocations
-- [ $$($(READELF) -r $@.bak | wc -l) -gt $$($(READELF) -r $@ | wc -l) ]
-+ [ $$($(TOOLCHAIN_PREFIX)readelf -r $@.bak | wc -l) -gt
$$($(TOOLCHAIN_PREFIX)readelf -r $@ | wc -l) ]
-
- test-array$(DLL_SUFFIX) test-ctors$(DLL_SUFFIX): DSO_SONAME=$@
- test-array$(DLL_SUFFIX): DT_TYPE=INIT_ARRAY
diff --git a/http/firefox/patches/0027-Disable-FFVPX-with-VA-API.patch
b/http/firefox/patches/0027-Disable-FFVPX-with-VA-API.patch
deleted file mode 100644
index 42d639f..0000000
--- a/http/firefox/patches/0027-Disable-FFVPX-with-VA-API.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 38068d0801ad85ba36673ab2ad6a53e0fd3ffdde Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi AT gentoo.org>
-Date: Thu, 29 Apr 2021 18:22:48 +0200
-Subject: [PATCH 27/30] Disable FFVPX with VA-API
-
-Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
----
- dom/media/platforms/PDMFactory.cpp | 32 +++++++++++++++---------------
- 1 file changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/dom/media/platforms/PDMFactory.cpp
b/dom/media/platforms/PDMFactory.cpp
-index 9b0342ce82..4e377082ae 100644
---- a/dom/media/platforms/PDMFactory.cpp
-+++ b/dom/media/platforms/PDMFactory.cpp
-@@ -486,12 +486,6 @@ void PDMFactory::CreateRddPDMs() {
- CreateAndStartupPDM<AppleDecoderModule>();
- }
- #endif
--#ifdef MOZ_FFVPX
-- if (StaticPrefs::media_ffvpx_enabled() &&
-- StaticPrefs::media_rdd_ffvpx_enabled()) {
-- CreateAndStartupPDM<FFVPXRuntimeLinker>();
-- }
--#endif
- #ifdef MOZ_FFMPEG
- if (StaticPrefs::media_ffmpeg_enabled() &&
- StaticPrefs::media_rdd_ffmpeg_enabled() &&
-@@ -499,6 +493,12 @@ void PDMFactory::CreateRddPDMs() {
- mFailureFlags += GetFailureFlagBasedOnFFmpegStatus(
- FFmpegRuntimeLinker::LinkStatusCode());
- }
-+#endif
-+#ifdef MOZ_FFVPX
-+ if (StaticPrefs::media_ffvpx_enabled() &&
-+ StaticPrefs::media_rdd_ffvpx_enabled()) {
-+ CreateAndStartupPDM<FFVPXRuntimeLinker>();
-+ }
- #endif
- CreateAndStartupPDM<AgnosticDecoderModule>();
- }
-@@ -535,11 +535,6 @@ void PDMFactory::CreateContentPDMs() {
- CreateAndStartupPDM<OmxDecoderModule>();
- }
- #endif
--#ifdef MOZ_FFVPX
-- if (StaticPrefs::media_ffvpx_enabled()) {
-- CreateAndStartupPDM<FFVPXRuntimeLinker>();
-- }
--#endif
- #ifdef MOZ_FFMPEG
- if (StaticPrefs::media_ffmpeg_enabled() &&
- !CreateAndStartupPDM<FFmpegRuntimeLinker>()) {
-@@ -547,6 +542,11 @@ void PDMFactory::CreateContentPDMs() {
- FFmpegRuntimeLinker::LinkStatusCode());
- }
- #endif
-+#ifdef MOZ_FFVPX
-+ if (StaticPrefs::media_ffvpx_enabled()) {
-+ CreateAndStartupPDM<FFVPXRuntimeLinker>();
-+ }
-+#endif
- #ifdef MOZ_WIDGET_ANDROID
- if (StaticPrefs::media_android_media_codec_enabled()) {
- StartupPDM(AndroidDecoderModule::Create(),
-@@ -581,11 +581,6 @@ void PDMFactory::CreateDefaultPDMs() {
- CreateAndStartupPDM<OmxDecoderModule>();
- }
- #endif
--#ifdef MOZ_FFVPX
-- if (StaticPrefs::media_ffvpx_enabled()) {
-- CreateAndStartupPDM<FFVPXRuntimeLinker>();
-- }
--#endif
- #ifdef MOZ_FFMPEG
- if (StaticPrefs::media_ffmpeg_enabled() &&
- !CreateAndStartupPDM<FFmpegRuntimeLinker>()) {
-@@ -593,6 +588,11 @@ void PDMFactory::CreateDefaultPDMs() {
- FFmpegRuntimeLinker::LinkStatusCode());
- }
- #endif
-+#ifdef MOZ_FFVPX
-+ if (StaticPrefs::media_ffvpx_enabled()) {
-+ CreateAndStartupPDM<FFVPXRuntimeLinker>();
-+ }
-+#endif
- #ifdef MOZ_WIDGET_ANDROID
- if (StaticPrefs::media_android_media_codec_enabled()) {
- StartupPDM(AndroidDecoderModule::Create(),
---
-2.34.1
-
diff --git
a/http/firefox/patches/0027-Enable-FLAC-on-platforms-without-ffvpx-via-ffmpeg.patch
b/http/firefox/patches/0027-Enable-FLAC-on-platforms-without-ffvpx-via-ffmpeg.patch
new file mode 100644
index 0000000..2c6a271
--- /dev/null
+++
b/http/firefox/patches/0027-Enable-FLAC-on-platforms-without-ffvpx-via-ffmpeg.patch
@@ -0,0 +1,36 @@
+From 58b0385412c6d96eb745e2fc5902df347e629f6d Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi AT gentoo.org>
+Date: Thu, 29 Apr 2021 18:48:06 +0200
+Subject: [PATCH 28/30] Enable FLAC on platforms without ffvpx via ffmpeg
+
+Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
+---
+ dom/media/flac/FlacDecoder.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/dom/media/flac/FlacDecoder.cpp b/dom/media/flac/FlacDecoder.cpp
+index 2f205c9aae..68847b0952 100644
+--- a/dom/media/flac/FlacDecoder.cpp
++++ b/dom/media/flac/FlacDecoder.cpp
+@@ -7,6 +7,7 @@
+ #include "FlacDecoder.h"
+ #include "MediaContainerType.h"
+ #include "mozilla/StaticPrefs_media.h"
++#include "PDMFactory.h"
+
+ namespace mozilla {
+
+@@ -14,6 +15,10 @@ namespace mozilla {
+ bool FlacDecoder::IsEnabled() {
+ #ifdef MOZ_FFVPX
+ return StaticPrefs::media_flac_enabled();
++#elif defined(MOZ_FFMPEG)
++ RefPtr<PDMFactory> platform = new PDMFactory();
++ return StaticPrefs::media_flac_enabled() &&
++ platform->SupportsMimeType("audio/flac"_ns);
+ #else
+ return false;
+ #endif
+--
+2.34.1
+
diff --git
a/http/firefox/patches/0028-Enable-FLAC-on-platforms-without-ffvpx-via-ffmpeg.patch
b/http/firefox/patches/0028-Enable-FLAC-on-platforms-without-ffvpx-via-ffmpeg.patch
deleted file mode 100644
index 2c6a271..0000000
---
a/http/firefox/patches/0028-Enable-FLAC-on-platforms-without-ffvpx-via-ffmpeg.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 58b0385412c6d96eb745e2fc5902df347e629f6d Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi AT gentoo.org>
-Date: Thu, 29 Apr 2021 18:48:06 +0200
-Subject: [PATCH 28/30] Enable FLAC on platforms without ffvpx via ffmpeg
-
-Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
----
- dom/media/flac/FlacDecoder.cpp | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/dom/media/flac/FlacDecoder.cpp b/dom/media/flac/FlacDecoder.cpp
-index 2f205c9aae..68847b0952 100644
---- a/dom/media/flac/FlacDecoder.cpp
-+++ b/dom/media/flac/FlacDecoder.cpp
-@@ -7,6 +7,7 @@
- #include "FlacDecoder.h"
- #include "MediaContainerType.h"
- #include "mozilla/StaticPrefs_media.h"
-+#include "PDMFactory.h"
-
- namespace mozilla {
-
-@@ -14,6 +15,10 @@ namespace mozilla {
- bool FlacDecoder::IsEnabled() {
- #ifdef MOZ_FFVPX
- return StaticPrefs::media_flac_enabled();
-+#elif defined(MOZ_FFMPEG)
-+ RefPtr<PDMFactory> platform = new PDMFactory();
-+ return StaticPrefs::media_flac_enabled() &&
-+ platform->SupportsMimeType("audio/flac"_ns);
- #else
- return false;
- #endif
---
-2.34.1
-
diff --git
a/http/firefox/patches/0028-bmo-1670333-OpenH264-Fix-decoding-if-it-starts-on-no.patch
b/http/firefox/patches/0028-bmo-1670333-OpenH264-Fix-decoding-if-it-starts-on-no.patch
new file mode 100644
index 0000000..856361d
--- /dev/null
+++
b/http/firefox/patches/0028-bmo-1670333-OpenH264-Fix-decoding-if-it-starts-on-no.patch
@@ -0,0 +1,96 @@
+From 0b53fcfa8ee76ccc2d77abb947810f631efaecd9 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi AT gentoo.org>
+Date: Fri, 11 Dec 2020 15:37:38 +0100
+Subject: [PATCH 29/30] bmo#1670333: OpenH264: Fix decoding if it starts on
non
+ IDR I-frame
+
+Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
+---
+ dom/media/mp4/MP4Demuxer.cpp | 8 ++++++++
+ dom/media/platforms/PDMFactory.cpp | 15 ++++++++++-----
+ dom/media/platforms/PDMFactory.h | 2 ++
+ 3 files changed, 20 insertions(+), 5 deletions(-)
+
+diff --git a/dom/media/mp4/MP4Demuxer.cpp b/dom/media/mp4/MP4Demuxer.cpp
+index 59bba16577..0304e3e89f 100644
+--- a/dom/media/mp4/MP4Demuxer.cpp
++++ b/dom/media/mp4/MP4Demuxer.cpp
+@@ -31,6 +31,8 @@ mozilla::LogModule* GetDemuxerLog() { return
gMediaDemuxerLog; }
+ DDMOZ_LOG(gMediaDemuxerLog, mozilla::LogLevel::Debug, "::%s: " arg, \
+ __func__, ##__VA_ARGS__)
+
++extern bool gUseKeyframeFromContainer;
++
+ namespace mozilla {
+
+ DDLoggedTypeDeclNameAndBase(MP4TrackDemuxer, MediaTrackDemuxer);
+@@ -394,6 +396,12 @@ already_AddRefed<MediaRawData>
MP4TrackDemuxer::GetNextSample() {
+ [[fallthrough]];
+ case H264::FrameType::OTHER: {
+ bool keyframe = type == H264::FrameType::I_FRAME;
++ if (gUseKeyframeFromContainer) {
++ if (sample->mKeyframe && sample->mKeyframe != keyframe) {
++ sample->mKeyframe = keyframe;
++ }
++ break;
++ }
+ if (sample->mKeyframe != keyframe) {
+ NS_WARNING(nsPrintfCString("Frame incorrectly marked as
%skeyframe "
+ "@ pts:%" PRId64 " dur:%" PRId64
+diff --git a/dom/media/platforms/PDMFactory.cpp
b/dom/media/platforms/PDMFactory.cpp
+index 4e377082ae..e778eb9948 100644
+--- a/dom/media/platforms/PDMFactory.cpp
++++ b/dom/media/platforms/PDMFactory.cpp
+@@ -58,6 +58,8 @@
+
+ #include <functional>
+
++bool gUseKeyframeFromContainer = false;
++
+ namespace mozilla {
+
+ #define PDM_INIT_LOG(msg, ...) \
+@@ -536,10 +538,12 @@ void PDMFactory::CreateContentPDMs() {
+ }
+ #endif
+ #ifdef MOZ_FFMPEG
+- if (StaticPrefs::media_ffmpeg_enabled() &&
+- !CreateAndStartupPDM<FFmpegRuntimeLinker>()) {
+- mFailureFlags += GetFailureFlagBasedOnFFmpegStatus(
+- FFmpegRuntimeLinker::LinkStatusCode());
++ if (StaticPrefs::media_ffmpeg_enabled()) {
++ mFFmpegUsed = CreateAndStartupPDM<FFmpegRuntimeLinker>();
++ if (!mFFmpegUsed) {
++ mFailureFlags += GetFailureFlagBasedOnFFmpegStatus(
++ FFmpegRuntimeLinker::LinkStatusCode());
++ }
+ }
+ #endif
+ #ifdef MOZ_FFVPX
+@@ -556,8 +560,9 @@ void PDMFactory::CreateContentPDMs() {
+
+ CreateAndStartupPDM<AgnosticDecoderModule>();
+
+- if (StaticPrefs::media_gmp_decoder_enabled() &&
++ if (StaticPrefs::media_gmp_decoder_enabled() && !mFFmpegUsed &&
+ !CreateAndStartupPDM<GMPDecoderModule>()) {
++ gUseKeyframeFromContainer = true;
+ mFailureFlags += DecoderDoctorDiagnostics::Flags::GMPPDMFailedToStartup;
+ }
+ }
+diff --git a/dom/media/platforms/PDMFactory.h
b/dom/media/platforms/PDMFactory.h
+index 4fc81c0b37..72f3255b6f 100644
+--- a/dom/media/platforms/PDMFactory.h
++++ b/dom/media/platforms/PDMFactory.h
+@@ -122,6 +122,8 @@ class PDMFactory final {
+
+ DecoderDoctorDiagnostics::FlagsSet mFailureFlags;
+
++ bool mFFmpegUsed = false;
++
+ friend class RemoteVideoDecoderParent;
+ static void EnsureInit();
+ };
+--
+2.34.1
+
diff --git
a/http/firefox/patches/0029-bmo-1663844-OpenH264-Allow-using-OpenH264-GMP-decode.patch
b/http/firefox/patches/0029-bmo-1663844-OpenH264-Allow-using-OpenH264-GMP-decode.patch
new file mode 100644
index 0000000..130edc4
--- /dev/null
+++
b/http/firefox/patches/0029-bmo-1663844-OpenH264-Allow-using-OpenH264-GMP-decode.patch
@@ -0,0 +1,55 @@
+From 2da8000880fe27908f1b18aba65a1b5e5f479cd8 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi AT gentoo.org>
+Date: Fri, 11 Dec 2020 15:46:25 +0100
+Subject: [PATCH 30/30] bmo#1663844: OpenH264: Allow using OpenH264 GMP
decoder
+ as fallback for video decoding
+
+Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
+---
+ dom/media/gmp/GMPSharedMemManager.h | 2 +-
+ dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp | 2 +-
+ dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp | 2 ++
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/dom/media/gmp/GMPSharedMemManager.h
b/dom/media/gmp/GMPSharedMemManager.h
+index 44c660f6ca..3a2eff3294 100644
+--- a/dom/media/gmp/GMPSharedMemManager.h
++++ b/dom/media/gmp/GMPSharedMemManager.h
+@@ -27,7 +27,7 @@ class GMPSharedMem {
+ // returned to the parent pool (which is not included). If more than
+ // this are needed, we presume the client has either crashed or hung
+ // (perhaps temporarily).
+- static const uint32_t kGMPBufLimit = 20;
++ static const uint32_t kGMPBufLimit = 40;
+
+ GMPSharedMem() {
+ for (size_t i = 0; i < sizeof(mGmpAllocated) / sizeof(mGmpAllocated[0]);
+diff --git a/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp
b/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp
+index 641f52a58b..6bd8235073 100644
+--- a/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp
++++ b/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp
+@@ -82,7 +82,7 @@ bool GMPDecoderModule::SupportsMimeType(const nsACString&
aMimeType,
+
+ bool GMPDecoderModule::SupportsMimeType(
+ const nsACString& aMimeType, DecoderDoctorDiagnostics* aDiagnostics)
const {
+- return false;
++ return MP4Decoder::IsH264(aMimeType);
+ }
+
+ /* static */
+diff --git a/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp
b/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp
+index c73bf38be6..0d521d5d7b 100644
+--- a/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp
++++ b/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp
+@@ -69,6 +69,8 @@ void GMPVideoDecoder::Decoded(GMPVideoi420Frame*
aDecodedFrame) {
+ RefPtr<GMPVideoDecoder> self = this;
+ if (v) {
+ mDecodedData.AppendElement(std::move(v));
++ mDecodePromise.ResolveIfExists(std::move(mDecodedData), __func__);
++ mDecodedData = DecodedData();
+ } else {
+ mDecodedData.Clear();
+ mDecodePromise.RejectIfExists(
+--
+2.34.1
+
diff --git
a/http/firefox/patches/0029-bmo-1670333-OpenH264-Fix-decoding-if-it-starts-on-no.patch
b/http/firefox/patches/0029-bmo-1670333-OpenH264-Fix-decoding-if-it-starts-on-no.patch
deleted file mode 100644
index 856361d..0000000
---
a/http/firefox/patches/0029-bmo-1670333-OpenH264-Fix-decoding-if-it-starts-on-no.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 0b53fcfa8ee76ccc2d77abb947810f631efaecd9 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi AT gentoo.org>
-Date: Fri, 11 Dec 2020 15:37:38 +0100
-Subject: [PATCH 29/30] bmo#1670333: OpenH264: Fix decoding if it starts on
non
- IDR I-frame
-
-Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
----
- dom/media/mp4/MP4Demuxer.cpp | 8 ++++++++
- dom/media/platforms/PDMFactory.cpp | 15 ++++++++++-----
- dom/media/platforms/PDMFactory.h | 2 ++
- 3 files changed, 20 insertions(+), 5 deletions(-)
-
-diff --git a/dom/media/mp4/MP4Demuxer.cpp b/dom/media/mp4/MP4Demuxer.cpp
-index 59bba16577..0304e3e89f 100644
---- a/dom/media/mp4/MP4Demuxer.cpp
-+++ b/dom/media/mp4/MP4Demuxer.cpp
-@@ -31,6 +31,8 @@ mozilla::LogModule* GetDemuxerLog() { return
gMediaDemuxerLog; }
- DDMOZ_LOG(gMediaDemuxerLog, mozilla::LogLevel::Debug, "::%s: " arg, \
- __func__, ##__VA_ARGS__)
-
-+extern bool gUseKeyframeFromContainer;
-+
- namespace mozilla {
-
- DDLoggedTypeDeclNameAndBase(MP4TrackDemuxer, MediaTrackDemuxer);
-@@ -394,6 +396,12 @@ already_AddRefed<MediaRawData>
MP4TrackDemuxer::GetNextSample() {
- [[fallthrough]];
- case H264::FrameType::OTHER: {
- bool keyframe = type == H264::FrameType::I_FRAME;
-+ if (gUseKeyframeFromContainer) {
-+ if (sample->mKeyframe && sample->mKeyframe != keyframe) {
-+ sample->mKeyframe = keyframe;
-+ }
-+ break;
-+ }
- if (sample->mKeyframe != keyframe) {
- NS_WARNING(nsPrintfCString("Frame incorrectly marked as
%skeyframe "
- "@ pts:%" PRId64 " dur:%" PRId64
-diff --git a/dom/media/platforms/PDMFactory.cpp
b/dom/media/platforms/PDMFactory.cpp
-index 4e377082ae..e778eb9948 100644
---- a/dom/media/platforms/PDMFactory.cpp
-+++ b/dom/media/platforms/PDMFactory.cpp
-@@ -58,6 +58,8 @@
-
- #include <functional>
-
-+bool gUseKeyframeFromContainer = false;
-+
- namespace mozilla {
-
- #define PDM_INIT_LOG(msg, ...) \
-@@ -536,10 +538,12 @@ void PDMFactory::CreateContentPDMs() {
- }
- #endif
- #ifdef MOZ_FFMPEG
-- if (StaticPrefs::media_ffmpeg_enabled() &&
-- !CreateAndStartupPDM<FFmpegRuntimeLinker>()) {
-- mFailureFlags += GetFailureFlagBasedOnFFmpegStatus(
-- FFmpegRuntimeLinker::LinkStatusCode());
-+ if (StaticPrefs::media_ffmpeg_enabled()) {
-+ mFFmpegUsed = CreateAndStartupPDM<FFmpegRuntimeLinker>();
-+ if (!mFFmpegUsed) {
-+ mFailureFlags += GetFailureFlagBasedOnFFmpegStatus(
-+ FFmpegRuntimeLinker::LinkStatusCode());
-+ }
- }
- #endif
- #ifdef MOZ_FFVPX
-@@ -556,8 +560,9 @@ void PDMFactory::CreateContentPDMs() {
-
- CreateAndStartupPDM<AgnosticDecoderModule>();
-
-- if (StaticPrefs::media_gmp_decoder_enabled() &&
-+ if (StaticPrefs::media_gmp_decoder_enabled() && !mFFmpegUsed &&
- !CreateAndStartupPDM<GMPDecoderModule>()) {
-+ gUseKeyframeFromContainer = true;
- mFailureFlags += DecoderDoctorDiagnostics::Flags::GMPPDMFailedToStartup;
- }
- }
-diff --git a/dom/media/platforms/PDMFactory.h
b/dom/media/platforms/PDMFactory.h
-index 4fc81c0b37..72f3255b6f 100644
---- a/dom/media/platforms/PDMFactory.h
-+++ b/dom/media/platforms/PDMFactory.h
-@@ -122,6 +122,8 @@ class PDMFactory final {
-
- DecoderDoctorDiagnostics::FlagsSet mFailureFlags;
-
-+ bool mFFmpegUsed = false;
-+
- friend class RemoteVideoDecoderParent;
- static void EnsureInit();
- };
---
-2.34.1
-
diff --git a/http/firefox/patches/0030-bgo-816975-fix-build-on-x86.patch
b/http/firefox/patches/0030-bgo-816975-fix-build-on-x86.patch
new file mode 100644
index 0000000..4b2289f
--- /dev/null
+++ b/http/firefox/patches/0030-bgo-816975-fix-build-on-x86.patch
@@ -0,0 +1,16 @@
+diff --git a/modules/fdlibm/src/math_private.h
b/modules/fdlibm/src/math_private.h
+index 51d79f9c2ec59..fafd7d6fc1e0d 100644
+--- a/modules/fdlibm/src/math_private.h
++++ b/modules/fdlibm/src/math_private.h
+@@ -30,7 +30,11 @@
+ * Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t
+ */
+
++#if defined __FLT_EVAL_METHOD__ && (__FLT_EVAL_METHOD__ == 2)
++typedef long double __double_t;
++#else
+ typedef double __double_t;
++#endif
+ typedef __double_t double_t;
+
+ /*
diff --git
a/http/firefox/patches/0030-bmo-1663844-OpenH264-Allow-using-OpenH264-GMP-decode.patch
b/http/firefox/patches/0030-bmo-1663844-OpenH264-Allow-using-OpenH264-GMP-decode.patch
deleted file mode 100644
index 130edc4..0000000
---
a/http/firefox/patches/0030-bmo-1663844-OpenH264-Allow-using-OpenH264-GMP-decode.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 2da8000880fe27908f1b18aba65a1b5e5f479cd8 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi AT gentoo.org>
-Date: Fri, 11 Dec 2020 15:46:25 +0100
-Subject: [PATCH 30/30] bmo#1663844: OpenH264: Allow using OpenH264 GMP
decoder
- as fallback for video decoding
-
-Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
----
- dom/media/gmp/GMPSharedMemManager.h | 2 +-
- dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp | 2 +-
- dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp | 2 ++
- 3 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/dom/media/gmp/GMPSharedMemManager.h
b/dom/media/gmp/GMPSharedMemManager.h
-index 44c660f6ca..3a2eff3294 100644
---- a/dom/media/gmp/GMPSharedMemManager.h
-+++ b/dom/media/gmp/GMPSharedMemManager.h
-@@ -27,7 +27,7 @@ class GMPSharedMem {
- // returned to the parent pool (which is not included). If more than
- // this are needed, we presume the client has either crashed or hung
- // (perhaps temporarily).
-- static const uint32_t kGMPBufLimit = 20;
-+ static const uint32_t kGMPBufLimit = 40;
-
- GMPSharedMem() {
- for (size_t i = 0; i < sizeof(mGmpAllocated) / sizeof(mGmpAllocated[0]);
-diff --git a/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp
b/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp
-index 641f52a58b..6bd8235073 100644
---- a/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp
-+++ b/dom/media/platforms/agnostic/gmp/GMPDecoderModule.cpp
-@@ -82,7 +82,7 @@ bool GMPDecoderModule::SupportsMimeType(const nsACString&
aMimeType,
-
- bool GMPDecoderModule::SupportsMimeType(
- const nsACString& aMimeType, DecoderDoctorDiagnostics* aDiagnostics)
const {
-- return false;
-+ return MP4Decoder::IsH264(aMimeType);
- }
-
- /* static */
-diff --git a/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp
b/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp
-index c73bf38be6..0d521d5d7b 100644
---- a/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp
-+++ b/dom/media/platforms/agnostic/gmp/GMPVideoDecoder.cpp
-@@ -69,6 +69,8 @@ void GMPVideoDecoder::Decoded(GMPVideoi420Frame*
aDecodedFrame) {
- RefPtr<GMPVideoDecoder> self = this;
- if (v) {
- mDecodedData.AppendElement(std::move(v));
-+ mDecodePromise.ResolveIfExists(std::move(mDecodedData), __func__);
-+ mDecodedData = DecodedData();
- } else {
- mDecodedData.Clear();
- mDecodePromise.RejectIfExists(
---
-2.34.1
-
diff --git
a/http/firefox/patches/0031-bgo-831903-pip-dont-fail-with-optional-deps.patch
b/http/firefox/patches/0031-bgo-831903-pip-dont-fail-with-optional-deps.patch
new file mode 100644
index 0000000..85e9082
--- /dev/null
+++
b/http/firefox/patches/0031-bgo-831903-pip-dont-fail-with-optional-deps.patch
@@ -0,0 +1,14 @@
+diff -Naur a/python/mach/mach/site.py b/python/mach/mach/site.py
+--- a/python/mach/mach/site.py 2022-01-20 00:44:27.000000000 +0200
++++ b/python/mach/mach/site.py 2022-01-24 08:45:34.705599229 +0200
+@@ -797,10 +797,6 @@
+
+ if not result.has_all_packages:
+ print(result.report())
+- raise Exception(
+- f'The Python packages associated with "{self.python_path}"
aren\'t '
+- f'compatible with the "{virtualenv_name}" virtualenv'
+- )
+
+ return result.provides_any_package
+
diff --git a/http/firefox/patches/0032-skip-pip-check.patch
b/http/firefox/patches/0032-skip-pip-check.patch
new file mode 100644
index 0000000..dba1056
--- /dev/null
+++ b/http/firefox/patches/0032-skip-pip-check.patch
@@ -0,0 +1,14 @@
+diff --git a/python/mach/mach/site.py b/python/mach/mach/site.py
+index 8fef9bfaf8..61c3101c11 100644
+--- a/python/mach/mach/site.py
++++ b/python/mach/mach/site.py
+@@ -940,6 +940,9 @@ def _assert_pip_check(topsrcdir, pthfile_lines,
virtualenv_name):
+ If there's an incompatibility, raise an exception and allow it to
bubble up since
+ it will require user intervention to resolve.
+ """
++
++ return True
++
+ if os.environ.get(
+
f"MACH_SYSTEM_ASSERTED_COMPATIBLE_WITH_{virtualenv_name.upper()}_SITE", None
+ ):
diff --git a/http/firefox/patches/0033-resolve-fs-symlinks-bmo1753182.patch
b/http/firefox/patches/0033-resolve-fs-symlinks-bmo1753182.patch
new file mode 100644
index 0000000..60ad078
--- /dev/null
+++ b/http/firefox/patches/0033-resolve-fs-symlinks-bmo1753182.patch
@@ -0,0 +1,18 @@
+diff --git a/build/moz.configure/init.configure
b/build/moz.configure/init.configure
+--- a/build/moz.configure/init.configure
++++ b/build/moz.configure/init.configure
+@@ -136,11 +136,12 @@
+ @checking("for Python 3", callback=lambda x: "%s (%s)" % (x.path,
x.str_version))
+ @imports("sys")
+ @imports(_from="mach.site", _import="PythonVirtualenv")
++@imports(_from="os.path", _import="realpath")
+ def virtualenv_python3():
+ return namespace(
+ # sys.executable is currently not updated for in-process
activations. However,
+ # sys.prefix is, so we can calculate the python executable's path
from there.
+- path=normsep(PythonVirtualenv(sys.prefix).python_path),
++ path=normsep(PythonVirtualenv(realpath(sys.prefix)).python_path),
+ str_version=".".join(str(i) for i in sys.version_info[0:3]),
+ )
+
+
- [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (054f325131ec0249dd8b5ec17058e473316c1882), Pavel Vinogradov, 03/07/2022
Archive powered by MHonArc 2.6.24.