[arch-commits] Commit in nomacs/repos/community-staging-x86_64 (5 files)
David Runge
dvzrv at archlinux.org
Sat Dec 21 20:19:57 UTC 2019
Date: Saturday, December 21, 2019 @ 20:19:56
Author: dvzrv
Revision: 538654
archrelease: copy trunk to community-staging-x86_64
Added:
nomacs/repos/community-staging-x86_64/PKGBUILD
(from rev 538653, nomacs/trunk/PKGBUILD)
nomacs/repos/community-staging-x86_64/nomacs-opencv-4.2.patch
(from rev 538653, nomacs/trunk/nomacs-opencv-4.2.patch)
Deleted:
nomacs/repos/community-staging-x86_64/PKGBUILD
nomacs/repos/community-staging-x86_64/nomacs-iostream.patch
nomacs/repos/community-staging-x86_64/nomacs-opencv-4.2.patch
-------------------------+
PKGBUILD | 107 +++++++++++++++++++++++-----------------------
nomacs-iostream.patch | 26 -----------
nomacs-opencv-4.2.patch | 52 +++++++++++-----------
3 files changed, 81 insertions(+), 104 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-12-21 20:19:37 UTC (rev 538653)
+++ PKGBUILD 2019-12-21 20:19:56 UTC (rev 538654)
@@ -1,52 +0,0 @@
-# Maintainer: David Runge <dave at sleepmap.de>
-# Contributor: speps <speps at aur dot archlinux dot org>
-
-_plugins_pkgver=3.12.0
-pkgname=nomacs
-pkgver=3.12
-pkgrel=8
-pkgdesc="A Qt image viewer"
-arch=('x86_64')
-url="https://nomacs.org/"
-license=('GPL3')
-depends=('desktop-file-utils' 'exiv2' 'libraw' 'opencv' 'quazip' 'qt5-svg')
-optdepends=('qt5-imageformats: support additional image formats')
-makedepends=('cmake' 'qt5-tools')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/${pkgver}.tar.gz"
- "${pkgname}-plugins-${_plugins_pkgver}.tar.gz::https://github.com/${pkgname}/${pkgname}-plugins/archive/${_plugins_pkgver}.tar.gz"
- "opencv4.patch::https://github.com/${pkgname}/${pkgname}-plugins/commit/7fdb4371135909bf5a2ba0caac2370e2a1a1c692.patch"
- nomacs-iostream.patch
- nomacs-opencv-4.2.patch)
-sha512sums=('4508354d48a6115cd40f701cc90cbbcb84490e99eaac0295db48f6fea99550d5e2b3e7365128d0c9cc4eeb621906f55e275603d84cb8b6bb164d0b5e2e192119'
- 'b46a2523737893bd342e90331d22082a84f3ff9abf4fdcf360d3fb9f2724cf616a6d77eacc272f117e103a9978f99b70feb8364f4c818681a147f78bfe356032'
- '456bb01e88974c4bad1b9ad0c24857a473777c78755adfcfbebbe0377db5e756c08321c462b9a56eb141dccb7da80582a4a6c17ebc0af80c229982c532c32ccb'
- 'fab94e9db91e209609f5f4d9dea9d2e9a8257f937c03cbc0768d25b979c0a67a1bbd7143ec4dfb3ad3dee7323d9625f80f1de7a03fdb29643c41633347497639'
- 'fdbef4eba4968cf4f01bcb7601633b8042f5fefb43307b534c3ff685594a0a96c27f9b18a2f4da27fe6948459ea99a0e141246e6035afd2abcd381aedf1711ac')
-
-prepare() {
- cd "${pkgname}-${pkgver}"
- # move plugins
- mv "${srcdir}/${pkgname}-plugins-${_plugins_pkgver}" "ImageLounge/plugins"
-
- patch -p1 -i ../nomacs-iostream.patch # Add missing header
- # upstream patch for opencv >= 4.0.0:
- # https://github.com/nomacs/nomacs-plugins/issues/26
- cd ImageLounge/plugins
- patch -Np1 -i "${srcdir}/opencv4.patch"
- # fix build with opencv 4.2
- cd ../..
- patch -Np1 -i "${srcdir}/nomacs-opencv-4.2.patch"
-}
-
-build() {
- cd "${pkgname}-${pkgver}"
- cmake ./ImageLounge -DCMAKE_INSTALL_PREFIX=/usr \
- -DUSE_SYSTEM_QUAZIP=ON \
- -DENABLE_TRANSLATIONS=true
- make
-}
-
-package() {
- cd "${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: nomacs/repos/community-staging-x86_64/PKGBUILD (from rev 538653, nomacs/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-12-21 20:19:56 UTC (rev 538654)
@@ -0,0 +1,55 @@
+# Maintainer: David Runge <dvzrv at archlinux.org>
+# Contributor: speps <speps at aur dot archlinux dot org>
+
+_plugins_pkgver=3.12.0
+pkgname=nomacs
+pkgver=3.12
+pkgrel=9
+pkgdesc="A Qt image viewer"
+arch=('x86_64')
+url="https://nomacs.org/"
+license=('GPL3')
+depends=('desktop-file-utils' 'exiv2' 'gcc-libs' 'glibc' 'libtiff' 'libraw'
+'opencv' 'quazip' 'qt5-base' 'qt5-svg')
+optdepends=('qt5-imageformats: support additional image formats')
+makedepends=('cmake' 'qt5-tools')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/${pkgver}.tar.gz"
+ "${pkgname}-plugins-${_plugins_pkgver}.tar.gz::https://github.com/${pkgname}/${pkgname}-plugins/archive/${_plugins_pkgver}.tar.gz"
+ "${pkgname}-opencv-4.2.patch"
+ "${pkgname}-3.12-opencv4.patch::https://github.com/${pkgname}/${pkgname}-plugins/commit/7fdb4371135909bf5a2ba0caac2370e2a1a1c692.patch"
+ "${pkgname}-3.12-gcc9.patch::https://github.com/nomacs/nomacs/commit/37805e3bc8753970127db101f4aa0c061bc5a70d.patch")
+sha512sums=('4508354d48a6115cd40f701cc90cbbcb84490e99eaac0295db48f6fea99550d5e2b3e7365128d0c9cc4eeb621906f55e275603d84cb8b6bb164d0b5e2e192119'
+ 'b46a2523737893bd342e90331d22082a84f3ff9abf4fdcf360d3fb9f2724cf616a6d77eacc272f117e103a9978f99b70feb8364f4c818681a147f78bfe356032'
+ 'fdbef4eba4968cf4f01bcb7601633b8042f5fefb43307b534c3ff685594a0a96c27f9b18a2f4da27fe6948459ea99a0e141246e6035afd2abcd381aedf1711ac'
+ '456bb01e88974c4bad1b9ad0c24857a473777c78755adfcfbebbe0377db5e756c08321c462b9a56eb141dccb7da80582a4a6c17ebc0af80c229982c532c32ccb'
+ 'ba5db2b6423742d5cc0068ed3e65e0888026628cea2e303cf66ed8f232a15e82d7620588ee23a3ba5e5d592339a5e53fee51bd5f21efe4dabd717d41ab244e12')
+
+prepare() {
+ cd "${pkgname}-${pkgver}"
+ # symlinking plugins into place
+ ln -sv "${srcdir}/${pkgname}-plugins-${_plugins_pkgver}" "ImageLounge/plugins"
+ # fixes for gcc >= 9:
+ # https://github.com/nomacs/nomacs/issues/408
+ patch -Np1 -i "../${pkgname}-3.12-gcc9.patch"
+ # fixes for opencv >= 4.0.0:
+ # https://github.com/nomacs/nomacs-plugins/issues/26
+ patch -d ImageLounge/plugins -Np1 -i "${srcdir}/${pkgname}-3.12-opencv4.patch"
+ # fixes for opencv >= 4.2.0:
+ # https://github.com/nomacs/nomacs/issues/410
+ patch -Np1 -i "../${pkgname}-opencv-4.2.patch"
+}
+
+build() {
+ cd "${pkgname}-${pkgver}"
+ cmake -DCMAKE_INSTALL_PREFIX=/usr \
+ -DUSE_SYSTEM_QUAZIP=ON \
+ -DENABLE_TRANSLATIONS=true \
+ -B build \
+ -S ./ImageLounge
+ make VERBOSE=1 -C build
+}
+
+package() {
+ cd "${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install -C build
+}
Deleted: nomacs-iostream.patch
===================================================================
--- nomacs-iostream.patch 2019-12-21 20:19:37 UTC (rev 538653)
+++ nomacs-iostream.patch 2019-12-21 20:19:56 UTC (rev 538654)
@@ -1,26 +0,0 @@
-diff --git a/ImageLounge/src/DkCore/DkMetaData.cpp b/ImageLounge/src/DkCore/DkMetaData.cpp
-index d195757e..affec7be 100644
---- a/ImageLounge/src/DkCore/DkMetaData.cpp
-+++ b/ImageLounge/src/DkCore/DkMetaData.cpp
-@@ -42,6 +42,8 @@
- #include <QApplication>
- #pragma warning(pop) // no warnings from includes - end
-
-+#include <iostream>
-+
- namespace nmc {
-
- // DkMetaDataT --------------------------------------------------------------------
-diff --git a/ImageLounge/src/DkGui/DkNoMacs.cpp b/ImageLounge/src/DkGui/DkNoMacs.cpp
-index 6a412f70..bbfba233 100644
---- a/ImageLounge/src/DkGui/DkNoMacs.cpp
-+++ b/ImageLounge/src/DkGui/DkNoMacs.cpp
-@@ -96,6 +96,8 @@
- #include <QWinTaskbarButton>
- #endif
-
-+#include <iostream>
-+
- namespace nmc {
-
- DkNomacsOSXEventFilter::DkNomacsOSXEventFilter(QObject *parent) : QObject(parent) {
Deleted: nomacs-opencv-4.2.patch
===================================================================
--- nomacs-opencv-4.2.patch 2019-12-21 20:19:37 UTC (rev 538653)
+++ nomacs-opencv-4.2.patch 2019-12-21 20:19:56 UTC (rev 538654)
@@ -1,26 +0,0 @@
-diff --git a/ImageLounge/src/DkCore/DkImageStorage.cpp b/ImageLounge/src/DkCore/DkImageStorage.cpp
-index f121c88e..c6b0c894 100644
---- a/ImageLounge/src/DkCore/DkImageStorage.cpp
-+++ b/ImageLounge/src/DkCore/DkImageStorage.cpp
-@@ -1419,7 +1419,7 @@ void DkImage::mapGammaTable(cv::Mat& img, const QVector<unsigned short>& gammaTa
- qDebug() << "gamma computation takes: " << dt;
- }
-
--void DkImage::logPolar(const cv::Mat& src, cv::Mat& dst, CvPoint2D32f center, double scaleLog, double angle, double scale) {
-+void DkImage::logPolar(const cv::Mat& src, cv::Mat& dst, cv::Point2d center, double scaleLog, double angle, double scale) {
-
- cv::Mat mapx, mapy;
-
-diff --git a/ImageLounge/src/DkCore/DkImageStorage.h b/ImageLounge/src/DkCore/DkImageStorage.h
-index 751057e3..62a87971 100644
---- a/ImageLounge/src/DkCore/DkImageStorage.h
-+++ b/ImageLounge/src/DkCore/DkImageStorage.h
-@@ -105,7 +105,7 @@ public:
- static void mapGammaTable(cv::Mat& img, const QVector<unsigned short>& gammaTable);
- static void gammaToLinear(cv::Mat& img);
- static void linearToGamma(cv::Mat& img);
-- static void logPolar(const cv::Mat& src, cv::Mat& dst, CvPoint2D32f center, double scaleLog, double angle, double scale = 1.0);
-+ static void logPolar(const cv::Mat& src, cv::Mat& dst, cv::Point2d center, double scaleLog, double angle, double scale = 1.0);
- static void tinyPlanet(QImage& img, double scaleLog, double angle, QSize s, bool invert = false);
- #endif
-
Copied: nomacs/repos/community-staging-x86_64/nomacs-opencv-4.2.patch (from rev 538653, nomacs/trunk/nomacs-opencv-4.2.patch)
===================================================================
--- nomacs-opencv-4.2.patch (rev 0)
+++ nomacs-opencv-4.2.patch 2019-12-21 20:19:56 UTC (rev 538654)
@@ -0,0 +1,26 @@
+diff --git a/ImageLounge/src/DkCore/DkImageStorage.cpp b/ImageLounge/src/DkCore/DkImageStorage.cpp
+index f121c88e..c6b0c894 100644
+--- a/ImageLounge/src/DkCore/DkImageStorage.cpp
++++ b/ImageLounge/src/DkCore/DkImageStorage.cpp
+@@ -1419,7 +1419,7 @@ void DkImage::mapGammaTable(cv::Mat& img, const QVector<unsigned short>& gammaTa
+ qDebug() << "gamma computation takes: " << dt;
+ }
+
+-void DkImage::logPolar(const cv::Mat& src, cv::Mat& dst, CvPoint2D32f center, double scaleLog, double angle, double scale) {
++void DkImage::logPolar(const cv::Mat& src, cv::Mat& dst, cv::Point2d center, double scaleLog, double angle, double scale) {
+
+ cv::Mat mapx, mapy;
+
+diff --git a/ImageLounge/src/DkCore/DkImageStorage.h b/ImageLounge/src/DkCore/DkImageStorage.h
+index 751057e3..62a87971 100644
+--- a/ImageLounge/src/DkCore/DkImageStorage.h
++++ b/ImageLounge/src/DkCore/DkImageStorage.h
+@@ -105,7 +105,7 @@ public:
+ static void mapGammaTable(cv::Mat& img, const QVector<unsigned short>& gammaTable);
+ static void gammaToLinear(cv::Mat& img);
+ static void linearToGamma(cv::Mat& img);
+- static void logPolar(const cv::Mat& src, cv::Mat& dst, CvPoint2D32f center, double scaleLog, double angle, double scale = 1.0);
++ static void logPolar(const cv::Mat& src, cv::Mat& dst, cv::Point2d center, double scaleLog, double angle, double scale = 1.0);
+ static void tinyPlanet(QImage& img, double scaleLog, double angle, QSize s, bool invert = false);
+ #endif
+
More information about the arch-commits
mailing list