diff options
| -rw-r--r-- | user/digikam/APKBUILD (renamed from legacy/digikam/APKBUILD) | 20 | ||||
| -rw-r--r-- | user/digikam/digikam6.patch (renamed from legacy/digikam/digikam6.patch) | 0 | ||||
| -rw-r--r-- | user/digikam/opencv42.patch | 11 |
3 files changed, 22 insertions, 9 deletions
diff --git a/legacy/digikam/APKBUILD b/user/digikam/APKBUILD index 3cdf9c377..7d512cb13 100644 --- a/legacy/digikam/APKBUILD +++ b/user/digikam/APKBUILD @@ -1,29 +1,30 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=digikam -pkgver=5.9.0 +pkgver=6.4.0 pkgrel=0 pkgdesc="Professional photo management and digital camera import" url="https://www.digikam.org/" arch="all" -options="!check" # Test suite doesn't support our version of Boost +options="!check" # No test suite. license="GPL-2.0-only" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtxmlpatterns-dev qt5-qtsvg-dev kconfig-dev kwindowsystem-dev kxmlgui-dev ki18n-dev karchive-dev kio-dev qt5-qtwebkit-dev kcoreaddons-dev kservice-dev solid-dev kiconthemes-dev kfilemetadata-dev threadweaver-dev libpng-dev - knotifyconfig-dev knotifications-dev akonadi-contacts-dev kcalcore-dev + knotifyconfig-dev knotifications-dev akonadi-contacts-dev x265-dev libjpeg-turbo-dev tiff-dev zlib-dev boost-dev lcms2-dev expat-dev exiv2-dev flex bison libxml2-dev libxslt-dev eigen-dev libgphoto2-dev libksane-dev libkipi-dev glu-dev qt5-qtx11extras-dev jasper-dev - opencv opencv-dev" + opencv opencv-dev imagemagick-dev kcalendarcore-dev marble-dev" # YES, both are needed. opencv-dev only pulls in -libs; CMake module in opencv subpackages="$pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/digikam/digikam-$pkgver.tar.xz" +source="https://download.kde.org/stable/digikam/$pkgver/digikam-$pkgver.tar.xz + opencv42.patch + " build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi @@ -35,17 +36,18 @@ build() { -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DENABLE_APPSTYLES=ON \ + -DENABLE_FACESENGINE_DNN=OFF \ -DENABLE_MYSQLSUPPORT=OFF \ -DEIGEN3_INCLUDE_DIR=/usr/include/eigen3 \ -DENABLE_OPENCV3=ON \ -DBUILD_TESTING=OFF \ - ${CMAKE_CROSSOPTS} + ${CMAKE_CROSSOPTS} . make } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="f6134a957dcd11343e34f0bc90f5560a28ed205c47d2ffd76a5418a4c63f76706045e9179c47f1448304b59081051b524f7a6847c3c1dcee4673047ce5d90e63 digikam-5.9.0.tar.xz" +sha512sums="b3b5e9903538d110613aa872c9215f5e7c19f7520a2b9060c24e686f20f72075378b447239dd3e17cb8860cdd35c699399994199b848757f0497ad25a7805e42 digikam-6.4.0.tar.xz +55b61bd67a25a4a1ec149205fd66c234a283a57f80c0070f95f085ae5e8f6cf5b9b5ed0a85a427ef58bd0f471d784555293b7fc61cf98eeb2ab84789da1979b1 opencv42.patch" diff --git a/legacy/digikam/digikam6.patch b/user/digikam/digikam6.patch index 58c0f0d28..58c0f0d28 100644 --- a/legacy/digikam/digikam6.patch +++ b/user/digikam/digikam6.patch diff --git a/user/digikam/opencv42.patch b/user/digikam/opencv42.patch new file mode 100644 index 000000000..d4d80a85f --- /dev/null +++ b/user/digikam/opencv42.patch @@ -0,0 +1,11 @@ +--- digikam-6.4.0/core/libs/facesengine/detection/opencvfacedetector.cpp.old 2019-11-03 09:04:00.000000000 +0000 ++++ digikam-6.4.0/core/libs/facesengine/detection/opencvfacedetector.cpp 2020-02-08 12:43:42.707340488 +0000 +@@ -166,7 +166,7 @@ + * 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), |