Package: opencv
In Ubuntu I have added OCL support to this package, debdiff attached
diff -Nru opencv-2.4.6.1+dfsg/debian/changelog opencv-2.4.6.1+dfsg/debian/changelog --- opencv-2.4.6.1+dfsg/debian/changelog 2013-11-23 04:31:06.000000000 +0000 +++ opencv-2.4.6.1+dfsg/debian/changelog 2013-12-12 16:29:01.000000000 +0000 @@ -1,3 +1,14 @@ +opencv (2.4.6.1+dfsg-2ubuntu1) trusty; urgency=low + + * Merge with Debian unstable, remaining changes: + - build-dep on ocl-icd-opencl-dev and add libopencv-ocl-dev to libcv-dev depends + and add libopencv-ocl2.4 and libopencv-ocl-dev packages + * Add detect_opencl to build ocl with multiarched libraries + * opencv-data breaks libopencv-dev (<= 2.4.6.1+dfsg-2ubuntu1) + * Add detect_opencl to fix finding opencl library with multiarch + + -- Jonathan Riddell <jridd...@ubuntu.com> Wed, 11 Dec 2013 16:23:54 +0000 + opencv (2.4.6.1+dfsg-2) unstable; urgency=low [ Anton Gladky ] @@ -67,6 +78,40 @@ -- Nobuhiro Iwamatsu <iwama...@debian.org> Fri, 12 Jul 2013 13:00:43 +0900 +opencv (2.4.5+dfsg-0ubuntu5) trusty; urgency=low + + * No change rebuild against libav9. + + -- Dmitrijs Ledkovs <x...@ubuntu.com> Thu, 07 Nov 2013 11:25:28 +0000 + +opencv (2.4.5+dfsg-0ubuntu4) saucy; urgency=low + + * Add libopencv-ocl-dev to depends of libopencv-dev + + -- Jonathan Riddell <jridd...@ubuntu.com> Thu, 10 Oct 2013 16:58:42 +0100 + +opencv (2.4.5+dfsg-0ubuntu3) saucy; urgency=low + + [ Thomas Bleher ] + * Package missing library libopencv-ocl LP: #1213861 + + [ Jonathan Riddell ] + * Add build-dep on ocl-icd-opencl-dev + + -- Thomas Bleher <thomasble...@gmx.de> Mon, 19 Aug 2013 08:21:39 +0200 + +opencv (2.4.5+dfsg-0ubuntu2) saucy; urgency=low + + * Package missing library libopencv-superres + + -- Jonathan Riddell <jridd...@ubuntu.com> Fri, 28 Jun 2013 14:01:14 +0100 + +opencv (2.4.5+dfsg-0ubuntu1) saucy; urgency=low + + * New upstream release + + -- Jonathan Riddell <jridd...@ubuntu.com> Wed, 26 Jun 2013 16:44:16 +0100 + opencv (2.4.3+dfsg-1) experimental; urgency=low * New upstream release. diff -Nru opencv-2.4.6.1+dfsg/debian/control opencv-2.4.6.1+dfsg/debian/control --- opencv-2.4.6.1+dfsg/debian/control 2013-10-12 22:09:18.000000000 +0100 +++ opencv-2.4.6.1+dfsg/debian/control 2013-12-12 16:17:52.000000000 +0000 @@ -1,7 +1,8 @@ Source: opencv Priority: optional Section: devel -Maintainer: Debian Science Team <debian-science-maintain...@lists.alioth.debian.org> +Maintainer: Kubuntu Developers <kubuntu-de...@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Science Team <debian-science-maintain...@lists.alioth.debian.org> Uploaders: Sam Hocevar (Debian packages) <sam+...@zoy.org>, Nobuhiro Iwamatsu <iwama...@debian.org> Build-Depends: debhelper (>= 9), @@ -25,7 +26,8 @@ python-numpy, python-sphinx, texlive-fonts-extra, texlive-latex-extra, texlive-latex-recommended, - latex-xcolor, texlive-fonts-recommended + latex-xcolor, texlive-fonts-recommended, + ocl-icd-opencl-dev Standards-Version: 3.9.4 Vcs-Svn: svn://anonscm.debian.org/debian-science/packages/opencv/trunk/ Vcs-Browser: http://anonscm.debian.org/viewsvn/debian-science/packages/opencv/trunk/ @@ -65,7 +67,8 @@ libopencv-objdetect-dev, libopencv-legacy-dev, libopencv-video-dev, - libopencv-ml-dev + libopencv-ml-dev, + libopencv-ocl-dev Conflicts: libcvaux-dev (<= 2.1.0-7), libhighgui-dev (<= 2.1.0-7) Description: Translation package for libcv-dev This package provide files for translation from libcv-dev to @@ -249,7 +252,7 @@ Section: libdevel Architecture: all Depends: ${misc:Depends} -Breaks: libopencv-dev (<= 2.3.1-12) +Breaks: libopencv-dev (<< 2.4.6.1+dfsg-2ubuntu1) Description: development data for opencv This is a metapackage providing development package necessary for development of OpenCV (Open Computer Vision). @@ -1030,6 +1033,50 @@ . The Open Computer Vision Library is a collection of algorithms and sample code for various computer vision problems. The library is compatible with + IPL (Intel's Image Processing Library) and, if available, can use IPP + (Intel's Integrated Performance Primitives) for better performance. + . + OpenCV provides low level portable data types and operators, and a set + of high level functionalities for video acquisition, image processing and + analysis, structural analysis, motion analysis and object tracking, object + recognition, camera calibration and 3D reconstruction. + +Package: libopencv-ocl-dev +Section: libdevel +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends}, + libopencv-core-dev (= ${binary:Version}), + libopencv-imgproc-dev (= ${binary:Version}), + libopencv-objdetect-dev (= ${binary:Version}), + libopencv-features2d-dev (= ${binary:Version}), + libopencv-ocl2.4 (= ${binary:Version}) +Description: development files for libopencv-photo2.4 + This package contains the header files and static library needed to compile + applications that use OpenCV (Open Computer Vision) OpenCL support library. + . + The Open Computer Vision Library is a collection of algorithms and sample + code for various computer vision problems. The library is compatible with + IPL (Intel's Image Processing Library) and, if available, can use IPP + (Intel's Integrated Performance Primitives) for better performance. + . + OpenCV provides low level portable data types and operators, and a set + of high level functionalities for video acquisition, image processing and + analysis, structural analysis, motion analysis and object tracking, object + recognition, camera calibration and 3D reconstruction. + +Package: libopencv-ocl2.4 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, + libopencv-core2.4 (= ${binary:Version}), + libopencv-imgproc2.4 (= ${binary:Version}), + libopencv-objdetect2.4 (= ${binary:Version}), + libopencv-highgui2.4 (= ${binary:Version}) +Description: computer vision OpenCL support library + This package contains the OpenCV (Open Computer Vision) OpenCL support library. + . + The Open Computer Vision Library is a collection of algorithms and sample + code for various computer vision problems. The library is compatible with IPL (Intel's Image Processing Library) and, if available, can use IPP (Intel's Integrated Performance Primitives) for better performance. . diff -Nru opencv-2.4.6.1+dfsg/debian/libopencv-ocl2.4.install opencv-2.4.6.1+dfsg/debian/libopencv-ocl2.4.install --- opencv-2.4.6.1+dfsg/debian/libopencv-ocl2.4.install 1970-01-01 01:00:00.000000000 +0100 +++ opencv-2.4.6.1+dfsg/debian/libopencv-ocl2.4.install 2013-12-12 15:41:43.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/*/libopencv_ocl.so.* diff -Nru opencv-2.4.6.1+dfsg/debian/libopencv-ocl-dev.install opencv-2.4.6.1+dfsg/debian/libopencv-ocl-dev.install --- opencv-2.4.6.1+dfsg/debian/libopencv-ocl-dev.install 1970-01-01 01:00:00.000000000 +0100 +++ opencv-2.4.6.1+dfsg/debian/libopencv-ocl-dev.install 2013-12-12 15:41:28.000000000 +0000 @@ -0,0 +1,3 @@ +usr/include/opencv2/ocl/* +usr/lib/*/libopencv_ocl.a +usr/lib/*/libopencv_ocl.so diff -Nru opencv-2.4.6.1+dfsg/debian/patches/detect_opencl opencv-2.4.6.1+dfsg/debian/patches/detect_opencl --- opencv-2.4.6.1+dfsg/debian/patches/detect_opencl 1970-01-01 01:00:00.000000000 +0100 +++ opencv-2.4.6.1+dfsg/debian/patches/detect_opencl 2013-12-11 18:30:48.000000000 +0000 @@ -0,0 +1,33 @@ +Index: opencv-2.4.6.1+dfsg/cmake/OpenCVDetectOpenCL.cmake +=================================================================== +--- opencv-2.4.6.1+dfsg.orig/cmake/OpenCVDetectOpenCL.cmake 2013-12-11 18:24:47.825131542 +0000 ++++ opencv-2.4.6.1+dfsg/cmake/OpenCVDetectOpenCL.cmake 2013-12-11 18:30:46.197140718 +0000 +@@ -4,7 +4,7 @@ + set(OPENCL_INCLUDE_DIR "" CACHE STRING "OpenCL include directory") + mark_as_advanced(OPENCL_INCLUDE_DIR OPENCL_LIBRARY) + else(APPLE) +- #find_package(OpenCL QUIET) ++ find_package(OpenCL QUIET) + + if (NOT OPENCL_FOUND) + find_path(OPENCL_ROOT_DIR +@@ -17,8 +17,7 @@ + NAMES OpenCL/cl.h CL/cl.h + HINTS ${OPENCL_ROOT_DIR} + PATH_SUFFIXES include include/nvidia-current +- DOC "OpenCL include directory" +- NO_DEFAULT_PATH) ++ DOC "OpenCL include directory") + + if (X86_64) + set(OPENCL_POSSIBLE_LIB_SUFFIXES lib/Win64 lib/x86_64 lib/x64) +@@ -30,8 +29,7 @@ + NAMES OpenCL + HINTS ${OPENCL_ROOT_DIR} + PATH_SUFFIXES ${OPENCL_POSSIBLE_LIB_SUFFIXES} +- DOC "OpenCL library" +- NO_DEFAULT_PATH) ++ DOC "OpenCL library") + + mark_as_advanced(OPENCL_INCLUDE_DIR OPENCL_LIBRARY) + include(FindPackageHandleStandardArgs) diff -Nru opencv-2.4.6.1+dfsg/debian/patches/series opencv-2.4.6.1+dfsg/debian/patches/series --- opencv-2.4.6.1+dfsg/debian/patches/series 2013-11-23 02:32:46.000000000 +0000 +++ opencv-2.4.6.1+dfsg/debian/patches/series 2013-12-11 18:22:21.000000000 +0000 @@ -4,3 +4,4 @@ fix_ftbfs_on_non_linux.patch pkg-config change_type_from_int_to_Atomic_word +detect_opencl