[arch-commits] Commit in nomacs/repos (8 files)
Antonio Rojas
arojas at archlinux.org
Wed Mar 9 20:26:23 UTC 2016
Date: Wednesday, March 9, 2016 @ 21:26:23
Author: arojas
Revision: 165780
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
nomacs/repos/community-staging-i686/
nomacs/repos/community-staging-i686/PKGBUILD
(from rev 165779, nomacs/trunk/PKGBUILD)
nomacs/repos/community-staging-i686/nomacs-opencv3.patch
(from rev 165779, nomacs/trunk/nomacs-opencv3.patch)
nomacs/repos/community-staging-i686/nomacs.install
(from rev 165779, nomacs/trunk/nomacs.install)
nomacs/repos/community-staging-x86_64/
nomacs/repos/community-staging-x86_64/PKGBUILD
(from rev 165779, nomacs/trunk/PKGBUILD)
nomacs/repos/community-staging-x86_64/nomacs-opencv3.patch
(from rev 165779, nomacs/trunk/nomacs-opencv3.patch)
nomacs/repos/community-staging-x86_64/nomacs.install
(from rev 165779, nomacs/trunk/nomacs.install)
-----------------------------------------------+
community-staging-i686/PKGBUILD | 42 ++++++++++++++++++++++++
community-staging-i686/nomacs-opencv3.patch | 21 ++++++++++++
community-staging-i686/nomacs.install | 11 ++++++
community-staging-x86_64/PKGBUILD | 42 ++++++++++++++++++++++++
community-staging-x86_64/nomacs-opencv3.patch | 21 ++++++++++++
community-staging-x86_64/nomacs.install | 11 ++++++
6 files changed, 148 insertions(+)
Copied: nomacs/repos/community-staging-i686/PKGBUILD (from rev 165779, nomacs/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2016-03-09 20:26:23 UTC (rev 165780)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: speps <speps at aur dot archlinux dot org>
+
+pkgname=nomacs
+pkgver=3.0.0
+pkgrel=2
+pkgdesc="A Qt image viewer"
+arch=(i686 x86_64)
+url="http://www.nomacs.org/"
+license=('GPL3')
+#depends=('qt4' 'exiv2' 'libraw' 'opencv')
+depends=('qt5-svg' 'exiv2' 'libraw' 'opencv' 'desktop-file-utils')
+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"
+ nomacs-opencv3.patch)
+md5sums=('e1630a4371d0e0f8aba9358ab20d43e5'
+ '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 -j1
+}
+
+package() {
+ cd $pkgname-$pkgver/b
+ make DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
Copied: nomacs/repos/community-staging-i686/nomacs-opencv3.patch (from rev 165779, nomacs/trunk/nomacs-opencv3.patch)
===================================================================
--- community-staging-i686/nomacs-opencv3.patch (rev 0)
+++ community-staging-i686/nomacs-opencv3.patch 2016-03-09 20:26:23 UTC (rev 165780)
@@ -0,0 +1,21 @@
+commit aa3fffc15bb6cbec8ef140a070dc12e6888e79df
+Author: Andreas Sturmlechner <andreas.sturmlechner at 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)
Copied: nomacs/repos/community-staging-i686/nomacs.install (from rev 165779, nomacs/trunk/nomacs.install)
===================================================================
--- community-staging-i686/nomacs.install (rev 0)
+++ community-staging-i686/nomacs.install 2016-03-09 20:26:23 UTC (rev 165780)
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: nomacs/repos/community-staging-x86_64/PKGBUILD (from rev 165779, nomacs/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2016-03-09 20:26:23 UTC (rev 165780)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: speps <speps at aur dot archlinux dot org>
+
+pkgname=nomacs
+pkgver=3.0.0
+pkgrel=2
+pkgdesc="A Qt image viewer"
+arch=(i686 x86_64)
+url="http://www.nomacs.org/"
+license=('GPL3')
+#depends=('qt4' 'exiv2' 'libraw' 'opencv')
+depends=('qt5-svg' 'exiv2' 'libraw' 'opencv' 'desktop-file-utils')
+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"
+ nomacs-opencv3.patch)
+md5sums=('e1630a4371d0e0f8aba9358ab20d43e5'
+ '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 -j1
+}
+
+package() {
+ cd $pkgname-$pkgver/b
+ make DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
Copied: nomacs/repos/community-staging-x86_64/nomacs-opencv3.patch (from rev 165779, nomacs/trunk/nomacs-opencv3.patch)
===================================================================
--- community-staging-x86_64/nomacs-opencv3.patch (rev 0)
+++ community-staging-x86_64/nomacs-opencv3.patch 2016-03-09 20:26:23 UTC (rev 165780)
@@ -0,0 +1,21 @@
+commit aa3fffc15bb6cbec8ef140a070dc12e6888e79df
+Author: Andreas Sturmlechner <andreas.sturmlechner at 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)
Copied: nomacs/repos/community-staging-x86_64/nomacs.install (from rev 165779, nomacs/trunk/nomacs.install)
===================================================================
--- community-staging-x86_64/nomacs.install (rev 0)
+++ community-staging-x86_64/nomacs.install 2016-03-09 20:26:23 UTC (rev 165780)
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
More information about the arch-commits
mailing list