rpms/ffmpeg/devel ffmpeg.spec,1.67,1.68

[Nicolas Chauvet]

Author: kwizart

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

Modified Files:
	ffmpeg.spec 
Log Message:
- Add opus
- Enable opencv frei0r by default
- Disable librmtp - use builtin implementation rfbz#2399 




Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- ffmpeg.spec	4 Oct 2012 20:39:33 -0000	1.67
+++ ffmpeg.spec	1 Nov 2012 21:42:58 -0000	1.68
@@ -5,8 +5,10 @@
 #global rel     rc1
 
 %if 0%{?rhel}
-%global _without_vpx   1
-%global _without_celt   1
+%global _without_celt     1
+%global _without_frei0r   1
+%global _without_opencv   1
+%global _without_vpx      1
 %endif
 
 Summary:        Digital VCR and streaming server
@@ -31,7 +33,7 @@
 %{?_with_dirac:BuildRequires: dirac-devel}
 %{?_with_faac:BuildRequires: faac-devel}
 BuildRequires:  freetype-devel
-%{?_with_frei0r:BuildRequires: frei0r-devel}
+%{!?_without_frei0r:BuildRequires: frei0r-devel}
 BuildRequires:  gnutls-devel
 BuildRequires:  gsm-devel
 BuildRequires:  lame-devel >= 3.98.3
@@ -42,7 +44,7 @@
 %{?_with_crystalhd:BuildRequires: libcrystalhd-devel}
 BuildRequires:  libdc1394-devel
 Buildrequires:  libmodplug-devel
-BuildRequires:  librtmp-devel
+%{?_with_rtmp:BuildRequires: librtmp-devel}
 BuildRequires:  libtheora-devel
 BuildRequires:  libv4l-devel
 %{?!_without_vaapi:BuildRequires: libva-devel >= 0.31.0}
@@ -54,8 +56,9 @@
 %endif
 %{?_with_amr:BuildRequires: opencore-amr-devel vo-amrwbenc-devel}
 %{!?_without_openal:BuildRequires: openal-soft-devel}
-%{?_with_opencv:BuildRequires: opencv-devel}
+%{!?_without_opencv:BuildRequires: opencv-devel}
 BuildRequires:  openjpeg-devel
+BuildRequires:  opus-devel
 %{!?_without_pulse:BuildRequires: pulseaudio-libs-devel}
 BuildRequires:  schroedinger-devel
 BuildRequires:  SDL-devel
@@ -110,7 +113,7 @@
     %{?_with_amr:--enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libvo-amrwbenc --enable-version3} \\\
     --enable-bzlib \\\
     %{!?_with_crystalhd:--disable-crystalhd} \\\
-    %{?_with_frei0r:--enable-frei0r} \\\
+    %{!?_without_frei0r:--enable-frei0r} \\\
     --enable-gnutls \\\
     --enable-libass \\\
     %{!?_without_cdio:--enable-libcdio} \\\
@@ -123,10 +126,11 @@
     --enable-libgsm \\\
     --enable-libmp3lame \\\
     %{!?_without_openal:--enable-openal} \\\
-    %{?_with_opencv:--enable-libopencv} \\\
+    %{!?_without_opencv:--enable-libopencv} \\\
     --enable-libopenjpeg \\\
+    --enable-libopus \\\
     %{!?_without_pulse:--enable-libpulse} \\\
-    --enable-librtmp \\\
+    %{?_with_rtmp:--enable-librtmp} \\\
     --enable-libschroedinger \\\
     --enable-libspeex \\\
     --enable-libtheora \\\