Hello community, here is the log from the commit of package opencv for openSUSE:Factory checked in at 2014-01-19 21:42:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opencv (Old) and /work/SRC/openSUSE:Factory/.opencv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opencv" Changes: -------- --- /work/SRC/openSUSE:Factory/opencv/opencv.changes 2013-12-02 07:25:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.opencv.new/opencv.changes 2014-01-23 15:50:16.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Jan 16 17:11:21 UTC 2014 - [email protected] + +- Fix build with altivec: + opencv-altivec-vector.patch + +------------------------------------------------------------------- New: ---- opencv-altivec-vector.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opencv.spec ++++++ --- /var/tmp/diff_new_pack.MbYGBL/_old 2014-01-23 15:50:18.000000000 +0100 +++ /var/tmp/diff_new_pack.MbYGBL/_new 2014-01-23 15:50:18.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package opencv # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -37,7 +37,9 @@ Patch3: improve-sphinx-search.diff # PATCH-FIX-UPSTREAM opencv-pkgconfig.patch -- Make sure to provide link flags in OpenCV pc file (bnc#853036). Issue is exposed when e.g. a project relies on # getting opencv vars via pc (first), and then via CMake, as is the case with nomacs +# PATCH-FIX-UPSTREAM opencv-altivec-vector.patch -- use __vector for altivec. https://github.com/Itseez/opencv/pull/2157 Patch4: opencv-pkgconfig.patch +Patch5: opencv-altivec-vector.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: gstreamer-0_10-plugins-base-devel @@ -124,6 +126,7 @@ %patch2 -p1 %patch3 -p0 %patch4 -p1 +%patch5 -p1 # Remove Windows specific files rm -f doc/packaging.txt ++++++ opencv-altivec-vector.patch ++++++ Index: opencv-2.4.7/3rdparty/include/opencl/1.2/CL/cl_platform.h =================================================================== --- opencv-2.4.7.orig/3rdparty/include/opencl/1.2/CL/cl_platform.h +++ opencv-2.4.7/3rdparty/include/opencl/1.2/CL/cl_platform.h @@ -332,13 +332,13 @@ typedef unsigned int cl_GLenum; /* Define basic vector types */ #if defined( __VEC__ ) #include <altivec.h> /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */ - typedef vector unsigned char __cl_uchar16; - typedef vector signed char __cl_char16; - typedef vector unsigned short __cl_ushort8; - typedef vector signed short __cl_short8; - typedef vector unsigned int __cl_uint4; - typedef vector signed int __cl_int4; - typedef vector float __cl_float4; + typedef __vector unsigned char __cl_uchar16; + typedef __vector signed char __cl_char16; + typedef __vector unsigned short __cl_ushort8; + typedef __vector signed short __cl_short8; + typedef __vector unsigned int __cl_uint4; + typedef __vector signed int __cl_int4; + typedef __vector float __cl_float4; #define __CL_UCHAR16__ 1 #define __CL_CHAR16__ 1 #define __CL_USHORT8__ 1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
