git: ca8fb53dcf4d - main - www/waterfox: Update 6.6.12 => 6.6.13
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 20 May 2026 14:50:06 UTC
The branch main has been updated by vvd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=ca8fb53dcf4d3969a62d4d2f71ff6c2f3f39551d
commit ca8fb53dcf4d3969a62d4d2f71ff6c2f3f39551d
Author: Martin Filla <freebsd@sysctl.cz>
AuthorDate: 2026-05-20 14:47:23 +0000
Commit: Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2026-05-20 14:47:23 +0000
www/waterfox: Update 6.6.12 => 6.6.13
Release Notes:
https://www.waterfox.com/releases/6.6.13/
PR: 295436
Sponsored by: UNIS Labs
MFH: 2026Q2
---
www/waterfox/Makefile | 5 +-
www/waterfox/distinfo | 10 +-
www/waterfox/files/patch-bug1962139-c27-ffmpeg8 | 15936 ----------------------
www/waterfox/files/patch-bug2033279 | 15 -
4 files changed, 7 insertions(+), 15959 deletions(-)
diff --git a/www/waterfox/Makefile b/www/waterfox/Makefile
index d3e016bfc65d..a325db22c04d 100644
--- a/www/waterfox/Makefile
+++ b/www/waterfox/Makefile
@@ -1,6 +1,5 @@
PORTNAME= waterfox
-DISTVERSION= 6.6.12
-PORTREVISION= 2
+DISTVERSION= 6.6.13
PORTEPOCH= 1
CATEGORIES= www
@@ -32,7 +31,7 @@ BUILD_DEPENDS= nspr>=4.32:devel/nspr \
USE_GECKO= gecko
USE_GITHUB= yes
GH_ACCOUNT= BrowserWorks
-GH_TUPLE= BrowserWorks:l10n:d7d584c:l10n/waterfox/browser/locales
+GH_TUPLE= BrowserWorks:l10n:f17435e:l10n/waterfox/browser/locales
USE_MOZILLA= -sqlite
# work around bindgen not finding ICU, e.g.
# dist/include/mozilla/intl/ICU4CGlue.h:8:10: fatal error: 'unicode/uenum.h' file not found, err: true
diff --git a/www/waterfox/distinfo b/www/waterfox/distinfo
index 51e34656222a..3ea6f6b5101a 100644
--- a/www/waterfox/distinfo
+++ b/www/waterfox/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1776969857
-SHA256 (BrowserWorks-waterfox-6.6.12_GH0.tar.gz) = 04621a7c3fd4e0737f182ab0f8f8cfcf23d6b7a63005ec8548cc8f6495b0e4a5
-SIZE (BrowserWorks-waterfox-6.6.12_GH0.tar.gz) = 926184434
-SHA256 (BrowserWorks-l10n-d7d584c_GH0.tar.gz) = 845a34b7b5d881e44a3b42133770cfb2104e3e6c4cfb4733242cca2552f3a850
-SIZE (BrowserWorks-l10n-d7d584c_GH0.tar.gz) = 25788616
+TIMESTAMP = 1779255352
+SHA256 (BrowserWorks-waterfox-6.6.13_GH0.tar.gz) = 1e2863d4c533af73995f66e1b517416b501573956eec1619e8854c6b4ecf3f77
+SIZE (BrowserWorks-waterfox-6.6.13_GH0.tar.gz) = 926517089
+SHA256 (BrowserWorks-l10n-f17435e_GH0.tar.gz) = 384e019dd86975c093b2177fb72f27d20c63c8cc126fd7a9e47e0b5aa9434338
+SIZE (BrowserWorks-l10n-f17435e_GH0.tar.gz) = 25801987
diff --git a/www/waterfox/files/patch-bug1962139-c27-ffmpeg8 b/www/waterfox/files/patch-bug1962139-c27-ffmpeg8
deleted file mode 100644
index 75aad24256a1..000000000000
--- a/www/waterfox/files/patch-bug1962139-c27-ffmpeg8
+++ /dev/null
@@ -1,15936 +0,0 @@
-commit 256c2e6f792ca4fd63ba8228021097efd766b3f9
-Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
-
- Support FFMpeg 8.0 for firefox-esr
-
- Patch taken from from OpenBSD, by Landry Breuil
- Via https://bugzilla.mozilla.org/show_bug.cgi?id=1962139#c27
-
-diff --git dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp
-index abc6c8ef614d..f41a921efd40 100644
---- dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp
-+++ dom/media/platforms/ffmpeg/FFmpegLibWrapper.cpp
-@@ -71,6 +71,7 @@ FFmpegLibWrapper::LinkResult FFmpegLibWrapper::Link() {
- AV_FUNC_59 = 1 << 6,
- AV_FUNC_60 = 1 << 7,
- AV_FUNC_61 = 1 << 8,
-+ AV_FUNC_62 = 1 << 9,
- AV_FUNC_AVUTIL_53 = AV_FUNC_53 | AV_FUNC_AVUTIL_MASK,
- AV_FUNC_AVUTIL_54 = AV_FUNC_54 | AV_FUNC_AVUTIL_MASK,
- AV_FUNC_AVUTIL_55 = AV_FUNC_55 | AV_FUNC_AVUTIL_MASK,
-@@ -80,9 +81,10 @@ FFmpegLibWrapper::LinkResult FFmpegLibWrapper::Link() {
- AV_FUNC_AVUTIL_59 = AV_FUNC_59 | AV_FUNC_AVUTIL_MASK,
- AV_FUNC_AVUTIL_60 = AV_FUNC_60 | AV_FUNC_AVUTIL_MASK,
- AV_FUNC_AVUTIL_61 = AV_FUNC_61 | AV_FUNC_AVUTIL_MASK,
-+ AV_FUNC_AVUTIL_62 = AV_FUNC_62 | AV_FUNC_AVUTIL_MASK,
- AV_FUNC_AVCODEC_ALL = AV_FUNC_53 | AV_FUNC_54 | AV_FUNC_55 | AV_FUNC_56 |
- AV_FUNC_57 | AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 |
-- AV_FUNC_61,
-+ AV_FUNC_61 | AV_FUNC_62,
- AV_FUNC_AVUTIL_ALL = AV_FUNC_AVCODEC_ALL | AV_FUNC_AVUTIL_MASK
- };
-
-@@ -114,6 +116,9 @@ FFmpegLibWrapper::LinkResult FFmpegLibWrapper::Link() {
- case 61:
- version = AV_FUNC_61;
- break;
-+ case 62:
-+ version = AV_FUNC_62;
-+ break;
- default:
- FFMPEGV_LOG("Unknown avcodec version: %d", macro);
- Unlink();
-@@ -154,17 +159,20 @@ FFmpegLibWrapper::LinkResult FFmpegLibWrapper::Link() {
- AV_FUNC(av_lockmgr_register, AV_FUNC_53 | AV_FUNC_54 | AV_FUNC_55 |
- AV_FUNC_56 | AV_FUNC_57 | AV_FUNC_58)
- AV_FUNC(avcodec_alloc_context3, AV_FUNC_AVCODEC_ALL)
-- AV_FUNC(avcodec_close, AV_FUNC_AVCODEC_ALL)
-+ AV_FUNC(avcodec_close, AV_FUNC_53 | AV_FUNC_54 | AV_FUNC_55 |
-+ AV_FUNC_56 | AV_FUNC_57 | AV_FUNC_58 |
-+ AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61)
-+
- AV_FUNC(avcodec_decode_audio4, AV_FUNC_53 | AV_FUNC_54 | AV_FUNC_55 |
- AV_FUNC_56 | AV_FUNC_57 | AV_FUNC_58)
- AV_FUNC(avcodec_decode_video2, AV_FUNC_53 | AV_FUNC_54 | AV_FUNC_55 |
- AV_FUNC_56 | AV_FUNC_57 | AV_FUNC_58)
- AV_FUNC(avcodec_find_decoder, AV_FUNC_AVCODEC_ALL)
- AV_FUNC(avcodec_find_decoder_by_name,
-- AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61)
-+ AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61 | AV_FUNC_62)
- AV_FUNC(avcodec_find_encoder, AV_FUNC_AVCODEC_ALL)
- AV_FUNC(avcodec_find_encoder_by_name,
-- AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61)
-+ AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61 | AV_FUNC_62)
- AV_FUNC(avcodec_flush_buffers, AV_FUNC_AVCODEC_ALL)
- AV_FUNC(avcodec_open2, AV_FUNC_AVCODEC_ALL)
- AV_FUNC(avcodec_register_all, AV_FUNC_53 | AV_FUNC_54 | AV_FUNC_55 |
-@@ -179,21 +187,25 @@ FFmpegLibWrapper::LinkResult FFmpegLibWrapper::Link() {
- AV_FUNC(avcodec_get_frame_defaults, (AV_FUNC_53 | AV_FUNC_54))
- AV_FUNC(avcodec_free_frame, AV_FUNC_54)
- AV_FUNC(avcodec_send_packet,
-- AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61)
-+ AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61 | AV_FUNC_62)
- AV_FUNC(avcodec_receive_packet,
-- AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61)
-- AV_FUNC(avcodec_send_frame, AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61)
-+ AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61 | AV_FUNC_62)
-+ AV_FUNC(avcodec_send_frame, AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 |
-+ AV_FUNC_61 | AV_FUNC_62)
- AV_FUNC(avcodec_receive_frame,
-- AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61)
-+ AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61 | AV_FUNC_62)
- AV_FUNC(avcodec_default_get_buffer2,
- (AV_FUNC_55 | AV_FUNC_56 | AV_FUNC_57 | AV_FUNC_58 | AV_FUNC_59 |
-- AV_FUNC_60 | AV_FUNC_61))
-+ AV_FUNC_60 | AV_FUNC_61 | AV_FUNC_62))
- AV_FUNC(av_packet_alloc,
-- (AV_FUNC_57 | AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61))
-+ (AV_FUNC_57 | AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61 |
-+ AV_FUNC_62))
- AV_FUNC(av_packet_unref,
-- (AV_FUNC_57 | AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61))
-+ (AV_FUNC_57 | AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61 |
-+ AV_FUNC_62))
- AV_FUNC(av_packet_free,
-- (AV_FUNC_57 | AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61))
-+ (AV_FUNC_57 | AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61 |
-+ AV_FUNC_62))
- AV_FUNC(avcodec_descriptor_get, AV_FUNC_AVCODEC_ALL)
- AV_FUNC(av_log_set_level, AV_FUNC_AVUTIL_ALL)
- AV_FUNC(av_malloc, AV_FUNC_AVUTIL_ALL)
-@@ -201,37 +213,40 @@ FFmpegLibWrapper::LinkResult FFmpegLibWrapper::Link() {
- AV_FUNC(av_frame_alloc,
- (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57 |
- AV_FUNC_AVUTIL_58 | AV_FUNC_AVUTIL_59 | AV_FUNC_AVUTIL_60 |
-- AV_FUNC_AVUTIL_61))
-+ AV_FUNC_AVUTIL_61 | AV_FUNC_AVUTIL_62))
- AV_FUNC(av_frame_free,
- (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57 |
- AV_FUNC_AVUTIL_58 | AV_FUNC_AVUTIL_59 | AV_FUNC_AVUTIL_60 |
-- AV_FUNC_AVUTIL_61))
-+ AV_FUNC_AVUTIL_61 | AV_FUNC_AVUTIL_62))
- AV_FUNC(av_frame_unref,
- (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57 |
- AV_FUNC_AVUTIL_58 | AV_FUNC_AVUTIL_59 | AV_FUNC_AVUTIL_60 |
-- AV_FUNC_AVUTIL_61))
-+ AV_FUNC_AVUTIL_61 | AV_FUNC_AVUTIL_62))
- AV_FUNC(av_frame_get_buffer,
- (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57 |
- AV_FUNC_AVUTIL_58 | AV_FUNC_AVUTIL_59 | AV_FUNC_AVUTIL_60 |
-- AV_FUNC_AVUTIL_61))
-+ AV_FUNC_AVUTIL_61 | AV_FUNC_AVUTIL_62))
- AV_FUNC(av_frame_make_writable,
- (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57 |
- AV_FUNC_AVUTIL_58 | AV_FUNC_AVUTIL_59 | AV_FUNC_AVUTIL_60 |
-- AV_FUNC_AVUTIL_61))
-+ AV_FUNC_AVUTIL_61 | AV_FUNC_AVUTIL_62))
- AV_FUNC(av_image_check_size, AV_FUNC_AVUTIL_ALL)
- AV_FUNC(av_image_get_buffer_size, AV_FUNC_AVUTIL_ALL)
- AV_FUNC_OPTION(av_channel_layout_default,
-- AV_FUNC_AVUTIL_60 | AV_FUNC_AVUTIL_61)
-+ AV_FUNC_AVUTIL_60 | AV_FUNC_AVUTIL_61 | AV_FUNC_AVUTIL_62)
- AV_FUNC_OPTION(av_channel_layout_from_mask,
-- AV_FUNC_AVUTIL_60 | AV_FUNC_AVUTIL_61)
-- AV_FUNC_OPTION(av_channel_layout_copy, AV_FUNC_AVUTIL_60 | AV_FUNC_AVUTIL_61)
-+ AV_FUNC_AVUTIL_60 | AV_FUNC_AVUTIL_61 | AV_FUNC_AVUTIL_62)
-+ AV_FUNC_OPTION(av_channel_layout_copy, AV_FUNC_AVUTIL_60 | AV_FUNC_AVUTIL_61 |
-+ AV_FUNC_AVUTIL_62)
- AV_FUNC_OPTION(av_buffer_get_opaque,
- (AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57 | AV_FUNC_AVUTIL_58 |
-- AV_FUNC_AVUTIL_59 | AV_FUNC_AVUTIL_60 | AV_FUNC_AVUTIL_61))
-+ AV_FUNC_AVUTIL_59 | AV_FUNC_AVUTIL_60 | AV_FUNC_AVUTIL_61 |
-+ AV_FUNC_AVUTIL_62))
- AV_FUNC(
- av_buffer_create,
- (AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57 |
-- AV_FUNC_AVUTIL_58 | AV_FUNC_AVUTIL_59 | AV_FUNC_AVUTIL_60 | AV_FUNC_61))
-+ AV_FUNC_AVUTIL_58 | AV_FUNC_AVUTIL_59 | AV_FUNC_AVUTIL_60 | AV_FUNC_61 |
-+ AV_FUNC_62))
- AV_FUNC_OPTION(av_frame_get_colorspace,
- AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57 |
- AV_FUNC_AVUTIL_58)
-@@ -239,7 +254,8 @@ FFmpegLibWrapper::LinkResult FFmpegLibWrapper::Link() {
- AV_FUNC_AVUTIL_55 | AV_FUNC_AVUTIL_56 | AV_FUNC_AVUTIL_57 |
- AV_FUNC_AVUTIL_58)
- AV_FUNC(av_strerror, AV_FUNC_AVUTIL_58 | AV_FUNC_AVUTIL_59 |
-- AV_FUNC_AVUTIL_60 | AV_FUNC_AVUTIL_61)
-+ AV_FUNC_AVUTIL_60 | AV_FUNC_AVUTIL_61 |
-+ AV_FUNC_AVUTIL_62)
- AV_FUNC(av_get_sample_fmt_name, AV_FUNC_AVUTIL_ALL)
- AV_FUNC(av_dict_set, AV_FUNC_AVUTIL_ALL)
- AV_FUNC(av_dict_free, AV_FUNC_AVUTIL_ALL)
-@@ -247,48 +263,65 @@ FFmpegLibWrapper::LinkResult FFmpegLibWrapper::Link() {
- AV_FUNC(av_opt_set_double, AV_FUNC_AVUTIL_ALL)
- AV_FUNC(av_opt_set_int, AV_FUNC_AVUTIL_ALL)
- AV_FUNC(avcodec_free_context,
-- AV_FUNC_57 | AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61)
-+ AV_FUNC_57 | AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61 |
-+ AV_FUNC_62)
- AV_FUNC_OPTION_SILENT(avcodec_get_hw_config,
-- AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61)
-+ AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61 |
-+ AV_FUNC_62)
- AV_FUNC_OPTION_SILENT(av_codec_is_decoder,
-- AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61)
-+ AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61 |
-+ AV_FUNC_62)
- AV_FUNC_OPTION_SILENT(av_codec_iterate,
-- AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61)
-+ AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61 |
-+ AV_FUNC_62)
- AV_FUNC_OPTION_SILENT(av_hwdevice_ctx_init,
- AV_FUNC_AVUTIL_58 | AV_FUNC_AVUTIL_59 |
-- AV_FUNC_AVUTIL_60 | AV_FUNC_AVUTIL_61)
-+ AV_FUNC_AVUTIL_60 | AV_FUNC_AVUTIL_61 |
-+ AV_FUNC_AVUTIL_62)
- AV_FUNC_OPTION_SILENT(av_hwdevice_ctx_alloc,
- AV_FUNC_AVUTIL_58 | AV_FUNC_AVUTIL_59 |
-- AV_FUNC_AVUTIL_60 | AV_FUNC_AVUTIL_61)
-+ AV_FUNC_AVUTIL_60 | AV_FUNC_AVUTIL_61 |
-+ AV_FUNC_AVUTIL_62)
- AV_FUNC_OPTION_SILENT(av_buffer_ref, AV_FUNC_AVUTIL_58 | AV_FUNC_AVUTIL_59 |
- AV_FUNC_AVUTIL_60 |
-- AV_FUNC_AVUTIL_61)
-+ AV_FUNC_AVUTIL_61 |
-+ AV_FUNC_AVUTIL_62)
- AV_FUNC_OPTION_SILENT(av_buffer_unref, AV_FUNC_AVUTIL_58 | AV_FUNC_AVUTIL_59 |
- AV_FUNC_AVUTIL_60 |
-- AV_FUNC_AVUTIL_61)
-+ AV_FUNC_AVUTIL_61 |
-+ AV_FUNC_AVUTIL_62)
- AV_FUNC_OPTION_SILENT(av_hwframe_ctx_alloc,
- AV_FUNC_AVUTIL_58 | AV_FUNC_AVUTIL_59 |
-- AV_FUNC_AVUTIL_60 | AV_FUNC_AVUTIL_61)
-+ AV_FUNC_AVUTIL_60 | AV_FUNC_AVUTIL_61 |
-+ AV_FUNC_AVUTIL_62)
- AV_FUNC_OPTION_SILENT(av_hwframe_ctx_init,
- AV_FUNC_AVUTIL_58 | AV_FUNC_AVUTIL_59 |
-- AV_FUNC_AVUTIL_60 | AV_FUNC_AVUTIL_61)
-+ AV_FUNC_AVUTIL_60 | AV_FUNC_AVUTIL_61 |
-+ AV_FUNC_AVUTIL_62)
-
- #ifdef MOZ_WIDGET_GTK
- AV_FUNC_OPTION_SILENT(av_hwdevice_hwconfig_alloc,
-- AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61)
-+ AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61 |
-+ AV_FUNC_62)
- AV_FUNC_OPTION_SILENT(av_hwdevice_get_hwframe_constraints,
-- AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61)
-+ AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61 |
-+ AV_FUNC_62)
- AV_FUNC_OPTION_SILENT(av_hwframe_constraints_free,
-- AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61)
-+ AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61 |
-+ AV_FUNC_62)
- AV_FUNC_OPTION_SILENT(av_hwframe_transfer_get_formats,
-- AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61)
-+ AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61 |
-+ AV_FUNC_62)
- AV_FUNC_OPTION_SILENT(av_hwdevice_ctx_create_derived,
-- AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61)
-+ AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61 |
-+ AV_FUNC_62)
- AV_FUNC_OPTION_SILENT(avcodec_get_name, AV_FUNC_57 | AV_FUNC_58 | AV_FUNC_59 |
-- AV_FUNC_60 | AV_FUNC_61)
-+ AV_FUNC_60 | AV_FUNC_61 |
-+ AV_FUNC_62)
- AV_FUNC_OPTION_SILENT(av_get_pix_fmt_string,
- AV_FUNC_AVUTIL_58 | AV_FUNC_AVUTIL_59 |
-- AV_FUNC_AVUTIL_60 | AV_FUNC_AVUTIL_61)
-+ AV_FUNC_AVUTIL_60 | AV_FUNC_AVUTIL_61 |
-+ AV_FUNC_AVUTIL_62)
- #endif
-
- AV_FUNC_OPTION(av_tx_init, AV_FUNC_AVUTIL_ALL)
-diff --git dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp
-index 042218af04f4..d1b1c739e3c8 100644
---- dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp
-+++ dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp
-@@ -34,6 +34,7 @@ static FFmpegLibWrapper sLibAV;
- static const char* sLibs[] = {
- // clang-format off
- #if defined(XP_DARWIN)
-+ "libavcodec.62.dylib",
- "libavcodec.61.dylib",
- "libavcodec.60.dylib",
- "libavcodec.59.dylib",
-@@ -47,6 +48,7 @@ static const char* sLibs[] = {
- "libavcodec.so", // OpenBSD hardly controls the major/minor library version
- // of ffmpeg and update it regulary on ABI/API changes
- #else
-+ "libavcodec.so.62",
- "libavcodec.so.61",
- "libavcodec.so.60",
- "libavcodec.so.59",
-@@ -113,6 +115,9 @@ bool FFmpegRuntimeLinker::Init() {
- case 61:
- FFmpegDecoderModule<61>::Init(&sLibAV);
- break;
-+ case 62:
-+ FFmpegDecoderModule<62>::Init(&sLibAV);
-+ break;
- }
- return true;
- case FFmpegLibWrapper::LinkResult::NoProvidedLib:
-@@ -203,6 +208,9 @@ already_AddRefed<PlatformDecoderModule> FFmpegRuntimeLinker::CreateDecoder() {
- case 61:
- module = FFmpegDecoderModule<61>::Create(&sLibAV);
- break;
-+ case 62:
-+ module = FFmpegDecoderModule<62>::Create(&sLibAV);
-+ break;
- default:
- module = nullptr;
- }
-@@ -241,6 +249,9 @@ already_AddRefed<PlatformEncoderModule> FFmpegRuntimeLinker::CreateEncoder() {
- case 61:
- module = FFmpegEncoderModule<61>::Create(&sLibAV);
- break;
-+ case 62:
-+ module = FFmpegEncoderModule<62>::Create(&sLibAV);
-+ break;
- default:
- module = nullptr;
- }
-diff --git dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
-index 46730e8c1acb..aae745be2277 100644
---- dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
-+++ dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
-@@ -1205,11 +1205,21 @@ MediaResult FFmpegVideoDecoder<LIBAV_VER>::DoDecode(
- RESULT_DETAIL("HW decoding is slow, switching back to SW decode"));
- }
- if (mUsingV4L2) {
-+# if LIBAVCODEC_VERSION_MAJOR < 62
- rv = CreateImageV4L2(mFrame->pkt_pos, GetFramePts(mFrame),
- Duration(mFrame), aResults);
-+# else
-+ rv = CreateImageV4L2(packet->pos, GetFramePts(mFrame),
-+ Duration(mFrame), aResults);
-+# endif
- } else {
-+# if LIBAVCODEC_VERSION_MAJOR < 62
- rv = CreateImageVAAPI(mFrame->pkt_pos, GetFramePts(mFrame),
- Duration(mFrame), aResults);
-+# else
-+ rv = CreateImageVAAPI(packet->pos, GetFramePts(mFrame),
-+ Duration(mFrame), aResults);
-+# endif
- }
-
- // If VA-API/V4L2 playback failed, just quit. Decoder is going to be
-@@ -1221,8 +1231,13 @@ MediaResult FFmpegVideoDecoder<LIBAV_VER>::DoDecode(
- return rv;
- }
- # elif defined(MOZ_ENABLE_D3D11VA)
-+# if LIBAVCODEC_VERSION_MAJOR < 62
- rv = CreateImageD3D11(mFrame->pkt_pos, GetFramePts(mFrame),
- Duration(mFrame), aResults);
-+# else
-+ rv = CreateImageD3D11(packet->pos, GetFramePts(mFrame),
-+ Duration(mFrame), aResults);
-+# endif
- # else
- return MediaResult(NS_ERROR_DOM_MEDIA_DECODE_ERR,
- RESULT_DETAIL("No HW decoding implementation!"));
-@@ -1230,8 +1245,13 @@ MediaResult FFmpegVideoDecoder<LIBAV_VER>::DoDecode(
- } else
- # endif
- {
-+# if LIBAVCODEC_VERSION_MAJOR < 62
- rv = CreateImage(mFrame->pkt_pos, GetFramePts(mFrame), Duration(mFrame),
- aResults);
-+# else
-+ rv = CreateImage(packet->pos, GetFramePts(mFrame), Duration(mFrame),
-+ aResults);
-+# endif
- }
- if (NS_FAILED(rv)) {
- return rv;
-@@ -1572,10 +1592,17 @@ MediaResult FFmpegVideoDecoder<LIBAV_VER>::CreateImage(
- mLib->av_buffer_get_opaque(mFrame->buf[0]));
- MOZ_ASSERT(wrapper);
- FFMPEG_LOGV("Create a video data from a shmem image=%p", wrapper.get());
-+# if LIBAVCODEC_VERSION_MAJOR < 62
- v = VideoData::CreateFromImage(
- mInfo.mDisplay, aOffset, TimeUnit::FromMicroseconds(aPts),
- TimeUnit::FromMicroseconds(aDuration), wrapper->AsImage(),
- !!mFrame->key_frame, TimeUnit::FromMicroseconds(-1));
-+# else
-+ v = VideoData::CreateFromImage(
-+ mInfo.mDisplay, aOffset, TimeUnit::FromMicroseconds(aPts),
-+ TimeUnit::FromMicroseconds(aDuration), wrapper->AsImage(),
-+ !!(mFrame->flags & AV_FRAME_FLAG_KEY), TimeUnit::FromMicroseconds(-1));
-+# endif
- }
- #endif
- #if defined(MOZ_WIDGET_GTK) && defined(MOZ_USE_HWDECODE)
-@@ -1599,10 +1626,17 @@ MediaResult FFmpegVideoDecoder<LIBAV_VER>::CreateImage(
- if (mInfo.mTransferFunction) {
- surface->SetTransferFunction(mInfo.mTransferFunction.value());
- }
-+# if LIBAVCODEC_VERSION_MAJOR < 62
- v = VideoData::CreateFromImage(
- mInfo.mDisplay, aOffset, TimeUnit::FromMicroseconds(aPts),
- TimeUnit::FromMicroseconds(aDuration), surface->GetAsImage(),
- !!mFrame->key_frame, TimeUnit::FromMicroseconds(-1));
-+# else
-+ v = VideoData::CreateFromImage(
-+ mInfo.mDisplay, aOffset, TimeUnit::FromMicroseconds(aPts),
-+ TimeUnit::FromMicroseconds(aDuration), surface->GetAsImage(),
-+ !!(mFrame->flags & AV_FRAME_FLAG_KEY), TimeUnit::FromMicroseconds(-1));
-+# endif
- } else {
- FFMPEG_LOG("Failed to uploaded video data to DMABuf");
- }
-@@ -1612,6 +1646,7 @@ MediaResult FFmpegVideoDecoder<LIBAV_VER>::CreateImage(
- }
- #endif
- if (!v) {
-+# if LIBAVCODEC_VERSION_MAJOR < 62
- Result<already_AddRefed<VideoData>, MediaResult> r =
- VideoData::CreateAndCopyData(
- mInfo, mImageContainer, aOffset, TimeUnit::FromMicroseconds(aPts),
-@@ -1619,6 +1654,15 @@ MediaResult FFmpegVideoDecoder<LIBAV_VER>::CreateImage(
- TimeUnit::FromMicroseconds(-1),
- mInfo.ScaledImageRect(mFrame->width, mFrame->height),
- mImageAllocator);
-+#else
-+ Result<already_AddRefed<VideoData>, MediaResult> r =
-+ VideoData::CreateAndCopyData(
-+ mInfo, mImageContainer, aOffset, TimeUnit::FromMicroseconds(aPts),
-+ TimeUnit::FromMicroseconds(aDuration), b, !!(mFrame->flags & AV_FRAME_FLAG_KEY),
-+ TimeUnit::FromMicroseconds(mFrame->pkt_dts),
-+ mInfo.ScaledImageRect(mFrame->width, mFrame->height),
-+ mImageAllocator);
-+#endif
- if (r.isErr()) {
- return r.unwrapErr();
- }
-@@ -1685,10 +1729,17 @@ MediaResult FFmpegVideoDecoder<LIBAV_VER>::CreateImageVAAPI(
- surface->SetTransferFunction(mInfo.mTransferFunction.value());
- }
-
-+# if LIBAVCODEC_VERSION_MAJOR < 62
- RefPtr<VideoData> vp = VideoData::CreateFromImage(
- mInfo.mDisplay, aOffset, TimeUnit::FromMicroseconds(aPts),
- TimeUnit::FromMicroseconds(aDuration), surface->GetAsImage(),
- !!mFrame->key_frame, TimeUnit::FromMicroseconds(-1));
-+# else
-+ RefPtr<VideoData> vp = VideoData::CreateFromImage(
-+ mInfo.mDisplay, aOffset, TimeUnit::FromMicroseconds(aPts),
-+ TimeUnit::FromMicroseconds(aDuration), surface->GetAsImage(),
-+ !!(mFrame->flags & AV_FRAME_FLAG_KEY), TimeUnit::FromMicroseconds(-1));
-+# endif
-
- if (!vp) {
- return MediaResult(NS_ERROR_DOM_MEDIA_DECODE_ERR,
-@@ -1734,10 +1785,17 @@ MediaResult FFmpegVideoDecoder<LIBAV_VER>::CreateImageV4L2(
- surface->SetYUVColorSpace(GetFrameColorSpace());
- surface->SetColorRange(GetFrameColorRange());
-
-+# if LIBAVCODEC_VERSION_MAJOR < 62
- RefPtr<VideoData> vp = VideoData::CreateFromImage(
- mInfo.mDisplay, aOffset, TimeUnit::FromMicroseconds(aPts),
- TimeUnit::FromMicroseconds(aDuration), surface->GetAsImage(),
- !!mFrame->key_frame, TimeUnit::FromMicroseconds(-1));
-+# else
-+ RefPtr<VideoData> vp = VideoData::CreateFromImage(
-+ mInfo.mDisplay, aOffset, TimeUnit::FromMicroseconds(aPts),
-+ TimeUnit::FromMicroseconds(aDuration), surface->GetAsImage(),
-+ !!(mFrame->flags & AV_FRAME_FLAG_KEY), TimeUnit::FromMicroseconds(-1));
-+# endif
-
- if (!vp) {
- return MediaResult(NS_ERROR_DOM_MEDIA_DECODE_ERR,
-@@ -2173,10 +2231,17 @@ MediaResult FFmpegVideoDecoder<LIBAV_VER>::CreateImageD3D11(
- }
- MOZ_ASSERT(image);
-
-+# if LIBAVCODEC_VERSION_MAJOR < 62
- RefPtr<VideoData> v = VideoData::CreateFromImage(
- mInfo.mDisplay, aOffset, TimeUnit::FromMicroseconds(aPts),
- TimeUnit::FromMicroseconds(aDuration), image, !!mFrame->key_frame,
- TimeUnit::FromMicroseconds(-1));
-+# else
-+ RefPtr<VideoData> v = VideoData::CreateFromImage(
-+ mInfo.mDisplay, aOffset, TimeUnit::FromMicroseconds(aPts),
-+ TimeUnit::FromMicroseconds(aDuration), image, !!(mFrame->flags & AV_FRAME_FLAG_KEY),
-+ TimeUnit::FromMicroseconds(-1));
-+# endif
- if (!v) {
- nsPrintfCString msg("D3D image allocation error");
- FFMPEG_LOG("%s", msg.get());
-diff --git dom/media/platforms/ffmpeg/FFmpegVideoEncoder.cpp dom/media/platforms/ffmpeg/FFmpegVideoEncoder.cpp
-index 2120d09f8974..da663d955048 100644
---- dom/media/platforms/ffmpeg/FFmpegVideoEncoder.cpp
-+++ dom/media/platforms/ffmpeg/FFmpegVideoEncoder.cpp
-@@ -118,11 +118,19 @@ struct H264LiteralSetting {
- H264Setting get() const { return {mValue, mString.AsString()}; }
- };
-
-+#if LIBAVCODEC_VERSION_MAJOR < 62
- static constexpr H264LiteralSetting H264Profiles[]{
- {FF_PROFILE_H264_BASELINE, "baseline"_ns},
- {FF_PROFILE_H264_MAIN, "main"_ns},
- {FF_PROFILE_H264_EXTENDED, ""_ns},
- {FF_PROFILE_H264_HIGH, "high"_ns}};
-+#else
-+static constexpr H264LiteralSetting H264Profiles[]{
-+ {AV_PROFILE_H264_BASELINE, "baseline"_ns},
-+ {AV_PROFILE_H264_MAIN, "main"_ns},
-+ {AV_PROFILE_H264_EXTENDED, ""_ns},
-+ {AV_PROFILE_H264_HIGH, "high"_ns}};
-+#endif
-
- static Maybe<H264Setting> GetH264Profile(const H264_PROFILE& aProfile) {
- switch (aProfile) {
-diff --git dom/media/platforms/ffmpeg/ffmpeg62/include/COPYING.LGPLv2.1 dom/media/platforms/ffmpeg/ffmpeg62/include/COPYING.LGPLv2.1
-new file mode 100644
-index 000000000000..00b4fedfe7e7
---- /dev/null
-+++ dom/media/platforms/ffmpeg/ffmpeg62/include/COPYING.LGPLv2.1
-@@ -0,0 +1,504 @@
-+ GNU LESSER GENERAL PUBLIC LICENSE
-+ Version 2.1, February 1999
-+
-+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ Everyone is permitted to copy and distribute verbatim copies
-+ of this license document, but changing it is not allowed.
-+
-+[This is the first released version of the Lesser GPL. It also counts
-+ as the successor of the GNU Library Public License, version 2, hence
-+ the version number 2.1.]
-+
-+ Preamble
-+
-+ The licenses for most software are designed to take away your
-+freedom to share and change it. By contrast, the GNU General Public
-+Licenses are intended to guarantee your freedom to share and change
-+free software--to make sure the software is free for all its users.
-+
-+ This license, the Lesser General Public License, applies to some
-+specially designated software packages--typically libraries--of the
-+Free Software Foundation and other authors who decide to use it. You
-+can use it too, but we suggest you first think carefully about whether
-+this license or the ordinary General Public License is the better
-+strategy to use in any particular case, based on the explanations below.
-+
-+ When we speak of free software, we are referring to freedom of use,
-+not price. Our General Public Licenses are designed to make sure that
-+you have the freedom to distribute copies of free software (and charge
-+for this service if you wish); that you receive source code or can get
-+it if you want it; that you can change the software and use pieces of
-+it in new free programs; and that you are informed that you can do
-+these things.
-+
-+ To protect your rights, we need to make restrictions that forbid
-+distributors to deny you these rights or to ask you to surrender these
-+rights. These restrictions translate to certain responsibilities for
-+you if you distribute copies of the library or if you modify it.
-+
-+ For example, if you distribute copies of the library, whether gratis
-+or for a fee, you must give the recipients all the rights that we gave
-+you. You must make sure that they, too, receive or can get the source
-+code. If you link other code with the library, you must provide
-+complete object files to the recipients, so that they can relink them
-+with the library after making changes to the library and recompiling
-+it. And you must show them these terms so they know their rights.
-+
-+ We protect your rights with a two-step method: (1) we copyright the
-+library, and (2) we offer you this license, which gives you legal
-+permission to copy, distribute and/or modify the library.
-+
-+ To protect each distributor, we want to make it very clear that
-+there is no warranty for the free library. Also, if the library is
-+modified by someone else and passed on, the recipients should know
-+that what they have is not the original version, so that the original
-+author's reputation will not be affected by problems that might be
-+introduced by others.
-+
-+ Finally, software patents pose a constant threat to the existence of
-+any free program. We wish to make sure that a company cannot
-+effectively restrict the users of a free program by obtaining a
-+restrictive license from a patent holder. Therefore, we insist that
-+any patent license obtained for a version of the library must be
-+consistent with the full freedom of use specified in this license.
-+
-+ Most GNU software, including some libraries, is covered by the
-+ordinary GNU General Public License. This license, the GNU Lesser
-+General Public License, applies to certain designated libraries, and
-+is quite different from the ordinary General Public License. We use
-+this license for certain libraries in order to permit linking those
-+libraries into non-free programs.
-+
-+ When a program is linked with a library, whether statically or using
-+a shared library, the combination of the two is legally speaking a
-+combined work, a derivative of the original library. The ordinary
-+General Public License therefore permits such linking only if the
-+entire combination fits its criteria of freedom. The Lesser General
-+Public License permits more lax criteria for linking other code with
-+the library.
-+
-+ We call this license the "Lesser" General Public License because it
-+does Less to protect the user's freedom than the ordinary General
-+Public License. It also provides other free software developers Less
-+of an advantage over competing non-free programs. These disadvantages
-+are the reason we use the ordinary General Public License for many
-+libraries. However, the Lesser license provides advantages in certain
-+special circumstances.
-+
-+ For example, on rare occasions, there may be a special need to
-+encourage the widest possible use of a certain library, so that it becomes
-+a de-facto standard. To achieve this, non-free programs must be
-+allowed to use the library. A more frequent case is that a free
-+library does the same job as widely used non-free libraries. In this
-+case, there is little to gain by limiting the free library to free
-+software only, so we use the Lesser General Public License.
-+
-+ In other cases, permission to use a particular library in non-free
-+programs enables a greater number of people to use a large body of
-+free software. For example, permission to use the GNU C Library in
-+non-free programs enables many more people to use the whole GNU
-+operating system, as well as its variant, the GNU/Linux operating
-+system.
-+
-+ Although the Lesser General Public License is Less protective of the
-+users' freedom, it does ensure that the user of a program that is
-+linked with the Library has the freedom and the wherewithal to run
-+that program using a modified version of the Library.
-+
-+ The precise terms and conditions for copying, distribution and
-+modification follow. Pay close attention to the difference between a
-+"work based on the library" and a "work that uses the library". The
-+former contains code derived from the library, whereas the latter must
-+be combined with the library in order to run.
-+
-+ GNU LESSER GENERAL PUBLIC LICENSE
-+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-+
-+ 0. This License Agreement applies to any software library or other
-+program which contains a notice placed by the copyright holder or
-+other authorized party saying it may be distributed under the terms of
-+this Lesser General Public License (also called "this License").
-+Each licensee is addressed as "you".
-+
-+ A "library" means a collection of software functions and/or data
-+prepared so as to be conveniently linked with application programs
-+(which use some of those functions and data) to form executables.
-+
-+ The "Library", below, refers to any such software library or work
-+which has been distributed under these terms. A "work based on the
-+Library" means either the Library or any derivative work under
-+copyright law: that is to say, a work containing the Library or a
-+portion of it, either verbatim or with modifications and/or translated
-+straightforwardly into another language. (Hereinafter, translation is
-+included without limitation in the term "modification".)
-+
-+ "Source code" for a work means the preferred form of the work for
-+making modifications to it. For a library, complete source code means
-+all the source code for all modules it contains, plus any associated
-+interface definition files, plus the scripts used to control compilation
-+and installation of the library.
-+
-+ Activities other than copying, distribution and modification are not
-+covered by this License; they are outside its scope. The act of
-+running a program using the Library is not restricted, and output from
-+such a program is covered only if its contents constitute a work based
-+on the Library (independent of the use of the Library in a tool for
-+writing it). Whether that is true depends on what the Library does
-+and what the program that uses the Library does.
-+
-+ 1. You may copy and distribute verbatim copies of the Library's
-+complete source code as you receive it, in any medium, provided that
-+you conspicuously and appropriately publish on each copy an
-+appropriate copyright notice and disclaimer of warranty; keep intact
-+all the notices that refer to this License and to the absence of any
-+warranty; and distribute a copy of this License along with the
-+Library.
-+
-+ You may charge a fee for the physical act of transferring a copy,
-+and you may at your option offer warranty protection in exchange for a
-+fee.
-+
-+ 2. You may modify your copy or copies of the Library or any portion
-+of it, thus forming a work based on the Library, and copy and
-+distribute such modifications or work under the terms of Section 1
-+above, provided that you also meet all of these conditions:
-+
-+ a) The modified work must itself be a software library.
-+
-+ b) You must cause the files modified to carry prominent notices
-+ stating that you changed the files and the date of any change.
-+
-+ c) You must cause the whole of the work to be licensed at no
-+ charge to all third parties under the terms of this License.
-+
-+ d) If a facility in the modified Library refers to a function or a
-+ table of data to be supplied by an application program that uses
-+ the facility, other than as an argument passed when the facility
-+ is invoked, then you must make a good faith effort to ensure that,
-+ in the event an application does not supply such function or
-+ table, the facility still operates, and performs whatever part of
-+ its purpose remains meaningful.
-+
-+ (For example, a function in a library to compute square roots has
-+ a purpose that is entirely well-defined independent of the
-+ application. Therefore, Subsection 2d requires that any
-+ application-supplied function or table used by this function must
-+ be optional: if the application does not supply it, the square
-+ root function must still compute square roots.)
-+
-+These requirements apply to the modified work as a whole. If
-+identifiable sections of that work are not derived from the Library,
-+and can be reasonably considered independent and separate works in
-+themselves, then this License, and its terms, do not apply to those
-+sections when you distribute them as separate works. But when you
-+distribute the same sections as part of a whole which is a work based
-+on the Library, the distribution of the whole must be on the terms of
-+this License, whose permissions for other licensees extend to the
-+entire whole, and thus to each and every part regardless of who wrote
-+it.
-+
-+Thus, it is not the intent of this section to claim rights or contest
-+your rights to work written entirely by you; rather, the intent is to
-+exercise the right to control the distribution of derivative or
-+collective works based on the Library.
-+
-+In addition, mere aggregation of another work not based on the Library
-+with the Library (or with a work based on the Library) on a volume of
-+a storage or distribution medium does not bring the other work under
-+the scope of this License.
-+
-+ 3. You may opt to apply the terms of the ordinary GNU General Public
-+License instead of this License to a given copy of the Library. To do
-+this, you must alter all the notices that refer to this License, so
-+that they refer to the ordinary GNU General Public License, version 2,
-+instead of to this License. (If a newer version than version 2 of the
-+ordinary GNU General Public License has appeared, then you can specify
-+that version instead if you wish.) Do not make any other change in
-+these notices.
-+
-+ Once this change is made in a given copy, it is irreversible for
-+that copy, so the ordinary GNU General Public License applies to all
-+subsequent copies and derivative works made from that copy.
-+
-+ This option is useful when you wish to copy part of the code of
-+the Library into a program that is not a library.
-+
-+ 4. You may copy and distribute the Library (or a portion or
-+derivative of it, under Section 2) in object code or executable form
-+under the terms of Sections 1 and 2 above provided that you accompany
-+it with the complete corresponding machine-readable source code, which
-+must be distributed under the terms of Sections 1 and 2 above on a
-+medium customarily used for software interchange.
-+
-+ If distribution of object code is made by offering access to copy
-+from a designated place, then offering equivalent access to copy the
-+source code from the same place satisfies the requirement to
-+distribute the source code, even though third parties are not
-+compelled to copy the source along with the object code.
-+
-+ 5. A program that contains no derivative of any portion of the
-+Library, but is designed to work with the Library by being compiled or
-+linked with it, is called a "work that uses the Library". Such a
-+work, in isolation, is not a derivative work of the Library, and
-+therefore falls outside the scope of this License.
-+
-+ However, linking a "work that uses the Library" with the Library
-+creates an executable that is a derivative of the Library (because it
-+contains portions of the Library), rather than a "work that uses the
-+library". The executable is therefore covered by this License.
-+Section 6 states terms for distribution of such executables.
-+
-+ When a "work that uses the Library" uses material from a header file
-+that is part of the Library, the object code for the work may be a
-+derivative work of the Library even though the source code is not.
-+Whether this is true is especially significant if the work can be
-+linked without the Library, or if the work is itself a library. The
-+threshold for this to be true is not precisely defined by law.
-+
-+ If such an object file uses only numerical parameters, data
-+structure layouts and accessors, and small macros and small inline
-+functions (ten lines or less in length), then the use of the object
-+file is unrestricted, regardless of whether it is legally a derivative
-+work. (Executables containing this object code plus portions of the
-+Library will still fall under Section 6.)
-+
-+ Otherwise, if the work is a derivative of the Library, you may
-+distribute the object code for the work under the terms of Section 6.
-+Any executables containing that work also fall under Section 6,
-+whether or not they are linked directly with the Library itself.
-+
-+ 6. As an exception to the Sections above, you may also combine or
-+link a "work that uses the Library" with the Library to produce a
-+work containing portions of the Library, and distribute that work
-+under terms of your choice, provided that the terms permit
-+modification of the work for the customer's own use and reverse
-+engineering for debugging such modifications.
-+
-+ You must give prominent notice with each copy of the work that the
-+Library is used in it and that the Library and its use are covered by
-+this License. You must supply a copy of this License. If the work
-+during execution displays copyright notices, you must include the
-+copyright notice for the Library among them, as well as a reference
-+directing the user to the copy of this License. Also, you must do one
-+of these things:
-+
-+ a) Accompany the work with the complete corresponding
-+ machine-readable source code for the Library including whatever
-+ changes were used in the work (which must be distributed under
-+ Sections 1 and 2 above); and, if the work is an executable linked
-+ with the Library, with the complete machine-readable "work that
-+ uses the Library", as object code and/or source code, so that the
-+ user can modify the Library and then relink to produce a modified
-+ executable containing the modified Library. (It is understood
-+ that the user who changes the contents of definitions files in the
-+ Library will not necessarily be able to recompile the application
-+ to use the modified definitions.)
-+
-+ b) Use a suitable shared library mechanism for linking with the
-+ Library. A suitable mechanism is one that (1) uses at run time a
-+ copy of the library already present on the user's computer system,
-+ rather than copying library functions into the executable, and (2)
-+ will operate properly with a modified version of the library, if
-+ the user installs one, as long as the modified version is
-+ interface-compatible with the version that the work was made with.
-+
-+ c) Accompany the work with a written offer, valid for at
-+ least three years, to give the same user the materials
-+ specified in Subsection 6a, above, for a charge no more
-+ than the cost of performing this distribution.
-+
-+ d) If distribution of the work is made by offering access to copy
-+ from a designated place, offer equivalent access to copy the above
-+ specified materials from the same place.
-+
-+ e) Verify that the user has already received a copy of these
-+ materials or that you have already sent this user a copy.
-+
-+ For an executable, the required form of the "work that uses the
-+Library" must include any data and utility programs needed for
-+reproducing the executable from it. However, as a special exception,
-+the materials to be distributed need not include anything that is
-+normally distributed (in either source or binary form) with the major
-+components (compiler, kernel, and so on) of the operating system on
-+which the executable runs, unless that component itself accompanies
-+the executable.
-+
-+ It may happen that this requirement contradicts the license
-+restrictions of other proprietary libraries that do not normally
-+accompany the operating system. Such a contradiction means you cannot
-+use both them and the Library together in an executable that you
-+distribute.
-+
-+ 7. You may place library facilities that are a work based on the
-+Library side-by-side in a single library together with other library
-+facilities not covered by this License, and distribute such a combined
-+library, provided that the separate distribution of the work based on
-+the Library and of the other library facilities is otherwise
-+permitted, and provided that you do these two things:
-+
-+ a) Accompany the combined library with a copy of the same work
-+ based on the Library, uncombined with any other library
-+ facilities. This must be distributed under the terms of the
-+ Sections above.
-+
-+ b) Give prominent notice with the combined library of the fact
-+ that part of it is a work based on the Library, and explaining
-+ where to find the accompanying uncombined form of the same work.
-+
-+ 8. You may not copy, modify, sublicense, link with, or distribute
-+the Library except as expressly provided under this License. Any
-+attempt otherwise to copy, modify, sublicense, link with, or
-+distribute the Library is void, and will automatically terminate your
-+rights under this License. However, parties who have received copies,
-+or rights, from you under this License will not have their licenses
-+terminated so long as such parties remain in full compliance.
-+
-+ 9. You are not required to accept this License, since you have not
-+signed it. However, nothing else grants you permission to modify or
-+distribute the Library or its derivative works. These actions are
-+prohibited by law if you do not accept this License. Therefore, by
-+modifying or distributing the Library (or any work based on the
-+Library), you indicate your acceptance of this License to do so, and
-+all its terms and conditions for copying, distributing or modifying
-+the Library or works based on it.
-+
-+ 10. Each time you redistribute the Library (or any work based on the
-+Library), the recipient automatically receives a license from the
-+original licensor to copy, distribute, link with or modify the Library
-+subject to these terms and conditions. You may not impose any further
-+restrictions on the recipients' exercise of the rights granted herein.
-+You are not responsible for enforcing compliance by third parties with
-+this License.
-+
-+ 11. If, as a consequence of a court judgment or allegation of patent
-+infringement or for any other reason (not limited to patent issues),
-+conditions are imposed on you (whether by court order, agreement or
-+otherwise) that contradict the conditions of this License, they do not
-+excuse you from the conditions of this License. If you cannot
-+distribute so as to satisfy simultaneously your obligations under this
-+License and any other pertinent obligations, then as a consequence you
-+may not distribute the Library at all. For example, if a patent
-+license would not permit royalty-free redistribution of the Library by
-+all those who receive copies directly or indirectly through you, then
-+the only way you could satisfy both it and this License would be to
-+refrain entirely from distribution of the Library.
-+
-+If any portion of this section is held invalid or unenforceable under any
-+particular circumstance, the balance of the section is intended to apply,
-+and the section as a whole is intended to apply in other circumstances.
-+
-+It is not the purpose of this section to induce you to infringe any
-+patents or other property right claims or to contest validity of any
-+such claims; this section has the sole purpose of protecting the
-+integrity of the free software distribution system which is
-+implemented by public license practices. Many people have made
-+generous contributions to the wide range of software distributed
-+through that system in reliance on consistent application of that
-+system; it is up to the author/donor to decide if he or she is willing
-+to distribute software through any other system and a licensee cannot
-+impose that choice.
-+
-+This section is intended to make thoroughly clear what is believed to
-+be a consequence of the rest of this License.
-+
-+ 12. If the distribution and/or use of the Library is restricted in
-+certain countries either by patents or by copyrighted interfaces, the
-+original copyright holder who places the Library under this License may add
-+an explicit geographical distribution limitation excluding those countries,
-+so that distribution is permitted only in or among countries not thus
-+excluded. In such case, this License incorporates the limitation as if
-+written in the body of this License.
-+
-+ 13. The Free Software Foundation may publish revised and/or new
-+versions of the Lesser General Public License from time to time.
-+Such new versions will be similar in spirit to the present version,
-+but may differ in detail to address new problems or concerns.
-+
-+Each version is given a distinguishing version number. If the Library
-+specifies a version number of this License which applies to it and
-+"any later version", you have the option of following the terms and
-+conditions either of that version or of any later version published by
-+the Free Software Foundation. If the Library does not specify a
-+license version number, you may choose any version ever published by
-+the Free Software Foundation.
-+
-+ 14. If you wish to incorporate parts of the Library into other free
-+programs whose distribution conditions are incompatible with these,
*** 15038 LINES SKIPPED ***