From 5241e4795e606500ea304b643fee8c9f5fffb4733ccbaeeafdd4d3a2080d30dd Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 27 Jul 2020 15:38:45 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/digikam revision 190.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/digikam?expand=0&rev=5d08c952c7032ce460c61257821fed1e --- ...tection-of-OpenGL-for-GLES-platforms.patch | 35 --------- ...now-released-with-exported-targets-u.patch | 54 ++++++------- Fix-build-with-Qt-5.15.patch | 42 ---------- digikam-6.4.0.tar.xz | 3 - digikam-7.0.0.tar.xz | 3 + digikam.changes | 77 +++++++++++++++++++ digikam.spec | 56 +++++--------- ...o-work-with-latest-version-of-OpenCV.patch | 26 ------- fix-build-with-opencv-4.2.patch | 26 ------- 9 files changed, 127 insertions(+), 195 deletions(-) delete mode 100644 0001-Disable-detection-of-OpenGL-for-GLES-platforms.patch delete mode 100644 Fix-build-with-Qt-5.15.patch delete mode 100644 digikam-6.4.0.tar.xz create mode 100644 digikam-7.0.0.tar.xz delete mode 100644 dlib-update-to-work-with-latest-version-of-OpenCV.patch delete mode 100644 fix-build-with-opencv-4.2.patch diff --git a/0001-Disable-detection-of-OpenGL-for-GLES-platforms.patch b/0001-Disable-detection-of-OpenGL-for-GLES-platforms.patch deleted file mode 100644 index 83d75c4..0000000 --- a/0001-Disable-detection-of-OpenGL-for-GLES-platforms.patch +++ /dev/null @@ -1,35 +0,0 @@ -From ebce81931d04aefea31795cb4df3f552ba6d3f38 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20Br=C3=BCns?= -Date: Sun, 20 Aug 2017 16:49:50 +0200 -Subject: [PATCH] Disable detection of OpenGL (for GLES platforms) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -On embedded platforms, Qt5 is typically build using GLES. Unfortunately, -the OpenGL code in the presentation module uses the old desktop OpenGL -immediate mode style and thus fails to compile on GLES platforms. - -Workaround for bug kde#383715 - -Signed-off-by: Stefan Brüns ---- - core/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt -index cd482ea..bc3772b 100644 ---- a/core/CMakeLists.txt -+++ b/core/CMakeLists.txt -@@ -323,7 +323,7 @@ find_package(Marble) - find_package(PkgConfig) - find_package(Jasper) # For JPEG 2000 support. - find_package(Eigen3) # For Refocus tool. --find_package(OpenGL) # For Presentation tool. -+# find_package(OpenGL) # For Presentation tool. - - find_package(ImageMagick COMPONENTS Magick++ MagickCore) - --- -2.14.0 - diff --git a/0001-Revert-Exiv2-is-now-released-with-exported-targets-u.patch b/0001-Revert-Exiv2-is-now-released-with-exported-targets-u.patch index a8295d1..0033d78 100644 --- a/0001-Revert-Exiv2-is-now-released-with-exported-targets-u.patch +++ b/0001-Revert-Exiv2-is-now-released-with-exported-targets-u.patch @@ -22,18 +22,18 @@ diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index e31e267772..d14364dc1e 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt -@@ -56,7 +56,7 @@ set(ECM_MIN_VERSION "1.7.0") - set(KF5_MIN_VERSION "5.1.0") - set(QT_MIN_VERSION "5.6.0") - set(LENSFUN_MIN_VERSION "0.2.6.0") +@@ -16,7 +16,7 @@ message(STATUS "") + + set(KF5_MIN_VERSION "5.5.0") + set(QT_MIN_VERSION "5.9.0") -set(EXIV2_MIN_VERSION "0.27.0") +set(EXIV2_MIN_VERSION "0.26") - set(OPENCV_MIN_VERSION "3.1.0") - set(QTAV_MIN_VERSION "1.12.0") - set(KSANE_MIN_VERSION "5.0.0") # For digital scanner support. -@@ -248,9 +248,9 @@ find_package(EXPAT) # For DNGWriter: XMP SDK need Expat library to compile. - find_package(Threads) # For DNGWriter and LibRaw which needs native threads support. - find_package(X265) # For HEIF encoding support. + set(OPENCV_MIN_VERSION "3.3.0") + set(LENSFUN_MIN_VERSION "0.2.6.0") # For Lens auto-correction plugin + set(QTAV_MIN_VERSION "1.12.0") # For video support. +@@ -178,9 +178,9 @@ if(NOT X265_FOUND) + set(X265_LIBRARIES "") + endif() -find_package(exiv2 REQUIRED) +find_package(Exiv2 ${EXIV2_MIN_VERSION} REQUIRED) @@ -41,9 +41,9 @@ index e31e267772..d14364dc1e 100644 -set_package_properties("exiv2" PROPERTIES +set_package_properties("Exiv2" PROPERTIES DESCRIPTION "Required to build digiKam" - URL "http://www.exiv2.org" + URL "https://www.exiv2.org" TYPE RECOMMENDED -@@ -257,10 +257,6 @@ set_package_properties("Exiv2" PROPERTIES +@@ -187,10 +187,6 @@ set_package_properties("Exiv2" PROPERTIES PURPOSE "Library to manage image metadata" ) @@ -53,17 +53,17 @@ index e31e267772..d14364dc1e 100644 - # -- check Media player -------------------------------------------------------- - find_package(FFmpeg COMPONENTS AVCODEC AVFILTER AVFORMAT AVUTIL SWSCALE) -@@ -585,7 +585,7 @@ PRINT_COMPONENT_COMPILE_STATUS("FacesEngine DNN Support" ENABLE_FACESENGINE_DNN) + find_package(FFmpeg COMPONENTS AVCODEC AVDEVICE AVFILTER AVFORMAT AVUTIL SWSCALE) +@@ -535,7 +531,7 @@ PRINT_COMPONENT_COMPILE_STATUS("QWebEngine Support" ENABLE_QWEBENGINE) # ============================================================================== - PRINT_LIBRARY_STATUS("libboostgraph" "http://www.boost.org/doc/libs" "(version >= 1.43.0)" Boost_FOUND) --PRINT_LIBRARY_STATUS("libexiv2" "http://www.exiv2.org" "(version >= ${EXIV2_MIN_VERSION}" exiv2_FOUND) -+PRINT_LIBRARY_STATUS("libexiv2" "http://www.exiv2.org" "(version >= ${EXIV2_MIN_VERSION}" Exiv2_FOUND) - PRINT_LIBRARY_STATUS("libexpat" "http://expat.sourceforge.net" "(version >= 2.0.0)" EXPAT_FOUND) - PRINT_LIBRARY_STATUS("libjpeg" "http://www.ijg.org" "(version >= 6b)" JPEG_FOUND) - PRINT_LIBRARY_STATUS("libkde" "http://www.kde.org" "(version >= ${KF5_MIN_VERSION})" KF5_FOUND) -@@ -627,7 +627,7 @@ PRINT_OPTIONAL_LIBRARY_STATUS("OpenGL" "https://www.mesa3d.org" + PRINT_LIBRARY_STATUS("libboostgraph" "https://www.boost.org/doc/libs" "(version >= 1.43.0)" Boost_FOUND) +-PRINT_LIBRARY_STATUS("libexiv2" "https://www.exiv2.org" "(version >= ${EXIV2_MIN_VERSION}" exiv2_FOUND) ++PRINT_LIBRARY_STATUS("libexiv2" "https://www.exiv2.org" "(version >= ${EXIV2_MIN_VERSION}" Exiv2_FOUND) + PRINT_LIBRARY_STATUS("libexpat" "https://libexpat.github.io" "(version >= 2.0.0)" EXPAT_FOUND) + PRINT_LIBRARY_STATUS("libjpeg" "https://github.com/libjpeg-turbo/libjpeg-turbo" "(version >= 6b)" JPEG_FOUND) + PRINT_LIBRARY_STATUS("libkde" "https://www.kde.org" "(version >= ${KF5_MIN_VERSION})" KF5_FOUND) +@@ -576,7 +572,7 @@ PRINT_OPTIONAL_LIBRARY_STATUS("OpenGL" "https://www.mesa3d.org" # ============================================================================== if(Boost_FOUND AND @@ -76,7 +76,7 @@ diff --git a/core/app/DigikamCoreTarget.cmake b/core/app/DigikamCoreTarget.cmake index 72b424cb36..7aa6dc5a1e 100644 --- a/core/app/DigikamCoreTarget.cmake +++ b/core/app/DigikamCoreTarget.cmake -@@ -116,7 +116,7 @@ target_link_libraries(digikamcore +@@ -143,7 +143,7 @@ target_link_libraries(digikamcore ${TIFF_LIBRARIES} PNG::PNG ${JPEG_LIBRARIES} @@ -211,7 +211,7 @@ diff --git a/core/libs/metadataengine/CMakeLists.txt b/core/libs/metadataengine/ index 64754c882c..da6fac050a 100644 --- a/core/libs/metadataengine/CMakeLists.txt +++ b/core/libs/metadataengine/CMakeLists.txt -@@ -7,14 +7,13 @@ +@@ -9,16 +9,15 @@ kde_enable_exceptions() @@ -224,12 +224,14 @@ index 64754c882c..da6fac050a 100644 + add_definitions( -DEXV_HAVE_DLL ) endif() + # Exiv2 version < 0.28 use auto_ptr instead unique_ptr which is deprecated. + -if("${exiv2_VERSION}" VERSION_LESS "0.27.99") +if("${EXIV2_VERSION}" VERSION_LESS "0.27.99") - # Exiv2 version < 0.28 use auto_ptr instead unique_ptr which is deprecated. DISABLE_GCC_COMPILER_WARNINGS("5.99.99" "-Wno-deprecated") -@@ -64,13 +63,12 @@ set(libdmetadata_SRCS + +@@ -72,13 +71,12 @@ set(libdmetadata_SRCS ) include_directories( @@ -243,7 +245,7 @@ index 64754c882c..da6fac050a 100644 - $ ) - add_library(dmetadata_src OBJECT ${libdmetadata_SRCS}) + # Used by digikamcore -- 2.16.4 diff --git a/Fix-build-with-Qt-5.15.patch b/Fix-build-with-Qt-5.15.patch deleted file mode 100644 index e9da9e8..0000000 --- a/Fix-build-with-Qt-5.15.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 9ef1670e7ea0852cdfb694dd4d839977305bd4a2 Mon Sep 17 00:00:00 2001 -From: Gilles Caulier -Date: Wed, 20 May 2020 13:05:55 +0200 -Subject: fix broken compilation with Qt 5.15 CCBUGS: 421817 - -diff --git a/core/libs/dimg/filters/levels/histogrampainter.cpp b/core/libs/dimg/filters/levels/histogrampainter.cpp -index 241d5fc..f11ad4b 100644 ---- a/core/libs/dimg/filters/levels/histogrampainter.cpp -+++ b/core/libs/dimg/filters/levels/histogrampainter.cpp -@@ -30,6 +30,7 @@ - // Qt includes - - #include -+#include - - // KDE includes - -diff --git a/core/libs/dimg/filters/curves/curveswidget.cpp b/core/libs/dimg/filters/curves/curveswidget.cpp -index cccccbd..e8b2e1b 100644 ---- a/core/libs/dimg/filters/curves/curveswidget.cpp -+++ b/core/libs/dimg/filters/curves/curveswidget.cpp -@@ -42,6 +42,7 @@ - #include - #include - #include -+#include - - // KDE includes - -diff --git a/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp b/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp -index b376994..4d4dbfb 100644 ---- a/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp -+++ b/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp -@@ -44,6 +44,8 @@ - #include - #include - #include -+#include -+#include - #include - #include - #include diff --git a/digikam-6.4.0.tar.xz b/digikam-6.4.0.tar.xz deleted file mode 100644 index 6e1fbd9..0000000 --- a/digikam-6.4.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:775012ff515bdd25a0b894c95bf5d33e7122b523da9c0f3af260ec3eff498d6f -size 340146992 diff --git a/digikam-7.0.0.tar.xz b/digikam-7.0.0.tar.xz new file mode 100644 index 0000000..7f64f0f --- /dev/null +++ b/digikam-7.0.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc0718e30031e692d7f05367b44e797fed61f12d27063641b6a5cf4d8b26e911 +size 571511148 diff --git a/digikam.changes b/digikam.changes index e1f9630..f7a10f7 100644 --- a/digikam.changes +++ b/digikam.changes @@ -1,3 +1,80 @@ +------------------------------------------------------------------- +Sat Jul 25 06:33:55 UTC 2020 - Wolfgang Bauer + +- Update to 7.0.0 + * https://www.digikam.org/news/2020-07-19-7.0.0_release_announcement/ +- New features (from NEWS): +FaceManagement: New Neural Network engine based on OpenCV Deep + Learning module to detect and recognize faces. +FaceManagement: Face Scan dialog contents is now simplified and + embeded into left side-bar tab. +SlideShow : Add new shuffle mode. +HTMLGallery : Add new theme "Html5Responsive". +General : Code compile with Qt5.15 framework. +General : All bundles have switched to last Qt 5.14.2 LTS. + Linux and MacOS use QtWebEngine instead QtWebKit. +General : All bundles have switched to last KF5 5.70.0. + Fix support for Gimp XCF files >= 2.10. +General : New FlatPak bundle processed by the KDE continuous + integration stream. +General : New Plugin ImageMosaicWall to create an image based + on a bunch of other photos. +General : Add Microsoft Visual C++ support and a Continuous + Integration workflow to check code with this + compiler. +General : Table-view is now able to show digiKam Tag-Paths + properties. +Metadata : Add option to write geolocation information in file + metadata. +Metadata : Add color label support for advanced metadata + settings. +Metadata : Add Exif, Iptc, and Xmp read support for HEIF + images. +General : Improved support for UNC network paths under + Windows. +General : Improved support for Unicode paths under Windows. +General : Internal libheif updated to last stable 1.6.2 and + internal libde265 updated to last stable 1.0.5. +General : Internal libraw updated to 0.20-RC2 + (https://www.libraw.org/news/libraw-0-20-rc2 ). + New camera supported: + Canon CR3, PowerShot G5 X Mark II, + G7 X Mark III, SX70 HS, EOS R, EOS RP, EOS 90D, + EOS 250D, EOS M6 Mark II, EOS M50, EOS M200, + EOS 1DX Mark III (lossless files only) + DJI Mavic Air, Air2, Osmo Action, + FujiFilm Fujifilm compressed/16bit, GFX 100, + X-A7, X-Pro3, X100V, X-T4, X-T200, + GoPro Fusion, HERO5, HERO6, HERO7, HERO8, + Hasselblad L1D-20c, X1D II 50C, + Leica D-LUX7, Q-P, Q2, V-LUX5, C-Lux / CAM-DC25, + SL2, M10 Monochrom, + Nikon D780, Z50, P950, + Olympus TG-6, E-M5 Mark III, E-PL10, E-M1 Mark III, + Panasonic Panasonic 14-bit, DC-FZ1000 II, DC-G90, + DC-S1, DC-S1R, DC-S1H, DC-TZ95, + PhaseOne IQ4 150MP, + Rapsberry Pi RAW+JPEG format, + Ricoh GR III, + Sony A7R IV, A9 II, ILCE-6100, ILCE-6600, RX0 II, + RX100 VII, + Zenit M, + also multiple modern smartphones. + +- 761 bugs fixed +- Drop patches merged upstream: + * fix-build-with-opencv-4.2.patch + * dlib-update-to-work-with-latest-version-of-OpenCV.patch + * Fix-build-with-Qt-5.15.patch +- Drop 0001-Disable-detection-of-OpenGL-for-GLES-platforms.patch, + no longer necessary +- Refresh patch: + * 0001-Revert-Exiv2-is-now-released-with-exported-targets-u.patch +- Re-enable Faces engine DNN on ppc64le, it builds fine now +- Switch back to old face detection engine when building with + opencv 3.3 (Leap 15.1/15.2), as the compilation fails otherwise +- Drop conditionals for no longer supported openSUSE versions + ------------------------------------------------------------------- Wed Jul 22 12:44:20 UTC 2020 - Guillaume GARDET diff --git a/digikam.spec b/digikam.spec index f9c8d39..e9d568e 100644 --- a/digikam.spec +++ b/digikam.spec @@ -16,25 +16,18 @@ # -%define soversion 6 +%define soversion 7 %bcond_without lang Name: digikam -Version: 6.4.0 +Version: 7.0.0 Release: 0 Summary: A KDE Photo Manager License: GPL-2.0-or-later Group: Productivity/Graphics/Viewers URL: https://www.digikam.org/ Source0: https://download.kde.org/stable/%{name}/%{version}/%{name}-%{version}.tar.xz -# PATCH-FIX-OPENSUSE 0001-Disable-detection-of-OpenGL-for-GLES-platforms.patch -- The OpenGL slideshow depends on Desktop GL, see kde#383715 -Patch0: 0001-Disable-detection-of-OpenGL-for-GLES-platforms.patch # PATCH-FIX-OPENSUSE -- Lower minimum exiv2 version to 0.26 -Patch1: 0001-Revert-Exiv2-is-now-released-with-exported-targets-u.patch -# PATCH-FIX-UPSTREAM -Patch2: fix-build-with-opencv-4.2.patch -Patch3: dlib-update-to-work-with-latest-version-of-OpenCV.patch -# PATCH-FIX-UPSTREAM -Patch4: Fix-build-with-Qt-5.15.patch +Patch0: 0001-Revert-Exiv2-is-now-released-with-exported-targets-u.patch BuildRequires: QtAV-devel >= 1.12 BuildRequires: bison BuildRequires: boost-devel @@ -72,11 +65,11 @@ BuildRequires: marble-devel BuildRequires: opencv-devel BuildRequires: pkgconfig BuildRequires: solid-devel -BuildRequires: threadweaver-devel >= 5.1.0 +BuildRequires: threadweaver-devel >= 5.5.0 BuildRequires: update-desktop-files BuildRequires: cmake(KF5CalendarCore) BuildRequires: cmake(Qt5Concurrent) -BuildRequires: cmake(Qt5Core) >= 5.6.0 +BuildRequires: cmake(Qt5Core) >= 5.9.0 BuildRequires: cmake(Qt5DBus) BuildRequires: cmake(Qt5Gui) BuildRequires: cmake(Qt5Network) @@ -90,6 +83,7 @@ BuildRequires: cmake(Qt5Xml) BuildRequires: cmake(Qt5XmlPatterns) BuildRequires: pkgconfig(Magick++) BuildRequires: pkgconfig(libavcodec) +BuildRequires: pkgconfig(libavdevice) BuildRequires: pkgconfig(libavfilter) BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) @@ -115,20 +109,13 @@ Obsoletes: digikam-libs < %{version} # Docs no longer included in 6.0.0 Provides: %{name}-doc = %{version} Obsoletes: %{name}-doc < %{version} -#This pulls in QWebEngine, which is not available on ppc64 +# QWebEngine is not available on ppc64 %ifarch %{ix86} x86_64 %{arm} aarch64 mips mips64 -%global qwebengine -DENABLE_QWEBENGINE:BOOL=ON BuildRequires: akonadi-contact-devel -BuildRequires: pkgconfig(Qt5WebEngineWidgets) +BuildRequires: cmake(Qt5WebEngineWidgets) %else -BuildRequires: pkgconfig(Qt5WebKitWidgets) -%endif -%ifarch ppc64le -%global facesengine -DENABLE_FACESENGINE_DNN:BOOL=OFF -%endif -%if 0%{?suse_version} < 1320 -# It does not build with the default compiler (GCC 4.8) on Leap 42.x -BuildRequires: gcc7-c++ +%global qwebengine -DENABLE_QWEBENGINE:BOOL=OFF +BuildRequires: cmake(Qt5WebKitWidgets) %endif %description @@ -176,17 +163,16 @@ The main digikam libraries that are being shared between showfoto and digikam %prep %setup -q -%ifarch %{arm} aarch64 -# Disable OpenGL slideshow on embedded platforms -%patch0 -p1 -%endif %if 0%{?suse_version} <= 1500 # Leap 15 only has exiv2 0.26 -%patch1 -p1 +%patch0 -p1 +%endif +%if %pkg_vcmp opencv-devel < 3.4.0 +# Option to switch between DNN or HAAR face detection. +# DNN is the default one, Haar is the legacy deprecated method. +# DNN fails to build with openCV 3.3 though (needs 3.4 at least), so disable it... +sed -i 's/set(DNN_DETECTION TRUE)/set(DNN_DETECTION FALSE)/' core/libs/facesengine/CMakeLists.txt %endif -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 # Remove build time references so build-compare can do its work FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') @@ -196,12 +182,7 @@ sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/g" core/libs/dimg/filters/greycstoration/ sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/g" core/libs/dimg/filters/greycstoration/cimg/CImg.h %build -%if 0%{?suse_version} < 1320 -# gcc 4.8.5 is too old -export CC=gcc-7 -export CXX=g++-7 -%endif -%cmake_kf5 -d build -- -DENABLE_APPSTYLES=ON -DENABLE_MEDIAPLAYER=ON %{?qwebengine} %{?facesengine} +%cmake_kf5 -d build -- -DENABLE_APPSTYLES=ON -DENABLE_MEDIAPLAYER=ON %{?qwebengine} %make_jobs VERBOSE=1 %install @@ -249,6 +230,7 @@ export CXX=g++-7 %{_kf5_cmakedir}/DigikamCore/ %{_kf5_cmakedir}/DigikamDatabase/ %{_kf5_cmakedir}/DigikamGui/ +%{_kf5_cmakedir}/DigikamPlugin/ %{_kf5_libdir}/libdigikamcore.so %{_kf5_libdir}/libdigikamdatabase.so %{_kf5_libdir}/libdigikamgui.so diff --git a/dlib-update-to-work-with-latest-version-of-OpenCV.patch b/dlib-update-to-work-with-latest-version-of-OpenCV.patch deleted file mode 100644 index c236758..0000000 --- a/dlib-update-to-work-with-latest-version-of-OpenCV.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 34dc7303045877226ebdd6cd07ce6384c0881eb8 Mon Sep 17 00:00:00 2001 -From: Davis King -Date: Sun, 22 Dec 2019 07:52:08 -0500 -Subject: [PATCH] Fix opencv version check to work on all opencv versions - -Index: digikam-6.4.0/core/libs/facesengine/recognition/dlib-dnn/dnnface/dnn_base/cv_image.h -=================================================================== ---- digikam-6.4.0.orig/core/libs/facesengine/recognition/dlib-dnn/dnnface/dnn_base/cv_image.h -+++ digikam-6.4.0/core/libs/facesengine/recognition/dlib-dnn/dnnface/dnn_base/cv_image.h -@@ -52,7 +52,16 @@ public: - << "\n\t img.channels(): " << img.channels() - << "\n\t img.pixel_traits::num: " << pixel_traits::num - ); -+// Note, do NOT use CV_VERSION_MAJOR because in OpenCV 2 CV_VERSION_MAJOR actually held -+// CV_VERSION_MINOR and instead they used CV_VERSION_EPOCH. So for example, in OpenCV -+// 2.4.9.1 CV_VERSION_MAJOR==4 and CV_VERSION_EPOCH==2. However, CV_MAJOR_VERSION has always -+// (seemingly) held the actual major version number, so we use that to test for the OpenCV major -+// version. -+#if CV_MAJOR_VERSION > 3 -+ IplImage temp = cvIplImage(img); -+#else - IplImage temp = img; -+#endif - init(&temp); - } - diff --git a/fix-build-with-opencv-4.2.patch b/fix-build-with-opencv-4.2.patch deleted file mode 100644 index 039ffe2..0000000 --- a/fix-build-with-opencv-4.2.patch +++ /dev/null @@ -1,26 +0,0 @@ -From cff33fbc9c7c69f92be990cef0f19e63ac1f7654 Mon Sep 17 00:00:00 2001 -From: Antonio Rojas -Date: Sat, 21 Dec 2019 14:46:46 +0100 -Subject: [PATCH] Fix build with opencv 4.2 - -Port away from old API which is removed in 4.2 - -Differential Revision: https://phabricator.kde.org/D26143 ---- - .../facesengine/detection/opencv-face/opencvfacedetector_p.cpp | 2 +- - .../facesengine/detection/opencv-face/opencvfacedetector_p.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -Index: digikam-6.4.0/core/libs/facesengine/detection/opencvfacedetector.cpp -=================================================================== ---- digikam-6.4.0.orig/core/libs/facesengine/detection/opencvfacedetector.cpp -+++ digikam-6.4.0/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),