summaryrefslogtreecommitdiff
path: root/firefox.spec
diff options
context:
space:
mode:
authorMartin Stransky <stransky@redhat.com>2022-03-02 15:58:15 +0100
committerMartin Stransky <stransky@redhat.com>2022-03-02 15:58:15 +0100
commit34e2f4991c214dd61237a14f2a39f3d2bd819cc5 (patch)
tree758c3eb003e19c19724ecf301aaf5724949c86d0 /firefox.spec
parenti686 build fixes (diff)
downloadlibrewolf-fedora-ff-34e2f4991c214dd61237a14f2a39f3d2bd819cc5.tar.gz
librewolf-fedora-ff-34e2f4991c214dd61237a14f2a39f3d2bd819cc5.tar.bz2
librewolf-fedora-ff-34e2f4991c214dd61237a14f2a39f3d2bd819cc5.zip
Added support for ffmpeg 5.0, spec tweaks
Diffstat (limited to 'firefox.spec')
-rw-r--r--firefox.spec23
1 files changed, 19 insertions, 4 deletions
diff --git a/firefox.spec b/firefox.spec
index 185cc37..4720289 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -163,7 +163,7 @@ ExcludeArch: aarch64
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 98.0
-Release: 1%{?pre_tag}%{?dist}
+Release: 2%{?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
@@ -248,6 +248,11 @@ Patch402: mozilla-1196777.patch
Patch407: mozilla-1667096.patch
Patch408: mozilla-1663844.patch
Patch415: mozilla-1670333.patch
+# ffmpeg50
+Patch500: D139696.diff
+Patch501: D139697.diff
+Patch502: D139698.diff
+Patch503: D139699.diff
# PGO/LTO patches
Patch600: pgo.patch
@@ -495,6 +500,12 @@ This package contains results of tests executed during build.
%patch408 -p1 -b .1663844
%patch415 -p1 -b .1670333
+# ffmpeg50
+%patch500 -p1 -b .D139696
+%patch501 -p1 -b .D139697
+%patch502 -p1 -b .D139698
+%patch503 -p1 -b .D139699
+
# PGO patches
%if %{build_with_pgo}
%if !%{build_with_clang}
@@ -744,12 +755,12 @@ cp %{SOURCE45} .
%if %{build_with_pgo}
%if %{test_on_wayland}
env | grep "WAYLAND"
-MOZ_ENABLE_WAYLAND=1 ./mach build -v 2>&1 | cat -
+MOZ_ENABLE_WAYLAND=1 ./mach build -v 2>&1 | cat - || exit 1
%else
-xvfb-run ./mach build -v 2>&1 | cat -
+xvfb-run ./mach build -v 2>&1 | cat - || exit 1
%endif
%else
-./mach build -v 2>&1 | cat -
+./mach build -v 2>&1 | cat - || exit 1
%endif
#---------------------------------------------------------------------
@@ -1060,6 +1071,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
+* Wed Mar 2 2022 Martin Stransky <stransky@redhat.com> - 98.0-2
+- Added support for ffmpeg 5.0
+- Spec tweaks
+
* Tue Mar 1 2022 Martin Stransky <stransky@redhat.com> - 98.0-1
- Updated to 98.0
bgstack15