Hi All,
Update OpenCV to the latest stable version 2.4.13.4.
Notable port changes:
- HOMEPAGE switch to https
- MAINTAINER email address
- Regen WANTLIB-main
- More portable cmake changes in patch-modules_java_CMakeLists_txt
Ok? Comments?
Best regards,
Rafael
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/opencv/Makefile,v
retrieving revision 1.42
diff -u -p -u -p -r1.42 Makefile
--- Makefile 26 Jul 2017 22:45:24 -0000 1.42
+++ Makefile 29 Oct 2017 20:58:07 -0000
@@ -7,7 +7,7 @@ COMMENT-docs = OpenCV documentation and
COMMENT-main = library of programming functions for real time cv
COMMENT-java = Java bindings for OpenCV
-V = 2.4.13
+V = 2.4.13.4
GH_ACCOUNT = Itseez
GH_PROJECT = opencv
GH_TAGNAME = ${V}
@@ -15,19 +15,16 @@ GH_TAGNAME = ${V}
PKGNAME-main = ${PKGNAME}
PKGNAME-docs = opencv-docs-$V
PKGNAME-java = opencv-java-$V
-REVISION-docs = 0
-REVISION-java = 0
-REVISION-main = 0
.for i in opencv_calib3d opencv_contrib opencv_core opencv_features2d \
opencv_flann opencv_gpu opencv_highgui opencv_imgproc opencv_legacy \
opencv_ml opencv_nonfree opencv_objdetect opencv_photo opencv_stitching \
opencv_superres opencv_ts opencv_video opencv_videostab opencv_ocl
-SHARED_LIBS += $i 2.0
+SHARED_LIBS += $i 3.0
.endfor
-HOMEPAGE = http://www.opencv.org/
-MAINTAINER = Rafael Sadowski <raf...@sizeofvoid.org>
+HOMEPAGE = https://www.opencv.org/
+MAINTAINER = Rafael Sadowski <rsadow...@openbsd.org>
# "patents" means containing some patented algorithms, see
# http://docs.opencv.org/modules/nonfree/doc/nonfree.html
@@ -39,14 +36,15 @@ PERMIT_PACKAGE_CDROM = patents
PERMIT_PACKAGE_CDROM-docs = Yes
WANTLIB-main += ${MODPY_WANTLIB}
-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 avresample avutil bz2 c cairo fontconfig
+WANTLIB-main += ${COMPILER_LIBCXX} Half Iex IlmImf IlmThread Imath
+WANTLIB-main += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB-main += Xrandr Xrender atk-1.0 avresample c cairo fontconfig
WANTLIB-main += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
WANTLIB-main += gobject-2.0 gstapp-1.0 gstbase-1.0 gstpbutils-1.0 gstreamer-1.0
WANTLIB-main += gstriff-1.0 gstvideo-1.0 gthread-2.0 gtk-x11-2.0 intl
WANTLIB-main += jasper jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB-main += png pthread ${COMPILER_LIBCXX} swscale tiff z
+WANTLIB-main += png tiff z
+
WANTLIB-docs =
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/opencv/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo 29 Nov 2016 00:27:23 -0000 1.6
+++ distinfo 29 Oct 2017 20:58:07 -0000
@@ -1,2 +1,2 @@
-SHA256 (opencv-2.4.13.tar.gz) = lOvMphwwA01fsW/quOwSyKho9RYtIKnwOW8PX22Lu/8=
-SIZE (opencv-2.4.13.tar.gz) = 91669572
+SHA256 (opencv-2.4.13.4.tar.gz) = +Kvx/MLaO7HerId28HuDkPhxNy4qRNw1XHZd03kZRIE=
+SIZE (opencv-2.4.13.4.tar.gz) = 91833056
Index: patches/patch-cmake_OpenCVDetectPython_cmake
===================================================================
RCS file: patches/patch-cmake_OpenCVDetectPython_cmake
diff -N patches/patch-cmake_OpenCVDetectPython_cmake
--- patches/patch-cmake_OpenCVDetectPython_cmake 29 Nov 2016 00:27:23
-0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-cmake_OpenCVDetectPython_cmake,v 1.2 2016/11/29 00:27:23 sthen
Exp $
---- cmake/OpenCVDetectPython.cmake.orig Wed Apr 20 16:21:19 2016
-+++ cmake/OpenCVDetectPython.cmake Mon Jun 6 23:06:38 2016
-@@ -123,8 +123,8 @@ if(PYTHON_EXECUTABLE)
- find_host_program(SPHINX_BUILD sphinx-build)
- if(SPHINX_BUILD)
- execute_process(COMMAND "${SPHINX_BUILD}"
-- OUTPUT_QUIET
-- ERROR_VARIABLE SPHINX_OUTPUT
-+ OUTPUT_VARIABLE SPHINX_OUTPUT
-+ ERROR_QUIET
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- if(SPHINX_OUTPUT MATCHES "Sphinx v([0-9][^ \n]*)")
- set(SPHINX_VERSION "${CMAKE_MATCH_1}")
Index: patches/patch-cmake_OpenCVPCHSupport_cmake
===================================================================
RCS file:
/cvs/ports/graphics/opencv/patches/patch-cmake_OpenCVPCHSupport_cmake,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-cmake_OpenCVPCHSupport_cmake
--- patches/patch-cmake_OpenCVPCHSupport_cmake 21 Oct 2013 22:46:27 -0000
1.1
+++ patches/patch-cmake_OpenCVPCHSupport_cmake 29 Oct 2017 20:58:07 -0000
@@ -1,12 +1,17 @@
$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")
+Index: cmake/OpenCVPCHSupport.cmake
+--- cmake/OpenCVPCHSupport.cmake.orig
++++ cmake/OpenCVPCHSupport.cmake
+@@ -15,7 +15,11 @@
+ IF(CMAKE_COMPILER_IS_GNUCXX)
+
+ IF(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.2.0")
- SET(PCHSupport_FOUND TRUE)
-+ SET(PCHSupport_FOUND FALSE)
++ IF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
++ SET(PCHSupport_FOUND FALSE)
++ ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
++ SET(PCHSupport_FOUND TRUE)
++ ENDIF()
ENDIF()
SET(_PCH_include_prefix "-I")
Index: patches/patch-modules_core_include_opencv2_core_operations_hpp
===================================================================
RCS file:
/cvs/ports/graphics/opencv/patches/patch-modules_core_include_opencv2_core_operations_hpp,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-modules_core_include_opencv2_core_operations_hpp
--- patches/patch-modules_core_include_opencv2_core_operations_hpp 3 Jun
2014 20:41:36 -0000 1.2
+++ patches/patch-modules_core_include_opencv2_core_operations_hpp 29 Oct
2017 20:58:07 -0000
@@ -1,13 +1,14 @@
$OpenBSD: patch-modules_core_include_opencv2_core_operations_hpp,v 1.2
2014/06/03 20:41:36 zhuk Exp $
All to build on sparc64 at least.
---- modules/core/include/opencv2/core/operations.hpp.orig Fri Apr 11
14:15:26 2014
-+++ modules/core/include/opencv2/core/operations.hpp Sun Jun 1 13:12:28 2014
+Index: modules/core/include/opencv2/core/operations.hpp
+--- modules/core/include/opencv2/core/operations.hpp.orig
++++ modules/core/include/opencv2/core/operations.hpp
@@ -65,7 +65,7 @@
#elif __GNUC__*10 + __GNUC_MINOR__ >= 42
#if !(defined WIN32 || defined _WIN32) && (defined __i486__ || defined
__i586__ || \
- defined __i686__ || defined __MMX__ || defined __SSE__ || defined
__ppc__) || \
+ defined __i686__ || defined __MMX__ || defined __SSE__ || defined
__ppc__ || defined _GLIBCXX_ATOMIC_BUILTINS) || \
- (defined __GNUC__ && defined _STLPORT_MAJOR) || \
+ defined _STLPORT_MAJOR || defined _LIBCPP_VERSION || \
defined __EMSCRIPTEN__
Index: patches/patch-modules_java_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/graphics/opencv/patches/patch-modules_java_CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-modules_java_CMakeLists_txt
--- patches/patch-modules_java_CMakeLists_txt 30 Jan 2015 21:38:37 -0000
1.3
+++ patches/patch-modules_java_CMakeLists_txt 29 Oct 2017 20:58:07 -0000
@@ -3,28 +3,51 @@ $OpenBSD: patch-modules_java_CMakeLists_
be under lib/.
2. Avoid exporting opencv_java together with other targets, unbreaks calling
find_package(OpenCV) without opencv-java package being installed.
---- modules/java/CMakeLists.txt.orig Wed Oct 1 11:33:36 2014
-+++ modules/java/CMakeLists.txt Thu Jan 29 21:20:33 2015
-@@ -280,7 +280,7 @@ else(ANDROID)
+Index: modules/java/CMakeLists.txt
+--- modules/java/CMakeLists.txt.orig
++++ modules/java/CMakeLists.txt
+@@ -280,7 +280,11 @@ 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)
++ if(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
++ set(JAR_INSTALL_DIR lib/OpenCV/java)
++ else(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
++ set(JAR_INSTALL_DIR share/OpenCV/java)
++ endif()
endif(WIN32)
install(FILES ${JAR_FILE} DESTINATION ${JAR_INSTALL_DIR} COMPONENT java)
endif(ANDROID)
-@@ -357,11 +357,11 @@ if(ANDROID)
+@@ -359,13 +363,25 @@ if(ANDROID)
ARCHIVE DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT java)
else()
if(NOT INSTALL_CREATE_DISTRIB)
- ocv_install_target(${the_module} EXPORT OpenCVModules
-+ ocv_install_target(${the_module}
- RUNTIME DESTINATION ${JAR_INSTALL_DIR} COMPONENT java
- LIBRARY DESTINATION ${JAR_INSTALL_DIR} COMPONENT java)
+- RUNTIME DESTINATION ${JAR_INSTALL_DIR} COMPONENT java
+- LIBRARY DESTINATION ${JAR_INSTALL_DIR} COMPONENT java)
++ if(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
++ ocv_install_target(${the_module}
++ RUNTIME DESTINATION ${JAR_INSTALL_DIR} COMPONENT java
++ LIBRARY DESTINATION ${JAR_INSTALL_DIR} COMPONENT java)
++ else(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
++ ocv_install_target(${the_module} EXPORT OpenCVModules
++ RUNTIME DESTINATION ${JAR_INSTALL_DIR} COMPONENT java
++ LIBRARY DESTINATION ${JAR_INSTALL_DIR} COMPONENT java)
++ endif()
else()
- ocv_install_target(${the_module} EXPORT OpenCVModules
-+ ocv_install_target(${the_module}
- RUNTIME DESTINATION ${JAR_INSTALL_DIR}/${OpenCV_ARCH} COMPONENT
java
- LIBRARY DESTINATION ${JAR_INSTALL_DIR}/${OpenCV_ARCH} COMPONENT
java)
+- RUNTIME DESTINATION ${JAR_INSTALL_DIR}/${OpenCV_ARCH} COMPONENT
java
+- LIBRARY DESTINATION ${JAR_INSTALL_DIR}/${OpenCV_ARCH} COMPONENT
java)
++ if(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
++ ocv_install_target(${the_module}
++ RUNTIME DESTINATION ${JAR_INSTALL_DIR}/${OpenCV_ARCH} COMPONENT
java
++ LIBRARY DESTINATION ${JAR_INSTALL_DIR}/${OpenCV_ARCH} COMPONENT
java)
++ else(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
++ ocv_install_target(${the_module} EXPORT OpenCVModules
++ RUNTIME DESTINATION ${JAR_INSTALL_DIR}/${OpenCV_ARCH} COMPONENT
java
++ LIBRARY DESTINATION ${JAR_INSTALL_DIR}/${OpenCV_ARCH} COMPONENT
java)
++ endif()
endif()
+ endif()
+
Index: pkg/PLIST-docs
===================================================================
RCS file: /cvs/ports/graphics/opencv/pkg/PLIST-docs,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 PLIST-docs
--- pkg/PLIST-docs 29 Nov 2016 00:27:23 -0000 1.9
+++ pkg/PLIST-docs 29 Oct 2017 20:58:07 -0000
@@ -849,16 +849,20 @@ share/doc/OpenCV/html/_images/Moments_Tu
share/doc/OpenCV/html/_images/Morphology_1_Tutorial_Cover.jpg
share/doc/OpenCV/html/_images/Morphology_1_Tutorial_Cover1.jpg
share/doc/OpenCV/html/_images/Morphology_1_Tutorial_Original_Image.jpg
+share/doc/OpenCV/html/_images/Morphology_1_Tutorial_Theory_Dilatation_2.png
share/doc/OpenCV/html/_images/Morphology_1_Tutorial_Theory_Dilation.png
share/doc/OpenCV/html/_images/Morphology_1_Tutorial_Theory_Erosion.png
+share/doc/OpenCV/html/_images/Morphology_1_Tutorial_Theory_Erosion_2.png
share/doc/OpenCV/html/_images/Morphology_1_Tutorial_Theory_Original_Image.png
share/doc/OpenCV/html/_images/Morphology_2_Tutorial_Cover.jpg
share/doc/OpenCV/html/_images/Morphology_2_Tutorial_Cover1.jpg
share/doc/OpenCV/html/_images/Morphology_2_Tutorial_Original_Image.jpg
share/doc/OpenCV/html/_images/Morphology_2_Tutorial_Theory_BlackHat.png
share/doc/OpenCV/html/_images/Morphology_2_Tutorial_Theory_Closing.png
+share/doc/OpenCV/html/_images/Morphology_2_Tutorial_Theory_Closing_2.png
share/doc/OpenCV/html/_images/Morphology_2_Tutorial_Theory_Gradient.png
share/doc/OpenCV/html/_images/Morphology_2_Tutorial_Theory_Opening.png
+share/doc/OpenCV/html/_images/Morphology_2_Tutorial_Theory_Opening_2.png
share/doc/OpenCV/html/_images/Morphology_2_Tutorial_Theory_TopHat.png
share/doc/OpenCV/html/_images/My_Harris_corner_detector_Result.jpg
share/doc/OpenCV/html/_images/My_Shi_Tomasi_corner_detector_Result.jpg
@@ -1002,6 +1006,7 @@ share/doc/OpenCV/html/_images/defects.pn
share/doc/OpenCV/html/_images/detection_of_planar_objects.png
share/doc/OpenCV/html/_images/dev_OCV_reference.png
share/doc/OpenCV/html/_images/discrete_fourier_transform.png
+share/doc/OpenCV/html/_images/distortion_examples.png
share/doc/OpenCV/html/_images/eclipse-logo.png
share/doc/OpenCV/html/_images/eclipse_10_crystal_clean.png
share/doc/OpenCV/html/_images/eclipse_11_run_as.png
@@ -1086,6 +1091,7 @@ share/doc/OpenCV/html/_images/output.png
share/doc/OpenCV/html/_images/outputInteropOpenCV1.jpg
share/doc/OpenCV/html/_images/outputVideoInput.png
share/doc/OpenCV/html/_images/patterns.png
+share/doc/OpenCV/html/_images/pinhole_camera_model.png
share/doc/OpenCV/html/_images/pointpolygon.png
share/doc/OpenCV/html/_images/qtDownloadThisPackage.png
share/doc/OpenCV/html/_images/qtgui.png
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/graphics/opencv/pkg/PLIST-main,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST-main
--- pkg/PLIST-main 29 Nov 2016 00:27:23 -0000 1.6
+++ pkg/PLIST-main 29 Oct 2017 20:58:07 -0000
@@ -4,6 +4,7 @@
@bin bin/opencv_haartraining
@bin bin/opencv_performance
@bin bin/opencv_traincascade
+@bin bin/opencv_version
@bin bin/opencv_visualisation
include/opencv/
include/opencv/cv.h
