| 1 |
commit: d44dfcaf2545c50c28ed4c066efbbc912de643da |
| 2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Jan 31 17:05:26 2016 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 31 17:28:20 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d44dfcaf |
| 7 |
|
| 8 |
media-gfx/nomacs: Fix configure with >=opencv-3 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.27 |
| 11 |
|
| 12 |
media-gfx/nomacs/files/nomacs-3.0.0-opencv3.patch | 21 +++++++++++++++++++++ |
| 13 |
media-gfx/nomacs/nomacs-2.4.2.ebuild | 7 +++++-- |
| 14 |
media-gfx/nomacs/nomacs-2.4.4.ebuild | 4 +++- |
| 15 |
media-gfx/nomacs/nomacs-2.4.6.ebuild | 4 +++- |
| 16 |
media-gfx/nomacs/nomacs-3.0.0.ebuild | 1 + |
| 17 |
5 files changed, 33 insertions(+), 4 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-gfx/nomacs/files/nomacs-3.0.0-opencv3.patch b/media-gfx/nomacs/files/nomacs-3.0.0-opencv3.patch |
| 20 |
new file mode 100644 |
| 21 |
index 0000000..a13d90f |
| 22 |
--- /dev/null |
| 23 |
+++ b/media-gfx/nomacs/files/nomacs-3.0.0-opencv3.patch |
| 24 |
@@ -0,0 +1,21 @@ |
| 25 |
+commit aa3fffc15bb6cbec8ef140a070dc12e6888e79df |
| 26 |
+Author: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
| 27 |
+Date: Sun Jan 31 17:38:21 2016 +0100 |
| 28 |
+ |
| 29 |
+ Drop minimum OpenCV version messing with detection of >=3.0.0 |
| 30 |
+ |
| 31 |
+ Similar to commit 624a2fa7fba25a9432dc15031f3fd569367927bd |
| 32 |
+ |
| 33 |
+diff --git a/ImageLounge/cmake/Unix.cmake b/ImageLounge/cmake/Unix.cmake |
| 34 |
+index 4e91135..e9ec436 100644 |
| 35 |
+--- a/ImageLounge/cmake/Unix.cmake |
| 36 |
++++ b/ImageLounge/cmake/Unix.cmake |
| 37 |
+@@ -43,7 +43,7 @@ endif(NOT EXIV2_FOUND) |
| 38 |
+ # search for opencv |
| 39 |
+ unset(OpenCV_FOUND CACHE) |
| 40 |
+ if(ENABLE_OPENCV) |
| 41 |
+- find_package(OpenCV 2.1.0 REQUIRED core imgproc) |
| 42 |
++ find_package(OpenCV REQUIRED core imgproc) |
| 43 |
+ if (NOT OpenCV_LIBRARIES) # OpenCV_FOUND can not be used since it is set in Ubuntu 12.04 (without finding opencv) |
| 44 |
+ # Older OpenCV versions only supplied pkg-config files |
| 45 |
+ if(PKG_CONFIG_FOUND) |
| 46 |
|
| 47 |
diff --git a/media-gfx/nomacs/nomacs-2.4.2.ebuild b/media-gfx/nomacs/nomacs-2.4.2.ebuild |
| 48 |
index b3ef73b..f666011 100644 |
| 49 |
--- a/media-gfx/nomacs/nomacs-2.4.2.ebuild |
| 50 |
+++ b/media-gfx/nomacs/nomacs-2.4.2.ebuild |
| 51 |
@@ -1,4 +1,4 @@ |
| 52 |
-# Copyright 1999-2015 Gentoo Foundation |
| 53 |
+# Copyright 1999-2016 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
# $Id$ |
| 56 |
|
| 57 |
@@ -31,7 +31,10 @@ DEPEND="${RDEPEND} |
| 58 |
virtual/pkgconfig |
| 59 |
" |
| 60 |
|
| 61 |
-PATCHES=( "${FILESDIR}/${P}-include.patch" ) |
| 62 |
+PATCHES=( |
| 63 |
+ "${FILESDIR}/${P}-include.patch" |
| 64 |
+ "${FILESDIR}/${PN}-3.0.0-opencv3.patch" |
| 65 |
+) |
| 66 |
|
| 67 |
src_configure() { |
| 68 |
local mycmakeargs=( |
| 69 |
|
| 70 |
diff --git a/media-gfx/nomacs/nomacs-2.4.4.ebuild b/media-gfx/nomacs/nomacs-2.4.4.ebuild |
| 71 |
index dee2bc0..d267681 100644 |
| 72 |
--- a/media-gfx/nomacs/nomacs-2.4.4.ebuild |
| 73 |
+++ b/media-gfx/nomacs/nomacs-2.4.4.ebuild |
| 74 |
@@ -1,4 +1,4 @@ |
| 75 |
-# Copyright 1999-2015 Gentoo Foundation |
| 76 |
+# Copyright 1999-2016 Gentoo Foundation |
| 77 |
# Distributed under the terms of the GNU General Public License v2 |
| 78 |
# $Id$ |
| 79 |
|
| 80 |
@@ -34,6 +34,8 @@ DEPEND="${RDEPEND} |
| 81 |
virtual/pkgconfig |
| 82 |
" |
| 83 |
|
| 84 |
+PATCHES=( "${FILESDIR}/${PN}-3.0.0-opencv3.patch" ) |
| 85 |
+ |
| 86 |
src_configure() { |
| 87 |
local mycmakeargs=( |
| 88 |
-DENABLE_QT5=OFF |
| 89 |
|
| 90 |
diff --git a/media-gfx/nomacs/nomacs-2.4.6.ebuild b/media-gfx/nomacs/nomacs-2.4.6.ebuild |
| 91 |
index 01cf47a..ecda8a1 100644 |
| 92 |
--- a/media-gfx/nomacs/nomacs-2.4.6.ebuild |
| 93 |
+++ b/media-gfx/nomacs/nomacs-2.4.6.ebuild |
| 94 |
@@ -1,4 +1,4 @@ |
| 95 |
-# Copyright 1999-2015 Gentoo Foundation |
| 96 |
+# Copyright 1999-2016 Gentoo Foundation |
| 97 |
# Distributed under the terms of the GNU General Public License v2 |
| 98 |
# $Id$ |
| 99 |
|
| 100 |
@@ -47,6 +47,8 @@ DEPEND="${RDEPEND} |
| 101 |
virtual/pkgconfig |
| 102 |
" |
| 103 |
|
| 104 |
+PATCHES=( "${FILESDIR}/${PN}-3.0.0-opencv3.patch" ) |
| 105 |
+ |
| 106 |
src_configure() { |
| 107 |
local mycmakeargs=( |
| 108 |
$(cmake-utils_use_enable opencv) |
| 109 |
|
| 110 |
diff --git a/media-gfx/nomacs/nomacs-3.0.0.ebuild b/media-gfx/nomacs/nomacs-3.0.0.ebuild |
| 111 |
index 67552f9..3915d6d 100644 |
| 112 |
--- a/media-gfx/nomacs/nomacs-3.0.0.ebuild |
| 113 |
+++ b/media-gfx/nomacs/nomacs-3.0.0.ebuild |
| 114 |
@@ -44,6 +44,7 @@ PATCHES=( |
| 115 |
"${FILESDIR}/${P}-tiff-build.patch" |
| 116 |
"${FILESDIR}/${P}-quazip-build.patch" |
| 117 |
"${FILESDIR}/${P}-quazip-link.patch" |
| 118 |
+ "${FILESDIR}/${P}-opencv3.patch" |
| 119 |
) |
| 120 |
|
| 121 |
src_configure() { |
Archives