mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-08 21:00:05 +02:00
imageplay, revbump for new opencv (#9203)
This commit is contained in:
@@ -6,7 +6,7 @@ HOMEPAGE="http://cpvrlab.github.io/ImagePlay/"
|
||||
COPYRIGHT="2015-2017 Bern University of Applied Sciences, Engineering and \
|
||||
Information Technology, HuCE, cpvrLab "
|
||||
LICENSE="GNU GPL v3"
|
||||
REVISION="2"
|
||||
REVISION="3"
|
||||
srcGitRev_1="3cccd1e7dc15f6da848d51c483671092e3904db8"
|
||||
SOURCE_URI_1="https://github.com/cpvrlab/ImagePlay/archive/$srcGitRev_1.tar.gz"
|
||||
CHECKSUM_SHA256_1="7242ce7134ee4dfd6da48151a168b68f2ff9053af83dec923a8b8efe233eb817"
|
||||
@@ -17,9 +17,9 @@ SOURCE_URI_2="https://github.com/cpvrlab/ImagePlay_lib/archive/$srcGitRev_2.tar.
|
||||
CHECKSUM_SHA256_2="937397586b1089749d723c0e2639a6e44717001bdb519050930002266f7dd043"
|
||||
SOURCE_FILENAME_2="imageplay_lib-$portVersion.tar.gz"
|
||||
SOURCE_DIR_2="ImagePlay_lib-$srcGitRev_2"
|
||||
PATCHES="imageplay-$portVersion.patchset"
|
||||
|
||||
ADDITIONAL_FILES="imageplay.rdef.in"
|
||||
PATCHES_1="imageplay-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
@@ -1,17 +1,11 @@
|
||||
From 3c20e5066491695786dafbc2cd13db116a07dccb Mon Sep 17 00:00:00 2001
|
||||
From 40e4649597397ad28be08e2aaed55e0823dbebe4 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
|
||||
Date: Fri, 8 Jan 2021 19:59:20 +0100
|
||||
Subject: [PATCH] Haiku platform support, dynamic opencv support
|
||||
|
||||
---
|
||||
IPL/IPL.pro | 14 +++++++++++---
|
||||
IPL/include/IPL_global.h | 2 +-
|
||||
IPL/include/processes/IPLLoadImageSequence.h | 2 +-
|
||||
ImagePlay/ImagePlay.pro | 16 +++++++++++++---
|
||||
4 files changed, 26 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/IPL/IPL.pro b/IPL/IPL.pro
|
||||
index e38c58b..8749d0a 100644
|
||||
index e38c58b..9a18f3c 100644
|
||||
--- a/IPL/IPL.pro
|
||||
+++ b/IPL/IPL.pro
|
||||
@@ -26,7 +26,8 @@ else: DESTDIR = ../ImagePlay/release
|
||||
@@ -33,12 +27,10 @@ index e38c58b..8749d0a 100644
|
||||
CONFIG += staticlib
|
||||
|
||||
LIBS += -lfreeimage
|
||||
@@ -162,5 +163,12 @@ gcc:!clang {
|
||||
INCLUDEPATH += $$PWD/include/
|
||||
@@ -163,4 +164,11 @@ INCLUDEPATH += $$PWD/include/
|
||||
INCLUDEPATH += $$PWD/include/processes/
|
||||
|
||||
-# OpenCV
|
||||
+# OpenCV
|
||||
# OpenCV
|
||||
+!haiku {
|
||||
INCLUDEPATH += $$PWD/include/opencv/
|
||||
+}
|
||||
@@ -74,7 +66,7 @@ index 41b1d55..5128994 100644
|
||||
#include <dirent.h>
|
||||
#else
|
||||
diff --git a/ImagePlay/ImagePlay.pro b/ImagePlay/ImagePlay.pro
|
||||
index 944b9ea..ca38b27 100644
|
||||
index 944b9ea..3ddad09 100644
|
||||
--- a/ImagePlay/ImagePlay.pro
|
||||
+++ b/ImagePlay/ImagePlay.pro
|
||||
@@ -62,7 +62,8 @@ DEFINES += IMAGEPLAY_APPCAST_URL=\\\"http://cpvrlab.github.io/ImagePlay/Appcast.
|
||||
@@ -100,9 +92,9 @@ index 944b9ea..ca38b27 100644
|
||||
LIBS += -lopencv_xfeatures2d
|
||||
LIBS += -lopencv_photo
|
||||
LIBS += -lopencv_xphoto
|
||||
+ !haiku{
|
||||
+ !haiku{
|
||||
LIBS += -ldl
|
||||
+ }
|
||||
+ }
|
||||
|
||||
QMAKE_POST_LINK += $${QMAKE_COPY_DIR} media/process_icons/ ../_bin/$$CONFIGURATION/$$PLATFORM/ && \
|
||||
$${QMAKE_COPY_DIR} media/examples/ ../_bin/$$CONFIGURATION/$$PLATFORM/ &&\
|
||||
@@ -112,7 +104,7 @@ index 944b9ea..ca38b27 100644
|
||||
INCLUDEPATH += $$PWD/../IPL/include/processes/
|
||||
-INCLUDEPATH += $$PWD/../IPL/include/opencv/
|
||||
+!haiku {
|
||||
+ INCLUDEPATH += $$PWD/../IPL/include/opencv/
|
||||
+ INCLUDEPATH += $$PWD/../IPL/include/opencv/
|
||||
+}
|
||||
+haiku {
|
||||
+ QT_CONFIG -= no-pkg-config
|
||||
@@ -123,5 +115,5 @@ index 944b9ea..ca38b27 100644
|
||||
|
||||
# Fervor autoupdater
|
||||
--
|
||||
2.30.0
|
||||
2.37.3
|
||||
|
||||
|
||||
Reference in New Issue
Block a user