commit 6994c4f7c4cf758e3763d0fed91c355be0440aa8
Author: Jakub Bogusz <[email protected]>
Date: Sat Feb 16 10:17:05 2013 +0100
- added ocl-fft,ocl-blas patches to fix compilation with clAmd{Fft,Blas}
respectively
opencv-ocl-blas.patch | 11 +++++++++++
opencv-ocl-fft.patch | 11 +++++++++++
opencv.spec | 4 ++++
3 files changed, 26 insertions(+)
---
diff --git a/opencv.spec b/opencv.spec
index d507b54..4d82508 100644
--- a/opencv.spec
+++ b/opencv.spec
@@ -49,6 +49,8 @@ Patch2: %{name}-unicap-c++.patch
Patch3: %{name}-c.patch
Patch4: %{name}-gcc.patch
Patch5: %{name}-ximea.patch
+Patch6: %{name}-ocl-fft.patch
+Patch7: %{name}-ocl-blas.patch
URL: http://opencv.willowgarage.com/
%{?with_pvapi:BuildRequires: AVT_GigE_SDK-devel}
%{?with_opencl:BuildRequires: OpenCL-devel}
@@ -170,6 +172,8 @@ Wiązania Pythona do OpenCV.
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
+%patch7 -p1
%build
install -d build
diff --git a/opencv-ocl-blas.patch b/opencv-ocl-blas.patch
new file mode 100644
index 0000000..82fc712
--- /dev/null
+++ b/opencv-ocl-blas.patch
@@ -0,0 +1,11 @@
+--- OpenCV-2.4.3/modules/ocl/perf/perf_gemm.cpp.orig 2012-10-12
00:55:12.000000000 +0200
++++ OpenCV-2.4.3/modules/ocl/perf/perf_gemm.cpp 2013-02-16
10:09:54.859534100 +0100
+@@ -109,5 +109,5 @@
+ INSTANTIATE_TEST_CASE_P(ocl_gemm, Gemm, testing::Combine(
+ testing::Values(CV_32FC1, CV_32FC2/* , CV_64FC1,
CV_64FC2*/),
+ testing::Values(cv::Size(512, 512),
cv::Size(1024, 1024)),
+- testing::Values(0, cv::GEMM_1_T, cv::GEMM_2_T,
cv::GEMM_1_T + cv::GEMM_2_T)));
+-#endif
+\ No newline
++ testing::Values(0, int(cv::GEMM_1_T),
int(cv::GEMM_2_T), cv::GEMM_1_T + cv::GEMM_2_T)));
++#endif
diff --git a/opencv-ocl-fft.patch b/opencv-ocl-fft.patch
new file mode 100644
index 0000000..541bf9f
--- /dev/null
+++ b/opencv-ocl-fft.patch
@@ -0,0 +1,11 @@
+--- OpenCV-2.4.3/modules/ocl/src/fft.cpp.orig 2012-10-23 00:55:11.000000000
+0200
++++ OpenCV-2.4.3/modules/ocl/src/fft.cpp 2013-02-16 08:52:00.733063588
+0100
+@@ -95,6 +95,8 @@
+ // if not, bake a new one, put it into the planStore and return
it.
+ static clAmdFftPlanHandle getPlan(Size _dft_size, int _src_step,
int _dst_step, int _flags, FftType _type);
+ };
++ void fft_setup();
++ void fft_teardown();
+ }
+ }
+ bool cv::ocl::FftPlan::started = false;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/opencv.git/commitdiff/6994c4f7c4cf758e3763d0fed91c355be0440aa8
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
