Update to 2.4.6.1. Sat in my tree until sthen@ helped me to realize that.
Key notes:
* OpenCV now has separate "opencv_nonfree" module, which contains all of
the patented algorithms. It was decided on ports@ to not create "nonfree"
FLAVOR but just set PERMIT_PACKAGE_CDROM=No, while allowing FTP
distribution.
* OpenCV now have its own Java bindings. You could avoid building them by
using the "no_java" PSEUDO_FLAVOR.
* Documentation placement was cleaned up, too.
Input from sthen@ and naddy@. Tested on i386 and amd64 with Digikam from WIP.
Okay sthen@ and Rafael Sadowski (MAINTAINER)
This commit is contained in:
zhuk
parent
bf10b8d564
commit
79e79b5af2
@ -1,100 +1,164 @@
|
||||
# $OpenBSD: Makefile,v 1.19 2013/03/21 08:45:19 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.20 2013/10/21 22:46:27 zhuk Exp $
|
||||
|
||||
ONLY_FOR_ARCHS= ${GCC4_ARCHS}
|
||||
ONLY_FOR_ARCHS = ${GCC4_ARCHS}
|
||||
ONLY_FOR_ARCHS-java = i386 amd64
|
||||
SHARED_ONLY = Yes
|
||||
VMEM_WARNING = Yes
|
||||
|
||||
BROKEN-sparc64 = error: cannot convert 'int*' to 'volatile _Atomic_word*'
|
||||
SHARED_ONLY= Yes
|
||||
CATEGORIES = graphics devel
|
||||
COMMENT-docs = OpenCV documentation and examples
|
||||
COMMENT-main = library of programming functions for real time cv
|
||||
COMMENT-java = Java bindings for OpenCV
|
||||
|
||||
COMMENT-main= library of programming functions for real time cv
|
||||
COMMENT-docs= documentation for OpenCV
|
||||
V = 2.4.6.1
|
||||
DISTNAME = opencv-$V
|
||||
PKGNAME-main = ${PKGNAME}
|
||||
PKGNAME-docs = opencv-docs-$V
|
||||
PKGNAME-java = opencv-java-$V
|
||||
|
||||
V= 2.2.0
|
||||
DISTNAME= OpenCV-$V
|
||||
PKGNAME-main= opencv-$V
|
||||
REVISION-main= 8
|
||||
PKGNAME-docs= opencv-docs-$V
|
||||
REVISION-docs= 1
|
||||
CATEGORIES= graphics devel
|
||||
HOMEPAGE = http://www.opencv.org/
|
||||
MAINTAINER = Rafael Sadowski <rafael@sizeofvoid.org>
|
||||
|
||||
SHARED_LIBS += opencv_calib3d 0.0
|
||||
SHARED_LIBS += opencv_contrib 0.0
|
||||
SHARED_LIBS += opencv_core 0.0
|
||||
SHARED_LIBS += opencv_features2d 0.0
|
||||
SHARED_LIBS += opencv_flann 0.0
|
||||
SHARED_LIBS += opencv_gpu 0.0
|
||||
SHARED_LIBS += opencv_highgui 0.0
|
||||
SHARED_LIBS += opencv_imgproc 0.0
|
||||
SHARED_LIBS += opencv_legacy 0.0
|
||||
SHARED_LIBS += opencv_ml 0.0
|
||||
SHARED_LIBS += opencv_objdetect 0.0
|
||||
SHARED_LIBS += opencv_video 0.0
|
||||
SHARED_LIBS = opencv_calib3d 1.0 #1.0
|
||||
SHARED_LIBS += opencv_contrib 1.0 #1.0
|
||||
SHARED_LIBS += opencv_core 1.0 #1.0
|
||||
SHARED_LIBS += opencv_features2d 1.0 #1.0
|
||||
SHARED_LIBS += opencv_flann 1.0 #1.0
|
||||
SHARED_LIBS += opencv_gpu 1.0 #1.0
|
||||
SHARED_LIBS += opencv_highgui 1.0 #1.0
|
||||
SHARED_LIBS += opencv_imgproc 1.0 #1.0
|
||||
SHARED_LIBS += opencv_legacy 1.0 #1.0
|
||||
SHARED_LIBS += opencv_ml 1.0 #1.0
|
||||
SHARED_LIBS += opencv_nonfree 0.0 #0.0
|
||||
SHARED_LIBS += opencv_objdetect 1.0 #1.0
|
||||
SHARED_LIBS += opencv_photo 0.0 #0.0
|
||||
SHARED_LIBS += opencv_stitching 0.0 #0.0
|
||||
SHARED_LIBS += opencv_superres 0.0 #0.0
|
||||
SHARED_LIBS += opencv_ts 0.0 #0.0
|
||||
SHARED_LIBS += opencv_video 1.0 #1.0
|
||||
SHARED_LIBS += opencv_videostab 0.0 #0.0
|
||||
|
||||
HOMEPAGE= http://opencv.willowgarage.com/
|
||||
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=opencvlibrary/}
|
||||
|
||||
MAINTAINER= Rafael Sadowski <rafael@sizeofvoid.org>
|
||||
WANTLIB-main = Half Iex IlmImf IlmThread Imath X11 Xcomposite Xcursor
|
||||
WANTLIB-main += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0
|
||||
WANTLIB-main += avcodec avformat avutil bz2 c cairo fontconfig
|
||||
WANTLIB-main += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
|
||||
WANTLIB-main += gmodule-2.0 gobject-2.0 gstapp-0.10 gstbase-0.10
|
||||
WANTLIB-main += gstreamer-0.10 gstvideo-0.10 gthread-2.0 gtk-x11-2.0
|
||||
WANTLIB-main += jasper jpeg m pango-1.0 pangocairo-1.0
|
||||
WANTLIB-main += pangoft2-1.0 png pthread stdc++ swscale tiff xml2 z
|
||||
WANTLIB-main += ${MODGETTEXT_WANTLIB} ${MODPY_WANTLIB}
|
||||
|
||||
# BSD
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
WANTLIB-docs =
|
||||
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opencvlibrary/}
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
WANTLIB-java = m pthread stdc++ z
|
||||
WANTLIB-java += opencv_calib3d opencv_contrib opencv_core
|
||||
WANTLIB-java += opencv_features2d opencv_flann opencv_highgui
|
||||
WANTLIB-java += opencv_imgproc opencv_ml opencv_objdetect
|
||||
WANTLIB-java += opencv_photo opencv_video
|
||||
|
||||
WANTLIB += GL Half Iex IlmImf Imath X11 Xcomposite Xcursor Xdamage
|
||||
WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 avcodec
|
||||
WANTLIB += avformat avutil bz2 c cairo expat fontconfig freetype
|
||||
WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
|
||||
WANTLIB += gobject-2.0 gstapp-0.10 gstbase-0.10 gstreamer-0.10
|
||||
WANTLIB += gstvideo-0.10 gthread-2.0 gtk-x11-2.0 jasper jpeg m
|
||||
WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png
|
||||
WANTLIB += pthread pthread-stubs stdc++ swscale tiff xcb
|
||||
WANTLIB += xcb-render xcb-shm xml2 z ${MODPY_WANTLIB}
|
||||
MULTI_PACKAGES = -main -docs -java
|
||||
PSEUDO_FLAVORS = no_docs no_java
|
||||
FLAVOR ?=
|
||||
|
||||
MODULES= devel/cmake \
|
||||
# "patents" means containing some patented algorithms, see
|
||||
# http://docs.opencv.org/modules/nonfree/doc/nonfree.html
|
||||
# As some source modules include this functionality, we couldn't
|
||||
# just subpackage "nonfree". Excluding this, here we have a usual
|
||||
# BSDL
|
||||
PERMIT_PACKAGE_FTP = Yes
|
||||
PERMIT_PACKAGE_CDROM = patents
|
||||
PERMIT_PACKAGE_CDROM-docs = Yes
|
||||
|
||||
.include <bsd.port.arch.mk>
|
||||
|
||||
MODULES = devel/cmake \
|
||||
devel/gettext \
|
||||
lang/python
|
||||
|
||||
MULTI_PACKAGES= -main -docs
|
||||
|
||||
CONFIGURE_STYLE= cmake
|
||||
LIB_DEPENDS-main= multimedia/gstreamer-0.10/plugins-base \
|
||||
x11/gtk+2 \
|
||||
graphics/ilmbase \
|
||||
graphics/openexr \
|
||||
graphics/ffmpeg>=20121026
|
||||
|
||||
WANTLIB-docs= # empty
|
||||
LIB_DEPENDS-docs= # empty
|
||||
RUN_DEPENDS-docs= # empty
|
||||
PKG_ARCH-docs= *
|
||||
|
||||
|
||||
VMEM_WARNING= Yes
|
||||
|
||||
RUN_DEPENDS-main= math/py-numpy
|
||||
BUILD_DEPENDS= devel/doxygen \
|
||||
BUILD_DEPENDS = devel/doxygen \
|
||||
math/py-numpy
|
||||
|
||||
RUN_DEPENDS-main = ${RUN_DEPENDS} \
|
||||
math/py-numpy
|
||||
RUN_DEPENDS-docs = ${BUILD_PKGPATH},-main
|
||||
RUN_DEPENDS-java = ${MODJAVA_RUN_DEPENDS}
|
||||
|
||||
LIB_DEPENDS-main = ${LIB_DEPENDS} \
|
||||
${MODPY_LIB_DEPENDS} \
|
||||
multimedia/gstreamer-0.10/plugins-base \
|
||||
x11/gtk+2 \
|
||||
graphics/ffmpeg \
|
||||
graphics/ilmbase \
|
||||
graphics/jpeg \
|
||||
graphics/openexr \
|
||||
graphics/png \
|
||||
graphics/tiff
|
||||
LIB_DEPENDS-docs =
|
||||
LIB_DEPENDS-java = ${BUILD_PKGPATH},-main
|
||||
|
||||
# ATM opencv requires V4L1 compat, ask them to change it,
|
||||
# then see WITH_V4L below.
|
||||
CONFIGURE_ARGS+= -DBUILD_EXAMPLES:Bool=Off \
|
||||
-DINSTALL_C_EXAMPLES:Bool=Off \
|
||||
-DINSTALL_PYTHON_EXAMPLES:Bool=Off \
|
||||
-DBUILD_PYTHON_SUPPORT:Bool=On \
|
||||
-DBUILD_LATEX_DOCS:Bool=Off \
|
||||
-DWITH_GTK:Bool=On \
|
||||
-DWITH_V4L:Bool=Off \
|
||||
-DWITH_EIGEN2:Bool=Off \
|
||||
-DWITH_GSTREAMER:Bool=On \
|
||||
CONFIGURE_ARGS = -DBUILD_opencv_nonfree:Bool=On \
|
||||
-DWITH_1394:Bool=Off \
|
||||
-DWITH_FFMPEG:Bool=On
|
||||
-DWITH_CUDA:Bool=Off \
|
||||
-DWITH_FFMPEG:Bool=On \
|
||||
-DWITH_GSTREAMER:Bool=On \
|
||||
-DWITH_GTK:Bool=On \
|
||||
-DWITH_JPEG:Bool=On \
|
||||
-DWITH_PNG:Bool=On \
|
||||
-DWITH_TIFF:Bool=On \
|
||||
-DWITH_V4L:Bool=Off
|
||||
|
||||
MAKE_ENV+= DOXYGEN_ENCODE_PATH_STRIP=${WRKSRC}
|
||||
.if ${BUILD_PACKAGES:M-java}
|
||||
MODULES += java
|
||||
MODJAVA_VER = 1.6+
|
||||
.else
|
||||
# Safe: Java will be detected, if present, but won't be used
|
||||
CONFIGURE_ARGS += -DBUILD_opencv_java:Bool=Off
|
||||
.endif
|
||||
|
||||
pre-patch:
|
||||
perl -i -pe 's/\r$$//' ${WRKSRC}/CMakeLists.txt
|
||||
.if ${BUILD_PACKAGES:M-docs}
|
||||
BUILD_DEPENDS += textproc/py-sphinx
|
||||
ALL_TARGET = all html_docs
|
||||
CONFIGURE_ARGS += -DBUILD_DOCS:Bool=On \
|
||||
-DBUILD_EXAMPLES:Bool=On \
|
||||
-DINSTALL_C_EXAMPLES:Bool=On \
|
||||
-DINSTALL_PYTHON_EXAMPLES:Bool=On
|
||||
.else
|
||||
CONFIGURE_ARGS += -DBUILD_DOCS:Bool=Off \
|
||||
-DBUILD_EXAMPLES:Bool=Off \
|
||||
-DINSTALL_PYTHON_EXAMPLES:Bool=Off
|
||||
.endif
|
||||
|
||||
post-configure:
|
||||
find ${WRKSRC} -type f -iname "*.make" -exec \
|
||||
perl -pi -e 's/(CXX_DEFINES =).*/$1/' {} \;
|
||||
CONFIG_ADJ_CMD = perl -pi
|
||||
.for _l _v in ${SHARED_LIBS}
|
||||
CONFIG_ADJ_CMD += -e 's,lib${_l}.so([^.]),lib${_l}.so.${_v}$$1,g;'
|
||||
.endfor
|
||||
|
||||
DOCDIR = ${PREFIX}/share/doc/OpenCV
|
||||
|
||||
post-patch:
|
||||
perl -pi -e 's@^.*(#\s*include)@$$1@' \
|
||||
${WRKSRC}/samples/cpp/tutorial_code/core/how_to_scan_images/how_to_scan_images.cpp
|
||||
|
||||
post-install:
|
||||
${CONFIG_ADJ_CMD} ${PREFIX}/share/OpenCV/OpenCVConfig.cmake
|
||||
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py ${WRKINST}${MODPY_SITEPKG}
|
||||
.if ${BUILD_PACKAGES:M-docs}
|
||||
rm -Rf ${DOCDIR}
|
||||
mv ${PREFIX}/share/OpenCV/doc ${DOCDIR}
|
||||
cp -R ${WRKBUILD}/doc/_html ${DOCDIR}/html
|
||||
.endif
|
||||
|
||||
do-test:
|
||||
@cd ${WRKBUILD}/bin; \
|
||||
failed=false; \
|
||||
for t in opencv_test*; do \
|
||||
echo "RUNNING TEST: $$t" >&2; \
|
||||
./$$t || failed=true; \
|
||||
done; \
|
||||
$$failed
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,5 +1,2 @@
|
||||
MD5 (OpenCV-2.2.0.tar.bz2) = Eiyax5OkaFTvKBn+271rGw==
|
||||
RMD160 (OpenCV-2.2.0.tar.bz2) = V67bdniWT0OvPxyDioJmx7SGmwE=
|
||||
SHA1 (OpenCV-2.2.0.tar.bz2) = mE7XFnLVA5HQYX/OLvWOdZDsD9c=
|
||||
SHA256 (OpenCV-2.2.0.tar.bz2) = JZmCKT254ec9yiypCfwzKskjvsZFeKZX2LuKtszeuI4=
|
||||
SIZE (OpenCV-2.2.0.tar.bz2) = 19800873
|
||||
SHA256 (opencv-2.4.6.1.tar.gz) = rnz9hZR2tswFJGlJ3csWX7KE6vmm2BSyl23CEIh3iqA=
|
||||
SIZE (opencv-2.4.6.1.tar.gz) = 80762052
|
||||
|
||||
@ -1,53 +1,12 @@
|
||||
$OpenBSD: patch-CMakeLists_txt,v 1.2 2011/11/12 16:49:43 sthen Exp $
|
||||
--- CMakeLists.txt.orig Sun Dec 5 03:35:23 2010
|
||||
+++ CMakeLists.txt Fri Nov 11 23:27:21 2011
|
||||
@@ -233,7 +233,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
|
||||
set(USE_OMIT_FRAME_POINTER ON CACHE BOOL "Enable -fomit-frame-pointer for GCC")
|
||||
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES arm*)
|
||||
# We can use only -O2 because the -O3 causes gcc crash
|
||||
- set(USE_O2 ON CACHE BOOL "Enable -O2 for GCC")
|
||||
set(USE_FAST_MATH ON CACHE BOOL "Enable -ffast-math for GCC")
|
||||
endif()
|
||||
|
||||
@@ -255,13 +254,11 @@ if(CMAKE_COMPILER_IS_GNUCXX)
|
||||
endif()
|
||||
|
||||
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES powerpc*)
|
||||
- set(USE_O3 ON CACHE BOOL "Enable -O3 for GCC")
|
||||
set(ENABLE_POWERPC ON CACHE BOOL "Enable PowerPC for GCC")
|
||||
endif ()
|
||||
|
||||
if(X86 OR X86_64)
|
||||
# enable everything, since the available set of instructions is checked at runtime
|
||||
- set(USE_O3 ON CACHE BOOL "Enable -O3")
|
||||
set(USE_FAST_MATH ON CACHE BOOL "Enable -ffast-math")
|
||||
set(ENABLE_SSE ON CACHE BOOL "Enable SSE instructions")
|
||||
set(ENABLE_SSE2 ON CACHE BOOL "Enable SSE2 instructions")
|
||||
@@ -430,7 +427,7 @@ if(UNIX)
|
||||
if(WITH_V4L)
|
||||
CHECK_MODULE(libv4l1 HAVE_LIBV4L)
|
||||
CHECK_INCLUDE_FILE(linux/videodev.h HAVE_CAMV4L)
|
||||
- CHECK_INCLUDE_FILE(linux/videodev2.h HAVE_CAMV4L2)
|
||||
+ CHECK_INCLUDE_FILE(sys/videoio.h HAVE_CAMV4L2)
|
||||
else()
|
||||
set(HAVE_LIBV4L FALSE)
|
||||
set(HAVE_CAMV4L FALSE)
|
||||
@@ -464,7 +461,8 @@ if(UNIX)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
- if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
|
||||
+ if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME}
|
||||
+ MATCHES "NetBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
|
||||
set(OPENCV_LINKER_LIBS m pthread)
|
||||
else()
|
||||
set(OPENCV_LINKER_LIBS dl m pthread rt)
|
||||
@@ -865,7 +863,7 @@ include_directories("."
|
||||
# Should be set to true for development
|
||||
set(OPENCV_WARNINGS_ARE_ERRORS OFF CACHE BOOL "Treat warnings as errors")
|
||||
|
||||
-set(EXTRA_C_FLAGS "")
|
||||
+set(EXTRA_C_FLAGS "-DHAVE_JPEG -DHAVE_TIFF -DHAVE_PNG -DHAVE_JASPER -DHAVE_OPENEXR")
|
||||
set(EXTRA_C_FLAGS_RELEASE "")
|
||||
set(EXTRA_C_FLAGS_DEBUG "")
|
||||
set(EXTRA_EXE_LINKER_FLAGS "")
|
||||
$OpenBSD: patch-CMakeLists_txt,v 1.3 2013/10/21 22:46:27 zhuk Exp $
|
||||
--- CMakeLists.txt.orig Fri Jun 28 19:47:30 2013
|
||||
+++ CMakeLists.txt Sat Jul 27 21:43:25 2013
|
||||
@@ -376,7 +376,7 @@ if(UNIX)
|
||||
CHECK_INCLUDE_FILE(pthread.h HAVE_LIBPTHREAD)
|
||||
if(ANDROID)
|
||||
set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} dl m log)
|
||||
- elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|NetBSD|DragonFly")
|
||||
+ elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|NetBSD|DragonFly|OpenBSD")
|
||||
set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} m pthread)
|
||||
else()
|
||||
set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} dl m pthread rt)
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-OpenCVPCHSupport_cmake,v 1.1 2011/07/16 22:43:57 espie Exp $
|
||||
--- OpenCVPCHSupport.cmake.orig Sat Jul 16 23:20:31 2011
|
||||
+++ OpenCVPCHSupport.cmake Sat Jul 16 23:20:38 2011
|
||||
@@ -20,7 +20,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
|
||||
OUTPUT_VARIABLE gcc_compiler_version)
|
||||
#MESSAGE("GCC Version: ${gcc_compiler_version}")
|
||||
IF(gcc_compiler_version MATCHES "4\\.[0,2-9]\\.[0-9]")
|
||||
- SET(PCHSupport_FOUND TRUE)
|
||||
+ SET(PCHSupport_FOUND FALSE)
|
||||
ENDIF()
|
||||
|
||||
SET(_PCH_include_prefix "-I")
|
||||
@ -0,0 +1,11 @@
|
||||
$OpenBSD: patch-cmake_OpenCVFindLibsVideo_cmake,v 1.1 2013/10/21 22:46:27 zhuk Exp $
|
||||
--- cmake/OpenCVFindLibsVideo.cmake.orig Fri Jun 28 19:47:30 2013
|
||||
+++ cmake/OpenCVFindLibsVideo.cmake Sat Jul 27 21:43:25 2013
|
||||
@@ -121,7 +121,6 @@ ocv_clear_vars(HAVE_LIBV4L HAVE_CAMV4L HAVE_CAMV4L2 HA
|
||||
if(WITH_V4L)
|
||||
CHECK_MODULE(libv4l1 HAVE_LIBV4L)
|
||||
CHECK_INCLUDE_FILE(linux/videodev.h HAVE_CAMV4L)
|
||||
- CHECK_INCLUDE_FILE(linux/videodev2.h HAVE_CAMV4L2)
|
||||
CHECK_INCLUDE_FILE(sys/videoio.h HAVE_VIDEOIO)
|
||||
endif(WITH_V4L)
|
||||
|
||||
12
graphics/opencv/patches/patch-cmake_OpenCVPCHSupport_cmake
Normal file
12
graphics/opencv/patches/patch-cmake_OpenCVPCHSupport_cmake
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-cmake_OpenCVPCHSupport_cmake,v 1.1 2013/10/21 22:46:27 zhuk Exp $
|
||||
--- cmake/OpenCVPCHSupport.cmake.orig Sun May 12 20:38:56 2013
|
||||
+++ cmake/OpenCVPCHSupport.cmake Sun May 12 20:39:31 2013
|
||||
@@ -20,7 +20,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
|
||||
OUTPUT_VARIABLE gcc_compiler_version)
|
||||
#MESSAGE("GCC Version: ${gcc_compiler_version}")
|
||||
IF(gcc_compiler_version VERSION_GREATER "4.2.-1")
|
||||
- SET(PCHSupport_FOUND TRUE)
|
||||
+ SET(PCHSupport_FOUND FALSE)
|
||||
ENDIF()
|
||||
|
||||
SET(_PCH_include_prefix "-I")
|
||||
40
graphics/opencv/patches/patch-cmake_OpenCVUtils_cmake
Normal file
40
graphics/opencv/patches/patch-cmake_OpenCVUtils_cmake
Normal file
@ -0,0 +1,40 @@
|
||||
$OpenBSD: patch-cmake_OpenCVUtils_cmake,v 1.1 2013/10/21 22:46:27 zhuk Exp $
|
||||
--- cmake/OpenCVUtils.cmake.orig Fri Jun 28 19:47:30 2013
|
||||
+++ cmake/OpenCVUtils.cmake Sat Jul 27 21:43:25 2013
|
||||
@@ -227,11 +227,31 @@ macro(CHECK_MODULE module_name define)
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
- foreach(P "${ALIAS_LIBRARY_DIRS}")
|
||||
- if(${P})
|
||||
- list(APPEND HIGHGUI_LIBRARY_DIRS ${${P}})
|
||||
- endif()
|
||||
- endforeach()
|
||||
+ # Find exact libraries to allow building OpenCV when another
|
||||
+ # version is installed.
|
||||
+ set(LL)
|
||||
+ set(LDIRS)
|
||||
+ foreach(L ${${ALIAS_LIBRARIES}})
|
||||
+ set("${ALIAS}_LIBRARY_${L}")
|
||||
+ find_library("${ALIAS}_LIBRARY_${L}" NAMES ${L}
|
||||
+ HINTS ${${ALIAS_LIBRARY_DIRS}}
|
||||
+ )
|
||||
+ if(${ALIAS}_LIBRARY_${L})
|
||||
+ list(APPEND LL "${${ALIAS}_LIBRARY_${L}}")
|
||||
+ else(${ALIAS}_LIBRARY_${L})
|
||||
+ list(APPEND LL "${L}")
|
||||
+ set(LDIRS ${${ALIAS_LIBRARY_DIRS}})
|
||||
+ endif(${ALIAS}_LIBRARY_${L})
|
||||
+ endforeach(L ${ALIAS_LIBRARIES})
|
||||
+ set(${ALIAS_LIBRARIES} ${LL}
|
||||
+ CACHE INTERNAL "Libraries to link to ${module_name}")
|
||||
+ set(${ALIAS_LIBRARY_DIRS} ${LDIRS}
|
||||
+ CACHE INTERNAL "Library directories to use when linking to ${module_name}")
|
||||
+ if(${ALIAS_LIBRARY_DIRS})
|
||||
+ message("-- Adding ${${ALIAS_LIBRARY_DIRS}} to link_directories for ${module_name}.")
|
||||
+ message(" This could break build if OpenCV is already installed!")
|
||||
+ link_directories(${${ALIAS_LIBRARY_DIRS}})
|
||||
+ endif(${ALIAS_LIBRARY_DIRS})
|
||||
|
||||
list(APPEND HIGHGUI_LIBRARIES ${${ALIAS_LIBRARIES}})
|
||||
endif()
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-doc_CMakeLists_txt,v 1.1.1.1 2011/06/24 09:30:21 jasper Exp $
|
||||
--- doc/CMakeLists.txt.orig Tue Jun 14 12:46:05 2011
|
||||
+++ doc/CMakeLists.txt Tue Jun 14 12:46:37 2011
|
||||
@@ -157,7 +157,7 @@ add_custom_target(${HTML_TARGET} ALL
|
||||
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
|
||||
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile ${doxy_html_dep_list})
|
||||
exec_program(mkdir ARGS "-p \"${CMAKE_CURRENT_BINARY_DIR}/html/\"")
|
||||
-install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/html" DESTINATION "${OPENCV_DOC_INSTALL_PATH}/html" COMPONENT main)
|
||||
+install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/html" DESTINATION "${OPENCV_DOC_INSTALL_PATH}/" COMPONENT main)
|
||||
|
||||
endif()
|
||||
|
||||
@ -1,292 +0,0 @@
|
||||
$OpenBSD: patch-modules_highgui_src_cap_ffmpeg_cpp,v 1.6 2013/01/19 10:13:15 brad Exp $
|
||||
|
||||
Update for newer FFmpeg API.
|
||||
|
||||
--- modules/highgui/src/cap_ffmpeg.cpp.orig Sat Dec 4 22:35:25 2010
|
||||
+++ modules/highgui/src/cap_ffmpeg.cpp Fri Jan 18 16:45:53 2013
|
||||
@@ -53,7 +53,7 @@ extern "C" {
|
||||
#define UINT64_C
|
||||
#define __STDC_CONSTANT_MACROS
|
||||
// force re-inclusion of stdint.h to get INT64_C macro
|
||||
-#undef _STDINT_H
|
||||
+#undef _SYS_STDINT_H_
|
||||
#include <stdint.h>
|
||||
#endif
|
||||
#include <errno.h>
|
||||
@@ -109,6 +109,8 @@ extern "C" {
|
||||
|
||||
}
|
||||
|
||||
+#define CALC_FFMPEG_VERSION(a,b,c) ( a<<16 | b<<8 | c )
|
||||
+
|
||||
#if defined _MSC_VER && _MSC_VER >= 1200
|
||||
#pragma warning( default: 4244 4510 4512 4610 )
|
||||
#endif
|
||||
@@ -384,7 +386,11 @@ void CvCapture_FFMPEG::close()
|
||||
|
||||
if( ic )
|
||||
{
|
||||
+#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 24, 2)
|
||||
+ avformat_close_input(&ic);
|
||||
+#else
|
||||
av_close_input_file(ic);
|
||||
+#endif
|
||||
ic = NULL;
|
||||
}
|
||||
|
||||
@@ -413,18 +419,35 @@ bool CvCapture_FFMPEG::reopen()
|
||||
#else
|
||||
avcodec_close( &video_st->codec );
|
||||
#endif
|
||||
+#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 24, 2)
|
||||
+ avformat_close_input(&ic);
|
||||
+#else
|
||||
av_close_input_file(ic);
|
||||
+#endif
|
||||
|
||||
// reopen video
|
||||
+#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(52, 111, 0)
|
||||
+ avformat_open_input(&ic, filename, NULL, NULL);
|
||||
+#else
|
||||
av_open_input_file(&ic, filename, NULL, 0, NULL);
|
||||
+#endif
|
||||
+
|
||||
+#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 3, 0)
|
||||
+ avformat_find_stream_info(ic, NULL);
|
||||
+#else
|
||||
av_find_stream_info(ic);
|
||||
+#endif
|
||||
#if LIBAVFORMAT_BUILD > 4628
|
||||
AVCodecContext *enc = ic->streams[video_stream]->codec;
|
||||
#else
|
||||
AVCodecContext *enc = &ic->streams[video_stream]->codec;
|
||||
#endif
|
||||
AVCodec *codec = avcodec_find_decoder(enc->codec_id);
|
||||
+#if LIBAVCODEC_VERSION_INT >= ((53<<16)+(8<<8)+0)
|
||||
+ avcodec_open2(enc, codec, NULL);
|
||||
+#else
|
||||
avcodec_open(enc, codec);
|
||||
+#endif
|
||||
video_st = ic->streams[video_stream];
|
||||
|
||||
// reset framenumber to zero
|
||||
@@ -449,12 +472,22 @@ bool CvCapture_FFMPEG::open( const char* _filename )
|
||||
// av_log_level = AV_LOG_QUIET;
|
||||
#endif
|
||||
|
||||
+#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(52, 111, 0)
|
||||
+ int err = avformat_open_input(&ic, _filename, NULL, NULL);
|
||||
+#else
|
||||
int err = av_open_input_file(&ic, _filename, NULL, 0, NULL);
|
||||
+#endif
|
||||
+
|
||||
if (err < 0) {
|
||||
CV_WARN("Error opening file");
|
||||
goto exit_func;
|
||||
}
|
||||
- err = av_find_stream_info(ic);
|
||||
+ err =
|
||||
+#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 3, 0)
|
||||
+ avformat_find_stream_info(ic, NULL);
|
||||
+#else
|
||||
+ av_find_stream_info(ic);
|
||||
+#endif
|
||||
if (err < 0) {
|
||||
CV_WARN("Could not find codec parameters");
|
||||
goto exit_func;
|
||||
@@ -466,10 +499,15 @@ bool CvCapture_FFMPEG::open( const char* _filename )
|
||||
AVCodecContext *enc = &ic->streams[i]->codec;
|
||||
#endif
|
||||
|
||||
- if( CODEC_TYPE_VIDEO == enc->codec_type && video_stream < 0) {
|
||||
+ if( AVMEDIA_TYPE_VIDEO == enc->codec_type && video_stream < 0) {
|
||||
AVCodec *codec = avcodec_find_decoder(enc->codec_id);
|
||||
if (!codec ||
|
||||
- avcodec_open(enc, codec) < 0)
|
||||
+#if LIBAVCODEC_VERSION_INT >= ((53<<16)+(8<<8)+0)
|
||||
+ avcodec_open2(enc, codec, NULL)
|
||||
+#else
|
||||
+ avcodec_open(enc, codec)
|
||||
+#endif
|
||||
+ < 0)
|
||||
goto exit_func;
|
||||
video_stream = i;
|
||||
video_st = ic->streams[i];
|
||||
@@ -550,7 +588,9 @@ bool CvCapture_FFMPEG::grabFrame()
|
||||
continue;
|
||||
}
|
||||
|
||||
-#if LIBAVFORMAT_BUILD > 4628
|
||||
+#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 2, 0)
|
||||
+ avcodec_decode_video2(video_st->codec, picture, &got_picture, &packet);
|
||||
+#elif LIBAVFORMAT_BUILD > 4628
|
||||
avcodec_decode_video(video_st->codec,
|
||||
picture, &got_picture,
|
||||
packet.data, packet.size);
|
||||
@@ -806,15 +846,15 @@ class CvVideoWriter_FFMPEG : public CvVideoWriter (pro
|
||||
static const char * icvFFMPEGErrStr(int err)
|
||||
{
|
||||
switch(err) {
|
||||
- case AVERROR_NUMEXPECTED:
|
||||
+ case AVERROR(EDOM):
|
||||
return "Incorrect filename syntax";
|
||||
- case AVERROR_INVALIDDATA:
|
||||
+ case AVERROR(EINVAL):
|
||||
return "Invalid data in header";
|
||||
- case AVERROR_NOFMT:
|
||||
+ case AVERROR(EILSEQ):
|
||||
return "Unknown format";
|
||||
- case AVERROR_IO:
|
||||
+ case AVERROR(EIO):
|
||||
return "I/O error occurred";
|
||||
- case AVERROR_NOMEM:
|
||||
+ case AVERROR(ENOMEM):
|
||||
return "Memory allocation error";
|
||||
default:
|
||||
break;
|
||||
@@ -885,8 +925,12 @@ static AVStream *icv_add_video_stream_FFMPEG(AVFormatC
|
||||
int frame_rate, frame_rate_base;
|
||||
AVCodec *codec;
|
||||
|
||||
-
|
||||
+#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 10, 0)
|
||||
+ st = avformat_new_stream(oc, 0);
|
||||
+#else
|
||||
st = av_new_stream(oc, 0);
|
||||
+#endif
|
||||
+
|
||||
if (!st) {
|
||||
CV_WARN("Could not allocate stream");
|
||||
return NULL;
|
||||
@@ -899,7 +943,7 @@ static AVStream *icv_add_video_stream_FFMPEG(AVFormatC
|
||||
#endif
|
||||
|
||||
#if LIBAVFORMAT_BUILD > 4621
|
||||
- c->codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, CODEC_TYPE_VIDEO);
|
||||
+ c->codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, AVMEDIA_TYPE_VIDEO);
|
||||
#else
|
||||
c->codec_id = oc->oformat->video_codec;
|
||||
#endif
|
||||
@@ -911,7 +955,7 @@ static AVStream *icv_add_video_stream_FFMPEG(AVFormatC
|
||||
//if(codec_tag) c->codec_tag=codec_tag;
|
||||
codec = avcodec_find_encoder(c->codec_id);
|
||||
|
||||
- c->codec_type = CODEC_TYPE_VIDEO;
|
||||
+ c->codec_type = AVMEDIA_TYPE_VIDEO;
|
||||
|
||||
/* put sample parameters */
|
||||
c->bit_rate = bitrate;
|
||||
@@ -998,7 +1042,7 @@ int icv_av_write_frame_FFMPEG( AVFormatContext * oc, A
|
||||
AVPacket pkt;
|
||||
av_init_packet(&pkt);
|
||||
|
||||
- pkt.flags |= PKT_FLAG_KEY;
|
||||
+ pkt.flags |= AV_PKT_FLAG_KEY;
|
||||
pkt.stream_index= video_st->index;
|
||||
pkt.data= (uint8_t *)picture;
|
||||
pkt.size= sizeof(AVPicture);
|
||||
@@ -1018,7 +1062,7 @@ int icv_av_write_frame_FFMPEG( AVFormatContext * oc, A
|
||||
pkt.pts = c->coded_frame->pts;
|
||||
#endif
|
||||
if(c->coded_frame->key_frame)
|
||||
- pkt.flags |= PKT_FLAG_KEY;
|
||||
+ pkt.flags |= AV_PKT_FLAG_KEY;
|
||||
pkt.stream_index= video_st->index;
|
||||
pkt.data= outbuf;
|
||||
pkt.size= out_size;
|
||||
@@ -1180,12 +1224,15 @@ void CvVideoWriter_FFMPEG::close()
|
||||
if (!(fmt->flags & AVFMT_NOFILE)) {
|
||||
/* close the output file */
|
||||
|
||||
-
|
||||
+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(123<<8)+0)
|
||||
#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(49<<8)+0)
|
||||
url_fclose(oc->pb);
|
||||
#else
|
||||
url_fclose(&oc->pb);
|
||||
#endif
|
||||
+#else
|
||||
+ avio_close(oc->pb);
|
||||
+#endif
|
||||
|
||||
}
|
||||
|
||||
@@ -1215,7 +1262,13 @@ bool CvVideoWriter_FFMPEG::open( const char * filename
|
||||
av_register_all ();
|
||||
|
||||
/* auto detect the output format from the name and fourcc code. */
|
||||
+
|
||||
+#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 2, 0)
|
||||
+ fmt = av_guess_format(NULL, filename, NULL);
|
||||
+#else
|
||||
fmt = guess_format(NULL, filename, NULL);
|
||||
+#endif
|
||||
+
|
||||
if (!fmt)
|
||||
return false;
|
||||
|
||||
@@ -1238,7 +1291,7 @@ bool CvVideoWriter_FFMPEG::open( const char * filename
|
||||
#endif
|
||||
|
||||
// alloc memory for context
|
||||
- oc = av_alloc_format_context();
|
||||
+ oc = avformat_alloc_context();
|
||||
assert (oc);
|
||||
|
||||
/* set file name */
|
||||
@@ -1279,11 +1332,15 @@ bool CvVideoWriter_FFMPEG::open( const char * filename
|
||||
|
||||
/* set the output parameters (must be done even if no
|
||||
parameters). */
|
||||
+#if LIBAVFORMAT_BUILD < CALC_FFMPEG_VERSION(53, 2, 0)
|
||||
if (av_set_parameters(oc, NULL) < 0) {
|
||||
CV_Error(CV_StsBadArg, "Invalid output format parameters");
|
||||
}
|
||||
+#endif
|
||||
|
||||
+#if 0
|
||||
dump_format(oc, 0, filename, 1);
|
||||
+#endif
|
||||
|
||||
/* now that all the parameters are set, we can open the audio and
|
||||
video codecs and allocate the necessary encode buffers */
|
||||
@@ -1308,7 +1365,13 @@ bool CvVideoWriter_FFMPEG::open( const char * filename
|
||||
}
|
||||
|
||||
/* open the codec */
|
||||
- if ( (err=avcodec_open(c, codec)) < 0) {
|
||||
+ if ( (err=
|
||||
+#if LIBAVCODEC_VERSION_INT >= ((53<<16)+(8<<8)+0)
|
||||
+ avcodec_open2(c, codec, NULL)
|
||||
+#else
|
||||
+ avcodec_open(c, codec)
|
||||
+#endif
|
||||
+ ) < 0) {
|
||||
char errtext[256];
|
||||
sprintf(errtext, "Could not open codec '%s': %s", codec->name, icvFFMPEGErrStr(err));
|
||||
CV_Error(CV_StsBadArg, errtext);
|
||||
@@ -1345,13 +1408,23 @@ bool CvVideoWriter_FFMPEG::open( const char * filename
|
||||
|
||||
/* open the output file, if needed */
|
||||
if (!(fmt->flags & AVFMT_NOFILE)) {
|
||||
- if (url_fopen(&oc->pb, filename, URL_WRONLY) < 0) {
|
||||
+ if (
|
||||
+#if LIBAVFORMAT_BUILD < CALC_FFMPEG_VERSION(53, 2, 0)
|
||||
+ url_fopen(&oc->pb, filename, URL_WRONLY)
|
||||
+#else
|
||||
+ avio_open(&oc->pb, filename, AVIO_FLAG_WRITE)
|
||||
+#endif
|
||||
+ < 0) {
|
||||
CV_Error(CV_StsBadArg, "Couldn't open output file for writing");
|
||||
}
|
||||
}
|
||||
|
||||
/* write the stream header, if any */
|
||||
+#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(52, 111, 0)
|
||||
+ avformat_write_header(oc, NULL);
|
||||
+#else
|
||||
av_write_header( oc );
|
||||
+#endif
|
||||
|
||||
return true;
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
$OpenBSD: patch-modules_highgui_src_cap_libv4l_cpp,v 1.1.1.1 2011/06/24 09:30:21 jasper Exp $
|
||||
--- modules/highgui/src/cap_libv4l.cpp.orig Sun Dec 5 04:35:25 2010
|
||||
+++ modules/highgui/src/cap_libv4l.cpp Fri May 6 08:43:02 2011
|
||||
@@ -241,8 +241,7 @@ make & enjoy!
|
||||
#include <sys/stat.h>
|
||||
#include <sys/ioctl.h>
|
||||
|
||||
-#include <linux/videodev.h>
|
||||
-#include <linux/videodev2.h>
|
||||
+#include <sys/videoio.h>
|
||||
|
||||
#include <libv4l1.h>
|
||||
#include <libv4l2.h>
|
||||
@ -1,24 +0,0 @@
|
||||
$OpenBSD: patch-modules_highgui_src_cap_v4l_cpp,v 1.1.1.1 2011/06/24 09:30:21 jasper Exp $
|
||||
--- modules/highgui/src/cap_v4l.cpp.orig Sun Dec 5 04:35:25 2010
|
||||
+++ modules/highgui/src/cap_v4l.cpp Fri May 6 08:52:24 2011
|
||||
@@ -214,17 +214,17 @@ make & enjoy!
|
||||
#include <sys/types.h>
|
||||
#include <sys/mman.h>
|
||||
|
||||
-#include <linux/videodev.h>
|
||||
+#include <sys/videoio.h>
|
||||
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
-#include <asm/types.h> /* for videodev2.h */
|
||||
+#include <sys/types.h> /* for videodev2.h */
|
||||
#include <assert.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/ioctl.h>
|
||||
|
||||
#ifdef HAVE_CAMV4L2
|
||||
-#include <linux/videodev2.h>
|
||||
+#include <sys/videoio.h>
|
||||
#endif
|
||||
|
||||
/* Defaults - If your board can do better, set it here. Set for the most common type inputs. */
|
||||
@ -1,59 +0,0 @@
|
||||
$OpenBSD: patch-modules_highgui_src_grfmt_png_cpp,v 1.1 2011/07/08 20:36:09 naddy Exp $
|
||||
|
||||
Fix build with png-1.5.
|
||||
|
||||
--- modules/highgui/src/grfmt_png.cpp.orig Sat Dec 4 20:35:25 2010
|
||||
+++ modules/highgui/src/grfmt_png.cpp Mon Jul 4 22:32:04 2011
|
||||
@@ -56,6 +56,7 @@
|
||||
#else
|
||||
#include <png.h>
|
||||
#endif
|
||||
+#include <zlib.h>
|
||||
#include "grfmt_png.hpp"
|
||||
|
||||
namespace cv
|
||||
@@ -107,7 +108,7 @@ void PngDecoder::close()
|
||||
void PngDecoder::readDataFromBuf( void* _png_ptr, uchar* dst, size_t size )
|
||||
{
|
||||
png_structp png_ptr = (png_structp)_png_ptr;
|
||||
- PngDecoder* decoder = (PngDecoder*)(png_ptr->io_ptr);
|
||||
+ PngDecoder* decoder = (PngDecoder*)(png_get_io_ptr(png_ptr));
|
||||
CV_Assert( decoder );
|
||||
const Mat& buf = decoder->m_buf;
|
||||
if( decoder->m_buf_pos + size > buf.cols*buf.rows*buf.elemSize() )
|
||||
@@ -138,7 +139,7 @@ bool PngDecoder::readHeader()
|
||||
|
||||
if( info_ptr && end_info )
|
||||
{
|
||||
- if( setjmp( png_ptr->jmpbuf ) == 0 )
|
||||
+ if( setjmp( png_jmpbuf( png_ptr ) ) == 0 )
|
||||
{
|
||||
if( !m_buf.empty() )
|
||||
png_set_read_fn(png_ptr, this, (png_rw_ptr)readDataFromBuf );
|
||||
@@ -200,7 +201,7 @@ bool PngDecoder::readData( Mat& img )
|
||||
png_infop info_ptr = (png_infop)m_info_ptr;
|
||||
png_infop end_info = (png_infop)m_end_info;
|
||||
|
||||
- if( setjmp(png_ptr->jmpbuf) == 0 )
|
||||
+ if( setjmp( png_jmpbuf ( png_ptr ) ) == 0 )
|
||||
{
|
||||
int y;
|
||||
|
||||
@@ -280,7 +281,7 @@ void PngEncoder::writeDataToBuf(void* _png_ptr, uchar*
|
||||
if( size == 0 )
|
||||
return;
|
||||
png_structp png_ptr = (png_structp)_png_ptr;
|
||||
- PngEncoder* encoder = (PngEncoder*)(png_ptr->io_ptr);
|
||||
+ PngEncoder* encoder = (PngEncoder*)(png_get_io_ptr(png_ptr));
|
||||
CV_Assert( encoder && encoder->m_buf );
|
||||
size_t cursz = encoder->m_buf->size();
|
||||
encoder->m_buf->resize(cursz + size);
|
||||
@@ -322,7 +323,7 @@ bool PngEncoder::write( const Mat& img, const vector<
|
||||
|
||||
if( info_ptr )
|
||||
{
|
||||
- if( setjmp( png_ptr->jmpbuf ) == 0 )
|
||||
+ if( setjmp( png_jmpbuf ( png_ptr ) ) == 0 )
|
||||
{
|
||||
if( m_buf )
|
||||
{
|
||||
14
graphics/opencv/patches/patch-modules_java_CMakeLists_txt
Normal file
14
graphics/opencv/patches/patch-modules_java_CMakeLists_txt
Normal file
@ -0,0 +1,14 @@
|
||||
$OpenBSD: patch-modules_java_CMakeLists_txt,v 1.1 2013/10/21 22:46:28 zhuk Exp $
|
||||
JNI shared object is installed in the same directory, so this should
|
||||
be under lib/.
|
||||
--- modules/java/CMakeLists.txt.orig Sat Jul 27 23:22:08 2013
|
||||
+++ modules/java/CMakeLists.txt Sat Jul 27 23:28:22 2013
|
||||
@@ -263,7 +263,7 @@ else(ANDROID)
|
||||
if(WIN32)
|
||||
set(JAR_INSTALL_DIR java)
|
||||
else(WIN32)
|
||||
- set(JAR_INSTALL_DIR share/OpenCV/java)
|
||||
+ set(JAR_INSTALL_DIR lib/OpenCV/java)
|
||||
endif(WIN32)
|
||||
install(FILES ${JAR_FILE} DESTINATION ${JAR_INSTALL_DIR} COMPONENT main)
|
||||
endif(ANDROID)
|
||||
24
graphics/opencv/patches/patch-samples_ocl_CMakeLists_txt
Normal file
24
graphics/opencv/patches/patch-samples_ocl_CMakeLists_txt
Normal file
@ -0,0 +1,24 @@
|
||||
$OpenBSD: patch-samples_ocl_CMakeLists_txt,v 1.1 2013/10/21 22:46:28 zhuk Exp $
|
||||
Install OCL examples in the same place as other source modules do.
|
||||
--- samples/ocl/CMakeLists.txt.orig Fri Jul 26 15:20:25 2013
|
||||
+++ samples/ocl/CMakeLists.txt Fri Jul 26 15:27:09 2013
|
||||
@@ -4,9 +4,9 @@ SET(OPENCV_OCL_SAMPLES_REQUIRED_DEPS opencv_core openc
|
||||
opencv_nonfree)
|
||||
|
||||
ocv_check_dependencies(${OPENCV_OCL_SAMPLES_REQUIRED_DEPS})
|
||||
+set(project "ocl")
|
||||
|
||||
if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
|
||||
- set(project "ocl")
|
||||
string(TOUPPER "${project}" project_upper)
|
||||
|
||||
project("${project}_samples")
|
||||
@@ -54,7 +54,7 @@ endif()
|
||||
if (INSTALL_C_EXAMPLES AND NOT WIN32)
|
||||
file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
|
||||
install(FILES ${install_list}
|
||||
- DESTINATION share/opencv/samples/${project}
|
||||
+ DESTINATION share/OpenCV/samples/${project}
|
||||
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
|
||||
endif()
|
||||
|
||||
@ -1 +1,4 @@
|
||||
Documentation for OpenCV.
|
||||
The Open Computer Vision Library is a collection of algorithms and sample
|
||||
code for various computer vision problems.
|
||||
|
||||
This package contains OpenCV documentation and examples.
|
||||
|
||||
4
graphics/opencv/pkg/DESCR-java
Normal file
4
graphics/opencv/pkg/DESCR-java
Normal file
@ -0,0 +1,4 @@
|
||||
The Open Computer Vision Library is a collection of algorithms and sample
|
||||
code for various computer vision problems.
|
||||
|
||||
This package contains Java bindings for OpenCV.
|
||||
@ -1,2 +1,4 @@
|
||||
The Open Computer Vision Library is a collection of algorithms and sample
|
||||
code for various computer vision problems.
|
||||
|
||||
This package contains main OpenCV components.
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
5
graphics/opencv/pkg/PLIST-java
Normal file
5
graphics/opencv/pkg/PLIST-java
Normal file
@ -0,0 +1,5 @@
|
||||
@comment $OpenBSD: PLIST-java,v 1.1 2013/10/21 22:46:29 zhuk Exp $
|
||||
lib/OpenCV/
|
||||
lib/OpenCV/java/
|
||||
lib/OpenCV/java/libopencv_java246.so
|
||||
lib/OpenCV/java/opencv-246.jar
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST-main,v 1.1.1.1 2011/06/24 09:30:22 jasper Exp $
|
||||
@comment $OpenBSD: PLIST-main,v 1.2 2013/10/21 22:46:29 zhuk Exp $
|
||||
@bin bin/opencv_createsamples
|
||||
@bin bin/opencv_haartraining
|
||||
@bin bin/opencv_performance
|
||||
@ -20,12 +20,21 @@ include/opencv2/calib3d/
|
||||
include/opencv2/calib3d/calib3d.hpp
|
||||
include/opencv2/contrib/
|
||||
include/opencv2/contrib/contrib.hpp
|
||||
include/opencv2/contrib/detection_based_tracker.hpp
|
||||
include/opencv2/contrib/hybridtracker.hpp
|
||||
include/opencv2/contrib/openfabmap.hpp
|
||||
include/opencv2/contrib/retina.hpp
|
||||
include/opencv2/core/
|
||||
include/opencv2/core/core.hpp
|
||||
include/opencv2/core/core_c.h
|
||||
include/opencv2/core/cuda_devptrs.hpp
|
||||
include/opencv2/core/devmem2d.hpp
|
||||
include/opencv2/core/eigen.hpp
|
||||
include/opencv2/core/gpumat.hpp
|
||||
include/opencv2/core/internal.hpp
|
||||
include/opencv2/core/mat.hpp
|
||||
include/opencv2/core/opengl_interop.hpp
|
||||
include/opencv2/core/opengl_interop_deprecated.hpp
|
||||
include/opencv2/core/operations.hpp
|
||||
include/opencv2/core/types_c.h
|
||||
include/opencv2/core/version.hpp
|
||||
@ -35,23 +44,34 @@ include/opencv2/features2d/features2d.hpp
|
||||
include/opencv2/flann/
|
||||
include/opencv2/flann/all_indices.h
|
||||
include/opencv2/flann/allocator.h
|
||||
include/opencv2/flann/any.h
|
||||
include/opencv2/flann/autotuned_index.h
|
||||
include/opencv2/flann/composite_index.h
|
||||
include/opencv2/flann/config.h
|
||||
include/opencv2/flann/defines.h
|
||||
include/opencv2/flann/dist.h
|
||||
include/opencv2/flann/dummy.h
|
||||
include/opencv2/flann/dynamic_bitset.h
|
||||
include/opencv2/flann/flann.hpp
|
||||
include/opencv2/flann/flann_base.hpp
|
||||
include/opencv2/flann/general.h
|
||||
include/opencv2/flann/ground_truth.h
|
||||
include/opencv2/flann/hdf5.h
|
||||
include/opencv2/flann/heap.h
|
||||
include/opencv2/flann/hierarchical_clustering_index.h
|
||||
include/opencv2/flann/index_testing.h
|
||||
include/opencv2/flann/kdtree_index.h
|
||||
include/opencv2/flann/kdtree_single_index.h
|
||||
include/opencv2/flann/kmeans_index.h
|
||||
include/opencv2/flann/linear_index.h
|
||||
include/opencv2/flann/logger.h
|
||||
include/opencv2/flann/lsh_index.h
|
||||
include/opencv2/flann/lsh_table.h
|
||||
include/opencv2/flann/matrix.h
|
||||
include/opencv2/flann/miniflann.hpp
|
||||
include/opencv2/flann/nn_index.h
|
||||
include/opencv2/flann/object_factory.h
|
||||
include/opencv2/flann/params.h
|
||||
include/opencv2/flann/random.h
|
||||
include/opencv2/flann/result_set.h
|
||||
include/opencv2/flann/sampling.h
|
||||
@ -59,13 +79,48 @@ include/opencv2/flann/saving.h
|
||||
include/opencv2/flann/simplex_downhill.h
|
||||
include/opencv2/flann/timer.h
|
||||
include/opencv2/gpu/
|
||||
include/opencv2/gpu/device/
|
||||
include/opencv2/gpu/device/block.hpp
|
||||
include/opencv2/gpu/device/border_interpolate.hpp
|
||||
include/opencv2/gpu/device/color.hpp
|
||||
include/opencv2/gpu/device/common.hpp
|
||||
include/opencv2/gpu/device/datamov_utils.hpp
|
||||
include/opencv2/gpu/device/detail/
|
||||
include/opencv2/gpu/device/detail/color_detail.hpp
|
||||
include/opencv2/gpu/device/detail/reduce.hpp
|
||||
include/opencv2/gpu/device/detail/reduce_key_val.hpp
|
||||
include/opencv2/gpu/device/detail/transform_detail.hpp
|
||||
include/opencv2/gpu/device/detail/type_traits_detail.hpp
|
||||
include/opencv2/gpu/device/detail/vec_distance_detail.hpp
|
||||
include/opencv2/gpu/device/dynamic_smem.hpp
|
||||
include/opencv2/gpu/device/emulation.hpp
|
||||
include/opencv2/gpu/device/filters.hpp
|
||||
include/opencv2/gpu/device/funcattrib.hpp
|
||||
include/opencv2/gpu/device/functional.hpp
|
||||
include/opencv2/gpu/device/limits.hpp
|
||||
include/opencv2/gpu/device/reduce.hpp
|
||||
include/opencv2/gpu/device/saturate_cast.hpp
|
||||
include/opencv2/gpu/device/scan.hpp
|
||||
include/opencv2/gpu/device/simd_functions.hpp
|
||||
include/opencv2/gpu/device/static_check.hpp
|
||||
include/opencv2/gpu/device/transform.hpp
|
||||
include/opencv2/gpu/device/type_traits.hpp
|
||||
include/opencv2/gpu/device/utility.hpp
|
||||
include/opencv2/gpu/device/vec_distance.hpp
|
||||
include/opencv2/gpu/device/vec_math.hpp
|
||||
include/opencv2/gpu/device/vec_traits.hpp
|
||||
include/opencv2/gpu/device/warp.hpp
|
||||
include/opencv2/gpu/device/warp_reduce.hpp
|
||||
include/opencv2/gpu/device/warp_shuffle.hpp
|
||||
include/opencv2/gpu/devmem2d.hpp
|
||||
include/opencv2/gpu/gpu.hpp
|
||||
include/opencv2/gpu/matrix_operations.hpp
|
||||
include/opencv2/gpu/gpumat.hpp
|
||||
include/opencv2/gpu/stream_accessor.hpp
|
||||
include/opencv2/highgui/
|
||||
include/opencv2/highgui/cap_ios.h
|
||||
include/opencv2/highgui/highgui.hpp
|
||||
include/opencv2/highgui/highgui_c.h
|
||||
include/opencv2/highgui/ios.h
|
||||
include/opencv2/imgproc/
|
||||
include/opencv2/imgproc/imgproc.hpp
|
||||
include/opencv2/imgproc/imgproc_c.h
|
||||
@ -77,12 +132,58 @@ include/opencv2/legacy/legacy.hpp
|
||||
include/opencv2/legacy/streams.hpp
|
||||
include/opencv2/ml/
|
||||
include/opencv2/ml/ml.hpp
|
||||
include/opencv2/nonfree/
|
||||
include/opencv2/nonfree/features2d.hpp
|
||||
include/opencv2/nonfree/gpu.hpp
|
||||
include/opencv2/nonfree/nonfree.hpp
|
||||
include/opencv2/nonfree/ocl.hpp
|
||||
include/opencv2/objdetect/
|
||||
include/opencv2/objdetect/objdetect.hpp
|
||||
include/opencv2/opencv.hpp
|
||||
include/opencv2/opencv_modules.hpp
|
||||
include/opencv2/photo/
|
||||
include/opencv2/photo/photo.hpp
|
||||
include/opencv2/photo/photo_c.h
|
||||
include/opencv2/stitching/
|
||||
include/opencv2/stitching/detail/
|
||||
include/opencv2/stitching/detail/autocalib.hpp
|
||||
include/opencv2/stitching/detail/blenders.hpp
|
||||
include/opencv2/stitching/detail/camera.hpp
|
||||
include/opencv2/stitching/detail/exposure_compensate.hpp
|
||||
include/opencv2/stitching/detail/matchers.hpp
|
||||
include/opencv2/stitching/detail/motion_estimators.hpp
|
||||
include/opencv2/stitching/detail/seam_finders.hpp
|
||||
include/opencv2/stitching/detail/util.hpp
|
||||
include/opencv2/stitching/detail/util_inl.hpp
|
||||
include/opencv2/stitching/detail/warpers.hpp
|
||||
include/opencv2/stitching/detail/warpers_inl.hpp
|
||||
include/opencv2/stitching/stitcher.hpp
|
||||
include/opencv2/stitching/warpers.hpp
|
||||
include/opencv2/superres/
|
||||
include/opencv2/superres/optical_flow.hpp
|
||||
include/opencv2/superres/superres.hpp
|
||||
include/opencv2/ts/
|
||||
include/opencv2/ts/gpu_perf.hpp
|
||||
include/opencv2/ts/gpu_test.hpp
|
||||
include/opencv2/ts/ts.hpp
|
||||
include/opencv2/ts/ts_gtest.h
|
||||
include/opencv2/ts/ts_perf.hpp
|
||||
include/opencv2/video/
|
||||
include/opencv2/video/background_segm.hpp
|
||||
include/opencv2/video/tracking.hpp
|
||||
include/opencv2/video/video.hpp
|
||||
include/opencv2/videostab/
|
||||
include/opencv2/videostab/deblurring.hpp
|
||||
include/opencv2/videostab/fast_marching.hpp
|
||||
include/opencv2/videostab/fast_marching_inl.hpp
|
||||
include/opencv2/videostab/frame_source.hpp
|
||||
include/opencv2/videostab/global_motion.hpp
|
||||
include/opencv2/videostab/inpainting.hpp
|
||||
include/opencv2/videostab/log.hpp
|
||||
include/opencv2/videostab/motion_stabilizing.hpp
|
||||
include/opencv2/videostab/optical_flow.hpp
|
||||
include/opencv2/videostab/stabilizer.hpp
|
||||
include/opencv2/videostab/videostab.hpp
|
||||
@lib lib/libopencv_calib3d.so.${LIBopencv_calib3d_VERSION}
|
||||
@lib lib/libopencv_contrib.so.${LIBopencv_contrib_VERSION}
|
||||
@lib lib/libopencv_core.so.${LIBopencv_core_VERSION}
|
||||
@ -93,31 +194,45 @@ include/opencv2/video/tracking.hpp
|
||||
@lib lib/libopencv_imgproc.so.${LIBopencv_imgproc_VERSION}
|
||||
@lib lib/libopencv_legacy.so.${LIBopencv_legacy_VERSION}
|
||||
@lib lib/libopencv_ml.so.${LIBopencv_ml_VERSION}
|
||||
@lib lib/libopencv_nonfree.so.${LIBopencv_nonfree_VERSION}
|
||||
@lib lib/libopencv_objdetect.so.${LIBopencv_objdetect_VERSION}
|
||||
@lib lib/libopencv_photo.so.${LIBopencv_photo_VERSION}
|
||||
@lib lib/libopencv_stitching.so.${LIBopencv_stitching_VERSION}
|
||||
@lib lib/libopencv_superres.so.${LIBopencv_superres_VERSION}
|
||||
@lib lib/libopencv_ts.so.${LIBopencv_ts_VERSION}
|
||||
@lib lib/libopencv_video.so.${LIBopencv_video_VERSION}
|
||||
@lib lib/libopencv_videostab.so.${LIBopencv_videostab_VERSION}
|
||||
lib/pkgconfig/opencv.pc
|
||||
lib/python${MODPY_VERSION}/site-packages/cv.so
|
||||
share/opencv/
|
||||
share/opencv/OpenCVConfig.cmake
|
||||
share/opencv/haarcascades/
|
||||
share/opencv/haarcascades/haarcascade_eye.xml
|
||||
share/opencv/haarcascades/haarcascade_eye_tree_eyeglasses.xml
|
||||
share/opencv/haarcascades/haarcascade_frontalface_alt.xml
|
||||
share/opencv/haarcascades/haarcascade_frontalface_alt2.xml
|
||||
share/opencv/haarcascades/haarcascade_frontalface_alt_tree.xml
|
||||
share/opencv/haarcascades/haarcascade_frontalface_default.xml
|
||||
share/opencv/haarcascades/haarcascade_fullbody.xml
|
||||
share/opencv/haarcascades/haarcascade_lefteye_2splits.xml
|
||||
share/opencv/haarcascades/haarcascade_lowerbody.xml
|
||||
share/opencv/haarcascades/haarcascade_mcs_eyepair_big.xml
|
||||
share/opencv/haarcascades/haarcascade_mcs_eyepair_small.xml
|
||||
share/opencv/haarcascades/haarcascade_mcs_lefteye.xml
|
||||
share/opencv/haarcascades/haarcascade_mcs_mouth.xml
|
||||
share/opencv/haarcascades/haarcascade_mcs_nose.xml
|
||||
share/opencv/haarcascades/haarcascade_mcs_righteye.xml
|
||||
share/opencv/haarcascades/haarcascade_mcs_upperbody.xml
|
||||
share/opencv/haarcascades/haarcascade_profileface.xml
|
||||
share/opencv/haarcascades/haarcascade_righteye_2splits.xml
|
||||
share/opencv/haarcascades/haarcascade_upperbody.xml
|
||||
share/opencv/lbpcascades/
|
||||
share/opencv/lbpcascades/lbpcascade_frontalface.xml
|
||||
lib/python${MODPY_VERSION}/site-packages/cv.py
|
||||
lib/python${MODPY_VERSION}/site-packages/cv.pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/cv2.so
|
||||
share/OpenCV/
|
||||
share/OpenCV/OpenCVConfig-version.cmake
|
||||
share/OpenCV/OpenCVConfig.cmake
|
||||
share/OpenCV/haarcascades/
|
||||
share/OpenCV/haarcascades/haarcascade_eye.xml
|
||||
share/OpenCV/haarcascades/haarcascade_eye_tree_eyeglasses.xml
|
||||
share/OpenCV/haarcascades/haarcascade_frontalface_alt.xml
|
||||
share/OpenCV/haarcascades/haarcascade_frontalface_alt2.xml
|
||||
share/OpenCV/haarcascades/haarcascade_frontalface_alt_tree.xml
|
||||
share/OpenCV/haarcascades/haarcascade_frontalface_default.xml
|
||||
share/OpenCV/haarcascades/haarcascade_fullbody.xml
|
||||
share/OpenCV/haarcascades/haarcascade_lefteye_2splits.xml
|
||||
share/OpenCV/haarcascades/haarcascade_lowerbody.xml
|
||||
share/OpenCV/haarcascades/haarcascade_mcs_eyepair_big.xml
|
||||
share/OpenCV/haarcascades/haarcascade_mcs_eyepair_small.xml
|
||||
share/OpenCV/haarcascades/haarcascade_mcs_leftear.xml
|
||||
share/OpenCV/haarcascades/haarcascade_mcs_lefteye.xml
|
||||
share/OpenCV/haarcascades/haarcascade_mcs_mouth.xml
|
||||
share/OpenCV/haarcascades/haarcascade_mcs_nose.xml
|
||||
share/OpenCV/haarcascades/haarcascade_mcs_rightear.xml
|
||||
share/OpenCV/haarcascades/haarcascade_mcs_righteye.xml
|
||||
share/OpenCV/haarcascades/haarcascade_mcs_upperbody.xml
|
||||
share/OpenCV/haarcascades/haarcascade_profileface.xml
|
||||
share/OpenCV/haarcascades/haarcascade_righteye_2splits.xml
|
||||
share/OpenCV/haarcascades/haarcascade_smile.xml
|
||||
share/OpenCV/haarcascades/haarcascade_upperbody.xml
|
||||
share/OpenCV/lbpcascades/
|
||||
share/OpenCV/lbpcascades/lbpcascade_frontalface.xml
|
||||
share/OpenCV/lbpcascades/lbpcascade_profileface.xml
|
||||
share/OpenCV/lbpcascades/lbpcascade_silverware.xml
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user