[rawstudio] Add patch for newer lensfun header location

Gianluca Sforna giallu at fedoraproject.org
Thu Jul 12 07:00:14 UTC 2012


commit 120d3eaf559c9a9ed1e40def472c6e53e1554cad
Author: Gianluca Sforna <giallu at gmail.com>
Date:   Thu Jul 12 08:59:28 2012 +0200

    Add patch for newer lensfun header location

 rawstudio-2.0-lensfun.patch |   61 +++++++++++++++++++++++++++++++++++++++++++
 rawstudio.spec              |    3 ++
 2 files changed, 64 insertions(+), 0 deletions(-)
---
diff --git a/rawstudio-2.0-lensfun.patch b/rawstudio-2.0-lensfun.patch
new file mode 100644
index 0000000..fd51bd8
--- /dev/null
+++ b/rawstudio-2.0-lensfun.patch
@@ -0,0 +1,61 @@
+diff -u -r rawstudio-2.0/librawstudio/rs-lens-db-editor.c rawstudio-2.0.new/librawstudio/rs-lens-db-editor.c
+--- rawstudio-2.0/librawstudio/rs-lens-db-editor.c	2011-03-27 19:53:27.000000000 +0200
++++ rawstudio-2.0.new/librawstudio/rs-lens-db-editor.c	2012-07-12 00:42:14.478030487 +0200
+@@ -29,7 +29,7 @@
+ #include <gtk/gtk.h>
+ #include <string.h>
+ #include <config.h>
+-#include <lensfun.h>
++#include <lensfun/lensfun.h>
+ #include <rs-lens-db.h>
+ #include <rs-lens.h>
+ #include <gettext.h>
+Only in rawstudio-2.0.new/librawstudio: .rs-lens-db-editor.c.swp
+diff -u -r rawstudio-2.0/plugins/lensfun/lensfun.c rawstudio-2.0.new/plugins/lensfun/lensfun.c
+--- rawstudio-2.0/plugins/lensfun/lensfun.c	2011-03-27 19:53:27.000000000 +0200
++++ rawstudio-2.0.new/plugins/lensfun/lensfun.c	2012-07-12 00:50:20.360121338 +0200
+@@ -20,7 +20,7 @@
+ /* Plugin tmpl version 4 */
+ 
+ #include <rawstudio.h>
+-#include <lensfun.h>
++#include <lensfun/lensfun.h>
+ #if defined (__SSE2__)
+ #include <emmintrin.h>
+ #endif /* __SSE2__ */
+diff -u -r rawstudio-2.0/plugins/lensfun/lensfun-sse2.c rawstudio-2.0.new/plugins/lensfun/lensfun-sse2.c
+--- rawstudio-2.0/plugins/lensfun/lensfun-sse2.c	2011-03-27 19:53:27.000000000 +0200
++++ rawstudio-2.0.new/plugins/lensfun/lensfun-sse2.c	2012-07-12 00:50:07.710067076 +0200
+@@ -20,7 +20,7 @@
+ /* Plugin tmpl version 4 */
+ 
+ #include <rawstudio.h>
+-#include <lensfun.h>
++#include <lensfun/lensfun.h>
+ 
+ #if defined (__SSE2__)
+ 
+diff -u -r rawstudio-2.0/plugins/lensfun/lensfun-version.c rawstudio-2.0.new/plugins/lensfun/lensfun-version.c
+--- rawstudio-2.0/plugins/lensfun/lensfun-version.c	2011-03-27 19:53:27.000000000 +0200
++++ rawstudio-2.0.new/plugins/lensfun/lensfun-version.c	2012-07-12 00:49:54.657011225 +0200
+@@ -44,7 +44,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+-#include <lensfun.h>
++#include <lensfun/lensfun.h>
+ #include <stdio.h>
+ 
+ #define __USE_GNU
+diff -u -r rawstudio-2.0/src/application.c rawstudio-2.0.new/src/application.c
+--- rawstudio-2.0/src/application.c	2011-04-06 23:30:48.000000000 +0200
++++ rawstudio-2.0.new/src/application.c	2012-07-12 00:50:52.875261424 +0200
+@@ -53,7 +53,7 @@
+ #include "rs-photo.h"
+ #include "rs-exif.h"
+ #include "rs-library.h"                                                                                                                                    
+-#include "lensfun.h"
++#include <lensfun/lensfun.h>
+ #include "rs-profile-factory-model.h"
+ #include "rs-profile-camera.h"
+ 
diff --git a/rawstudio.spec b/rawstudio.spec
index aa9ef28..bca8cc1 100644
--- a/rawstudio.spec
+++ b/rawstudio.spec
@@ -24,6 +24,7 @@ BuildRequires:  libtool
 
 # FIX FTBS, patch extracted from current code upstream
 Patch0:         rawstudio-2.0-libpng.patch
+Patch1:         rawstudio-2.0-lensfun.patch
 
 
 %description
@@ -57,6 +58,7 @@ Rawstudio backend library
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 
 %build
@@ -116,6 +118,7 @@ update-desktop-database &> /dev/null ||:
 %changelog
 * Wed Jul 11 2012 Gianluca Sforna <giallu at gmail.com> - 2.0-6
 - rebuild (flickcurl)
+- add patch for newer lensfun headers location
 
 * Wed May 02 2012 Rex Dieter <rdieter at fedoraproject.org> - 2.0-5
 - rebuild (exiv2)


More information about the scm-commits mailing list