packages: ffmpeg/ffmpeg.spec - added x264 bcond

[sls]

Author: sls                          Date: Sun Sep 18 11:52:22 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added x264 bcond

---- Files affected:
packages/ffmpeg:
   ffmpeg.spec (1.225 -> 1.226) 

---- Diffs:

================================================================
Index: packages/ffmpeg/ffmpeg.spec
diff -u packages/ffmpeg/ffmpeg.spec:1.225 packages/ffmpeg/ffmpeg.spec:1.226
--- packages/ffmpeg/ffmpeg.spec:1.225	Sun Sep 18 13:37:01 2011
+++ packages/ffmpeg/ffmpeg.spec	Sun Sep 18 13:52:16 2011
@@ -6,6 +6,7 @@
 %bcond_with	nonfree		# non free options of package (currently: faac)
 %bcond_without	autoreqdep	# don't care about package name deps generated by rpm
 %bcond_without	frei0r		# build without frei0r video filtering
+%bcond_without	x264		# build without x264 encoder
 %bcond_without	va		# VAAPI (Video Acceleration API)
 %bcond_without	vpx		# VP8, a high-quality video codec
 %bcond_without	doc		# don't build docs
@@ -54,7 +55,7 @@
 BuildRequires:	libvorbis-devel
 %{?with_vpx:BuildRequires:	libvpx-devel >= 0.9.6}
 # X264_BUILD >= 83
-BuildRequires:	libx264-devel >= 0.1.3-1.20110625_2245
+%{?with_x264:BuildRequires:	libx264-devel >= 0.1.3-1.20110625_2245}
 BuildRequires:	opencore-amr-devel
 BuildRequires:	openjpeg-devel >= 1.3-2
 BuildRequires:	speex-devel >= 1:1.2-rc1
@@ -152,7 +153,7 @@
 %{?with_va:Requires:	libva-devel >= 1.0.3}
 Requires:	libvorbis-devel
 %{?with_vpx:Requires:	libvpx-devel >= 0.9.6}
-Requires:	libx264-devel >= 0.1.3-1.20110625_2245
+%{?with_x264:Requires:	libx264-devel >= 0.1.3-1.20110625_2245}
 Requires:	opencore-amr-devel
 Requires:	openjpeg-devel >= 1.3-2
 Requires:	schroedinger-devel
@@ -316,7 +317,7 @@
 	--enable-libvo-amrwbenc \
 	--enable-libvorbis \
 	%{?with_vpx:--enable-libvpx} \
-	--enable-libx264 \
+	%{?with_x264:--enable-libx264} \
 	--enable-libxavs \
 	--enable-libxvid \
 	--enable-postproc \
@@ -492,6 +493,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.226  2011/09/18 11:52:16  sls
+- added x264 bcond
+
 Revision 1.225  2011/09/18 11:37:01  sls
 - added frei0r bcond
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ffmpeg/ffmpeg.spec?r1=1.225&r2=1.226&f=u