[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 192ef7abd7a7a62d1326896888e9ed695921ef6d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Mar 26 12:51:48 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Mar 26 12:54:16 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=192ef7ab
media-gfx/digikam: Drop IUSE marble, add IUSE geolocation
Upstream commits:
99dce91a6165b7d91a19e070a5a1498cca016e7e "tinymarble++"
... a lot of garbage commit messages in between ...
72ae68dcdc27ba7cf4b55d6b9d0945c15fb6ad57 "add new option to enable or disable
geolocation support"
071e151ff6c65aa28b749f0eed48bea48c184bbc "HAVE_MARBLE -> HAVE_GEOLOCATION"
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 9 ++---
media-gfx/digikam/metadata.xml| 1 -
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 5b11866565..1b651216d0 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://www.digikam.org/;
LICENSE="GPL-2"
SLOT="5"
-IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mysql
opengl openmp +panorama scanner semantic-desktop spell"
+IUSE="addressbook calendar geolocation gphoto2 heif +imagemagick +lensfun
mysql opengl openmp +panorama scanner semantic-desktop spell"
# bug 366505
RESTRICT="test"
@@ -73,11 +73,6 @@ COMMON_DEPEND="
)
imagemagick? ( media-gfx/imagemagick:= )
lensfun? ( media-libs/lensfun )
- marble? (
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=kde-apps/marble-23.08.3:5
- >=kde-frameworks/kbookmarks-${KFMIN}:5
- )
opengl? (
>=dev-qt/qtopengl-${QTMIN}:5
virtual/opengl
@@ -129,11 +124,11 @@ src_configure() {
-DENABLE_QWEBENGINE=ON
-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
$(cmake_use_find_package calendar KF5CalendarCore)
+ -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 lensfun LensFun)
- $(cmake_use_find_package marble Marble)
-DENABLE_MYSQLSUPPORT=$(usex mysql)
-DENABLE_INTERNALMYSQL=$(usex mysql)
$(cmake_use_find_package opengl OpenGL)
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
index 4c55a9727c..0a97204254 100644
--- a/media-gfx/digikam/metadata.xml
+++ b/media-gfx/digikam/metadata.xml
@@ -16,7 +16,6 @@
Enable akonadi contact
integration
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
Build the panorama plugin which requires
media-gfx/hugin
Enable
kde-frameworks/kfilemetadata support
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 4da80e12b68ce96e0bef263b5140ea99156ac60f Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Mar 25 14:44:35 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Mar 25 14:44:35 2024 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=4da80e12 media-gfx/digikam: add kde-invent upstream metadata Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/digikam/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml index 98caf78224..4c55a9727c 100644 --- a/media-gfx/digikam/metadata.xml +++ b/media-gfx/digikam/metadata.xml @@ -10,6 +10,7 @@ https://bugs.kde.org/ + graphics/digikam Enable akonadi contact integration
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
commit: 5b29330de98932bbefc40d87c632c817ab29dfc7
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Mar 25 14:41:32 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Mar 25 14:41:54 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=5b29330d
media-gfx/digikam: Rebase cmake.patch on top of HEAD
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 18 +++
...--cmake.patch => digikam-8.3.0-cmake.patch} | 26 --
2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index c0a5622d34..5b11866565 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -8,14 +8,12 @@ QTMIN=5.15.12
inherit ecm kde.org toolchain-funcs
if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ TARNAME="digiKam-${PV/_/-}"
if [[ ${PV} =~ beta[0-9]$ ]]; then
- SRC_URI="mirror://kde/unstable/${PN}/"
+ SRC_URI="mirror://kde/unstable/${PN}/${TARNAME}.tar.xz"
else
- SRC_URI="mirror://kde/stable/${PN}/${PV}/"
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/${TARNAME}.tar.xz"
fi
- SRC_URI+="digiKam-${PV/_/-}.tar.xz"
- KEYWORDS="~amd64 ~arm64 ~x86"
- S="${WORKDIR}/${PN}-${PV/_/-}"
fi
DESCRIPTION="Digital photo management application"
@@ -64,7 +62,7 @@ COMMON_DEPEND="
media-libs/tiff:=
x11-libs/libX11
addressbook? (
- >=kde-apps/akonadi-contacts-19.04.3:5
+ >=kde-apps/akonadi-contacts-23.08.3:5
>=kde-frameworks/kcontacts-${KFMIN}:5
)
calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 )
@@ -77,7 +75,7 @@ COMMON_DEPEND="
lensfun? ( media-libs/lensfun )
marble? (
>=dev-qt/qtconcurrent-${QTMIN}:5
- >=kde-apps/marble-19.04.3:5
+ >=kde-apps/marble-23.08.3:5
>=kde-frameworks/kbookmarks-${KFMIN}:5
)
opengl? (
@@ -85,14 +83,14 @@ COMMON_DEPEND="
virtual/opengl
)
panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
- scanner? ( >=kde-apps/libksane-19.04.3:5 )
+ scanner? ( >=kde-apps/libksane-23.08.3:5 )
semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
spell? ( >=kde-frameworks/sonnet-${KFMIN}:5 )
"
DEPEND="${COMMON_DEPEND}
dev-cpp/eigen:3
dev-libs/boost
- addressbook? ( >=kde-apps/akonadi-19.04.3:5 )
+ addressbook? ( >=kde-apps/akonadi-23.08.3:5 )
"
RDEPEND="${COMMON_DEPEND}
media-libs/exiftool
@@ -107,7 +105,7 @@ BDEPEND="
)
"
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+PATCHES=( "${FILESDIR}/${PN}-8.3.0-cmake.patch" )
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
diff --git a/media-gfx/digikam/files/digikam--cmake.patch
b/media-gfx/digikam/files/digikam-8.3.0-cmake.patch
similarity index 88%
rename from media-gfx/digikam/files/digikam--cmake.patch
rename to media-gfx/digikam/files/digikam-8.3.0-cmake.patch
index 7121ede14d..03438e3f22 100644
--- a/media-gfx/digikam/files/digikam--cmake.patch
+++ b/media-gfx/digikam/files/digikam-8.3.0-cmake.patch
@@ -1,20 +1,20 @@
-From 945c59d7dd66ccb89910db7b560206550fe0fe69 Mon Sep 17 00:00:00 2001
+From c6ae81abf56851c818285d555e192c660635247b Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner
Date: Sun, 17 Feb 2019 23:51:03 +0100
Subject: [PATCH] Un-break optional Qt/KF detection
And if we enable an option, make the necessary libraries REQUIRED.
---
- core/cmake/rules/RulesKDEFramework.cmake | 41 +++-
+ core/cmake/rules/RulesKDEFramework.cmake | 43 +++--
core/cmake/rules/RulesQtFramework.cmake | 61 +---
core/cmake/rules/RulesX11.cmake | 7 +--
- 3 files changed, 20 insertions(+), 89 deletions(-)
+ 3 files changed, 20 insertions(+), 91 deletions(-)
diff --git a/core/cmake/rules/RulesKDEFramework.cmake
b/core/cmake/rules/RulesKDEFramework.cmake
-index 996de43d6a..34698eb2b8 100644
+index e34e5f4a8d..3cde25928f 100644
--- a/core/cmake/rules/RulesKDEFramework.cmake
+++ b/core/cmake/rules/RulesKDEFramework.cmake
-@@ -26,24 +26,15 @@ find_package(KF${QT_VERSION_MAJOR}
${KF${QT_VERSION_MAJOR}_MIN_VERSION} QUIET
+@@ -26,26 +26,15 @@ find_package(KF${QT_VERSION_MAJOR}
${KF${QT_VERSION_MAJOR}_MIN_VERSION} QUIET
)
if(ENABLE_KFILEMETADATASUPPORT)
@@ -37,6 +37,8 @@ index 996de43d6a..34698eb2b8 100644
-AkonadiContact # For KDE
Mail Contacts support.
-Contacts# API for
contacts/address book data.
-)
+-find_package(KPim${QT_VERSION_MAJOR}Akonadi ${AKONADI_MIN_VERSION} QUIET)
+-
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 9abf6b2d17ae4ecf2c0255fea824c3c280cdb72a
Author: Sam James gentoo org>
AuthorDate: Sun Oct 1 06:25:57 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Mar 25 13:49:53 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9abf6b2d
media-gfx/digikam: Keyword 8.1.0-r1 arm64, #907378
Signed-off-by: Sam James gentoo.org>
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index cf551e3211..c0a5622d34 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -14,7 +14,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/"
fi
SRC_URI+="digiKam-${PV/_/-}.tar.xz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~x86"
S="${WORKDIR}/${PN}-${PV/_/-}"
fi
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 846b7f91e5bb87c066fee140d88ba52f8c4a5ac6 Author: Sam James gentoo org> AuthorDate: Mon Jan 8 12:07:33 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jan 11 23:12:34 2024 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=846b7f91 media-gfx/digikam: sys-devel/bison -> app-alternatives/yacc All of these will be using app-alternatives/yacc anyway as they're not unsetting YACC or LEX, so make the dep reflect reality. (Included both YACC and LEX out of conservatism.) Signed-off-by: Sam James gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/digikam/digikam-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/digikam/digikam-.ebuild b/media-gfx/digikam/digikam-.ebuild index b7b25149e6..705f85ef85 100644 --- a/media-gfx/digikam/digikam-.ebuild +++ b/media-gfx/digikam/digikam-.ebuild @@ -103,7 +103,7 @@ BDEPEND=" sys-devel/gettext panorama? ( app-alternatives/lex - sys-devel/bison + app-alternatives/yacc ) "
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 5435a3a5e0f8595dc70f14fb3e5462a3b761fdac
Author: Sam James gentoo org>
AuthorDate: Mon Jan 8 11:49:32 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jan 11 23:11:56 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=5435a3a5
media-gfx/digikam: sys-devel/flex -> app-alternatives/lex
All of these will be using app-alternatives/lex anyway as they're not unsetting
YACC or LEX, so make the dep reflect reality.
(Included both YACC and LEX out of conservatism.)
Signed-off-by: Sam James gentoo.org>
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index e5928fda36..b7b25149e6 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -102,8 +102,8 @@ RDEPEND="${COMMON_DEPEND}
BDEPEND="
sys-devel/gettext
panorama? (
+ app-alternatives/lex
sys-devel/bison
- sys-devel/flex
)
"
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 5c3305bdf4ed973afb9729066977ff6f61ad30ad
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Thu Dec 28 20:22:39 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Dec 30 13:49:22 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=5c3305bd
media-gfx/digikam: fix patchname
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 03d0cf3403..d695a154b0 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -107,7 +107,7 @@ BDEPEND="
)
"
-PATCHES=( "${FILESDIR}/${P}--cmake.patch" )
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
commit: 0b91c1b31414a75686319cebfe4c357cac706f50
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Dec 25 21:52:10 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Dec 25 21:52:10 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0b91c1b3
media-gfx/digikam: Rebase cmake.patch on top of HEAD
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 2 +-
...-8.1.0-cmake.patch => digikam--cmake.patch} | 81 --
2 files changed, 47 insertions(+), 36 deletions(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 1441ee66e0..03d0cf3403 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -107,7 +107,7 @@ BDEPEND="
)
"
-PATCHES=( "${FILESDIR}/${PN}-8.1.0-cmake.patch" )
+PATCHES=( "${FILESDIR}/${P}--cmake.patch" )
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
diff --git a/media-gfx/digikam/files/digikam-8.1.0-cmake.patch
b/media-gfx/digikam/files/digikam--cmake.patch
similarity index 62%
rename from media-gfx/digikam/files/digikam-8.1.0-cmake.patch
rename to media-gfx/digikam/files/digikam--cmake.patch
index 16c1ffa5c3..7121ede14d 100644
--- a/media-gfx/digikam/files/digikam-8.1.0-cmake.patch
+++ b/media-gfx/digikam/files/digikam--cmake.patch
@@ -1,72 +1,80 @@
-From 05b6e81bd4ceca8d6166aa0a000919cde2bfde3e Mon Sep 17 00:00:00 2001
+From 945c59d7dd66ccb89910db7b560206550fe0fe69 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner
Date: Sun, 17 Feb 2019 23:51:03 +0100
-Subject: [PATCH] Un-break optional Qt/KF5 detection
+Subject: [PATCH] Un-break optional Qt/KF detection
And if we enable an option, make the necessary libraries REQUIRED.
---
- core/cmake/rules/RulesKDEFramework.cmake | 34 +++---
- core/cmake/rules/RulesQtFramework.cmake | 58 +---
+ core/cmake/rules/RulesKDEFramework.cmake | 41 +++-
+ core/cmake/rules/RulesQtFramework.cmake | 61 +---
core/cmake/rules/RulesX11.cmake | 7 +--
- 3 files changed, 18 insertions(+), 81 deletions(-)
+ 3 files changed, 20 insertions(+), 89 deletions(-)
diff --git a/core/cmake/rules/RulesKDEFramework.cmake
b/core/cmake/rules/RulesKDEFramework.cmake
-index 610033425c..2d8acc7956 100644
+index 996de43d6a..34698eb2b8 100644
--- a/core/cmake/rules/RulesKDEFramework.cmake
+++ b/core/cmake/rules/RulesKDEFramework.cmake
-@@ -26,19 +26,15 @@ find_package(KF5 ${KF5_MIN_VERSION} QUIET
+@@ -26,24 +26,15 @@ find_package(KF${QT_VERSION_MAJOR}
${KF${QT_VERSION_MAJOR}_MIN_VERSION} QUIET
)
if(ENABLE_KFILEMETADATASUPPORT)
-
--find_package(KF5 ${KF5_MIN_VERSION} QUIET
+-find_package(KF${QT_VERSION_MAJOR} ${KF${QT_VERSION_MAJOR}_MIN_VERSION}
QUIET
-OPTIONAL_COMPONENTS
--FileMetaData# For Plasma
destop file indexer support.
+-FileMetaData# For Plasma
desktop file indexer support.
-)
-
+# For Plasma desktop file indexer support.
-+find_package(KF5FileMetaData ${KF5_MIN_VERSION} REQUIRED)
++find_package(KF${QT_VERSION_MAJOR}FileMetaData
${KF${QT_VERSION_MAJOR}_MIN_VERSION} REQUIRED)
endif()
if(ENABLE_AKONADICONTACTSUPPORT)
-
--find_package(KF5 ${AKONADI_MIN_VERSION} QUIET
+-
+-find_package(KF${QT_VERSION_MAJOR} ${AKONADI_MIN_VERSION} QUIET
-OPTIONAL_COMPONENTS
-+find_package(KF5 ${AKONADI_MIN_VERSION} REQUIRED
-+COMPONENTS
- Akonadi
- AkonadiContact # For KDE
Mail Contacts support.
- Contacts# API for
contacts/address book data.
-@@ -46,15 +42,9 @@ if(ENABLE_AKONADICONTACTSUPPORT)
-
+-Akonadi
+-AkonadiContact # For KDE
Mail Contacts support.
+-Contacts# API for
contacts/address book data.
+-)
+-
++find_package(KF${QT_VERSION_MAJOR}Contacts
${KF${QT_VERSION_MAJOR}_MIN_VERSION} REQUIRED) # API for contacts/address book
data.
++find_package(KPim${QT_VERSION_MAJOR}Akonadi ${AKONADI_MIN_VERSION}
REQUIRED)
++find_package(KPim${QT_VERSION_MAJOR}AkonadiContact ${AKONADI_MIN_VERSION}
REQUIRED) # For KDE Mail Contacts support.
endif()
--find_package(KF5 ${KSANE_MIN_VERSION} QUIET
-- OPTIONAL_COMPONENTS
-- Sane # For digital
scanner support.
--)
-+find_package(KF5Sane ${KSANE_MIN_VERSION} QUIET) # For digital scanner
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 962652f275b77a1b0a0ef1512f6e2c72b6e06bfd
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Jul 25 10:34:27 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Jul 25 10:46:15 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=962652f2
media-gfx/digikam: Drop IUSE X
It is broken and we won't fix it.
Bug: https://bugs.gentoo.org/813450
Closes: https://bugs.gentoo.org/911191
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 8cc390dbf0..1441ee66e0 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="https://www.digikam.org/;
LICENSE="GPL-2"
SLOT="5"
-IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mysql
opengl openmp +panorama scanner semantic-desktop spell X"
+IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mysql
opengl openmp +panorama scanner semantic-desktop spell"
# bug 366505
RESTRICT="test"
@@ -39,6 +39,7 @@ COMMON_DEPEND="
>=dev-qt/qtsql-${QTMIN}:5[mysql?]
>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
>=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtx11extras-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
>=dev-qt/qtxmlpatterns-${QTMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
@@ -61,6 +62,7 @@ COMMON_DEPEND="
media-libs/libpng:=
>=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d]
media-libs/tiff:=
+ x11-libs/libX11
addressbook? (
>=kde-apps/akonadi-contacts-19.04.3:5
>=kde-frameworks/kcontacts-${KFMIN}:5
@@ -86,10 +88,6 @@ COMMON_DEPEND="
scanner? ( >=kde-apps/libksane-19.04.3:5 )
semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
spell? ( >=kde-frameworks/sonnet-${KFMIN}:5 )
- X? (
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libX11
- )
"
DEPEND="${COMMON_DEPEND}
dev-cpp/eigen:3
@@ -145,7 +143,6 @@ src_configure() {
$(cmake_use_find_package scanner KF5Sane)
$(cmake_use_find_package spell KF5Sonnet)
-DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop)
- $(cmake_use_find_package X X11)
)
ecm_src_configure
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: f5f65d76915b514d14832759c7d436ecb48be0d8
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Jul 25 09:47:45 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Jul 25 09:47:45 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f5f65d76
media-gfx/digikam: Add RDEPEND=media-libs/exiftool
Bug: https://bugs.gentoo.org/910495
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index ade4353af7..8cc390dbf0 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -97,6 +97,7 @@ DEPEND="${COMMON_DEPEND}
addressbook? ( >=kde-apps/akonadi-19.04.3:5 )
"
RDEPEND="${COMMON_DEPEND}
+ media-libs/exiftool
mysql? ( virtual/mysql[server(+)] )
panorama? ( media-gfx/hugin )
"
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
commit: 3cadcc5156864cff0cc4e3e2850f93089d3f
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Jul 8 14:47:00 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jul 8 14:47:37 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=3cadcc51
media-gfx/digikam: Update dependencies, cmake args
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 14 +-
media-gfx/digikam/files/digikam-7.8.0-cmake.patch | 119 --
media-gfx/digikam/files/digikam-8.1.0-cmake.patch | 179 ++
3 files changed, 189 insertions(+), 123 deletions(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 01b3292151..ade4353af7 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="https://www.digikam.org/;
LICENSE="GPL-2"
SLOT="5"
-IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mysql
opengl openmp +panorama scanner semantic-desktop X"
+IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mysql
opengl openmp +panorama scanner semantic-desktop spell X"
# bug 366505
RESTRICT="test"
@@ -34,6 +34,7 @@ COMMON_DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5[-gles2-only]
>=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtnetworkauth-${QTMIN}:5
>=dev-qt/qtprintsupport-${QTMIN}:5
>=dev-qt/qtsql-${QTMIN}:5[mysql?]
>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
@@ -53,7 +54,7 @@ COMMON_DEPEND="
>=kde-frameworks/kwindowsystem-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
>=kde-frameworks/solid-${KFMIN}:5
- >=media-gfx/exiv2-0.27:=[xmp]
+ >=media-gfx/exiv2-0.27.1:=[xmp]
media-libs/lcms:2
media-libs/libjpeg-turbo:=
media-libs/liblqr
@@ -84,6 +85,7 @@ COMMON_DEPEND="
panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
scanner? ( >=kde-apps/libksane-19.04.3:5 )
semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
+ spell? ( >=kde-frameworks/sonnet-${KFMIN}:5 )
X? (
>=dev-qt/qtx11extras-${QTMIN}:5
x11-libs/libX11
@@ -92,6 +94,7 @@ COMMON_DEPEND="
DEPEND="${COMMON_DEPEND}
dev-cpp/eigen:3
dev-libs/boost
+ addressbook? ( >=kde-apps/akonadi-19.04.3:5 )
"
RDEPEND="${COMMON_DEPEND}
mysql? ( virtual/mysql[server(+)] )
@@ -105,7 +108,7 @@ BDEPEND="
)
"
-PATCHES=( "${FILESDIR}/${PN}-7.8.0-cmake.patch" )
+PATCHES=( "${FILESDIR}/${PN}-8.1.0-cmake.patch" )
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
@@ -120,10 +123,12 @@ pkg_setup() {
# FIXME: Unbundle libraw (libs/rawengine/libraw)
src_configure() {
local mycmakeargs=(
+ -DBUILD_WITH_QT6=OFF # KF6 not stable upstream yet
-DBUILD_TESTING=OFF # bug 698192
-DENABLE_APPSTYLES=ON
-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
- -DENABLE_MEDIAPLAYER=OFF # bug 758641, last-rited
+ -DENABLE_MEDIAPLAYER=OFF # bug 758641; bundled as of 8.0,
KDE-bug 448681
+ -DENABLE_SHOWFOTO=ON # built unconditionally so far, new option
since 8.0
-DENABLE_QWEBENGINE=ON
-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
$(cmake_use_find_package calendar KF5CalendarCore)
@@ -137,6 +142,7 @@ src_configure() {
$(cmake_use_find_package opengl OpenGL)
$(cmake_use_find_package panorama KF5ThreadWeaver)
$(cmake_use_find_package scanner KF5Sane)
+ $(cmake_use_find_package spell KF5Sonnet)
-DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop)
$(cmake_use_find_package X X11)
)
diff --git a/media-gfx/digikam/files/digikam-7.8.0-cmake.patch
b/media-gfx/digikam/files/digikam-7.8.0-cmake.patch
deleted file mode 100644
index d698626e8c..00
--- a/media-gfx/digikam/files/digikam-7.8.0-cmake.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From 618e3f3ba195a3b50812d1184ebf90555d659055 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner
-Date: Sun, 17 Feb 2019 23:51:03 +0100
-Subject: [PATCH] Un-break optional Qt5/KF5 detection
-
-And if we enable an option, make the necessary libraries REQUIRED.
- core/CMakeLists.txt | 50 +
- 1 file changed, 14 insertions(+), 36 deletions(-)
-
-diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
-index de599ee881..8aef35e062 100644
a/core/CMakeLists.txt
-+++ b/core/CMakeLists.txt
-@@ -65,17 +65,14 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED
- )
-
- if(ENABLE_QWEBENGINE)
--find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS
WebEngineWidgets)
-+find_package(Qt5WebEngineWidgets ${QT_MIN_VERSION} REQUIRED
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 8f66fa339e5e17cd0173ae92a11644908c251eca
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Mar 29 09:49:18 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Mar 29 10:29:39 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=8f66fa33
media-gfx/digikam: Drop IUSE mediaplayer
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 9 ++---
media-gfx/digikam/metadata.xml| 1 -
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 872be2cad8..e0636d36eb 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="https://www.digikam.org/;
LICENSE="GPL-2"
SLOT="5"
-IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble
mediaplayer mysql opengl openmp +panorama scanner semantic-desktop X"
+IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mysql
opengl openmp +panorama scanner semantic-desktop X"
# bug 366505
RESTRICT="test"
@@ -77,10 +77,6 @@ COMMON_DEPEND="
>=kde-apps/marble-19.04.3:5
>=kde-frameworks/kbookmarks-${KFMIN}:5
)
- mediaplayer? (
- media-libs/qtav[opengl(+)]
- media-video/ffmpeg:=
- )
opengl? (
>=dev-qt/qtopengl-${QTMIN}:5
virtual/opengl
@@ -127,6 +123,7 @@ src_configure() {
-DBUILD_TESTING=OFF # bug 698192
-DENABLE_APPSTYLES=ON
-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
+ -DENABLE_MEDIAPLAYER=OFF # bug 758641, last-rited
-DENABLE_QWEBENGINE=ON
-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
$(cmake_use_find_package calendar KF5CalendarCore)
@@ -135,8 +132,6 @@ src_configure() {
$(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)
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
index f9e9117794..1c37a7c308 100644
--- a/media-gfx/digikam/metadata.xml
+++ b/media-gfx/digikam/metadata.xml
@@ -17,7 +17,6 @@
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
- Enable support for media player using
media-libs/qtav
Build the panorama plugin which requires
media-gfx/hugin
Enable
kde-frameworks/kfilemetadata support
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: b9005e06e0f3cbfb537ddf9d2007f96d41405db7
Author: Sam James gentoo org>
AuthorDate: Fri Dec 16 01:24:57 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Dec 16 19:32:08 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b9005e06
media-gfx/digikam: add media-libs/libtiff subslot dep
libtiff changed SONAME.
Signed-off-by: Sam James gentoo.org>
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 5bf52554fb..a76afccd03 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -57,9 +57,9 @@ COMMON_DEPEND="
media-libs/lcms:2
media-libs/libjpeg-turbo:=
media-libs/liblqr
- media-libs/libpng:0=
+ media-libs/libpng:=
>=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d]
- media-libs/tiff:0
+ media-libs/tiff:=
addressbook? (
>=kde-apps/akonadi-contacts-19.04.3:5
>=kde-frameworks/kcontacts-${KFMIN}:5
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: f33468dde1ca4b9931a59baca3e5665ff12a65ff Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Sep 15 17:45:14 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Sep 15 17:45:14 2022 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f33468dd media-gfx/digikam: Add missing media-libs/opencv[features2d] USEdep Bug: https://bugs.gentoo.org/774552 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/digikam/digikam-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/digikam/digikam-.ebuild b/media-gfx/digikam/digikam-.ebuild index 05016350b5..5bf52554fb 100644 --- a/media-gfx/digikam/digikam-.ebuild +++ b/media-gfx/digikam/digikam-.ebuild @@ -58,7 +58,7 @@ COMMON_DEPEND=" media-libs/libjpeg-turbo:= media-libs/liblqr media-libs/libpng:0= - >=media-libs/opencv-3.3.0:=[contrib,contribdnn] + >=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d] media-libs/tiff:0 addressbook? ( >=kde-apps/akonadi-contacts-19.04.3:5
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: aa3d9c2853682cb5dd7bf590f6352c3b3d7022dc
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Sep 14 13:08:05 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Sep 14 13:08:05 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=aa3d9c28
media-gfx/digikam: Fix patch name
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 5919dbb0d5..05016350b5 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -109,7 +109,7 @@ BDEPEND="
)
"
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+PATCHES=( "${FILESDIR}/${PN}-7.8.0-cmake.patch" )
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/files/, media-gfx/digikam/
commit: f297810232781332e35065bb11c68a12364cc671
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Sep 14 13:05:09 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Sep 14 13:06:02 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f2978102
media-gfx/digikam: Respin cmake.patch, update IUSE heif
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 9 ++-
...7.3.0-cmake.patch => digikam-7.8.0-cmake.patch} | 73 +++---
2 files changed, 43 insertions(+), 39 deletions(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index ec2fee905d..5919dbb0d5 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -66,7 +66,10 @@ COMMON_DEPEND="
)
calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 )
gphoto2? ( media-libs/libgphoto2:= )
- heif? ( media-libs/x265:= )
+ heif? (
+ media-libs/libheif:=
+ media-libs/x265:=
+ )
imagemagick? ( media-gfx/imagemagick:= )
lensfun? ( media-libs/lensfun )
marble? (
@@ -106,7 +109,7 @@ BDEPEND="
)
"
-PATCHES=( "${FILESDIR}/${PN}-7.3.0-cmake.patch" )
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
@@ -128,7 +131,7 @@ src_configure() {
-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
$(cmake_use_find_package calendar KF5CalendarCore)
$(cmake_use_find_package gphoto2 Gphoto2)
- $(cmake_use_find_package heif X265)
+ $(cmake_use_find_package heif Libheif)
$(cmake_use_find_package imagemagick ImageMagick)
$(cmake_use_find_package lensfun LensFun)
$(cmake_use_find_package marble Marble)
diff --git a/media-gfx/digikam/files/digikam-7.3.0-cmake.patch
b/media-gfx/digikam/files/digikam-7.8.0-cmake.patch
similarity index 68%
rename from media-gfx/digikam/files/digikam-7.3.0-cmake.patch
rename to media-gfx/digikam/files/digikam-7.8.0-cmake.patch
index 2b580f92a1..d698626e8c 100644
--- a/media-gfx/digikam/files/digikam-7.3.0-cmake.patch
+++ b/media-gfx/digikam/files/digikam-7.8.0-cmake.patch
@@ -1,14 +1,15 @@
-From 370308fb8381b55e7ebfcdd77f1361b49a288f88 Mon Sep 17 00:00:00 2001
+From 618e3f3ba195a3b50812d1184ebf90555d659055 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner
Date: Sun, 17 Feb 2019 23:51:03 +0100
Subject: [PATCH] Un-break optional Qt5/KF5 detection
+And if we enable an option, make the necessary libraries REQUIRED.
---
- core/CMakeLists.txt | 58 -
- 1 file changed, 20 insertions(+), 38 deletions(-)
+ core/CMakeLists.txt | 50 +
+ 1 file changed, 14 insertions(+), 36 deletions(-)
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
-index 16bba83335..b8cdc59baa 100644
+index de599ee881..8aef35e062 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -65,17 +65,14 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED
@@ -42,42 +43,47 @@ index 16bba83335..b8cdc59baa 100644
- NO_MODULE COMPONENTS
- Test
-)
--
++find_package(Qt5Test ${QT_MIN_VERSION} NO_MODULE)
+
-find_package(Qt5 ${QT_MIN_VERSION}
- QUIET
- OPTIONAL_COMPONENTS
- Qml WebView # Optional, for 'sialis' O2 library test tool.
-)
-+find_package(Qt5Test ${QT_MIN_VERSION} NO_MODULE)
-+
+# Optional, for 'sialis' O2 library test tool.
+find_package(Qt5Qml ${QT_MIN_VERSION} QUIET NO_MODULE)
+find_package(Qt5WebView ${QT_MIN_VERSION} QUIET NO_MODULE)
endif()
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
-@@ -113,38 +105,28 @@ find_package(KF5 ${KF5_MIN_VERSION} QUIET
- OPTIONAL_COMPONENTS
- KIO# For Desktop integration (Widgets only).
- IconThemes # For Desktop integration.
-- FileMetaData # For KDE file indexer support.
- ThreadWeaver # For Panorama tool.
- NotifyConfig # KDE desktop application notify
configuration.
- Notifications # KDE desktop notifications integration.
- )
+@@ -121,7 +113,7 @@ find_package(KF5 ${KF5_MIN_VERSION} QUIET
+ if(ENABLE_KFILEMETADATASUPPORT)
--find_package(KF5 ${AKONADI_MIN_VERSION} QUIET
-- OPTIONAL_COMPONENTS
-- AkonadiContact # For KDE Mail Contacts support.
-- Contacts # API for contacts/address book data.
--)
-+find_package(KF5Sane ${KSANE_MIN_VERSION} QUIET) # For digital scanner
support.
+ find_package(KF5 ${KF5_MIN_VERSION}
+- QUIET
++ REQUIRED
+
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 699ac8b241e4652c95370424977a66f0dcf99a16
Author: David Seifert gentoo org>
AuthorDate: Sun Sep 4 12:22:11 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Sep 14 12:26:10 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=699ac8b2
media-gfx/digikam: remove boost[threads(+)] usedep
Signed-off-by: David Seifert gentoo.org>
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 4dc1fd6b4d..ec2fee905d 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -92,7 +92,7 @@ COMMON_DEPEND="
"
DEPEND="${COMMON_DEPEND}
dev-cpp/eigen:3
- dev-libs/boost[threads(+)]
+ dev-libs/boost
"
RDEPEND="${COMMON_DEPEND}
mysql? ( virtual/mysql[server(+)] )
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: fd5aa866cd33cccfa94ace24193f3875cd77cef7
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun May 8 13:11:04 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun May 8 13:11:04 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=fd5aa866
media-gfx/digikam: Switch to media-libs/libjpeg-turbo:=
Away from deprecated virtual/jpeg.
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index ec7d91762b..d369876d56 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -55,11 +55,11 @@ COMMON_DEPEND="
>=kde-frameworks/solid-${KFMIN}:5
>=media-gfx/exiv2-0.27:=[xmp]
media-libs/lcms:2
+ media-libs/libjpeg-turbo:=
media-libs/liblqr
media-libs/libpng:0=
>=media-libs/opencv-3.3.0:=[contrib,contribdnn]
media-libs/tiff:0
- virtual/jpeg:0
addressbook? (
>=kde-apps/akonadi-contacts-19.04.3:5
>=kde-frameworks/kcontacts-${KFMIN}:5
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
commit: ceb5a2bc9ed69eac89a4f54053cb38264bd093f3
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Dec 18 17:29:27 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Jan 18 16:00:54 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ceb5a2bc
media-gfx/digikam: Add missing usedep, fix cmake (again)
Closes: https://bugs.gentoo.org/829539
Closes: https://bugs.gentoo.org/829571
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 13 +--
media-gfx/digikam/files/digikam-7.3.0-cmake.patch | 118 ++
2 files changed, 125 insertions(+), 6 deletions(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 9be42602ea..ec7d91762b 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -3,20 +3,19 @@
EAPI=8
-KFMIN=5.82.0
+KFMIN=5.88.0
QTMIN=5.15.2
inherit ecm kde.org toolchain-funcs
if [[ ${KDE_BUILD_TYPE} != live ]]; then
- MY_P=${PN}-${PV/_/-}
if [[ ${PV} =~ beta[0-9]$ ]]; then
SRC_URI="mirror://kde/unstable/${PN}/"
else
SRC_URI="mirror://kde/stable/${PN}/${PV}/"
fi
- SRC_URI+="${MY_P}.tar.xz"
+ SRC_URI+="digiKam-${PV/_/-}.tar.xz"
KEYWORDS="~amd64 ~x86"
- S="${WORKDIR}/${MY_P}"
+ S="${WORKDIR}/${PN}-${PV/_/-}"
fi
DESCRIPTION="Digital photo management application"
@@ -54,7 +53,7 @@ COMMON_DEPEND="
>=kde-frameworks/kwindowsystem-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
>=kde-frameworks/solid-${KFMIN}:5
- >=media-gfx/exiv2-0.27:=
+ >=media-gfx/exiv2-0.27:=[xmp]
media-libs/lcms:2
media-libs/liblqr
media-libs/libpng:0=
@@ -107,6 +106,8 @@ BDEPEND="
)
"
+PATCHES=( "${FILESDIR}/${PN}-7.3.0-cmake.patch" )
+
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
ecm_pkg_pretend
@@ -138,7 +139,7 @@ src_configure() {
$(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)
+ -DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop)
$(cmake_use_find_package X X11)
)
diff --git a/media-gfx/digikam/files/digikam-7.3.0-cmake.patch
b/media-gfx/digikam/files/digikam-7.3.0-cmake.patch
new file mode 100644
index 00..2b580f92a1
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-7.3.0-cmake.patch
@@ -0,0 +1,118 @@
+From 370308fb8381b55e7ebfcdd77f1361b49a288f88 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Sun, 17 Feb 2019 23:51:03 +0100
+Subject: [PATCH] Un-break optional Qt5/KF5 detection
+
+---
+ core/CMakeLists.txt | 58 -
+ 1 file changed, 20 insertions(+), 38 deletions(-)
+
+diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
+index 16bba83335..b8cdc59baa 100644
+--- a/core/CMakeLists.txt
b/core/CMakeLists.txt
+@@ -65,17 +65,14 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED
+ )
+
+ if(ENABLE_QWEBENGINE)
+-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS
WebEngineWidgets)
++find_package(Qt5WebEngineWidgets ${QT_MIN_VERSION} REQUIRED NO_MODULE)
+ else()
+-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS
WebKitWidgets)
++find_package(Qt5WebKitWidgets ${QT_MIN_VERSION} REQUIRED NO_MODULE)
+ endif()
+
+-find_package(Qt5 ${QT_MIN_VERSION}
+- OPTIONAL_COMPONENTS
+- DBus
+- OpenGL
+- XmlPatterns# For Rajce plugin
+-)
++find_package(Qt5DBus ${QT_MIN_VERSION})
++find_package(Qt5OpenGL ${QT_MIN_VERSION})
++find_package(Qt5XmlPatterns ${QT_MIN_VERSION}) # For Rajce plugin
+
+ if(ENABLE_DBUS)
+ if(NOT Qt5DBus_FOUND)
+@@ -86,16 +83,11 @@ endif()
+ # Dependencies For unit tests and CLI test tools
+
+ if(BUILD_TESTING)
+-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED
+- NO_MODULE COMPONENTS
+- Test
+-)
+-
+-find_package(Qt5 ${QT_MIN_VERSION}
+- QUIET
+- OPTIONAL_COMPONENTS
+- Qml WebView # Optional, for 'sialis' O2 library test tool.
+-)
++find_package(Qt5Test ${QT_MIN_VERSION} NO_MODULE)
++
++# Optional, for 'sialis' O2 library test tool.
++find_package(Qt5Qml ${QT_MIN_VERSION} QUIET NO_MODULE)
++find_package(Qt5WebView ${QT_MIN_VERSION} QUIET NO_MODULE)
+ endif()
+
+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
+@@ -113,38 +105,28 @@ find_package(KF5 ${KF5_MIN_VERSION} QUIET
+ OPTIONAL_COMPONENTS
+ KIO# For Desktop integration (Widgets only).
+ IconThemes
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 6c7548a6370115fda8c577b11983101851ba5c86
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Dec 16 14:18:08 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Dec 16 14:18:08 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6c7548a6
media-gfx/digikam: Drop obsolete min dev-util/cmake BDEPEND
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index fc4314dddb..5f81a1ce18 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -100,7 +100,6 @@ RDEPEND="${COMMON_DEPEND}
panorama? ( media-gfx/hugin )
"
BDEPEND="
- >=dev-util/cmake-3.14.3
sys-devel/gettext
panorama? (
sys-devel/bison
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: c7a696d55776373cd4bca1d63435695ddfc32049
Author: David Seifert gentoo org>
AuthorDate: Fri Jun 18 19:16:47 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Jun 20 18:44:52 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c7a696d5
media-gfx/digikam: Depend on dev-libs/boost:=[threads(+)]
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: David Seifert gentoo.org>
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index a596d1108e..0bd0169868 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -29,14 +29,6 @@ IUSE="addressbook calendar gphoto2 heif +imagemagick
+lensfun marble mediaplayer
# bug 366505
RESTRICT+=" test"
-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
@@ -101,12 +93,20 @@ COMMON_DEPEND="
"
DEPEND="${COMMON_DEPEND}
dev-cpp/eigen:3
- dev-libs/boost[threads]
+ dev-libs/boost[threads(+)]
"
RDEPEND="${COMMON_DEPEND}
mysql? ( virtual/mysql[server(+)] )
panorama? ( media-gfx/hugin )
"
+BDEPEND="
+ >=dev-util/cmake-3.14.3
+ sys-devel/gettext
+ panorama? (
+ sys-devel/bison
+ sys-devel/flex
+ )
+"
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: fc48c8f34b5f467fd94031286ef226ad3244df52
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Mar 26 19:32:38 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Mar 26 21:18:07 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=fc48c8f3
media-gfx/digikam: Drop 7.2.0
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-7.2.0_rc.ebuild | 147 --
1 file changed, 147 deletions(-)
diff --git a/media-gfx/digikam/digikam-7.2.0_rc.ebuild
b/media-gfx/digikam/digikam-7.2.0_rc.ebuild
deleted file mode 100644
index c7406e0e9c..00
--- a/media-gfx/digikam/digikam-7.2.0_rc.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.74.0
-QTMIN=5.15.2
-inherit ecm kde.org toolchain-funcs
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- MY_P=${PN}-${PV/_/-}
- if [[ ${PV} =~ rc[0-9]*$ ]]; then
- SRC_URI="mirror://kde/unstable/${PN}/"
- else
- SRC_URI="mirror://kde/stable/${PN}/${PV}/"
- fi
- SRC_URI+="${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 gphoto2 heif +imagemagick +lensfun marble
mediaplayer mysql opengl openmp +panorama scanner semantic-desktop X"
-
-# bug 366505
-RESTRICT+=" test"
-
-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-only]
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5[mysql?]
- >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
- >=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.3.0:=[contrib,contribdnn]
- 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 )
- 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(+)]
- media-video/ffmpeg:=
- )
- 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 )
- 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 )
-"
-
-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_QWEBENGINE=ON
- -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
- $(cmake_use_find_package calendar KF5CalendarCore)
- $(cmake_use_find_package
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 42ea24759791645d66f0e427e3aa4cd603979e9b
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Mar 7 22:02:01 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Mar 7 22:02:01 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=42ea2475
media-gfx/digikam: 7.2.0_rc version bump
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-7.2.0_rc.ebuild | 147 ++
1 file changed, 147 insertions(+)
diff --git a/media-gfx/digikam/digikam-7.2.0_rc.ebuild
b/media-gfx/digikam/digikam-7.2.0_rc.ebuild
new file mode 100644
index 00..c7406e0e9c
--- /dev/null
+++ b/media-gfx/digikam/digikam-7.2.0_rc.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.74.0
+QTMIN=5.15.2
+inherit ecm kde.org toolchain-funcs
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ MY_P=${PN}-${PV/_/-}
+ if [[ ${PV} =~ rc[0-9]*$ ]]; then
+ SRC_URI="mirror://kde/unstable/${PN}/"
+ else
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/"
+ fi
+ SRC_URI+="${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 gphoto2 heif +imagemagick +lensfun marble
mediaplayer mysql opengl openmp +panorama scanner semantic-desktop X"
+
+# bug 366505
+RESTRICT+=" test"
+
+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-only]
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5[mysql?]
+ >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+ >=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.3.0:=[contrib,contribdnn]
+ 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 )
+ 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(+)]
+ media-video/ffmpeg:=
+ )
+ 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 )
+ 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 )
+"
+
+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_QWEBENGINE=ON
+ -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
+ $(cmake_use_find_package calendar KF5CalendarCore)
+
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 92ad645e74fe4d75cc1659e014fce859841f76c1
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Mar 7 22:12:06 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Mar 7 22:12:06 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=92ad645e
media-gfx/digikam: Sync with Gentoo ebuild repo
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 73ceac0b60..a596d1108e 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -26,6 +26,9 @@ LICENSE="GPL-2"
SLOT="5"
IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble
mediaplayer mysql opengl openmp +panorama scanner semantic-desktop X"
+# bug 366505
+RESTRICT+=" test"
+
BDEPEND="
>=dev-util/cmake-3.14.3
sys-devel/gettext
@@ -81,7 +84,7 @@ COMMON_DEPEND="
>=kde-frameworks/kbookmarks-${KFMIN}:5
)
mediaplayer? (
- media-libs/qtav
+ media-libs/qtav[opengl(+)]
media-video/ffmpeg:=
)
opengl? (
@@ -105,9 +108,6 @@ RDEPEND="${COMMON_DEPEND}
panorama? ( media-gfx/hugin )
"
-RESTRICT+=" test"
-# bug 366505
-
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
ecm_pkg_pretend
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/, kde-apps/okular/, media-gfx/kphotoalbum/, kde-apps/gwenview/, ...
commit: e2ab2d7028693c61bbb669c5b3dc9474e8eb4803
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Jan 23 22:22:45 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jan 23 22:22:45 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e2ab2d70
*/*: Switch from virtual/jpeg to media-libs/libjpeg-turbo:=
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/gwenview/gwenview-20.12.49..ebuild | 2 +-
kde-apps/gwenview/gwenview-.ebuild | 2 +-
kde-apps/okular/okular-20.12.49..ebuild | 2 +-
kde-apps/okular/okular-.ebuild | 2 +-
kde-frameworks/khtml/khtml-.ebuild | 2 +-
media-gfx/digikam/digikam-.ebuild | 2 +-
media-gfx/kphotoalbum/kphotoalbum-.ebuild | 2 +-
media-gfx/krita/krita-.ebuild | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/kde-apps/gwenview/gwenview-20.12.49..ebuild
b/kde-apps/gwenview/gwenview-20.12.49..ebuild
index 52b827017f..c9b69f8b37 100644
--- a/kde-apps/gwenview/gwenview-20.12.49..ebuild
+++ b/kde-apps/gwenview/gwenview-20.12.49..ebuild
@@ -45,10 +45,10 @@ COMMON_DEPEND="
>=kde-frameworks/solid-${KFMIN}:5
media-gfx/exiv2:=
media-libs/lcms:2
+ media-libs/libjpeg-turbo:=
media-libs/libpng:0=
>=media-libs/phonon-4.11.0
media-libs/tiff
- virtual/jpeg:0
activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
fits? ( sci-libs/cfitsio )
kipi? ( >=kde-apps/libkipi-${PVCUT}:5= )
diff --git a/kde-apps/gwenview/gwenview-.ebuild
b/kde-apps/gwenview/gwenview-.ebuild
index 52b827017f..c9b69f8b37 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -45,10 +45,10 @@ COMMON_DEPEND="
>=kde-frameworks/solid-${KFMIN}:5
media-gfx/exiv2:=
media-libs/lcms:2
+ media-libs/libjpeg-turbo:=
media-libs/libpng:0=
>=media-libs/phonon-4.11.0
media-libs/tiff
- virtual/jpeg:0
activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
fits? ( sci-libs/cfitsio )
kipi? ( >=kde-apps/libkipi-${PVCUT}:5= )
diff --git a/kde-apps/okular/okular-20.12.49..ebuild
b/kde-apps/okular/okular-20.12.49..ebuild
index 8f80cd0cd9..1098c59a9a 100644
--- a/kde-apps/okular/okular-20.12.49..ebuild
+++ b/kde-apps/okular/okular-20.12.49..ebuild
@@ -56,7 +56,7 @@ DEPEND="
markdown? ( app-text/discount )
mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
pdf? ( app-text/poppler[qt5] )
- plucker? ( virtual/jpeg:0 )
+ plucker? ( media-libs/libjpeg-turbo:= )
postscript? ( app-text/libspectre )
share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
diff --git a/kde-apps/okular/okular-.ebuild
b/kde-apps/okular/okular-.ebuild
index fe8d00a846..c306f66c13 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -56,7 +56,7 @@ DEPEND="
markdown? ( app-text/discount )
mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
pdf? ( app-text/poppler[nss,qt5] )
- plucker? ( virtual/jpeg:0 )
+ plucker? ( media-libs/libjpeg-turbo:= )
postscript? ( app-text/libspectre )
share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
diff --git a/kde-frameworks/khtml/khtml-.ebuild
b/kde-frameworks/khtml/khtml-.ebuild
index 43c4e8901f..6253c629e7 100644
--- a/kde-frameworks/khtml/khtml-.ebuild
+++ b/kde-frameworks/khtml/khtml-.ebuild
@@ -47,10 +47,10 @@ RDEPEND="
=kde-frameworks/kxmlgui-${PVCUT}*:5
=kde-frameworks/sonnet-${PVCUT}*:5
media-libs/giflib:=
+ media-libs/libjpeg-turbo:=
media-libs/libpng:0=
>=media-libs/phonon-4.11.0
sys-libs/zlib
- virtual/jpeg:0
!libressl? ( dev-libs/openssl:0 )
libressl? ( dev-libs/libressl )
X? (
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 73ceac0b60..f09f9c4d12 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -61,11 +61,11 @@ COMMON_DEPEND="
>=kde-frameworks/solid-${KFMIN}:5
>=media-gfx/exiv2-0.27:=
media-libs/lcms:2
+ media-libs/libjpeg-turbo:=
media-libs/liblqr
media-libs/libpng:0=
>=media-libs/opencv-3.3.0:=[contrib,contribdnn]
media-libs/tiff:0
- virtual/jpeg:0
addressbook? (
>=kde-apps/akonadi-contacts-19.04.3:5
>=kde-frameworks/kcontacts-${KFMIN}:5
diff --git a/media-gfx/kphotoalbum/kphotoalbum-.ebuild
b/media-gfx/kphotoalbum/kphotoalbum-.ebuild
index 05d99b7e2d..b78fd50e3c 100644
---
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: b7df69799565934a5793cf32e0c6998d724ceb04
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Dec 6 23:57:45 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Dec 6 23:57:45 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b7df6979
media-gfx/digikam: Update media-libs/qtav DEPEND (drop opengl usedep)
Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 1dea6282b5..a5f359b6bb 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -81,7 +81,7 @@ COMMON_DEPEND="
>=kde-frameworks/kbookmarks-${KFMIN}:5
)
mediaplayer? (
- media-libs/qtav[opengl]
+ media-libs/qtav
media-video/ffmpeg:=
)
opengl? (
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 4d87fa70cd168a98c523932d9d8c43b8cf74d319
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Aug 18 18:34:38 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Aug 18 18:35:06 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=4d87fa70
media-gfx/digikam: Drop IUSE=webkit
Package-Manager: Portage-3.0.3, Repoman-3.0.0
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 7 +++
media-gfx/digikam/metadata.xml| 1 -
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index f96bf0ae40..d630d405fe 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="https://www.digikam.org/;
LICENSE="GPL-2"
SLOT="5"
-IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble
mediaplayer mysql opengl openmp +panorama scanner semantic-desktop webkit X"
+IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble
mediaplayer mysql opengl openmp +panorama scanner semantic-desktop X"
BDEPEND="
>=dev-util/cmake-3.14.3
@@ -42,6 +42,7 @@ COMMON_DEPEND="
>=dev-qt/qtnetwork-${QTMIN}:5
>=dev-qt/qtprintsupport-${QTMIN}:5
>=dev-qt/qtsql-${QTMIN}:5[mysql?]
+ >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
>=dev-qt/qtxmlpatterns-${QTMIN}:5
@@ -90,8 +91,6 @@ COMMON_DEPEND="
panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
scanner? ( >=kde-apps/libksane-19.04.3:5 )
semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}: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
@@ -125,6 +124,7 @@ src_configure() {
-DBUILD_TESTING=OFF # bug 698192
-DENABLE_APPSTYLES=ON
-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
+ -DENABLE_QWEBENGINE=ON
-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
$(cmake_use_find_package calendar KF5CalendarCore)
$(cmake_use_find_package gphoto2 Gphoto2)
@@ -140,7 +140,6 @@ src_configure() {
$(cmake_use_find_package panorama KF5ThreadWeaver)
$(cmake_use_find_package scanner KF5Sane)
$(cmake_use_find_package semantic-desktop KF5FileMetaData)
- -DENABLE_QWEBENGINE=$(usex !webkit)
$(cmake_use_find_package X X11)
)
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
index f08d859d16..518cc8835a 100644
--- a/media-gfx/digikam/metadata.xml
+++ b/media-gfx/digikam/metadata.xml
@@ -17,6 +17,5 @@
Enable support for media player using
media-libs/qtav
Build the panorama plugin which requires
media-gfx/hugin
Enable
kde-frameworks/kfilemetadata support
- Build with dev-qt/qtwebkit
instead of dev-qt/qtwebengine
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: aba1daa58e427d5736a7299a01633302a1ba2711
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue May 26 15:30:25 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue May 26 15:32:12 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=aba1daa5
media-gfx/digikam: Fix MissingUseDepDefault on virtual/mysql
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 9ffd0bb932..434ae7fe07 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -104,7 +104,7 @@ DEPEND="${COMMON_DEPEND}
dev-libs/boost[threads]
"
RDEPEND="${COMMON_DEPEND}
- mysql? ( virtual/mysql[server] )
+ mysql? ( virtual/mysql[server(+)] )
panorama? ( media-gfx/hugin )
"
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
commit: 8a550743edabcfe29c3a632fa2faa9b9c8e489ad
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue May 26 15:11:13 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue May 26 15:11:13 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=8a550743
media-gfx/digikam: Drop 7.0.0_beta3
Moved to Gentoo ebuild repository.
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-7.0.0_beta3.ebuild | 153 -
.../files/digikam-7.0.0_beta2-qt-5.15.patch| 51 ---
2 files changed, 204 deletions(-)
diff --git a/media-gfx/digikam/digikam-7.0.0_beta3.ebuild
b/media-gfx/digikam/digikam-7.0.0_beta3.ebuild
deleted file mode 100644
index eb8596ca2d..00
--- a/media-gfx/digikam/digikam-7.0.0_beta3.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2020 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}
- if [[ ${PV} =~ beta[0-9]$ ]]; then
- SRC_URI="mirror://kde/unstable/${PN}/"
- else
- SRC_URI="mirror://kde/unstable/${PN}/${PV}/"
- fi
- SRC_URI+="${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 gphoto2 heif +imagemagick +lensfun 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-only]
- >=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.3.0:=[contrib,contribdnn]
- 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 )
- 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]
- media-video/ffmpeg:=
- )
- 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 )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-7.0.0_beta2-qt-5.15.patch )
-
-RESTRICT+=" test"
-# bug 366505
-
-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=(
-
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 36fe885f534f491eaeb2e9d71b69df2b4a847cfb
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Apr 26 18:49:41 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Apr 26 18:49:41 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=36fe885f
media-gfx/digikam: Fix patch path
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-7.0.0_beta3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-7.0.0_beta3.ebuild
b/media-gfx/digikam/digikam-7.0.0_beta3.ebuild
index b9dd335861..eb8596ca2d 100644
--- a/media-gfx/digikam/digikam-7.0.0_beta3.ebuild
+++ b/media-gfx/digikam/digikam-7.0.0_beta3.ebuild
@@ -108,7 +108,7 @@ RDEPEND="${COMMON_DEPEND}
panorama? ( media-gfx/hugin )
"
-PATCHES=( "${FILESDIR}"/${P}-qt-5.15.patch )
+PATCHES=( "${FILESDIR}"/${PN}-7.0.0_beta2-qt-5.15.patch )
RESTRICT+=" test"
# bug 366505
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 7e5ec33a6f5bd3fe91e7d78a57215afb59930f59
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Apr 25 15:21:37 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Apr 25 16:06:07 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7e5ec33a
media-gfx/digikam: 7.0.0_beta3 version bump
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../digikam/{digikam-7.0.0_beta2.ebuild => digikam-7.0.0_beta3.ebuild}| 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/media-gfx/digikam/digikam-7.0.0_beta2.ebuild
b/media-gfx/digikam/digikam-7.0.0_beta3.ebuild
similarity index 100%
rename from media-gfx/digikam/digikam-7.0.0_beta2.ebuild
rename to media-gfx/digikam/digikam-7.0.0_beta3.ebuild
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/, media-gfx/digikam/files/
commit: 34ddb2a63471bacfc07cfb8e0c5f3aff7260fc9c
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Apr 19 07:59:25 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Apr 19 07:59:25 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=34ddb2a6
media-gfx/digikam: Fix build with Qt 5.15
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-7.0.0_beta2.ebuild | 2 +
.../files/digikam-7.0.0_beta2-qt-5.15.patch| 51 ++
2 files changed, 53 insertions(+)
diff --git a/media-gfx/digikam/digikam-7.0.0_beta2.ebuild
b/media-gfx/digikam/digikam-7.0.0_beta2.ebuild
index 49e89080ca..d6909e113c 100644
--- a/media-gfx/digikam/digikam-7.0.0_beta2.ebuild
+++ b/media-gfx/digikam/digikam-7.0.0_beta2.ebuild
@@ -109,6 +109,8 @@ RDEPEND="${COMMON_DEPEND}
panorama? ( media-gfx/hugin )
"
+PATCHES=( "${FILESDIR}"/${P}-qt-5.15.patch )
+
RESTRICT+=" test"
# bug 366505
diff --git a/media-gfx/digikam/files/digikam-7.0.0_beta2-qt-5.15.patch
b/media-gfx/digikam/files/digikam-7.0.0_beta2-qt-5.15.patch
new file mode 100644
index 00..fe865eb73a
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-7.0.0_beta2-qt-5.15.patch
@@ -0,0 +1,51 @@
+From 10fd663f43148fc96ed3afeecf70de15cadd0f8a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Sun, 19 Apr 2020 09:55:03 +0200
+Subject: [PATCH] Fix build with Qt 5.15.0
+
+Signed-off-by: Andreas Sturmlechner
+---
+ .../dplugins/generic/view/presentation/opengl/presentationgl.cpp | 1 +
+ core/libs/dimg/filters/curves/curveswidget.cpp | 1 +
+ core/libs/dimg/filters/levels/histogrampainter.cpp | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp
b/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp
+index b37699436e..6a4f173ab0 100644
+--- a/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp
b/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp
+@@ -44,6 +44,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
+diff --git a/core/libs/dimg/filters/curves/curveswidget.cpp
b/core/libs/dimg/filters/curves/curveswidget.cpp
+index cbd156..d0beef9bf2 100644
+--- a/core/libs/dimg/filters/curves/curveswidget.cpp
b/core/libs/dimg/filters/curves/curveswidget.cpp
+@@ -40,6 +40,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+
+diff --git a/core/libs/dimg/filters/levels/histogrampainter.cpp
b/core/libs/dimg/filters/levels/histogrampainter.cpp
+index 241d5fc4c8..f11ad4b560 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
+
+--
+2.26.1
+
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/, kde-plasma/kinfocenter/, kde-plasma/kwin/, media-gfx/krita/, ...
commit: 359854334e5b10ae8f143d9ffa71423a74c009a6
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Mar 21 23:40:52 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Apr 3 19:13:18 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=35985433
*/*: IUSE gles2 -> gles2-only
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/analitza/analitza-20.03.90.ebuild | 2 +-
kde-apps/analitza/analitza-20.04.49..ebuild| 2 +-
kde-apps/analitza/analitza-.ebuild | 2 +-
kde-apps/kdenlive/kdenlive-20.03.90.ebuild | 4 ++--
kde-apps/kdenlive/kdenlive-20.04.49..ebuild| 4 ++--
kde-apps/kdenlive/kdenlive-.ebuild | 4 ++--
kde-apps/kdenlive/metadata.xml | 1 -
kde-frameworks/plasma/metadata.xml | 3 ---
kde-frameworks/plasma/plasma-.ebuild | 6 +++---
kde-plasma/kinfocenter/kinfocenter-5.18.49..ebuild | 14 +++---
kde-plasma/kinfocenter/kinfocenter-.ebuild | 14 +++---
kde-plasma/kinfocenter/metadata.xml| 1 -
kde-plasma/kwin/kwin-5.18.49..ebuild | 7 ---
kde-plasma/kwin/kwin-.ebuild | 7 ---
kde-plasma/kwin/metadata.xml | 1 -
media-gfx/digikam/digikam-7.0.0_beta2.ebuild | 2 +-
media-gfx/digikam/digikam-.ebuild | 2 +-
media-gfx/krita/krita-.ebuild | 2 +-
18 files changed, 37 insertions(+), 41 deletions(-)
diff --git a/kde-apps/analitza/analitza-20.03.90.ebuild
b/kde-apps/analitza/analitza-20.03.90.ebuild
index 37c37e1637..68e3b648b9 100644
--- a/kde-apps/analitza/analitza-20.03.90.ebuild
+++ b/kde-apps/analitza/analitza-20.03.90.ebuild
@@ -20,7 +20,7 @@ BDEPEND="
"
DEPEND="
>=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5[-gles2]
+ >=dev-qt/qtgui-${QTMIN}:5[-gles2-only]
>=dev-qt/qtprintsupport-${QTMIN}:5
>=dev-qt/qtsvg-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
diff --git a/kde-apps/analitza/analitza-20.04.49..ebuild
b/kde-apps/analitza/analitza-20.04.49..ebuild
index f83c44acff..447a2f 100644
--- a/kde-apps/analitza/analitza-20.04.49..ebuild
+++ b/kde-apps/analitza/analitza-20.04.49..ebuild
@@ -20,7 +20,7 @@ BDEPEND="
"
DEPEND="
>=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5[-gles2]
+ >=dev-qt/qtgui-${QTMIN}:5[-gles2-only]
>=dev-qt/qtprintsupport-${QTMIN}:5
>=dev-qt/qtsvg-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
diff --git a/kde-apps/analitza/analitza-.ebuild
b/kde-apps/analitza/analitza-.ebuild
index f83c44acff..447a2f 100644
--- a/kde-apps/analitza/analitza-.ebuild
+++ b/kde-apps/analitza/analitza-.ebuild
@@ -20,7 +20,7 @@ BDEPEND="
"
DEPEND="
>=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5[-gles2]
+ >=dev-qt/qtgui-${QTMIN}:5[-gles2-only]
>=dev-qt/qtprintsupport-${QTMIN}:5
>=dev-qt/qtsvg-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
diff --git a/kde-apps/kdenlive/kdenlive-20.03.90.ebuild
b/kde-apps/kdenlive/kdenlive-20.03.90.ebuild
index ba02bfabca..c20235cce0 100644
--- a/kde-apps/kdenlive/kdenlive-20.03.90.ebuild
+++ b/kde-apps/kdenlive/kdenlive-20.03.90.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://kdenlive.org/en/;
LICENSE="GPL-2"
SLOT="5"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="freesound gles2 semantic-desktop share v4l"
+IUSE="freesound gles2-only semantic-desktop share v4l"
BDEPEND="
sys-devel/gettext
@@ -26,7 +26,7 @@ DEPEND="
>=dev-qt/qtconcurrent-${QTMIN}:5
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5[gles2=]
+ >=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
>=dev-qt/qtmultimedia-${QTMIN}:5
>=dev-qt/qtnetwork-${QTMIN}:5
>=dev-qt/qtquickcontrols2-${QTMIN}:5
diff --git a/kde-apps/kdenlive/kdenlive-20.04.49..ebuild
b/kde-apps/kdenlive/kdenlive-20.04.49..ebuild
index 5f8301a148..4728a04231 100644
--- a/kde-apps/kdenlive/kdenlive-20.04.49..ebuild
+++ b/kde-apps/kdenlive/kdenlive-20.04.49..ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://kdenlive.org/en/;
LICENSE="GPL-2"
SLOT="5"
KEYWORDS=""
-IUSE="freesound gles2 semantic-desktop share v4l"
+IUSE="freesound gles2-only semantic-desktop share v4l"
BDEPEND="
sys-devel/gettext
@@ -26,7 +26,7 @@ DEPEND="
>=dev-qt/qtconcurrent-${QTMIN}:5
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5[gles2=]
+ >=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
>=dev-qt/qtmultimedia-${QTMIN}:5
>=dev-qt/qtnetwork-${QTMIN}:5
>=dev-qt/qtquickcontrols2-${QTMIN}:5
diff --git a/kde-apps/kdenlive/kdenlive-.ebuild
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 674b260a3a5e1db26f72aa1f774c888f005c401b
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Mar 31 17:59:40 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Apr 3 14:22:54 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=674b260a
media-gfx/digikam: 7.0.0-beta2 version bump
No keywords because pre-release version.
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-7.0.0_beta2.ebuild | 152 +++
1 file changed, 152 insertions(+)
diff --git a/media-gfx/digikam/digikam-7.0.0_beta2.ebuild
b/media-gfx/digikam/digikam-7.0.0_beta2.ebuild
new file mode 100644
index 00..92c5c46e47
--- /dev/null
+++ b/media-gfx/digikam/digikam-7.0.0_beta2.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2020 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}
+ if [[ ${PV} =~ beta[0-9]$ ]]; then
+ SRC_URI="mirror://kde/unstable/${PN}/"
+ else
+ SRC_URI="mirror://kde/unstable/${PN}/${PV}/"
+ fi
+ SRC_URI+="${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 gphoto2 heif +imagemagick +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.3.0:=[contrib,contribdnn]
+ 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 )
+ 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
+
+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
+
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 09ce89d2643715ae778f9d4fa7826b41ee1521d0
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Mar 31 17:59:40 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Apr 2 00:50:05 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=09ce89d2
media-gfx/digikam: Update release switch with current unstable paths
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 31cb7a11c7..b304214bc7 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -10,9 +10,12 @@ 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"
+ if [[ ${PV} =~ beta[0-9]$ ]]; then
+ SRC_URI="mirror://kde/unstable/${PN}/"
+ else
+ SRC_URI="mirror://kde/unstable/${PN}/${PV}/"
+ fi
+ SRC_URI+="${MY_P}.tar.xz"
KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/${MY_P}"
fi
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 94ce677e730dab74c073f9ac560ab3c8111d9c08
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Mar 31 18:49:42 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Apr 2 00:54:41 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=94ce677e
media-gfx/digikam: Drop USE dnn
This is now unconditional upstream, commit
8f88c85672c1afdcc88162afbdb674ba874fb1fc
Package-Manager: Portage-2.3.96, Repoman-2.3.22
RepoMan-Options: --force
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 6 ++
media-gfx/digikam/metadata.xml| 1 -
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index b304214bc7..b7a206a7f9 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -25,7 +25,7 @@ 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"
+IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun libav marble
mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte
webkit X"
BDEPEND="
>=dev-util/cmake-3.14.3
@@ -63,7 +63,7 @@ COMMON_DEPEND="
media-libs/lcms:2
media-libs/liblqr
media-libs/libpng:0=
- >=media-libs/opencv-3.1.0:=
+ >=media-libs/opencv-3.3.0:=[contrib,contribdnn]
media-libs/tiff:0
virtual/jpeg:0
addressbook? (
@@ -71,7 +71,6 @@ COMMON_DEPEND="
>=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:= )
@@ -131,7 +130,6 @@ src_configure() {
-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)
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
index 5843335b38..a9fe85e506 100644
--- a/media-gfx/digikam/metadata.xml
+++ b/media-gfx/digikam/metadata.xml
@@ -10,7 +10,6 @@
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
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 841baf53b2f9f86b9d1a37bd6d4441a1b1d137a8 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Jan 2 20:09:43 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jan 2 20:09:43 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=841baf53 media-gfx/digikam: Drop CMAKE_MIN_VERSION BDEPEND on >=dev-util/cmake-3.14.3 directly. Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/digikam/digikam-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/digikam/digikam-.ebuild b/media-gfx/digikam/digikam-.ebuild index 954a99b061..31cb7a11c7 100644 --- a/media-gfx/digikam/digikam-.ebuild +++ b/media-gfx/digikam/digikam-.ebuild @@ -3,7 +3,6 @@ EAPI=7 -CMAKE_MIN_VERSION=3.14.3 KFMIN=5.60.0 QTMIN=5.12.3 inherit ecm kde.org toolchain-funcs @@ -26,6 +25,7 @@ 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
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: a7ae7f5ac5a4990a48ddc894b165b35ac79267cc
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Dec 18 12:14:02 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Dec 18 12:14:02 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a7ae7f5a
media-gfx/digikam: Raise minimum media-gfx/exiv2 version
Upstream commits:
06e77271d72fe5e4abeb38641f3addc2cfbff126
7da4bdc47879a13a3e316d4e16ddeb100a4056fb
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 393c64c7ef..c9c7d44c89 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -33,6 +33,7 @@ BDEPEND="
)
"
COMMON_DEPEND="
+ dev-libs/expat
>=dev-qt/qtconcurrent-${QTMIN}:5
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5[-gles2]
@@ -42,7 +43,6 @@ COMMON_DEPEND="
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
>=dev-qt/qtxmlpatterns-${QTMIN}:5
- dev-libs/expat
>=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/kconfigwidgets-${KFMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
@@ -56,7 +56,7 @@ COMMON_DEPEND="
>=kde-frameworks/kwindowsystem-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
>=kde-frameworks/solid-${KFMIN}:5
- >=media-gfx/exiv2-0.26:=
+ >=media-gfx/exiv2-0.27:=
media-libs/lcms:2
media-libs/liblqr
media-libs/libpng:0=
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 90dc47b985de63fb9c7d186ff3521b75e0651890
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Dec 18 12:22:29 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Dec 18 12:22:29 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=90dc47b9
media-gfx/digikam: Add USE heif using media-libs/x265
Upstream commit 4968bda51b4cc17c72e5b978a770aa7b3ab7b8bd
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 4 +++-
media-gfx/digikam/metadata.xml| 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index c9c7d44c89..a42aa5b436 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="https://www.digikam.org/;
LICENSE="GPL-2"
SLOT="5"
-IUSE="addressbook calendar dnn +imagemagick gphoto2 +lensfun libav marble
mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte
webkit X"
+IUSE="addressbook calendar dnn heif +imagemagick gphoto2 +lensfun libav marble
mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte
webkit X"
BDEPEND="
sys-devel/gettext
@@ -70,6 +70,7 @@ COMMON_DEPEND="
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? (
@@ -129,6 +130,7 @@ src_configure() {
$(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)
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
index 3f8f9d04dc..5843335b38 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
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: af1969f44c2939b28ff856c4605ce80dbb848ffa
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Nov 28 18:21:23 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Nov 29 10:36:56 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=af1969f4
media-gfx/digikam: IUSE contrib_dnn -> contribdnn
Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Andreas Sturmlechner gentoo.org>
Signed-off-by: Amy Liffey gentoo.org>
media-gfx/digikam/digikam-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 8ee402c197..393c64c7ef 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -68,7 +68,7 @@ COMMON_DEPEND="
>=kde-frameworks/kcontacts-${KFMIN}:5
)
calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 )
- dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contrib_dnn] )
+ dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contribdnn] )
gphoto2? ( media-libs/libgphoto2:= )
imagemagick? ( media-gfx/imagemagick:= )
lensfun? ( media-libs/lensfun )
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 766fa7a3c22c0ab27b4a90600f6b58a47345fa17
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Nov 10 21:07:36 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Nov 10 21:07:36 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=766fa7a3
media-gfx/digikam: s/QT5MIN/QTMIN/
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 28 ++--
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index bf9732056d..4323ddcfbc 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -5,7 +5,7 @@ EAPI=7
CMAKE_MIN_VERSION=3.14.3
KFMIN=5.60.0
-QT5MIN=5.12.3
+QTMIN=5.12.3
inherit ecm kde.org toolchain-funcs
if [[ ${KDE_BUILD_TYPE} != live ]]; then
@@ -33,15 +33,15 @@ BDEPEND="
)
"
COMMON_DEPEND="
- >=dev-qt/qtconcurrent-${QT5MIN}:5
- >=dev-qt/qtdbus-${QT5MIN}:5
- >=dev-qt/qtgui-${QT5MIN}:5[-gles2]
- >=dev-qt/qtnetwork-${QT5MIN}:5
- >=dev-qt/qtprintsupport-${QT5MIN}:5
- >=dev-qt/qtsql-${QT5MIN}:5[mysql?]
- >=dev-qt/qtwidgets-${QT5MIN}:5
- >=dev-qt/qtxml-${QT5MIN}:5
- >=dev-qt/qtxmlpatterns-${QT5MIN}:5
+ >=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
dev-libs/expat
>=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/kconfigwidgets-${KFMIN}:5
@@ -73,7 +73,7 @@ COMMON_DEPEND="
imagemagick? ( media-gfx/imagemagick:= )
lensfun? ( media-libs/lensfun )
marble? (
- >=dev-qt/qtconcurrent-${QT5MIN}:5
+ >=dev-qt/qtconcurrent-${QTMIN}:5
>=kde-apps/marble-19.04.3:5
>=kde-frameworks/kbookmarks-${KFMIN}:5
)
@@ -83,17 +83,17 @@ COMMON_DEPEND="
libav? ( media-video/libav:= )
)
opengl? (
- >=dev-qt/qtopengl-${QT5MIN}:5
+ >=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-${QT5MIN}:5[widgets] )
+ !webkit? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
X? (
- >=dev-qt/qtx11extras-${QT5MIN}:5
+ >=dev-qt/qtx11extras-${QTMIN}:5
x11-libs/libX11
)
"
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 43334d15939e0d3b75f75bfbc83e49b0d47e0d58
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Nov 10 20:53:21 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Nov 10 20:53:21 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=43334d15
media-gfx/digikam: s/KF5MIN/KFMIN/
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 38 +--
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 2d8bbacc08..bf9732056d 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -4,7 +4,7 @@
EAPI=7
CMAKE_MIN_VERSION=3.14.3
-KF5MIN=5.60.0
+KFMIN=5.60.0
QT5MIN=5.12.3
inherit ecm kde.org toolchain-funcs
@@ -43,19 +43,19 @@ COMMON_DEPEND="
>=dev-qt/qtxml-${QT5MIN}:5
>=dev-qt/qtxmlpatterns-${QT5MIN}:5
dev-libs/expat
- >=kde-frameworks/kconfig-${KF5MIN}:5
- >=kde-frameworks/kconfigwidgets-${KF5MIN}:5
- >=kde-frameworks/kcoreaddons-${KF5MIN}:5
- >=kde-frameworks/ki18n-${KF5MIN}:5
- >=kde-frameworks/kiconthemes-${KF5MIN}:5
- >=kde-frameworks/kio-${KF5MIN}:5
- >=kde-frameworks/knotifications-${KF5MIN}:5
- >=kde-frameworks/knotifyconfig-${KF5MIN}:5
- >=kde-frameworks/kservice-${KF5MIN}:5
- >=kde-frameworks/kwidgetsaddons-${KF5MIN}:5
- >=kde-frameworks/kwindowsystem-${KF5MIN}:5
- >=kde-frameworks/kxmlgui-${KF5MIN}:5
- >=kde-frameworks/solid-${KF5MIN}: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.26:=
media-libs/lcms:2
media-libs/liblqr
@@ -65,9 +65,9 @@ COMMON_DEPEND="
virtual/jpeg:0
addressbook? (
>=kde-apps/akonadi-contacts-19.04.3:5
- >=kde-frameworks/kcontacts-${KF5MIN}:5
+ >=kde-frameworks/kcontacts-${KFMIN}:5
)
- calendar? ( >=kde-frameworks/kcalendarcore-${KF5MIN}:5 )
+ calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 )
dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contrib_dnn] )
gphoto2? ( media-libs/libgphoto2:= )
imagemagick? ( media-gfx/imagemagick:= )
@@ -75,7 +75,7 @@ COMMON_DEPEND="
marble? (
>=dev-qt/qtconcurrent-${QT5MIN}:5
>=kde-apps/marble-19.04.3:5
- >=kde-frameworks/kbookmarks-${KF5MIN}:5
+ >=kde-frameworks/kbookmarks-${KFMIN}:5
)
mediaplayer? (
media-libs/qtav[opengl]
@@ -86,9 +86,9 @@ COMMON_DEPEND="
>=dev-qt/qtopengl-${QT5MIN}:5
virtual/opengl
)
- panorama? ( >=kde-frameworks/threadweaver-${KF5MIN}:5 )
+ panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
scanner? ( >=kde-apps/libksane-19.04.3:5 )
- semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KF5MIN}:5 )
+ semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
vkontakte? ( net-libs/libkvkontakte:5 )
!webkit? ( >=dev-qt/qtwebengine-${QT5MIN}:5[widgets] )
webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: d7003597a5ca3085db7f236ff01f8ba9cfbbcac4
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Nov 6 15:14:31 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Nov 10 17:10:44 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d7003597
media-gfx/digikam: Port to ecm.eclass and kde.org.eclass
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 79 ++-
1 file changed, 41 insertions(+), 38 deletions(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 2cfc9c72f8..2d8bbacc08 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -4,7 +4,9 @@
EAPI=7
CMAKE_MIN_VERSION=3.14.3
-inherit kde5 toolchain-funcs
+KF5MIN=5.60.0
+QT5MIN=5.12.3
+inherit ecm kde.org toolchain-funcs
if [[ ${KDE_BUILD_TYPE} != live ]]; then
MY_PV=${PV/_/-}
@@ -20,6 +22,7 @@ DESCRIPTION="Digital photo management application"
HOMEPAGE="https://www.digikam.org/;
LICENSE="GPL-2"
+SLOT="5"
IUSE="addressbook calendar dnn +imagemagick gphoto2 +lensfun libav marble
mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte
webkit X"
BDEPEND="
@@ -30,29 +33,29 @@ BDEPEND="
)
"
COMMON_DEPEND="
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep knotifications)
- $(add_frameworks_dep knotifyconfig)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem)
- $(add_frameworks_dep kxmlgui)
- $(add_frameworks_dep solid)
- $(add_qt_dep qtconcurrent)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtgui '-gles2')
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtprintsupport)
- $(add_qt_dep qtsql 'mysql?')
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- $(add_qt_dep qtxmlpatterns)
+ >=dev-qt/qtconcurrent-${QT5MIN}:5
+ >=dev-qt/qtdbus-${QT5MIN}:5
+ >=dev-qt/qtgui-${QT5MIN}:5[-gles2]
+ >=dev-qt/qtnetwork-${QT5MIN}:5
+ >=dev-qt/qtprintsupport-${QT5MIN}:5
+ >=dev-qt/qtsql-${QT5MIN}:5[mysql?]
+ >=dev-qt/qtwidgets-${QT5MIN}:5
+ >=dev-qt/qtxml-${QT5MIN}:5
+ >=dev-qt/qtxmlpatterns-${QT5MIN}:5
dev-libs/expat
+ >=kde-frameworks/kconfig-${KF5MIN}:5
+ >=kde-frameworks/kconfigwidgets-${KF5MIN}:5
+ >=kde-frameworks/kcoreaddons-${KF5MIN}:5
+ >=kde-frameworks/ki18n-${KF5MIN}:5
+ >=kde-frameworks/kiconthemes-${KF5MIN}:5
+ >=kde-frameworks/kio-${KF5MIN}:5
+ >=kde-frameworks/knotifications-${KF5MIN}:5
+ >=kde-frameworks/knotifyconfig-${KF5MIN}:5
+ >=kde-frameworks/kservice-${KF5MIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KF5MIN}:5
+ >=kde-frameworks/kwindowsystem-${KF5MIN}:5
+ >=kde-frameworks/kxmlgui-${KF5MIN}:5
+ >=kde-frameworks/solid-${KF5MIN}:5
>=media-gfx/exiv2-0.26:=
media-libs/lcms:2
media-libs/liblqr
@@ -61,18 +64,18 @@ COMMON_DEPEND="
media-libs/tiff:0
virtual/jpeg:0
addressbook? (
- $(add_frameworks_dep kcontacts)
- $(add_kdeapps_dep akonadi-contacts)
+ >=kde-apps/akonadi-contacts-19.04.3:5
+ >=kde-frameworks/kcontacts-${KF5MIN}:5
)
- calendar? ( $(add_frameworks_dep kcalendarcore) )
+ calendar? ( >=kde-frameworks/kcalendarcore-${KF5MIN}:5 )
dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contrib_dnn] )
gphoto2? ( media-libs/libgphoto2:= )
imagemagick? ( media-gfx/imagemagick:= )
lensfun? ( media-libs/lensfun )
marble? (
- $(add_frameworks_dep kbookmarks)
- $(add_kdeapps_dep marble)
- $(add_qt_dep qtconcurrent)
+ >=dev-qt/qtconcurrent-${QT5MIN}:5
+ >=kde-apps/marble-19.04.3:5
+ >=kde-frameworks/kbookmarks-${KF5MIN}:5
)
mediaplayer? (
media-libs/qtav[opengl]
@@ -80,17 +83,17 @@ COMMON_DEPEND="
libav? ( media-video/libav:= )
)
opengl? (
- $(add_qt_dep qtopengl)
+ >=dev-qt/qtopengl-${QT5MIN}:5
virtual/opengl
)
- panorama? ( $(add_frameworks_dep threadweaver) )
- scanner? ( $(add_kdeapps_dep libksane) )
- semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
+ panorama? ( >=kde-frameworks/threadweaver-${KF5MIN}:5 )
+ scanner? ( >=kde-apps/libksane-19.04.3:5 )
+ semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KF5MIN}:5 )
vkontakte? ( net-libs/libkvkontakte:5 )
-
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: a12ae54e2fb2080de4cf817cbf3037247bed3298
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Oct 21 11:54:59 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Oct 21 14:12:26 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a12ae54e
media-gfx/digikam: Don't even try to build broken tests
Closes: https://bugs.gentoo.org/698192
Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index bd9a6f5057..2cfc9c72f8 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -119,6 +119,7 @@ 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)
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 5dc703a4d6f0528294753c9d1bbbebf6a83bf3ee
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Aug 8 16:55:42 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Aug 8 16:55:42 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=5dc703a4
media-gfx/digikam: Drop USE jpeg2k
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index b931fb9fd4..3ffd1cfb3f 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -20,7 +20,7 @@ DESCRIPTION="Digital photo management application"
HOMEPAGE="https://www.digikam.org/;
LICENSE="GPL-2"
-IUSE="addressbook calendar dnn +imagemagick gphoto2 jpeg2k +lensfun libav
marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop
vkontakte webkit X"
+IUSE="addressbook calendar dnn +imagemagick gphoto2 +lensfun libav marble
mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte
webkit X"
BDEPEND="
sys-devel/gettext
@@ -68,7 +68,6 @@ COMMON_DEPEND="
dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contrib_dnn] )
gphoto2? ( media-libs/libgphoto2:= )
imagemagick? ( media-gfx/imagemagick:= )
- jpeg2k? ( media-libs/jasper:= )
lensfun? ( media-libs/lensfun )
marble? (
$(add_frameworks_dep kbookmarks)
@@ -121,12 +120,12 @@ pkg_setup() {
src_configure() {
local mycmakeargs=(
-DENABLE_APPSTYLES=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
$(cmake-utils_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 jpeg2k Jasper)
$(cmake-utils_use_find_package lensfun LensFun)
$(cmake-utils_use_find_package marble Marble)
-DENABLE_MEDIAPLAYER=$(usex mediaplayer)
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 186d147fec6d39855b173f6203efd6d0ec28868f
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Jun 5 18:11:17 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Jun 5 18:11:17 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=186d147f
media-gfx/digikam: Set CMAKE_MIN_VERSION=3.14.3
In an attempt to fix build with ninja.
Closes: https://bugs.gentoo.org/677858
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 7b50ecaaa3..b931fb9fd4 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -3,6 +3,7 @@
EAPI=7
+CMAKE_MIN_VERSION=3.14.3
inherit kde5 toolchain-funcs
if [[ ${KDE_BUILD_TYPE} != live ]]; then
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 880e716edee04e1795a35e9972442da08996a3a8 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri May 10 19:45:47 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri May 10 19:45:47 2019 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=880e716e media-gfx/digikam: Add media-libs/opencv[contrib] DEPEND to USE=dnn Bug: https://bugs.gentoo.org/684692 Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/digikam/digikam-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/digikam/digikam-.ebuild b/media-gfx/digikam/digikam-.ebuild index 82fb491f7b..7b50ecaaa3 100644 --- a/media-gfx/digikam/digikam-.ebuild +++ b/media-gfx/digikam/digikam-.ebuild @@ -64,7 +64,7 @@ COMMON_DEPEND=" $(add_kdeapps_dep kcontacts) ) calendar? ( $(add_kdeapps_dep kcalcore) ) - dnn? ( >=media-libs/opencv-3.1.0:=[contrib_dnn] ) + dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contrib_dnn] ) gphoto2? ( media-libs/libgphoto2:= ) imagemagick? ( media-gfx/imagemagick:= ) jpeg2k? ( media-libs/jasper:= )
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 4ca64f16dac0845c46da8c8216e3f031c0ff82d9
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Apr 21 12:33:29 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Apr 21 12:33:29 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=4ca64f16
media-gfx/digikam: Add USE imagemagick
Upstream commit 86a40546894c7b053ab3aad85a11a0c709e60220
Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 4 +++-
media-gfx/digikam/metadata.xml| 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 958fe6b291..82fb491f7b 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -19,7 +19,7 @@ DESCRIPTION="Digital photo management application"
HOMEPAGE="https://www.digikam.org/;
LICENSE="GPL-2"
-IUSE="addressbook calendar dnn gphoto2 jpeg2k +lensfun libav marble
mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte
webkit X"
+IUSE="addressbook calendar dnn +imagemagick gphoto2 jpeg2k +lensfun libav
marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop
vkontakte webkit X"
BDEPEND="
sys-devel/gettext
@@ -66,6 +66,7 @@ COMMON_DEPEND="
calendar? ( $(add_kdeapps_dep kcalcore) )
dnn? ( >=media-libs/opencv-3.1.0:=[contrib_dnn] )
gphoto2? ( media-libs/libgphoto2:= )
+ imagemagick? ( media-gfx/imagemagick:= )
jpeg2k? ( media-libs/jasper:= )
lensfun? ( media-libs/lensfun )
marble? (
@@ -123,6 +124,7 @@ src_configure() {
$(cmake-utils_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 jpeg2k Jasper)
$(cmake-utils_use_find_package lensfun LensFun)
$(cmake-utils_use_find_package marble Marble)
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
index db75c6dcb2..3f8f9d04dc 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 additional image
formats such as XCF, FITS, HEIC etc.
Enable support for
media-libs/lensfun
Enable support for geolocation using
kde-apps/marble
Enable support for media player using
media-libs/qtav
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 07a4dd7e5cbe0657e39ce2e892fc37989fcbd668
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Apr 21 12:21:05 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Apr 21 12:23:24 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=07a4dd7e
media-gfx/digikam: Add USE dnn
Upstream commit 6a3da298103797d01fa0cb049cccaff39bd1583e
Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 4 +++-
media-gfx/digikam/metadata.xml| 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 1ed43c3ed6..958fe6b291 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -19,7 +19,7 @@ DESCRIPTION="Digital photo management application"
HOMEPAGE="https://www.digikam.org/;
LICENSE="GPL-2"
-IUSE="addressbook calendar gphoto2 jpeg2k +lensfun libav marble mediaplayer
mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X"
+IUSE="addressbook calendar dnn gphoto2 jpeg2k +lensfun libav marble
mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte
webkit X"
BDEPEND="
sys-devel/gettext
@@ -64,6 +64,7 @@ COMMON_DEPEND="
$(add_kdeapps_dep kcontacts)
)
calendar? ( $(add_kdeapps_dep kcalcore) )
+ dnn? ( >=media-libs/opencv-3.1.0:=[contrib_dnn] )
gphoto2? ( media-libs/libgphoto2:= )
jpeg2k? ( media-libs/jasper:= )
lensfun? ( media-libs/lensfun )
@@ -120,6 +121,7 @@ src_configure() {
-DENABLE_APPSTYLES=ON
-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
$(cmake-utils_use_find_package calendar KF5CalendarCore)
+ -DENABLE_FACESENGINE_DNN=$(usex dnn)
$(cmake-utils_use_find_package gphoto2 Gphoto2)
$(cmake-utils_use_find_package jpeg2k Jasper)
$(cmake-utils_use_find_package lensfun LensFun)
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
index fe15e413c1..db75c6dcb2 100644
--- a/media-gfx/digikam/metadata.xml
+++ b/media-gfx/digikam/metadata.xml
@@ -10,6 +10,7 @@
Enable akonadi contact
integration
+ Build neural network faces engine module
Enable support for
media-libs/lensfun
Enable support for geolocation using
kde-apps/marble
Enable support for media player using
media-libs/qtav
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 2062ac13d246b61d5b93985956e624cf384adeae
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Feb 11 13:16:00 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Feb 13 13:38:35 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2062ac13
media-gfx/digikam: Fix SRC_URI
Signed-off-by: Andreas Sturmlechner gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
media-gfx/digikam/digikam-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 6854dbe74f..1ed43c3ed6 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -10,7 +10,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
MY_P=${PN}-${MY_PV}
SRC_BRANCH=stable
[[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable
- SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${MY_P}.tar.xz"
+ SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${PV}/${MY_P}.tar.xz"
KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/${MY_P}"
fi
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 681629f1e7ffaccfb5fd575db5570e429f82fc94
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Jan 19 17:10:55 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jan 26 20:28:43 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=681629f1
media-gfx/digikam: EAPI-7 bump
Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 32 +++-
1 file changed, 15 insertions(+), 17 deletions(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 104e598290..b48b85ac33 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -1,30 +1,33 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- KDE_HANDBOOK="true"
- KDE_TEST="true"
-fi
inherit kde5 toolchain-funcs
-DESCRIPTION="Digital photo management application"
-HOMEPAGE="https://www.digikam.org/;
-
-LICENSE="GPL-2"
-IUSE="addressbook calendar gphoto2 jpeg2k +lensfun libav marble mediaplayer
mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X"
-
if [[ ${KDE_BUILD_TYPE} != live ]]; then
- KEYWORDS="~amd64 ~x86"
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/${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"
+IUSE="addressbook calendar gphoto2 jpeg2k +lensfun libav marble mediaplayer
mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X"
+
+BDEPEND="
+ sys-devel/gettext
+ panorama? (
+ sys-devel/bison
+ sys-devel/flex
+ )
+"
COMMON_DEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
@@ -92,11 +95,6 @@ COMMON_DEPEND="
DEPEND="${COMMON_DEPEND}
dev-cpp/eigen:3
dev-libs/boost[threads]
- sys-devel/gettext
- panorama? (
- sys-devel/bison
- sys-devel/flex
- )
"
RDEPEND="${COMMON_DEPEND}
mysql? ( virtual/mysql[server] )
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 73162c3b1417d45855ddf3cf3582c48369309ae3
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Dec 30 13:43:59 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Dec 30 13:43:59 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=73162c3b
media-gfx/digikam: Drop 6.0.0_beta3
Moved to Gentoo ebuild repository.
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-6.0.0_beta3.ebuild | 143 ---
1 file changed, 143 deletions(-)
diff --git a/media-gfx/digikam/digikam-6.0.0_beta3.ebuild
b/media-gfx/digikam/digikam-6.0.0_beta3.ebuild
deleted file mode 100644
index 48c1135b4f..00
--- a/media-gfx/digikam/digikam-6.0.0_beta3.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- KDE_HANDBOOK="true"
- KDE_TEST="true"
-fi
-inherit kde5 toolchain-funcs
-
-DESCRIPTION="Digital photo management application"
-HOMEPAGE="https://www.digikam.org/;
-
-LICENSE="GPL-2"
-IUSE="addressbook calendar gphoto2 jpeg2k +lensfun libav marble mediaplayer
mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X"
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- KEYWORDS="~amd64 ~x86"
- 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/${MY_P}.tar.xz"
- S="${WORKDIR}/${MY_P}"
-fi
-
-COMMON_DEPEND="
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep knotifications)
- $(add_frameworks_dep knotifyconfig)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem)
- $(add_frameworks_dep kxmlgui)
- $(add_frameworks_dep solid)
- $(add_qt_dep qtconcurrent)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtgui '-gles2')
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtprintsupport)
- $(add_qt_dep qtsql 'mysql?')
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- $(add_qt_dep qtxmlpatterns)
- dev-libs/expat
- >=media-gfx/exiv2-0.26:=
- 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? (
- $(add_kdeapps_dep akonadi-contacts)
- $(add_kdeapps_dep kcontacts)
- )
- calendar? ( $(add_kdeapps_dep kcalcore) )
- gphoto2? ( media-libs/libgphoto2:= )
- jpeg2k? ( media-libs/jasper:= )
- lensfun? ( media-libs/lensfun )
- marble? (
- $(add_frameworks_dep kbookmarks)
- $(add_kdeapps_dep marble)
- $(add_qt_dep qtconcurrent)
- )
- mediaplayer? (
- media-libs/qtav[opengl]
- !libav? ( media-video/ffmpeg:= )
- libav? ( media-video/libav:= )
- )
- opengl? (
- $(add_qt_dep qtopengl)
- virtual/opengl
- )
- panorama? ( $(add_frameworks_dep threadweaver) )
- scanner? ( $(add_kdeapps_dep libksane) )
- semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
- vkontakte? ( net-libs/libkvkontakte:5 )
- !webkit? ( $(add_qt_dep qtwebengine 'widgets') )
- webkit? ( $(add_qt_dep qtwebkit) )
- X? (
- $(add_qt_dep qtx11extras)
- x11-libs/libX11
- )
-"
-DEPEND="${COMMON_DEPEND}
- dev-cpp/eigen:3
- dev-libs/boost[threads]
- sys-devel/gettext
- panorama? (
- sys-devel/bison
- sys-devel/flex
- )
-"
-RDEPEND="${COMMON_DEPEND}
- mysql? ( virtual/mysql[server] )
- panorama? ( media-gfx/hugin )
-"
-
-RESTRICT+=" test"
-# bug 366505
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
- kde5_pkg_pretend
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
- kde5_pkg_setup
-}
-
-# FIXME: Unbundle libraw (libs/rawengine/libraw)
-src_configure() {
- local mycmakeargs=(
- -DENABLE_APPSTYLES=ON
- -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
- $(cmake-utils_use_find_package calendar KF5CalendarCore)
- $(cmake-utils_use_find_package gphoto2 Gphoto2)
- $(cmake-utils_use_find_package jpeg2k Jasper)
- $(cmake-utils_use_find_package lensfun LensFun)
- $(cmake-utils_use_find_package marble Marble)
-
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: a83e0194ed59f2f7c2022ba33e163ca50af1c579
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Dec 30 00:42:16 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Dec 30 00:42:16 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a83e0194
media-gfx/digikam: 6.0.0_beta3 version bump
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-6.0.0_beta3.ebuild | 143 +++
1 file changed, 143 insertions(+)
diff --git a/media-gfx/digikam/digikam-6.0.0_beta3.ebuild
b/media-gfx/digikam/digikam-6.0.0_beta3.ebuild
new file mode 100644
index 00..48c1135b4f
--- /dev/null
+++ b/media-gfx/digikam/digikam-6.0.0_beta3.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ KDE_HANDBOOK="true"
+ KDE_TEST="true"
+fi
+inherit kde5 toolchain-funcs
+
+DESCRIPTION="Digital photo management application"
+HOMEPAGE="https://www.digikam.org/;
+
+LICENSE="GPL-2"
+IUSE="addressbook calendar gphoto2 jpeg2k +lensfun libav marble mediaplayer
mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ KEYWORDS="~amd64 ~x86"
+ 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/${MY_P}.tar.xz"
+ S="${WORKDIR}/${MY_P}"
+fi
+
+COMMON_DEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep solid)
+ $(add_qt_dep qtconcurrent)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui '-gles2')
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtprintsupport)
+ $(add_qt_dep qtsql 'mysql?')
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ $(add_qt_dep qtxmlpatterns)
+ dev-libs/expat
+ >=media-gfx/exiv2-0.26:=
+ 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? (
+ $(add_kdeapps_dep akonadi-contacts)
+ $(add_kdeapps_dep kcontacts)
+ )
+ calendar? ( $(add_kdeapps_dep kcalcore) )
+ gphoto2? ( media-libs/libgphoto2:= )
+ jpeg2k? ( media-libs/jasper:= )
+ lensfun? ( media-libs/lensfun )
+ marble? (
+ $(add_frameworks_dep kbookmarks)
+ $(add_kdeapps_dep marble)
+ $(add_qt_dep qtconcurrent)
+ )
+ mediaplayer? (
+ media-libs/qtav[opengl]
+ !libav? ( media-video/ffmpeg:= )
+ libav? ( media-video/libav:= )
+ )
+ opengl? (
+ $(add_qt_dep qtopengl)
+ virtual/opengl
+ )
+ panorama? ( $(add_frameworks_dep threadweaver) )
+ scanner? ( $(add_kdeapps_dep libksane) )
+ semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
+ vkontakte? ( net-libs/libkvkontakte:5 )
+ !webkit? ( $(add_qt_dep qtwebengine 'widgets') )
+ webkit? ( $(add_qt_dep qtwebkit) )
+ X? (
+ $(add_qt_dep qtx11extras)
+ x11-libs/libX11
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-cpp/eigen:3
+ dev-libs/boost[threads]
+ sys-devel/gettext
+ panorama? (
+ sys-devel/bison
+ sys-devel/flex
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ mysql? ( virtual/mysql[server] )
+ panorama? ( media-gfx/hugin )
+"
+
+RESTRICT+=" test"
+# bug 366505
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+ kde5_pkg_pretend
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+ kde5_pkg_setup
+}
+
+# FIXME: Unbundle libraw (libs/rawengine/libraw)
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_APPSTYLES=ON
+ -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
+ $(cmake-utils_use_find_package calendar KF5CalendarCore)
+ $(cmake-utils_use_find_package gphoto2 Gphoto2)
+ $(cmake-utils_use_find_package jpeg2k Jasper)
+ $(cmake-utils_use_find_package lensfun LensFun)
+ $(cmake-utils_use_find_package marble Marble)
+
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 97e04c1749b42940ab800c31dd7cd31bf7366735
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Dec 30 00:43:07 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Dec 30 00:43:07 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=97e04c17
media-gfx/digikam: Drop 6.0.0_beta2
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-6.0.0_beta2.ebuild | 143 ---
1 file changed, 143 deletions(-)
diff --git a/media-gfx/digikam/digikam-6.0.0_beta2.ebuild
b/media-gfx/digikam/digikam-6.0.0_beta2.ebuild
deleted file mode 100644
index 48c1135b4f..00
--- a/media-gfx/digikam/digikam-6.0.0_beta2.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- KDE_HANDBOOK="true"
- KDE_TEST="true"
-fi
-inherit kde5 toolchain-funcs
-
-DESCRIPTION="Digital photo management application"
-HOMEPAGE="https://www.digikam.org/;
-
-LICENSE="GPL-2"
-IUSE="addressbook calendar gphoto2 jpeg2k +lensfun libav marble mediaplayer
mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X"
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- KEYWORDS="~amd64 ~x86"
- 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/${MY_P}.tar.xz"
- S="${WORKDIR}/${MY_P}"
-fi
-
-COMMON_DEPEND="
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep knotifications)
- $(add_frameworks_dep knotifyconfig)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem)
- $(add_frameworks_dep kxmlgui)
- $(add_frameworks_dep solid)
- $(add_qt_dep qtconcurrent)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtgui '-gles2')
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtprintsupport)
- $(add_qt_dep qtsql 'mysql?')
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- $(add_qt_dep qtxmlpatterns)
- dev-libs/expat
- >=media-gfx/exiv2-0.26:=
- 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? (
- $(add_kdeapps_dep akonadi-contacts)
- $(add_kdeapps_dep kcontacts)
- )
- calendar? ( $(add_kdeapps_dep kcalcore) )
- gphoto2? ( media-libs/libgphoto2:= )
- jpeg2k? ( media-libs/jasper:= )
- lensfun? ( media-libs/lensfun )
- marble? (
- $(add_frameworks_dep kbookmarks)
- $(add_kdeapps_dep marble)
- $(add_qt_dep qtconcurrent)
- )
- mediaplayer? (
- media-libs/qtav[opengl]
- !libav? ( media-video/ffmpeg:= )
- libav? ( media-video/libav:= )
- )
- opengl? (
- $(add_qt_dep qtopengl)
- virtual/opengl
- )
- panorama? ( $(add_frameworks_dep threadweaver) )
- scanner? ( $(add_kdeapps_dep libksane) )
- semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
- vkontakte? ( net-libs/libkvkontakte:5 )
- !webkit? ( $(add_qt_dep qtwebengine 'widgets') )
- webkit? ( $(add_qt_dep qtwebkit) )
- X? (
- $(add_qt_dep qtx11extras)
- x11-libs/libX11
- )
-"
-DEPEND="${COMMON_DEPEND}
- dev-cpp/eigen:3
- dev-libs/boost[threads]
- sys-devel/gettext
- panorama? (
- sys-devel/bison
- sys-devel/flex
- )
-"
-RDEPEND="${COMMON_DEPEND}
- mysql? ( virtual/mysql[server] )
- panorama? ( media-gfx/hugin )
-"
-
-RESTRICT+=" test"
-# bug 366505
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
- kde5_pkg_pretend
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
- kde5_pkg_setup
-}
-
-# FIXME: Unbundle libraw (libs/rawengine/libraw)
-src_configure() {
- local mycmakeargs=(
- -DENABLE_APPSTYLES=ON
- -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
- $(cmake-utils_use_find_package calendar KF5CalendarCore)
- $(cmake-utils_use_find_package gphoto2 Gphoto2)
- $(cmake-utils_use_find_package jpeg2k Jasper)
- $(cmake-utils_use_find_package lensfun LensFun)
- $(cmake-utils_use_find_package marble Marble)
- -DENABLE_MEDIAPLAYER=$(usex
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 2a21936a17e8db93ecf53e9c6a11be549afa967b
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Dec 23 17:22:57 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Dec 23 17:27:23 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2a21936a
media-gfx/digikam: 6.0.0_beta2 version bump
Closes: https://bugs.gentoo.org/667398
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/{digikam-.ebuild => digikam-6.0.0_beta2.ebuild} | 1 +
media-gfx/digikam/digikam-.ebuild | 1 +
2 files changed, 2 insertions(+)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-6.0.0_beta2.ebuild
similarity index 99%
copy from media-gfx/digikam/digikam-.ebuild
copy to media-gfx/digikam/digikam-6.0.0_beta2.ebuild
index 12a3a7db4a..48c1135b4f 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-6.0.0_beta2.ebuild
@@ -22,6 +22,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_BRANCH=stable
[[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable
SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${MY_P}.tar.xz"
+ S="${WORKDIR}/${MY_P}"
fi
COMMON_DEPEND="
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 12a3a7db4a..48c1135b4f 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -22,6 +22,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_BRANCH=stable
[[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable
SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${MY_P}.tar.xz"
+ S="${WORKDIR}/${MY_P}"
fi
COMMON_DEPEND="
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 189648442afebe35dd0d155481a18fb04a0f0bfe Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Dec 23 15:56:54 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Dec 23 15:56:54 2018 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=18964844 media-gfx/digikam: Add missing DEPEND Upstream commit f908def10a3029c6b9cca21fa459eb4eeb653ebf Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/digikam/digikam-.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/media-gfx/digikam/digikam-.ebuild b/media-gfx/digikam/digikam-.ebuild index 911ff0b698..daba2c96d6 100644 --- a/media-gfx/digikam/digikam-.ebuild +++ b/media-gfx/digikam/digikam-.ebuild @@ -48,6 +48,7 @@ COMMON_DEPEND=" $(add_qt_dep qtwebkit) $(add_qt_dep qtwidgets) $(add_qt_dep qtxml) + $(add_qt_dep qtxmlpatterns) dev-libs/expat >=media-gfx/exiv2-0.26:= media-libs/lcms:2
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 4e961ccf114b39d9167fb6de16a9b9749a089dec
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Dec 23 16:06:35 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Dec 23 17:11:27 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=4e961ccf
media-gfx/digikam: Add USE webkit
Upstream commit 101b1170ef8484df732ccbff235dc28fc91f1a26
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 6 --
media-gfx/digikam/metadata.xml| 1 +
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 72acbd4d92..9a6f6f4a29 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Digital photo management application"
HOMEPAGE="https://www.digikam.org/;
LICENSE="GPL-2"
-IUSE="addressbook calendar gphoto2 jpeg2k +lensfun libav marble mediaplayer
semantic-desktop mysql opengl openmp +panorama scanner X"
+IUSE="addressbook calendar gphoto2 jpeg2k +lensfun libav marble mediaplayer
mysql opengl openmp +panorama scanner semantic-desktop webkit X"
if [[ ${KDE_BUILD_TYPE} != live ]]; then
KEYWORDS="~amd64 ~x86"
@@ -45,7 +45,6 @@ COMMON_DEPEND="
$(add_qt_dep qtgui '-gles2')
$(add_qt_dep qtprintsupport)
$(add_qt_dep qtsql 'mysql?')
- $(add_qt_dep qtwebkit)
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
$(add_qt_dep qtxmlpatterns)
@@ -83,6 +82,8 @@ COMMON_DEPEND="
panorama? ( $(add_frameworks_dep threadweaver) )
scanner? ( $(add_kdeapps_dep libksane) )
semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
+ !webkit? ( $(add_qt_dep qtwebengine 'widgets') )
+ webkit? ( $(add_qt_dep qtwebkit) )
X? (
$(add_qt_dep qtx11extras)
x11-libs/libX11
@@ -160,6 +161,7 @@ src_configure() {
$(cmake-utils_use_find_package panorama KF5ThreadWeaver)
$(cmake-utils_use_find_package scanner KF5Sane)
$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
+ -DENABLE_QWEBENGINE=$(usex !webkit)
$(cmake-utils_use_find_package X X11)
)
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
index 5521adfea1..cfd72c2d6f 100644
--- a/media-gfx/digikam/metadata.xml
+++ b/media-gfx/digikam/metadata.xml
@@ -15,5 +15,6 @@
Enable support for media player using
media-libs/qtav
Build the panorama plugin which requires
media-gfx/hugin
Enable
kde-frameworks/kfilemetadata support
+ Build with dev-qt/qtwebkit
instead of dev-qt/qtwebengine
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 7702f20547f672a24bac4a885c0b6464cb128356
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Dec 23 15:56:13 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Dec 23 15:56:13 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7702f205
media-gfx/digikam: Drop USE kipi
Upstream commit 51bc7582db1d3917eec1a113fdde5689167d
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 5 +
media-gfx/digikam/metadata.xml| 1 -
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 9ffef3e608..911ff0b698 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Digital photo management application"
HOMEPAGE="https://www.digikam.org/;
LICENSE="GPL-2"
-IUSE="addressbook calendar gphoto2 jpeg2k +kipi +lensfun marble mediaplayer
semantic-desktop mysql opengl openmp +panorama scanner X"
+IUSE="addressbook calendar gphoto2 jpeg2k +lensfun marble mediaplayer
semantic-desktop mysql opengl openmp +panorama scanner X"
if [[ ${KDE_BUILD_TYPE} != live ]]; then
KEYWORDS="~amd64 ~x86"
@@ -63,7 +63,6 @@ COMMON_DEPEND="
calendar? ( $(add_kdeapps_dep kcalcore) )
gphoto2? ( media-libs/libgphoto2:= )
jpeg2k? ( media-libs/jasper:= )
- kipi? ( $(add_kdeapps_dep libkipi) )
lensfun? ( media-libs/lensfun )
marble? (
$(add_frameworks_dep kbookmarks)
@@ -94,7 +93,6 @@ DEPEND="${COMMON_DEPEND}
)
"
RDEPEND="${COMMON_DEPEND}
- media-plugins/kipi-plugins:5
mysql? ( virtual/mysql[server] )
panorama? ( media-gfx/hugin )
!media-gfx/digikam:4
@@ -149,7 +147,6 @@ src_configure() {
$(cmake-utils_use_find_package calendar KF5CalendarCore)
$(cmake-utils_use_find_package gphoto2 Gphoto2)
$(cmake-utils_use_find_package jpeg2k Jasper)
- $(cmake-utils_use_find_package kipi KF5Kipi)
$(cmake-utils_use_find_package lensfun LensFun)
$(cmake-utils_use_find_package marble Marble)
$(cmake-utils_use_find_package mediaplayer QtAV)
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
index 59e835b018..5521adfea1 100644
--- a/media-gfx/digikam/metadata.xml
+++ b/media-gfx/digikam/metadata.xml
@@ -10,7 +10,6 @@
Enable akonadi contact
integration
- Enable support for
media-plugins/kipi-plugins
Enable support for
media-libs/lensfun
Enable support for geolocation using
kde-apps/marble
Enable support for media player using
media-libs/qtav
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: a7b7e118a3e302239500d3b8170912a64c69eb2a
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Dec 23 17:08:47 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Dec 23 17:12:15 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a7b7e118
media-gfx/digikam: libmediawiki was merged into digikam
Upstream commit e4bc0da59fc5321cc3b63655e1fa7f7b1aa4fe81
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 10 +-
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 741d546613..12a3a7db4a 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -41,6 +41,7 @@ COMMON_DEPEND="
$(add_qt_dep qtconcurrent)
$(add_qt_dep qtdbus)
$(add_qt_dep qtgui '-gles2')
+ $(add_qt_dep qtnetwork)
$(add_qt_dep qtprintsupport)
$(add_qt_dep qtsql 'mysql?')
$(add_qt_dep qtwidgets)
@@ -66,7 +67,6 @@ COMMON_DEPEND="
$(add_frameworks_dep kbookmarks)
$(add_kdeapps_dep marble)
$(add_qt_dep qtconcurrent)
- $(add_qt_dep qtnetwork)
)
mediaplayer? (
media-libs/qtav[opengl]
@@ -116,14 +116,6 @@ pkg_setup() {
}
# FIXME: Unbundle libraw (libs/rawengine/libraw)
-src_prepare() {
- if ! use marble; then
- punt_bogus_dep Qt5 Network
- fi
-
- kde5_src_prepare
-}
-
src_configure() {
local mycmakeargs=(
-DENABLE_APPSTYLES=ON
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: c383eee48a99094f3ef30375f78391843d7f5b16
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Dec 23 15:54:09 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Dec 23 15:54:09 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c383eee4
media-gfx/digikam: OpenCV2 support was dropped
Upstream commit b7d55aae13753757bf256ef9bcd5beb1321970a4
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 04baabcaf5..9ffef3e608 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -53,8 +53,7 @@ COMMON_DEPEND="
media-libs/lcms:2
media-libs/liblqr
media-libs/libpng:0=
- media-libs/opencv:=[-qt4(-)]
- || ( =media-libs/opencv-3.1.0 )
+ >=media-libs/opencv-3.1.0:=
media-libs/tiff:0
virtual/jpeg:0
addressbook? (
@@ -64,7 +63,7 @@ COMMON_DEPEND="
calendar? ( $(add_kdeapps_dep kcalcore) )
gphoto2? ( media-libs/libgphoto2:= )
jpeg2k? ( media-libs/jasper:= )
- kipi? ( $(add_kdeapps_dep libkipi '' '16.03.80') )
+ kipi? ( $(add_kdeapps_dep libkipi) )
lensfun? ( media-libs/lensfun )
marble? (
$(add_frameworks_dep kbookmarks)
@@ -147,7 +146,6 @@ src_configure() {
-DENABLE_MEDIAPLAYER=$(usex mediaplayer)
-DENABLE_MYSQLSUPPORT=$(usex mysql)
-DENABLE_INTERNALMYSQL=$(usex mysql)
- -DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo
yes || echo no)
$(cmake-utils_use_find_package calendar KF5CalendarCore)
$(cmake-utils_use_find_package gphoto2 Gphoto2)
$(cmake-utils_use_find_package jpeg2k Jasper)
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 2865837264b4f8ebc6623470430573653025f1b4
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Dec 23 16:24:12 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Dec 23 17:11:40 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=28658372
media-gfx/digikam: Cleanup and sort
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 28
1 file changed, 4 insertions(+), 24 deletions(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 9a6f6f4a29..304b56e682 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -7,7 +7,6 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
KDE_HANDBOOK="true"
KDE_TEST="true"
fi
-CMAKE_MAKEFILE_GENERATOR="emake"
inherit kde5 toolchain-funcs
DESCRIPTION="Digital photo management application"
@@ -23,7 +22,6 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_BRANCH=stable
[[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable
SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${MY_P}.tar.xz"
- S="${WORKDIR}/${MY_P}/core"
fi
COMMON_DEPEND="
@@ -101,10 +99,9 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
mysql? ( virtual/mysql[server] )
panorama? ( media-gfx/hugin )
- !media-gfx/digikam:4
"
-RESTRICT=test
+RESTRICT+=" test"
# bug 366505
pkg_pretend() {
@@ -119,23 +116,6 @@ pkg_setup() {
# FIXME: Unbundle libraw (libs/rawengine/libraw)
src_prepare() {
- if [[ ${KDE_BUILD_TYPE} != live ]]; then
- # prepare the translations
- mv "${WORKDIR}/${MY_P}/po" po || die
- find po -name "*.po" -and -not -name "digikam.po" -delete || die
- echo "set_property(GLOBAL PROPERTY
ALLOW_DUPLICATE_CUSTOM_TARGETS 1)" >> CMakeLists.txt || die
- echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
- echo "add_subdirectory( po )" >> CMakeLists.txt || die
-
- if use handbook; then
- # subdirs need to be preserved b/c relative paths...
- # doc-translated is, in fact, broken, and ignored
- mv "${WORKDIR}/${MY_P}/doc/${PN}" doc-default || die
- echo "find_package(KF5DocTools REQUIRED)" >>
CMakeLists.txt || die
- echo "add_subdirectory( doc-default )" >>
CMakeLists.txt || die
- fi
- fi
-
if ! use marble; then
punt_bogus_dep Qt5 Network
fi
@@ -147,15 +127,15 @@ src_configure() {
local mycmakeargs=(
-DENABLE_APPSTYLES=ON
-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
- -DENABLE_MEDIAPLAYER=$(usex mediaplayer)
- -DENABLE_MYSQLSUPPORT=$(usex mysql)
- -DENABLE_INTERNALMYSQL=$(usex mysql)
$(cmake-utils_use_find_package calendar KF5CalendarCore)
$(cmake-utils_use_find_package gphoto2 Gphoto2)
$(cmake-utils_use_find_package jpeg2k Jasper)
$(cmake-utils_use_find_package lensfun LensFun)
$(cmake-utils_use_find_package marble Marble)
+ -DENABLE_MEDIAPLAYER=$(usex mediaplayer)
$(cmake-utils_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 openmp OpenMP)
$(cmake-utils_use_find_package panorama KF5ThreadWeaver)
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: f139263da9bf2ba6ef7655dea214ae91de7a0c3a
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Dec 23 16:01:07 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Dec 23 16:01:07 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f139263d
media-gfx/digikam: Add USE libav
Upstream commit 6df0a5f86202cd3ed1ded41079742305c8b04813
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index daba2c96d6..72acbd4d92 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Digital photo management application"
HOMEPAGE="https://www.digikam.org/;
LICENSE="GPL-2"
-IUSE="addressbook calendar gphoto2 jpeg2k +lensfun marble mediaplayer
semantic-desktop mysql opengl openmp +panorama scanner X"
+IUSE="addressbook calendar gphoto2 jpeg2k +lensfun libav marble mediaplayer
semantic-desktop mysql opengl openmp +panorama scanner X"
if [[ ${KDE_BUILD_TYPE} != live ]]; then
KEYWORDS="~amd64 ~x86"
@@ -71,7 +71,11 @@ COMMON_DEPEND="
$(add_qt_dep qtconcurrent)
$(add_qt_dep qtnetwork)
)
- mediaplayer? ( media-libs/qtav[opengl] )
+ mediaplayer? (
+ media-libs/qtav[opengl]
+ !libav? ( media-video/ffmpeg:= )
+ libav? ( media-video/libav:= )
+ )
opengl? (
$(add_qt_dep qtopengl)
virtual/opengl
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: a3be36247186bf50758de6ad11429f1eeddd4d25
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Dec 23 16:48:57 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Dec 23 17:11:41 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a3be3624
media-gfx/digikam: Drop obsolete openmp build switch
Upstream commit 3725d055664212dd942d832a5a2c9fa49fc1a042
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/digikam/digikam-.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 304b56e682..d9e82c721c 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -137,7 +137,6 @@ src_configure() {
-DENABLE_MYSQLSUPPORT=$(usex mysql)
-DENABLE_INTERNALMYSQL=$(usex mysql)
$(cmake-utils_use_find_package opengl OpenGL)
- $(cmake-utils_use_find_package openmp OpenMP)
$(cmake-utils_use_find_package panorama KF5ThreadWeaver)
$(cmake-utils_use_find_package scanner KF5Sane)
$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 275111700369143b7ce3c26b85407d14ae01ee11
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Oct 4 22:42:38 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Oct 4 22:42:38 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=27511170
media-gfx/digikam: Also switch ENABLE_INTERNALMYSQL on w/ USE mysql
This may or may not make sense as a separate USE flag.
Signed-off-by: Andreas Sturmlechner gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
media-gfx/digikam/digikam-.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 5e60813c58..04baabcaf5 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -146,6 +146,7 @@ src_configure() {
-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
-DENABLE_MEDIAPLAYER=$(usex mediaplayer)
-DENABLE_MYSQLSUPPORT=$(usex mysql)
+ -DENABLE_INTERNALMYSQL=$(usex mysql)
-DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo
yes || echo no)
$(cmake-utils_use_find_package calendar KF5CalendarCore)
$(cmake-utils_use_find_package gphoto2 Gphoto2)
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: e707ce79b0d6fc4c36f4b71c8c3ba9593d96b99d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Oct 4 22:40:39 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Oct 4 22:40:59 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e707ce79
media-gfx/digikam: Move virtual/mysql to RDEPEND-only
Bug: https://bugs.gentoo.org/665922
Signed-off-by: Andreas Sturmlechner gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
media-gfx/digikam/digikam-.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 3f996363d3..5e60813c58 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -73,7 +73,6 @@ COMMON_DEPEND="
$(add_qt_dep qtnetwork)
)
mediaplayer? ( media-libs/qtav[opengl] )
- mysql? ( virtual/mysql[server] )
opengl? (
$(add_qt_dep qtopengl)
virtual/opengl
@@ -97,6 +96,7 @@ DEPEND="${COMMON_DEPEND}
"
RDEPEND="${COMMON_DEPEND}
media-plugins/kipi-plugins:5
+ mysql? ( virtual/mysql[server] )
panorama? ( media-gfx/hugin )
!media-gfx/digikam:4
"
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/, kde-misc/zanshin/, app-office/calligra/
commit: a92d04b6df3e4be4505f511835e1217688697093
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun May 13 21:25:36 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun May 13 21:27:29 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a92d04b6
*/*: Drop obsolete KDE_APPS_MINIMAL definitions
app-office/calligra/calligra-.ebuild | 1 -
kde-misc/zanshin/zanshin-.ebuild | 1 -
media-gfx/digikam/digikam-.ebuild| 1 -
3 files changed, 3 deletions(-)
diff --git a/app-office/calligra/calligra-.ebuild
b/app-office/calligra/calligra-.ebuild
index 1602364fe6..c300be6a08 100644
--- a/app-office/calligra/calligra-.ebuild
+++ b/app-office/calligra/calligra-.ebuild
@@ -4,7 +4,6 @@
EAPI=6
CHECKREQS_DISK_BUILD="4G"
-KDE_APPS_MINIMAL="17.12.0"
KDE_HANDBOOK="forceoptional"
KDE_PO_DIRS="po plan/po"
KDE_TEST="forceoptional"
diff --git a/kde-misc/zanshin/zanshin-.ebuild
b/kde-misc/zanshin/zanshin-.ebuild
index fcef0ab48e..2b1412f6cf 100644
--- a/kde-misc/zanshin/zanshin-.ebuild
+++ b/kde-misc/zanshin/zanshin-.ebuild
@@ -3,7 +3,6 @@
EAPI=6
-KDE_APPS_MINIMAL="17.12.0"
KDE_TEST="forceoptional"
VIRTUALX_REQUIRED="test"
inherit kde5
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 2bb7eeecc9..3f996363d3 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -8,7 +8,6 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
KDE_TEST="true"
fi
CMAKE_MAKEFILE_GENERATOR="emake"
-KDE_APPS_MINIMAL="17.12.0"
inherit kde5 toolchain-funcs
DESCRIPTION="Digital photo management application"
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 9b57ca9da8057a775596dbfa48b2c7d78f4b860f
Author: Johannes Huber gentoo org>
AuthorDate: Tue Mar 27 05:12:28 2018 +
Commit: Johannes Huber gentoo org>
CommitDate: Tue Mar 27 05:12:28 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9b57ca9d
media-gfx/digikam: Sync w/ tree
Package-Manager: Portage-2.3.24, Repoman-2.3.6
media-gfx/digikam/digikam-.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 7d2aec96b9..2bb7eeecc9 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -8,6 +8,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
KDE_TEST="true"
fi
CMAKE_MAKEFILE_GENERATOR="emake"
+KDE_APPS_MINIMAL="17.12.0"
inherit kde5 toolchain-funcs
DESCRIPTION="Digital photo management application"
@@ -26,8 +27,6 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
S="${WORKDIR}/${MY_P}/core"
fi
-# TODO: Package QtAV http://www.qtav.org/
-# video? ( media-video/qtav )
COMMON_DEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 42cd560060a45b9ba88738b4378e3950e583e650 Author: Johannes Huber gentoo org> AuthorDate: Fri Sep 8 15:35:59 2017 + Commit: Johannes Huber gentoo org> CommitDate: Fri Sep 8 15:35:59 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=42cd5600 media-gfx/digikam: Raise dependency on media-gfx/exiv2 Package-Manager: Portage-2.3.8, Repoman-2.3.3 media-gfx/digikam/digikam-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/digikam/digikam-.ebuild b/media-gfx/digikam/digikam-.ebuild index 07f15ab39a..f5836f87eb 100644 --- a/media-gfx/digikam/digikam-.ebuild +++ b/media-gfx/digikam/digikam-.ebuild @@ -51,7 +51,7 @@ COMMON_DEPEND=" $(add_qt_dep qtwidgets) $(add_qt_dep qtxml) dev-libs/expat - media-gfx/exiv2:= + >=media-gfx/exiv2-0.26:= media-libs/lcms:2 media-libs/liblqr media-libs/libpng:0=
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 13ef4a40615c175ae742a4e1b2fe3ce77cf65032
Author: Johannes Huber gentoo org>
AuthorDate: Thu Sep 7 21:40:56 2017 +
Commit: Johannes Huber gentoo org>
CommitDate: Thu Sep 7 21:42:17 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=13ef4a40
media-gfx/digikam: Add mediaplayer use flag
Bug: https://bugs.gentoo.org/show_bug.cgi?id=613146
Package-Manager: Portage-2.3.8, Repoman-2.3.3
media-gfx/digikam/digikam-.ebuild | 6 --
media-gfx/digikam/metadata.xml| 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 389ed74eed..07f15ab39a 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Digital photo management application"
HOMEPAGE="https://www.digikam.org/;
LICENSE="GPL-2"
-IUSE="addressbook calendar gphoto2 jpeg2k +kipi +lensfun marble
semantic-desktop mysql opengl openmp +panorama scanner X"
+IUSE="addressbook calendar gphoto2 jpeg2k +kipi +lensfun marble mediaplayer
semantic-desktop mysql opengl openmp +panorama scanner X"
if [[ ${KDE_BUILD_TYPE} != live ]]; then
KEYWORDS="~amd64 ~x86"
@@ -74,6 +74,7 @@ COMMON_DEPEND="
$(add_qt_dep qtconcurrent)
$(add_qt_dep qtnetwork)
)
+ mediaplayer? ( media-libs/qtav[opengl] )
mysql? ( virtual/mysql[server] )
opengl? (
$(add_qt_dep qtopengl)
@@ -145,8 +146,8 @@ src_configure() {
local mycmakeargs=(
-DENABLE_APPSTYLES=ON
-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
+ -DENABLE_MEDIAPLAYER=$(usex mediaplayer)
-DENABLE_MYSQLSUPPORT=$(usex mysql)
- -DENABLE_MEDIAPLAYER=OFF
-DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo
yes || echo no)
$(cmake-utils_use_find_package calendar KF5CalendarCore)
$(cmake-utils_use_find_package gphoto2 Gphoto2)
@@ -154,6 +155,7 @@ src_configure() {
$(cmake-utils_use_find_package kipi KF5Kipi)
$(cmake-utils_use_find_package lensfun LensFun)
$(cmake-utils_use_find_package marble Marble)
+ $(cmake-utils_use_find_package mediaplayer QtAV)
$(cmake-utils_use_find_package opengl OpenGL)
$(cmake-utils_use_find_package openmp OpenMP)
$(cmake-utils_use_find_package panorama KF5ThreadWeaver)
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
index c3a816503f..59e835b018 100644
--- a/media-gfx/digikam/metadata.xml
+++ b/media-gfx/digikam/metadata.xml
@@ -13,8 +13,8 @@
Enable support for
media-plugins/kipi-plugins
Enable support for
media-libs/lensfun
Enable support for geolocation using
kde-apps/marble
+ Enable support for media player using
media-libs/qtav
Build the panorama plugin which requires
media-gfx/hugin
Enable
kde-frameworks/kfilemetadata support
-
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 906f3c06d6d54f580d6c412e573f7d798b01f100 Author: Michael Palimaka gentoo org> AuthorDate: Thu Sep 7 12:37:42 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Sep 7 12:37:47 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=906f3c06 media-gfx/digikam: mysql server is required Closes: https://bugs.gentoo.org/576754 Package-Manager: Portage-2.3.6, Repoman-2.3.3 media-gfx/digikam/digikam-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/digikam/digikam-.ebuild b/media-gfx/digikam/digikam-.ebuild index 5602083e38..389ed74eed 100644 --- a/media-gfx/digikam/digikam-.ebuild +++ b/media-gfx/digikam/digikam-.ebuild @@ -74,7 +74,7 @@ COMMON_DEPEND=" $(add_qt_dep qtconcurrent) $(add_qt_dep qtnetwork) ) - mysql? ( virtual/mysql ) + mysql? ( virtual/mysql[server] ) opengl? ( $(add_qt_dep qtopengl) virtual/opengl
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 4d8be423c35df38cd30e1298e5c48e3f594dd2fb
Author: Johannes Huber gentoo org>
AuthorDate: Wed Sep 6 18:49:37 2017 +
Commit: Johannes Huber gentoo org>
CommitDate: Wed Sep 6 18:49:37 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=4d8be423
media-gfx/digikam: Sync with main tree
Package-Manager: Portage-2.3.8, Repoman-2.3.3
media-gfx/digikam/digikam-.ebuild | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 94ce193fd3..5602083e38 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -14,10 +14,10 @@ DESCRIPTION="Digital photo management application"
HOMEPAGE="https://www.digikam.org/;
LICENSE="GPL-2"
-KEYWORDS=""
IUSE="addressbook calendar gphoto2 jpeg2k +kipi +lensfun marble
semantic-desktop mysql opengl openmp +panorama scanner X"
if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ KEYWORDS="~amd64 ~x86"
MY_PV=${PV/_/-}
MY_P=${PN}-${MY_PV}
SRC_BRANCH=stable
@@ -32,8 +32,8 @@ COMMON_DEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kiconthemes)
$(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
$(add_frameworks_dep kio)
$(add_frameworks_dep knotifications)
$(add_frameworks_dep knotifyconfig)
@@ -42,6 +42,7 @@ COMMON_DEPEND="
$(add_frameworks_dep kwindowsystem)
$(add_frameworks_dep kxmlgui)
$(add_frameworks_dep solid)
+ $(add_qt_dep qtconcurrent)
$(add_qt_dep qtdbus)
$(add_qt_dep qtgui '-gles2')
$(add_qt_dep qtprintsupport)
@@ -53,7 +54,6 @@ COMMON_DEPEND="
media-gfx/exiv2:=
media-libs/lcms:2
media-libs/liblqr
- >=media-libs/libpgf-6.12.27
media-libs/libpng:0=
media-libs/opencv:=[-qt4(-)]
|| ( =media-libs/opencv-3.1.0 )
@@ -88,7 +88,6 @@ COMMON_DEPEND="
)
"
DEPEND="${COMMON_DEPEND}
- $(add_qt_dep qtconcurrent)
dev-cpp/eigen:3
dev-libs/boost[threads]
sys-devel/gettext
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 6c0c64ad27b67264e762ce26da47583132471504 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Mar 18 12:27:02 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Mar 18 12:27:02 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6c0c64ad media-gfx/digikam: Drop unused USE flag description Package-Manager: Portage-2.3.3, Repoman-2.3.1 media-gfx/digikam/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml index faac150cd0..c3a816503f 100644 --- a/media-gfx/digikam/metadata.xml +++ b/media-gfx/digikam/metadata.xml @@ -15,6 +15,6 @@ Enable support for geolocation using kde-apps/marble Build the panorama plugin which requires media-gfx/hugin Enable kde-frameworks/kfilemetadata support - Enable video player support +
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 2409b5c1b935d669916908635dd35cf6964a9b90
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Mar 18 12:17:34 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Mar 18 12:17:34 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2409b5c1
media-gfx/digikam: Disable USE=video until QtAV is packaged
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-gfx/digikam/digikam-.ebuild | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 2627c2dbe5..94ce193fd3 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.digikam.org/;
LICENSE="GPL-2"
KEYWORDS=""
-IUSE="addressbook calendar gphoto2 jpeg2k +kipi +lensfun marble
semantic-desktop mysql opengl openmp +panorama scanner video X"
+IUSE="addressbook calendar gphoto2 jpeg2k +kipi +lensfun marble
semantic-desktop mysql opengl openmp +panorama scanner X"
if [[ ${KDE_BUILD_TYPE} != live ]]; then
MY_PV=${PV/_/-}
@@ -26,6 +26,8 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
S="${WORKDIR}/${MY_P}/core"
fi
+# TODO: Package QtAV http://www.qtav.org/
+# video? ( media-video/qtav )
COMMON_DEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
@@ -80,7 +82,6 @@ COMMON_DEPEND="
panorama? ( $(add_frameworks_dep threadweaver) )
scanner? ( $(add_kdeapps_dep libksane) )
semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
- video? ( $(add_qt_dep qtmultimedia 'widgets') )
X? (
$(add_qt_dep qtx11extras)
x11-libs/libX11
@@ -146,7 +147,7 @@ src_configure() {
-DENABLE_APPSTYLES=ON
-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
-DENABLE_MYSQLSUPPORT=$(usex mysql)
- -DENABLE_MEDIAPLAYER=$(usex video)
+ -DENABLE_MEDIAPLAYER=OFF
-DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo
yes || echo no)
$(cmake-utils_use_find_package calendar KF5CalendarCore)
$(cmake-utils_use_find_package gphoto2 Gphoto2)
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 695bf80aefee127778e3d922f89758c49d1e7278
Author: Johannes Huber gentoo org>
AuthorDate: Fri Dec 23 09:15:10 2016 +
Commit: Johannes Huber gentoo org>
CommitDate: Fri Dec 23 10:10:12 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=695bf80a
media-gfx/digikam: Drop CMAKE_MIN_VERSION
Covered by cmake-utils eclass now.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-gfx/digikam/digikam-.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 6b47605..4a2e28c 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -9,7 +9,6 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
KDE_TEST="true"
fi
CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_MIN_VERSION="3.0"
inherit kde5 toolchain-funcs
DESCRIPTION="Digital photo management application"
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: e0e5d32b8e2856dc19091015f7782f6d0eb12c50 Author: Johannes Huber gentoo org> AuthorDate: Tue Nov 8 09:31:04 2016 + Commit: Johannes Huber gentoo org> CommitDate: Tue Nov 8 09:31:04 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e0e5d32b media-gfx/digikam: Fix use dependency on media-libs/opencv Gentoo-bug: 599178 Package-Manager: portage-2.3.2 media-gfx/digikam/digikam-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/digikam/digikam-.ebuild b/media-gfx/digikam/digikam-.ebuild index bf6d12f..6b47605 100644 --- a/media-gfx/digikam/digikam-.ebuild +++ b/media-gfx/digikam/digikam-.ebuild @@ -55,7 +55,7 @@ COMMON_DEPEND=" media-libs/liblqr >=media-libs/libpgf-6.12.27 media-libs/libpng:0= - media-libs/opencv:=[-qt4] + media-libs/opencv:=[-qt4(-)] || ( =media-libs/opencv-3.1.0 ) media-libs/tiff:0 virtual/jpeg:0
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 6ab7437cf4fc4919016eef9434eb4e98980094ec
Author: Andreas Sturmlechner gmail com>
AuthorDate: Sun Nov 6 17:18:30 2016 +
Commit: Johannes Huber gentoo org>
CommitDate: Mon Nov 7 21:44:20 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6ab7437c
media-gfx/digikam: Add subslot op, improve openmp check
Thanks to Soap.
Package-Manager: portage-2.3.0
Signed-off-by: Johannes Huber gentoo.org>
media-gfx/digikam/digikam-.ebuild | 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index cbd2f47..bf6d12f 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -65,7 +65,7 @@ COMMON_DEPEND="
)
calendar? ( $(add_kdeapps_dep kcalcore) )
gphoto2? ( media-libs/libgphoto2:= )
- jpeg2k? ( media-libs/jasper )
+ jpeg2k? ( media-libs/jasper:= )
kipi? ( $(add_kdeapps_dep libkipi '' '16.03.80') )
lensfun? ( media-libs/lensfun )
marble? (
@@ -107,14 +107,17 @@ RDEPEND="${COMMON_DEPEND}
RESTRICT=test
# bug 366505
-# FIXME: Unbundle libraw (libs/rawengine/libraw)
pkg_pretend() {
- if use openmp ; then
- tc-has-openmp || die "Please switch to an openmp compatible
compiler"
- fi
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
kde5_pkg_pretend
}
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+ kde5_pkg_setup
+}
+
+# FIXME: Unbundle libraw (libs/rawengine/libraw)
src_prepare() {
if [[ ${KDE_BUILD_TYPE} != live ]]; then
# prepare the translations
@@ -141,7 +144,6 @@ src_prepare() {
}
src_configure() {
- # LQR = only allows to choose between bundled/external
local mycmakeargs=(
-DENABLE_APPSTYLES=ON
-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 98d44f0a40a6aa23f80390242cda132b2e2c781b
Author: Johannes Huber gentoo org>
AuthorDate: Mon Oct 31 18:46:38 2016 +
Commit: Johannes Huber gentoo org>
CommitDate: Mon Oct 31 18:52:14 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=98d44f0a
media-gfx/digikam: Restore application style support
Gentoo-bug: 597734
Package-Manager: portage-2.3.2
media-gfx/digikam/digikam-.ebuild | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 521865e..cbd2f47 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -20,16 +20,12 @@ KEYWORDS=""
IUSE="addressbook calendar gphoto2 jpeg2k +kipi +lensfun marble
semantic-desktop mysql opengl openmp +panorama scanner video X"
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/${MY_P}.tar.xz"
-
S="${WORKDIR}/${MY_P}/core"
-
fi
COMMON_DEPEND="
@@ -147,6 +143,7 @@ src_prepare() {
src_configure() {
# LQR = only allows to choose between bundled/external
local mycmakeargs=(
+ -DENABLE_APPSTYLES=ON
-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
-DENABLE_MYSQLSUPPORT=$(usex mysql)
-DENABLE_MEDIAPLAYER=$(usex video)
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 367937b577beda6a35ce67c7c1113972b901d7a7
Author: Michael Palimaka gentoo org>
AuthorDate: Thu Oct 20 20:53:13 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Oct 20 20:54:00 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=367937b5
media-gfx/digikam: fix bogus dep command
Package-Manager: portage-2.3.2
media-gfx/digikam/digikam-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 90a5075..8f8e45b 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -137,7 +137,7 @@ src_prepare() {
fi
if ! use marble; then
- kde_punt_bogus_dep Qt5 Network
+ punt_bogus_dep Qt5 Network
fi
kde5_src_prepare
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 42a7be5879326677580993f5c648dab43a5fbcea Author: Michael Palimaka gentoo org> AuthorDate: Thu Oct 20 20:53:57 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Oct 20 20:54:00 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=42a7be58 media-gfx/digikam: qtconcurrent is required at runtime for marble Package-Manager: portage-2.3.2 media-gfx/digikam/digikam-.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/media-gfx/digikam/digikam-.ebuild b/media-gfx/digikam/digikam-.ebuild index 8f8e45b..521865e 100644 --- a/media-gfx/digikam/digikam-.ebuild +++ b/media-gfx/digikam/digikam-.ebuild @@ -75,6 +75,7 @@ COMMON_DEPEND=" marble? ( $(add_frameworks_dep kbookmarks) $(add_kdeapps_dep marble) + $(add_qt_dep qtconcurrent) $(add_qt_dep qtnetwork) ) mysql? ( virtual/mysql )
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 4f552f4709d93c2f624fec83774bd868781edfca Author: Michael Palimaka gentoo org> AuthorDate: Thu Oct 20 20:48:46 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Oct 20 20:48:49 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=4f552f47 media-gfx/digikam: require qt not be built with gles2 Gentoo-bug: 588914 Package-Manager: portage-2.3.2 media-gfx/digikam/digikam-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/digikam/digikam-.ebuild b/media-gfx/digikam/digikam-.ebuild index fc871c3..90a5075 100644 --- a/media-gfx/digikam/digikam-.ebuild +++ b/media-gfx/digikam/digikam-.ebuild @@ -47,7 +47,7 @@ COMMON_DEPEND=" $(add_frameworks_dep kxmlgui) $(add_frameworks_dep solid) $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) + $(add_qt_dep qtgui '-gles2') $(add_qt_dep qtprintsupport) $(add_qt_dep qtsql 'mysql?') $(add_qt_dep qtwebkit)
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: ab6bcd2c261cc1b46d414a435b73604535112d28 Author: Michael Palimaka gentoo org> AuthorDate: Thu Oct 20 20:39:17 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Oct 20 20:42:10 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ab6bcd2c media-gfx/digikam: remove unused dependency Upstream-commit: d7528bacf8030698df256d7357f02c93b872456f Package-Manager: portage-2.3.2 media-gfx/digikam/digikam-.ebuild | 2 -- 1 file changed, 2 deletions(-) diff --git a/media-gfx/digikam/digikam-.ebuild b/media-gfx/digikam/digikam-.ebuild index 82dd4ab..fc871c3 100644 --- a/media-gfx/digikam/digikam-.ebuild +++ b/media-gfx/digikam/digikam-.ebuild @@ -49,7 +49,6 @@ COMMON_DEPEND=" $(add_qt_dep qtdbus) $(add_qt_dep qtgui) $(add_qt_dep qtprintsupport) - $(add_qt_dep qtscript) $(add_qt_dep qtsql 'mysql?') $(add_qt_dep qtwebkit) $(add_qt_dep qtwidgets) @@ -75,7 +74,6 @@ COMMON_DEPEND=" lensfun? ( media-libs/lensfun ) marble? ( $(add_frameworks_dep kbookmarks) - $(add_frameworks_dep kitemmodels) $(add_kdeapps_dep marble) $(add_qt_dep qtnetwork) )
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 5e2b16d9a517519de25362fc74fbe43b13557956
Author: Michael Palimaka gentoo org>
AuthorDate: Thu Oct 20 20:08:08 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Oct 20 20:10:12 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=5e2b16d9
media-gfx/digikam: add new dependency for USE="marble"
Upstream-commit: 00b291b07d4620f5971ad43a626b1df08804d92d
Package-Manager: portage-2.3.2
media-gfx/digikam/digikam-.ebuild | 5 +
1 file changed, 5 insertions(+)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 3c45dd4..cf60003 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -76,6 +76,7 @@ COMMON_DEPEND="
$(add_frameworks_dep kbookmarks)
$(add_frameworks_dep kitemmodels)
$(add_kdeapps_dep marble)
+ $(add_qt_dep qtnetwork)
)
mysql? ( virtual/mysql )
opengl? (
@@ -136,6 +137,10 @@ src_prepare() {
fi
fi
+ if ! use marble; then
+ kde_punt_bogus_dep Qt5 Network
+ fi
+
kde5_src_prepare
}
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 7601d1e67c829d3d75bb19850557482513e127b1
Author: Michael Palimaka gentoo org>
AuthorDate: Thu Oct 20 20:10:07 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Oct 20 20:10:12 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7601d1e6
media-gfx/digikam: introduce calendar USE flag
Upstream-commit: 05e9b6ad768597fcce6ac16d82df042135e18e49
Package-Manager: portage-2.3.2
media-gfx/digikam/digikam-.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index cf60003..82dd4ab 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.digikam.org/;
LICENSE="GPL-2"
KEYWORDS=""
-IUSE="addressbook gphoto2 jpeg2k +kipi +lensfun marble semantic-desktop mysql
opengl openmp +panorama scanner video X"
+IUSE="addressbook calendar gphoto2 jpeg2k +kipi +lensfun marble
semantic-desktop mysql opengl openmp +panorama scanner video X"
if [[ ${KDE_BUILD_TYPE} != live ]]; then
@@ -68,6 +68,7 @@ COMMON_DEPEND="
$(add_kdeapps_dep akonadi-contacts)
$(add_kdeapps_dep kcontacts)
)
+ calendar? ( $(add_kdeapps_dep kcalcore) )
gphoto2? ( media-libs/libgphoto2:= )
jpeg2k? ( media-libs/jasper )
kipi? ( $(add_kdeapps_dep libkipi '' '16.03.80') )
@@ -151,6 +152,7 @@ src_configure() {
-DENABLE_MYSQLSUPPORT=$(usex mysql)
-DENABLE_MEDIAPLAYER=$(usex video)
-DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo
yes || echo no)
+ $(cmake-utils_use_find_package calendar KF5CalendarCore)
$(cmake-utils_use_find_package gphoto2 Gphoto2)
$(cmake-utils_use_find_package jpeg2k Jasper)
$(cmake-utils_use_find_package kipi KF5Kipi)
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 8c00f8e3f4a812432c87483f50555b516910e0b9
Author: Michael Palimaka gentoo org>
AuthorDate: Thu Oct 20 19:52:17 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Oct 20 20:02:01 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=8c00f8e3
media-gfx/digikam: boost and qtconcurrent appear to be build-only
Package-Manager: portage-2.3.2
media-gfx/digikam/digikam-.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index d66f938..6c47c5a 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -50,7 +50,6 @@ COMMON_DEPEND="
$(add_frameworks_dep kxmlgui)
$(add_frameworks_dep solid)
$(add_kdeapps_dep libkexiv2)
- $(add_qt_dep qtconcurrent)
$(add_qt_dep qtdbus)
$(add_qt_dep qtgui)
$(add_qt_dep qtprintsupport)
@@ -59,7 +58,6 @@ COMMON_DEPEND="
$(add_qt_dep qtwebkit)
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
- dev-libs/boost[threads]
dev-libs/expat
media-gfx/exiv2:=
media-libs/lcms:2
@@ -98,7 +96,9 @@ COMMON_DEPEND="
)
"
DEPEND="${COMMON_DEPEND}
+ $(add_qt_dep qtconcurrent)
dev-cpp/eigen:3
+ dev-libs/boost[threads]
sys-devel/gettext
panorama? (
sys-devel/bison
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 46d2677e4937ef043e5510d8cfbe53758042b72f
Author: Michael Palimaka gentoo org>
AuthorDate: Thu Oct 20 20:01:56 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Oct 20 20:02:01 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=46d2677e
media-gfx/digikam: drop unused dependencies
Upstream-commit: 3e579b81aabaa6ec1304f05e02173db02c2d376b
Upstream-commit: ba568ced8227e7e13681f7a9de1566271c4bccb8
Upstream-commit: a469ce0d8c6cb4b7806cab83a8207d01a559
Package-Manager: portage-2.3.2
media-gfx/digikam/digikam-.ebuild | 4
1 file changed, 4 deletions(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 6c47c5a..3c45dd4 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -33,23 +33,19 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
fi
COMMON_DEPEND="
- $(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kiconthemes)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kio)
- $(add_frameworks_dep kjobwidgets)
$(add_frameworks_dep knotifications)
$(add_frameworks_dep knotifyconfig)
$(add_frameworks_dep kservice)
- $(add_frameworks_dep ktextwidgets)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kwindowsystem)
$(add_frameworks_dep kxmlgui)
$(add_frameworks_dep solid)
- $(add_kdeapps_dep libkexiv2)
$(add_qt_dep qtdbus)
$(add_qt_dep qtgui)
$(add_qt_dep qtprintsupport)
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 1d4883633e8a841547cb52ae74aceef792be7f1a
Author: Michael Palimaka gentoo org>
AuthorDate: Thu Oct 20 19:40:30 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Oct 20 19:40:34 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1d488363
media-gfx/digikam: fix doc building
Package-Manager: portage-2.3.2
media-gfx/digikam/digikam-.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 8476def..d66f938 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -135,6 +135,7 @@ src_prepare() {
# subdirs need to be preserved b/c relative paths...
# doc-translated is, in fact, broken, and ignored
mv "${WORKDIR}/${MY_P}/doc/${PN}" doc-default || die
+ echo "find_package(KF5DocTools REQUIRED)" >>
CMakeLists.txt || die
echo "add_subdirectory( doc-default )" >>
CMakeLists.txt || die
fi
fi
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 20e284def4b3001c7212ec287f8a74d34c223de0
Author: Michael Palimaka gentoo org>
AuthorDate: Thu Oct 20 19:38:45 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Oct 20 19:38:51 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=20e284de
media-gfx/digikam: fix semantic-desktop USE flag
Package-Manager: portage-2.3.2
media-gfx/digikam/digikam-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 70a30ce..8476def 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -146,7 +146,6 @@ src_configure() {
# LQR = only allows to choose between bundled/external
local mycmakeargs=(
-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
- -DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop)
-DENABLE_MYSQLSUPPORT=$(usex mysql)
-DENABLE_MEDIAPLAYER=$(usex video)
-DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo
yes || echo no)
@@ -159,6 +158,7 @@ src_configure() {
$(cmake-utils_use_find_package openmp OpenMP)
$(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 X X11)
)
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 97cb59df6ff1000fe834c5b1dd26d61b3630fd40
Author: Andreas Sturmlechner gmail com>
AuthorDate: Mon Aug 15 14:18:54 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Aug 18 12:45:38 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=97cb59df
media-gfx/digikam: Add USE=jpeg2k,opengl,openmp,panorama and sort DEPENDs
Also set some default USE flags.
Package-Manager: portage-2.2.28
media-gfx/digikam/digikam-.ebuild | 34 --
media-gfx/digikam/metadata.xml| 1 +
2 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index f453b0c..70a30ce 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -10,14 +10,14 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
fi
CMAKE_MAKEFILE_GENERATOR="emake"
CMAKE_MIN_VERSION="3.0"
-inherit kde5
+inherit kde5 toolchain-funcs
DESCRIPTION="Digital photo management application"
HOMEPAGE="https://www.digikam.org/;
LICENSE="GPL-2"
KEYWORDS=""
-IUSE="addressbook gphoto2 kipi lensfun marble semantic-desktop mysql scanner
video X"
+IUSE="addressbook gphoto2 jpeg2k +kipi +lensfun marble semantic-desktop mysql
opengl openmp +panorama scanner video X"
if [[ ${KDE_BUILD_TYPE} != live ]]; then
@@ -61,8 +61,7 @@ COMMON_DEPEND="
$(add_qt_dep qtxml)
dev-libs/boost[threads]
dev-libs/expat
- >=media-gfx/exiv2-0.24:=
- media-libs/jasper
+ media-gfx/exiv2:=
media-libs/lcms:2
media-libs/liblqr
>=media-libs/libpgf-6.12.27
@@ -75,8 +74,8 @@ COMMON_DEPEND="
$(add_kdeapps_dep akonadi-contacts)
$(add_kdeapps_dep kcontacts)
)
- scanner? ( $(add_kdeapps_dep libksane) )
gphoto2? ( media-libs/libgphoto2:= )
+ jpeg2k? ( media-libs/jasper )
kipi? ( $(add_kdeapps_dep libkipi '' '16.03.80') )
lensfun? ( media-libs/lensfun )
marble? (
@@ -84,8 +83,14 @@ COMMON_DEPEND="
$(add_frameworks_dep kitemmodels)
$(add_kdeapps_dep marble)
)
- semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
mysql? ( virtual/mysql )
+ opengl? (
+ $(add_qt_dep qtopengl)
+ virtual/opengl
+ )
+ panorama? ( $(add_frameworks_dep threadweaver) )
+ scanner? ( $(add_kdeapps_dep libksane) )
+ semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
video? ( $(add_qt_dep qtmultimedia 'widgets') )
X? (
$(add_qt_dep qtx11extras)
@@ -95,15 +100,28 @@ COMMON_DEPEND="
DEPEND="${COMMON_DEPEND}
dev-cpp/eigen:3
sys-devel/gettext
+ panorama? (
+ sys-devel/bison
+ sys-devel/flex
+ )
"
RDEPEND="${COMMON_DEPEND}
media-plugins/kipi-plugins:5
+ panorama? ( media-gfx/hugin )
!media-gfx/digikam:4
"
RESTRICT=test
# bug 366505
+# FIXME: Unbundle libraw (libs/rawengine/libraw)
+pkg_pretend() {
+ if use openmp ; then
+ tc-has-openmp || die "Please switch to an openmp compatible
compiler"
+ fi
+ kde5_pkg_pretend
+}
+
src_prepare() {
if [[ ${KDE_BUILD_TYPE} != live ]]; then
# prepare the translations
@@ -133,9 +151,13 @@ src_configure() {
-DENABLE_MEDIAPLAYER=$(usex video)
-DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo
yes || echo no)
$(cmake-utils_use_find_package gphoto2 Gphoto2)
+ $(cmake-utils_use_find_package jpeg2k Jasper)
$(cmake-utils_use_find_package kipi KF5Kipi)
$(cmake-utils_use_find_package lensfun LensFun)
$(cmake-utils_use_find_package marble Marble)
+ $(cmake-utils_use_find_package opengl OpenGL)
+ $(cmake-utils_use_find_package openmp OpenMP)
+ $(cmake-utils_use_find_package panorama KF5ThreadWeaver)
$(cmake-utils_use_find_package scanner KF5Sane)
$(cmake-utils_use_find_package X X11)
)
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
index c178b90..faac150 100644
--- a/media-gfx/digikam/metadata.xml
+++ b/media-gfx/digikam/metadata.xml
@@ -13,6 +13,7 @@
Enable support for
media-plugins/kipi-plugins
Enable support for
media-libs/lensfun
Enable support for geolocation using
kde-apps/marble
+ Build the panorama plugin which requires
media-gfx/hugin
Enable
kde-frameworks/kfilemetadata support
Enable video player support
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 132de54700092b72de7fe7ca901ca7663c04af8c Author: Michael Palimaka gentoo org> AuthorDate: Wed Aug 10 17:33:13 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Wed Aug 10 17:39:38 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=132de547 media-gfx/digikam: ensure qt4 is disabled on media-libs/opencv As digikam is qt5-based, any qt4 symbols loaded will collide and cause a crash. Gentoo-bug: 590706 Package-Manager: portage-2.3.0 media-gfx/digikam/digikam-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/digikam/digikam-.ebuild b/media-gfx/digikam/digikam-.ebuild index ac21978..f453b0c 100644 --- a/media-gfx/digikam/digikam-.ebuild +++ b/media-gfx/digikam/digikam-.ebuild @@ -67,7 +67,7 @@ COMMON_DEPEND=" media-libs/liblqr >=media-libs/libpgf-6.12.27 media-libs/libpng:0= - media-libs/opencv:= + media-libs/opencv:=[-qt4] || ( =media-libs/opencv-3.1.0 ) media-libs/tiff:0 virtual/jpeg:0
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: d9f607c2538d14daee2ec245c6efe197344cf413
Author: Andreas Sturmlechner gmail com>
AuthorDate: Sun Aug 7 21:11:06 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Wed Aug 10 15:36:46 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d9f607c2
media-gfx/digikam: Bump OpenCV3 DEPEND to >=3.1.0
Upstream commit 78f21055e816ae1dc219185b7497f3c1299629e3
Package-Manager: portage-2.2.28
media-gfx/digikam/digikam-.ebuild | 2 ++
1 file changed, 2 insertions(+)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 517381d..ac21978 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -9,6 +9,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
KDE_TEST="true"
fi
CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_MIN_VERSION="3.0"
inherit kde5
DESCRIPTION="Digital photo management application"
@@ -67,6 +68,7 @@ COMMON_DEPEND="
>=media-libs/libpgf-6.12.27
media-libs/libpng:0=
media-libs/opencv:=
+ || ( =media-libs/opencv-3.1.0 )
media-libs/tiff:0
virtual/jpeg:0
addressbook? (
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 1dd867d7f3a1b710a6cdcc64761a340735bf1436
Author: Michael Palimaka gentoo org>
AuthorDate: Fri Aug 5 17:39:03 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Fri Aug 5 17:39:10 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1dd867d7
media-gfx/digikam: simplify
Package-Manager: portage-2.3.0
media-gfx/digikam/digikam-.ebuild | 13 ++---
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 503d034..517381d 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -103,17 +103,6 @@ RESTRICT=test
# bug 366505
src_prepare() {
- undetect_lib() {
- local _use=${1}
- local _name=${2}
- [[ -z ${_name} ]] && _name=$(echo ${_use} | sed 's/./\U&/g')
- use $_use || \
- sed -i -e "/DETECT_LIB${_name}/d" CMakeLists.txt || die
- }
-
- undetect_lib kipi
- undetect_lib scanner KSANE
-
if [[ ${KDE_BUILD_TYPE} != live ]]; then
# prepare the translations
mv "${WORKDIR}/${MY_P}/po" po || die
@@ -142,8 +131,10 @@ src_configure() {
-DENABLE_MEDIAPLAYER=$(usex video)
-DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo
yes || echo no)
$(cmake-utils_use_find_package gphoto2 Gphoto2)
+ $(cmake-utils_use_find_package kipi KF5Kipi)
$(cmake-utils_use_find_package lensfun LensFun)
$(cmake-utils_use_find_package marble Marble)
+ $(cmake-utils_use_find_package scanner KF5Sane)
$(cmake-utils_use_find_package X X11)
)
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: a8182a64acdc822f413e227f11e6ee420f32f8d2
Author: Andreas Sturmlechner gmail com>
AuthorDate: Sun Jul 31 19:53:01 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Aug 4 14:11:10 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a8182a64
media-gfx/digikam: Add translations and doc; lower opencv dependency
Arfrever-enhanced method.
Package-Manager: portage-2.2.28
media-gfx/digikam/digikam-.ebuild | 23 ---
1 file changed, 20 insertions(+), 3 deletions(-)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index 96f19c8..503d034 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -5,7 +5,8 @@
EAPI=6
if [[ ${KDE_BUILD_TYPE} != live ]]; then
- KDE_TEST=true
+ KDE_HANDBOOK="true"
+ KDE_TEST="true"
fi
CMAKE_MAKEFILE_GENERATOR="emake"
inherit kde5
@@ -65,7 +66,7 @@ COMMON_DEPEND="
media-libs/liblqr
>=media-libs/libpgf-6.12.27
media-libs/libpng:0=
- >=media-libs/opencv-3.0.0:=
+ media-libs/opencv:=
media-libs/tiff:0
virtual/jpeg:0
addressbook? (
@@ -113,17 +114,33 @@ src_prepare() {
undetect_lib kipi
undetect_lib scanner KSANE
+ if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ # prepare the translations
+ mv "${WORKDIR}/${MY_P}/po" po || die
+ find po -name "*.po" -and -not -name "digikam.po" -delete || die
+ echo "set_property(GLOBAL PROPERTY
ALLOW_DUPLICATE_CUSTOM_TARGETS 1)" >> CMakeLists.txt || die
+ echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
+ echo "add_subdirectory( po )" >> CMakeLists.txt || die
+
+ if use handbook; then
+ # subdirs need to be preserved b/c relative paths...
+ # doc-translated is, in fact, broken, and ignored
+ mv "${WORKDIR}/${MY_P}/doc/${PN}" doc-default || die
+ echo "add_subdirectory( doc-default )" >>
CMakeLists.txt || die
+ fi
+ fi
+
kde5_src_prepare
}
src_configure() {
# LQR = only allows to choose between bundled/external
local mycmakeargs=(
- -DENABLE_OPENCV3=ON
-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
-DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop)
-DENABLE_MYSQLSUPPORT=$(usex mysql)
-DENABLE_MEDIAPLAYER=$(usex video)
+ -DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo
yes || echo no)
$(cmake-utils_use_find_package gphoto2 Gphoto2)
$(cmake-utils_use_find_package lensfun LensFun)
$(cmake-utils_use_find_package marble Marble)
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/, kde-apps/korganizer/, kde-apps/grantleeeditor/, ...
commit: d51649edc13c40638d82ac65c21e3e548a4894e0
Author: Andreas Sturmlechner gmail com>
AuthorDate: Tue Jul 26 13:49:40 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Tue Jul 26 13:50:02 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d51649ed
kde-apps/akonadi-contact -> kde-apps/akonadi-contacts
Package-Manager: portage-2.2.28
app-office/calligra/calligra-.ebuild| 2 +-
kde-apps/accountwizard/accountwizard-16.07.80.ebuild| 2 +-
kde-apps/accountwizard/accountwizard-16.08.49..ebuild | 2 +-
kde-apps/accountwizard/accountwizard-.ebuild| 2 +-
kde-apps/akonadi-calendar/akonadi-calendar-16.07.80.ebuild | 2 +-
kde-apps/akonadi-calendar/akonadi-calendar-16.08.49..ebuild | 2 +-
kde-apps/akonadi-calendar/akonadi-calendar-.ebuild | 2 +-
.../akonadi-contacts-16.07.80.ebuild} | 2 --
.../akonadi-contacts-16.08.49..ebuild} | 2 --
.../akonadi-contacts-.ebuild} | 2 --
kde-apps/{akonadi-contact => akonadi-contacts}/metadata.xml | 0
kde-apps/akonadiconsole/akonadiconsole-16.07.80.ebuild | 2 +-
kde-apps/akonadiconsole/akonadiconsole-16.08.49..ebuild | 2 +-
kde-apps/akonadiconsole/akonadiconsole-.ebuild | 2 +-
kde-apps/grantleeeditor/grantleeeditor-16.07.80.ebuild | 2 +-
kde-apps/grantleeeditor/grantleeeditor-16.08.49..ebuild | 2 +-
kde-apps/grantleeeditor/grantleeeditor-.ebuild | 2 +-
kde-apps/incidenceeditor/incidenceeditor-16.07.80.ebuild| 2 +-
kde-apps/incidenceeditor/incidenceeditor-16.08.49..ebuild | 2 +-
kde-apps/incidenceeditor/incidenceeditor-.ebuild| 2 +-
kde-apps/kaddressbook/kaddressbook-16.07.80.ebuild | 2 +-
kde-apps/kaddressbook/kaddressbook-16.08.49..ebuild | 2 +-
kde-apps/kaddressbook/kaddressbook-.ebuild | 2 +-
kde-apps/kalarm/kalarm-16.07.80.ebuild | 2 +-
kde-apps/kalarm/kalarm-16.08.49..ebuild | 2 +-
kde-apps/kalarm/kalarm-.ebuild | 2 +-
kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.07.80.ebuild | 2 +-
kde-apps/kdepim-apps-libs/kdepim-apps-libs-16.08.49..ebuild | 2 +-
kde-apps/kdepim-apps-libs/kdepim-apps-libs-.ebuild | 2 +-
kde-apps/kdepim-meta/kdepim-meta-16.07.80.ebuild| 2 +-
kde-apps/kdepim-meta/kdepim-meta-16.08.49..ebuild | 2 +-
kde-apps/kdepim-meta/kdepim-meta-.ebuild| 2 +-
kde-apps/kdepim-runtime/kdepim-runtime-16.07.80.ebuild | 2 +-
kde-apps/kdepim-runtime/kdepim-runtime-16.08.49..ebuild | 2 +-
kde-apps/kdepim-runtime/kdepim-runtime-.ebuild | 2 +-
kde-apps/kgpg/kgpg-5..ebuild| 2 +-
kde-apps/kmail/kmail-16.07.80.ebuild| 2 +-
kde-apps/kmail/kmail-16.08.49..ebuild | 2 +-
kde-apps/kmail/kmail-.ebuild| 2 +-
kde-apps/korganizer/korganizer-16.07.80.ebuild | 2 +-
kde-apps/korganizer/korganizer-16.08.49..ebuild | 2 +-
kde-apps/korganizer/korganizer-.ebuild | 2 +-
kde-apps/libkdepim/libkdepim-16.07.80.ebuild| 2 +-
kde-apps/libkdepim/libkdepim-16.08.49..ebuild | 2 +-
kde-apps/libkdepim/libkdepim-.ebuild| 2 +-
kde-apps/mailcommon/mailcommon-16.07.80.ebuild | 2 +-
kde-apps/mailcommon/mailcommon-16.08.49..ebuild | 2 +-
kde-apps/mailcommon/mailcommon-.ebuild | 2 +-
kde-apps/messagelib/messagelib-16.07.80.ebuild | 2 +-
kde-apps/messagelib/messagelib-16.08.49..ebuild | 2 +-
kde-apps/messagelib/messagelib-.ebuild | 2 +-
kde-apps/pimcommon/pimcommon-16.07.80.ebuild| 2 +-
kde-apps/pimcommon/pimcommon-16.08.49..ebuild | 2 +-
kde-apps/pimcommon/pimcommon-.ebuild| 2 +-
kde-apps/pimsettingexporter/pimsettingexporter-16.07.80.ebuild | 2 +-
kde-apps/pimsettingexporter/pimsettingexporter-16.08.49..ebuild | 2 +-
kde-apps/pimsettingexporter/pimsettingexporter-.ebuild | 2 +-
kde-apps/sieveeditor/sieveeditor-16.07.80.ebuild
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 785426df88e0f892ed82b04c253dbac812e00eab
Author: Michael Palimaka gentoo org>
AuthorDate: Wed Jul 13 15:41:02 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Wed Jul 13 15:41:09 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=785426df
media-gfx/digikam: avoid ninja cmake generator
Gentoo-bug: 588538
Package-Manager: portage-2.3.0
media-gfx/digikam/digikam-.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index c539363..cdebd33 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -7,6 +7,7 @@ EAPI=6
if [[ ${KDE_BUILD_TYPE} != live ]]; then
KDE_TEST=true
fi
+CMAKE_MAKEFILE_GENERATOR="emake"
inherit kde5
DESCRIPTION="Digital photo management application"
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: e03f39f50050b5e199be01fcfe9bb401c0698634
Author: Johannes Huber gentoo org>
AuthorDate: Sun Jul 10 13:21:20 2016 +
Commit: Johannes Huber gentoo org>
CommitDate: Sun Jul 10 13:21:20 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e03f39f5
media-gfx/digikam: Remove 5.0.0
Moved to gentoo main tree.
Package-Manager: portage-2.3.0
media-gfx/digikam/digikam-5.0.0.ebuild | 133 -
1 file changed, 133 deletions(-)
diff --git a/media-gfx/digikam/digikam-5.0.0.ebuild
b/media-gfx/digikam/digikam-5.0.0.ebuild
deleted file mode 100644
index c539363..000
--- a/media-gfx/digikam/digikam-5.0.0.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- KDE_TEST=true
-fi
-inherit kde5
-
-DESCRIPTION="Digital photo management application"
-HOMEPAGE="https://www.digikam.org/;
-
-LICENSE="GPL-2"
-KEYWORDS=""
-IUSE="addressbook gphoto2 kipi lensfun marble semantic-desktop mysql scanner
video X"
-
-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/${MY_P}.tar.xz"
-
- S="${WORKDIR}/${MY_P}/core"
-
-fi
-
-COMMON_DEPEND="
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kjobwidgets)
- $(add_frameworks_dep knotifications)
- $(add_frameworks_dep knotifyconfig)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep ktextwidgets)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem)
- $(add_frameworks_dep kxmlgui)
- $(add_frameworks_dep solid)
- $(add_kdeapps_dep libkexiv2)
- $(add_qt_dep qtconcurrent)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtprintsupport)
- $(add_qt_dep qtscript)
- $(add_qt_dep qtsql 'mysql?')
- $(add_qt_dep qtwebkit)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- dev-libs/boost[threads]
- dev-libs/expat
- >=media-gfx/exiv2-0.24:=
- media-libs/jasper
- media-libs/lcms:2
- media-libs/liblqr
- >=media-libs/libpgf-6.12.27
- media-libs/libpng:0=
- >=media-libs/opencv-3.0.0:=
- media-libs/tiff:0
- virtual/jpeg:0
- addressbook? (
- $(add_kdeapps_dep akonadi-contact)
- $(add_kdeapps_dep kcontacts)
- )
- scanner? ( $(add_kdeapps_dep libksane) )
- gphoto2? ( media-libs/libgphoto2:= )
- kipi? ( $(add_kdeapps_dep libkipi '' '16.03.80') )
- lensfun? ( media-libs/lensfun )
- marble? (
- $(add_frameworks_dep kbookmarks)
- $(add_frameworks_dep kitemmodels)
- $(add_kdeapps_dep marble)
- )
- semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
- mysql? ( virtual/mysql )
- video? ( $(add_qt_dep qtmultimedia 'widgets') )
- X? (
- $(add_qt_dep qtx11extras)
- x11-libs/libX11
- )
-"
-DEPEND="${COMMON_DEPEND}
- dev-cpp/eigen:3
- sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
- media-plugins/kipi-plugins:5
- !media-gfx/digikam:4
-"
-
-RESTRICT=test
-# bug 366505
-
-src_prepare() {
- undetect_lib() {
- local _use=${1}
- local _name=${2}
- [[ -z ${_name} ]] && _name=$(echo ${_use} | sed 's/./\U&/g')
- use $_use || \
- sed -i -e "/DETECT_LIB${_name}/d" CMakeLists.txt || die
- }
-
- undetect_lib kipi
- undetect_lib scanner KSANE
-
- kde5_src_prepare
-}
-
-src_configure() {
- # LQR = only allows to choose between bundled/external
- local mycmakeargs=(
- -DENABLE_OPENCV3=ON
- -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
- -DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop)
- -DENABLE_MYSQLSUPPORT=$(usex mysql)
- -DENABLE_MEDIAPLAYER=$(usex video)
- $(cmake-utils_use_find_package gphoto2 Gphoto2)
- $(cmake-utils_use_find_package lensfun LensFun)
- $(cmake-utils_use_find_package marble Marble)
- $(cmake-utils_use_find_package X X11)
- )
-
- kde5_src_configure
-}
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: b0c54b1de7c4c3ba02a3ed4a6f2323b0b6dd15cc
Author: Michael Palimaka gentoo org>
AuthorDate: Thu Jul 7 18:10:24 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Jul 7 18:11:33 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b0c54b1d
media-gfx/digikam: version bump
Package-Manager: portage-2.3.0
media-gfx/digikam/{digikam-5.0.0_beta6.ebuild => digikam-5.0.0.ebuild} | 2 +-
media-gfx/digikam/digikam-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-gfx/digikam/digikam-5.0.0_beta6.ebuild
b/media-gfx/digikam/digikam-5.0.0.ebuild
similarity index 98%
rename from media-gfx/digikam/digikam-5.0.0_beta6.ebuild
rename to media-gfx/digikam/digikam-5.0.0.ebuild
index b975dfe..c539363 100644
--- a/media-gfx/digikam/digikam-5.0.0_beta6.ebuild
+++ b/media-gfx/digikam/digikam-5.0.0.ebuild
@@ -23,7 +23,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_BRANCH=stable
[[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable
- SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${MY_P}.tar.bz2"
+ SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${MY_P}.tar.xz"
S="${WORKDIR}/${MY_P}/core"
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index b975dfe..c539363 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -23,7 +23,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_BRANCH=stable
[[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable
- SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${MY_P}.tar.bz2"
+ SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${MY_P}.tar.xz"
S="${WORKDIR}/${MY_P}/core"
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: bb86ee5919d7900f2d6b4660d3be288699960e8e
Author: Michael Palimaka gentoo org>
AuthorDate: Wed Jun 15 14:06:52 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Wed Jun 15 14:06:59 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=bb86ee59
media-gfx/digikam: remove doxygen references
doxygen support was dropped in 4c342aafcb62734fe33922091bb7f56bbf8790dc.
Package-Manager: portage-2.3.0_rc1
media-gfx/digikam/digikam-5.0.0_beta6.ebuild | 10 --
media-gfx/digikam/digikam-.ebuild| 10 --
2 files changed, 20 deletions(-)
diff --git a/media-gfx/digikam/digikam-5.0.0_beta6.ebuild
b/media-gfx/digikam/digikam-5.0.0_beta6.ebuild
index bf24118..b975dfe 100644
--- a/media-gfx/digikam/digikam-5.0.0_beta6.ebuild
+++ b/media-gfx/digikam/digikam-5.0.0_beta6.ebuild
@@ -131,13 +131,3 @@ src_configure() {
kde5_src_configure
}
-
-src_install() {
- kde5_src_install
-
- if use doc; then
- # install the api documentation
- insinto /usr/share/doc/${PF}/
- doins -r "${S}"/apidocs/html
- fi
-}
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index bf24118..b975dfe 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -131,13 +131,3 @@ src_configure() {
kde5_src_configure
}
-
-src_install() {
- kde5_src_install
-
- if use doc; then
- # install the api documentation
- insinto /usr/share/doc/${PF}/
- doins -r "${S}"/apidocs/html
- fi
-}
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: e78c54a19bda62049d877baec9985c09462a97dd
Author: Felix Leif Keppmann keppmann de>
AuthorDate: Thu Apr 28 07:50:47 2016 +
Commit: Johannes Huber gentoo org>
CommitDate: Thu Apr 28 10:10:00 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e78c54a1
media-gfx/digikam: version bump to 5.0.0_beta6
Ebuild for beta version of Digikam 5.
Signed-off-by: Johannes Huber gentoo.org>
.../digikam/{digikam-5.0.0_beta5.ebuild => digikam-5.0.0_beta6.ebuild}| 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/media-gfx/digikam/digikam-5.0.0_beta5.ebuild
b/media-gfx/digikam/digikam-5.0.0_beta6.ebuild
similarity index 100%
rename from media-gfx/digikam/digikam-5.0.0_beta5.ebuild
rename to media-gfx/digikam/digikam-5.0.0_beta6.ebuild
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: fd702858962c4b44e0611fdcdb2eb3ec371696bd
Author: Andreas Sturmlechner gmail com>
AuthorDate: Sat Apr 16 15:22:37 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sat Apr 16 17:48:09 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=fd702858
media-gfx/digikam: Sync ebuilds, qtsql[mysql] optional
Gentoo-bug: 580018
Package-Manager: portage-2.2.27
media-gfx/digikam/digikam-5.0.0_beta5.ebuild | 21 ++---
media-gfx/digikam/digikam-.ebuild| 25 ++---
2 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/media-gfx/digikam/digikam-5.0.0_beta5.ebuild
b/media-gfx/digikam/digikam-5.0.0_beta5.ebuild
index d8da5cb..29961c9 100644
--- a/media-gfx/digikam/digikam-5.0.0_beta5.ebuild
+++ b/media-gfx/digikam/digikam-5.0.0_beta5.ebuild
@@ -8,11 +8,10 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
KDE_DOXYGEN=true
KDE_TEST=true
fi
-
inherit kde5
DESCRIPTION="Digital photo management application"
-HOMEPAGE="http://www.digikam.org/;
+HOMEPAGE="https://www.digikam.org/;
LICENSE="GPL-2"
KEYWORDS=""
@@ -49,17 +48,17 @@ COMMON_DEPEND="
$(add_frameworks_dep kxmlgui)
$(add_frameworks_dep solid)
$(add_kdeapps_dep libkexiv2)
- dev-libs/boost[threads]
- dev-libs/expat
$(add_qt_dep qtconcurrent)
$(add_qt_dep qtdbus)
$(add_qt_dep qtgui)
$(add_qt_dep qtprintsupport)
$(add_qt_dep qtscript)
- $(add_qt_dep qtsql 'mysql')
+ $(add_qt_dep qtsql 'mysql?')
$(add_qt_dep qtwebkit)
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
+ dev-libs/boost[threads]
+ dev-libs/expat
>=media-gfx/exiv2-0.24:=
media-libs/jasper
media-libs/lcms:2
@@ -84,18 +83,16 @@ COMMON_DEPEND="
)
semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
mysql? ( virtual/mysql )
- video? ( dev-qt/qtmultimedia[widgets] )
+ video? ( $(add_qt_dep qtmultimedia 'widgets') )
X? (
$(add_qt_dep qtx11extras)
x11-libs/libX11
)
"
-
DEPEND="${COMMON_DEPEND}
dev-cpp/eigen:3
sys-devel/gettext
"
-
RDEPEND="${COMMON_DEPEND}
media-plugins/kipi-plugins:5
!media-gfx/digikam:4
@@ -105,7 +102,6 @@ RESTRICT=test
# bug 366505
src_prepare() {
-
undetect_lib() {
local _use=${1}
local _name=${2}
@@ -118,11 +114,9 @@ src_prepare() {
undetect_lib scanner KSANE
kde5_src_prepare
-
}
src_configure() {
-
# LQR = only allows to choose between bundled/external
local mycmakeargs=(
-DENABLE_OPENCV3=ON
@@ -137,17 +131,14 @@ src_configure() {
)
kde5_src_configure
-
}
src_install() {
-
kde5_src_install
if use doc; then
# install the api documentation
insinto /usr/share/doc/${PF}/
- doins -r ${CMAKE_BUILD_DIR}/api/html
+ doins -r "${S}"/apidocs/html
fi
-
}
diff --git a/media-gfx/digikam/digikam-.ebuild
b/media-gfx/digikam/digikam-.ebuild
index d45ce50..29961c9 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -4,21 +4,32 @@
EAPI=6
-KDE_DOXYGEN="true"
-KDE_TEST="true"
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ KDE_DOXYGEN=true
+ KDE_TEST=true
+fi
inherit kde5
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
DESCRIPTION="Digital photo management application"
HOMEPAGE="https://www.digikam.org/;
-[[ ${KDE_BUILD_TYPE} = live ]] ||
SRC_URI="mirror://kde/stable/${PN}/${MY_P}.tar.bz2"
LICENSE="GPL-2"
KEYWORDS=""
IUSE="addressbook gphoto2 kipi lensfun marble semantic-desktop mysql scanner
video X"
+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/${MY_P}.tar.bz2"
+
+ S="${WORKDIR}/${MY_P}/core"
+
+fi
+
COMMON_DEPEND="
$(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)
@@ -42,7 +53,7 @@ COMMON_DEPEND="
$(add_qt_dep qtgui)
$(add_qt_dep qtprintsupport)
$(add_qt_dep qtscript)
- $(add_qt_dep qtsql 'mysql')
+ $(add_qt_dep qtsql 'mysql?')
$(add_qt_dep qtwebkit)
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: f1104d3196ddd0f79bc5956abbafd222a2452c56
Author: Felix Leif Keppmann keppmann de>
AuthorDate: Sun Apr 10 13:31:14 2016 +
Commit: Johannes Huber gentoo org>
CommitDate: Tue Apr 12 17:55:25 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f1104d31
media-gfx/digikam: version bump to 5.0.0_beta5
Ebuild for beta version of Digikam 5.
Signed-off-by: Johannes Huber gentoo.org>
.../digikam/{digikam-5.0.0_beta4.ebuild => digikam-5.0.0_beta5.ebuild}| 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/media-gfx/digikam/digikam-5.0.0_beta4.ebuild
b/media-gfx/digikam/digikam-5.0.0_beta5.ebuild
similarity index 100%
rename from media-gfx/digikam/digikam-5.0.0_beta4.ebuild
rename to media-gfx/digikam/digikam-5.0.0_beta5.ebuild
