Update digikam to 7.2.0
This commit is contained in:
rsadowski
parent
9dbe7404b0
commit
026000ca63
@ -1,19 +1,18 @@
|
||||
# $OpenBSD: Makefile,v 1.71 2021/03/14 14:12:27 kn Exp $
|
||||
# $OpenBSD: Makefile,v 1.72 2021/03/23 10:37:35 rsadowski Exp $
|
||||
|
||||
COMMENT = KDE digital photo and video management utility
|
||||
|
||||
V = 7.1.0
|
||||
V = 7.2.0
|
||||
DISTNAME = digikam-${V}
|
||||
CATEGORIES = graphics
|
||||
REVISION = 1
|
||||
|
||||
HOMEPAGE = https://www.digikam.org/
|
||||
|
||||
MAINTAINER = Rafael Sadowski <rsadowski@openbsd.org>
|
||||
|
||||
SHARED_LIBS += digikamcore 2.0 # 5.9
|
||||
SHARED_LIBS += digikamdatabase 2.0 # 5.9
|
||||
SHARED_LIBS += digikamgui 2.0 # 5.9
|
||||
SHARED_LIBS += digikamcore 2.1 # 7.2
|
||||
SHARED_LIBS += digikamdatabase 3.0 # 7.2
|
||||
SHARED_LIBS += digikamgui 3.0 # 7.2
|
||||
|
||||
# LGPL, GPL and many others
|
||||
PERMIT_PACKAGE = Yes
|
||||
@ -22,20 +21,22 @@ WANTLIB += ${COMPILER_LIBCXX} GL GLU ICE KF5AkonadiContact KF5AkonadiCore
|
||||
WANTLIB += KF5AkonadiWidgets KF5Auth KF5AuthCore KF5CalendarCore
|
||||
WANTLIB += KF5Codecs KF5Completion KF5ConfigCore KF5ConfigGui
|
||||
WANTLIB += KF5ConfigWidgets KF5Contacts KF5CoreAddons KF5FileMetaData
|
||||
WANTLIB += KF5I18n KF5IconThemes KF5ItemModels KF5JobWidgets KF5KIOCore
|
||||
WANTLIB += KF5KIOGui KF5KIOWidgets KF5Notifications KF5NotifyConfig
|
||||
WANTLIB += KF5Sane KF5Service KF5Solid KF5ThreadWeaver KF5WidgetsAddons
|
||||
WANTLIB += KF5WindowSystem KF5XmlGui Magick++-6.Q16 MagickCore-6.Q16
|
||||
WANTLIB += Qt5Concurrent Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5OpenGL
|
||||
WANTLIB += Qt5Positioning Qt5PrintSupport Qt5Qml Qt5Quick Qt5Sql
|
||||
WANTLIB += Qt5WebChannel Qt5WebEngineCore Qt5WebEngineWidgets
|
||||
WANTLIB += Qt5Widgets Qt5X11Extras Qt5Xml Qt5XmlPatterns SM X11
|
||||
WANTLIB += Xext avcodec avdevice avfilter avformat avutil c exiv2
|
||||
WANTLIB += expat exslt glib-2.0 gphoto2 gphoto2_port intl jasper
|
||||
WANTLIB += jpeg lcms2 lensfun lqr-1 m marblewidget-qt5 opencv_calib3d
|
||||
WANTLIB += opencv_core opencv_dnn opencv_features2d opencv_flann
|
||||
WANTLIB += opencv_imgcodecs opencv_imgproc opencv_objdetect png
|
||||
WANTLIB += swscale tiff usb-1.0 x265 xml2 xslt z
|
||||
WANTLIB += KF5GrantleeTheme KF5I18n KF5IconThemes KF5ItemModels
|
||||
WANTLIB += KF5JobWidgets KF5KIOCore KF5KIOGui KF5KIOWidgets KF5Notifications
|
||||
WANTLIB += KF5NotifyConfig KF5Sane KF5Service KF5Solid KF5ThreadWeaver
|
||||
WANTLIB += KF5WidgetsAddons KF5WindowSystem KF5XmlGui Magick++-6.Q16
|
||||
WANTLIB += MagickCore-6.Q16 Qt5Concurrent Qt5Core Qt5DBus Qt5Gui
|
||||
WANTLIB += Qt5Network Qt5OpenGL Qt5Positioning Qt5PrintSupport
|
||||
WANTLIB += Qt5Qml Qt5QmlModels Qt5Quick Qt5Sql Qt5WebChannel Qt5WebEngineCore
|
||||
WANTLIB += Qt5WebEngineWidgets Qt5Widgets Qt5X11Extras Qt5Xml
|
||||
WANTLIB += Qt5XmlPatterns SM X11 Xext avcodec avdevice avfilter
|
||||
WANTLIB += avformat avutil c exiv2 expat exslt glib-2.0 gphoto2
|
||||
WANTLIB += gphoto2_port intl jasper jpeg lcms2 lensfun lqr-1 m
|
||||
WANTLIB += marblewidget-qt5 opencv_calib3d opencv_core opencv_dnn
|
||||
WANTLIB += opencv_features2d opencv_flann opencv_imgcodecs opencv_imgproc
|
||||
WANTLIB += opencv_ml opencv_objdetect png swscale tiff usb-1.0
|
||||
WANTLIB += x265 xml2 xslt z
|
||||
|
||||
|
||||
MASTER_SITES = ${MASTER_SITE_KDE:=stable/digikam/${V}/}
|
||||
|
||||
@ -96,6 +97,7 @@ LIB_DEPENDS = devel/kf5/kauth \
|
||||
x11/kde-applications/akonadi-contacts \
|
||||
x11/kde-applications/libksane \
|
||||
x11/kde-applications/marble \
|
||||
x11/kde-applications/grantleetheme \
|
||||
x11/qt5/qtdeclarative \
|
||||
x11/qt5/qtwebchannel \
|
||||
x11/qt5/qtwebengine \
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (digikam-7.1.0.tar.xz) = sQPIRjrfBJOVgxmeE/joMBXYpKmteev9UC0qULWlq74=
|
||||
SIZE (digikam-7.1.0.tar.xz) = 593501044
|
||||
SHA256 (digikam-7.2.0.tar.xz) = zYfs4UOu+gLmkqSvXDw8wQe5pNYYBNefp33S40R5ihc=
|
||||
SIZE (digikam-7.2.0.tar.xz) = 255278796
|
||||
|
||||
@ -0,0 +1,18 @@
|
||||
$OpenBSD: patch-core_dplugins_generic_tools_mediaserver_upnpsdk_Neptune_Source_System_Bsd_NptBsdResolver_cpp,v 1.1 2021/03/23 10:37:35 rsadowski Exp $
|
||||
|
||||
Index: core/dplugins/generic/tools/mediaserver/upnpsdk/Neptune/Source/System/Bsd/NptBsdResolver.cpp
|
||||
--- core/dplugins/generic/tools/mediaserver/upnpsdk/Neptune/Source/System/Bsd/NptBsdResolver.cpp.orig
|
||||
+++ core/dplugins/generic/tools/mediaserver/upnpsdk/Neptune/Source/System/Bsd/NptBsdResolver.cpp
|
||||
@@ -51,7 +51,6 @@ static NPT_WinsockSystem& WinsockInitializer = NPT_Win
|
||||
#include "NptResults.h"
|
||||
#include "NptSockets.h"
|
||||
|
||||
-#if defined(NPT_CONFIG_HAVE_GETADDRINFO)
|
||||
/*----------------------------------------------------------------------
|
||||
| constants
|
||||
+---------------------------------------------------------------------*/
|
||||
@@ -134,4 +133,3 @@ NPT_NetworkNameResolver::Resolve(const char*
|
||||
|
||||
return NPT_SUCCESS;
|
||||
}
|
||||
-#endif
|
||||
@ -0,0 +1,37 @@
|
||||
$OpenBSD: patch-core_libs_rawengine_libraw_src_decoders_fp_dng_cpp,v 1.1 2021/03/23 10:37:35 rsadowski Exp $
|
||||
|
||||
Rename to avoid conflicts
|
||||
|
||||
Index: core/libs/rawengine/libraw/src/decoders/fp_dng.cpp
|
||||
--- core/libs/rawengine/libraw/src/decoders/fp_dng.cpp.orig
|
||||
+++ core/libs/rawengine/libraw/src/decoders/fp_dng.cpp
|
||||
@@ -549,7 +549,7 @@ _forceinline
|
||||
#else
|
||||
inline
|
||||
#endif
|
||||
-void swap24(uchar *data, int len)
|
||||
+void _swap24(uchar *data, int len)
|
||||
{
|
||||
for (int i = 0; i < len - 2; i += 3)
|
||||
{
|
||||
@@ -565,7 +565,7 @@ _forceinline
|
||||
#else
|
||||
inline
|
||||
#endif
|
||||
-void swap32(uchar *data, int len)
|
||||
+void _swap32(uchar *data, int len)
|
||||
{
|
||||
unsigned *d = (unsigned*)data;
|
||||
for (int i = 0; i < len / 4; i++)
|
||||
@@ -630,9 +630,9 @@ void LibRaw::uncompressed_fp_dng_load_raw()
|
||||
if (bytesps == 2 && difford)
|
||||
swab((char *)dst, (char *)dst, fullrowbytes);
|
||||
else if (bytesps == 3 && (libraw_internal_data.unpacker_data.order == 0x4949)) // II-16bit
|
||||
- swap24(dst, fullrowbytes);
|
||||
+ _swap24(dst, fullrowbytes);
|
||||
if (bytesps == 4 && difford)
|
||||
- swap32(dst, fullrowbytes);
|
||||
+ _swap32(dst, fullrowbytes);
|
||||
|
||||
float lmax = expandFloats(
|
||||
dst,
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.26 2020/09/04 18:34:50 rsadowski Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.27 2021/03/23 10:37:35 rsadowski Exp $
|
||||
@conflict digikam-kde4-*
|
||||
@conflict kipi-plugins-<=4
|
||||
bin/cleanup_digikamdb
|
||||
@ -14,6 +14,7 @@ include/digikam/coredbconstants.h
|
||||
include/digikam/coredbfields.h
|
||||
include/digikam/coredburl.h
|
||||
include/digikam/curvescontainer.h
|
||||
include/digikam/dactivelabel.h
|
||||
include/digikam/dbengineaction.h
|
||||
include/digikam/dbengineconfig.h
|
||||
include/digikam/dbengineconfigsettings.h
|
||||
@ -53,6 +54,7 @@ include/digikam/dpluginloader.h
|
||||
include/digikam/dpluginrawimport.h
|
||||
include/digikam/dpreviewimage.h
|
||||
include/digikam/dpreviewmanager.h
|
||||
include/digikam/dprogresswdg.h
|
||||
include/digikam/drawdecoder.h
|
||||
include/digikam/drawdecodersettings.h
|
||||
include/digikam/drawdecoding.h
|
||||
@ -94,6 +96,8 @@ include/digikam/rginfo.h
|
||||
include/digikam/thumbnailinfo.h
|
||||
include/digikam/thumbnailloadthread.h
|
||||
include/digikam/wbcontainer.h
|
||||
include/digikam/wstooldialog.h
|
||||
include/digikam/wstoolutils.h
|
||||
lib/cmake/DigikamCore/
|
||||
lib/cmake/DigikamCore/DigikamCoreConfig${MODCMAKE_BUILD_SUFFIX}
|
||||
lib/cmake/DigikamCore/DigikamCoreConfig.cmake
|
||||
@ -215,7 +219,6 @@ lib/qt5/plugins/digikam/generic/
|
||||
@so lib/qt5/plugins/digikam/generic/Generic_DigitalScanner_Plugin.so
|
||||
@so lib/qt5/plugins/digikam/generic/Generic_DropBox_Plugin.so
|
||||
@so lib/qt5/plugins/digikam/generic/Generic_ExpoBlending_Plugin.so
|
||||
@so lib/qt5/plugins/digikam/generic/Generic_FaceBook_Plugin.so
|
||||
@so lib/qt5/plugins/digikam/generic/Generic_FileCopy_Plugin.so
|
||||
@so lib/qt5/plugins/digikam/generic/Generic_FileTransfer_Plugin.so
|
||||
@so lib/qt5/plugins/digikam/generic/Generic_Flickr_Plugin.so
|
||||
@ -225,7 +228,6 @@ lib/qt5/plugins/digikam/generic/
|
||||
@so lib/qt5/plugins/digikam/generic/Generic_HtmlGallery_Plugin.so
|
||||
@so lib/qt5/plugins/digikam/generic/Generic_ImageShack_Plugin.so
|
||||
@so lib/qt5/plugins/digikam/generic/Generic_ImgUr_Plugin.so
|
||||
@so lib/qt5/plugins/digikam/generic/Generic_IpFs_Plugin.so
|
||||
@so lib/qt5/plugins/digikam/generic/Generic_JAlbum_Plugin.so
|
||||
@so lib/qt5/plugins/digikam/generic/Generic_MediaServer_Plugin.so
|
||||
@so lib/qt5/plugins/digikam/generic/Generic_MediaWiki_Plugin.so
|
||||
@ -303,6 +305,7 @@ share/digikam/data/colors-luma.png
|
||||
share/digikam/data/craters-pattern.png
|
||||
share/digikam/data/curvefree.png
|
||||
share/digikam/data/curvemooth.png
|
||||
share/digikam/data/detectFacesImg.png
|
||||
share/digikam/data/dried-pattern.png
|
||||
share/digikam/data/duplicatebothhorz.png
|
||||
share/digikam/data/duplicatebothvert.png
|
||||
@ -314,6 +317,7 @@ share/digikam/data/histogram-lin.png
|
||||
share/digikam/data/histogram-log.png
|
||||
share/digikam/data/histogram.png
|
||||
share/digikam/data/ice-pattern.png
|
||||
share/digikam/data/ignoreImg.png
|
||||
share/digikam/data/image-full.png
|
||||
share/digikam/data/image-selection.png
|
||||
share/digikam/data/leaf-pattern.png
|
||||
@ -344,6 +348,7 @@ share/digikam/data/metalwire-texture.png
|
||||
share/digikam/data/modern-texture.png
|
||||
share/digikam/data/moss-texture.png
|
||||
share/digikam/data/original.png
|
||||
share/digikam/data/overlayImg.png
|
||||
share/digikam/data/paper-pattern.png
|
||||
share/digikam/data/paper-texture.png
|
||||
share/digikam/data/paper2-texture.png
|
||||
@ -357,19 +362,16 @@ share/digikam/data/sample-aix.png
|
||||
share/digikam/data/splash-digikam.png
|
||||
share/digikam/data/stone-pattern.png
|
||||
share/digikam/data/stone-texture.png
|
||||
share/digikam/data/tagFacesImg.gif
|
||||
share/digikam/data/target.png
|
||||
share/digikam/data/togglemouseover.png
|
||||
share/digikam/data/wall-pattern.png
|
||||
share/digikam/data/wall-texture.png
|
||||
share/digikam/data/wood-pattern.png
|
||||
share/digikam/data/workOnAllCoresImg.png
|
||||
share/digikam/database/
|
||||
share/digikam/database/dbconfig.xml
|
||||
share/digikam/database/mysql-global.conf
|
||||
share/digikam/facesengine/
|
||||
share/digikam/facesengine/deploy.prototxt
|
||||
share/digikam/facesengine/openface_nn4.small2.v1.t7
|
||||
share/digikam/facesengine/res10_300x300_ssd_iter_140000_fp16.caffemodel
|
||||
share/digikam/facesengine/shapepredictor.dat
|
||||
share/digikam/geoiface/
|
||||
share/digikam/geoiface/backend-googlemaps-js.js
|
||||
share/digikam/geoiface/backend-googlemaps.html
|
||||
@ -694,14 +696,11 @@ share/icons/hicolor/128x128/apps/showfoto.png
|
||||
share/icons/hicolor/16x16/apps/digikam.png
|
||||
share/icons/hicolor/16x16/apps/dk-box.png
|
||||
share/icons/hicolor/16x16/apps/dk-dropbox.png
|
||||
share/icons/hicolor/16x16/apps/dk-facebook-white.png
|
||||
share/icons/hicolor/16x16/apps/dk-facebook.png
|
||||
share/icons/hicolor/16x16/apps/dk-flickr.png
|
||||
share/icons/hicolor/16x16/apps/dk-googledrive.png
|
||||
share/icons/hicolor/16x16/apps/dk-googlephoto.png
|
||||
share/icons/hicolor/16x16/apps/dk-imageshack.png
|
||||
share/icons/hicolor/16x16/apps/dk-imgur.png
|
||||
share/icons/hicolor/16x16/apps/dk-ipfs.png
|
||||
share/icons/hicolor/16x16/apps/dk-mediawiki.png
|
||||
share/icons/hicolor/16x16/apps/dk-onedrive.png
|
||||
share/icons/hicolor/16x16/apps/dk-pinterest.png
|
||||
@ -714,14 +713,11 @@ share/icons/hicolor/16x16/apps/showfoto.png
|
||||
share/icons/hicolor/22x22/apps/digikam.png
|
||||
share/icons/hicolor/22x22/apps/dk-box.png
|
||||
share/icons/hicolor/22x22/apps/dk-dropbox.png
|
||||
share/icons/hicolor/22x22/apps/dk-facebook-white.png
|
||||
share/icons/hicolor/22x22/apps/dk-facebook.png
|
||||
share/icons/hicolor/22x22/apps/dk-flickr.png
|
||||
share/icons/hicolor/22x22/apps/dk-googledrive.png
|
||||
share/icons/hicolor/22x22/apps/dk-googlephoto.png
|
||||
share/icons/hicolor/22x22/apps/dk-imageshack.png
|
||||
share/icons/hicolor/22x22/apps/dk-imgur.png
|
||||
share/icons/hicolor/22x22/apps/dk-ipfs.png
|
||||
share/icons/hicolor/22x22/apps/dk-mediawiki.png
|
||||
share/icons/hicolor/22x22/apps/dk-onedrive.png
|
||||
share/icons/hicolor/22x22/apps/dk-pinterest.png
|
||||
@ -754,14 +750,11 @@ share/icons/hicolor/32x32/actions/underexposure.png
|
||||
share/icons/hicolor/32x32/apps/digikam.png
|
||||
share/icons/hicolor/32x32/apps/dk-box.png
|
||||
share/icons/hicolor/32x32/apps/dk-dropbox.png
|
||||
share/icons/hicolor/32x32/apps/dk-facebook-white.png
|
||||
share/icons/hicolor/32x32/apps/dk-facebook.png
|
||||
share/icons/hicolor/32x32/apps/dk-flickr.png
|
||||
share/icons/hicolor/32x32/apps/dk-googledrive.png
|
||||
share/icons/hicolor/32x32/apps/dk-googlephoto.png
|
||||
share/icons/hicolor/32x32/apps/dk-imageshack.png
|
||||
share/icons/hicolor/32x32/apps/dk-imgur.png
|
||||
share/icons/hicolor/32x32/apps/dk-ipfs.png
|
||||
share/icons/hicolor/32x32/apps/dk-mediawiki.png
|
||||
share/icons/hicolor/32x32/apps/dk-onedrive.png
|
||||
share/icons/hicolor/32x32/apps/dk-pinterest.png
|
||||
@ -774,14 +767,11 @@ share/icons/hicolor/32x32/apps/showfoto.png
|
||||
share/icons/hicolor/48x48/apps/digikam.png
|
||||
share/icons/hicolor/48x48/apps/dk-box.png
|
||||
share/icons/hicolor/48x48/apps/dk-dropbox.png
|
||||
share/icons/hicolor/48x48/apps/dk-facebook-white.png
|
||||
share/icons/hicolor/48x48/apps/dk-facebook.png
|
||||
share/icons/hicolor/48x48/apps/dk-flickr.png
|
||||
share/icons/hicolor/48x48/apps/dk-googledrive.png
|
||||
share/icons/hicolor/48x48/apps/dk-googlephoto.png
|
||||
share/icons/hicolor/48x48/apps/dk-imageshack.png
|
||||
share/icons/hicolor/48x48/apps/dk-imgur.png
|
||||
share/icons/hicolor/48x48/apps/dk-ipfs.png
|
||||
share/icons/hicolor/48x48/apps/dk-mediawiki.png
|
||||
share/icons/hicolor/48x48/apps/dk-onedrive.png
|
||||
share/icons/hicolor/48x48/apps/dk-pinterest.png
|
||||
@ -796,12 +786,9 @@ share/icons/hicolor/64x64/apps/showfoto.png
|
||||
share/icons/hicolor/96x96/apps/expoblending.png
|
||||
share/icons/hicolor/96x96/apps/panorama.png
|
||||
share/icons/hicolor/scalable/apps/digikam.svgz
|
||||
share/icons/hicolor/scalable/apps/dk-facebook-white.svgz
|
||||
share/icons/hicolor/scalable/apps/dk-facebook.svgz
|
||||
share/icons/hicolor/scalable/apps/dk-flickr.svgz
|
||||
share/icons/hicolor/scalable/apps/dk-googlephoto.svgz
|
||||
share/icons/hicolor/scalable/apps/dk-imgur.svgz
|
||||
share/icons/hicolor/scalable/apps/dk-ipfs.svgz
|
||||
share/icons/hicolor/scalable/apps/dk-mediawiki.svgz
|
||||
share/icons/hicolor/scalable/apps/dk-piwigo.svgz
|
||||
share/icons/hicolor/scalable/apps/dk-smugmug.svgz
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user