pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/libkdcraw libkdcraw: update to 19.08.3 qt5/...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3f182d60362d
branches:  trunk
changeset: 344173:3f182d60362d
user:      markd <markd%pkgsrc.org@localhost>
date:      Sun Nov 17 02:52:23 2019 +0000

description:
libkdcraw: update to 19.08.3   qt5/kf5 version

diffstat:

 graphics/libkdcraw/Makefile                              |  19 ++--
 graphics/libkdcraw/PLIST                                 |  43 ++++------
 graphics/libkdcraw/buildlink3.mk                         |   7 +-
 graphics/libkdcraw/distinfo                              |  11 +-
 graphics/libkdcraw/patches/patch-libkdcraw_kdcraw__p.cpp |  64 ----------------
 5 files changed, 35 insertions(+), 109 deletions(-)

diffs (184 lines):

diff -r 7c60f1fd6752 -r 3f182d60362d graphics/libkdcraw/Makefile
--- a/graphics/libkdcraw/Makefile       Sun Nov 17 02:45:29 2019 +0000
+++ b/graphics/libkdcraw/Makefile       Sun Nov 17 02:52:23 2019 +0000
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.68 2019/11/02 22:37:59 rillig Exp $
+# $NetBSD: Makefile,v 1.69 2019/11/17 02:52:23 markd Exp $
 
-DISTNAME=      libkdcraw-15.08.3
-PKGREVISION=   12
+DISTNAME=      libkdcraw-${KAPPSVER}
 CATEGORIES=    graphics
+
+HOMEPAGE=      https://kde.org/applications/graphics/
 COMMENT=       KDE digital camera raw image library wrapper
-MASTER_SITES=  ${MASTER_SITE_KDE:=applications/15.08.3/src/}
+LICENSE=       gnu-gpl-v2 AND gnu-fdl-v1.2 AND gnu-lgpl-v2
 
-.include "../../meta-pkgs/kde4/Makefile.kde4"
+.include "../../meta-pkgs/kde/applications.mk"
 
-PKGCONFIG_OVERRIDE+=   libkdcraw.pc.cmake
+USE_TOOLS+=    pkg-config
 
-.include "../../meta-pkgs/kde4/kde4.mk"
-
+BUILDLINK_API_DEPENDS.libraw+= libraw>=0.18.0
 .include "../../graphics/libraw/buildlink3.mk"
-.include "../../x11/kdelibs4/buildlink3.mk"
-
+.include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 7c60f1fd6752 -r 3f182d60362d graphics/libkdcraw/PLIST
--- a/graphics/libkdcraw/PLIST  Sun Nov 17 02:45:29 2019 +0000
+++ b/graphics/libkdcraw/PLIST  Sun Nov 17 02:52:23 2019 +0000
@@ -1,25 +1,18 @@
-@comment $NetBSD: PLIST,v 1.10 2014/11/13 20:06:29 markd Exp $
-include/libkdcraw/dcrawinfocontainer.h
-include/libkdcraw/dcrawsettingswidget.h
-include/libkdcraw/kdcraw.h
-include/libkdcraw/libkdcraw_export.h
-include/libkdcraw/ractionthreadbase.h
-include/libkdcraw/rawdecodingsettings.h
-include/libkdcraw/rawfiles.h
-include/libkdcraw/rcombobox.h
-include/libkdcraw/rexpanderbox.h
-include/libkdcraw/rnuminput.h
-include/libkdcraw/squeezedcombobox.h
-include/libkdcraw/version.h
-lib/libkdcraw.so
-lib/libkdcraw.so.23
-lib/libkdcraw.so.23.0.0
-lib/pkgconfig/libkdcraw.pc
-share/icons/hicolor/128x128/apps/kdcraw.png
-share/icons/hicolor/32x32/apps/kdcraw.png
-share/icons/hicolor/48x48/apps/kdcraw.png
-share/icons/hicolor/64x64/apps/kdcraw.png
-share/kde/apps/libkdcraw/profiles/compatibleWithAdobeRGB1998.icc
-share/kde/apps/libkdcraw/profiles/prophoto.icm
-share/kde/apps/libkdcraw/profiles/srgb-d65.icm
-share/kde/apps/libkdcraw/profiles/widegamut.icm
+@comment $NetBSD: PLIST,v 1.11 2019/11/17 02:52:23 markd Exp $
+include/KF5/KDCRAW/KDCRAW/DcrawInfoContainer
+include/KF5/KDCRAW/KDCRAW/KDcraw
+include/KF5/KDCRAW/KDCRAW/RawDecodingSettings
+include/KF5/KDCRAW/KDCRAW/RawFiles
+include/KF5/KDCRAW/kdcraw/dcrawinfocontainer.h
+include/KF5/KDCRAW/kdcraw/kdcraw.h
+include/KF5/KDCRAW/kdcraw/libkdcraw_export.h
+include/KF5/KDCRAW/kdcraw/rawdecodingsettings.h
+include/KF5/KDCRAW/kdcraw/rawfiles.h
+include/KF5/libkdcraw_version.h
+lib/cmake/KF5KDcraw/KF5KDcrawConfig.cmake
+lib/cmake/KF5KDcraw/KF5KDcrawConfigVersion.cmake
+lib/cmake/KF5KDcraw/KF5KDcrawTargets-noconfig.cmake
+lib/cmake/KF5KDcraw/KF5KDcrawTargets.cmake
+lib/libKF5KDcraw.so
+lib/libKF5KDcraw.so.5
+lib/libKF5KDcraw.so.5.0.0
diff -r 7c60f1fd6752 -r 3f182d60362d graphics/libkdcraw/buildlink3.mk
--- a/graphics/libkdcraw/buildlink3.mk  Sun Nov 17 02:45:29 2019 +0000
+++ b/graphics/libkdcraw/buildlink3.mk  Sun Nov 17 02:52:23 2019 +0000
@@ -1,15 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.51 2019/08/22 12:23:20 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.52 2019/11/17 02:52:23 markd Exp $
 
 BUILDLINK_TREE+=       libkdcraw
 
 .if !defined(LIBKDCRAW_BUILDLINK3_MK)
 LIBKDCRAW_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libkdcraw+=      libkdcraw>=4.8.0
-BUILDLINK_ABI_DEPENDS.libkdcraw?=      libkdcraw>=15.08.3nb12
+BUILDLINK_API_DEPENDS.libkdcraw+=      libkdcraw>=17.12.1
 BUILDLINK_PKGSRCDIR.libkdcraw?=                ../../graphics/libkdcraw
 
-.include "../../x11/kdelibs4/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
 .endif # LIBKDCRAW_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libkdcraw
diff -r 7c60f1fd6752 -r 3f182d60362d graphics/libkdcraw/distinfo
--- a/graphics/libkdcraw/distinfo       Sun Nov 17 02:45:29 2019 +0000
+++ b/graphics/libkdcraw/distinfo       Sun Nov 17 02:52:23 2019 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.22 2019/11/02 17:09:54 maya Exp $
+$NetBSD: distinfo,v 1.23 2019/11/17 02:52:23 markd Exp $
 
-SHA1 (libkdcraw-15.08.3.tar.xz) = faf93404a36162a381abcafd289e3de811774a25
-RMD160 (libkdcraw-15.08.3.tar.xz) = a70f999dc10b4ed473ecec8ea0548a1f5c969e29
-SHA512 (libkdcraw-15.08.3.tar.xz) = f77902a768df26368a67f680cb1e5c54eec5f44b5598ff9966c30abdfd977ea683a738cf01749557f144d58a85121afea61a8e5f7ec80d1c2d55a3bdf9549c39
-Size (libkdcraw-15.08.3.tar.xz) = 102308 bytes
-SHA1 (patch-libkdcraw_kdcraw__p.cpp) = 96ecd8cdb7ee0258a23e07fb33b9f1a3697deb0f
+SHA1 (libkdcraw-19.08.3.tar.xz) = 59f41fd13d365c10072ba8f63120ed565139c58d
+RMD160 (libkdcraw-19.08.3.tar.xz) = e8d1202f0445d7fa30ef1993aca3f6fe43cbe260
+SHA512 (libkdcraw-19.08.3.tar.xz) = 295e171f174e574c2bd016f597321b2aa04f82bb8fbd4144d1227834cf11b22cbaeb4c07154ce23d917c6fd606f6235680f38e877bb1f769212c7308815dde9d
+Size (libkdcraw-19.08.3.tar.xz) = 42192 bytes
diff -r 7c60f1fd6752 -r 3f182d60362d graphics/libkdcraw/patches/patch-libkdcraw_kdcraw__p.cpp
--- a/graphics/libkdcraw/patches/patch-libkdcraw_kdcraw__p.cpp  Sun Nov 17 02:45:29 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-$NetBSD: patch-libkdcraw_kdcraw__p.cpp,v 1.1 2019/11/02 17:09:55 maya Exp $
-
-Fix with libraw 0.19
-from https://github.com/KDE/libkdcraw/commit/f40ebe30dca1cfadc8171364ac325532e6c3f229
-
---- libkdcraw/kdcraw_p.cpp.orig        2015-05-14 20:54:16.000000000 +0000
-+++ libkdcraw/kdcraw_p.cpp
-@@ -367,6 +367,7 @@ bool KDcraw::Private::loadFromLibraw(con
-             raw.imgdata.params.fbdd_noiserd = lround(m_parent->m_rawDecodingSettings.NRThreshold / 100.0);
-             break;
-         }
-+#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
-         case RawDecodingSettings::LINENR:
-         {
-             // (100 - 1000) => (0.001 - 0.02) conversion.
-@@ -374,7 +375,6 @@ bool KDcraw::Private::loadFromLibraw(con
-             raw.imgdata.params.cfaline      = true;
-             break;
-         }
--
-         case RawDecodingSettings::IMPULSENR:
-         {
-             // (100 - 1000) => (0.005 - 0.05) conversion.
-@@ -383,23 +383,28 @@ bool KDcraw::Private::loadFromLibraw(con
-             raw.imgdata.params.cfa_clean    = true;
-             break;
-         }
-+#endif
-         default:   // No Noise Reduction
-         {
-             raw.imgdata.params.threshold    = 0;
-             raw.imgdata.params.fbdd_noiserd = 0;
-+#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
-             raw.imgdata.params.linenoise    = 0;
-             raw.imgdata.params.cfaline      = false;
-             raw.imgdata.params.lclean       = 0;
-             raw.imgdata.params.cclean       = 0;
-             raw.imgdata.params.cfa_clean    = false;
-+#endif
-             break;
-         }
-     }
- 
-+#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
-     // Chromatic aberration correction.
-     raw.imgdata.params.ca_correc  = m_parent->m_rawDecodingSettings.enableCACorrection;
-     raw.imgdata.params.cared      = m_parent->m_rawDecodingSettings.caMultiplier[0];
-     raw.imgdata.params.cablue     = m_parent->m_rawDecodingSettings.caMultiplier[1];
-+#endif
- 
-     // Exposure Correction before interpolation.
-     raw.imgdata.params.exp_correc = m_parent->m_rawDecodingSettings.expoCorrection;
-@@ -453,9 +458,10 @@ bool KDcraw::Private::loadFromLibraw(con
- 
-     raw.imgdata.params.dcb_iterations = m_parent->m_rawDecodingSettings.dcbIterations;
-     raw.imgdata.params.dcb_enhance_fl = m_parent->m_rawDecodingSettings.dcbEnhanceFl;
-+#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
-     raw.imgdata.params.eeci_refine    = m_parent->m_rawDecodingSettings.eeciRefine;
-     raw.imgdata.params.es_med_passes  = m_parent->m_rawDecodingSettings.esMedPasses;
--
-+#endif
-     //-------------------------------------------------------------------------------------------
- 
-     setProgress(0.1);



Home | Main Index | Thread Index | Old Index