From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- media-gfx/digikam/Manifest | 6 +- media-gfx/digikam/digikam-6.3.0-r1.ebuild | 26 ++--- media-gfx/digikam/digikam-6.4.0.ebuild | 153 ++++++++++++++++++++++++++++++ media-gfx/digikam/metadata.xml | 1 + 4 files changed, 171 insertions(+), 15 deletions(-) create mode 100644 media-gfx/digikam/digikam-6.4.0.ebuild (limited to 'media-gfx/digikam') diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index 04c8ced7704d..8a11dd151689 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -1,5 +1,7 @@ AUX digikam-6.3.0-cmake.patch 2038 BLAKE2B 73c6c7d008c3b76f9347f4192d435e10aa3607abf62436372ef131ac034ef538c1baa8d0d03e6b587b771fb766fa3286c649a6ffc7640a2f21e292b1e524cab6 SHA512 c8e6d2fd6c18d8c8e8733dffd1e0e2fb66b8bf3496aa6f767a4c633a56733c85bc53bdceaf689e84beca672a5013a02349cfca73d9f1e89a99252c7bac526a4d AUX digikam-6.3.0-googlephoto-import-crash.patch 2815 BLAKE2B e39efa7815aef3f7b165e0915610e54af188479af3bef140717d5d903e557bb0da49fa493e06df9a76b9695df7ebe84cbf6132674209f45476da0a1d4752ceb7 SHA512 523dc9add1ee5b9ffb675c1983e8f54624b7537dbec567a60661fdd58b045978f2a794a47093f5a3d268e4aa159a8064cd6b261798bf19cfeb5241fd5ce4cdb8 DIST digikam-6.3.0.tar.xz 335641824 BLAKE2B 1ecddeee653d6b97570aa3616c6dd0a951210983400fe8aca19ee9e01aef29820f0ab32e3cbc2e92e833868f0f652c5bdd0809324437b6fa778dfdaf04ea3c83 SHA512 9463d7a8351acae32e2fa77c96026d1cb60e56fcc20ad2b71ac7461ff1e5e2e02ca0ef8a12e4d5ae2324aa66e185cdf5b237d6330f4741691876977e773511ce -EBUILD digikam-6.3.0-r1.ebuild 4255 BLAKE2B fcdff7cb0211901c20caf4197a09f0a58e6956c4bc6006a688106283f84b78fe0892c4050f9a33bb2b3bd8e577d2315f94a23e2f28e86b232193e3de5cf8769c SHA512 3444df820862f4c76b9c16e3073eabf27f3dfe9266469ce377fe51264d77de4de51555eeb9ad5c6e32f0ace1deb901d3a1d8cb1df7322b5ce1bd505684bd778a -MISC metadata.xml 1256 BLAKE2B c3899279a6382ac2b2a12f5b94938db2324093bd63e0db8e3f82bb56ea9944d4369b793f7fa039c2c08af1887e4cc51d58f4e89a57c81b18cb5f896ef4cd0a5c SHA512 9b220b4271d0cb7b9fd5549fec165c4bc20c250cc66ce14ecb3cb16d0eb8355f35d0e585d9d800ed70437b3cd5434bcacc7dfd783f2a5683dbe1b1b3ce48356f +DIST digikam-6.4.0.tar.xz 340146992 BLAKE2B ca1bc8b0d165f9774354d8489a11d46d8d7467edd3c1e90fd3a96024c4b7cd23bfd5c813251183bcca6d4beac9bffeb9d921beaa9a3752f75f1918796aacd719 SHA512 b3b5e9903538d110613aa872c9215f5e7c19f7520a2b9060c24e686f20f72075378b447239dd3e17cb8860cdd35c699399994199b848757f0497ad25a7805e42 +EBUILD digikam-6.3.0-r1.ebuild 4183 BLAKE2B 0c6db20f59f6c2797a05b63483f81e6e741ff41b1b2ff058fd48a8b6fe6c511765cef05a314b942aed178170ecf806228395c55210b2c7732211a794b1bb3d9b SHA512 bb06b989309c24de79b3eb713767ae41b5654297a53d90d74275ad11b2cbcc0fdb2e79bece5f05cd891be3e4ad36f850e7555ca155171ead6ffbe299bc83a5ef +EBUILD digikam-6.4.0.ebuild 4355 BLAKE2B 2feed71db7ae7b89f76e91b3d1e94640037522f0bf1fe536abd891e40cda9aa695721eb401fc2f568311bcfd86a7dee16b7a1bfd811896e2ec7ff8791f2e471a SHA512 46d92805507617800d7885238f1754579891483015cf19ac2fe7dcb37c90cc0e263551e70490fcbe16c281418451e7fa7152789a97836e99446c99dca1a1b451 +MISC metadata.xml 1368 BLAKE2B 5dec50abba4f748e1f8eb465807c719f4b81759277241169d9e721749a1ba807425f7d46e9feb1edb4dcf3b4dd00b40bfbb353fe479e29c8a1878ad1fbfb5082 SHA512 4cd1ada9c4274338e49a692095d80b572c309bd34c838e2663a18ec1e7230de87e27087febfedde46a0f6af19f1a3f440335750375117d20eacd0c756db8b2f8 diff --git a/media-gfx/digikam/digikam-6.3.0-r1.ebuild b/media-gfx/digikam/digikam-6.3.0-r1.ebuild index 8b30b380b54e..7a9327fbcb30 100644 --- a/media-gfx/digikam/digikam-6.3.0-r1.ebuild +++ b/media-gfx/digikam/digikam-6.3.0-r1.ebuild @@ -3,7 +3,6 @@ EAPI=7 -CMAKE_MIN_VERSION=3.14.3 inherit kde5 toolchain-funcs if [[ ${KDE_BUILD_TYPE} != live ]]; then @@ -23,6 +22,7 @@ LICENSE="GPL-2" IUSE="addressbook calendar dnn +imagemagick gphoto2 +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X" BDEPEND=" + >=dev-util/cmake-3.14.3 sys-devel/gettext panorama? ( sys-devel/bison @@ -134,23 +134,23 @@ src_configure() { -DENABLE_APPSTYLES=ON -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook) - $(cmake-utils_use_find_package calendar KF5CalendarCore) + $(cmake_use_find_package calendar KF5CalendarCore) -DENABLE_FACESENGINE_DNN=$(usex dnn) - $(cmake-utils_use_find_package gphoto2 Gphoto2) - $(cmake-utils_use_find_package imagemagick ImageMagick) - $(cmake-utils_use_find_package lensfun LensFun) - $(cmake-utils_use_find_package marble Marble) + $(cmake_use_find_package gphoto2 Gphoto2) + $(cmake_use_find_package imagemagick ImageMagick) + $(cmake_use_find_package lensfun LensFun) + $(cmake_use_find_package marble Marble) -DENABLE_MEDIAPLAYER=$(usex mediaplayer) - $(cmake-utils_use_find_package mediaplayer QtAV) + $(cmake_use_find_package mediaplayer QtAV) -DENABLE_MYSQLSUPPORT=$(usex mysql) -DENABLE_INTERNALMYSQL=$(usex mysql) - $(cmake-utils_use_find_package opengl OpenGL) - $(cmake-utils_use_find_package panorama KF5ThreadWeaver) - $(cmake-utils_use_find_package scanner KF5Sane) - $(cmake-utils_use_find_package semantic-desktop KF5FileMetaData) - $(cmake-utils_use_find_package vkontakte KF5Vkontakte) + $(cmake_use_find_package opengl OpenGL) + $(cmake_use_find_package panorama KF5ThreadWeaver) + $(cmake_use_find_package scanner KF5Sane) + $(cmake_use_find_package semantic-desktop KF5FileMetaData) + $(cmake_use_find_package vkontakte KF5Vkontakte) -DENABLE_QWEBENGINE=$(usex !webkit) - $(cmake-utils_use_find_package X X11) + $(cmake_use_find_package X X11) ) kde5_src_configure diff --git a/media-gfx/digikam/digikam-6.4.0.ebuild b/media-gfx/digikam/digikam-6.4.0.ebuild new file mode 100644 index 000000000000..9ee9030d8c61 --- /dev/null +++ b/media-gfx/digikam/digikam-6.4.0.ebuild @@ -0,0 +1,153 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +KFMIN=5.60.0 +QTMIN=5.12.3 +inherit ecm kde.org toolchain-funcs + +if [[ ${KDE_BUILD_TYPE} != live ]]; then + MY_PV=${PV/_/-} + MY_P=${PN}-${MY_PV} + SRC_BRANCH=stable + [[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable + SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${PV}/${MY_P}.tar.xz" + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/${MY_P}" +fi + +DESCRIPTION="Digital photo management application" +HOMEPAGE="https://www.digikam.org/" + +LICENSE="GPL-2" +SLOT="5" +IUSE="addressbook calendar dnn heif +imagemagick gphoto2 +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X" + +BDEPEND=" + >=dev-util/cmake-3.14.3 + sys-devel/gettext + panorama? ( + sys-devel/bison + sys-devel/flex + ) +" +COMMON_DEPEND=" + dev-libs/expat + >=dev-qt/qtconcurrent-${QTMIN}:5 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5[-gles2] + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtsql-${QTMIN}:5[mysql?] + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=dev-qt/qtxmlpatterns-${QTMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/knotifyconfig-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/solid-${KFMIN}:5 + >=media-gfx/exiv2-0.27:= + media-libs/lcms:2 + media-libs/liblqr + media-libs/libpng:0= + >=media-libs/opencv-3.1.0:= + media-libs/tiff:0 + virtual/jpeg:0 + addressbook? ( + >=kde-apps/akonadi-contacts-19.04.3:5 + >=kde-frameworks/kcontacts-${KFMIN}:5 + ) + calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 ) + dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contribdnn] ) + gphoto2? ( media-libs/libgphoto2:= ) + heif? ( media-libs/x265:= ) + imagemagick? ( media-gfx/imagemagick:= ) + lensfun? ( media-libs/lensfun ) + marble? ( + >=dev-qt/qtconcurrent-${QTMIN}:5 + >=kde-apps/marble-19.04.3:5 + >=kde-frameworks/kbookmarks-${KFMIN}:5 + ) + mediaplayer? ( + media-libs/qtav[opengl] + !libav? ( media-video/ffmpeg:= ) + libav? ( media-video/libav:= ) + ) + opengl? ( + >=dev-qt/qtopengl-${QTMIN}:5 + virtual/opengl + ) + panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 ) + scanner? ( >=kde-apps/libksane-19.04.3:5 ) + semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 ) + vkontakte? ( net-libs/libkvkontakte:5 ) + !webkit? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] ) + webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) + X? ( + >=dev-qt/qtx11extras-${QTMIN}:5 + x11-libs/libX11 + ) +" +DEPEND="${COMMON_DEPEND} + dev-cpp/eigen:3 + dev-libs/boost[threads] +" +RDEPEND="${COMMON_DEPEND} + mysql? ( virtual/mysql[server] ) + panorama? ( media-gfx/hugin ) +" + +RESTRICT+=" test" +# bug 366505 + +PATCHES=( "${FILESDIR}/${PN}-6.3.0-cmake.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) +src_configure() { + local mycmakeargs=( + -DBUILD_TESTING=OFF # bug 698192 + -DENABLE_APPSTYLES=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON + -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook) + $(cmake_use_find_package calendar KF5CalendarCore) + -DENABLE_FACESENGINE_DNN=$(usex dnn) + $(cmake_use_find_package gphoto2 Gphoto2) + $(cmake_use_find_package heif X265) + $(cmake_use_find_package imagemagick ImageMagick) + $(cmake_use_find_package lensfun LensFun) + $(cmake_use_find_package marble Marble) + -DENABLE_MEDIAPLAYER=$(usex mediaplayer) + $(cmake_use_find_package mediaplayer QtAV) + -DENABLE_MYSQLSUPPORT=$(usex mysql) + -DENABLE_INTERNALMYSQL=$(usex mysql) + $(cmake_use_find_package opengl OpenGL) + $(cmake_use_find_package panorama KF5ThreadWeaver) + $(cmake_use_find_package scanner KF5Sane) + $(cmake_use_find_package semantic-desktop KF5FileMetaData) + $(cmake_use_find_package vkontakte KF5Vkontakte) + -DENABLE_QWEBENGINE=$(usex !webkit) + $(cmake_use_find_package X X11) + ) + + ecm_src_configure +} diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml index 3f8f9d04dcfd..5843335b3898 100644 --- a/media-gfx/digikam/metadata.xml +++ b/media-gfx/digikam/metadata.xml @@ -11,6 +11,7 @@ Enable akonadi contact integration Build neural network faces engine module + Enable support for ISO/IEC 23008-12:2017 HEIF files using media-libs/x265 Enable support for additional image formats such as XCF, FITS, HEIC etc. Enable support for media-libs/lensfun Enable support for geolocation using kde-apps/marble -- cgit v1.2.3