From bbb92a85723ed11fe114e3a702c1fe1362fbbf7d Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Wed, 15 May 2019 16:14:03 +0200 Subject: Updated to 67.0 --- mozilla-1515641-av1-build-2.patch | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100644 mozilla-1515641-av1-build-2.patch (limited to 'mozilla-1515641-av1-build-2.patch') diff --git a/mozilla-1515641-av1-build-2.patch b/mozilla-1515641-av1-build-2.patch deleted file mode 100644 index bcfc380..0000000 --- a/mozilla-1515641-av1-build-2.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -up firefox-66.0/media/libdav1d/moz.build.mozilla-1515641 firefox-66.0/media/libdav1d/moz.build ---- firefox-66.0/media/libdav1d/moz.build.mozilla-1515641 2019-03-12 14:51:09.102398904 +0100 -+++ firefox-66.0/media/libdav1d/moz.build 2019-03-12 14:52:12.601193367 +0100 -@@ -25,7 +25,7 @@ SOURCES += [ - ] - - # Enable ASM build only on Linux for now. --if CONFIG['OS_TARGET'] == 'Linux' and (CONFIG['CPU_ARCH'] in ('x86', 'x86_64')): -+if CONFIG['MOZ_DAV1D_ASM']: - # Default stack aligment is 16 bytes - DIRS += ['asm'] - -diff -up firefox-66.0/toolkit/moz.configure.mozilla-1515641 firefox-66.0/toolkit/moz.configure ---- firefox-66.0/toolkit/moz.configure.mozilla-1515641 2019-03-12 14:51:09.101398907 +0100 -+++ firefox-66.0/toolkit/moz.configure 2019-03-12 14:51:09.103398901 +0100 -@@ -437,6 +437,16 @@ def av1(value, target, c_compiler): - if enabled: - return True - -+@depends(target, nasm_version, when=av1 & compile_environment) -+def dav1d_asm(target, nasm_version): -+ if target.os == 'GNU' and target.kernel == 'Linux' and target.cpu in ('x86', 'x86_64'): -+ if nasm_version < '2.13': -+ die('nasm 2.13 or greater is required for AV1 support. ' -+ 'Either install nasm or add --disable-av1 to your configure options.') -+ return True -+ -+ -+set_config('MOZ_DAV1D_ASM', dav1d_asm) - set_config('MOZ_AV1', av1) - set_define('MOZ_AV1', av1) - -- cgit