Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at 2019-09-17 13:34:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MozillaFirefox (Old) and /work/SRC/openSUSE:Factory/.MozillaFirefox.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "MozillaFirefox" Tue Sep 17 13:34:43 2019 rev:295 rq:730473 version:69.0 Changes: -------- --- /work/SRC/openSUSE:Factory/MozillaFirefox/MozillaFirefox.changes 2019-09-07 11:27:19.742479998 +0200 +++ /work/SRC/openSUSE:Factory/.MozillaFirefox.new.7948/MozillaFirefox.changes 2019-09-17 13:34:44.925868309 +0200 @@ -1,0 +2,47 @@ +Thu Sep 5 13:02:39 UTC 2019 - Wolfgang Rosenauer <[email protected]> + +- Mozilla Firefox 69.0 + * Enhanced Tracking Protection (ETP) for stronger privacy protections + * Block Autoplay feature is enhanced to give users the option to block + any video + * Users in the US or using the en-US browser, can get a new “New Tab” + page experience connecting to the best of Pocket's content. + * Support for the Web Authentication HmacSecret extension via + Windows Hello introduced. + * Support for receiving multiple video codecs with this release makes + it easier for WebRTC conferencing services to mix video from + different clients. + MFSA 2019-25 (boo#1149324) + * CVE-2019-11741 (bmo#1539595) + Isolate addons.mozilla.org and accounts.firefox.com + * CVE-2019-5849 (bmo#1555838) + Out-of-bounds read in Skia + * CVE-2019-11737 (bmo#1388015) + Content security policy directives ignore port and path if host is a wildcard + * CVE-2019-11734 (bmo#1352875,bmo#1536227,bmo#1557208,bmo#1560641) + Memory safety bugs fixed in Firefox 69 + * CVE-2019-11735 (bmo#1561404,bmo#1561484,bmo#1568047,bmo#1561912, + bmo#1565744,bmo#1568858,bmo#1570358) + Memory safety bugs fixed in Firefox 69 and Firefox ESR 68.1 + * CVE-2019-11740 (bmo#1563133,bmo#1573160) + Memory safety bugs fixed in Firefox 69, Firefox ESR 68.1, and Firefox ESR 60.9 +- requires + * rust/cargo >= 1.35 + * rust-cbindgen >= 0.9.0 + * mozilla-nss >= 3.45 +- rebased patches + +------------------------------------------------------------------- +Wed Sep 4 15:38:40 UTC 2019 - Wolfgang Rosenauer <[email protected]> + +- added a bunch of patches mainly for big endian platforms + * mozilla-bmo1504834-part1.patch + * mozilla-bmo1504834-part2.patch + * mozilla-bmo1504834-part3.patch + * mozilla-bmo1511604.patch + * mozilla-bmo1554971.patch + * mozilla-bmo1573381.patch + * mozilla-nestegg-big-endian.patch + * mozilla-bmo1512162.patch + +------------------------------------------------------------------- Old: ---- firefox-68.1.0esr.source.tar.xz firefox-68.1.0esr.source.tar.xz.asc l10n-68.1.0esr.tar.xz New: ---- firefox-69.0.source.tar.xz firefox-69.0.source.tar.xz.asc l10n-69.0.tar.xz mozilla-bmo1504834-part1.patch mozilla-bmo1504834-part2.patch mozilla-bmo1504834-part3.patch mozilla-bmo1511604.patch mozilla-bmo1512162.patch mozilla-bmo1554971.patch mozilla-bmo1573381.patch mozilla-nestegg-big-endian.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.ZgJnn8/_old 2019-09-17 13:35:19.473862800 +0200 +++ /var/tmp/diff_new_pack.ZgJnn8/_new 2019-09-17 13:35:19.473862800 +0200 @@ -18,13 +18,13 @@ # changed with every update -%define major 68 -%define mainver %major.1.0 -%define orig_version 68.1.0 -%define orig_suffix esr -%define update_channel esr68 +%define major 69 +%define mainver %major.0 +%define orig_version 69.0 +%define orig_suffix %{nil} +%define update_channel release %define branding 1 -%define releasedate 20190826132627 +%define releasedate 20190827005903 %define source_prefix firefox-%{orig_version} # always build with GCC as SUSE Security Team requires that @@ -33,6 +33,8 @@ # PIE, full relro %define build_hardened 1 +%bcond_with only_print_mozconfig + # Firefox only supports i686 %ifarch %ix86 ExclusiveArch: i586 i686 @@ -70,7 +72,7 @@ %else BuildRequires: gcc-c++ %endif -BuildRequires: cargo >= 1.34 +BuildRequires: cargo >= 1.35 BuildRequires: libXcomposite-devel BuildRequires: libcurl-devel BuildRequires: libidl-devel @@ -79,14 +81,14 @@ BuildRequires: libproxy-devel BuildRequires: makeinfo BuildRequires: mozilla-nspr-devel >= 4.21 -BuildRequires: mozilla-nss-devel >= 3.44.1 +BuildRequires: mozilla-nss-devel >= 3.45 BuildRequires: nasm >= 2.13 -BuildRequires: nodejs >= 8.11 +BuildRequires: nodejs8 >= 8.11 BuildRequires: python-devel BuildRequires: python2-xml BuildRequires: python3 >= 3.5 -BuildRequires: rust >= 1.34 -BuildRequires: rust-cbindgen >= 0.8.7 +BuildRequires: rust >= 1.35 +BuildRequires: rust-cbindgen >= 0.9.0 BuildRequires: startup-notification-devel BuildRequires: unzip BuildRequires: update-desktop-files @@ -134,7 +136,8 @@ License: MPL-2.0 Group: Productivity/Networking/Web/Browsers Url: http://www.mozilla.org/ -Source: http://ftp.mozilla.org/pub/firefox/releases/%{version}%{orig_suffix}/source/firefox-%{orig_version}%{orig_suffix}.source.tar.xz +%if !%{with only_print_mozconfig} +Source: http://ftp.mozilla.org/pub/%{progname}/releases/%{version}%{orig_suffix}/source/firefox-%{orig_version}%{orig_suffix}.source.tar.xz Source1: MozillaFirefox.desktop Source2: MozillaFirefox-rpmlintrc Source3: mozilla.sh.in @@ -157,7 +160,7 @@ Source18: mozilla-api-key Source19: google-api-key Source20: https://ftp.mozilla.org/pub/%{progname}/releases/%{version}%{orig_suffix}/source/%{progname}-%{orig_version}%{orig_suffix}.source.tar.xz.asc -Source21: mozilla.keyring +Source21: https://ftp.mozilla.org/pub/%{progname}/releases/%{version}%{orig_suffix}/KEY#/mozilla.keyring # Gecko/Toolkit Patch1: mozilla-nongnome-proxies.patch Patch2: mozilla-kde.patch @@ -174,10 +177,19 @@ Patch13: mozilla-ppc-altivec_static_inline.patch Patch14: mozilla-bmo1005535.patch Patch15: mozilla-bmo1568145.patch +Patch16: mozilla-bmo1573381.patch +Patch17: mozilla-bmo1504834-part1.patch +Patch18: mozilla-bmo1504834-part2.patch +Patch19: mozilla-bmo1504834-part3.patch +Patch20: mozilla-bmo1511604.patch +Patch21: mozilla-bmo1554971.patch +Patch22: mozilla-nestegg-big-endian.patch +Patch23: mozilla-bmo1512162.patch # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-branded-icons.patch Patch103: firefox-add-kde.js-in-order-to-survive-PGO-build.patch +%endif # only_print_mozconfig BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): coreutils shared-mime-info desktop-file-utils Requires(postun): shared-mime-info desktop-file-utils @@ -267,13 +279,14 @@ symbols meant for upload to Mozilla's crash collector database. %endif +%if !%{with only_print_mozconfig} %prep %if %localize # If generated incorrectly, the tarball will be ~270B in # size, so 1MB seems like good enough limit to check. MINSIZE=1048576 -if (( $(stat -c%s "%{SOURCE7}") < MINSIZE)); then +if (( $(stat -Lc%s "%{SOURCE7}") < MINSIZE)); then echo "Translations tarball %{SOURCE7} not generated properly." exit 1 fi @@ -293,19 +306,29 @@ %patch8 -p1 %patch9 -p1 %patch10 -p1 -%ifarch s390x +%ifarch s390x ppc64 %patch11 -p1 %endif %patch12 -p1 %patch13 -p1 %patch14 -p1 %patch15 -p1 +%patch16 -p1 +%patch17 -p1 +%patch18 -p1 +%patch19 -p1 +%patch20 -p1 +%patch21 -p1 +%patch22 -p1 +%patch23 -p1 # Firefox %patch101 -p1 %patch102 -p1 %patch103 -p1 +%endif # only_print_mozconfig %build +%if !%{with only_print_mozconfig} # no need to add build time to binaries modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\"" @@ -318,6 +341,8 @@ exit 1 fi source %{SOURCE5} +%endif # only_print_mozconfig + export MOZ_SOURCE_CHANGESET=$REV export SOURCE_REPO=$REPO export source_repo=$REPO @@ -348,8 +373,18 @@ %endif export CXXFLAGS="$CFLAGS" export MOZCONFIG=$RPM_BUILD_DIR/mozconfig +%if %{with only_print_mozconfig} +echo "export CC=$CC" +echo "export CXX=$CXX" +echo "export CFLAGS=\"$CFLAGS\"" +echo "export LDFLAGS=\"$LDFLAGS\"" +echo "export RUSTFLAGS=\"$RUSTFLAGS\"" +echo "" +cat << EOF +%else %limit_build -m 2000 cat << EOF > $MOZCONFIG +%endif mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 mk_add_options MOZ_MAKE_FLAGS=%{?jobs:-j%jobs} @@ -413,7 +448,7 @@ ac_add_options --disable-webrtc %endif # mitigation/workaround for bmo#1512162 -%ifarch ppc64le +%ifarch ppc64le s390x ac_add_options --enable-optimize="-O1" %endif %ifarch x86_64 @@ -424,7 +459,19 @@ %endif %endif EOF +%if !%{with only_print_mozconfig} +%ifarch ppc64 s390x s390 +# NOTE: Currently, system-icu is too old, so we can't build with that, +# but have to generate the .dat-file freshly. This seems to be a +# less fragile approach anyways. +# ac_add_options --with-system-icu +echo "Generate big endian version of config/external/icu/data/icud58l.dat" +./mach python intl/icu_sources_data.py . +ls -l config/external/icu/data +rm -f config/external/icu/data/icudt*l.dat +%endif xvfb-run --server-args="-screen 0 1920x1080x24" ./mach build +%endif # only_print_mozconfig %install cd $RPM_BUILD_DIR/obj @@ -440,7 +487,7 @@ grep amazondotcom dist/firefox/browser/omni.ja # copy tree into RPM_BUILD_ROOT mkdir -p %{buildroot}%{progdir} -cp -rf $RPM_BUILD_DIR/obj/dist/firefox/* %{buildroot}%{progdir} +cp -rf $RPM_BUILD_DIR/obj/dist/%{progname}/* %{buildroot}%{progdir} mkdir -p %{buildroot}%{progdir}/distribution/extensions mkdir -p %{buildroot}%{progdir}/browser/defaults/preferences/ # install gre prefs @@ -448,7 +495,7 @@ # install browser prefs install -m 644 %{SOURCE6} %{buildroot}%{progdir}/browser/defaults/preferences/kde.js install -m 644 %{SOURCE9} %{buildroot}%{progdir}/browser/defaults/preferences/firefox.js -# install additional locales +# build additional locales %if %localize mkdir -p %{buildroot}%{progdir}/browser/extensions truncate -s 0 %{_tmppath}/translations.{common,other} ++++++ compare-locales.tar.xz ++++++ ++++++ firefox-68.1.0esr.source.tar.xz -> firefox-69.0.source.tar.xz ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/firefox-68.1.0esr.source.tar.xz /work/SRC/openSUSE:Factory/.MozillaFirefox.new.7948/firefox-69.0.source.tar.xz differ: char 15, line 1 ++++++ firefox-kde.patch ++++++ ++++ 1411 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/MozillaFirefox/firefox-kde.patch ++++ and /work/SRC/openSUSE:Factory/.MozillaFirefox.new.7948/firefox-kde.patch ++++++ l10n-68.1.0esr.tar.xz -> l10n-69.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/l10n-68.1.0esr.tar.xz /work/SRC/openSUSE:Factory/.MozillaFirefox.new.7948/l10n-69.0.tar.xz differ: char 26, line 1 ++++++ mozilla-bmo1463035.patch ++++++ --- /var/tmp/diff_new_pack.ZgJnn8/_old 2019-09-17 13:35:19.761862754 +0200 +++ /var/tmp/diff_new_pack.ZgJnn8/_new 2019-09-17 13:35:19.761862754 +0200 @@ -3,7 +3,7 @@ # User Mike Hommey <[email protected]> # Date 1526871862 -32400 # Node ID 94f21505ff13cd089f7129cd24927cf8b31a0f43 -# Parent fc741a5ea37dbe145e0ca5f85e5dfb100f3c9091 +# Parent 5dc1d2186f44dd6ccfc4b28b9e1ed859cffc63bb Bug 1463035 - Remove MOZ_SIGNAL_TRAMPOLINE. r?darchons For some reason, GNU as is not happy with the assembly generated after @@ -36,6 +36,46 @@ 'double-conversion/double-conversion/bignum.cc', 'double-conversion/double-conversion/cached-powers.cc', 'double-conversion/double-conversion/diy-fp.cc', +diff --git a/mozglue/baseprofiler/core/platform-linux-android.cpp b/mozglue/baseprofiler/core/platform-linux-android.cpp +--- a/mozglue/baseprofiler/core/platform-linux-android.cpp ++++ b/mozglue/baseprofiler/core/platform-linux-android.cpp +@@ -55,17 +55,16 @@ + #ifdef __GLIBC__ + # include <execinfo.h> // backtrace, backtrace_symbols + #endif // def __GLIBC__ + #include <strings.h> // index + #include <errno.h> + #include <stdarg.h> + + #include "prenv.h" +-#include "mozilla/LinuxSignal.h" + #include "mozilla/PodOperations.h" + #include "mozilla/DebugOnly.h" + + #include <string.h> + #include <list> + + using namespace mozilla; + +@@ -266,17 +265,17 @@ Sampler::Sampler(PSLockRef aLock) + + // NOTE: We don't initialize LUL here, instead initializing it in + // SamplerThread's constructor. This is because with the + // profiler_suspend_and_sample_thread entry point, we want to be able to + // sample without waiting for LUL to be initialized. + + // Request profiling signals. + struct sigaction sa; +- sa.sa_sigaction = MOZ_SIGNAL_TRAMPOLINE(SigprofHandler); ++ sa.sa_sigaction = SigprofHandler; + sigemptyset(&sa.sa_mask); + sa.sa_flags = SA_RESTART | SA_SIGINFO; + if (sigaction(SIGPROF, &sa, &mOldSigprofHandler) != 0) { + MOZ_CRASH("Error installing SIGPROF handler in the profiler"); + } + } + + void Sampler::Disable(PSLockRef aLock) { diff --git a/tools/profiler/core/platform-linux-android.cpp b/tools/profiler/core/platform-linux-android.cpp --- a/tools/profiler/core/platform-linux-android.cpp +++ b/tools/profiler/core/platform-linux-android.cpp @@ -57,7 +97,7 @@ using namespace mozilla; -@@ -248,17 +247,17 @@ Sampler::Sampler(PSLockRef aLock) +@@ -257,17 +256,17 @@ Sampler::Sampler(PSLockRef aLock) // NOTE: We don't initialize LUL here, instead initializing it in // SamplerThread's constructor. This is because with the ++++++ mozilla-bmo1504834-part1.patch ++++++ # HG changeset patch # Parent 051b75a600dfbf7503c3485cebfd34d4eb29be96 Taken from https://bugzilla.mozilla.org/show_bug.cgi?id=1504834 diff -r 051b75a600df gfx/2d/DrawTargetSkia.cpp --- a/gfx/2d/DrawTargetSkia.cpp Fri Jul 05 12:42:44 2019 +0200 +++ b/gfx/2d/DrawTargetSkia.cpp Mon Jul 08 10:59:30 2019 +0200 @@ -138,8 +138,7 @@ return surfaceBounds.Intersect(bounds); } -static const int kARGBAlphaOffset = - SurfaceFormat::A8R8G8B8_UINT32 == SurfaceFormat::B8G8R8A8 ? 3 : 0; +static const int kARGBAlphaOffset = 0; // Skia is always BGRA SurfaceFormat::A8R8G8B8_UINT32 == SurfaceFormat::B8G8R8A8 ? 3 : 0; static bool VerifyRGBXFormat(uint8_t* aData, const IntSize& aSize, const int32_t aStride, SurfaceFormat aFormat) { diff -r 051b75a600df gfx/2d/Types.h --- a/gfx/2d/Types.h Fri Jul 05 12:42:44 2019 +0200 +++ b/gfx/2d/Types.h Mon Jul 08 10:59:30 2019 +0200 @@ -85,15 +85,8 @@ // The following values are endian-independent synonyms. The _UINT32 suffix // indicates that the name reflects the layout when viewed as a uint32_t // value. -#if MOZ_LITTLE_ENDIAN A8R8G8B8_UINT32 = B8G8R8A8, // 0xAARRGGBB X8R8G8B8_UINT32 = B8G8R8X8 // 0x00RRGGBB -#elif MOZ_BIG_ENDIAN - A8R8G8B8_UINT32 = A8R8G8B8, // 0xAARRGGBB - X8R8G8B8_UINT32 = X8R8G8B8 // 0x00RRGGBB -#else -# error "bad endianness" -#endif }; static inline int BytesPerPixel(SurfaceFormat aFormat) { diff -r 051b75a600df gfx/skia/skia/third_party/skcms/skcms.cc --- a/gfx/skia/skia/third_party/skcms/skcms.cc Fri Jul 05 12:42:44 2019 +0200 +++ b/gfx/skia/skia/third_party/skcms/skcms.cc Mon Jul 08 10:59:30 2019 +0200 @@ -17,6 +17,8 @@ #include <arm_neon.h> #elif defined(__SSE__) #include <immintrin.h> +#else + #define SKCMS_PORTABLE #endif // sizeof(x) will return size_t, which is 32-bit on some machines and 64-bit on others. @@ -124,20 +126,28 @@ static uint16_t read_big_u16(const uint8_t* ptr) { uint16_t be; memcpy(&be, ptr, sizeof(be)); -#if defined(_MSC_VER) +#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ + return be; +#else + #if defined(_MSC_VER) return _byteswap_ushort(be); -#else + #else return __builtin_bswap16(be); + #endif #endif } static uint32_t read_big_u32(const uint8_t* ptr) { uint32_t be; memcpy(&be, ptr, sizeof(be)); -#if defined(_MSC_VER) +#if __BYTE_ORDER == __ORDER_BIG_ENDIAN__ + return be; +#else + #if defined(_MSC_VER) return _byteswap_ulong(be); -#else + #else return __builtin_bswap32(be); + #endif #endif } ++++++ mozilla-bmo1504834-part2.patch ++++++ # HG changeset patch # Parent 6fa4b62427433e8f445d05c557e5db096667d880 Skia does not support big endian. The places to fix are too numerous and upstream (skia, not Mozilla) has no interest in maintaining big endian. So here we try to swizzle the input for skia, so that skia always works on LE, and when it comes out again, we transform back to BE. diff --git a/gfx/2d/ConvolutionFilter.cpp b/gfx/2d/ConvolutionFilter.cpp --- a/gfx/2d/ConvolutionFilter.cpp +++ b/gfx/2d/ConvolutionFilter.cpp @@ -30,32 +30,79 @@ bool ConvolutionFilter::GetFilterOffsetA int32_t* aResultLength) { if (aRowIndex >= mFilter->numValues()) { return false; } mFilter->FilterForValue(aRowIndex, aResultOffset, aResultLength); return true; } +static void ByteSwapArray(uint8_t *u8Array, int32_t size) { + uint32_t *array = reinterpret_cast<uint32_t*>(u8Array); + for (int pxl = 0; pxl < size; ++pxl) { + // Use an endian swap to move the bytes, i.e. BGRA -> ARGB. + uint32_t rgba = array[pxl]; + array[pxl] = NativeEndian::swapToLittleEndian(rgba); + } +} + void ConvolutionFilter::ConvolveHorizontally(const uint8_t* aSrc, uint8_t* aDst, bool aHasAlpha) { +#if MOZ_BIG_ENDIAN + int outputSize = mFilter->numValues(); + + // Input size isn't handed in, so we have to calculate it quickly + int inputSize = 0; + for (int xx = 0; xx < outputSize; ++xx) { + // Get the filter that determines the current output pixel. + int filterOffset, filterLength; + mFilter->FilterForValue(xx, &filterOffset, &filterLength); + inputSize = std::max(inputSize, filterOffset + filterLength); + } + + ByteSwapArray((uint8_t*)aSrc, inputSize); +#endif + SkOpts::convolve_horizontally(aSrc, *mFilter, aDst, aHasAlpha); + +#if MOZ_BIG_ENDIAN + ByteSwapArray((uint8_t*)aSrc, inputSize); + ByteSwapArray(aDst, outputSize); +#endif } void ConvolutionFilter::ConvolveVertically(uint8_t* const* aSrc, uint8_t* aDst, int32_t aRowIndex, int32_t aRowSize, bool aHasAlpha) { MOZ_ASSERT(aRowIndex < mFilter->numValues()); int32_t filterOffset; int32_t filterLength; auto filterValues = mFilter->FilterForValue(aRowIndex, &filterOffset, &filterLength); + +#if MOZ_BIG_ENDIAN + for (int filterY = 0; filterY < filterLength; filterY++) { + // Skia only knows LE, so we have to swizzle the input + ByteSwapArray(aSrc[filterY], aRowSize); + } +#endif + SkOpts::convolve_vertically(filterValues, filterLength, aSrc, aRowSize, aDst, aHasAlpha); + +#if MOZ_BIG_ENDIAN + // After skia is finished, we swizzle back to BE, in case + // the input is used again somewhere else + for (int filterY = 0; filterY < filterLength; filterY++) { + ByteSwapArray(aSrc[filterY], aRowSize); + } + // The destination array as well + ByteSwapArray(aDst, aRowSize); +#endif } /* ConvolutionFilter::ComputeResizeFactor is derived from Skia's * SkBitmapScaler/SkResizeFilter::computeFactors. It is governed by Skia's * BSD-style license (see gfx/skia/LICENSE) and the following copyright: * Copyright (c) 2015 Google Inc. */ bool ConvolutionFilter::ComputeResizeFilter(ResizeMethod aResizeMethod, diff --git a/gfx/skia/skia/include/core/SkPreConfig.h b/gfx/skia/skia/include/core/SkPreConfig.h --- a/gfx/skia/skia/include/core/SkPreConfig.h +++ b/gfx/skia/skia/include/core/SkPreConfig.h @@ -68,17 +68,17 @@ #define SK_CPU_BENDIAN #elif defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) #define SK_CPU_LENDIAN #elif defined(__sparc) || defined(__sparc__) || \ defined(_POWER) || defined(__powerpc__) || \ defined(__ppc__) || defined(__hppa) || \ defined(__PPC__) || defined(__PPC64__) || \ defined(_MIPSEB) || defined(__ARMEB__) || \ - defined(__s390__) || \ + defined(__s390__) || defined(__s390x__) || \ (defined(__sh__) && defined(__BIG_ENDIAN__)) || \ (defined(__ia64) && defined(__BIG_ENDIAN__)) #define SK_CPU_BENDIAN #else #define SK_CPU_LENDIAN #endif #endif ++++++ mozilla-bmo1504834-part3.patch ++++++ # HG changeset patch # Parent aecb4600e5da17443b224c79eee178c1d8e155e3 For FF68, AntiAliasing of XULTexts seem to be broken on big endian (s390x). Text and icons of the sandwich-menu to the right of the address bar, as well as plugin-windows appears transparant, which usually means unreadable (white on white). diff -r aecb4600e5da gfx/skia/skia/include/private/SkNx.h --- a/gfx/skia/skia/include/private/SkNx.h Tue Aug 20 09:46:55 2019 +0200 +++ b/gfx/skia/skia/include/private/SkNx.h Mon Sep 09 10:04:06 2019 +0200 @@ -238,7 +238,18 @@ AI SkNx operator*(const SkNx& y) const { return fVal * y.fVal; } AI SkNx operator/(const SkNx& y) const { return fVal / y.fVal; } + // On Big endian the commented out variant doesn't work, + // and honestly, I have no idea why it exists in the first place. + // The reason its broken is, I think, that it defaults to the double-variant of ToBits() + // which gets a 64-bit integer, and FromBits returns 32-bit, + // cutting off the wrong half again. + // Overall, I see no reason to have ToBits and FromBits at all (even for floats/doubles). + // Still we are only "fixing" this for big endian and leave little endian alone (never touch a running system) +#ifdef SK_CPU_BENDIAN + AI SkNx operator&(const SkNx& y) const { return fVal & y.fVal; } +#else AI SkNx operator&(const SkNx& y) const { return FromBits(ToBits(fVal) & ToBits(y.fVal)); } +#endif AI SkNx operator|(const SkNx& y) const { return FromBits(ToBits(fVal) | ToBits(y.fVal)); } AI SkNx operator^(const SkNx& y) const { return FromBits(ToBits(fVal) ^ ToBits(y.fVal)); } diff -r aecb4600e5da gfx/skia/skia/src/opts/SkBlitMask_opts.h --- a/gfx/skia/skia/src/opts/SkBlitMask_opts.h Tue Aug 20 09:46:55 2019 +0200 +++ b/gfx/skia/skia/src/opts/SkBlitMask_opts.h Mon Sep 09 10:04:06 2019 +0200 @@ -203,7 +203,13 @@ // ~~~> // a = 1*aa + d(1-1*aa) = aa + d(1-aa) // c = 0*aa + d(1-1*aa) = d(1-aa) + + // For big endian we have to swap the alpha-mask from 0,0,0,255 to 255,0,0,0 +#ifdef SK_CPU_BENDIAN + return Sk4px(Sk16b(aa) & Sk16b(255,0,0,0, 255,0,0,0, 255,0,0,0, 255,0,0,0)) +#else return Sk4px(Sk16b(aa) & Sk16b(0,0,0,255, 0,0,0,255, 0,0,0,255, 0,0,0,255)) +#endif + d.approxMulDiv255(aa.inv()); }; while (h --> 0) { ++++++ mozilla-bmo1511604.patch ++++++ # HG changeset patch # User A. Wilcox <[email protected]> # Date 1543674229 0 # Sat Dec 01 14:23:49 2018 +0000 # Node ID 0309ff19e46b126c527e633518d7de8570442114 # Parent ba2c9b0542c95cc5ee26c264e8338fc9ba94c958 Bug 1511604 - Swizzle YCbCr->RGB data on big-endian machines Taken from https://bugzilla.mozilla.org/show_bug.cgi?id=1511604 This is very closely related to mozilla-bmo1504834 Again, input for skia is swizzled to LE, as skia only understands LE. diff --git a/gfx/ycbcr/YCbCrUtils.cpp b/gfx/ycbcr/YCbCrUtils.cpp --- a/gfx/ycbcr/YCbCrUtils.cpp +++ b/gfx/ycbcr/YCbCrUtils.cpp @@ -1,14 +1,16 @@ /* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*- * 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 "mozilla/EndianUtils.h" #include "gfx2DGlue.h" +#include "mozilla/gfx/Swizzle.h" #include "YCbCrUtils.h" #include "yuv_convert.h" #include "ycbcr_to_rgb565.h" namespace mozilla { namespace gfx { @@ -231,16 +233,23 @@ ConvertYCbCrToRGB(const layers::PlanarYC srcData.mPicSize.width, srcData.mPicSize.height, srcData.mYStride, srcData.mCbCrStride, aStride, yuvtype, srcData.mYUVColorSpace); } +#if MOZ_BIG_ENDIAN + // libyuv makes endian-correct result, which needs to be swapped to BGRX + if (aDestFormat != SurfaceFormat::R5G6B5_UINT16) + gfx::SwizzleData(aDestBuffer, aStride, gfx::SurfaceFormat::X8R8G8B8, + aDestBuffer, aStride, gfx::SurfaceFormat::B8G8R8X8, + srcData.mPicSize); +#endif } void ConvertYCbCrAToARGB(const uint8_t* aSrcY, const uint8_t* aSrcU, const uint8_t* aSrcV, const uint8_t* aSrcA, int aSrcStrideYA, int aSrcStrideUV, @@ -252,12 +261,18 @@ ConvertYCbCrAToARGB(const uint8_t* aSrcY aSrcV, aSrcA, aDstARGB, aWidth, aHeight, aSrcStrideYA, aSrcStrideUV, aDstStrideARGB); +#if MOZ_BIG_ENDIAN + // libyuv makes endian-correct result, which needs to be swapped to BGRA + gfx::SwizzleData(aDstARGB, aDstStrideARGB, gfx::SurfaceFormat::A8R8G8B8, + aDstARGB, aDstStrideARGB, gfx::SurfaceFormat::B8G8R8A8, + IntSize(aWidth, aHeight)); +#endif } } // namespace gfx } // namespace mozilla ++++++ mozilla-bmo1512162.patch ++++++ # HG changeset patch # Parent e5858dc7ab007042436496f7cfb9a5abf10f5082 This fixes a broken build for gcc < 9 on ppc64le. This patch can be removed for newer gcc-versions. diff -r e5858dc7ab00 -r 5d3469aabe61 js/xpconnect/src/XPCWrappedNative.cpp --- a/js/xpconnect/src/XPCWrappedNative.cpp Thu Nov 29 10:07:29 2018 +0100 +++ b/js/xpconnect/src/XPCWrappedNative.cpp Tue Sep 10 12:42:13 2019 +0200 @@ -1092,7 +1092,11 @@ MOZ_ALWAYS_INLINE bool GetOutParamSource(uint8_t paramIndex, MutableHandleValue srcp) const; - MOZ_ALWAYS_INLINE bool GatherAndConvertResults(); +#if !(__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN) +// Work around a compiler bug on ppc64le (bug 1512162). + MOZ_ALWAYS_INLINE +#endif + bool GatherAndConvertResults(); MOZ_ALWAYS_INLINE bool QueryInterfaceFastPath(); @@ -1139,7 +1143,11 @@ ~CallMethodHelper(); - MOZ_ALWAYS_INLINE bool Call(); +#if !(__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN) +// Work around a compiler bug on ppc64le (bug 1512162). + MOZ_ALWAYS_INLINE +#endif + bool Call(); // Trace implementation so we can put our CallMethodHelper in a Rooted<T>. void trace(JSTracer* aTrc); ++++++ mozilla-bmo1554971.patch ++++++ # HG changeset patch # Parent a25cebecb02d5460b8ad757fe9cb4a9c8d1d7658 Eliminate startup error message: JavaScript error: , line 0: Error: Type error for platformInfo value (Error processing arch: Invalid enumeration value "s390x") for runtime.getPlatformInfo. Reported here: https://bugzilla.mozilla.org/show_bug.cgi?id=1554971 Uncertain if this is causing real problems or not. Also uncertain if the fix actually fixes anything. No response from upstream yet. diff -r a25cebecb02d -r 378b81b00e73 toolkit/components/extensions/schemas/runtime.json --- a/toolkit/components/extensions/schemas/runtime.json Fri Jul 05 12:42:44 2019 +0200 +++ b/toolkit/components/extensions/schemas/runtime.json Fri Jul 19 13:19:30 2019 +0200 @@ -64,7 +64,7 @@ { "id": "PlatformArch", "type": "string", - "enum": ["arm", "x86-32", "x86-64"], + "enum": ["arm", "x86-32", "x86-64", "s390x", "aarch64", "ppc64le"], "allowedContexts": ["content", "devtools"], "description": "The machine's processor architecture." }, ++++++ mozilla-bmo1573381.patch ++++++ # HG changeset patch # Parent 45680ce4ca06795cbca1ea5a9ae8a7a11ab95cf1 The code tries to find a codec in a list of codecs. For this it searches for a given prefix. But the prefix is of type char16_t, which means 2 bytes per character instead of 1, as was compared here. On big endian this created some false positives, as the order of bytes is different and some characters only occupy "the first" byte, having the second null'ed out. Noticed because of gtest: MediaMIMETypes.MediaCodecs Upstream bugreport: https://bugzilla.mozilla.org/show_bug.cgi?id=1573381 diff -r 45680ce4ca06 -r 381102061fcc dom/media/MediaMIMETypes.cpp --- a/dom/media/MediaMIMETypes.cpp Mon Aug 05 09:28:53 2019 +0200 +++ b/dom/media/MediaMIMETypes.cpp Tue Aug 13 07:51:27 2019 +0200 @@ -87,7 +87,7 @@ const size_t prefixLength = aCodecPrefix.Length(); for (const auto& myCodec : Range()) { if (myCodec.Length() >= prefixLength && - memcmp(myCodec.Data(), aCodecPrefix.Data(), prefixLength) == 0) { + memcmp(myCodec.Data(), aCodecPrefix.Data(), prefixLength * sizeof(char16_t)) == 0) { return true; } } ++++++ mozilla-kde.patch ++++++ ++++ 663 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/MozillaFirefox/mozilla-kde.patch ++++ and /work/SRC/openSUSE:Factory/.MozillaFirefox.new.7948/mozilla-kde.patch ++++++ mozilla-nestegg-big-endian.patch ++++++ # HG changeset patch # Parent 381102061fccdec40efda75c7423a766f68201ba Bug-behavior: Youtube-videos using VP9 and opus as audio-codec started loading but did not play Reason: While parsing the audio-stream, the sampling frequency (short rate) was wrongly parsed by nestegg, returning 0 all the time. This led to the audio-track reporting that it neither had valid video nor audio. Which led to an endless-loop in the video state machine. Solution: Correct parsing of rate in nestegg, which is a float and cuts of bytes. Link: https://github.com/kinetiknz/nestegg/issues/64 diff -r 381102061fcc -r 8da4be020b1e media/libnestegg/src/nestegg.c --- a/media/libnestegg/src/nestegg.c Tue Aug 13 07:51:27 2019 +0200 +++ b/media/libnestegg/src/nestegg.c Tue Aug 20 07:59:54 2019 +0200 @@ -768,7 +768,15 @@ { union { uint64_t u; - float f; + struct { +#if __FLOAT_WORD_ORDER__ == __ORDER_BIG_ENDIAN__ + uint32_t _pad; + float f; +#else + float f; + uint32_t _pad; +#endif + } f; double d; } value; int r; @@ -780,7 +788,7 @@ if (r != 1) return r; if (length == 4) - *val = value.f; + *val = value.f.f; else *val = value.d; return 1; ++++++ mozilla-ppc-altivec_static_inline.patch ++++++ --- /var/tmp/diff_new_pack.ZgJnn8/_old 2019-09-17 13:35:19.901862732 +0200 +++ /var/tmp/diff_new_pack.ZgJnn8/_new 2019-09-17 13:35:19.901862732 +0200 @@ -3,13 +3,18 @@ # Date 1558452418 -7200 # Tue May 21 17:26:58 2019 +0200 # Node ID 6cd963b6c82ea6629aaf4050851789b78f310338 -# Parent 602e92722e765a3c238d3b96b26c0c8063b5eeb4 +# Parent 010a35335b4e45e222b9efdbda24fd1963202ecf imported patch mozilla-ppc-altivec_static_inline.patch -diff -r 602e92722e76 -r 6cd963b6c82e gfx/qcms/transform-altivec.c ---- a/gfx/qcms/transform-altivec.c Tue May 21 17:26:48 2019 +0200 -+++ b/gfx/qcms/transform-altivec.c Tue May 21 17:26:58 2019 +0200 -@@ -30,7 +30,7 @@ +diff --git a/gfx/qcms/transform-altivec.cpp b/gfx/qcms/transform-altivec.cpp +--- a/gfx/qcms/transform-altivec.cpp ++++ b/gfx/qcms/transform-altivec.cpp +@@ -25,17 +25,17 @@ + + #include "qcmsint.h" + + #define FLOATSCALE (float)(PRECACHE_OUTPUT_SIZE) + #define CLAMPMAXVAL (((float) (PRECACHE_OUTPUT_SIZE - 1)) / PRECACHE_OUTPUT_SIZE) static const ALIGN float floatScaleX4 = FLOATSCALE; static const ALIGN float clampMaxValueX4 = CLAMPMAXVAL; @@ -18,3 +23,8 @@ { vector float data = vec_lde(0, dataPtr); vector unsigned char moveToStart = vec_lvsl(0, dataPtr); + return vec_perm(data, data, moveToStart); + } + + template <size_t kRIndex, size_t kGIndex, size_t kBIndex, size_t kAIndex = NO_A_INDEX> + static void qcms_transform_data_template_lut_altivec(const qcms_transform *transform, ++++++ source-stamp.txt ++++++ --- /var/tmp/diff_new_pack.ZgJnn8/_old 2019-09-17 13:35:19.945862725 +0200 +++ /var/tmp/diff_new_pack.ZgJnn8/_new 2019-09-17 13:35:19.945862725 +0200 @@ -1,2 +1,2 @@ -REV=380fedbb18002297f1b233bd9c09764e59ddaa86 -REPO=http://hg.mozilla.org/releases/mozilla-esr68 +REV=cce4622026ab8e0130a0afc03f829f9b19ca38c2 +REPO=http://hg.mozilla.org/releases/mozilla-release ++++++ tar_stamps ++++++ --- /var/tmp/diff_new_pack.ZgJnn8/_old 2019-09-17 13:35:19.969862721 +0200 +++ /var/tmp/diff_new_pack.ZgJnn8/_new 2019-09-17 13:35:19.969862721 +0200 @@ -1,8 +1,8 @@ PRODUCT="firefox" -CHANNEL="esr68" -VERSION="68.1.0" -VERSION_SUFFIX="esr" -FF_RELEASE_TAG="380fedbb18002297f1b233bd9c09764e59ddaa86" +CHANNEL="release" +VERSION="69.0" +VERSION_SUFFIX="" +FF_RELEASE_TAG="cce4622026ab8e0130a0afc03f829f9b19ca38c2" TB_RELEASE_TAG="" PREV_VERSION="" PREV_VERSION_SUFFIX=""
