mirror of
https://git.freebsd.org/ports.git
synced 2025-06-09 23:00:30 -04:00
a1069e80ec
With two additional patches to the unity_menu patch due to jsm@. Changelog: https://gitlab.com/librewolf-community/browser/bsys6/-/releases PR: 273948 See also: https://codeberg.org/librewolf/issues/issues/1279 Obtained from: https://people.freebsd.org/~jsm/patch2.diff
123 lines
4.1 KiB
Text
123 lines
4.1 KiB
Text
commit 717bba28411c
|
|
Author: Jory A. Pratt <anarchy@gentoo.org>
|
|
Date: Thu Jun 13 11:53:00 2019 -0700
|
|
|
|
Bug 1559213 - Allow to use system av1 libs instead of bundled.
|
|
---
|
|
config/external/moz.build | 5 +++--
|
|
config/system-headers.mozbuild | 8 ++++++++
|
|
dom/media/platforms/moz.build | 5 +++++
|
|
toolkit/moz.configure | 19 ++++++++++++++++++-
|
|
4 files changed, 34 insertions(+), 3 deletions(-)
|
|
|
|
diff --git config/external/moz.build config/external/moz.build
|
|
index a0877c9d717e..5caa2036e0ec 100644
|
|
--- config/external/moz.build
|
|
+++ config/external/moz.build
|
|
@@ -45,8 +45,9 @@ if not CONFIG["MOZ_SYSTEM_LIBVPX"]:
|
|
external_dirs += ["media/libvpx"]
|
|
|
|
if CONFIG["MOZ_AV1"]:
|
|
- external_dirs += ["media/libaom"]
|
|
- external_dirs += ["media/libdav1d"]
|
|
+ if 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 config/system-headers.mozbuild config/system-headers.mozbuild
|
|
index d9489c8f15e4..4d2f15e18c1c 100644
|
|
--- config/system-headers.mozbuild
|
|
+++ config/system-headers.mozbuild
|
|
@@ -1291,6 +1291,14 @@ if CONFIG['MOZ_ENABLE_LIBPROXY']:
|
|
'proxy.h',
|
|
]
|
|
|
|
+if CONFIG['MOZ_SYSTEM_AV1']:
|
|
+ system_headers += [
|
|
+ 'aom/aom_decoder.h',
|
|
+ 'aom/aomdx.h',
|
|
+ 'aom/aom_image.h',
|
|
+ 'dav1d/dav1d.h',
|
|
+ ]
|
|
+
|
|
if CONFIG['MOZ_SYSTEM_LIBVPX']:
|
|
system_headers += [
|
|
'vpx_mem/vpx_mem.h',
|
|
diff --git dom/media/platforms/moz.build dom/media/platforms/moz.build
|
|
index c71f22a22eee..efbd523b1225 100644
|
|
--- dom/media/platforms/moz.build
|
|
+++ dom/media/platforms/moz.build
|
|
@@ -80,6 +80,11 @@ if CONFIG["MOZ_AV1"]:
|
|
"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 += [
|
|
diff --git media/ffvpx/libavcodec/moz.build media/ffvpx/libavcodec/moz.build
|
|
index 5675c28234a1..56344e5e4c98 100644
|
|
--- media/ffvpx/libavcodec/moz.build
|
|
+++ media/ffvpx/libavcodec/moz.build
|
|
@@ -109,10 +109,14 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']:
|
|
'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 += [
|
|
diff --git toolkit/moz.configure toolkit/moz.configure
|
|
index 2e56fa46ce59..23e30935c4bc 100644
|
|
--- toolkit/moz.configure
|
|
+++ toolkit/moz.configure
|
|
@@ -745,7 +745,23 @@ def av1(value):
|
|
return True
|
|
|
|
|
|
-@depends(target, when=av1 & compile_environment)
|
|
+option("--with-system-av1",
|
|
+ help="Use system av1 (located with pkgconfig)")
|
|
+
|
|
+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(system_libaom_info, system_libdav1d_info)
|
|
+def system_av1(system_libaom_info, system_libdav1d_info):
|
|
+ has_av1_libs = False
|
|
+ if system_libaom_info and system_libdav1d_info:
|
|
+ has_av1_libs = True
|
|
+ return has_av1_libs
|
|
+
|
|
+@depends(target, when=av1 & depends(system_av1)(lambda v: not v) & compile_environment)
|
|
def dav1d_asm(target):
|
|
if target.cpu in ("aarch64", "x86", "x86_64"):
|
|
return True
|
|
@@ -761,6 +777,7 @@ 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", depends_if(system_av1)(lambda _: True))
|
|
|
|
# JXL Image Codec Support
|
|
# ==============================================================
|