diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | firefox-disable-ffvpx-with-vapi.patch | 29 | ||||
| -rw-r--r-- | firefox.spec | 10 | ||||
| -rwxr-xr-x | run-tests-wayland | 57 | ||||
| -rw-r--r-- | sources | 4 |
5 files changed, 63 insertions, 39 deletions
@@ -439,3 +439,5 @@ firefox-3.6.4.source.tar.bz2 /firefox-84.0.source.tar.xz /firefox-langpacks-84.0-20201210.tar.xz /firefox-langpacks-84.0-20201214.tar.xz +/firefox-84.0.1.source.tar.xz +/firefox-langpacks-84.0.1-20201222.tar.xz diff --git a/firefox-disable-ffvpx-with-vapi.patch b/firefox-disable-ffvpx-with-vapi.patch deleted file mode 100644 index dfe6dd8..0000000 --- a/firefox-disable-ffvpx-with-vapi.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -up firefox-81.0/dom/media/platforms/PDMFactory.cpp.firefox-disable-ffvpx-with-vapi firefox-81.0/dom/media/platforms/PDMFactory.cpp ---- firefox-81.0/dom/media/platforms/PDMFactory.cpp.firefox-disable-ffvpx-with-vapi 2020-09-17 02:32:43.000000000 +0200 -+++ firefox-81.0/dom/media/platforms/PDMFactory.cpp 2020-09-21 10:30:29.393903183 +0200 -@@ -371,12 +371,6 @@ void PDMFactory::CreatePDMs() { - StartupPDM(m); - } - #endif --#ifdef MOZ_FFVPX -- if (StaticPrefs::media_ffvpx_enabled()) { -- m = FFVPXRuntimeLinker::CreateDecoderModule(); -- StartupPDM(m); -- } --#endif - #ifdef MOZ_FFMPEG - if (StaticPrefs::media_ffmpeg_enabled()) { - m = FFmpegRuntimeLinker::CreateDecoderModule(); -@@ -385,6 +379,12 @@ void PDMFactory::CreatePDMs() { - mFFmpegFailedToLoad = false; - } - #endif -+#ifdef MOZ_FFVPX -+ if (StaticPrefs::media_ffvpx_enabled()) { -+ m = FFVPXRuntimeLinker::CreateDecoderModule(); -+ StartupPDM(m); -+ } -+#endif - #ifdef MOZ_WIDGET_ANDROID - if (StaticPrefs::media_android_media_codec_enabled()) { - m = new AndroidDecoderModule(); diff --git a/firefox.spec b/firefox.spec index f8af39f..86cb1e2 100644 --- a/firefox.spec +++ b/firefox.spec @@ -137,13 +137,13 @@ ExcludeArch: s390x Summary: Mozilla Firefox Web browser Name: firefox -Version: 84.0 -Release: 7%{?pre_tag}%{?dist} +Version: 84.0.1 +Release: 1%{?pre_tag}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz %if %{with langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20201214.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20201222.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source10: firefox-mozconfig @@ -681,6 +681,7 @@ MOZ_SMP_FLAGS=-j1 [ "$RPM_BUILD_NCPUS" -ge 16 ] && MOZ_SMP_FLAGS=-j16 [ "$RPM_BUILD_NCPUS" -ge 24 ] && MOZ_SMP_FLAGS=-j24 [ "$RPM_BUILD_NCPUS" -ge 32 ] && MOZ_SMP_FLAGS=-j32 +[ "$RPM_BUILD_NCPUS" -ge 64 ] && MOZ_SMP_FLAGS=-j64 %endif echo "mk_add_options MOZ_MAKE_FLAGS=\"$MOZ_SMP_FLAGS\"" >> .mozconfig @@ -1006,6 +1007,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Tue Dec 22 2020 Martin Stransky <stransky@redhat.com> - 84.0.1-1 +- Updated to 84.0.1 + * Sun Dec 20 2020 Miro Hrončok <mhroncok@redhat.com> - 84.0-7 - Filter out private libraries provides - Fixes: rhbz#1908791 diff --git a/run-tests-wayland b/run-tests-wayland index 36d874d..eb42785 100755 --- a/run-tests-wayland +++ b/run-tests-wayland @@ -1,11 +1,44 @@ #!/usr/bin/bash +# usage: run-tests-wayland offscreen [test flavour] +if ! [ $1 ] ; then + echo "Missing test params!" + echo "" + echo "usage: run-tests-wayland offscreen [test_flavour]" + echo "" + echo " offscreen can be 0 or 1" + echo " test_flavour can be xpc ref moch crash" + exit +fi + set -x OFFSCREEN_TESTING=$1 +RUN_XPCSHELL_TEST=0 +RUN_REFTEST=0 +RUN_MOCHITEST=0 +RUN_CRASHTEST=0 + +SELECTED_TEST=$2 +if [ $SELECTED_TEST = "xpc" ] ; then + RUN_XPCSHELL_TEST=1 +elif [ $SELECTED_TEST = "ref" ] ; then + RUN_REFTEST=1 +elif [ $SELECTED_TEST = "moch" ] ; then + RUN_MOCHITEST=1 +elif [ $SELECTED_TEST = "crash" ] ; then + RUN_CRASHTEST=1 +else + RUN_XPCSHELL_TEST=1 + RUN_REFTEST=1 + RUN_MOCHITEST=1 + RUN_CRASHTEST=1 +fi + MACH_USE_SYSTEM_PYTHON=1 MOZ_NODE_PATH=/usr/bin/node MOCHITEST_PARAMS="--timeout 1 --chunk-by-dir 4" TEST_DIR="test_results" +mkdir $TEST_DIR # Fix for system nss ln -s /usr/bin/certutil objdir/dist/bin/certutil @@ -36,22 +69,36 @@ if [ $OFFSCREEN_TESTING -ne 0 ] ; then done fi -./mach xpcshell-test --sequential 2>&1 | cat - | tee $TEST_DIR/xpcshell -./mach xpcshell-test --sequential --enable-webrender 2>&1 | cat - | tee $TEST_DIR/xpcshell-wr +if [ $RUN_XPCSHELL_TEST -ne 0 ] ; then + ./mach xpcshell-test --sequential 2>&1 | cat - | tee $TEST_DIR/xpcshell + ./mach xpcshell-test --sequential --enable-webrender 2>&1 | cat - | tee $TEST_DIR/xpcshell-wr +fi # Basic render testing export TEST_PARAMS="" export TEST_FLAVOUR="" -./mach reftest $TEST_PARAMS 2>&1 | tee $TEST_DIR/reftest$TEST_FLAVOUR -./mach crashtest $TEST_PARAMS 2>&1 | tee $TEST_DIR/crashtest$TEST_FLAVOUR -./mach mochitest $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR +if [ $RUN_REFTEST -ne 0 ] ; then + ./mach reftest $TEST_PARAMS 2>&1 | tee $TEST_DIR/reftest$TEST_FLAVOUR +fi +if [ $RUN_CRASHTEST -ne 0 ] ; then + ./mach crashtest $TEST_PARAMS 2>&1 | tee $TEST_DIR/crashtest$TEST_FLAVOUR +fi +if [ $RUN_MOCHITEST -ne 0 ] ; then + ./mach mochitest $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR +fi # WebRender testing export TEST_PARAMS="--enable-webrender $TEST_PARAMS" export TEST_FLAVOUR="-wr" +if [ $RUN_REFTEST -ne 0 ] ; then ./mach reftest $TEST_PARAMS 2>&1 | tee $TEST_DIR/reftest$TEST_FLAVOUR +fi +if [ $RUN_CRASHTEST -ne 0 ] ; then ./mach crashtest $TEST_PARAMS 2>&1 | tee $TEST_DIR/crashtest$TEST_FLAVOUR +fi +if [ $RUN_MOCHITEST -ne 0 ] ; then ./mach mochitest $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR +fi rm -f objdir/dist/bin/certutil rm -f objdir/dist/bin/pk12util @@ -1,4 +1,4 @@ SHA512 (cbindgen-vendor.tar.xz) = 3c925c5523246b7dfbcb4ce563483d5b45315a06dc90f2cf07cddef0c263dd15b410afbbe4d86594de96a308e93be3b27ffec01f5f759a42ecba3cc983b1677f SHA512 (mochitest-python.tar.gz) = 7f357cb8bd93d64be5cb75819a8a813d2f8f217ff25f0df8c3190910744132405d45797b3900775a44b554f5c70cf2682809c9e7a686ca131fddcd81e98028d9 -SHA512 (firefox-84.0.source.tar.xz) = 6ad94617ee7b30c23c94dc5a0e0a5aded0022a91b7cbe393284659227e3a5e2390ce4438a459e9789291fa6ace787429388ce715ae1f758446b3c2e682c1d2ce -SHA512 (firefox-langpacks-84.0-20201214.tar.xz) = 139ce8f3f62740bbb6ec912c5cca1e086991bf1a6d887ed25e00a44f7a291b9cb269b32a2d1fc28297d4df9ff45c7099dbb414924fa9cd8f53f969d4c23d39ef +SHA512 (firefox-84.0.1.source.tar.xz) = e5fc2f4aa8cff2f34dcfae83c040ab0ffc23194840d1b00944c5293849f82be48c638112dec55f158002f2c6b6cc626a11a06ab55b0c327b29fba3bc078e4435 +SHA512 (firefox-langpacks-84.0.1-20201222.tar.xz) = 57cbf9cce363e81b5a14eb95c59a0012b949924a04ea903afcfe4dfe9148470820986c41d81fa93a7cbe1cd20d658dfb7798bbb34f4ce39fd14fd821623d3667 |