[arch-commits] Commit in digikam/repos/extra-x86_64 (4 files)
Antonio Rojas
arojas at archlinux.org
Sun Feb 9 18:04:31 UTC 2020
Date: Sunday, February 9, 2020 @ 18:04:31
Author: arojas
Revision: 375131
archrelease: copy trunk to extra-x86_64
Added:
digikam/repos/extra-x86_64/PKGBUILD
(from rev 375130, digikam/trunk/PKGBUILD)
digikam/repos/extra-x86_64/digikam-opencv-4.2.patch
(from rev 375130, digikam/trunk/digikam-opencv-4.2.patch)
Deleted:
digikam/repos/extra-x86_64/PKGBUILD
digikam/repos/extra-x86_64/digikam-opencv-4.2.patch
--------------------------+
PKGBUILD | 113 ++++++++++++++++++++++-----------------------
digikam-opencv-4.2.patch | 70 +++++++++++++--------------
2 files changed, 92 insertions(+), 91 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-02-09 18:03:48 UTC (rev 375130)
+++ PKGBUILD 2020-02-09 18:04:31 UTC (rev 375131)
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 320127 2018-03-24 09:48:28Z arojas $
-# Maintainer: Ronald van Haren <ronald at archlinux.org>
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Tobias Powalowski <tpowa at archlinux.org>
-
-pkgname=digikam
-_pkgver=6.4.0
-pkgver=${_pkgver//-/_} # for beta versions
-pkgrel=6
-pkgdesc="An advanced digital photo management application"
-arch=(x86_64)
-license=(GPL)
-url="https://www.digikam.org/"
-depends=(lensfun opencv akonadi-contacts knotifyconfig libksane kfilemetadata qtav marble-common threadweaver kcalendarcore
- qt5-xmlpatterns imagemagick glu)
-makedepends=(extra-cmake-modules doxygen eigen boost kdoctools libkvkontakte)
-optdepends=('hugin: panorama tool' 'qt5-imageformats: support for additional image formats (WEBP, TIFF)'
- 'libkvkontakte: VKontakte plugin'
- 'rawtherapee: RAW import' 'darktable: RAW import')
-source=("https://download.kde.org/stable/$pkgname/$_pkgver/$pkgname-$_pkgver.tar.xz"{,.sig}
- initialize-imagemagick.patch::"https://cgit.kde.org/digikam.git/patch/?id=76ff65ae"
- digikam-opencv-4.2.patch)
-sha256sums=('775012ff515bdd25a0b894c95bf5d33e7122b523da9c0f3af260ec3eff498d6f'
- 'SKIP'
- 'c559882c0df2243c5a5baab3373bda4084fb9a1d54959770b8846fe026eaf360'
- 'fcd9a18dee3b4d009ec7256207d1b6645d2e2aa918b5cf9f9dc9b44db41f6a7b')
-validpgpkeys=(D1CF2444A7858C5F2FB095B74A77747BC2386E50) # digiKam.org (digiKam project) <digikamdeveloper at gmail.com>
-
-prepare() {
- mkdir -p build
-
- cd $pkgname-$pkgver
- patch -p1 -i ../initialize-imagemagick.patch # Properly initialize exceptions in imagemagick
- patch -p1 -i ../digikam-opencv-4.2.patch # Fix build with opencv 4.2
-}
-
-build() {
- cd build
-
- cmake ../$pkgname-$_pkgver \
- -DBUILD_TESTING=OFF \
- -DENABLE_KFILEMETADATASUPPORT=ON \
- -DENABLE_MEDIAPLAYER=ON \
- -DENABLE_AKONADICONTACTSUPPORT=ON \
- -DENABLE_MYSQLSUPPORT=ON \
- -DENABLE_APPSTYLES=ON \
- -DENABLE_QWEBENGINE=ON \
- -DOpenGL_GL_PREFERENCE=GLVND
- make
-}
-
-package() {
- cd build
- make DESTDIR="$pkgdir" install
-}
Copied: digikam/repos/extra-x86_64/PKGBUILD (from rev 375130, digikam/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-02-09 18:04:31 UTC (rev 375131)
@@ -0,0 +1,57 @@
+# $Id: PKGBUILD 320127 2018-03-24 09:48:28Z arojas $
+# Maintainer: Ronald van Haren <ronald at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgname=digikam
+_pkgver=6.4.0
+pkgver=${_pkgver//-/_} # for beta versions
+pkgrel=7
+pkgdesc="An advanced digital photo management application"
+arch=(x86_64)
+license=(GPL)
+url="https://www.digikam.org/"
+depends=(lensfun opencv akonadi-contacts knotifyconfig libksane kfilemetadata qtav marble-common threadweaver kcalendarcore
+ qt5-xmlpatterns imagemagick glu)
+makedepends=(extra-cmake-modules doxygen eigen boost kdoctools libkvkontakte)
+optdepends=('hugin: panorama tool' 'qt5-imageformats: support for additional image formats (WEBP, TIFF)'
+ 'libkvkontakte: VKontakte plugin'
+ 'rawtherapee: RAW import' 'darktable: RAW import'
+ 'perl: for digitaglinktree')
+source=("https://download.kde.org/stable/$pkgname/$_pkgver/$pkgname-$_pkgver.tar.xz"{,.sig}
+ initialize-imagemagick.patch::"https://cgit.kde.org/digikam.git/patch/?id=76ff65ae"
+ digikam-opencv-4.2.patch)
+sha256sums=('775012ff515bdd25a0b894c95bf5d33e7122b523da9c0f3af260ec3eff498d6f'
+ 'SKIP'
+ 'c559882c0df2243c5a5baab3373bda4084fb9a1d54959770b8846fe026eaf360'
+ 'fcd9a18dee3b4d009ec7256207d1b6645d2e2aa918b5cf9f9dc9b44db41f6a7b')
+validpgpkeys=(D1CF2444A7858C5F2FB095B74A77747BC2386E50) # digiKam.org (digiKam project) <digikamdeveloper at gmail.com>
+
+prepare() {
+ mkdir -p build
+
+ cd $pkgname-$pkgver
+ patch -p1 -i ../initialize-imagemagick.patch # Properly initialize exceptions in imagemagick
+ patch -p1 -i ../digikam-opencv-4.2.patch # Fix build with opencv 4.2
+}
+
+build() {
+ cd build
+
+ cmake ../$pkgname-$_pkgver \
+ -DBUILD_TESTING=OFF \
+ -DENABLE_KFILEMETADATASUPPORT=ON \
+ -DENABLE_MEDIAPLAYER=ON \
+ -DENABLE_AKONADICONTACTSUPPORT=ON \
+ -DENABLE_MYSQLSUPPORT=ON \
+ -DENABLE_APPSTYLES=ON \
+ -DENABLE_QWEBENGINE=ON \
+ -DOpenGL_GL_PREFERENCE=GLVND
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
Deleted: digikam-opencv-4.2.patch
===================================================================
--- digikam-opencv-4.2.patch 2020-02-09 18:03:48 UTC (rev 375130)
+++ digikam-opencv-4.2.patch 2020-02-09 18:04:31 UTC (rev 375131)
@@ -1,35 +0,0 @@
-diff --git a/core/libs/facesengine/detection/opencvfacedetector.cpp b/core/libs/facesengine/detection/opencvfacedetector.cpp
-index 46a56bb2f3..178d31f093 100644
---- a/core/libs/facesengine/detection/opencvfacedetector.cpp
-+++ b/core/libs/facesengine/detection/opencvfacedetector.cpp
-@@ -166,7 +166,7 @@ public:
- * of the region of interest of this cascade (still relative to whole image).
- * For frontal face cascades, returns the given parameter unchanged.
- */
-- cv::Rect faceROI(const CvRect& faceRect) const
-+ cv::Rect faceROI(const cv::Rect faceRect) const
- {
- return cv::Rect(lround(faceRect.x + roi.x() * faceRect.width),
- lround(faceRect.y + roi.y() * faceRect.height),
-diff --git a/core/libs/facesengine/recognition/dlib-dnn/dnnface/dnn_base/cv_image.h b/core/libs/facesengine/recognition/dlib-dnn/dnnface/dnn_base/cv_image.h
-index 370aca14d6..1baf33c2bf 100644
---- a/core/libs/facesengine/recognition/dlib-dnn/dnnface/dnn_base/cv_image.h
-+++ b/core/libs/facesengine/recognition/dlib-dnn/dnnface/dnn_base/cv_image.h
-@@ -52,7 +52,7 @@ public:
- << "\n\t img.channels(): " << img.channels()
- << "\n\t img.pixel_traits<pixel_type>::num: " << pixel_traits<pixel_type>::num
- );
-- IplImage temp = img;
-+ IplImage temp = cvIplImage(img);
- init(&temp);
- }
-
-@@ -125,7 +125,7 @@ public:
-
- cv_image& operator=( const cv::Mat img)
- {
-- IplImage temp = img;
-+ IplImage temp = cvIplImage(img);
- init(&temp);
- return *this;
- }
Copied: digikam/repos/extra-x86_64/digikam-opencv-4.2.patch (from rev 375130, digikam/trunk/digikam-opencv-4.2.patch)
===================================================================
--- digikam-opencv-4.2.patch (rev 0)
+++ digikam-opencv-4.2.patch 2020-02-09 18:04:31 UTC (rev 375131)
@@ -0,0 +1,35 @@
+diff --git a/core/libs/facesengine/detection/opencvfacedetector.cpp b/core/libs/facesengine/detection/opencvfacedetector.cpp
+index 46a56bb2f3..178d31f093 100644
+--- a/core/libs/facesengine/detection/opencvfacedetector.cpp
++++ b/core/libs/facesengine/detection/opencvfacedetector.cpp
+@@ -166,7 +166,7 @@ public:
+ * of the region of interest of this cascade (still relative to whole image).
+ * For frontal face cascades, returns the given parameter unchanged.
+ */
+- cv::Rect faceROI(const CvRect& faceRect) const
++ cv::Rect faceROI(const cv::Rect faceRect) const
+ {
+ return cv::Rect(lround(faceRect.x + roi.x() * faceRect.width),
+ lround(faceRect.y + roi.y() * faceRect.height),
+diff --git a/core/libs/facesengine/recognition/dlib-dnn/dnnface/dnn_base/cv_image.h b/core/libs/facesengine/recognition/dlib-dnn/dnnface/dnn_base/cv_image.h
+index 370aca14d6..1baf33c2bf 100644
+--- a/core/libs/facesengine/recognition/dlib-dnn/dnnface/dnn_base/cv_image.h
++++ b/core/libs/facesengine/recognition/dlib-dnn/dnnface/dnn_base/cv_image.h
+@@ -52,7 +52,7 @@ public:
+ << "\n\t img.channels(): " << img.channels()
+ << "\n\t img.pixel_traits<pixel_type>::num: " << pixel_traits<pixel_type>::num
+ );
+- IplImage temp = img;
++ IplImage temp = cvIplImage(img);
+ init(&temp);
+ }
+
+@@ -125,7 +125,7 @@ public:
+
+ cv_image& operator=( const cv::Mat img)
+ {
+- IplImage temp = img;
++ IplImage temp = cvIplImage(img);
+ init(&temp);
+ return *this;
+ }
More information about the arch-commits
mailing list