Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (1b4e312adad62be7d5d988c886df52144804f827)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (1b4e312adad62be7d5d988c886df52144804f827)
  • Date: Mon, 25 Nov 2024 19:03:45 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

http/firefox/DEPENDS | 2
http/firefox/DETAILS | 4
http/firefox/HISTORY | 5
http/firefox/patches/0011-bmo-1196777-Set-GDK_FOCUS_CHANGE_MASK.patch | 13
http/firefox/patches/0019-bmo-1559213-support-system-av1.patch | 442
----------
5 files changed, 8 insertions(+), 458 deletions(-)

New commits:
commit 1b4e312adad62be7d5d988c886df52144804f827
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

http/firefox: version 133.0, SECURITY_PATCH++

diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index cb5e902..ff3338eb 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -51,7 +51,7 @@ depends libwebp "--with-system-webp"
&&

depends nspr "--with-system-nspr" &&

-local NSS_BRANCH="3.105" &&
+local NSS_BRANCH="3.106" &&
if spell_ok nss &&
is_version_less "$(installed_version nss)" "${NSS_BRANCH}"; then
depends -sub "${NSS_BRANCH}" nss "--with-system-nss"
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 8cceae0..bae4513 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,6 +1,6 @@
SPELL=firefox
- VERSION=132.0.2
- SECURITY_PATCH=200
+ VERSION=133.0
+ SECURITY_PATCH=201
SOURCE="${SPELL}-${VERSION}.source.tar.xz"
# Watch: http://releases.mozilla.org/pub/firefox/releases/
/releases/([0-9.]+)/

SOURCE_URL[0]="http://releases.mozilla.org/pub/${SPELL}/releases/${VERSION}/source/${SOURCE}";
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 7cd2257..8dac240 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,8 @@
+2024-11-25 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 133.0, SECURITY_PATCH++
+ * DEPENDS: nss >= 3.106
+ * patches/*: updated
+
2024-11-17 Pavel Vinogradov <public AT sourcemage.org>
* patches/*: updated

diff --git
a/http/firefox/patches/0011-bmo-1196777-Set-GDK_FOCUS_CHANGE_MASK.patch
b/http/firefox/patches/0011-bmo-1196777-Set-GDK_FOCUS_CHANGE_MASK.patch
deleted file mode 100644
index 864741e..0000000
--- a/http/firefox/patches/0011-bmo-1196777-Set-GDK_FOCUS_CHANGE_MASK.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up firefox-100.0/widget/gtk/nsWindow.cpp.1196777
firefox-100.0/widget/gtk/nsWindow.cpp
---- firefox-100.0/widget/gtk/nsWindow.cpp.1196777 2022-05-02
11:29:06.763325015 +0200
-+++ firefox-100.0/widget/gtk/nsWindow.cpp 2022-05-02 11:30:49.100717334
+0200
-@@ -163,7 +163,8 @@ const gint kEvents = GDK_TOUCHPAD_GESTUR
- GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
- GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
- GDK_SMOOTH_SCROLL_MASK | GDK_TOUCH_MASK |
GDK_SCROLL_MASK |
-- GDK_POINTER_MOTION_MASK | GDK_PROPERTY_CHANGE_MASK;
-+ GDK_POINTER_MOTION_MASK | GDK_PROPERTY_CHANGE_MASK |
-+ GDK_FOCUS_CHANGE_MASK;
-
- /* utility functions */
- static bool is_mouse_in_window(GdkWindow* aWindow, gdouble aMouseX,
diff --git a/http/firefox/patches/0019-bmo-1559213-support-system-av1.patch
b/http/firefox/patches/0019-bmo-1559213-support-system-av1.patch
deleted file mode 100644
index 8c69500..0000000
--- a/http/firefox/patches/0019-bmo-1559213-support-system-av1.patch
+++ /dev/null
@@ -1,442 +0,0 @@
-diff --git a/config/external/moz.build b/config/external/moz.build
---- a/config/external/moz.build
-+++ b/config/external/moz.build
-@@ -37,11 +37,11 @@
- external_dirs += ["media/libvorbis"]
-
- if not CONFIG["MOZ_SYSTEM_LIBVPX"]:
- external_dirs += ["media/libvpx"]
-
--if CONFIG["MOZ_AV1"]:
-+if CONFIG["MOZ_AV1"] and not CONFIG["MOZ_SYSTEM_AV1"]:
- external_dirs += ["media/libaom"]
- external_dirs += ["media/libdav1d"]
-
- if not CONFIG["MOZ_SYSTEM_PNG"]:
- external_dirs += ["media/libpng"]
-diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild
---- a/config/system-headers.mozbuild
-+++ b/config/system-headers.mozbuild
-@@ -1302,10 +1302,15 @@
- if CONFIG["MOZ_ENABLE_LIBPROXY"]:
- system_headers += [
- "proxy.h",
- ]
-
-+if CONFIG["MOZ_SYSTEM_AV1"]:
-+ system_headers += [
-+ "dav1d/dav1d.h",
-+ ]
-+
- if CONFIG["MOZ_SYSTEM_ICU"]:
- system_headers += [
- "unicode/calendar.h",
- "unicode/datefmt.h",
- "unicode/dtfmtsym.h",
-diff --git a/dom/media/ipc/moz.build b/dom/media/ipc/moz.build
---- a/dom/media/ipc/moz.build
-+++ b/dom/media/ipc/moz.build
-@@ -73,10 +73,16 @@
- ]
- LOCAL_INCLUDES += [
- "../platforms/wmf",
- ]
-
-+if CONFIG["MOZ_AV1"] and CONFIG["MOZ_SYSTEM_AV1"]:
-+ CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
-+ OS_LIBS += CONFIG["MOZ_SYSTEM_LIBAOM_LIBS"]
-+ CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBDAV1D_CFLAGS"]
-+ OS_LIBS += CONFIG["MOZ_SYSTEM_LIBDAV1D_LIBS"]
-+
- if CONFIG["MOZ_WMF_CDM"]:
- IPDL_SOURCES += [
- "PMFCDM.ipdl",
- ]
- EXPORTS.mozilla += [
-diff --git a/dom/media/moz.build b/dom/media/moz.build
---- a/dom/media/moz.build
-+++ b/dom/media/moz.build
-@@ -57,10 +57,16 @@
- "webrtc",
- "webspeech",
- "webvtt",
- ]
-
-+if CONFIG["MOZ_AV1"] and CONFIG["MOZ_SYSTEM_AV1"]:
-+ CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
-+ OS_LIBS += CONFIG["MOZ_SYSTEM_LIBAOM_LIBS"]
-+ CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBDAV1D_CFLAGS"]
-+ OS_LIBS += CONFIG["MOZ_SYSTEM_LIBDAV1D_LIBS"]
-+
- if CONFIG["MOZ_ANDROID_HLS_SUPPORT"]:
- DIRS += ["hls"]
-
- if CONFIG["MOZ_WEBRTC"]:
- DIRS += ["bridge"]
-diff --git a/dom/media/mp4/moz.build b/dom/media/mp4/moz.build
---- a/dom/media/mp4/moz.build
-+++ b/dom/media/mp4/moz.build
-@@ -33,10 +33,12 @@
- "SampleIterator.cpp",
- "SinfParser.cpp",
- ]
-
- FINAL_LIBRARY = "xul"
-+if CONFIG["MOZ_AV1"] and CONFIG["MOZ_SYSTEM_AV1"]:
-+ CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
-
- # Suppress warnings for now.
- CXXFLAGS += [
- "-Wno-sign-compare",
- ]
-diff --git a/dom/media/platforms/agnostic/eme/moz.build
b/dom/media/platforms/agnostic/eme/moz.build
---- a/dom/media/platforms/agnostic/eme/moz.build
-+++ b/dom/media/platforms/agnostic/eme/moz.build
-@@ -15,8 +15,11 @@
- "ChromiumCDMVideoDecoder.cpp",
- "EMEDecoderModule.cpp",
- "SamplesWaitingForKey.cpp",
- ]
-
-+if CONFIG["MOZ_AV1"] and CONFIG["MOZ_SYSTEM_AV1"]:
-+ CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
-+
- include("/ipc/chromium/chromium-config.mozbuild")
-
- FINAL_LIBRARY = "xul"
-diff --git a/dom/media/platforms/agnostic/gmp/moz.build
b/dom/media/platforms/agnostic/gmp/moz.build
---- a/dom/media/platforms/agnostic/gmp/moz.build
-+++ b/dom/media/platforms/agnostic/gmp/moz.build
-@@ -6,10 +6,13 @@
-
- LOCAL_INCLUDES += [
- "/dom/media/gmp", # for GMPLog.h,
- ]
-
-+if CONFIG["MOZ_AV1"] and CONFIG["MOZ_SYSTEM_AV1"]:
-+ CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
-+
- EXPORTS += [
- "GMPDecoderModule.h",
- "GMPEncoderModule.h",
- "GMPVideoDecoder.h",
- "GMPVideoEncoder.h",
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg57/moz.build
b/dom/media/platforms/ffmpeg/ffmpeg57/moz.build
---- a/dom/media/platforms/ffmpeg/ffmpeg57/moz.build
-+++ b/dom/media/platforms/ffmpeg/ffmpeg57/moz.build
-@@ -30,10 +30,13 @@
- '-Wno-attributes',
- ]
-
- include("/ipc/chromium/chromium-config.mozbuild")
-
-+if CONFIG["MOZ_AV1"] and CONFIG["MOZ_SYSTEM_AV1"]:
-+ CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
-+
- LOCAL_INCLUDES += [
- "/media/libyuv/libyuv/include",
- ]
-
- FINAL_LIBRARY = 'xul'
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg58/moz.build
b/dom/media/platforms/ffmpeg/ffmpeg58/moz.build
---- a/dom/media/platforms/ffmpeg/ffmpeg58/moz.build
-+++ b/dom/media/platforms/ffmpeg/ffmpeg58/moz.build
-@@ -38,10 +38,13 @@
- USE_LIBS += ['mozva']
- DEFINES['MOZ_USE_HWDECODE'] = 1
-
- include("/ipc/chromium/chromium-config.mozbuild")
-
-+if CONFIG["MOZ_AV1"] and CONFIG["MOZ_SYSTEM_AV1"]:
-+ CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
-+
- LOCAL_INCLUDES += [
- "/media/libyuv/libyuv/include",
- ]
-
- FINAL_LIBRARY = 'xul'
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/moz.build
b/dom/media/platforms/ffmpeg/ffmpeg59/moz.build
---- a/dom/media/platforms/ffmpeg/ffmpeg59/moz.build
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/moz.build
-@@ -38,10 +38,13 @@
- USE_LIBS += ["mozva"]
- DEFINES["MOZ_USE_HWDECODE"] = 1
-
- include("/ipc/chromium/chromium-config.mozbuild")
-
-+if CONFIG["MOZ_AV1"] and CONFIG["MOZ_SYSTEM_AV1"]:
-+ CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
-+
- LOCAL_INCLUDES += [
- "/media/libyuv/libyuv/include",
- ]
-
- FINAL_LIBRARY = "xul"
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg60/moz.build
b/dom/media/platforms/ffmpeg/ffmpeg60/moz.build
---- a/dom/media/platforms/ffmpeg/ffmpeg60/moz.build
-+++ b/dom/media/platforms/ffmpeg/ffmpeg60/moz.build
-@@ -36,10 +36,13 @@
- UNIFIED_SOURCES += ["../FFmpegVideoFramePool.cpp"]
- LOCAL_INCLUDES += ["/third_party/drm/drm/include/libdrm/"]
- USE_LIBS += ["mozva"]
- DEFINES["MOZ_USE_HWDECODE"] = 1
-
-+if CONFIG["MOZ_AV1"] and CONFIG["MOZ_SYSTEM_AV1"]:
-+ CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
-+
- include("/ipc/chromium/chromium-config.mozbuild")
-
- LOCAL_INCLUDES += [
- "/media/libyuv/libyuv/include",
- ]
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg61/moz.build
b/dom/media/platforms/ffmpeg/ffmpeg61/moz.build
---- a/dom/media/platforms/ffmpeg/ffmpeg61/moz.build
-+++ b/dom/media/platforms/ffmpeg/ffmpeg61/moz.build
-@@ -38,10 +38,13 @@
- USE_LIBS += ["mozva"]
- DEFINES["MOZ_USE_HWDECODE"] = 1
-
- include("/ipc/chromium/chromium-config.mozbuild")
-
-+if CONFIG["MOZ_AV1"] and CONFIG["MOZ_SYSTEM_AV1"]:
-+ CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
-+
- LOCAL_INCLUDES += [
- "/media/libyuv/libyuv/include",
- ]
-
- FINAL_LIBRARY = "xul"
-diff --git a/dom/media/platforms/ffmpeg/libav53/moz.build
b/dom/media/platforms/ffmpeg/libav53/moz.build
---- a/dom/media/platforms/ffmpeg/libav53/moz.build
-+++ b/dom/media/platforms/ffmpeg/libav53/moz.build
-@@ -24,8 +24,11 @@
- if CONFIG['CC_TYPE'] == 'clang':
- CXXFLAGS += [
- '-Wno-unknown-attributes',
- ]
-
-+if CONFIG["MOZ_AV1"] and CONFIG["MOZ_SYSTEM_AV1"]:
-+ CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
-+
- LOCAL_INCLUDES += [
- "/media/libyuv/libyuv/include",
- ]
-diff --git a/dom/media/platforms/ffmpeg/libav54/moz.build
b/dom/media/platforms/ffmpeg/libav54/moz.build
---- a/dom/media/platforms/ffmpeg/libav54/moz.build
-+++ b/dom/media/platforms/ffmpeg/libav54/moz.build
-@@ -24,8 +24,11 @@
- if CONFIG['CC_TYPE'] == 'clang':
- CXXFLAGS += [
- '-Wno-unknown-attributes',
- ]
-
-+if CONFIG["MOZ_AV1"] and CONFIG["MOZ_SYSTEM_AV1"]:
-+ CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
-+
- LOCAL_INCLUDES += [
- "/media/libyuv/libyuv/include",
- ]
-diff --git a/dom/media/platforms/ffmpeg/libav55/moz.build
b/dom/media/platforms/ffmpeg/libav55/moz.build
---- a/dom/media/platforms/ffmpeg/libav55/moz.build
-+++ b/dom/media/platforms/ffmpeg/libav55/moz.build
-@@ -30,8 +30,11 @@
- '-Wno-attributes',
- ]
-
- FINAL_LIBRARY = 'xul'
-
-+if CONFIG["MOZ_AV1"] and CONFIG["MOZ_SYSTEM_AV1"]:
-+ CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
-+
- LOCAL_INCLUDES += [
- "/media/libyuv/libyuv/include",
- ]
-diff --git a/dom/media/platforms/ffmpeg/moz.build
b/dom/media/platforms/ffmpeg/moz.build
---- a/dom/media/platforms/ffmpeg/moz.build
-+++ b/dom/media/platforms/ffmpeg/moz.build
-@@ -22,10 +22,13 @@
- UNIFIED_SOURCES += ["FFmpegRuntimeLinker.cpp"]
-
- if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
- include("/ipc/chromium/chromium-config.mozbuild")
-
-+if CONFIG["MOZ_AV1"] and CONFIG["MOZ_SYSTEM_AV1"]:
-+ CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
-+
- LOCAL_INCLUDES += [
- "/media/libyuv/libyuv/include",
- ]
-
- FINAL_LIBRARY = "xul"
-diff --git a/dom/media/platforms/moz.build b/dom/media/platforms/moz.build
---- a/dom/media/platforms/moz.build
-+++ b/dom/media/platforms/moz.build
-@@ -69,10 +69,15 @@
- ]
- UNIFIED_SOURCES += [
- "agnostic/AOMDecoder.cpp",
- "agnostic/DAV1DDecoder.cpp",
- ]
-+ if CONFIG["MOZ_SYSTEM_AV1"]:
-+ CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
-+ OS_LIBS += CONFIG["MOZ_SYSTEM_LIBAOM_LIBS"]
-+ CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBDAV1D_CFLAGS"]
-+ OS_LIBS += CONFIG["MOZ_SYSTEM_LIBDAV1D_LIBS"]
-
- if CONFIG["MOZ_OMX"]:
- EXPORTS += [
- "omx/OmxCoreLibLinker.h",
- ]
-diff --git a/dom/media/systemservices/moz.build
b/dom/media/systemservices/moz.build
---- a/dom/media/systemservices/moz.build
-+++ b/dom/media/systemservices/moz.build
-@@ -63,10 +63,13 @@
- CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
-
- if CONFIG["OS_TARGET"] == "Android":
- DEFINES["WEBRTC_ANDROID"] = True
-
-+if CONFIG["MOZ_AV1"] and CONFIG["MOZ_SYSTEM_AV1"]:
-+ CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
-+
- if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa":
- UNIFIED_SOURCES += ["OSXRunLoopSingleton.cpp"]
- EXPORTS += ["OSXRunLoopSingleton.h"]
-
- EXPORTS.mozilla += [
-diff --git a/dom/media/webaudio/moz.build b/dom/media/webaudio/moz.build
---- a/dom/media/webaudio/moz.build
-+++ b/dom/media/webaudio/moz.build
-@@ -145,7 +145,10 @@
- CONFIG["SSE4_2_FLAGS"] + CONFIG["FMA_FLAGS"]
- )
-
- include("/ipc/chromium/chromium-config.mozbuild")
-
-+if CONFIG["MOZ_AV1"] and CONFIG["MOZ_SYSTEM_AV1"]:
-+ CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
-+
- FINAL_LIBRARY = "xul"
- LOCAL_INCLUDES += [".."]
-diff --git a/dom/media/webm/moz.build b/dom/media/webm/moz.build
---- a/dom/media/webm/moz.build
-+++ b/dom/media/webm/moz.build
-@@ -19,10 +19,12 @@
- "WebMDemuxer.cpp",
- "WebMWriter.cpp",
- ]
-
- CXXFLAGS += CONFIG["MOZ_LIBVPX_CFLAGS"]
-+if CONFIG["MOZ_AV1"] and CONFIG["MOZ_SYSTEM_AV1"]:
-+ CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
-
- FINAL_LIBRARY = "xul"
-
- # Add libFuzzer configuration directives
- include("/tools/fuzzing/libfuzzer-config.mozbuild")
-diff --git a/image/decoders/moz.build b/image/decoders/moz.build
---- a/image/decoders/moz.build
-+++ b/image/decoders/moz.build
-@@ -39,10 +39,13 @@
- if CONFIG["MOZ_JXL"]:
- UNIFIED_SOURCES += [
- "nsJXLDecoder.cpp",
- ]
-
-+if CONFIG["MOZ_AV1"] and CONFIG["MOZ_SYSTEM_AV1"]:
-+ CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
-+
- include("/ipc/chromium/chromium-config.mozbuild")
-
- LOCAL_INCLUDES += [
- # Access to Skia headers for Downscaler.
- "/gfx/2d",
-diff --git a/image/moz.build b/image/moz.build
---- a/image/moz.build
-+++ b/image/moz.build
-@@ -137,7 +137,10 @@
- "/xpcom/threads",
- ]
-
- LOCAL_INCLUDES += CONFIG["SKIA_INCLUDES"]
-
-+if CONFIG["MOZ_AV1"] and CONFIG["MOZ_SYSTEM_AV1"]:
-+ CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
-+
- # Add libFuzzer configuration directives
- include("/tools/fuzzing/libfuzzer-config.mozbuild")
-diff --git a/media/ffvpx/libavcodec/moz.build
b/media/ffvpx/libavcodec/moz.build
---- a/media/ffvpx/libavcodec/moz.build
-+++ b/media/ffvpx/libavcodec/moz.build
-@@ -117,14 +117,18 @@
- 'vp9mvs.c',
- 'vp9prob.c',
- 'vp9recon.c',
- 'vpx_rac.c',
- ]
-- USE_LIBS += [
-- 'dav1d',
-- 'media_libdav1d_asm',
-- ]
-+ 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',
-+ ]
- if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
- LOCAL_INCLUDES += ['/media/mozva']
- SOURCES += [
- 'vaapi_av1.c',
- 'vaapi_decode.c',
-diff --git a/toolkit/moz.configure b/toolkit/moz.configure
---- a/toolkit/moz.configure
-+++ b/toolkit/moz.configure
-@@ -862,26 +862,38 @@
- def av1(value):
- if value:
- return True
-
-
--@depends(target, when=av1 & compile_environment)
--def dav1d_asm(target):
-- if target.cpu in ("arm", "aarch64", "x86", "x86_64"):
-+option("--with-system-av1", help="Use system av1 (located with pkg-config)")
-+
-+system_libaom_info = pkg_check_modules(
-+ "MOZ_SYSTEM_LIBAOM", "aom >= 1.0.0", when="--with-system-av1"
-+)
-+
-+system_libdav1d_info = pkg_check_modules(
-+ "MOZ_SYSTEM_LIBDAV1D", "dav1d >= 0.1.1", when="--with-system-av1"
-+)
-+
-+
-+@depends(target, "--with-system-av1", when=av1 & compile_environment)
-+def dav1d_asm(target, system_av1):
-+ if not system_av1 and target.cpu in ("arm", "aarch64", "x86", "x86_64"):
- return True
-
-
--@depends(target, when=av1 & compile_environment)
--def dav1d_nasm(target):
-- if target.cpu in ("x86", "x86_64"):
-+@depends(target, "--with-system-av1", when=av1 & compile_environment)
-+def dav1d_nasm(target, system_av1):
-+ if not system_av1 and target.cpu in ("x86", "x86_64"):
- return namespace(version="2.14", what="AV1")
-
-
- 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", True, when="--with-system-av1")
-
- # JXL Image Codec Support
- # ==============================================================
- option("--disable-jxl", help="Disable jxl image support")
-
-


  • [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (1b4e312adad62be7d5d988c886df52144804f827), Pavel Vinogradov, 11/25/2024

Archive powered by MHonArc 2.6.24.

Top of Page