rpms/firefox
7
0
Fork 0
Code Issues Pull Requests Releases Activity

system jpeg - let's do it better

Browse Source
This commit is contained in:
Martin Stransky 2014-11-04 16:07:20 +01:00
parent 3d545d817e
commit e0dccae91a
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
firefox.spec
View File

@ -25,6 +25,14 @@
%define system_cairo 1 %define system_cairo 1
%endif %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 %define enable_gstreamer 1
# Separated plugins are supported on x86(64) only # Separated plugins are supported on x86(64) only
@ -190,6 +198,9 @@ BuildRequires: libvpx-devel >= %{libvpx_version}
BuildRequires: autoconf213 BuildRequires: autoconf213
BuildRequires: pulseaudio-libs-devel BuildRequires: pulseaudio-libs-devel
BuildRequires: libicu-devel BuildRequires: libicu-devel
%if !%{?system_jpeg}
BuildRequires: yasm
%endif
Requires: mozilla-filesystem Requires: mozilla-filesystem
%if %{?system_nss} %if %{?system_nss}
@ -405,10 +416,8 @@ echo "ac_add_options --disable-crashreporter" >> .mozconfig
echo "ac_add_options --enable-tests" >> .mozconfig echo "ac_add_options --enable-tests" >> .mozconfig
%endif %endif
# TODO Hack - FF does not support new jpeg turbo library %if !%{?system_jpeg}
%if 0%{?fedora} > 21
echo "ac_add_options --without-system-jpeg" >> .mozconfig echo "ac_add_options --without-system-jpeg" >> .mozconfig
BuildRequires: yasm
%else %else
echo "ac_add_options --with-system-jpeg" >> .mozconfig echo "ac_add_options --with-system-jpeg" >> .mozconfig
%endif %endif