Hello community, here is the log from the commit of package digikam for openSUSE:Factory checked in at 2020-07-27 17:38:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/digikam (Old) and /work/SRC/openSUSE:Factory/.digikam.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "digikam" Mon Jul 27 17:38:45 2020 rev:190 rq:822749 version:7.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/digikam/digikam.changes 2020-07-24 10:03:44.581846775 +0200 +++ /work/SRC/openSUSE:Factory/.digikam.new.3592/digikam.changes 2020-07-27 17:39:23.810943297 +0200 @@ -1,0 +2,77 @@ +Sat Jul 25 06:33:55 UTC 2020 - Wolfgang Bauer <wba...@tmo.at> + +- 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 + +------------------------------------------------------------------- Old: ---- 0001-Disable-detection-of-OpenGL-for-GLES-platforms.patch Fix-build-with-Qt-5.15.patch digikam-6.4.0.tar.xz dlib-update-to-work-with-latest-version-of-OpenCV.patch fix-build-with-opencv-4.2.patch New: ---- digikam-7.0.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ digikam.spec ++++++ --- /var/tmp/diff_new_pack.ApWbOB/_old 2020-07-27 17:39:26.146945490 +0200 +++ /var/tmp/diff_new_pack.ApWbOB/_new 2020-07-27 17:39:26.146945490 +0200 @@ -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: 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(Qt5XmlPatterns) BuildRequires: pkgconfig(Magick++) BuildRequires: pkgconfig(libavcodec) +BuildRequires: pkgconfig(libavdevice) BuildRequires: pkgconfig(libavfilter) BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) @@ -115,20 +109,13 @@ # 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 @@ %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/__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 @@ %{_kf5_cmakedir}/DigikamCore/ %{_kf5_cmakedir}/DigikamDatabase/ %{_kf5_cmakedir}/DigikamGui/ +%{_kf5_cmakedir}/DigikamPlugin/ %{_kf5_libdir}/libdigikamcore.so %{_kf5_libdir}/libdigikamdatabase.so %{_kf5_libdir}/libdigikamgui.so ++++++ 0001-Revert-Exiv2-is-now-released-with-exported-targets-u.patch ++++++ --- /var/tmp/diff_new_pack.ApWbOB/_old 2020-07-27 17:39:26.162945505 +0200 +++ /var/tmp/diff_new_pack.ApWbOB/_new 2020-07-27 17:39:26.162945505 +0200 @@ -22,18 +22,18 @@ 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 @@ -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 @@ - # -- 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 @@ 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 @@ 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 @@ + 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 @@ - $<TARGET_PROPERTY:exiv2lib,INTERFACE_INCLUDE_DIRECTORIES> ) - add_library(dmetadata_src OBJECT ${libdmetadata_SRCS}) + # Used by digikamcore -- 2.16.4 ++++++ digikam-6.4.0.tar.xz -> digikam-7.0.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/digikam/digikam-6.4.0.tar.xz /work/SRC/openSUSE:Factory/.digikam.new.3592/digikam-7.0.0.tar.xz differ: char 13, line 1
