packages: opencv/opencv.spec - qt bcond (GTK+ is the default)

[qboosh]

Author: qboosh                       Date: Sat Jan 29 09:05:19 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- qt bcond (GTK+ is the default)

---- Files affected:
packages/opencv:
   opencv.spec (1.24 -> 1.25) 

---- Diffs:

================================================================
Index: packages/opencv/opencv.spec
diff -u packages/opencv/opencv.spec:1.24 packages/opencv/opencv.spec:1.25
--- packages/opencv/opencv.spec:1.24	Mon Jan 24 17:08:29 2011
+++ packages/opencv/opencv.spec	Sat Jan 29 10:05:14 2011
@@ -1,8 +1,10 @@
 # $Revision$, $Date$
+# TODO: CUDA support (on bcond)
 #
 # Conditional build:
 %bcond_without	gstreamer	# GStreamer support
 %bcond_with	pvapi		# PvAPI (AVT GigE cameras) support
+%bcond_with	qt		# Qt backend instead of GTK+
 %bcond_with	tbb		# Threading Building Blocks support
 %bcond_with	unicap		# Unicap support (GPL)
 %bcond_with	xine		# XINE support (GPL)
@@ -37,7 +39,6 @@
 BuildRequires:	gstreamer-plugins-base-devel >= 0.10
 %endif
 BuildRequires:	jasper-devel
-BuildRequires:	gtk+2-devel
 BuildRequires:	libdc1394-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
@@ -60,10 +61,16 @@
 %{?with_tbb:BuildRequires:	tbb-devel}
 BuildRequires:	zlib-devel
 %{?with_xine:BuildRequires:	xine-lib-devel}
-# TODO:
-# - Qt (bcond replacing GTK+?)
-# - cuda (on bcond)
-# - ipp (libippi)
+%if %{with qt}
+BuildRequires:	OpenGL-devel
+BuildRequires:	QtCore-devel >= 4
+BuildRequires:	QtGui-devel >= 4
+BuildRequires:	QtOpenGL-devel >= 4
+BuildRequires:	qt4-qmake >= 4
+%else
+BuildRequires:	gtk+2-devel >= 2.0
+%endif
+# ipp (libippi): http://software.intel.com/en-us/articles/intel-ipp/ (proprietary)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -150,6 +157,7 @@
 	-DUSE_O3=OFF \
 	%{!?with_gstreamer:-DWITH_GSTREAMER=OFF} \
 	%{!?with_pvapi:-DWITH_PVAPI=OFF} \
+	%{?with_qt:-DWITH_QT=ON -DWITH_QT_OPENGL=ON -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt4} \
 	%{?with_tbb:-DWITH_TBB=ON} \
 	%{?with_unicap:-DWITH_UNICAP=ON} \
 	%{?with_xine:-DWITH_XINE=ON}
@@ -204,6 +212,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2011/01/29 09:05:14  qboosh
+- qt bcond (GTK+ is the default)
+
 Revision 1.24  2011/01/24 16:08:29  qboosh
 - added unicap-c++ patch (workaround for "private" field name being a keyword in C++)
 - added tbb support (on bcond)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opencv/opencv.spec?r1=1.24&r2=1.25&f=u