On Mon Mar 11, 2019 at 09:45:17PM +0100, Rafael Sadowski wrote:
> On Tue Oct 16, 2018 at 09:43:36PM +0200, Rafael Sadowski wrote:
> > Hi All!
> >
> > Digikam 5.x depends on opencv 3.x. The diff below updates opencv to the
> > latest stable version. Please keep in mind graphics/digikam-kde4 will
> > not build with opencv 3.x. The second consumer nomacs is fine with this
> > version.
> >
> > A few months ago, Elias M. Mariani successfully tested it and I run
> > Digikam very often.
> >
> > I need an OK to import the new KDE5 digikam.
> >
> > Rafael Sadowski
> >
>
> ping and re-attached...
>
Please find attached a new tarball with following changes:
I would *really* go in before the tree is locked.
RS
diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile
index d03370d3e..fecbbe918 100644
--- a/graphics/digikam/Makefile
+++ b/graphics/digikam/Makefile
@@ -11,10 +11,9 @@ HOMEPAGE = https://www.digikam.org/
MAINTAINER = Rafael Sadowski
SHARED_LIBS += KF5kipiplugins0.0 # 5.6
-# Version numbers from digikam-kde4
-SHARED_LIBS += digikamcore 1.0 # 5.5
-SHARED_LIBS += digikamdatabase 1.0 # 5.5
-SHARED_LIBS += digikamgui1.0 # 5.5
+SHARED_LIBS += digikamcore 0.0 # 5.6
+SHARED_LIBS += digikamdatabase 0.0 # 5.6
+SHARED_LIBS += digikamgui0.0 # 5.6
# LGPL, GPL and many others
PERMIT_PACKAGE_CDROM = Yes
@@ -31,7 +30,7 @@ WANTLIB += Qt5Sql Qt5WebKit Qt5WebKitWidgets Qt5Widgets
Qt5X11Extras
WANTLIB += Qt5Xml Qt5XmlPatterns SM X11 Xext c exiv2 expat exslt
WANTLIB += glib-2.0 gphoto2 gphoto2_port intl jasper jpeg lcms2
WANTLIB += lensfun lqr-1 m opencv_core opencv_imgcodecs opencv_imgproc
-WANTLIB += opencv_objdetect png tiff usb-1.0 xml2 xslt z
+WANTLIB += opencv_objdetect png16 tiff usb-1.0 xml2 xslt z
MASTER_SITES = ${MASTER_SITE_KDE:=stable/digikam/}
@@ -57,8 +56,8 @@ RUN_DEPENDS = devel/desktop-file-utils \
devel/gettext
# TODO
-# - libksane
# - libakonadicontact
+# - libkvkontakte
LIB_DEPENDS += devel/kf5/kservice \
devel/kf5/kcoreaddons \
@@ -79,15 +78,17 @@ LIB_DEPENDS += devel/kf5/kservice \
graphics/libgphoto2 \
graphics/jasper \
graphics/lensfun \
- graphics/opencv \
+ graphics/opencv>=3\
graphics/liblqr \
graphics/exiv2 \
x11/qt5/qtwebkit \
x11/qt5/qtxmlpatterns \
x11/kde-applications/kcalcore \
- x11/kde-applications/libkipi
+ x11/kde-applications/libksane \
+ x11/kde-applications/libkipi \
+ x11/kde-applications/marble
-CONFIGURE_ARGS = -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen:Bool=Yes \
+CONFIGURE_ARGS = -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=Yes \
-DENABLE_MEDIAPLAYER=OFF \
CONFIGURE_ARGS += -DCMAKE_POLICY_DEFAULT_CMP0071=NEW
diff --git a/graphics/digikam/pkg/PLIST b/graphics/digikam/pkg/PLIST
index 4e2635f5f..371a086cc 100644
--- a/graphics/digikam/pkg/PLIST
+++ b/graphics/digikam/pkg/PLIST
@@ -1,4 +1,6 @@
-@comment $OpenBSD$
+@comment $OpenBSD: PLIST,v$
+@conflict digikam-kde4-*
+@conflict kipi-plugins-<=4
bin/cleanup_digikamdb
@bin bin/digikam
bin/digitaglinktree
@@ -2368,3 +2370,5 @@ share/solid/actions/digikam-opencamera.desktop
@unexec-delete %D/bin/update-desktop-database
@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@tag update-desktop-database
+@tag gtk-update-icon-cache %D/share/icons/hicolor
digikam-5.9.tar.gz
Description: Binary data
