[packages/rawstudio] - fix building with new lensfun with CCI support removed - rel 10

baggins baggins at pld-linux.org
Mon Jul 20 20:23:30 CEST 2015


commit 6f471d0e61721a96a78011e347bd7534acc0ca12
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Jul 20 18:23:07 2015 +0000

    - fix building with new lensfun with CCI support removed
    - rel 10

 lensfun.patch  | 11 +++++++++++
 rawstudio.spec |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/rawstudio.spec b/rawstudio.spec
index 102b3e9..a017c32 100644
--- a/rawstudio.spec
+++ b/rawstudio.spec
@@ -2,7 +2,7 @@ Summary:	RAW-image converter written using GTK+
 Summary(pl.UTF-8):	Konwerter obrazów RAW napisany z użyciem GTK+
 Name:		rawstudio
 Version:	2.0
-%define	_rel	9
+%define	_rel	10
 # Keep it for future snapshots because releases are not-so-frequent:
 %define	_svnrev		1624
 %define	_snapday	20080130
@@ -17,6 +17,7 @@ Source0:	http://rawstudio.org/files/release/%{name}-%{version}.tar.gz
 # Source0-md5:	b2f86b8ca6b83ad954e3104c4cb89e9b
 Patch0:		%{name}-libpng15.patch
 Patch1:		am.patch
+Patch2:		lensfun.patch
 URL:		http://rawstudio.org/
 BuildRequires:	GConf2-devel >= 2.0
 BuildRequires:	autoconf
@@ -54,6 +55,7 @@ Header files for %{name}.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
diff --git a/lensfun.patch b/lensfun.patch
new file mode 100644
index 0000000..7246a2d
--- /dev/null
+++ b/lensfun.patch
@@ -0,0 +1,11 @@
+--- rawstudio-2.0/plugins/lensfun/lensfun.c~	2011-03-27 17:53:27.000000000 +0000
++++ rawstudio-2.0/plugins/lensfun/lensfun.c	2015-07-20 18:15:21.691308292 +0000
+@@ -652,7 +652,7 @@
+ 			}
+ 
+ 			/* 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;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rawstudio.git/commitdiff/6f471d0e61721a96a78011e347bd7534acc0ca12



More information about the pld-cvs-commit mailing list