packages: frei0r/frei0r.spec - added opencv bcond (there's a loop in BR: op...

sls sls at pld-linux.org
Sat Sep 17 21:11:11 CEST 2011


Author: sls                          Date: Sat Sep 17 19:11:11 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added opencv bcond (there's a loop in BR: opencv -> ffmpeg -> frei0r)

---- Files affected:
packages/frei0r:
   frei0r.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/frei0r/frei0r.spec
diff -u packages/frei0r/frei0r.spec:1.5 packages/frei0r/frei0r.spec:1.6
--- packages/frei0r/frei0r.spec:1.5	Sun Jul  3 11:56:44 2011
+++ packages/frei0r/frei0r.spec	Sat Sep 17 21:11:06 2011
@@ -1,4 +1,8 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without	opencv		# build without OpenCV support
+#
 Summary:	Minimalistic plugin API for video effects - common package
 Summary(pl.UTF-8):	Minimalistyczne API wtyczek efektów wideo - wspólny pakiet
 Name:		frei0r
@@ -13,7 +17,7 @@
 BuildRequires:	automake
 BuildRequires:	gavl-devel >= 0.2.3
 BuildRequires:	libtool >= 2:2.0
-BuildRequires:	opencv-devel >= 1.0.0
+%{?with_opencv:BuildRequires:	opencv-devel >= 1.0.0}
 BuildRequires:	pkgconfig
 BuildRequires:	sed >= 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -238,10 +242,12 @@
 %attr(755,root,root) %{_libdir}/frei0r-1/vectorscope.so
 %attr(755,root,root) %{_libdir}/frei0r-1/rgbparade.so
 
+%if %{with opencv}
 %files plugins-opencv
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/frei0r-1/facebl0r.so
 %attr(755,root,root) %{_libdir}/frei0r-1/facedetect.so
+%endif
 
 %files devel
 %defattr(644,root,root,755)
@@ -254,6 +260,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2011/09/17 19:11:06  sls
+- added opencv bcond (there's a loop in BR: opencv -> ffmpeg -> frei0r)
+
 Revision 1.5  2011/07/03 09:56:44  qboosh
 - fixed autotools regeneration
 - change PACKAGE_LIB_DIR to be lib64-aware
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/frei0r/frei0r.spec?r1=1.5&r2=1.6&f=u



More information about the pld-cvs-commit mailing list