packages: ffmpeg/ffmpeg.spec - opencv bcond, added comment about ffmpeg/ope...

[hawk]

Author: hawk                         Date: Fri Dec 16 12:23:57 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- opencv bcond, added comment about ffmpeg/opencv build dependency loop

---- Files affected:
packages/ffmpeg:
   ffmpeg.spec (1.235 -> 1.236) 

---- Diffs:

================================================================
Index: packages/ffmpeg/ffmpeg.spec
diff -u packages/ffmpeg/ffmpeg.spec:1.235 packages/ffmpeg/ffmpeg.spec:1.236
--- packages/ffmpeg/ffmpeg.spec:1.235	Tue Dec 13 21:07:40 2011
+++ packages/ffmpeg/ffmpeg.spec	Fri Dec 16 13:23:52 2011
@@ -2,11 +2,19 @@
 # TODO
 # - is bug803 patch still needed? the code changed somehow
 #
+# Workaround ffmpeg.spec & opencv.spec updating:
+#
+# 	1. make-request -r --without opencv ffmpeg.spec
+#	2. make-request -r opencv.spec
+#	3. bump release of ffmpeg.spec
+#	4. make-request -r ffmpeg.spec
+#
 # Conditional build:
 %bcond_with	nonfree		# non free options of package (currently: faac)
 %bcond_with	aacplus		# AAC+ encoding via libaacplus (requires nonfree)
 %bcond_without	autoreqdep	# don't care about package name deps generated by rpm
 %bcond_without	frei0r		# build without frei0r video filtering
+%bcond_without	opencv		# build without opencv 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
@@ -16,7 +24,7 @@
 Summary(pl.UTF-8):	FFmpeg - szybki konwerter audio/wideo
 Name:		ffmpeg
 Version:	0.9
-Release:	1
+Release:	2
 # LGPL or GPL, chosen at configure time (GPL version is more featured)
 # (postprocessing, some filters, x264, xavs, xvid, x11grab)
 # using v3 allows Apache-licensed libs (opencore-amr, libvo-*enc)
@@ -59,6 +67,7 @@
 # X264_BUILD >= 118
 %{?with_x264:BuildRequires:	libx264-devel >= 0.1.3-1.20111212_2245}
 BuildRequires:	opencore-amr-devel
+%{?with_opencv:BuildRequires:	opencv-devel}
 BuildRequires:	openjpeg-devel >= 1.3-2
 BuildRequires:	speex-devel >= 1:1.2-rc1
 %ifarch %{ix86}
@@ -311,6 +320,7 @@
 	--enable-libnut \
 	--enable-libopencore-amrnb \
 	--enable-libopencore-amrwb \
+	%{?with_opencv:--enable-libopencv} \
 	--enable-libopenjpeg \
 	--enable-librtmp \
 	--enable-libschroedinger \
@@ -341,8 +351,6 @@
 %endif
 	--enable-runtime-cpudetect
 
-#	--enable-libopencv would cause dependency loop
-
 # force oldscaler build
 %{__sed} -i -e 's|#define.*CONFIG_OLDSCALER.*0|#define CONFIG_OLDSCALER 1|g' config.h
 
@@ -506,6 +514,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.236  2011/12/16 12:23:52  hawk
+- opencv bcond, added comment about ffmpeg/opencv build dependency loop
+
 Revision 1.235  2011/12/13 20:07:40  arekm
 - up to 0.9
 
================================================================

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