summaryrefslogtreecommitdiff
path: root/firefox.spec
diff options
context:
space:
mode:
authorMartin Stransky <stransky@redhat.com>2014-11-04 16:07:20 +0100
committerMartin Stransky <stransky@redhat.com>2014-11-04 16:07:20 +0100
commite0dccae91adc86bd2a12e2f2e893b4cd740638ed (patch)
tree54ce5669d6ebab869a3ff40abf8a7c1f2b18d371 /firefox.spec
parentAdded yasm to build req, needed for in-tree turbo jpeg (diff)
downloadlibrewolf-fedora-ff-e0dccae91adc86bd2a12e2f2e893b4cd740638ed.tar.gz
librewolf-fedora-ff-e0dccae91adc86bd2a12e2f2e893b4cd740638ed.tar.bz2
librewolf-fedora-ff-e0dccae91adc86bd2a12e2f2e893b4cd740638ed.zip
system jpeg - let's do it better
Diffstat (limited to 'firefox.spec')
-rw-r--r--firefox.spec15
1 files changed, 12 insertions, 3 deletions
diff --git a/firefox.spec b/firefox.spec
index 3d58c46..e8a6a9d 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -25,6 +25,14 @@
%define system_cairo 1
%endif
+# TODO Hack - FF does not support new jpeg turbo library
+# mozbz#1093615
+%if 0%{?fedora} > 21
+%define system_jpeg 0
+%else
+%define system_jpeg 1
+%endif
+
%define enable_gstreamer 1
# Separated plugins are supported on x86(64) only
@@ -190,6 +198,9 @@ BuildRequires: libvpx-devel >= %{libvpx_version}
BuildRequires: autoconf213
BuildRequires: pulseaudio-libs-devel
BuildRequires: libicu-devel
+%if !%{?system_jpeg}
+BuildRequires: yasm
+%endif
Requires: mozilla-filesystem
%if %{?system_nss}
@@ -405,10 +416,8 @@ echo "ac_add_options --disable-crashreporter" >> .mozconfig
echo "ac_add_options --enable-tests" >> .mozconfig
%endif
-# TODO Hack - FF does not support new jpeg turbo library
-%if 0%{?fedora} > 21
+%if !%{?system_jpeg}
echo "ac_add_options --without-system-jpeg" >> .mozconfig
-BuildRequires: yasm
%else
echo "ac_add_options --with-system-jpeg" >> .mozconfig
%endif
bgstack15