packages: opencv/opencv-cflags.patch, opencv/opencv.spec - updated cflags p...

[qboosh]

Author: qboosh                       Date: Sun Jan 23 06:42:43 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated cflags patch to remove -march=i686 from CFLAGS
- pass cmake options to disable -O3 overrides and -msse/-msse2 on CPUs which possibly don't support SSE

---- Files affected:
packages/opencv:
   opencv-cflags.patch (1.1 -> 1.2) , opencv.spec (1.21 -> 1.22) 

---- Diffs:

================================================================
Index: packages/opencv/opencv-cflags.patch
diff -u packages/opencv/opencv-cflags.patch:1.1 packages/opencv/opencv-cflags.patch:1.2
--- packages/opencv/opencv-cflags.patch:1.1	Fri Aug 13 13:07:39 2010
+++ packages/opencv/opencv-cflags.patch	Sun Jan 23 07:42:37 2011
@@ -9,3 +9,20 @@
  if(MSVC)
      set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE /D _SCL_SECURE_NO_WARNINGS")
      # 64-bit portability warnings, in MSVC8
+@@ -916,16 +918,6 @@
+         set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -Werror")
+     endif()
+ 
+-    if(X86)
+-        if(NOT MINGW64)
+-            if(NOT X86_64)
+-                if(NOT APPLE)
+-                    set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -march=i686")
+-                endif()
+-            endif()
+-        endif()
+-    endif()
+-
+     # Other optimizations
+     if(USE_OMIT_FRAME_POINTER)
+         set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -fomit-frame-pointer")

================================================================
Index: packages/opencv/opencv.spec
diff -u packages/opencv/opencv.spec:1.21 packages/opencv/opencv.spec:1.22
--- packages/opencv/opencv.spec:1.21	Sat Jan 22 21:46:56 2011
+++ packages/opencv/opencv.spec	Sun Jan 23 07:42:37 2011
@@ -128,21 +128,27 @@
 install -d build
 cd build
 %cmake .. \
-%ifarch i686 pentium4 athlon %{x8664}
+	-DCMAKE_C_FLAGS_RELEASE="-DNDEBUG" \
+	-DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG" \
+%ifarch pentium4 %{x8664}
+	-DENABLE_SSE=ON \
 	-DENABLE_SSE2=ON \
+%else
+	-DENABLE_SSE=OFF \
+	-DENABLE_SSE2=OFF \
 %endif
 	-DBUILD_NEW_PYTHON_SUPPORT=ON \
-%if %{with xine}
-	-DWITH_XINE=ON \
-%endif
-	-DWITH_GSTREAMER=OFF \
+	-DUSE_O3=OFF \
 	-DWITH_1394=ON \
 	-DWITH_FFMPEG=ON \
+	-DWITH_GSTREAMER=OFF \
 	-DWITH_GTK=ON \
-	-DWITH_V4L=ON
+	-DWITH_V4L=ON \
+%if %{with xine}
+	-DWITH_XINE=ON
+%endif
 
-%{__make} \
-	VERBOSE=1
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -192,6 +198,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22  2011/01/23 06:42:37  qboosh
+- updated cflags patch to remove -march=i686 from CFLAGS
+- pass cmake options to disable -O3 overrides and -msse/-msse2 on CPUs which possibly don't support SSE
+
 Revision 1.21  2011/01/22 20:46:56  qboosh
 - pl
 - more BRs
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opencv/opencv-cflags.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opencv/opencv.spec?r1=1.21&r2=1.22&f=u