From 400d48dd1002c5eb5c0a5a69173be6750a250f40d6cdfdedaa1317c1b44e9abb Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sun, 10 Jun 2012 21:01:25 +0000 Subject: [PATCH] Accepting request 124297 from KDE:Distro:Factory Add more info in changes file (forwarded request 124276 from koprok) OBS-URL: https://build.opensuse.org/request/show/124297 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=32 --- OpenCV-2.4.0.tar.bz2 | 3 --- OpenCV-2.4.1.tar.bz2 | 3 +++ opencv-2.3-underlinking.patch | 12 ------------ opencv-underlinking.patch | 11 +++++++++++ opencv.changes | 7 +++++++ opencv.spec | 8 ++++---- 6 files changed, 25 insertions(+), 19 deletions(-) delete mode 100644 OpenCV-2.4.0.tar.bz2 create mode 100644 OpenCV-2.4.1.tar.bz2 delete mode 100644 opencv-2.3-underlinking.patch create mode 100644 opencv-underlinking.patch diff --git a/OpenCV-2.4.0.tar.bz2 b/OpenCV-2.4.0.tar.bz2 deleted file mode 100644 index 6f6ebd7..0000000 --- a/OpenCV-2.4.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3b5fedb2fc6ad0aa1509676468f571ba21456679e7d48a8242a096d62e2c6ac9 -size 47156770 diff --git a/OpenCV-2.4.1.tar.bz2 b/OpenCV-2.4.1.tar.bz2 new file mode 100644 index 0000000..ea4a1ba --- /dev/null +++ b/OpenCV-2.4.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29b6ab4fcda5cf89015507f4625d672ade5b041a48535792214f3b19fe92b1f3 +size 47211018 diff --git a/opencv-2.3-underlinking.patch b/opencv-2.3-underlinking.patch deleted file mode 100644 index 30eb35b..0000000 --- a/opencv-2.3-underlinking.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: CMakeLists.txt -=================================================================== ---- CMakeLists.txt.orig -+++ CMakeLists.txt -@@ -544,6 +544,7 @@ if(UNIX) - endif() - if(WITH_V4L) - CHECK_MODULE(libv4l1 HAVE_LIBV4L) -+ CHECK_MODULE(libv4l2 HAVE_LIBV4L2) - CHECK_INCLUDE_FILE(linux/videodev.h HAVE_CAMV4L) - CHECK_INCLUDE_FILE(linux/videodev2.h HAVE_CAMV4L2) - else() diff --git a/opencv-underlinking.patch b/opencv-underlinking.patch new file mode 100644 index 0000000..6f99f01 --- /dev/null +++ b/opencv-underlinking.patch @@ -0,0 +1,11 @@ +diff -urN OpenCV-2.4.1-orig/cmake/OpenCVFindLibsVideo.cmake OpenCV-2.4.1/cmake/OpenCVFindLibsVideo.cmake +--- OpenCV-2.4.1-orig/cmake/OpenCVFindLibsVideo.cmake 2012-05-31 17:05:39.000000000 +0300 ++++ OpenCV-2.4.1/cmake/OpenCVFindLibsVideo.cmake 2012-06-08 11:26:23.643869881 +0300 +@@ -75,6 +75,7 @@ + ocv_clear_vars(HAVE_LIBV4L HAVE_CAMV4L HAVE_CAMV4L2) + if(WITH_V4L) + CHECK_MODULE(libv4l1 HAVE_LIBV4L) ++ CHECK_MODULE(libv4l2 HAVE_LIBV4L2) + CHECK_INCLUDE_FILE(linux/videodev.h HAVE_CAMV4L) + CHECK_INCLUDE_FILE(linux/videodev2.h HAVE_CAMV4L2) + endif(WITH_V4L) diff --git a/opencv.changes b/opencv.changes index 6b8cd93..65959e9 100644 --- a/opencv.changes +++ b/opencv.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jun 8 11:07:47 EEST 2012 - koprok@nand.bg + +- Update to OpenCV 2.4.1 + More info at: + http://code.opencv.org/projects/opencv/wiki/ChangeLog + ------------------------------------------------------------------- Tue May 15 14:24:05 EEST 2012 - koprok@nand.bg diff --git a/opencv.spec b/opencv.spec index a85cb36..10aefce 100644 --- a/opencv.spec +++ b/opencv.spec @@ -21,7 +21,7 @@ Name: opencv %define libname lib%{name} %define soname 2_4 -Version: 2.4.0 +Version: 2.4.1 Release: 0 Summary: Collection of algorithms for computer vision License: BSD-3-Clause @@ -30,8 +30,8 @@ Url: http://%{name}.willowgarage.com/wiki/ Source0: http://downloads.sourceforge.net/project/%{name}library/%{name}-unix/%{version}/OpenCV-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM opencv-samples.patch koprok@nand.bg -- Improve samples installation. Patch1: %{name}-samples.patch -# PATCH-FIX-UPSTREAM opencv-2.3-underlinking.patch reddwarf@opensuse.org -- Make libopencv_highgui.so link to libv4l2 since it's using symbols defined there. -Patch2: %{name}-2.3-underlinking.patch +# PATCH-FIX-UPSTREAM opencv-underlinking.patch koprok@nand.bg -- Make libopencv_highgui.so link to libv4l2 since it's using symbols defined there. +Patch2: %{name}-underlinking.patch # PATCH-FIX-OPENSUSE opencv-datadir.patch koprok@nand.bg -- Install data files in share/opencv instead of share/OpenCV. Patch3: %{name}-datadir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -105,7 +105,7 @@ This package contains the documentation and examples for the OpenCV library. %prep %setup -qn OpenCV-%{version} %patch1 -p1 -%patch2 +%patch2 -p1 %patch3 -p1 # Windows specific and with wrong end of line