Hi All, Simple update to the latest stable version. The diff below includes fixes for krita and libkdcraw KDE4/5 from upstream.
OK? Index: graphics/krita/Makefile =================================================================== RCS file: /cvs/ports/graphics/krita/Makefile,v retrieving revision 1.14 diff -u -p -u -p -r1.14 Makefile --- graphics/krita/Makefile 19 Jul 2018 19:43:11 -0000 1.14 +++ graphics/krita/Makefile 20 Sep 2018 16:10:19 -0000 @@ -4,6 +4,7 @@ COMMENT = advanced drawing and image man VERSION = 4.1.1 DISTNAME = krita-${VERSION} +REVISION = 0 SHARED_LIBS += kritabasicflakes 1.0 # 16.0 SHARED_LIBS += kritacolord 1.0 # 16.0 Index: graphics/krita/patches/patch-plugins_impex_raw_3rdparty_libkdcraw_src_kdcraw_p_cpp =================================================================== RCS file: graphics/krita/patches/patch-plugins_impex_raw_3rdparty_libkdcraw_src_kdcraw_p_cpp diff -N graphics/krita/patches/patch-plugins_impex_raw_3rdparty_libkdcraw_src_kdcraw_p_cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ graphics/krita/patches/patch-plugins_impex_raw_3rdparty_libkdcraw_src_kdcraw_p_cpp 20 Sep 2018 16:10:19 -0000 @@ -0,0 +1,57 @@ +$OpenBSD$ + +Fix build with libraw-0.19 + +Index: plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp +--- plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp.orig ++++ plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp +@@ -375,40 +375,14 @@ bool KDcraw::Private::loadFromLibraw(const QString& fi + raw.imgdata.params.fbdd_noiserd = lround(m_parent->m_rawDecodingSettings.NRThreshold / 100.0); + break; + } +- case RawDecodingSettings::LINENR: +- { +- // (100 - 1000) => (0.001 - 0.02) conversion. +- raw.imgdata.params.linenoise = m_parent->m_rawDecodingSettings.NRThreshold * 2.11E-5 + 0.00111111; +- raw.imgdata.params.cfaline = true; +- break; +- } +- +- case RawDecodingSettings::IMPULSENR: +- { +- // (100 - 1000) => (0.005 - 0.05) conversion. +- raw.imgdata.params.lclean = m_parent->m_rawDecodingSettings.NRThreshold * 5E-5; +- raw.imgdata.params.cclean = m_parent->m_rawDecodingSettings.NRChroThreshold * 5E-5; +- raw.imgdata.params.cfa_clean = true; +- break; +- } + default: // No Noise Reduction + { + raw.imgdata.params.threshold = 0; + raw.imgdata.params.fbdd_noiserd = 0; +- 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; + break; + } + } + +- // 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]; +- + // Exposure Correction before interpolation. + raw.imgdata.params.exp_correc = m_parent->m_rawDecodingSettings.expoCorrection; + raw.imgdata.params.exp_shift = m_parent->m_rawDecodingSettings.expoCorrectionShift; +@@ -461,8 +435,6 @@ bool KDcraw::Private::loadFromLibraw(const QString& fi + + raw.imgdata.params.dcb_iterations = m_parent->m_rawDecodingSettings.dcbIterations; + raw.imgdata.params.dcb_enhance_fl = m_parent->m_rawDecodingSettings.dcbEnhanceFl; +- raw.imgdata.params.eeci_refine = m_parent->m_rawDecodingSettings.eeciRefine; +- raw.imgdata.params.es_med_passes = m_parent->m_rawDecodingSettings.esMedPasses; + + //------------------------------------------------------------------------------------------- + Index: graphics/libraw/Makefile =================================================================== RCS file: /cvs/ports/graphics/libraw/Makefile,v retrieving revision 1.39 diff -u -p -u -p -r1.39 Makefile --- graphics/libraw/Makefile 1 Jul 2018 11:44:15 -0000 1.39 +++ graphics/libraw/Makefile 20 Sep 2018 16:10:19 -0000 @@ -2,12 +2,12 @@ COMMENT = library for reading RAW files -DISTNAME = LibRaw-0.18.13 +DISTNAME = LibRaw-0.19.0 PKGNAME = ${DISTNAME:L} CATEGORIES = graphics -SHARED_LIBS += raw 3.2 # 15.0 -SHARED_LIBS += raw_r 3.2 # 15.0 +SHARED_LIBS += raw 4.0 # 15.0 +SHARED_LIBS += raw_r 4.0 # 15.0 HOMEPAGE = https://www.libraw.org/ Index: graphics/libraw/distinfo =================================================================== RCS file: /cvs/ports/graphics/libraw/distinfo,v retrieving revision 1.15 diff -u -p -u -p -r1.15 distinfo --- graphics/libraw/distinfo 1 Jul 2018 11:44:15 -0000 1.15 +++ graphics/libraw/distinfo 20 Sep 2018 16:10:19 -0000 @@ -1,2 +1,2 @@ -SHA256 (LibRaw-0.18.13.tar.gz) = yx+dDR+ryJZ9UB2VwF0rU9l6K5FzRcZlU7GrvqBnV8o= -SIZE (LibRaw-0.18.13.tar.gz) = 1287631 +SHA256 (LibRaw-0.19.0.tar.gz) = 6D9R6DsZ+bpri9FER1/BLt8tezuTDY0oC969io8+0lk= +SIZE (LibRaw-0.19.0.tar.gz) = 1300662 Index: graphics/libraw/patches/patch-internal_libraw_x3f_cpp =================================================================== RCS file: graphics/libraw/patches/patch-internal_libraw_x3f_cpp diff -N graphics/libraw/patches/patch-internal_libraw_x3f_cpp --- graphics/libraw/patches/patch-internal_libraw_x3f_cpp 18 May 2018 06:04:33 -0000 1.6 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,18 +0,0 @@ -$OpenBSD: patch-internal_libraw_x3f_cpp,v 1.6 2018/05/18 06:04:33 rsadowski Exp $ - -fix non-constant-expression cannot be narrowed from type 'int' to 'int16_t' -(aka 'short') with clang6 -Index: internal/libraw_x3f.cpp ---- internal/libraw_x3f.cpp.orig -+++ internal/libraw_x3f.cpp -@@ -1398,7 +1398,9 @@ static void huffman_decode_row(x3f_info_t *I, - x3f_image_data_t *ID = &DEH->data_subsection.image_data; - x3f_huffman_t *HUF = ID->huffman; - -- int16_t c[3] = {offset,offset,offset}; -+ int16_t off16 = static_cast<int16_t>(offset); -+ -+ int16_t c[3] = {off16, off16, off16}; - int col; - bit_state_t BS; - Index: x11/kde-applications/libkdcraw/Makefile =================================================================== RCS file: /cvs/ports/x11/kde-applications/libkdcraw/Makefile,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 Makefile --- x11/kde-applications/libkdcraw/Makefile 4 Sep 2018 05:30:27 -0000 1.1.1.1 +++ x11/kde-applications/libkdcraw/Makefile 20 Sep 2018 16:10:41 -0000 @@ -4,6 +4,7 @@ COMMENT = KDE wrapper around the LibRaw DISTNAME = libkdcraw-${VERSION} PKGNAME = libkdcraw-kf5-${VERSION} CATEGORIES = devel graphics +REVISION = 0 KDE5 = Yes Index: x11/kde-applications/libkdcraw/patches/patch-src_kdcraw_p_cpp =================================================================== RCS file: x11/kde-applications/libkdcraw/patches/patch-src_kdcraw_p_cpp diff -N x11/kde-applications/libkdcraw/patches/patch-src_kdcraw_p_cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ x11/kde-applications/libkdcraw/patches/patch-src_kdcraw_p_cpp 20 Sep 2018 16:10:41 -0000 @@ -0,0 +1,55 @@ +$OpenBSD$ + +Fix build with libraw 0.19: https://phabricator.kde.org/D15132 + +Index: src/kdcraw_p.cpp +--- src/kdcraw_p.cpp.orig ++++ src/kdcraw_p.cpp +@@ -371,6 +371,7 @@ bool KDcraw::Private::loadFromLibraw(const QString& fi + 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. +@@ -387,23 +388,28 @@ bool KDcraw::Private::loadFromLibraw(const QString& fi + 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; +@@ -457,8 +463,10 @@ bool KDcraw::Private::loadFromLibraw(const QString& fi + + 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 + + //------------------------------------------------------------------------------------------- + Index: x11/kde-applications/libkdcraw/patches/patch-src_rawdecodingsettings_h =================================================================== RCS file: x11/kde-applications/libkdcraw/patches/patch-src_rawdecodingsettings_h diff -N x11/kde-applications/libkdcraw/patches/patch-src_rawdecodingsettings_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ x11/kde-applications/libkdcraw/patches/patch-src_rawdecodingsettings_h 20 Sep 2018 16:10:41 -0000 @@ -0,0 +1,102 @@ +$OpenBSD$ + +Fix build with libraw 0.19: https://phabricator.kde.org/D15132 + +Index: src/rawdecodingsettings.h +--- src/rawdecodingsettings.h.orig ++++ src/rawdecodingsettings.h +@@ -50,8 +50,6 @@ class LIBKDCRAW_EXPORT RawDecodingSettings (public) + + /** RAW decoding Interpolation methods + * +- * NOTE: from original dcraw demosaic +- * + * Bilinear: use high-speed but low-quality bilinear + * interpolation (default - for slow computer). In this method, + * the red value of a non-red pixel is computed as the average of +@@ -67,37 +65,38 @@ class LIBKDCRAW_EXPORT RawDecodingSettings (public) + * AHD: use Adaptive Homogeneity-Directed interpolation. + * This method selects the direction of interpolation so as to + * maximize a homogeneity metric, thus typically minimizing color artifacts. ++ * DCB: DCB interpolation (see http://www.linuxphoto.org/html/dcb.html for details) + * +- * NOTE: from GPL2 demosaic pack. ++ * NOTE: from GPL2/GPL3 demosaic packs - will not work with libraw>=0.19 + * +- * DCB: DCB interpolation (see http://www.linuxphoto.org/html/dcb.html for details) + * PL_AHD: modified AHD interpolation (see http://sites.google.com/site/demosaicalgorithms/modified-dcraw + * for details). + * AFD: demosaicing through 5 pass median filter from PerfectRaw project. + * VCD: VCD interpolation. + * VCD_AHD: mixed demosaicing between VCD and AHD. + * LMMSE: LMMSE interpolation from PerfectRaw. +- * +- * NOTE: from GPL3 demosaic pack. +- * + * AMAZE: AMaZE interpolation and color aberration removal from RawTherapee project. ++ * ++ * NOTE: for libraw>=0.19 only ++ * ++ * DHT: DHT interpolation. ++ * AAHD: Enhanced Adaptative AHD interpolation. + */ + enum DecodingQuality + { +- // from original dcraw demosaic + BILINEAR = 0, + VNG = 1, + PPG = 2, + AHD = 3, +- // Extended demosaicing method from GPL2 demosaic pack + DCB = 4, + PL_AHD = 5, + AFD = 6, + VCD = 7, + VCD_AHD = 8, + LMMSE = 9, +- // Extended demosaicing methods from GPL3 demosaic pack +- AMAZE = 10 ++ AMAZE = 10, ++ DHT = 11, ++ AAHD = 12 + }; + + /** White balances alternatives +@@ -252,6 +251,7 @@ class LIBKDCRAW_EXPORT RawDecodingSettings (public) + int NRThreshold; + + /** Turn on chromatic aberrations correction ++ * @deprecated does not work with libraw>=0.19 + */ + bool enableCACorrection; + +@@ -259,6 +259,7 @@ class LIBKDCRAW_EXPORT RawDecodingSettings (public) + * - caMultiplier[0] = amount of correction on red-green axis. + * - caMultiplier[1] = amount of correction on blue-yellow axis. + * - Both values set to 0.0 = automatic CA correction. ++ * @deprecated does not work with libraw>=0.19 + */ + double caMultiplier[2]; + +@@ -325,17 +326,20 @@ class LIBKDCRAW_EXPORT RawDecodingSettings (public) + /// For VCD_AHD interpolation. + + /** Turn on the EECI refine for VCD Demosaicing. ++ * @deprecated does not work with libraw>=0.19 + */ + bool eeciRefine; + + /** Use edge-sensitive median filtering for artifact supression after VCD demosaicing. + * 0 : disable (default) + * 1-10 : median filter passes. ++ * @deprecated does not work with libraw>=0.19 + */ + int esMedPasses; + + /** For IMPULSENR Noise reduction. Set the amount of Chrominance impulse denoise. +- Null value disable NR. Range is between 100 and 1000. ++ * Null value disable NR. Range is between 100 and 1000. ++ * @deprecated does not work with libraw>=0.19 + */ + int NRChroThreshold; + Index: x11/kde4/libkdcraw/Makefile =================================================================== RCS file: /cvs/ports/x11/kde4/libkdcraw/Makefile,v retrieving revision 1.20 diff -u -p -u -p -r1.20 Makefile --- x11/kde4/libkdcraw/Makefile 29 Jun 2018 22:16:31 -0000 1.20 +++ x11/kde4/libkdcraw/Makefile 20 Sep 2018 16:10:42 -0000 @@ -7,8 +7,8 @@ DISTNAME = libkdcraw-${MODKDE4_VERSION} PKGNAME-main = ${DISTNAME} PKGNAME-icons = kde4-libkdcraw-icons-${MODKDE4_VERSION} PKGSPEC-main = libkdcraw-${MODKDE4_SPEC} -REVISION-icons =3 -REVISION-main = 2 +REVISION-icons =4 +REVISION-main = 3 SHARED_LIBS = kdcraw 51.0 # 20.0 Index: x11/kde4/libkdcraw/patches/patch-libkdcraw_kdcraw_p_cpp =================================================================== RCS file: x11/kde4/libkdcraw/patches/patch-libkdcraw_kdcraw_p_cpp diff -N x11/kde4/libkdcraw/patches/patch-libkdcraw_kdcraw_p_cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ x11/kde4/libkdcraw/patches/patch-libkdcraw_kdcraw_p_cpp 20 Sep 2018 16:10:42 -0000 @@ -0,0 +1,55 @@ +$OpenBSD$ + +Fix build with libraw 0.19: https://phabricator.kde.org/D15132 + +Index: libkdcraw/kdcraw_p.cpp +--- libkdcraw/kdcraw_p.cpp.orig ++++ libkdcraw/kdcraw_p.cpp +@@ -367,6 +367,7 @@ bool KDcraw::Private::loadFromLibraw(const QString& fi + 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. +@@ -383,23 +384,28 @@ bool KDcraw::Private::loadFromLibraw(const QString& fi + raw.imgdata.params.cfa_clean = true; + break; + } ++#endif + default: // No Noise Reduction + { + raw.imgdata.params.threshold = 0; ++#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19) + raw.imgdata.params.fbdd_noiserd = 0; + 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; + } + } + + // Chromatic aberration correction. ++#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19) + 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,8 +459,10 @@ bool KDcraw::Private::loadFromLibraw(const QString& fi + + 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 + + //------------------------------------------------------------------------------------------- +