packages: opencv/opencv.spec - build with -D__STDC_CONSTANT_MACROS flag to ...

lisu lisu at pld-linux.org
Fri Aug 13 13:07:28 CEST 2010


Author: lisu                         Date: Fri Aug 13 11:07:28 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- build with -D__STDC_CONSTANT_MACROS flag to avoid errors (-cflags.patch)

---- Files affected:
packages/opencv:
   opencv.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: packages/opencv/opencv.spec
diff -u packages/opencv/opencv.spec:1.9 packages/opencv/opencv.spec:1.10
--- packages/opencv/opencv.spec:1.9	Fri Aug 13 12:27:58 2010
+++ packages/opencv/opencv.spec	Fri Aug 13 13:07:23 2010
@@ -12,6 +12,7 @@
 Patch0:		%{name}-2.0.0-libpng14.patch
 Patch1:		%{name}-2.1.0-mmap.patch
 Patch2:		%{name}-2.1.0-multilib.patch
+Patch3:		%{name}-cflags.patch
 URL:		http://opencv.willowgarage.com
 BuildRequires:	cmake
 BuildRequires:	ffmpeg-devel
@@ -68,15 +69,21 @@
 
 %prep
 %setup -q -n OpenCV-%{version}
+
+%undos src/ml/CMakeLists.txt
+%undos CMakeLists.txt
+%undos src/cv/CMakeLists.txt
+%undos src/cxcore/CMakeLists.txt
+
 %patch0 -p0
 %patch1 -p0
 %patch2 -p1
+%patch3 -p1
 
 %build
 install -d build
 cd build
 %cmake \
-	-DCXXFLAGS="-D__STDC_CONSTANT_MACROS" \
 %ifarch i686 pentium4 athlon %{x8664}
 	-DENABLE_SSE2=ON \
 %endif
@@ -93,6 +100,7 @@
 		-DLIB_SUFFIX=64 \
 %endif
 	../
+
 %{__make} \
 	VERBOSE=1
 
@@ -139,6 +147,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2010/08/13 11:07:23  lisu
+- build with -D__STDC_CONSTANT_MACROS flag to avoid errors (-cflags.patch)
+
 Revision 1.9  2010/08/13 10:27:58  arekm
 - start updating to 2.1.0
 
================================================================

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



More information about the pld-cvs-commit mailing list