From d69399c7befdd98cda62d6a1788ae2aa7f104c5e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 7 Jan 2025 06:41:06 +0000 Subject: gentoo auto-resync : 07:01:2025 - 06:41:06 --- media-gfx/digikam/Manifest | 3 +- media-gfx/digikam/digikam-8.5.0-r1.ebuild | 134 +++++++++++++++++++++ media-gfx/digikam/digikam-8.5.0.ebuild | 133 -------------------- .../files/digikam-8.5.0-cmake-have_ksane.patch | 28 +++++ 4 files changed, 164 insertions(+), 134 deletions(-) create mode 100644 media-gfx/digikam/digikam-8.5.0-r1.ebuild delete mode 100644 media-gfx/digikam/digikam-8.5.0.ebuild create mode 100644 media-gfx/digikam/files/digikam-8.5.0-cmake-have_ksane.patch (limited to 'media-gfx/digikam') diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index 52b6ae0ace1b..f575e997c621 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -1,5 +1,6 @@ AUX digikam-8.3.0-cmake-addressbook.patch 1245 BLAKE2B 22365de2072c5ce5e2eac3bc1d7138e820166b977e5894f29addcdb00ae3329c47965b2b7930a4725b01789add63b4416083e6e358ca6ffb4a0d60f3e80ad52c SHA512 a872aed53811642407c98e20f423cf5381a117e96d4e95d309da6f116a13aa2584671ef20af3e1059c3ed7e09fec178fdb77e7afecde21077252bb2c8f116158 AUX digikam-8.4.0-cmake.patch 7429 BLAKE2B 20d79867086e390c2a571bae76f2023e4ec5f26bdc137f28be6ec8eff54ba2c5e84ec15191ceed83eb8e9415a522165f5931cf6d972e1537806cbb6d7e22bbf0 SHA512 fd38773ce49a31d3fcd0d477c5e180b42d1a2ea586b41534b7dd3d08653fea4020af30bce3b20ba14c4a2710cde3fecbd13fbe8fcfd33bdca6b82989cf431214 +AUX digikam-8.5.0-cmake-have_ksane.patch 2752 BLAKE2B acdff8fd6b634e636db42b0a266553192939f68184791d7023caeabc5bfed63bb705d601947039c38e250f2e817e44ec4bd541801043bb025f8cbd1039c040d3 SHA512 4a30f625f2d6ece1ed2b821524efbd189cbc8aa11495cd19020f5f1ed94692478677d3afd45a7e4a66cb788baa86ff79121f4ced7f0946763f458406054358f7 DIST digiKam-8.5.0.tar.xz 62028432 BLAKE2B ef061b73e72d9b2ad3da361fcdd3e27a4758b1ef837adde1a405cfbd759cc950d373464765f5ff07f36e8457c6c9c15550002e3ebd94215b154d2c51723192ee SHA512 5610f0173043e29a2b5ff62b2ed2c2bea79e10cd20a0c2416ebb425457cee55aa8b8d575ba57e8e188a899cc909516ea05e6c80e73e3316742cc9e8119855509 -EBUILD digikam-8.5.0.ebuild 4023 BLAKE2B 62b4839043995097c4bee151e69b056417aade9a50de9265de32051aa199203eb9bad9b208cb6043eb36b0d56549865a51cbca434cd553962f2961645bac6625 SHA512 cdf6b2b05b72ae2ebbbf1c27e3a6b1710abe297f3ad497e1b515a16c83666a008fb84c65ba337d59c46e686e66ee7eb84dd9c621ad48ea315cd3f7492defed7e +EBUILD digikam-8.5.0-r1.ebuild 4079 BLAKE2B 2fd808d054390c98e34cb1f59a7f2b3eff655323fcd9b4827792ae97473166792b565ff84efac0802ed02668ef32d08926a84c6ce96b950d91779ef35c6adb86 SHA512 23b10e38ec957640e064b8e54294e87630d6025402bac57d8026af13c28c43590ac80748b18266b589b0623397b2e0473b34170cee1b3d6c607c248194e3bb93 MISC metadata.xml 981 BLAKE2B 1c1494b9c7fd7207550ea214baafcab17aa12ecb93f08885dd7c873a15114d826341027b8a37e36138cf89d1ba1451c8fff247d9fde18c235bee062f3cda1ab9 SHA512 7f4602eafde8e22b18b7abc1a071eb27369d2ab7df01554253f142614577209828698b39614666fd6d4688ff44b3c1dc3d4820ec3398a6f8228710343ef65f85 diff --git a/media-gfx/digikam/digikam-8.5.0-r1.ebuild b/media-gfx/digikam/digikam-8.5.0-r1.ebuild new file mode 100644 index 000000000000..4c3b3f8ba5ce --- /dev/null +++ b/media-gfx/digikam/digikam-8.5.0-r1.ebuild @@ -0,0 +1,134 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KFMIN=6.3.0 +QTMIN=6.6.2 +inherit ecm kde.org toolchain-funcs + +DESCRIPTION="Digital photo management application" +HOMEPAGE="https://www.digikam.org/" +SRC_URI="mirror://kde/stable/${PN}/${PV}/digiKam-${PV/_/-}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm64" +IUSE="addressbook calendar geolocation gphoto2 heif +imagemagick jpegxl +lensfun mysql openmp +panorama scanner semantic-desktop spell video" + +# bug 366505 +RESTRICT="test" + +# slot op: Uses Qt::GuiPrivate for qtx11extras_p.h +COMMON_DEPEND=" + dev-libs/expat + >=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,-gles2-only,gui,mysql?,network,opengl,sql,widgets,X,xml] + >=dev-qt/qtnetworkauth-${QTMIN}:6 + >=dev-qt/qtscxml-${QTMIN}:6 + >=dev-qt/qtsvg-${QTMIN}:6 + >=dev-qt/qtwebengine-${QTMIN}:6[widgets] + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kiconthemes-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/knotifyconfig-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-frameworks/solid-${KFMIN}:6 + >=media-gfx/exiv2-0.27.1:=[xmp] + media-libs/lcms:2 + media-libs/libjpeg-turbo:= + media-libs/liblqr + media-libs/libpng:= + >=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d] + media-libs/tiff:= + virtual/opengl + x11-libs/libX11 + addressbook? ( + >=kde-apps/akonadi-contacts-24.05.2:6 + >=kde-frameworks/kcontacts-${KFMIN}:6 + ) + calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:6 ) + gphoto2? ( media-libs/libgphoto2:= ) + heif? ( + media-libs/libheif:= + media-libs/x265:= + ) + imagemagick? ( media-gfx/imagemagick:= ) + jpegxl? ( media-libs/libjxl:= ) + lensfun? ( media-libs/lensfun ) + panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:6 ) + scanner? ( >=kde-apps/libksane-24.05.2:6 ) + semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:6 ) + spell? ( >=kde-frameworks/sonnet-${KFMIN}:6 ) + video? ( >=dev-qt/qtmultimedia-${QTMIN}:6 ) +" +DEPEND="${COMMON_DEPEND} + dev-cpp/eigen:3 + dev-libs/boost + addressbook? ( >=kde-apps/akonadi-24.05.2:6 ) +" +RDEPEND="${COMMON_DEPEND} + !${CATEGORY}/${PN}:5 + media-libs/exiftool + mysql? ( virtual/mysql[server(+)] ) + panorama? ( media-gfx/hugin ) +" +BDEPEND=" + sys-devel/gettext + panorama? ( + app-alternatives/lex + app-alternatives/yacc + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-8.4.0-cmake.patch" + "${FILESDIR}/${PN}-8.3.0-cmake-addressbook.patch" + "${FILESDIR}/${P}-cmake-have_ksane.patch" # bug 947312 +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + ecm_pkg_pretend +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + ecm_pkg_setup +} + +# FIXME: Unbundle libraw (libs/rawengine/libraw) +# TODO: adding IUSE X requires upstreaming WITH_X11 option for libX11, +# see core/cmake/rules/RulesX11.cmake; only used in core/libs/dimg/filters/icc +src_configure() { + local mycmakeargs=( + -DBUILD_WITH_QT6=ON + -DBUILD_TESTING=OFF # bug 698192 + -DENABLE_APPSTYLES=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON + -DENABLE_SHOWFOTO=ON # built unconditionally so far, new option since 8.0 + -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook) + $(cmake_use_find_package calendar KF6CalendarCore) + -DENABLE_GEOLOCATION=$(usex geolocation) + $(cmake_use_find_package gphoto2 Gphoto2) + $(cmake_use_find_package heif Libheif) + $(cmake_use_find_package imagemagick ImageMagick) + $(cmake_use_find_package jpegxl Libjxl) + $(cmake_use_find_package lensfun LensFun) + -DENABLE_MYSQLSUPPORT=$(usex mysql) + -DENABLE_INTERNALMYSQL=$(usex mysql) + $(cmake_use_find_package panorama KF6ThreadWeaver) + $(cmake_use_find_package scanner KSaneWidgets6) + -DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop) + $(cmake_use_find_package spell KF6Sonnet) + -DENABLE_MEDIAPLAYER=$(usex video) + ) + + ecm_src_configure +} diff --git a/media-gfx/digikam/digikam-8.5.0.ebuild b/media-gfx/digikam/digikam-8.5.0.ebuild deleted file mode 100644 index 2b603c38c9a3..000000000000 --- a/media-gfx/digikam/digikam-8.5.0.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=6.3.0 -QTMIN=6.6.2 -inherit ecm kde.org toolchain-funcs - -DESCRIPTION="Digital photo management application" -HOMEPAGE="https://www.digikam.org/" -SRC_URI="mirror://kde/stable/${PN}/${PV}/digiKam-${PV/_/-}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm64" -IUSE="addressbook calendar geolocation gphoto2 heif +imagemagick jpegxl +lensfun mysql openmp +panorama scanner semantic-desktop spell video" - -# bug 366505 -RESTRICT="test" - -# slot op: Uses Qt::GuiPrivate for qtx11extras_p.h -COMMON_DEPEND=" - dev-libs/expat - >=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,-gles2-only,gui,mysql?,network,opengl,sql,widgets,X,xml] - >=dev-qt/qtnetworkauth-${QTMIN}:6 - >=dev-qt/qtscxml-${QTMIN}:6 - >=dev-qt/qtsvg-${QTMIN}:6 - >=dev-qt/qtwebengine-${QTMIN}:6[widgets] - >=kde-frameworks/kconfig-${KFMIN}:6 - >=kde-frameworks/kconfigwidgets-${KFMIN}:6 - >=kde-frameworks/kcoreaddons-${KFMIN}:6 - >=kde-frameworks/ki18n-${KFMIN}:6 - >=kde-frameworks/kiconthemes-${KFMIN}:6 - >=kde-frameworks/kio-${KFMIN}:6 - >=kde-frameworks/knotifications-${KFMIN}:6 - >=kde-frameworks/knotifyconfig-${KFMIN}:6 - >=kde-frameworks/kservice-${KFMIN}:6 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 - >=kde-frameworks/kwindowsystem-${KFMIN}:6 - >=kde-frameworks/kxmlgui-${KFMIN}:6 - >=kde-frameworks/solid-${KFMIN}:6 - >=media-gfx/exiv2-0.27.1:=[xmp] - media-libs/lcms:2 - media-libs/libjpeg-turbo:= - media-libs/liblqr - media-libs/libpng:= - >=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d] - media-libs/tiff:= - virtual/opengl - x11-libs/libX11 - addressbook? ( - >=kde-apps/akonadi-contacts-24.05.2:6 - >=kde-frameworks/kcontacts-${KFMIN}:6 - ) - calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:6 ) - gphoto2? ( media-libs/libgphoto2:= ) - heif? ( - media-libs/libheif:= - media-libs/x265:= - ) - imagemagick? ( media-gfx/imagemagick:= ) - jpegxl? ( media-libs/libjxl:= ) - lensfun? ( media-libs/lensfun ) - panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:6 ) - scanner? ( >=kde-apps/libksane-24.05.2:6 ) - semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:6 ) - spell? ( >=kde-frameworks/sonnet-${KFMIN}:6 ) - video? ( >=dev-qt/qtmultimedia-${QTMIN}:6 ) -" -DEPEND="${COMMON_DEPEND} - dev-cpp/eigen:3 - dev-libs/boost - addressbook? ( >=kde-apps/akonadi-24.05.2:6 ) -" -RDEPEND="${COMMON_DEPEND} - !${CATEGORY}/${PN}:5 - media-libs/exiftool - mysql? ( virtual/mysql[server(+)] ) - panorama? ( media-gfx/hugin ) -" -BDEPEND=" - sys-devel/gettext - panorama? ( - app-alternatives/lex - app-alternatives/yacc - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-8.4.0-cmake.patch" - "${FILESDIR}/${PN}-8.3.0-cmake-addressbook.patch" -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - ecm_pkg_pretend -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - ecm_pkg_setup -} - -# FIXME: Unbundle libraw (libs/rawengine/libraw) -# TODO: adding IUSE X requires upstreaming WITH_X11 option for libX11, -# see core/cmake/rules/RulesX11.cmake; only used in core/libs/dimg/filters/icc -src_configure() { - local mycmakeargs=( - -DBUILD_WITH_QT6=ON - -DBUILD_TESTING=OFF # bug 698192 - -DENABLE_APPSTYLES=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON - -DENABLE_SHOWFOTO=ON # built unconditionally so far, new option since 8.0 - -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook) - $(cmake_use_find_package calendar KF6CalendarCore) - -DENABLE_GEOLOCATION=$(usex geolocation) - $(cmake_use_find_package gphoto2 Gphoto2) - $(cmake_use_find_package heif Libheif) - $(cmake_use_find_package imagemagick ImageMagick) - $(cmake_use_find_package jpegxl Libjxl) - $(cmake_use_find_package lensfun LensFun) - -DENABLE_MYSQLSUPPORT=$(usex mysql) - -DENABLE_INTERNALMYSQL=$(usex mysql) - $(cmake_use_find_package panorama KF6ThreadWeaver) - $(cmake_use_find_package scanner KSaneWidgets6) - -DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop) - $(cmake_use_find_package spell KF6Sonnet) - -DENABLE_MEDIAPLAYER=$(usex video) - ) - - ecm_src_configure -} diff --git a/media-gfx/digikam/files/digikam-8.5.0-cmake-have_ksane.patch b/media-gfx/digikam/files/digikam-8.5.0-cmake-have_ksane.patch new file mode 100644 index 000000000000..9099b2f37468 --- /dev/null +++ b/media-gfx/digikam/files/digikam-8.5.0-cmake-have_ksane.patch @@ -0,0 +1,28 @@ +diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt +index 2cef54510c..95e33cfc2f 100644 +--- a/core/CMakeLists.txt ++++ b/core/CMakeLists.txt +@@ -201,7 +201,11 @@ MACOS_DEBUG_POLICIES() + message(STATUS "--------------------------------------------------") + message(STATUS "") + ++if(Qt6_FOUND) ++MACRO_BOOL_TO_01(KSaneWidgets6_FOUND HAVE_KSANE) ++else() + MACRO_BOOL_TO_01(KF${QT_VERSION_MAJOR}Sane_FOUND HAVE_KSANE) ++endif() + MACRO_BOOL_TO_01(KF${QT_VERSION_MAJOR}FileMetaData_FOUND HAVE_KFILEMETADATA) + MACRO_BOOL_TO_01(KF${QT_VERSION_MAJOR}CalendarCore_FOUND HAVE_KCALENDAR) + MACRO_BOOL_TO_01(KF${QT_VERSION_MAJOR}Notifications_FOUND HAVE_KNOTIFICATIONS) +@@ -294,7 +302,11 @@ PRINT_OPTIONAL_LIBRARY_STATUS("libkio" "https://invent.kde.org/framew + PRINT_OPTIONAL_LIBRARY_STATUS("libknotifications" "https://invent.kde.org/frameworks/knotifyconfig" "(version >= ${KF${QT_VERSION_MAJOR}_MIN_VERSION})" "digiKam will be compiled without KDE desktop notifications support." KF${QT_VERSION_MAJOR}Notifications_FOUND) + PRINT_OPTIONAL_LIBRARY_STATUS("libknotifyconfig" "https://invent.kde.org/frameworks/knotifications" "(version >= ${KF${QT_VERSION_MAJOR}_MIN_VERSION})" "digiKam will be compiled without KDE desktop notify configuration support." KF${QT_VERSION_MAJOR}NotifyConfig_FOUND) + PRINT_OPTIONAL_LIBRARY_STATUS("libsonnet" "https://invent.kde.org/frameworks/sonnet" "(version >= ${KF${QT_VERSION_MAJOR}_MIN_VERSION})" "digiKam will be compiled without spell-checking support." KF${QT_VERSION_MAJOR}Sonnet_FOUND) ++if(Qt6_FOUND) ++PRINT_OPTIONAL_LIBRARY_STATUS("libksane" "https://invent.kde.org/graphics/libksane" "(version >= ${KSANE_MIN_VERSION})" "digiKam will be compiled without flat scanners support." KSaneWidgets6_FOUND) ++else() + PRINT_OPTIONAL_LIBRARY_STATUS("libksane" "https://invent.kde.org/graphics/libksane" "(version >= ${KSANE_MIN_VERSION})" "digiKam will be compiled without flat scanners support." KF${QT_VERSION_MAJOR}Sane_FOUND) ++endif() + PRINT_OPTIONAL_LIBRARY_STATUS("liblensfun" "https://github.com/lensfun/lensfun" "(version >= 0.2.6)" "digiKam will be compiled without Lens Auto Correction tool support." LensFun_FOUND) + PRINT_OPTIONAL_LIBRARY_STATUS("libglib2" "https://developer.gnome.org/glib/" "(version >= 2.0.0)" "digiKam will be compiled without Contents Aware Resizer tool support." GLIB2_FOUND) + -- cgit v1.2.3