2015-01-02 22:08 GMT+03:00 Vadim Zhukov <[email protected]>:
> 02 Jan 2015, 21:44 Vadim Zhukov wrote:
>
> My bad, :( I'll re-check and commit soon. Thank you for reminding!
Unfortunately, this update was broken on i386 due to PIE/PIC and
inline assembly conflict. Guessing that OpenCV is used mostly
as a library, I think it's okay to have -fPIC forced. Any other
opinions before I finally put this in?
I removed the patch that "fixes" incompatibility in int64/uint64
definitions between OpenCV and tiff; this would break API (twice),
and is easily being workarounded, if needed.
I also added a forced version dependency for opencv-java.
So an updated patch is below.
--
WBR,
Vadim Zhukov
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/opencv/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile 30 Sep 2014 17:18:37 -0000 1.30
+++ Makefile 21 Jan 2015 08:37:38 -0000
@@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.30 2014/09/30 17:18:37 sthen Exp $
ONLY_FOR_ARCHS = ${GCC4_ARCHS}
-# XXX no i386 due to often JDK build failures
-ONLY_FOR_ARCHS-java = amd64
+ONLY_FOR_ARCHS-java = i386 amd64
SHARED_ONLY = Yes
CATEGORIES = graphics devel
@@ -10,13 +9,11 @@ COMMENT-docs = OpenCV documentation and
COMMENT-main = library of programming functions for real time cv
COMMENT-java = Java bindings for OpenCV
-V = 2.4.9
+V = 2.4.10
DISTNAME = opencv-$V
PKGNAME-main = ${PKGNAME}
PKGNAME-docs = opencv-docs-$V
PKGNAME-java = opencv-java-$V
-REVISION-main = 1
-REVISION-docs = 0
HOMEPAGE = http://www.opencv.org/
MAINTAINER = Rafael Sadowski <[email protected]>
@@ -99,7 +96,13 @@ LIB_DEPENDS-main = ${LIB_DEPENDS} \
graphics/png \
graphics/tiff
LIB_DEPENDS-docs =
-LIB_DEPENDS-java = ${BUILD_PKGPATH},-main
+LIB_DEPENDS-java = ${BUILD_PKGPATH},-main=${V}
+
+# PIE cannot be produced to problems with inline assembly
+.if ${ARCH:Mi386}
+CONFIGURE_ENV = CFLAGS="${CFLAGS} -fPIC" \
+ CXXFLAGS="${CXXFLAGS} -fPIC"
+.endif
# ATM opencv requires V4L1 compat, ask them to change it,
# then see WITH_V4L below.
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/opencv/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 3 Jun 2014 20:41:36 -0000 1.3
+++ distinfo 21 Jan 2015 08:37:38 -0000
@@ -1,2 +1,2 @@
-SHA256 (opencv-2.4.9.zip) = gDAQhIFUmI6cvaiz+oV/y7JzgsKUbtcp4afkBgC7THE=
-SIZE (opencv-2.4.9.zip) = 91684751
+SHA256 (opencv-2.4.10.zip) = G/TLhyg3l/2RZp1PkLYipnepA8ILSld7eViiFk91lsY=
+SIZE (opencv-2.4.10.zip) = 91692581
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/graphics/opencv/patches/patch-CMakeLists_txt,v
retrieving revision 1.4
diff -u -p -r1.4 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 3 Jun 2014 20:41:36 -0000 1.4
+++ patches/patch-CMakeLists_txt 21 Jan 2015 08:37:38 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-CMakeLists_txt,v 1.4 2014/06/03 20:41:36 zhuk Exp $
---- CMakeLists.txt.orig Fri Apr 11 12:15:26 2014
-+++ CMakeLists.txt Mon May 26 22:11:21 2014
-@@ -432,7 +432,7 @@ if(UNIX)
+--- CMakeLists.txt.orig Wed Oct 1 09:33:36 2014
++++ CMakeLists.txt Sun Dec 21 20:16:55 2014
+@@ -438,7 +438,7 @@ if(UNIX)
CHECK_INCLUDE_FILE(pthread.h HAVE_LIBPTHREAD)
if(ANDROID)
set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} dl m log)
Index: patches/patch-apps_haartraining_CMakeLists_txt
===================================================================
RCS file:
/cvs/ports/graphics/opencv/patches/patch-apps_haartraining_CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -r1.2 patch-apps_haartraining_CMakeLists_txt
--- patches/patch-apps_haartraining_CMakeLists_txt 19 Sep 2014 22:35:51
-0000 1.2
+++ patches/patch-apps_haartraining_CMakeLists_txt 21 Jan 2015 08:37:38
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-apps_haartraining_CMakeLists_txt,v 1.2 2014/09/19 22:35:51
zhuk Exp $
Fix linking.
---- apps/haartraining/CMakeLists.txt.orig Fri Apr 11 14:15:26 2014
-+++ apps/haartraining/CMakeLists.txt Sat Sep 20 01:51:33 2014
+--- apps/haartraining/CMakeLists.txt.orig Wed Oct 1 09:33:36 2014
++++ apps/haartraining/CMakeLists.txt Sun Dec 21 20:16:55 2014
@@ -14,8 +14,6 @@ if(WIN32)
link_directories(${CMAKE_CURRENT_BINARY_DIR})
endif()
@@ -11,7 +11,7 @@ Fix linking.
# -----------------------------------------------------------
# Library
# -----------------------------------------------------------
-@@ -39,6 +37,8 @@ set_target_properties(opencv_haartraining_engine PROPE
+@@ -42,6 +40,8 @@ set_target_properties(opencv_haartraining_engine PROPE
INSTALL_NAME_DIR lib
)
@@ -20,7 +20,7 @@ Fix linking.
# -----------------------------------------------------------
# haartraining
# -----------------------------------------------------------
-@@ -47,6 +47,7 @@ add_executable(opencv_haartraining cvhaartraining.h ha
+@@ -50,6 +50,7 @@ add_executable(opencv_haartraining cvhaartraining.h ha
set_target_properties(opencv_haartraining PROPERTIES
DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
OUTPUT_NAME "opencv_haartraining")
@@ -28,7 +28,7 @@ Fix linking.
# -----------------------------------------------------------
# createsamples
-@@ -56,6 +57,7 @@ add_executable(opencv_createsamples cvhaartraining.h c
+@@ -59,6 +60,7 @@ add_executable(opencv_createsamples cvhaartraining.h c
set_target_properties(opencv_createsamples PROPERTIES
DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
OUTPUT_NAME "opencv_createsamples")
@@ -36,7 +36,7 @@ Fix linking.
# -----------------------------------------------------------
# performance
-@@ -64,6 +66,7 @@ add_executable(opencv_performance performance.cpp)
+@@ -67,6 +69,7 @@ add_executable(opencv_performance performance.cpp)
set_target_properties(opencv_performance PROPERTIES
DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
OUTPUT_NAME "opencv_performance")
Index: patches/patch-cmake_OpenCVFindLibsVideo_cmake
===================================================================
RCS file:
/cvs/ports/graphics/opencv/patches/patch-cmake_OpenCVFindLibsVideo_cmake,v
retrieving revision 1.2
diff -u -p -r1.2 patch-cmake_OpenCVFindLibsVideo_cmake
--- patches/patch-cmake_OpenCVFindLibsVideo_cmake 3 Jun 2014 20:41:36
-0000 1.2
+++ patches/patch-cmake_OpenCVFindLibsVideo_cmake 21 Jan 2015 08:37:38
-0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-cmake_OpenCVFindLibsVideo_cmake,v 1.2 2014/06/03 20:41:36 zhuk
Exp $
---- cmake/OpenCVFindLibsVideo.cmake.orig Wed Nov 6 15:26:39 2013
-+++ cmake/OpenCVFindLibsVideo.cmake Sun Jan 5 09:13:06 2014
-@@ -129,7 +129,6 @@ if(WITH_V4L)
- CHECK_MODULE(libv4l1 HAVE_LIBV4L)
+--- cmake/OpenCVFindLibsVideo.cmake.orig Wed Oct 1 09:33:36 2014
++++ cmake/OpenCVFindLibsVideo.cmake Sun Dec 21 20:16:55 2014
+@@ -162,7 +162,6 @@ if(WITH_V4L)
+ endif()
endif()
CHECK_INCLUDE_FILE(linux/videodev.h HAVE_CAMV4L)
- CHECK_INCLUDE_FILE(linux/videodev2.h HAVE_CAMV4L2)
Index: pkg/PLIST-docs
===================================================================
RCS file: /cvs/ports/graphics/opencv/pkg/PLIST-docs,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST-docs
--- pkg/PLIST-docs 29 Sep 2014 15:09:12 -0000 1.6
+++ pkg/PLIST-docs 21 Jan 2015 08:37:38 -0000
@@ -426,8 +426,8 @@ share/doc/OpenCV/html/.doctrees/doc/tuto
share/doc/OpenCV/html/.doctrees/doc/tutorials/viz/widget_pose/widget_pose.doctree
share/doc/OpenCV/html/.doctrees/doc/user_guide/
share/doc/OpenCV/html/.doctrees/doc/user_guide/ug_features2d.doctree
-share/doc/OpenCV/html/.doctrees/doc/user_guide/ug_highgui.doctree
share/doc/OpenCV/html/.doctrees/doc/user_guide/ug_intelperc.doctree
+share/doc/OpenCV/html/.doctrees/doc/user_guide/ug_kinect.doctree
share/doc/OpenCV/html/.doctrees/doc/user_guide/ug_mat.doctree
share/doc/OpenCV/html/.doctrees/doc/user_guide/ug_traincascade.doctree
share/doc/OpenCV/html/.doctrees/doc/user_guide/user_guide.doctree
@@ -983,6 +983,7 @@ share/doc/OpenCV/html/_images/fisherface
share/doc/OpenCV/html/_images/fisherface_reconstruction_0.png
share/doc/OpenCV/html/_images/fisherface_reconstruction_opencv.png
share/doc/OpenCV/html/_images/fisherfaces_opencv.png
+share/doc/OpenCV/html/_images/fisheye_undistorted.jpg
share/doc/OpenCV/html/_images/gccegg-65.jpg
share/doc/OpenCV/html/_images/general.jpg
share/doc/OpenCV/html/_images/global_view_point.png
@@ -1298,8 +1299,8 @@ share/doc/OpenCV/html/_sources/doc/tutor
share/doc/OpenCV/html/_sources/doc/tutorials/viz/widget_pose/widget_pose.txt
share/doc/OpenCV/html/_sources/doc/user_guide/
share/doc/OpenCV/html/_sources/doc/user_guide/ug_features2d.txt
-share/doc/OpenCV/html/_sources/doc/user_guide/ug_highgui.txt
share/doc/OpenCV/html/_sources/doc/user_guide/ug_intelperc.txt
+share/doc/OpenCV/html/_sources/doc/user_guide/ug_kinect.txt
share/doc/OpenCV/html/_sources/doc/user_guide/ug_mat.txt
share/doc/OpenCV/html/_sources/doc/user_guide/ug_traincascade.txt
share/doc/OpenCV/html/_sources/doc/user_guide/user_guide.txt
@@ -1708,8 +1709,8 @@ share/doc/OpenCV/html/doc/tutorials/viz/
share/doc/OpenCV/html/doc/tutorials/viz/widget_pose/widget_pose.html
share/doc/OpenCV/html/doc/user_guide/
share/doc/OpenCV/html/doc/user_guide/ug_features2d.html
-share/doc/OpenCV/html/doc/user_guide/ug_highgui.html
share/doc/OpenCV/html/doc/user_guide/ug_intelperc.html
+share/doc/OpenCV/html/doc/user_guide/ug_kinect.html
share/doc/OpenCV/html/doc/user_guide/ug_mat.html
share/doc/OpenCV/html/doc/user_guide/ug_traincascade.html
share/doc/OpenCV/html/doc/user_guide/user_guide.html
Index: pkg/PLIST-java
===================================================================
RCS file: /cvs/ports/graphics/opencv/pkg/PLIST-java,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-java
--- pkg/PLIST-java 3 Jun 2014 20:41:36 -0000 1.2
+++ pkg/PLIST-java 21 Jan 2015 08:37:38 -0000
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-java,v 1.2 2014/06/03 20:41:36 zhuk Exp $
lib/OpenCV/
lib/OpenCV/java/
-lib/OpenCV/java/libopencv_java249.so
-lib/OpenCV/java/opencv-249.jar
+lib/OpenCV/java/libopencv_java2410.so
+lib/OpenCV/java/opencv-2410.jar
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/graphics/opencv/pkg/PLIST-main,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-main
--- pkg/PLIST-main 3 Jun 2014 20:41:36 -0000 1.3
+++ pkg/PLIST-main 21 Jan 2015 08:37:38 -0000
@@ -214,7 +214,7 @@ lib/python${MODPY_VERSION}/site-packages
share/OpenCV/
share/OpenCV/OpenCVConfig-version.cmake
share/OpenCV/OpenCVConfig.cmake
-share/OpenCV/OpenCVModules-release.cmake
+share/OpenCV/OpenCVModules${MODCMAKE_BUILD_SUFFIX}
share/OpenCV/OpenCVModules.cmake
share/OpenCV/haarcascades/
share/OpenCV/haarcascades/haarcascade_eye.xml
