[rawstudio] Fix the build with lensfun 0.3
Kalev Lember
kalev at fedoraproject.org
Sun Mar 22 19:43:00 UTC 2015
commit 6e71d6448c752edd69bcf6f29c57a06070303fce
Author: Kalev Lember <kalevlember at gmail.com>
Date: Sun Mar 22 20:41:26 2015 +0100
Fix the build with lensfun 0.3
https://bugzilla.redhat.com/show_bug.cgi?id=1184156
...h-Lensfun-0.3-version-where-CCI-correctio.patch | 26 ++++++++++++++++++++++
rawstudio.spec | 7 +++++-
2 files changed, 32 insertions(+), 1 deletion(-)
---
diff --git a/0001-Compile-with-Lensfun-0.3-version-where-CCI-correctio.patch b/0001-Compile-with-Lensfun-0.3-version-where-CCI-correctio.patch
new file mode 100644
index 0000000..b9484e8
--- /dev/null
+++ b/0001-Compile-with-Lensfun-0.3-version-where-CCI-correctio.patch
@@ -0,0 +1,26 @@
+From cc31d235cd3c4f0adf35614e09965c28175c7c99 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9rgio=20Basto?= <sergio at serjux.com>
+Date: Tue, 27 Jan 2015 13:30:27 +0000
+Subject: [PATCH] Compile with Lensfun 0.3 version where CCI correction have
+ been removed
+
+---
+ plugins/lensfun/lensfun.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/lensfun/lensfun.c b/plugins/lensfun/lensfun.c
+index af1f189..4f7fffb 100644
+--- a/plugins/lensfun/lensfun.c
++++ b/plugins/lensfun/lensfun.c
+@@ -668,7 +668,7 @@ get_image(RSFilter *filter, const RSFilterRequest *request)
+ }
+
+ /* Start threads to apply phase 2, Vignetting and CA Correction */
+- if (effective_flags & (LF_MODIFY_VIGNETTING | LF_MODIFY_CCI))
++ if (effective_flags & LF_MODIFY_VIGNETTING)
+ {
+ /* Phase 2 is corrected inplace, so copy input first */
+ guint y_offset, y_per_thread, threaded_h;
+--
+2.3.3
+
diff --git a/rawstudio.spec b/rawstudio.spec
index 5507bc9..8b3d800 100644
--- a/rawstudio.spec
+++ b/rawstudio.spec
@@ -1,6 +1,6 @@
Name: rawstudio
Version: 2.0
-Release: 17%{?dist}
+Release: 18%{?dist}
Summary: Read, manipulate and convert digital camera raw images
Group: Applications/Multimedia
@@ -23,6 +23,7 @@ BuildRequires: libtool autoconf automake
# FIX FTBS, patch extracted from current code upstream
Patch0: rawstudio-2.0-libpng.patch
Patch1: rawstudio-2.0-lensfun.patch
+Patch2: 0001-Compile-with-Lensfun-0.3-version-where-CCI-correctio.patch
%description
@@ -57,6 +58,7 @@ Rawstudio backend library
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
@@ -109,6 +111,9 @@ update-desktop-database &> /dev/null ||:
%{_libdir}/pkgconfig/rawstudio-2.0.pc
%changelog
+* Sun Mar 22 2015 Kalev Lember <kalevlember at gmail.com> - 2.0-18
+- Fix the build with lensfun 0.3 (#1184156)
+
* Tue Jan 20 2015 Peter Robinson <pbrobinson at fedoraproject.org> 2.0-17
- rebuild (libgphoto2)
More information about the scm-commits
mailing list