1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00

On behalf of the KDE team proudly to announce Digikam 6.4.0 release!

NEW FEATURES:
General    : new RawImport plugin interface to delegate Raw decoding function to extra engine with ImageEditor.
General    : new DImg plugin interface to externalize image loaders from core implementation.
General    : new HEIC image loader compatible with media generated by Apple devices.
Import     : add new option to convert on the fly to HEIC lossless format while downloading.
ImageEditor: add new setting from setup dialog to select right Raw Import plugin.
ImageEditor: add new clone tool to fix artifacts on image.
ImageEditor: add new tool to import RAW image using UFRaw.
ImageEditor: add new tool to import RAW image using RawTherapee.
ImageEditor: add new tool to import RAW image using DarkTable.
BQM        : add new tool to convert to HEIC format.
This commit is contained in:
Dima Panov 2019-11-29 14:00:50 +00:00
parent b122f3eaa8
commit 0a70b012db
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=518651
8 changed files with 51 additions and 90 deletions

View File

@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME= digikam
DISTVERSION= 6.3.0
PORTREVISION= 2
DISTVERSION= 6.4.0
PORTREVISION= 0
CATEGORIES= graphics kde
MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}
DIST_SUBDIR= KDE/digikam/${PORTVERSION}
@ -29,7 +29,8 @@ LIB_DEPENDS= libKF5KGeoMap.so:astro/libkgeomap \
libopencv_core.so:graphics/opencv-core \
libpgf.so:graphics/libpgf \
libpng.so:graphics/png \
libtiff.so:graphics/tiff
libtiff.so:graphics/tiff \
libx265.so:multimedia/x265
USES= bison cmake compiler:c++11-lib desktop-file-utils eigen:3 gl \
gnome jpeg kde:5 pkgconfig qt:5 shebangfix tar:xz xorg
@ -101,8 +102,4 @@ WEBENGINE_CMAKE_BOOL= ENABLE_QWEBENGINE
PLIST_SUB= SHLIB_VER=${DISTVERSION}
post-extract:
# Remove localization file already installed by net/libkvkontakte.
${RM} ${WRKSRC}/po/*/libkvkontakte.po
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1567767452
SHA256 (KDE/digikam/6.3.0/digikam-6.3.0.tar.xz) = 94dc05e3f9c08b83419010d1689c7b0398d4eced4fef42375249c974622874ba
SIZE (KDE/digikam/6.3.0/digikam-6.3.0.tar.xz) = 335641824
TIMESTAMP = 1575016178
SHA256 (KDE/digikam/6.4.0/digikam-6.4.0.tar.xz) = 775012ff515bdd25a0b894c95bf5d33e7122b523da9c0f3af260ec3eff498d6f
SIZE (KDE/digikam/6.4.0/digikam-6.4.0.tar.xz) = 340146992

View File

@ -0,0 +1,11 @@
--- core/app/utils/digikam_version.cpp.orig 2019-11-03 09:03:59 UTC
+++ core/app/utils/digikam_version.cpp
@@ -29,7 +29,7 @@
// Local includes.
-#include "gitversion.h"
+#define GITVERSION ""
#include "daboutdata.h"
#if defined(Q_CC_GNU)

View File

@ -1,11 +0,0 @@
--- core/app/utils/digikam_version.h.cmake.in.orig 2019-02-10 22:44:01 UTC
+++ core/app/utils/digikam_version.h.cmake.in
@@ -34,7 +34,7 @@
// Local includes.
-#include "gitversion.h"
+#define GITVERSION ""
#include "daboutdata.h"
namespace Digikam

View File

@ -1,10 +0,0 @@
--- core/dplugins/generic/tools/mediaserver/CMakeLists.txt.orig 2019-09-09 17:14:58 UTC
+++ core/dplugins/generic/tools/mediaserver/CMakeLists.txt
@@ -166,6 +166,7 @@ add_library(mediaserverbackend STATIC ${libmediaserver
target_link_libraries(mediaserverbackend
digikamcore
+ Threads::Threads
)
# ---------------------------------------------------------------------------------------------------

View File

@ -1,58 +0,0 @@
From f4e988761fec7d7a75c2789e752b5419b4a84213 Mon Sep 17 00:00:00 2001
From: "Tobias C. Berner" <tcberner@FreeBSD.org>
Date: Fri, 2 Nov 2018 13:15:41 +0100
Subject: [PATCH] Don't redefine nulltpr on FreeBSD
FreeBSDs `/usr/include/sys/_null.h` defines
```
[...]
#if __cplusplus >= 201103L
#define NULL nullptr
[...]
```
This leads to compilation errors:
```
core/libs/dimg/loaders/pgfloader.cpp:295:27: error: use of undeclared identifier 'NULL'
NULL,
^
/usr/include/sys/_null.h:37:14: note: expanded from macro 'NULL'
#define NULL nullptr
^
core/libs/pgfutils/libpgf/PGFplatform.h:488:20: note: expanded from macro 'nullptr'
#define nullptr NULL
^
core/libs/dimg/loaders/pgfloader.cpp:455:26: error: use of undeclared identifier 'NULL'
NULL,
^
/usr/include/sys/_null.h:37:14: note: expanded from macro 'NULL'
#define NULL nullptr
^
core/libs/pgfutils/libpgf/PGFplatform.h:488:20: note: expanded from macro 'nullptr'
#define nullptr NULL
^
2 errors generated.
ninja: build stopped: subcommand failed.
```
---
core/libs/pgfutils/libpgf/PGFplatform.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/core/libs/pgfutils/libpgf/PGFplatform.h b/core/libs/pgfutils/libpgf/PGFplatform.h
index ee803c36f4..e8df6d99ba 100644
--- core/libs/pgfutils/libpgf/PGFplatform.h
+++ core/libs/pgfutils/libpgf/PGFplatform.h
@@ -485,7 +485,9 @@ __inline int MulDiv(int nNumber, int nNumerator, int nDenominator) {
#define FSFromStart SEEK_SET
#define FSFromCurrent SEEK_CUR
#define FSFromEnd SEEK_END
+#if !(defined(__FreeBSD__) && (__cplusplus >= 201103L))
#define nullptr NULL
+#endif
//-------------------------------------------------------------------------------
// IO Error constants
--
2.19.1

View File

@ -9,6 +9,6 @@ Basic auto-transformations can be deployed on the fly during
image downloading.
Digikam also uses the very flexible Kipi plugin architecture.
Install the graphics/kipi-plugins-kde4 port to extend Digikam's features.
Install the graphics/kipi-plugins port to extend Digikam's features.
WWW: https://www.digikam.org/

View File

@ -19,6 +19,7 @@ include/digikam/dcolor.h
include/digikam/dcolorblend.h
include/digikam/dcolorcomposer.h
include/digikam/dcolorpixelaccess.h
include/digikam/dhistoryview.h
include/digikam/digikam_config.h
include/digikam/digikam_core_export.h
include/digikam/digikam_database_export.h
@ -26,6 +27,10 @@ include/digikam/digikam_export.h
include/digikam/digikam_globals.h
include/digikam/dimg.h
include/digikam/dimgbuiltinfilter.h
include/digikam/dimgloaderobserver.h
include/digikam/dimgpreviewitem.h
include/digikam/dimgthreadedanalyser.h
include/digikam/dimgthreadedfilter.h
include/digikam/dinfointerface.h
include/digikam/ditemslist.h
include/digikam/dmessagebox.h
@ -38,6 +43,7 @@ include/digikam/dplugindialog.h
include/digikam/dplugineditor.h
include/digikam/dplugingeneric.h
include/digikam/dpluginloader.h
include/digikam/dpluginrawimport.h
include/digikam/dpreviewimage.h
include/digikam/dpreviewmanager.h
include/digikam/drawdecoder.h
@ -48,23 +54,34 @@ include/digikam/dsavesettingswidget.h
include/digikam/dshareddata.h
include/digikam/dwizarddlg.h
include/digikam/dwizardpage.h
include/digikam/editortool.h
include/digikam/filesaveconflictbox.h
include/digikam/filteraction.h
include/digikam/geocoordinates.h
include/digikam/geoifacetypes.h
include/digikam/gpsdatacontainer.h
include/digikam/gpsitemcontainer.h
include/digikam/graphicsdimgitem.h
include/digikam/graphicsdimgview.h
include/digikam/historyimageid.h
include/digikam/iccprofile.h
include/digikam/icctransform.h
include/digikam/imageiface.h
include/digikam/imageregionwidget.h
include/digikam/imagezoomsettings.h
include/digikam/iofilesettings.h
include/digikam/iteminfo.h
include/digikam/iteminfolist.h
include/digikam/loadingdescription.h
include/digikam/metaengine.h
include/digikam/metaengine_data.h
include/digikam/photoinfocontainer.h
include/digikam/previewlayout.h
include/digikam/previewsettings.h
include/digikam/previewtoolbar.h
include/digikam/queuesettings.h
include/digikam/rginfo.h
include/digikam/thumbnailinfo.h
include/digikam/wbcontainer.h
lib/cmake/DigikamCore/DigikamCoreConfig-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/DigikamCore/DigikamCoreConfig.cmake
@ -94,6 +111,7 @@ lib/libdigikamgui.so.%%SHLIB_VER%%
%%QT_PLUGINDIR%%/digikam/bqm/Bqm_Convert16To8_Plugin.so
%%QT_PLUGINDIR%%/digikam/bqm/Bqm_Convert8To16_Plugin.so
%%QT_PLUGINDIR%%/digikam/bqm/Bqm_ConvertToDNG_Plugin.so
%%QT_PLUGINDIR%%/digikam/bqm/Bqm_ConvertToHEIF_Plugin.so
%%QT_PLUGINDIR%%/digikam/bqm/Bqm_ConvertToJP2lugin_Plugin.so
%%QT_PLUGINDIR%%/digikam/bqm/Bqm_ConvertToJPEG_Plugin.so
%%QT_PLUGINDIR%%/digikam/bqm/Bqm_ConvertToPGF_Plugin.so
@ -119,6 +137,15 @@ lib/libdigikamgui.so.%%SHLIB_VER%%
%%QT_PLUGINDIR%%/digikam/bqm/Bqm_UserScript_Plugin.so
%%QT_PLUGINDIR%%/digikam/bqm/Bqm_WaterMark_Plugin.so
%%QT_PLUGINDIR%%/digikam/bqm/Bqm_WhiteBalance_Plugin.so
%%QT_PLUGINDIR%%/digikam/dimg/DImg_HEIF_Plugin.so
%%QT_PLUGINDIR%%/digikam/dimg/DImg_ImageMagick_Plugin.so
%%QT_PLUGINDIR%%/digikam/dimg/DImg_JPEG2000_Plugin.so
%%QT_PLUGINDIR%%/digikam/dimg/DImg_JPEG_Plugin.so
%%QT_PLUGINDIR%%/digikam/dimg/DImg_PGF_Plugin.so
%%QT_PLUGINDIR%%/digikam/dimg/DImg_PNG_Plugin.so
%%QT_PLUGINDIR%%/digikam/dimg/DImg_QImage_Plugin.so
%%QT_PLUGINDIR%%/digikam/dimg/DImg_RAW_Plugin.so
%%QT_PLUGINDIR%%/digikam/dimg/DImg_TIFF_Plugin.so
%%QT_PLUGINDIR%%/digikam/editor/Editor_AdjustCurvesTool_Plugin.so
%%QT_PLUGINDIR%%/digikam/editor/Editor_AdjustLevelsTool_Plugin.so
%%QT_PLUGINDIR%%/digikam/editor/Editor_AntivignettingTool_Plugin.so
@ -142,6 +169,7 @@ lib/libdigikamgui.so.%%SHLIB_VER%%
%%QT_PLUGINDIR%%/digikam/editor/Editor_FilmTool_Plugin.so
%%QT_PLUGINDIR%%/digikam/editor/Editor_FreeRotationTool_Plugin.so
%%QT_PLUGINDIR%%/digikam/editor/Editor_HSLTool_Plugin.so
%%QT_PLUGINDIR%%/digikam/editor/Editor_HealingCloneTool_Plugin.so
%%QT_PLUGINDIR%%/digikam/editor/Editor_HotpixelsTool_Plugin.so
%%QT_PLUGINDIR%%/digikam/editor/Editor_InsertTextTool_Plugin.so
%%QT_PLUGINDIR%%/digikam/editor/Editor_InvertTool_Plugin.so
@ -196,6 +224,10 @@ lib/libdigikamgui.so.%%SHLIB_VER%%
%%KVKONTAKTE%%%%QT_PLUGINDIR%%/digikam/generic/Generic_VKontakte_Plugin.so
%%QT_PLUGINDIR%%/digikam/generic/Generic_Wallpaper_Plugin.so
%%QT_PLUGINDIR%%/digikam/generic/Generic_YandexFotki_Plugin.so
%%QT_PLUGINDIR%%/digikam/rawimport/RawImport_DarkTable_Plugin.so
%%QT_PLUGINDIR%%/digikam/rawimport/RawImport_Native_Plugin.so
%%QT_PLUGINDIR%%/digikam/rawimport/RawImport_RawTherapee_Plugin.so
%%QT_PLUGINDIR%%/digikam/rawimport/RawImport_UFRaw_Plugin.so
man/man1/cleanup_digikamdb.1.gz
man/man1/digitaglinktree.1.gz
share/applications/org.kde.digikam.desktop