Date: Wednesday, March 9, 2016 @ 21:25:47 Author: arojas Revision: 165779
opencv 3.1 rebuild Added: nomacs/trunk/nomacs-opencv3.patch Modified: nomacs/trunk/PKGBUILD ----------------------+ PKGBUILD | 13 +++++++++---- nomacs-opencv3.patch | 21 +++++++++++++++++++++ 2 files changed, 30 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-03-09 19:41:17 UTC (rev 165778) +++ PKGBUILD 2016-03-09 20:25:47 UTC (rev 165779) @@ -3,7 +3,7 @@ pkgname=nomacs pkgver=3.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="A Qt image viewer" arch=(i686 x86_64) url="http://www.nomacs.org/" @@ -13,20 +13,25 @@ makedepends=('cmake' 'qt5-tools') install="$pkgname.install" source=("https://github.com/nomacs/nomacs/releases/download/$pkgver/nomacs-$pkgver-source.tar.bz2" - "https://github.com/nomacs/nomacs-plugins/archive/207cb0f5fb13907bf1ccf3549ad72768841cec63.zip") + "https://github.com/nomacs/nomacs-plugins/archive/207cb0f5fb13907bf1ccf3549ad72768841cec63.zip" + nomacs-opencv3.patch) md5sums=('e1630a4371d0e0f8aba9358ab20d43e5' - 'bbe351379e24c51e691b390a9c867719') + 'bbe351379e24c51e691b390a9c867719' + '0b51fcf4de8ee1debd1b8fadef2dd11d') prepare() { mv nomacs-plugins-207cb0f5fb13907bf1ccf3549ad72768841cec63 $pkgname-$pkgver/plugins cd $pkgname-$pkgver [ -d b ] || mkdir b + +# Fix opencv 3 detection (Gentoo) + patch -p2 -i ../nomacs-opencv3.patch } build() { cd $pkgname-$pkgver/b cmake .. -DCMAKE_INSTALL_PREFIX=/usr - make + make -j1 } package() { Added: nomacs-opencv3.patch =================================================================== --- nomacs-opencv3.patch (rev 0) +++ nomacs-opencv3.patch 2016-03-09 20:25:47 UTC (rev 165779) @@ -0,0 +1,21 @@ +commit aa3fffc15bb6cbec8ef140a070dc12e6888e79df +Author: Andreas Sturmlechner <andreas.sturmlech...@gmail.com> +Date: Sun Jan 31 17:38:21 2016 +0100 + + Drop minimum OpenCV version messing with detection of >=3.0.0 + + Similar to commit 624a2fa7fba25a9432dc15031f3fd569367927bd + +diff --git a/ImageLounge/cmake/Unix.cmake b/ImageLounge/cmake/Unix.cmake +index 4e91135..e9ec436 100644 +--- a/ImageLounge/cmake/Unix.cmake ++++ b/ImageLounge/cmake/Unix.cmake +@@ -43,7 +43,7 @@ endif(NOT EXIV2_FOUND) + # search for opencv + unset(OpenCV_FOUND CACHE) + if(ENABLE_OPENCV) +- find_package(OpenCV 2.1.0 REQUIRED core imgproc) ++ find_package(OpenCV REQUIRED core imgproc) + if (NOT OpenCV_LIBRARIES) # OpenCV_FOUND can not be used since it is set in Ubuntu 12.04 (without finding opencv) + # Older OpenCV versions only supplied pkg-config files + if(PKG_CONFIG_FOUND)