automatic version update by autodist [release 2.4.10-1mamba;Sun Dec 28 2014]

opencv-2.4.10-i586-inconsistent-constraint-asm.patch

@@ -0,0 +1,46 @@
+From ea50be0529c248961e1b66293f8a9e4b807294a6 Mon Sep 17 00:00:00 2001
+From: Samuel Martin <s.martin49@gmail.com>
+Date: Sun, 12 Oct 2014 10:17:23 +0200
+Subject: [PATCH] core: fix x86 PIC code compilation
+
+This bug was triggered by Buildroot autobuilders [1,2], causing this
+kind of failures [3,4]:
+
+  [ 14%] Building CXX object modules/core/CMakeFiles/opencv_core.dir/src/system.cpp.o
+  /home/test/autobuild/instance-0/output/build/opencv-2.4.10/modules/core/src/system.cpp: In function '(static initializers for /home/test/autobuild/instance-0/output/build/opencv-2.4.10/modules/core/src/system.cpp)':
+  /home/test/autobuild/instance-0/output/build/opencv-2.4.10/modules/core/src/system.cpp:280:10: error: inconsistent operand constraints in an 'asm'
+  make[3]: *** [modules/core/CMakeFiles/opencv_core.dir/src/system.cpp.o] Error 1
+
+[1] http://buildroot.org/
+[2] http://autobuild.buildroot.org/
+[3] http://autobuild.buildroot.org/?reason=opencv-2.4.10
+[4] http://autobuild.buildroot.org/results/483/4838285b25d6293a5cf0bb9eadd5040a7c75d766/build-end.log
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+---
+ modules/core/src/system.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp
+index 5a970d5..e9ffdc7 100644
+--- a/modules/core/src/system.cpp
++++ b/modules/core/src/system.cpp
+@@ -267,14 +267,17 @@ struct HWFeatures
+          : "cc"
+         );
+         #else
++        // We need to preserve ebx since we are compiling PIC code.
++        // This means we cannot use "=b" for the 2nd output register.
+         asm volatile
+         (
+          "pushl %%ebx\n\t"
+          "movl $7,%%eax\n\t"
+          "movl $0,%%ecx\n\t"
+          "cpuid\n\t"
++         "movl %%ebx,%1\n\t"
+          "popl %%ebx\n\t"
+-         : "=a"(cpuid_data[0]), "=b"(cpuid_data[1]), "=c"(cpuid_data[2]), "=d"(cpuid_data[3])
++         : "=a"(cpuid_data[0]), "=r"(cpuid_data[1]), "=c"(cpuid_data[2]), "=d"(cpuid_data[3])
+          :
+          : "cc"
+         );

opencv.spec

@@ -1,8 +1,8 @@
 %define pkgver %(echo %version | sed "s|[a-z]||")
 %define javaver %(echo %version | cut -d. -f1-3 | tr -d .)
 Name:          opencv
-Version:       2.4.9
-Release:       2mamba
+Version:       2.4.10
+Release:       1mamba
 Summary:       Collection of algorithms for computer vision
 Group:         Development/Libraries
 Vendor:        openmamba
@@ -14,6 +14,7 @@ Source:        http://downloads.sourceforge.net/project/opencvlibrary/opencv-uni
 Patch0:        %{name}-2.1.0-libpng14.patch
 Patch1:        %{name}-2.3.1-arm-build.patch
 Patch2:        opencv-2.4.9-buildfix-x86-asm-constraint.patch
+Patch3:        opencv-2.4.10-i586-inconsistent-constraint-asm.patch
 License:       BSD
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
@@ -90,6 +91,7 @@ This package contains Python bindings for the OpenCV library.
 %ifarch %{ix86}
 %patch2 -p1
 %endif
+%patch3 -p1
 
 # WARNING: don't reinstall with -D -T or cmake files will be incorrect
 #% ifarch arm
@@ -180,6 +182,9 @@ rm -fr %{buildroot}%{_datadir}/opencv/doc
 %{python_sitelib}/cv2.so
 
 %changelog
+* Sun Dec 28 2014 Automatic Build System <autodist@mambasoft.it> 2.4.10-1mamba
+- automatic version update by autodist
+
 * Thu Sep 04 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 2.4.9-2mamba
 - rebuilt to fix wrong cmake files on i586 which don't like to digikam