[arch-commits] Commit in nomacs/trunk (PKGBUILD nomacs-opencv-4.2.patch)

[Antonio Rojas]

    Date: Saturday, December 21, 2019 @ 14:33:07
  Author: arojas
Revision: 538605

opencv 4.2 rebuild

Added:
  nomacs/trunk/nomacs-opencv-4.2.patch
Modified:
  nomacs/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   11 ++++++++---
 nomacs-opencv-4.2.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-21 13:58:27 UTC (rev 538604)
+++ PKGBUILD	2019-12-21 14:33:07 UTC (rev 538605)
@@ -4,7 +4,7 @@
 _plugins_pkgver=3.12.0
 pkgname=nomacs
 pkgver=3.12
-pkgrel=7
+pkgrel=8
 pkgdesc="A Qt image viewer"
 arch=('x86_64')
 url="https://nomacs.org/"
@@ -15,11 +15,13 @@
 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-iostream.patch
+        nomacs-opencv-4.2.patch)
 sha512sums=('4508354d48a6115cd40f701cc90cbbcb84490e99eaac0295db48f6fea99550d5e2b3e7365128d0c9cc4eeb621906f55e275603d84cb8b6bb164d0b5e2e192119'
             'b46a2523737893bd342e90331d22082a84f3ff9abf4fdcf360d3fb9f2724cf616a6d77eacc272f117e103a9978f99b70feb8364f4c818681a147f78bfe356032'
             '456bb01e88974c4bad1b9ad0c24857a473777c78755adfcfbebbe0377db5e756c08321c462b9a56eb141dccb7da80582a4a6c17ebc0af80c229982c532c32ccb'
-            'fab94e9db91e209609f5f4d9dea9d2e9a8257f937c03cbc0768d25b979c0a67a1bbd7143ec4dfb3ad3dee7323d9625f80f1de7a03fdb29643c41633347497639')
+            'fab94e9db91e209609f5f4d9dea9d2e9a8257f937c03cbc0768d25b979c0a67a1bbd7143ec4dfb3ad3dee7323d9625f80f1de7a03fdb29643c41633347497639'
+            'fdbef4eba4968cf4f01bcb7601633b8042f5fefb43307b534c3ff685594a0a96c27f9b18a2f4da27fe6948459ea99a0e141246e6035afd2abcd381aedf1711ac')
 
 prepare() {
   cd "${pkgname}-${pkgver}"
@@ -31,6 +33,9 @@
   # 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() {

Added: nomacs-opencv-4.2.patch
===================================================================
--- nomacs-opencv-4.2.patch	                        (rev 0)
+++ nomacs-opencv-4.2.patch	2019-12-21 14:33:07 UTC (rev 538605)
@@ -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
+