Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d89124bfe1a75bbb6c5266b63585bc0f7bb1eba5
commit d89124bfe1a75bbb6c5266b63585bc0f7bb1eba5 Author: Marius Cirsta <[email protected]> Date: Sun Dec 6 18:55:27 2015 +0200 nomacs-2.4.6-1-x86_64 * rebuild for new libraw * version bump diff --git a/source/xapps-extra/nomacs/FrugalBuild b/source/xapps-extra/nomacs/FrugalBuild index f5c6378..f1bf631 100644 --- a/source/xapps-extra/nomacs/FrugalBuild +++ b/source/xapps-extra/nomacs/FrugalBuild @@ -1,20 +1,18 @@ # Compiling Time: 0.35 SBU # Maintainer: Melko <[email protected]> -options+=('asneeded') pkgname=nomacs -pkgver=1.6.4 -pkgrel=2 +pkgver=2.4.6 +pkgrel=1 pkgdesc="Small and fast image viewer." -depends=('libqtgui' 'libqtnetwork' 'exiv2>=0.25' 'libraw>=0.15.2' 'opencv>=2.4.6.1') +depends=('libqtgui' 'libqtnetwork' 'exiv2>=0.25' 'libraw>=0.17' 'opencv>=2.4.6.1') makedepends=('qt4-linguist') groups=('xapps-extra') archs=('i686' 'x86_64') -_F_sourceforge_ext="-source.tar.bz2" -Finclude sourceforge cmake -source=(${source[@]} find-opencv.diff) -sha1sums=('98f6495fc1c15b817ea55caa0ba5bccf94b676c2' \ - '492df00e74f191b917c05a13ea4de3b6a91c9f8b') +_F_github_tag='y' +Finclude github cmake +_F_cd_path="${pkgname}-${pkgver}/ImageLounge" +sha1sums=('9fedbdb39101eaa01f3c7005e3acd5fdb3cbad63') # optimization OK diff --git a/source/xapps-extra/nomacs/find-opencv.diff b/source/xapps-extra/nomacs/find-opencv.diff deleted file mode 100644 index 6e8327b..0000000 --- a/source/xapps-extra/nomacs/find-opencv.diff +++ /dev/null @@ -1,16 +0,0 @@ -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
