Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6cb78b9550fccdb9db8cda78bbbe306ec11c18fa
commit 6cb78b9550fccdb9db8cda78bbbe306ec11c18fa Author: kikadf <[email protected]> Date: Thu Oct 23 09:16:15 2014 +0200 opencv-2.4.10-1-x86_64 * Fix patch to build on i686 diff --git a/source/xmultimedia-extra/opencv/FrugalBuild b/source/xmultimedia-extra/opencv/FrugalBuild index 4b98e71..2dd3fac 100644 --- a/source/xmultimedia-extra/opencv/FrugalBuild +++ b/source/xmultimedia-extra/opencv/FrugalBuild @@ -33,7 +33,7 @@ archs=('i686' 'x86_64') sha1sums=('0b185f5e332d5feef91722a6ed68c36a6d33909e') if [ "${CARCH}" = "i686" ] ;then source+=(opencv-0001-core-fix-x86-PIC-code-compilation.patch) - sha1sums+=('1bf4ded0ab3ef860852495bb3908dfb7847f698e') + sha1sums+=('9fae7f05b6b28f62bad5a7bc20acd1b6abaf5e49') fi diff --git a/source/xmultimedia-extra/opencv/opencv-0001-core-fix-x86-PIC-code-compilation.patch b/source/xmultimedia-extra/opencv/opencv-0001-core-fix-x86-PIC-code-compilation.patch index c72617c..2b937a5 100644 --- a/source/xmultimedia-extra/opencv/opencv-0001-core-fix-x86-PIC-code-compilation.patch +++ b/source/xmultimedia-extra/opencv/opencv-0001-core-fix-x86-PIC-code-compilation.patch @@ -1,8 +1,7 @@ -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 - <at> <at> -267,14 +267,17 <at> <at> struct HWFeatures +diff -Naur opencv-2.4.10/modules/core/src/system.cpp opencv-2.4.10.new/modules/core/src/system.cpp +--- opencv-2.4.10/modules/core/src/system.cpp 2014-10-01 09:33:36.000000000 +0200 ++++ opencv-2.4.10.new/modules/core/src/system.cpp 2014-10-23 09:13:25.099724441 +0200 +@@ -267,14 +267,17 @@ : "cc" ); #else @@ -14,13 +13,10 @@ index 5a970d5..e9ffdc7 100644 "movl $7,%%eax\n\t" "movl $0,%%ecx\n\t" "cpuid\n\t" -+ "movl %%ebx,%1\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" ); --- -2.1.2 - _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
