rpms/ffmpeg/devel ffmpeg.spec,1.86,1.87

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/free/rpms/ffmpeg/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13229

Modified Files:
	ffmpeg.spec 
Log Message:
libcdio is still broken (missing cdio/cdda.h needed by ffmpeg)



Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- ffmpeg.spec	27 Jun 2013 09:20:47 -0000	1.86
+++ ffmpeg.spec	27 Jun 2013 19:30:55 -0000	1.87
@@ -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:  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 @@
 %else
     --enable-thumb \
 %endif
-%ifnarch armv7hnl
-    --disable-neon \
-%else
+%ifarch armv7hnl
     --enable-neon \
 %endif
 %endif
@@ -288,7 +289,7 @@
 
 %changelog
 * Thu Jun 27 2013 Nicolas Chauvet <kwizart at gmail.com> - 1.2.1-4
-- Re-enable libcdio
+- Reverse the logic for neon on arm
 
 * Wed Jun 19 2013 Nicolas Chauvet <kwizart at gmail.com> - 1.2.1-3
 - Enable neon on armv7hnl