Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1ec4b20c9a2b98c18a743b2d046c2240d02ce0b0
commit 1ec4b20c9a2b98c18a743b2d046c2240d02ce0b0 Author: Melko <[email protected]> Date: Tue Jan 28 23:26:21 2014 +0100 nomacs-1.6.2-1-i686 * version bump diff --git a/source/xapps-extra/nomacs/FrugalBuild b/source/xapps-extra/nomacs/FrugalBuild index a727f58..f7ebe32 100644 --- a/source/xapps-extra/nomacs/FrugalBuild +++ b/source/xapps-extra/nomacs/FrugalBuild @@ -4,8 +4,8 @@ options+=('asneeded') pkgname=nomacs -pkgver=1.4.0 -pkgrel=2 +pkgver=1.6.2 +pkgrel=1 pkgdesc="Small and fast image viewer." depends=('libqtgui' 'libqtnetwork' 'exiv2>=0.23' 'libraw>=0.15.2' 'opencv>=2.4.6.1') makedepends=('qt4-linguist') @@ -13,6 +13,8 @@ groups=('xapps-extra') archs=('i686' 'x86_64') _F_sourceforge_ext="-source.tar.bz2" Finclude sourceforge cmake -sha1sums=('bcd7487d684c8b872ba8286412edcc5d5b717f36') +source=(${source[@]} find-opencv.diff) +sha1sums=('c37686a72381a792bf5d1db5014b6d15d2599eb7' \ + '492df00e74f191b917c05a13ea4de3b6a91c9f8b') # optimization OK diff --git a/source/xapps-extra/nomacs/find-opencv.diff b/source/xapps-extra/nomacs/find-opencv.diff new file mode 100644 index 0000000..6e8327b --- /dev/null +++ b/source/xapps-extra/nomacs/find-opencv.diff @@ -0,0 +1,16 @@ +diff -ur nomacs-1.6.2/CMakeLists.txt nomacs-1.6.2.n/CMakeLists.txt +--- nomacs-1.6.2/CMakeLists.txt 2013-12-20 15:11:00.000000000 +0100 ++++ nomacs-1.6.2/CMakeLists.txt 2014-01-28 23:17:43.249575185 +0100 +@@ -222,10 +222,8 @@ + + # OpenCV + SET(OpenCV_LIBS "") +- if (PKG_CONFIG_FOUND) # not sure: pkgconfig is needed for old linux with old old opencv systems +- pkg_check_modules(OpenCV opencv>=2.1.0) +- SET(OpenCV_LIBS ${OpenCV_LIBRARIES}) +- endif(PKG_CONFIG_FOUND) ++ find_package(OpenCV REQUIRED) ++ SET(OpenCV_LIBS ${OpenCV_LIBRARIES}) + IF (OpenCV_LIBS STREQUAL "") + find_package(OpenCV 2.1.0 REQUIRED core imgproc) + ENDIF() _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
