git » libkdcraw.git » commit 28fd4a2

KDE Applications 18.08.1

author Antonio Rojas
2018-09-06 09:58:56 UTC
committer Antonio Rojas
2018-09-06 09:58:56 UTC
parent c9fc771f2a7f5c364757a8bd609478dab9eac7f3

KDE Applications 18.08.1

PKGBUILD +5 -10
libkdcraw-libraw-0.19.patch +0 -54

diff --git a/PKGBUILD b/PKGBUILD
index 26fadba..831ce25 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,27 +3,22 @@
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkdcraw
-pkgver=18.08.0
-pkgrel=2
+pkgver=18.08.1
+pkgrel=1
 pkgdesc="A C++ interface used to decode RAW picture"
 url="https://www.kde.org/applications/graphics/"
 arch=(x86_64)
 license=(GPL LGPL FDL)
 depends=(qt5-base libraw)
 makedepends=(extra-cmake-modules)
-source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}
-        libkdcraw-libraw-0.19.patch)
-sha256sums=('dd146eebd1e0eea7e6a20ebd66b7d9ac2c79cc573de39faf6d34efaafb9bf376'
-            'SKIP'
-            '48570c819c98010598b289f9918a13d69bdae03013c806ca6229b8a12451245c')
+source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig})
+sha256sums=('2d4cdb8dc4c2b5527ba08afdd670d33e77e377fda231b44ba4a90eee920ee03a'
+            'SKIP')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid@kde.org>
               F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck@kde.org>
 
 prepare() {
   mkdir -p build
-
-  cd $pkgname-$pkgver
-  patch -p1 -i ../libkdcraw-libraw-0.19.patch # Remove support for features no longer available in libraw 0.19
 }
 
 build() {
diff --git a/libkdcraw-libraw-0.19.patch b/libkdcraw-libraw-0.19.patch
deleted file mode 100644
index f1a9bbb..0000000
--- a/libkdcraw-libraw-0.19.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/src/kdcraw_p.cpp b/src/kdcraw_p.cpp
-index d6f5d00..2b1b9d4 100644
---- a/src/kdcraw_p.cpp
-+++ b/src/kdcraw_p.cpp
-@@ -371,40 +371,14 @@ bool KDcraw::Private::loadFromLibraw(const QString& filePath, QByteArray& imageD
-             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;
-@@ -457,8 +431,6 @@ bool KDcraw::Private::loadFromLibraw(const QString& filePath, QByteArray& imageD
- 
-     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;
- 
-     //-------------------------------------------------------------------------------------------
-