From b909109e5794e1c7773eaa5ab1e80711e0579899 Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Nov 18 2016 14:40:48 +0000 Subject: add back ffmpeg for centos plus --- diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec index 7b94e0b..65d40de 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -528,7 +528,7 @@ function add_to_mozconfig() { %endif #Disabled due to rhbz#1330898 -add_to_mozconfig "disable-ffmpeg" +#add_to_mozconfig "disable-ffmpeg" #FIXME RTTI?? RHEL5/6 # ac_add_options --enable-cpp-rtti @@ -949,11 +949,16 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{mozappdir}/libsoftokn3.chk %endif +# Add in CentOS for ffmpeg +%{mozappdir}/gmp-clearkey/0.1/clearkey.info +%{mozappdir}/gmp-clearkey/0.1/libclearkey.so + #--------------------------------------------------------------------- %changelog * Tue Nov 15 2016 CentOS Sources - 45.5.0-1.el7.centos - CentOS default prefs +- add back in ffmpeg * Tue Nov 8 2016 Jan Horak - 45.5.0-1 - Update to 45.5.0 ESR