SPECS: ffmpeg.spec - lzo bcond, disabled by default (needs upate f...

[qboosh]

Author: qboosh                       Date: Wed May 10 20:17:15 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- lzo bcond, disabled by default (needs upate for lzo 2)

---- Files affected:
SPECS:
   ffmpeg.spec (1.95 -> 1.96) 

---- Diffs:

================================================================
Index: SPECS/ffmpeg.spec
diff -u SPECS/ffmpeg.spec:1.95 SPECS/ffmpeg.spec:1.96
--- SPECS/ffmpeg.spec:1.95	Tue May  9 12:21:03 2006
+++ SPECS/ffmpeg.spec	Wed May 10 22:17:10 2006
@@ -1,13 +1,14 @@
 # $Revision$, $Date$
 #
-# TODO: only lzo 1.x is supported
+# TODO: update for lzo 2.x (currently only lzo 1.x is supported)
 #	- make (ffmpeg code inside) mplayer play .3gp mobile phone movies
 #	  (ffplay and vlc plays them fine
 #
 # Conditional build:
-%bcond_without	imlib2		# don't build imlib2 vhook module
-%bcond_without	autoreqdep	# don't care about package name deps generated by rpm
 %bcond_without	amr		# don't build 3GPP Adaptive Multi Rate (AMR) speech codec
+%bcond_without	autoreqdep	# don't care about package name deps generated by rpm
+%bcond_without	imlib2		# don't build imlib2 vhook module
+%bcond_with	lzo		# build with LZO support
 #
 Summary:	Realtime audio/video encoder and streaming server
 Summary(pl):	Koder audio/wideo czasu rzeczywistego oraz serwer strumieni
@@ -68,7 +69,7 @@
 BuildRequires:	libtool >= 2:1.4d-3
 BuildRequires:	libvorbis-devel
 BuildRequires:	libx264-devel >= 0.1.2-1.20060430_2245.1
-BuildRequires:	lzo-devel < 2.0
+%{?with_lzo:BuildRequires:	lzo-devel < 2.0}
 %ifarch %{ix86}
 %ifnarch i386 i486
 BuildRequires:	nasm
@@ -136,7 +137,7 @@
 Requires:	libgsm-devel
 Requires:	libtheora-devel
 Requires:	libvorbis-devel
-Requires:	lzo-devel < 2.0
+%{?with_lzo:Requires:	lzo-devel < 2.0}
 Requires:	libx264-devel >= 0.1.2-1.20060430_2245.1
 Requires:	xvid-devel >= 1:1.1.0
 Requires:	zlib-devel
@@ -244,6 +245,7 @@
 	--prefix=%{_prefix} \
 	--libdir=%{_libdir} \
 	--mandir=%{_mandir} \
+	%{!?with_lzo:--disable-lzo} \
 	--disable-strip \
 	--enable-a52 \
 	--enable-a52bin \
@@ -384,6 +386,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.96  2006/05/10 20:17:10  qboosh
+- lzo bcond, disabled by default (needs upate for lzo 2)
+
 Revision 1.95  2006/05/09 10:21:03  qboosh
 - -devel R: libx264-devel now
 - added versions to lzo-devel deps (lzo support must be disabled or updated)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ffmpeg.spec?r1=1.95&r2=1.96&f=u