7 files changed, 180 insertions, 0 deletions

diff --git a/graphics/rawstudio/files/patch-exiv2 b/graphics/rawstudio/files/patch-exiv2
new file mode 100644
index 000000000000..0212d7c6d9b6
--- /dev/null
+++ b/graphics/rawstudio/files/patch-exiv2
@@ -0,0 +1,33 @@
+--- librawstudio/rs-exif.cc.orig
++++ librawstudio/rs-exif.cc
+@@ -21,6 +21,8 @@
+ #include <iomanip>
+ #include <exiv2/image.hpp>
+ #include <exiv2/exif.hpp>
++#include <exiv2/error.hpp>
++#include <exiv2/version.hpp>
+ #include "rs-exif.h"
+ #include <assert.h>
+ #include "rs-library.h"
+--- plugins/load-gdk/exiv2-colorspace.cpp.orig
++++ plugins/load-gdk/exiv2-colorspace.cpp
+@@ -22,6 +22,8 @@
+ #include <iomanip>
+ #include <exiv2/image.hpp>
+ #include <exiv2/exif.hpp>
++#include <exiv2/version.hpp>
++#include <exiv2/error.hpp>
+ #include <assert.h>
+ #include "exiv2-colorspace.h"
+ #include <math.h>
+--- plugins/meta-exiv2/exiv2-metadata.cpp.orig
++++ plugins/meta-exiv2/exiv2-metadata.cpp
+@@ -22,6 +22,8 @@
+ #include <iomanip>
+ #include <exiv2/image.hpp>
+ #include <exiv2/exif.hpp>
++#include <exiv2/version.hpp>
++#include <exiv2/error.hpp>
+ #include <assert.h>
+ #include "exiv2-metadata.h"
+ #include <math.h>
diff --git a/graphics/rawstudio/files/patch-libpng15 b/graphics/rawstudio/files/patch-libpng15
new file mode 100644
index 000000000000..c23a24f64034
--- /dev/null
+++ b/graphics/rawstudio/files/patch-libpng15
@@ -0,0 +1,35 @@
+--- plugins/output-pngfile/output-pngfile.c
++++ plugins/output-pngfile/output-pngfile.c
+@@ -23,6 +23,7 @@
+ #include <gettext.h>
+ #include "config.h"
+ #include <png.h>
++#include <zlib.h>
+ 
+ #define RS_TYPE_PNGFILE (rs_pngfile_type)
+ #define RS_PNGFILE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RS_TYPE_PNGFILE, RSPngfile))
+@@ -198,7 +199,7 @@
+ 		rs_icc_profile_get_data(profile, &data, &data_length);
+ 
+ 		// FIXME: Insert correct profile name
+-		png_set_iCCP(png_ptr, info_ptr, "Profile name", PNG_COMPRESSION_TYPE_BASE, data, data_length);
++		png_set_iCCP(png_ptr, info_ptr, "Profile name", PNG_COMPRESSION_TYPE_BASE, (png_const_bytep)data, data_length);
+ 		if (pngfile->save16bit)
+ 			png_set_gAMA(png_ptr, info_ptr, 1.0);
+ 	}
+--- plugins/load-gdk/exiv2-colorspace.cpp
++++ plugins/load-gdk/exiv2-colorspace.cpp
+@@ -125,11 +125,11 @@
+ 
+ 					int compression_type;
+ 					/* Extract embedded ICC profile */
+-					if (info_ptr->valid & PNG_INFO_iCCP)
++					if (png_get_valid(png_ptr, info_ptr, TRUE) & PNG_INFO_iCCP)
+ 					{
+ 						png_uint_32 retval = png_get_iCCP (png_ptr, info_ptr,
+ 													(png_charpp) &icc_profile_title, &compression_type,
+-													(png_charpp) &icc_profile, (png_uint_32*) &icc_profile_size);
++													(png_byte**) &icc_profile, (png_uint_32*) &icc_profile_size);
+ 						if (retval != 0)
+ 						{
+ 							RSIccProfile *icc = rs_icc_profile_new_from_memory((gchar*)icc_profile, icc_profile_size, TRUE);
diff --git a/graphics/rawstudio/files/patch-plugins_denoise_fftwindow.cpp b/graphics/rawstudio/files/patch-plugins_denoise_fftwindow.cpp
new file mode 100644
index 000000000000..84290eb44403
--- /dev/null
+++ b/graphics/rawstudio/files/patch-plugins_denoise_fftwindow.cpp
@@ -0,0 +1,38 @@
+--- plugins/denoise/fftwindow.cpp.orig	2011-02-15 17:28:03 UTC
++++ plugins/denoise/fftwindow.cpp
+@@ -174,7 +174,7 @@ void FFTWindow::applyAnalysisWindowSSE( 
+     if ((uintptr_t)src1 & 15) {
+       asm volatile 
+       ( 
+-      "loop_analysis_sse_ua:\n"
++      "1:\n"
+       "prefetchnta (%4)\n"        // Prefetch next line (Used once only, so don't pollute cache)
+       "movups (%1), %%xmm0\n"       // src1 pt1
+       "movups 16(%1), %%xmm1\n"     // src1 pt2 
+@@ -193,7 +193,7 @@ void FFTWindow::applyAnalysisWindowSSE( 
+       "add $64, %2\n"
+       "add $64, %4\n"
+       "dec %3\n"
+-      "jnz loop_analysis_sse_ua\n"
++      "jnz 1b\n"
+ 
+       : /* no output registers */
+       : "r" (analysis.getLine(y)), "r" (src1),  "r" (dst->getLine(y)), "r" (sizew), "r" (&src1[image->pitch])
+@@ -202,7 +202,7 @@ void FFTWindow::applyAnalysisWindowSSE( 
+     } else {
+     asm volatile 
+       ( 
+-      "loop_analysis_sse_a:\n"
++      "1:\n"
+       "prefetchnta (%4)\n"        // Prefetch next line (Used once only, so don't pollute cache)
+       "movaps (%1), %%xmm0\n"       // src1 pt1
+       "movaps 16(%1), %%xmm1\n"     // src1 pt2 
+@@ -221,7 +221,7 @@ void FFTWindow::applyAnalysisWindowSSE( 
+       "add $64, %2\n"
+       "add $64, %4\n"
+       "dec %3\n"
+-      "jnz loop_analysis_sse_a\n"
++      "jnz 1b\n"
+ 
+       : /* no output registers */
+       : "r" (analysis.getLine(y)), "r" (src1),  "r" (dst->getLine(y)), "r" (sizew), "r" (&src1[image->pitch])
diff --git a/graphics/rawstudio/files/patch-plugins_load-dcraw_dcraw.cc b/graphics/rawstudio/files/patch-plugins_load-dcraw_dcraw.cc
new file mode 100644
index 000000000000..b8f2410aa0e7
--- /dev/null
+++ b/graphics/rawstudio/files/patch-plugins_load-dcraw_dcraw.cc
@@ -0,0 +1,21 @@
+--- plugins/load-dcraw/dcraw.cc.orig	2015-05-29 01:03:46 UTC
++++ plugins/load-dcraw/dcraw.cc
+@@ -869,7 +869,8 @@ struct jhead {
+ 
+ int CLASS ljpeg_start (struct jhead *jh, int info_only)
+ {
+-  int c, tag, len;
++  int c, tag;
++  ushort len;
+   uchar data[0x10000];
+   const uchar *dp;
+ 
+@@ -8605,7 +8606,7 @@ void CLASS tiff_head (struct tiff_hdr *th, int full)
+   strncpy (th->desc, desc, 512);
+   strncpy (th->make, make, 64);
+   strncpy (th->model, model, 64);
+-  strcpy (th->soft, "dcraw v"DCRAW_VERSION);
++  strcpy (th->soft, "dcraw v" DCRAW_VERSION);
+   t = gmtime (&timestamp);
+   sprintf (th->date, "%04d:%02d:%02d %02d:%02d:%02d",
+       t->tm_year+1900,t->tm_mon+1,t->tm_mday,t->tm_hour,t->tm_min,t->tm_sec);
diff --git a/graphics/rawstudio/files/patch-rs-macros.h b/graphics/rawstudio/files/patch-rs-macros.h
new file mode 100644
index 000000000000..fdc456950c0c
--- /dev/null
+++ b/graphics/rawstudio/files/patch-rs-macros.h
@@ -0,0 +1,16 @@
+--- librawstudio/rs-macros.h	2014-02-19 06:34:15.000000000 +0100
++++ librawstudio/rs-macros.h	2014-02-19 06:34:21.000000000 +0100
+@@ -51,12 +51,12 @@
+ #if __GNUC__ >= 3
+ #define likely(x) __builtin_expect (!!(x), 1)
+ #define unlikely(x) __builtin_expect (!!(x), 0)
+-#define align(x) __attribute__ ((aligned (x)))
++// #define align(x) __attribute__ ((aligned (x)))
+ #define __deprecated __attribute__ ((deprecated))
+ #else
+ #define likely(x) (x)
+ #define unlikely(x) (x)
+-#define align(x)
++// #define align(x)
+ #define __deprecated
+ #endif
diff --git a/graphics/rawstudio/files/patch-rs-tag-gui.c b/graphics/rawstudio/files/patch-rs-tag-gui.c
new file mode 100644
index 000000000000..c4033fb4df25
--- /dev/null
+++ b/graphics/rawstudio/files/patch-rs-tag-gui.c
@@ -0,0 +1,26 @@
+--- src/rs-tag-gui.c.orig	2011-02-15 18:28:05.000000000 +0100
++++ src/rs-tag-gui.c	2014-02-14 18:36:48.000000000 +0100
+@@ -93,11 +93,6 @@
+ 	return box;
+ }
+ 
+-GtkWidget *
+-rs_library_tag_entry_new(RSLibrary *library)
+-{
+-	g_assert(RS_IS_LIBRARY(library));
+-
+ 	gboolean
+ 	selected(GtkEntryCompletion *completion, GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data)
+ 	{
+@@ -179,6 +174,11 @@
+ 		return found;
+ 	}
+ 
++GtkWidget *
++rs_library_tag_entry_new(RSLibrary *library)
++{
++	g_assert(RS_IS_LIBRARY(library));
++
+ 	GtkWidget *entry = gtk_entry_new();
+ 	GtkEntryCompletion *completion = gtk_entry_completion_new();
+ 	GtkListStore *store = gtk_list_store_new(1, G_TYPE_STRING);
diff --git a/graphics/rawstudio/files/patch-src_rs-batch.c b/graphics/rawstudio/files/patch-src_rs-batch.c
new file mode 100644
index 000000000000..5350facf8b74
--- /dev/null
+++ b/graphics/rawstudio/files/patch-src_rs-batch.c
@@ -0,0 +1,11 @@
+--- src/rs-batch.c.orig	2011-04-07 18:05:03 UTC
++++ src/rs-batch.c
+@@ -830,7 +830,7 @@ static void
+ filetype_changed(gpointer active, gpointer user_data)
+ {
+ 	RS_QUEUE *queue = (RS_QUEUE *) user_data;
+-	GType filetype = GPOINTER_TO_INT(active);
++	GType filetype = (GType)active;
+ 
+ 	if (!filetype)
+ 		return;