SPECS: ffmpeg.spec - amr bcond inverted (license issue). - as-need...

pluto pluto at pld-linux.org
Mon Sep 18 15:57:15 CEST 2006


Author: pluto                        Date: Mon Sep 18 13:57:15 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- amr bcond inverted (license issue).
- as-needed fix for configure.

---- Files affected:
SPECS:
   ffmpeg.spec (1.103 -> 1.104) 

---- Diffs:

================================================================
Index: SPECS/ffmpeg.spec
diff -u SPECS/ffmpeg.spec:1.103 SPECS/ffmpeg.spec:1.104
--- SPECS/ffmpeg.spec:1.103	Mon Sep 11 23:21:30 2006
+++ SPECS/ffmpeg.spec	Mon Sep 18 15:57:09 2006
@@ -3,7 +3,7 @@
 # TODO: update for lzo 2.x (currently only lzo 1.x is supported)
 #
 # Conditional build:
-%bcond_without	amr		# don't build 3GPP Adaptive Multi Rate (AMR) speech codec
+%bcond_with	amr		# 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
@@ -31,6 +31,7 @@
 Patch2:		%{name}-gcc4.patch
 Patch3:		%{name}-system-amr.patch
 Patch4:		%{name}-x264.patch
+Patch5:		%{name}-as_needed.patch
 URL:		http://ffmpeg.mplayerhq.hu/
 BuildRequires:	SDL-devel
 %if %{with amr}
@@ -210,6 +211,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 # notes:
@@ -360,6 +362,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.104  2006/09/18 13:57:09  pluto
+- amr bcond inverted (license issue).
+- as-needed fix for configure.
+
 Revision 1.103  2006/09/11 21:21:30  grzegol
 - added x264 patch (fixes build with libx264 20060828 snapshot)
 - rel. .14
================================================================

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



More information about the pld-cvs-commit mailing list