From 4baa3eee9c26aa336f1bdfcc96c791120ee561cc Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 27 Jun 2013 19:30:55 +0000 Subject: [PATCH] libcdio is still broken (missing cdio/cdda.h needed by ffmpeg) --- ffmpeg.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ffmpeg.spec b/ffmpeg.spec index 12779e8..597313c 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -10,6 +10,9 @@ %global _without_opencv 1 %global _without_vpx 1 %endif +%if 0%{?fedora} >= 19 +%global _without_cdio 1 +%endif Summary: Digital VCR and streaming server Name: ffmpeg @@ -39,7 +42,7 @@ BuildRequires: gsm-devel BuildRequires: lame-devel >= 3.98.3 %{?_with_jack:BuildRequires: jack-audio-connection-kit-devel} BuildRequires: libass-devel -%{!?_without_cdio:BuildRequires: libcdio-devel} +%{!?_without_cdio:BuildRequires: libcdio-devel cdparanoia-devel} #libcrystalhd is currently broken %{?_with_crystalhd:BuildRequires: libcrystalhd-devel} BuildRequires: libdc1394-devel @@ -197,9 +200,7 @@ pushd generic %else --enable-thumb \ %endif -%ifnarch armv7hnl - --disable-neon \ -%else +%ifarch armv7hnl --enable-neon \ %endif %endif @@ -288,7 +289,7 @@ mv $RPM_BUILD_ROOT%{_mandir}/man1/lib*.3 $RPM_BUILD_ROOT%{_mandir}/man3 %changelog * Thu Jun 27 2013 Nicolas Chauvet - 1.2.1-4 -- Re-enable libcdio +- Reverse the logic for neon on arm * Wed Jun 19 2013 Nicolas Chauvet - 1.2.1-3 - Enable neon on armv7hnl