Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (e6b6a0b3f522da8c86fbf6f6b6327bb92204484f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (e6b6a0b3f522da8c86fbf6f6b6327bb92204484f)
  • Date: Thu, 5 Oct 2023 10:05:42 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

doc/asciidoc/DEPENDS
| 3
doc/asciidoc/DETAILS
| 10
doc/asciidoc/HISTORY
| 5
doc/asciidoc/PRE_BUILD
| 5
http/firefox-esr/DETAILS
| 6
http/firefox-esr/HISTORY
| 7

http/firefox-esr/patches/0014-libaom-Use-NEON_FLAGS-instead-of-VPX_ASFLAGS-for-lib.patch
| 28 -
http/firefox-esr/patches/0026-bmo-1840931-elfhack-pgo-fix.patch
| 165 ----------

http/firefox-esr/patches/0029-bmo-1839023-arm-unified-build-missing-header.patch
| 77 ----

http/firefox-esr/patches/0032-bmo-1838323-disambiguate-skvx-when-building-with-different-arches.patch
| 85 -----
10 files changed, 25 insertions(+), 366 deletions(-)

New commits:
commit e6b6a0b3f522da8c86fbf6f6b6327bb92204484f
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

firefox-esr, asciidoc: update FF-ESR to 115.3.1 (++SECURITY_PATCH) and
asciidoc to 10.2.0, dropping python2

Sorry for the confusion, I accidentally mixed up two commits and am
not battling with git to detangle them.

diff --git a/doc/asciidoc/DEPENDS b/doc/asciidoc/DEPENDS
index c3300c8..324de51 100755
--- a/doc/asciidoc/DEPENDS
+++ b/doc/asciidoc/DEPENDS
@@ -1,3 +1,4 @@
depends autoconf &&
depends automake &&
-depends python
+depends python3 &&
+depends pip
diff --git a/doc/asciidoc/DETAILS b/doc/asciidoc/DETAILS
index 5bfbdce..e08519e 100755
--- a/doc/asciidoc/DETAILS
+++ b/doc/asciidoc/DETAILS
@@ -1,9 +1,10 @@
SPELL=asciidoc
- VERSION=8.6.10
-
SOURCE_HASH=sha512:6ecc86977baaf1c756691e3f661e43ef2bb24e606898f6075bfa6f174d1fdc5e77d00853ffe014847e295364349d6ad34f3b8209cb97870e0233012fc38a281a
+ SPELLX=asciidoc-py
+ VERSION=10.2.0
+
SOURCE_HASH=sha512:e8f97559a169504bd2b47a5a4108268d08dbeb98e304486e64761c2603963f4610a0f96c443fdbb8ea289586f015d066681c8ad2946610864662d6df5d7ba9d6
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
- SOURCE_URL=https://github.com/asciidoc/$SPELL/archive/$VERSION.tar.gz
+
SOURCE_URL="https://github.com/$SPELLX/$SPELLX/releases/download/$VERSION/$SOURCE";
WEB_SITE=http://www.methods.co.nz/asciidoc/
ENTERED=20060123
LICENSE[0]=GPL
@@ -13,4 +14,7 @@ cat << EOF
AsciiDoc is a text document format for writing short documents, articles,
books and UNIX man pages. AsciiDoc files can be translated to HTML and
DocBook markups using the asciidoc(1) command
+
+This is the legacy processor using python. Modern frontends for the
+current specificatin are to be found elsewhere.
EOF
diff --git a/doc/asciidoc/HISTORY b/doc/asciidoc/HISTORY
index e9edba6..a936b6f 100644
--- a/doc/asciidoc/HISTORY
+++ b/doc/asciidoc/HISTORY
@@ -1,3 +1,8 @@
+2023-10-04 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: switch to asciidoc-py project, python3 variant,
+ update to 10.2.0
+ * PRE_BUILD, DEPENDS: python3
+
2020-06-05 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS, DEPENDS, PRE_BUILD: version 8.6.10

diff --git a/doc/asciidoc/PRE_BUILD b/doc/asciidoc/PRE_BUILD
index bd8bcfb..1ad610c 100755
--- a/doc/asciidoc/PRE_BUILD
+++ b/doc/asciidoc/PRE_BUILD
@@ -1,7 +1,4 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-autoreconf -fi &&
-
-# fix scripts to use python2 explicitly
-find "$SOURCE_DIRECTORY" -name \*.py -exec sed -ri '1s/python$/&2/' '{}' +
+autoreconf -fi
diff --git a/http/firefox-esr/DETAILS b/http/firefox-esr/DETAILS
index 1bdac49..0316315 100755
--- a/http/firefox-esr/DETAILS
+++ b/http/firefox-esr/DETAILS
@@ -1,11 +1,11 @@
SPELL=firefox-esr
SPELLX=firefox
- VERSION=115.0.3esr
- SECURITY_PATCH=179
+ VERSION=115.3.1esr
+ SECURITY_PATCH=180
SOURCE="${SPELLX}-${VERSION}.source.tar.xz"

SOURCE_URL[0]="http://releases.mozilla.org/pub/${SPELLX}/releases/${VERSION}/source/${SOURCE}";
# Download SHA512SUMS and SHA512SUMS.asc, verify, then place hash here.
-
SOURCE_HASH="sha512:416ee56bd4a602c543391faaa8de31808f267ef2167f7d913195de45d3628de08d0582dbaa8905c847e1431bccd9d1d5d73ad9e7e5ea75be39e4d908a8b40376"
+
SOURCE_HASH="sha512:65cb6fc46bba03eed742bd67f8e36b63b19f2ad7b85d2f503595704a4e88f554758a1e66ba548c8efe97a76322fb2514db72e6ff4bb2992d1aaa86edc3af85f1"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION%esr}"
WEB_SITE=https://www.mozilla.org/en-US/firefox/fx/
GATHER_DOCS=off
diff --git a/http/firefox-esr/HISTORY b/http/firefox-esr/HISTORY
index fb177b2..77c9dc4 100644
--- a/http/firefox-esr/HISTORY
+++ b/http/firefox-esr/HISTORY
@@ -1,3 +1,10 @@
+2023-10-04 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 115.3.1esr, ++SECURITY_PATCH
+ *
patches/0014-libaom-Use-NEON_FLAGS-instead-of-VPX_ASFLAGS-for-lib.patch:
obsolete
+ * patches/0026-bmo-1840931-elfhack-pgo-fix.patch: obsolete
+ * patches/0029-bmo-1839023-arm-unified-build-missing-header.patch:
obsolete
+ *
patches/0032-bmo-1838323-disambiguate-skvx-when-building-with-different-arches.patch:
obsolete
+
2023-09-07 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: version 115.0.3esr, ++SECURITY_PATCH

diff --git
a/http/firefox-esr/patches/0014-libaom-Use-NEON_FLAGS-instead-of-VPX_ASFLAGS-for-lib.patch

b/http/firefox-esr/patches/0014-libaom-Use-NEON_FLAGS-instead-of-VPX_ASFLAGS-for-lib.patch
deleted file mode 100644
index 85c305f..0000000
---
a/http/firefox-esr/patches/0014-libaom-Use-NEON_FLAGS-instead-of-VPX_ASFLAGS-for-lib.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 6e220b49aee7dbdcafd255f6260517c5c551f9b1 Mon Sep 17 00:00:00 2001
-From: Mike Hommey <mh AT glandium.org>
-Date: Mon, 26 Nov 2018 09:59:56 +0900
-Subject: [PATCH 23/30] libaom: Use NEON_FLAGS instead of VPX_ASFLAGS for
- libaom neon code
-
-Bug: https://bugs.gentoo.org/730606
-Signed-off-by: Thomas Deutschmann <whissi AT gentoo.org>
----
- media/libaom/moz.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/media/libaom/moz.build b/media/libaom/moz.build
-index fd8c7f2b33..db3f9ca6ec 100644
---- a/media/libaom/moz.build
-+++ b/media/libaom/moz.build
-@@ -55,7 +55,7 @@ elif CONFIG['CPU_ARCH'] == 'arm':
-
- for f in SOURCES:
- if f.endswith('neon.c'):
-- SOURCES[f].flags += CONFIG['VPX_ASFLAGS']
-+ SOURCES[f].flags += CONFIG['NEON_FLAGS']
-
- if CONFIG['OS_TARGET'] == 'Android':
- # For cpu-features.h
---
-2.34.1
-
diff --git a/http/firefox-esr/patches/0026-bmo-1840931-elfhack-pgo-fix.patch
b/http/firefox-esr/patches/0026-bmo-1840931-elfhack-pgo-fix.patch
deleted file mode 100644
index 6d88bc5..0000000
--- a/http/firefox-esr/patches/0026-bmo-1840931-elfhack-pgo-fix.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-
-# HG changeset patch
-# User Mike Hommey <mh+mozilla AT glandium.org>
-# Date 1688068580 0
-# Node ID 51b78cf4881b07422c0c6e590e863b095257e9e1
-# Parent eef8bff2d6117cc88dcca9ab4718be0f5186924b
-Bug 1840931 - More properly handle files > 4GB in elfhack. r=gsvelto
-
-I'm pretty sure there are other theoretical problems in the code,
-notably when a single section is larger than 4GB, but by the time
-we reach that limit, bug 1839740 will have been fixed.
-
-Differential Revision: https://phabricator.services.mozilla.com/D182447
-
-diff --git a/build/unix/elfhack/elf.cpp b/build/unix/elfhack/elf.cpp
---- a/build/unix/elfhack/elf.cpp
-+++ b/build/unix/elfhack/elf.cpp
-@@ -344,17 +344,17 @@ ElfSection* Elf::getSection(int index) {
- break;
- default:
- sections[index] = new ElfSection(*tmp_shdr[index], tmp_file, this);
- }
- }
- return sections[index];
- }
-
--ElfSection* Elf::getSectionAt(unsigned int offset) {
-+ElfSection* Elf::getSectionAt(Elf64_Off offset) {
- for (int i = 1; i < ehdr->e_shnum; i++) {
- ElfSection* section = getSection(i);
- if ((section != nullptr) && (section->getFlags() & SHF_ALLOC) &&
- !(section->getFlags() & SHF_TLS) && (offset >= section->getAddr())
&&
- (offset < section->getAddr() + section->getSize()))
- return section;
- }
- return nullptr;
-@@ -529,38 +529,38 @@ ElfSection::ElfSection(Elf_Shdr& s, std:
- // Only SHT_REL/SHT_RELA sections use sh_info to store a section
- // number.
- if ((shdr.sh_type == SHT_REL) || (shdr.sh_type == SHT_RELA))
- info.section = shdr.sh_info ? parent->getSection(shdr.sh_info) :
nullptr;
- else
- info.index = shdr.sh_info;
- }
-
--unsigned int ElfSection::getAddr() {
-+Elf64_Addr ElfSection::getAddr() {
- if (shdr.sh_addr != (Elf64_Addr)-1) return shdr.sh_addr;
-
- // It should be safe to adjust sh_addr for all allocated sections that
- // are neither SHT_NOBITS nor SHT_PROGBITS
- if ((previous != nullptr) && isRelocatable()) {
- unsigned int addr = previous->getAddr();
- if (previous->getType() != SHT_NOBITS) addr += previous->getSize();
-
- if (addr & (getAddrAlign() - 1)) addr = (addr | (getAddrAlign() - 1)) +
1;
-
- return (shdr.sh_addr = addr);
- }
- return shdr.sh_addr;
- }
-
--unsigned int ElfSection::getOffset() {
-+Elf64_Off ElfSection::getOffset() {
- if (shdr.sh_offset != (Elf64_Off)-1) return shdr.sh_offset;
-
- if (previous == nullptr) return (shdr.sh_offset = 0);
-
-- unsigned int offset = previous->getOffset();
-+ Elf64_Off offset = previous->getOffset();
-
- ElfSegment* ptload = getSegmentByType(PT_LOAD);
- ElfSegment* prev_ptload = previous->getSegmentByType(PT_LOAD);
-
- if (ptload && (ptload == prev_ptload)) {
- offset += getAddr() - previous->getAddr();
- return (shdr.sh_offset = offset);
- }
-diff --git a/build/unix/elfhack/elfhack.cpp b/build/unix/elfhack/elfhack.cpp
---- a/build/unix/elfhack/elfhack.cpp
-+++ b/build/unix/elfhack/elfhack.cpp
-@@ -1255,18 +1255,18 @@ int do_relocation_section(Elf* elf, unsi
- "Expected to find an .eh_frame section adjacent to .eh_frame_hdr");
- }
- if (eh_frame && first->getAddr() > relhack->getAddr() &&
- second->getAddr() < first_executable->getAddr()) {
- // The distance between both sections needs to be preserved because
- // eh_frame_hdr contains relative offsets to eh_frame. Well, they could
be
- // relocated too, but it's not worth the effort for the few number of
bytes
- // this would save.
-- unsigned int distance = second->getAddr() - first->getAddr();
-- unsigned int origAddr = eh_frame->getAddr();
-+ Elf64_Off distance = second->getAddr() - first->getAddr();
-+ Elf64_Addr origAddr = eh_frame->getAddr();
- ElfSection* previous = first->getPrevious();
- first->getShdr().sh_addr = (previous->getAddr() + previous->getSize() +
- first->getAddrAlign() - 1) &
- ~(first->getAddrAlign() - 1);
- second->getShdr().sh_addr =
- (first->getAddr() + std::min(first->getSize(), distance) +
- second->getAddrAlign() - 1) &
- ~(second->getAddrAlign() - 1);
-diff --git a/build/unix/elfhack/elfxx.h b/build/unix/elfhack/elfxx.h
---- a/build/unix/elfhack/elfxx.h
-+++ b/build/unix/elfhack/elfxx.h
-@@ -280,17 +280,17 @@ typedef serializable<Elf_Shdr_Traits> El
- class Elf {
- public:
- Elf(std::ifstream& file);
- ~Elf();
-
- /* index == -1 is treated as index == ehdr.e_shstrndx */
- ElfSection* getSection(int index);
-
-- ElfSection* getSectionAt(unsigned int offset);
-+ ElfSection* getSectionAt(Elf64_Off offset);
-
- ElfSegment* getSegmentByType(unsigned int type, ElfSegment* last =
nullptr);
-
- ElfDynamic_Section* getDynSection();
-
- void normalize();
- void write(std::ofstream& file);
-
-@@ -329,18 +329,18 @@ class ElfSection {
-
- ElfSection(Elf_Shdr& s, std::ifstream* file, Elf* parent);
-
- virtual ~ElfSection() { free(data); }
-
- const char* getName() { return name; }
- unsigned int getType() { return shdr.sh_type; }
- unsigned int getFlags() { return shdr.sh_flags; }
-- unsigned int getAddr();
-- unsigned int getSize() { return shdr.sh_size; }
-+ Elf64_Addr getAddr();
-+ Elf64_Off getSize() { return shdr.sh_size; }
- unsigned int getAddrAlign() { return shdr.sh_addralign; }
- unsigned int getEntSize() { return shdr.sh_entsize; }
- const char* getData() { return data; }
- ElfSection* getLink() { return link; }
- SectionInfo getInfo() { return info; }
-
- void shrink(unsigned int newsize) {
- if (newsize < shdr.sh_size) {
-@@ -353,17 +353,17 @@ class ElfSection {
- if (newsize > shdr.sh_size) {
- data = static_cast<char*>(realloc(data, newsize));
- memset(data + shdr.sh_size, 0, newsize - shdr.sh_size);
- shdr.sh_size = newsize;
- markDirty();
- }
- }
-
-- unsigned int getOffset();
-+ Elf64_Off getOffset();
- int getIndex();
- Elf_Shdr& getShdr();
-
- ElfSection* getNext() { return next; }
- ElfSection* getPrevious() { return previous; }
-
- virtual bool isRelocatable() {
- return ((getType() == SHT_SYMTAB) || (getType() == SHT_STRTAB) ||
-
diff --git
a/http/firefox-esr/patches/0029-bmo-1839023-arm-unified-build-missing-header.patch

b/http/firefox-esr/patches/0029-bmo-1839023-arm-unified-build-missing-header.patch
deleted file mode 100644
index ae426cd..0000000
---
a/http/firefox-esr/patches/0029-bmo-1839023-arm-unified-build-missing-header.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-
-# HG changeset patch
-# User serge-sans-paille <sguelton AT mozilla.com>
-# Date 1687447863 0
-# Node ID 34ef9f4d1d2c638f47eb4615a6ea47c011c91e87
-# Parent eecca96ba9040cb07462280dda39d8551fc8c098
-Bug 1839023 - Fix missing arm-specifc header r=nbp
-
-Differential Revision: https://phabricator.services.mozilla.com/D181738
-
-diff --git a/js/src/jit/shared/AtomicOperations-shared-jit.cpp
b/js/src/jit/shared/AtomicOperations-shared-jit.cpp
---- a/js/src/jit/shared/AtomicOperations-shared-jit.cpp
-+++ b/js/src/jit/shared/AtomicOperations-shared-jit.cpp
-@@ -1,16 +1,20 @@
- /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: set ts=8 sts=4 et sw=4 tw=99:
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
- #include "jit/AtomicOperations.h"
-
-+#if defined(__arm__)
-+# include "jit/arm/Architecture-arm.h"
-+#endif
-+
- #ifdef JS_HAVE_GENERATED_ATOMIC_OPS
-
- # include <atomic>
-
- # include "js/GCAPI.h"
-
- using namespace js;
- using namespace js::jit;
-@@ -73,18 +77,18 @@ void AtomicMemcpyDownUnsynchronized(uint
- const uint8_t* lim = src + nbytes;
-
- // Set up bulk copying. The cases are ordered the way they are on the
- // assumption that if we can achieve aligned copies even with a little
- // preprocessing then that is better than unaligned copying on a platform
- // that supports it.
-
- if (nbytes >= WORDSIZE) {
-- void (*copyBlock)(uint8_t * dest, const uint8_t* src);
-- void (*copyWord)(uint8_t * dest, const uint8_t* src);
-+ void (*copyBlock)(uint8_t* dest, const uint8_t* src);
-+ void (*copyWord)(uint8_t* dest, const uint8_t* src);
-
- if (((uintptr_t(dest) ^ uintptr_t(src)) & WORDMASK) == 0) {
- const uint8_t* cutoff = (const uint8_t*)RoundUp(uintptr_t(src),
WORDSIZE);
- MOZ_ASSERT(cutoff <= lim); // because nbytes >= WORDSIZE
- while (src < cutoff) {
- AtomicCopyByteUnsynchronized(dest++, src++);
- }
- copyBlock = AtomicCopyBlockDownUnsynchronized;
-@@ -126,18 +130,18 @@ void AtomicMemcpyUpUnsynchronized(uint8_
- JS::AutoSuppressGCAnalysis nogc;
-
- const uint8_t* lim = src;
-
- src += nbytes;
- dest += nbytes;
-
- if (nbytes >= WORDSIZE) {
-- void (*copyBlock)(uint8_t * dest, const uint8_t* src);
-- void (*copyWord)(uint8_t * dest, const uint8_t* src);
-+ void (*copyBlock)(uint8_t* dest, const uint8_t* src);
-+ void (*copyWord)(uint8_t* dest, const uint8_t* src);
-
- if (((uintptr_t(dest) ^ uintptr_t(src)) & WORDMASK) == 0) {
- const uint8_t* cutoff = (const uint8_t*)(uintptr_t(src) & ~WORDMASK);
- MOZ_ASSERT(cutoff >= lim); // Because nbytes >= WORDSIZE
- while (src > cutoff) {
- AtomicCopyByteUnsynchronized(--dest, --src);
- }
- copyBlock = AtomicCopyBlockUpUnsynchronized;
-
diff --git
a/http/firefox-esr/patches/0032-bmo-1838323-disambiguate-skvx-when-building-with-different-arches.patch

b/http/firefox-esr/patches/0032-bmo-1838323-disambiguate-skvx-when-building-with-different-arches.patch
deleted file mode 100644
index f11821d..0000000
---
a/http/firefox-esr/patches/0032-bmo-1838323-disambiguate-skvx-when-building-with-different-arches.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-
-# HG changeset patch
-# User Lee Salzman <lsalzman AT mozilla.com>
-# Date 1688610280 0
-# Node ID 07bc853b8799270e182342be68ddcfca8acb2f28
-# Parent fdcac5f186cb2394b6a7e9a0f03bacd38edff404
-Bug 1838323 - Disambiguate skvx when building with different arch options.
r=glandium
-
-It seems that GCC, under certain circumstances, does not completely inline
code in the skvx namespace in Skia, even though the code specifies
"always_inline". As a side-effect, it leaves around symbols that are
generated with different architecture flags supplied. LTO then picks one of
the symbols, at what may as well be random.
-
-This could potentially be an issue under clang if it ever failed to inline.
-
-As a workaround for both, we force skvx to exist in arch-specific
namespaces, i.e. -Dskvx=skvx_foo, so that even in the worst case, no
ambiguous symbols will be generated.
-
-Differential Revision: https://phabricator.services.mozilla.com/D182855
-
-diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py
---- a/gfx/skia/generate_mozbuild.py
-+++ b/gfx/skia/generate_mozbuild.py
-@@ -47,24 +47,24 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wind
- UNIFIED_SOURCES += [
- 'skia/src/fonts/SkFontMgr_indirect.cpp',
- 'skia/src/fonts/SkRemotableFontMgr.cpp',
- ]
-
- # We should autogenerate these SSE related flags.
-
- if CONFIG['INTEL_ARCHITECTURE']:
-- SOURCES['skia/src/opts/SkOpts_ssse3.cpp'].flags += ['-mssse3']
-- SOURCES['skia/src/opts/SkOpts_sse42.cpp'].flags += ['-msse4.2']
-- SOURCES['skia/src/opts/SkOpts_avx.cpp'].flags += ['-mavx']
-- SOURCES['skia/src/opts/SkOpts_hsw.cpp'].flags += ['-mavx2', '-mf16c',
'-mfma']
-+ SOURCES['skia/src/opts/SkOpts_ssse3.cpp'].flags +=
['-Dskvx=skvx_ssse3', '-mssse3']
-+ SOURCES['skia/src/opts/SkOpts_sse42.cpp'].flags +=
['-Dskvx=skvx_sse42', '-msse4.2']
-+ SOURCES['skia/src/opts/SkOpts_avx.cpp'].flags += ['-Dskvx=skvx_avx',
'-mavx']
-+ SOURCES['skia/src/opts/SkOpts_hsw.cpp'].flags += ['-Dskvx=skvx_hsw',
'-mavx2', '-mf16c', '-mfma']
- if not CONFIG["MOZ_CODE_COVERAGE"]:
-- SOURCES['skia/src/opts/SkOpts_skx.cpp'].flags += ['-mavx512f',
'-mavx512dq', '-mavx512cd', '-mavx512bw', '-mavx512vl']
-+ SOURCES['skia/src/opts/SkOpts_skx.cpp'].flags +=
['-Dskvx=skvx_skx', '-mavx512f', '-mavx512dq', '-mavx512cd', '-mavx512bw',
'-mavx512vl']
- elif CONFIG['CPU_ARCH'] == 'aarch64' and CONFIG['CC_TYPE'] in ('clang',
'gcc'):
-- SOURCES['skia/src/opts/SkOpts_crc32.cpp'].flags +=
['-march=armv8-a+crc']
-+ SOURCES['skia/src/opts/SkOpts_crc32.cpp'].flags +=
['-Dskvx=skvx_crc32', '-march=armv8-a+crc']
-
- DEFINES['MOZ_SKIA'] = True
-
- DEFINES['SKIA_IMPLEMENTATION'] = 1
-
- DEFINES['SK_PDF_USE_HARFBUZZ_SUBSETTING'] = 1
-
- if CONFIG['MOZ_TREE_FREETYPE']:
-diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build
---- a/gfx/skia/moz.build
-+++ b/gfx/skia/moz.build
-@@ -557,24 +557,24 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wind
- UNIFIED_SOURCES += [
- 'skia/src/fonts/SkFontMgr_indirect.cpp',
- 'skia/src/fonts/SkRemotableFontMgr.cpp',
- ]
-
- # We should autogenerate these SSE related flags.
-
- if CONFIG['INTEL_ARCHITECTURE']:
-- SOURCES['skia/src/opts/SkOpts_ssse3.cpp'].flags += ['-mssse3']
-- SOURCES['skia/src/opts/SkOpts_sse42.cpp'].flags += ['-msse4.2']
-- SOURCES['skia/src/opts/SkOpts_avx.cpp'].flags += ['-mavx']
-- SOURCES['skia/src/opts/SkOpts_hsw.cpp'].flags += ['-mavx2', '-mf16c',
'-mfma']
-+ SOURCES['skia/src/opts/SkOpts_ssse3.cpp'].flags +=
['-Dskvx=skvx_ssse3', '-mssse3']
-+ SOURCES['skia/src/opts/SkOpts_sse42.cpp'].flags +=
['-Dskvx=skvx_sse42', '-msse4.2']
-+ SOURCES['skia/src/opts/SkOpts_avx.cpp'].flags += ['-Dskvx=skvx_avx',
'-mavx']
-+ SOURCES['skia/src/opts/SkOpts_hsw.cpp'].flags += ['-Dskvx=skvx_hsw',
'-mavx2', '-mf16c', '-mfma']
- if not CONFIG["MOZ_CODE_COVERAGE"]:
-- SOURCES['skia/src/opts/SkOpts_skx.cpp'].flags += ['-mavx512f',
'-mavx512dq', '-mavx512cd', '-mavx512bw', '-mavx512vl']
-+ SOURCES['skia/src/opts/SkOpts_skx.cpp'].flags +=
['-Dskvx=skvx_skx', '-mavx512f', '-mavx512dq', '-mavx512cd', '-mavx512bw',
'-mavx512vl']
- elif CONFIG['CPU_ARCH'] == 'aarch64' and CONFIG['CC_TYPE'] in ('clang',
'gcc'):
-- SOURCES['skia/src/opts/SkOpts_crc32.cpp'].flags +=
['-march=armv8-a+crc']
-+ SOURCES['skia/src/opts/SkOpts_crc32.cpp'].flags +=
['-Dskvx=skvx_crc32', '-march=armv8-a+crc']
-
- DEFINES['MOZ_SKIA'] = True
-
- DEFINES['SKIA_IMPLEMENTATION'] = 1
-
- DEFINES['SK_PDF_USE_HARFBUZZ_SUBSETTING'] = 1
-
- if CONFIG['MOZ_TREE_FREETYPE']:
-



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (e6b6a0b3f522da8c86fbf6f6b6327bb92204484f), Thomas Orgis, 10/05/2023

Archive powered by MHonArc 2.6.24.

Top of Page