haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 03:30:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

OpenCV: version bump (#1743)

Browse Source
This commit is contained in:
miqlas
2017-10-27 14:26:34 +02:00
committed by waddlesplash
parent 7208830d82
commit a2ba4d2c9c
2 changed files with 36 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
media-libs/opencv/opencv-3.3.0.recipe → media-libs/opencv/opencv-3.3.1.recipe
View File

@@ -9,12 +9,11 @@ COPYRIGHT="2000-2016, Intel Corporation
2015-2016, OpenCV Foundation
2015-2016, Itseez Inc."
LICENSE="BSD (3-clause)"
REVISION="2"
REVISION="1"
SOURCE_URI="https://github.com/opencv/opencv/archive/$portVersion.tar.gz"
SOURCE_FILENAME="opencv-$portVersion.tar.gz"
CHECKSUM_SHA256="8bb312b9d9fd17336dc1f8b3ac82f021ca50e2034afc866098866176d985adc6"
CHECKSUM_SHA256="5dca3bb0d661af311e25a72b04a7e4c22c47c1aa86eb73e70063cd378a2aa6ee"
SOURCE_DIR="opencv-$portVersion"
PATCHES="opencv-$portVersion.patchset"
ARCHITECTURES="?x86 x86_64"
SECONDARY_ARCHITECTURES="?x86"
@@ -33,23 +32,23 @@ PROVIDES="
cmd:opencv_traincascade$commandSuffix= $portVersion
cmd:opencv_version$commandSuffix= $portVersion
cmd:opencv_visualisation$commandSuffix= $portVersion
lib:libopencv_calib3d$secondaryArchSuffix = 3.3.0 compat >= 3
lib:libopencv_core$secondaryArchSuffix = 3.3.0 compat >= 3
lib:libopencv_dnn$secondaryArchSuffix = 3.3.0 compat >= 3
lib:libopencv_features2d$secondaryArchSuffix = 3.3.0 compat >= 3
lib:libopencv_flann$secondaryArchSuffix = 3.3.0 compat >= 3
lib:libopencv_highgui$secondaryArchSuffix = 3.3.0 compat >= 3
lib:libopencv_imgcodecs$secondaryArchSuffix = 3.3.0 compat >= 3
lib:libopencv_imgproc$secondaryArchSuffix = 3.3.0 compat >= 3
lib:libopencv_ml$secondaryArchSuffix = 3.3.0 compat >= 3
lib:libopencv_objdetect$secondaryArchSuffix = 3.3.0 compat >= 3
lib:libopencv_photo$secondaryArchSuffix = 3.3.0 compat >= 3
lib:libopencv_shape$secondaryArchSuffix = 3.3.0 compat >= 3
lib:libopencv_stitching$secondaryArchSuffix = 3.3.0 compat >= 3
lib:libopencv_superres$secondaryArchSuffix = 3.3.0 compat >= 3
lib:libopencv_video$secondaryArchSuffix = 3.3.0 compat >= 3
lib:libopencv_videoio$secondaryArchSuffix = 3.3.0 compat >= 3
lib:libopencv_videostab$secondaryArchSuffix = 3.3.0 compat >= 3
lib:libopencv_calib3d$secondaryArchSuffix = 3.3.1 compat >= 3
lib:libopencv_core$secondaryArchSuffix = 3.3.1 compat >= 3
lib:libopencv_dnn$secondaryArchSuffix = 3.3.1 compat >= 3
lib:libopencv_features2d$secondaryArchSuffix = 3.3.1 compat >= 3
lib:libopencv_flann$secondaryArchSuffix = 3.3.1 compat >= 3
lib:libopencv_highgui$secondaryArchSuffix = 3.3.1 compat >= 3
lib:libopencv_imgcodecs$secondaryArchSuffix = 3.3.1 compat >= 3
lib:libopencv_imgproc$secondaryArchSuffix = 3.3.1 compat >= 3
lib:libopencv_ml$secondaryArchSuffix = 3.3.1 compat >= 3
lib:libopencv_objdetect$secondaryArchSuffix = 3.3.1 compat >= 3
lib:libopencv_photo$secondaryArchSuffix = 3.3.1 compat >= 3
lib:libopencv_shape$secondaryArchSuffix = 3.3.1 compat >= 3
lib:libopencv_stitching$secondaryArchSuffix = 3.3.1 compat >= 3
lib:libopencv_superres$secondaryArchSuffix = 3.3.1 compat >= 3
lib:libopencv_video$secondaryArchSuffix = 3.3.1 compat >= 3
lib:libopencv_videoio$secondaryArchSuffix = 3.3.1 compat >= 3
lib:libopencv_videostab$secondaryArchSuffix = 3.3.1 compat >= 3
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -85,23 +84,23 @@ REQUIRES="
PROVIDES_devel="
opencv${secondaryArchSuffix}_devel = $portVersion compat >= 3
devel:libopencv_calib3d$secondaryArchSuffix = 3.3.0 compat >= 3
devel:libopencv_core$secondaryArchSuffix = 3.3.0 compat >= 3
devel:libopencv_dnn$secondaryArchSuffix = 3.3.0 compat >= 3
devel:libopencv_features2d$secondaryArchSuffix = 3.3.0 compat >= 3
devel:libopencv_flann$secondaryArchSuffix = 3.3.0 compat >= 3
devel:libopencv_highgui$secondaryArchSuffix = 3.3.0 compat >= 3
devel:libopencv_imgcodecs$secondaryArchSuffix = 3.3.0 compat >= 3
devel:libopencv_imgproc$secondaryArchSuffix = 3.3.0 compat >= 3
devel:libopencv_ml$secondaryArchSuffix = 3.3.0 compat >= 3
devel:libopencv_objdetect$secondaryArchSuffix = 3.3.0 compat >= 3
devel:libopencv_photo$secondaryArchSuffix = 3.3.0 compat >= 3
devel:libopencv_shape$secondaryArchSuffix = 3.3.0 compat >= 3
devel:libopencv_stitching$secondaryArchSuffix = 3.3.0 compat >= 3
devel:libopencv_superres$secondaryArchSuffix = 3.3.0 compat >= 3
devel:libopencv_video$secondaryArchSuffix = 3.3.0 compat >= 3
devel:libopencv_videoio$secondaryArchSuffix = 3.3.0 compat >= 3
devel:libopencv_videostab$secondaryArchSuffix = 3.3.0 compat >= 3
devel:libopencv_calib3d$secondaryArchSuffix = 3.3.1 compat >= 3
devel:libopencv_core$secondaryArchSuffix = 3.3.1 compat >= 3
devel:libopencv_dnn$secondaryArchSuffix = 3.3.1 compat >= 3
devel:libopencv_features2d$secondaryArchSuffix = 3.3.1 compat >= 3
devel:libopencv_flann$secondaryArchSuffix = 3.3.1 compat >= 3
devel:libopencv_highgui$secondaryArchSuffix = 3.3.1 compat >= 3
devel:libopencv_imgcodecs$secondaryArchSuffix = 3.3.1 compat >= 3
devel:libopencv_imgproc$secondaryArchSuffix = 3.3.1 compat >= 3
devel:libopencv_ml$secondaryArchSuffix = 3.3.1 compat >= 3
devel:libopencv_objdetect$secondaryArchSuffix = 3.3.1 compat >= 3
devel:libopencv_photo$secondaryArchSuffix = 3.3.1 compat >= 3
devel:libopencv_shape$secondaryArchSuffix = 3.3.1 compat >= 3
devel:libopencv_stitching$secondaryArchSuffix = 3.3.1 compat >= 3
devel:libopencv_superres$secondaryArchSuffix = 3.3.1 compat >= 3
devel:libopencv_video$secondaryArchSuffix = 3.3.1 compat >= 3
devel:libopencv_videoio$secondaryArchSuffix = 3.3.1 compat >= 3
devel:libopencv_videostab$secondaryArchSuffix = 3.3.1 compat >= 3
"
REQUIRES_devel="
opencv$secondaryArchSuffix == $portVersion base

78
media-libs/opencv/patches/opencv-3.3.0.patchset
View File

@@ -1,78 +0,0 @@
From 2c12c6a1cba8a063d210fa477dc61f9872ad6117 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Fri, 7 Apr 2017 14:10:49 +0200
Subject: Haiku is like BSD but with nicer icons (no -lrt -ldl)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index af5e2c1..f926e88 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -557,7 +557,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|OpenBSD")
+ elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|NetBSD|DragonFly|OpenBSD|Haiku")
set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} m pthread)
elseif(EMSCRIPTEN)
# no need to link to system libs with emscripten
--
2.12.2
From f7de64ae96e89b6b161442609e54e191ebc4919c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Fri, 7 Apr 2017 14:14:46 +0200
Subject: Haiku build fix
diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp
index 3eeb5fe..73759d6 100644
--- a/modules/core/src/system.cpp
+++ b/modules/core/src/system.cpp
@@ -66,7 +66,7 @@ Mutex* __initialization_mutex_initializer = &getInitializationMutex();
# endif
#endif
-#if defined __ANDROID__ || defined __linux__ || defined __FreeBSD__
+#if defined __ANDROID__ || defined __linux__ || defined __FreeBSD__ || defined __HAIKU__
# include <unistd.h>
# include <fcntl.h>
# include <elf.h>
@@ -202,7 +202,7 @@ std::wstring GetTempFileNameWinRT(std::wstring prefix)
#include "omp.h"
#endif
-#if defined __linux__ || defined __APPLE__ || defined __EMSCRIPTEN__ || defined __FreeBSD__
+#if defined __linux__ || defined __APPLE__ || defined __EMSCRIPTEN__ || defined __FreeBSD__ || defined __HAIKU__
#include <unistd.h>
#include <stdio.h>
#include <sys/types.h>
--
2.12.2
From e6632eafd03dc6a052499a6a20a03f1e4e97a9ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Fri, 7 Apr 2017 15:36:17 +0200
Subject: FFMPEG test fix for Haiku
diff --git a/cmake/checks/ffmpeg_test.cpp b/cmake/checks/ffmpeg_test.cpp
index 4a7a3e0..8f293f9 100644
--- a/cmake/checks/ffmpeg_test.cpp
+++ b/cmake/checks/ffmpeg_test.cpp
@@ -2,6 +2,10 @@
#include <stdlib.h>
+#ifdef __HAIKU__
+ #define __STDC_CONSTANT_MACROS
+#endif
+
extern "C" {
#include <libavformat/avformat.h>
#include <libavcodec/avcodec.h>
--
2.12.2