From 25269a76b9ba162f9f888cdf7654b160d26da590 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Mon, 6 May 2013 13:28:25 +0000 Subject: [PATCH] - updated to 2.4.5 - removed obsolete opencv-ocl-blas.patch --- opencv-ocl-blas.patch | 11 ----------- opencv.spec | 12 ++++++------ 2 files changed, 6 insertions(+), 17 deletions(-) delete mode 100644 opencv-ocl-blas.patch diff --git a/opencv-ocl-blas.patch b/opencv-ocl-blas.patch deleted file mode 100644 index 82fc712..0000000 --- a/opencv-ocl-blas.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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.spec b/opencv.spec index de778ed..41e5eff 100644 --- a/opencv.spec +++ b/opencv.spec @@ -33,8 +33,8 @@ Summary: A library of programming functions mainly aimed at real time computer vision Summary(pl.UTF-8): Biblioteka funkcji do grafiki komputerowej w czasie rzeczywistym Name: opencv -Version: 2.4.3 -Release: 2 +Version: 2.4.5 +Release: 1 Epoch: 1 %if %{with unicap} || %{with xine} License: GPL (enforced by used libraries), BSD (opencv itself) @@ -42,8 +42,8 @@ License: GPL (enforced by used libraries), BSD (opencv itself) License: BSD %endif Group: Libraries -Source0: http://downloads.sourceforge.net/opencvlibrary/OpenCV-%{version}.tar.bz2 -# Source0-md5: c0a5af4ff9d0d540684c0bf00ef35dbe +Source0: http://downloads.sourceforge.net/opencvlibrary/opencv-unix/%{version}/opencv-%{version}.tar.gz +# Source0-md5: 8eac87462c7bec8b89021b723207c623 Patch0: %{name}-cflags.patch Patch1: %{name}-link.patch Patch2: %{name}-unicap-c++.patch @@ -162,7 +162,7 @@ OpenCV Python bindings. Wiązania Pythona do OpenCV. %prep -%setup -q -n OpenCV-%{version} +%setup -q %undos CMakeLists.txt %undos modules/gpu/CMakeLists.txt @@ -174,7 +174,7 @@ Wiązania Pythona do OpenCV. %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p1 +#%patch7 -p1 %build install -d build -- 2.44.0