graphics/rawstudio clang6 fix

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

graphics/rawstudio clang6 fix

Ingo Schwarze
Hi,

not sure how to really test, but the following seems correct
from code inspection, fixes the build, and the program still
starts.

Note that upstream is now at 2.0 and has rewritten everything
in C, no more C++, so no need to report upstream.

Yours,
  Ingo


Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/rawstudio/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile 15 Nov 2017 15:51:05 -0000 1.27
+++ Makefile 16 Apr 2018 15:09:59 -0000
@@ -3,7 +3,7 @@
 COMMENT = tool for working with RAW images
 
 DISTNAME = rawstudio-1.2
-REVISION = 15
+REVISION = 16
 
 CATEGORIES = graphics
 
Index: patches/patch-src_dcraw_cc
===================================================================
RCS file: /cvs/ports/graphics/rawstudio/patches/patch-src_dcraw_cc,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_dcraw_cc
--- patches/patch-src_dcraw_cc 2 May 2017 15:48:41 -0000 1.2
+++ patches/patch-src_dcraw_cc 16 Apr 2018 15:09:59 -0000
@@ -4,6 +4,9 @@ fix CVE-2015-3885
 const correct.
 fix evaluation order.
 
+clang6 fixes:
+sufficient width for integers in static tables, and whitespace.
+
 Index: src/dcraw.cc
 --- src/dcraw.cc.orig
 +++ src/dcraw.cc
@@ -27,7 +30,46 @@ Index: src/dcraw.cc
  }
 
  void CLASS sony_load_raw()
-@@ -8445,7 +8447,8 @@ int CLASS main (int argc, const char **argv)
+@@ -4061,7 +4063,7 @@ void CLASS lin_interpolate()
+  */
+ void CLASS vng_interpolate()
+ {
+-  static const signed char *cp, terms[] = {
++  static const signed short *cp, terms[] = {
+     -2,-2,+0,-1,0,0x01, -2,-2,+0,+0,1,0x01, -2,-1,-1,+0,0,0x01,
+     -2,-1,+0,-1,0,0x02, -2,-1,+0,+0,0,0x03, -2,-1,+0,+1,1,0x01,
+     -2,+0,+0,-1,0,0x06, -2,+0,+0,+0,1,0x02, -2,+0,+0,+1,0,0x03,
+@@ -6174,7 +6176,8 @@ void CLASS adobe_coeff (const char *make, const char *
+ {
+   static const struct {
+     const char *prefix;
+-    short black, maximum, trans[12];
++    ushort black, maximum;
++    short trans[12];
+   } table[] = {
+     { "Apple QuickTake", 0, 0, /* DJC */
+ { 17576,-3191,-3318,5210,6733,-1942,9031,1280,-124 } },
+@@ -6606,8 +6609,8 @@ void CLASS adobe_coeff (const char *make, const char *
+   sprintf (name, "%s %s", make, model);
+   for (i=0; i < (int) sizeof table / (int) sizeof *table; i++)
+     if (!strncmp (name, table[i].prefix, strlen(table[i].prefix))) {
+-      if (table[i].black)   black   = (ushort) table[i].black;
+-      if (table[i].maximum) maximum = (ushort) table[i].maximum;
++      if (table[i].black)   black   = table[i].black;
++      if (table[i].maximum) maximum = table[i].maximum;
+       for (j=0; j < 4; j++)
+ for (k=0; k < 3; k++)
+  cam_xyz[j][k] = table[i].trans[3*j+k] / 10000.0;
+@@ -8366,7 +8369,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);
+@@ -8445,7 +8448,8 @@ int CLASS main (int argc, const char **argv)
    static int timestamp_only=0, thumbnail_only=0, identify_only=0;
    static int user_qual=-1, user_black=-1, user_sat=-1, user_flip=-1;
    static int use_fuji_rotate=1, write_to_stdout=0, quality, i, c;
@@ -37,7 +79,7 @@ Index: src/dcraw.cc
    static const char *sp, *dark_frame=0, *write_ext;
    static struct utimbuf ut;
    static FILE *ofp;
-@@ -8781,7 +8784,7 @@ thumbnail:
+@@ -8781,7 +8785,7 @@ thumbnail:
        strcpy (ofname,_("standard output"));
      else {
        strcpy (ofname, ifname);

Reply | Threaded
Open this post in threaded view
|

Re: graphics/rawstudio clang6 fix

Stuart Henderson
On 2018/04/16 17:13, Ingo Schwarze wrote:
> Hi,
>
> not sure how to really test, but the following seems correct
> from code inspection, fixes the build, and the program still
> starts.
>
> Note that upstream is now at 2.0 and has rewritten everything
> in C, no more C++, so no need to report upstream.

Ah, I didn't see your mail while I was working on this, I've already
committed a dumber diff for this, though I can pull that out and add yours
if you prefer.

If anyone is interested in updating to 2.0 here's a starting point which
builds and runs, but it's doing strange things with colours in my testing,
and it's easy to make it segfault.

Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/rawstudio/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile 16 Apr 2018 15:40:01 -0000 1.28
+++ Makefile 16 Apr 2018 15:48:30 -0000
@@ -1,9 +1,10 @@
 # $OpenBSD: Makefile,v 1.28 2018/04/16 15:40:01 sthen Exp $
 
+SHARED_LIBS += rawstudio-2.0             0.0 # 0.0
+
 COMMENT = tool for working with RAW images
 
-DISTNAME = rawstudio-1.2
-REVISION = 16
+DISTNAME = rawstudio-2.0
 
 CATEGORIES = graphics
 
@@ -14,21 +15,29 @@ MASTER_SITES = ${HOMEPAGE}files/release/
 PERMIT_PACKAGE_CDROM = Yes
 
 WANTLIB += ${COMPILER_LIBCXX} X11 Xcomposite Xcursor Xdamage Xext
-WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo dbus-1
-WANTLIB += exiv2 fontconfig freetype gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0
-WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0
-WANTLIB += intl jpeg lcms m pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += tiff xml2 z
+WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo crypto
+WANTLIB += curl dbus-1 dbus-glib-1 exif exiv2 expat ffi fftw3f
+WANTLIB += flickcurl fontconfig freetype gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0
+WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gphoto2 gphoto2_port
+WANTLIB += graphite2 gthread-2.0 gtk-x11-2.0 harfbuzz iconv intl
+WANTLIB += jpeg lcms lensfun ltdl lzma m nghttp2 pango-1.0 pangocairo-1.0
+WANTLIB += pangoft2-1.0 pcre pixman-1 png raptor2 sqlite3 ssl
+WANTLIB += tiff xcb xcb-render xcb-shm xml2 xslt yajl z
 
 CONFIGURE_STYLE = gnu
-CXXFLAGS += --std=gnu++98
 CONFIGURE_ENV += CPPFLAGS=-I${LOCALBASE}/include \
  LDFLAGS=-L${LOCALBASE}/lib
 
+LIBTOOL_FLAGS += --tag=disable-static
+
 LIB_DEPENDS += graphics/exiv2 \
  graphics/lcms \
+ graphics/lensfun \
+ graphics/libgphoto2 \
  devel/gconf2 \
  devel/gettext \
+ math/fftw3,float \
+ net/flickcurl \
  x11/dbus \
  x11/gtk+2
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/rawstudio/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 2 Jan 2014 12:21:49 -0000 1.4
+++ distinfo 16 Apr 2018 15:48:30 -0000
@@ -1,2 +1,2 @@
-SHA256 (rawstudio-1.2.tar.gz) = vOhSW70NWakJekQE4NcIVvqlxnH3fNMsoNKMe8KObYU=
-SIZE (rawstudio-1.2.tar.gz) = 516171
+SHA256 (rawstudio-2.0.tar.gz) = FM1a/zFcqaKOw1ntLaDZk/ACK1SKF1HyCEY+qCOyp/w=
+SIZE (rawstudio-2.0.tar.gz) = 1537703
Index: patches/patch-librawstudio_rs-macros_h
===================================================================
RCS file: patches/patch-librawstudio_rs-macros_h
diff -N patches/patch-librawstudio_rs-macros_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-librawstudio_rs-macros_h 16 Apr 2018 15:48:30 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Index: librawstudio/rs-macros.h
+--- librawstudio/rs-macros.h.orig
++++ librawstudio/rs-macros.h
+@@ -51,8 +51,8 @@
+ #if __GNUC__ >= 3
+ #define likely(x) __builtin_expect (!!(x), 1)
+ #define unlikely(x) __builtin_expect (!!(x), 0)
+-#define align(x) __attribute__ ((aligned (x)))
+-#define __deprecated __attribute__ ((deprecated))
++// #define align(x) __attribute__ ((aligned (x)))
++// #define __deprecated __attribute__ ((deprecated))
+ #else
+ #define likely(x) (x)
+ #define unlikely(x) (x)
Index: patches/patch-plugins_denoise_fftwindow_cpp
===================================================================
RCS file: patches/patch-plugins_denoise_fftwindow_cpp
diff -N patches/patch-plugins_denoise_fftwindow_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-plugins_denoise_fftwindow_cpp 16 Apr 2018 15:48:30 -0000
@@ -0,0 +1,46 @@
+$OpenBSD$
+
+from freebsd bug 216771
+
+"Fix build of graphics/rawstudio with clang (or any recent optimizing
+compiler), by using anonymous labels in asm fragments."
+
+Index: plugins/denoise/fftwindow.cpp
+--- plugins/denoise/fftwindow.cpp.orig
++++ plugins/denoise/fftwindow.cpp
+@@ -174,7 +174,7 @@ void FFTWindow::applyAnalysisWindowSSE( FloatImagePlan
+     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( FloatImagePlan
+       "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( FloatImagePlan
+     } 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( FloatImagePlan
+       "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])
Index: patches/patch-plugins_lensfun_lensfun_c
===================================================================
RCS file: patches/patch-plugins_lensfun_lensfun_c
diff -N patches/patch-plugins_lensfun_lensfun_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-plugins_lensfun_lensfun_c 16 Apr 2018 15:48:30 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+unbreak with newer lensfun
+
+Index: plugins/lensfun/lensfun.c
+--- plugins/lensfun/lensfun.c.orig
++++ plugins/lensfun/lensfun.c
+@@ -652,7 +652,7 @@ get_image(RSFilter *filter, const RSFilterRequest *req
+ }
+
+ /* 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;
Index: patches/patch-plugins_load-dcraw_Makefile_in
===================================================================
RCS file: patches/patch-plugins_load-dcraw_Makefile_in
diff -N patches/patch-plugins_load-dcraw_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-plugins_load-dcraw_Makefile_in 16 Apr 2018 15:48:30 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+use gnu++98 on old file that is basically just renamed c code
+
+Index: plugins/load-dcraw/Makefile.in
+--- plugins/load-dcraw/Makefile.in.orig
++++ plugins/load-dcraw/Makefile.in
+@@ -91,7 +91,7 @@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCL
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --std=gnu++98
+ CXXLD = $(CXX)
+ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
Index: patches/patch-plugins_load-dcraw_dcraw_cc
===================================================================
RCS file: patches/patch-plugins_load-dcraw_dcraw_cc
diff -N patches/patch-plugins_load-dcraw_dcraw_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-plugins_load-dcraw_dcraw_cc 16 Apr 2018 15:48:30 -0000
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+From 983bda1f0fa5fa86884381208274198a620f006e Mon Sep 17 00:00:00 2001
+From: Anders Brander <[hidden email]>
+Date: Mon, 11 May 2015 14:59:52 +0200
+Subject: [PATCH] Avoid overflow in ljpeg_start().
+
+Index: plugins/load-dcraw/dcraw.cc
+--- plugins/load-dcraw/dcraw.cc.orig
++++ 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;
+
Index: patches/patch-plugins_load-gdk_exiv2-colorspace_cpp
===================================================================
RCS file: patches/patch-plugins_load-gdk_exiv2-colorspace_cpp
diff -N patches/patch-plugins_load-gdk_exiv2-colorspace_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-plugins_load-gdk_exiv2-colorspace_cpp 16 Apr 2018 15:48:30 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+
+https://svnweb.freebsd.org/ports/head/graphics/rawstudio/files/patch-libpng15?view=log&pathrev=375456
+
+Index: plugins/load-gdk/exiv2-colorspace.cpp
+--- plugins/load-gdk/exiv2-colorspace.cpp.orig
++++ plugins/load-gdk/exiv2-colorspace.cpp
+@@ -125,11 +125,11 @@ jpeg_fail:
+
+ 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);
Index: patches/patch-plugins_output-pngfile_output-pngfile_c
===================================================================
RCS file: patches/patch-plugins_output-pngfile_output-pngfile_c
diff -N patches/patch-plugins_output-pngfile_output-pngfile_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-plugins_output-pngfile_output-pngfile_c 16 Apr 2018 15:48:30 -0000
@@ -0,0 +1,24 @@
+$OpenBSD$
+
+https://svnweb.freebsd.org/ports/head/graphics/rawstudio/files/patch-libpng15?view=log&pathrev=375456
+
+Index: plugins/output-pngfile/output-pngfile.c
+--- plugins/output-pngfile/output-pngfile.c.orig
++++ 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 @@ execute(RSOutput *output, RSFilter *filter)
+ 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);
+ }
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: patches/patch-src_Makefile_in
diff -N patches/patch-src_Makefile_in
--- patches/patch-src_Makefile_in 22 Apr 2016 08:45:25 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_Makefile_in,v 1.4 2016/04/22 08:45:25 sthen Exp $
---- src/Makefile.in.orig Fri Apr 22 09:41:23 2016
-+++ src/Makefile.in Fri Apr 22 09:41:25 2016
-@@ -208,7 +208,6 @@ INCLUDES = \
-
- AM_CFLAGS = \
- -Wall -fno-strict-aliasing\
-- -O4\
- -DWITH_GCONF\
- -DDCRAW_NOMAIN\
- -DDCRAW_NOLCMS\
Index: patches/patch-src_dcraw_cc
===================================================================
RCS file: patches/patch-src_dcraw_cc
diff -N patches/patch-src_dcraw_cc
--- patches/patch-src_dcraw_cc 2 May 2017 15:48:41 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,48 +0,0 @@
-$OpenBSD: patch-src_dcraw_cc,v 1.2 2017/05/02 15:48:41 espie Exp $
-
-fix CVE-2015-3885
-const correct.
-fix evaluation order.
-
-Index: src/dcraw.cc
---- src/dcraw.cc.orig
-+++ src/dcraw.cc
-@@ -916,7 +916,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], *dp;
-
-   if (!info_only) init_decoder();
-@@ -2634,7 +2635,8 @@ void CLASS sony_decrypt (unsigned *data, int len, int
-       pad[p] = htonl(pad[p]);
-   }
-   while (len--)
--    *data++ ^= pad[p++ & 127] = pad[(p+1) & 127] ^ pad[(p+65) & 127];
-+    *data++ ^= pad[p & 127] = pad[(p+1) & 127] ^ pad[(p+65) & 127];
-+    p++;
- }
-
- void CLASS sony_load_raw()
-@@ -8445,7 +8447,8 @@ int CLASS main (int argc, const char **argv)
-   static int timestamp_only=0, thumbnail_only=0, identify_only=0;
-   static int user_qual=-1, user_black=-1, user_sat=-1, user_flip=-1;
-   static int use_fuji_rotate=1, write_to_stdout=0, quality, i, c;
--  static char opm, opt, *ofname, *cp, *bpfile=0;
-+  static char opm, opt, *ofname, *cp2, *bpfile=0;
-+  static const char *cp;
-   static const char *sp, *dark_frame=0, *write_ext;
-   static struct utimbuf ut;
-   static FILE *ofp;
-@@ -8781,7 +8784,7 @@ thumbnail:
-       strcpy (ofname,_("standard output"));
-     else {
-       strcpy (ofname, ifname);
--      if ((cp = strrchr (ofname, '.'))) *cp = 0;
-+      if ((cp2 = strrchr (ofname, '.'))) *cp2 = 0;
-       if (multi_out)
- sprintf (ofname+strlen(ofname), "_%0*d",
- snprintf(0,0,"%d",is_raw-1), shot_select);
Index: patches/patch-src_rs-batch_c
===================================================================
RCS file: patches/patch-src_rs-batch_c
diff -N patches/patch-src_rs-batch_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_rs-batch_c 16 Apr 2018 15:48:30 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+segfault at startup
+https://svnweb.freebsd.org/ports/head/graphics/rawstudio/files/patch-src_rs-batch.c?revision=399513&view=co&pathrev=456945
+
+Index: src/rs-batch.c
+--- src/rs-batch.c.orig
++++ 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;
Index: patches/patch-src_rs-tag-gui_c
===================================================================
RCS file: patches/patch-src_rs-tag-gui_c
diff -N patches/patch-src_rs-tag-gui_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_rs-tag-gui_c 16 Apr 2018 15:48:30 -0000
@@ -0,0 +1,33 @@
+$OpenBSD$
+
+https://svnweb.freebsd.org/ports/head/graphics/rawstudio/files/patch-rs-tag-gui.c?revision=345132&view=co&pathrev=456945
+
+Index: src/rs-tag-gui.c
+--- src/rs-tag-gui.c.orig
++++ src/rs-tag-gui.c
+@@ -93,11 +93,6 @@ rs_tag_gui_toolbox_new(RSLibrary *library, RSStore *st
+ 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)
+ {
+@@ -178,6 +173,13 @@ rs_library_tag_entry_new(RSLibrary *library)
+
+ 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();
Index: patches/patch-src_rs-utils_c
===================================================================
RCS file: patches/patch-src_rs-utils_c
diff -N patches/patch-src_rs-utils_c
--- patches/patch-src_rs-utils_c 20 May 2012 21:34:57 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_rs-utils_c,v 1.1 2012/05/20 21:34:57 naddy Exp $
-
-Needed for strptime(3).
-
---- src/rs-utils.c.orig Sun May 20 15:10:05 2012
-+++ src/rs-utils.c Sun May 20 15:10:31 2012
-@@ -18,6 +18,7 @@
-  */
-
- #define _XOPEN_SOURCE /* strptime() */
-+#define _XOPEN_SOURCE_EXTENDED 1
- #include <config.h>
- #include <glib.h>
- #include <glib/gstdio.h>
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/rawstudio/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 16 Apr 2018 15:40:01 -0000 1.5
+++ pkg/PLIST 16 Apr 2018 15:48:30 -0000
@@ -1,5 +1,60 @@
 @comment $OpenBSD: PLIST,v 1.5 2018/04/16 15:40:01 sthen Exp $
 @bin bin/rawstudio
+include/${FULLPKGNAME}/
+include/${FULLPKGNAME}/rawstudio.h
+include/${FULLPKGNAME}/rs-1d-function.h
+include/${FULLPKGNAME}/rs-color-space-icc.h
+include/${FULLPKGNAME}/rs-color-space-selector.h
+include/${FULLPKGNAME}/rs-color-space.h
+include/${FULLPKGNAME}/rs-color.h
+include/${FULLPKGNAME}/rs-curve.h
+include/${FULLPKGNAME}/rs-dcp-file.h
+include/${FULLPKGNAME}/rs-debug.h
+include/${FULLPKGNAME}/rs-exif.h
+include/${FULLPKGNAME}/rs-filetypes.h
+include/${FULLPKGNAME}/rs-filter-param.h
+include/${FULLPKGNAME}/rs-filter-request.h
+include/${FULLPKGNAME}/rs-filter-response.h
+include/${FULLPKGNAME}/rs-filter.h
+include/${FULLPKGNAME}/rs-gui-functions.h
+include/${FULLPKGNAME}/rs-huesat-map.h
+include/${FULLPKGNAME}/rs-icc-profile.h
+include/${FULLPKGNAME}/rs-image.h
+include/${FULLPKGNAME}/rs-image16.h
+include/${FULLPKGNAME}/rs-io-job-checksum.h
+include/${FULLPKGNAME}/rs-io-job-metadata.h
+include/${FULLPKGNAME}/rs-io-job-prefetch.h
+include/${FULLPKGNAME}/rs-io-job-tagging.h
+include/${FULLPKGNAME}/rs-io-job.h
+include/${FULLPKGNAME}/rs-io.h
+include/${FULLPKGNAME}/rs-job-queue.h
+include/${FULLPKGNAME}/rs-lens-db-editor.h
+include/${FULLPKGNAME}/rs-lens-db.h
+include/${FULLPKGNAME}/rs-lens-fix.h
+include/${FULLPKGNAME}/rs-lens.h
+include/${FULLPKGNAME}/rs-library.h
+include/${FULLPKGNAME}/rs-macros.h
+include/${FULLPKGNAME}/rs-math.h
+include/${FULLPKGNAME}/rs-metadata.h
+include/${FULLPKGNAME}/rs-output.h
+include/${FULLPKGNAME}/rs-plugin-manager.h
+include/${FULLPKGNAME}/rs-plugin.h
+include/${FULLPKGNAME}/rs-profile-camera.h
+include/${FULLPKGNAME}/rs-profile-factory.h
+include/${FULLPKGNAME}/rs-profile-selector.h
+include/${FULLPKGNAME}/rs-rawfile.h
+include/${FULLPKGNAME}/rs-settings.h
+include/${FULLPKGNAME}/rs-spline.h
+include/${FULLPKGNAME}/rs-stock.h
+include/${FULLPKGNAME}/rs-tiff-ifd-entry.h
+include/${FULLPKGNAME}/rs-tiff-ifd.h
+include/${FULLPKGNAME}/rs-tiff.h
+include/${FULLPKGNAME}/rs-types.h
+include/${FULLPKGNAME}/rs-utils.h
+include/${FULLPKGNAME}/x86-cpu.h
+lib/lib${FULLPKGNAME}.la
+@lib lib/lib${FULLPKGNAME}.so.${LIBrawstudio-2.0_VERSION}
+lib/pkgconfig/${FULLPKGNAME}.pc
 share/applications/rawstudio.desktop
 share/icons/rawstudio.png
 share/locale/ca/LC_MESSAGES/rawstudio.mo
@@ -10,7 +65,9 @@ share/locale/en/LC_MESSAGES/rawstudio.mo
 share/locale/es/LC_MESSAGES/rawstudio.mo
 share/locale/fi/LC_MESSAGES/rawstudio.mo
 share/locale/fr/LC_MESSAGES/rawstudio.mo
+share/locale/hu/LC_MESSAGES/rawstudio.mo
 share/locale/it/LC_MESSAGES/rawstudio.mo
+share/locale/ja/LC_MESSAGES/rawstudio.mo
 share/locale/nb/LC_MESSAGES/rawstudio.mo
 share/locale/nl/LC_MESSAGES/rawstudio.mo
 share/locale/pl/LC_MESSAGES/rawstudio.mo
@@ -19,17 +76,405 @@ share/locale/ru/LC_MESSAGES/rawstudio.mo
 share/locale/sv/LC_MESSAGES/rawstudio.mo
 share/pixmaps/
 share/pixmaps/rawstudio/
+share/pixmaps/rawstudio/camera-photo.png
+share/pixmaps/rawstudio/cursor-color-picker.png
+share/pixmaps/rawstudio/cursor-crop.png
+share/pixmaps/rawstudio/cursor-rotate.png
 share/pixmaps/rawstudio/overlay_deleted.png
 share/pixmaps/rawstudio/overlay_exported.png
 share/pixmaps/rawstudio/overlay_priority1.png
 share/pixmaps/rawstudio/overlay_priority2.png
 share/pixmaps/rawstudio/overlay_priority3.png
+share/pixmaps/rawstudio/tool-color-picker.png
+share/pixmaps/rawstudio/tool-crop.png
+share/pixmaps/rawstudio/tool-rotate.png
 share/pixmaps/rawstudio/transform_180.png
 share/pixmaps/rawstudio/transform_270.png
 share/pixmaps/rawstudio/transform_90.png
 share/pixmaps/rawstudio/transform_flip.png
 share/pixmaps/rawstudio/transform_mirror.png
+share/rawspeed/
+share/rawspeed/cameras.xml
 share/rawstudio/
+share/rawstudio/lens_fix.xml
+share/rawstudio/plugins/
+share/rawstudio/plugins/cache.la
+share/rawstudio/plugins/cache.so
+share/rawstudio/plugins/colorspace_adobergb.la
+share/rawstudio/plugins/colorspace_adobergb.so
+share/rawstudio/plugins/colorspace_prophoto.la
+share/rawstudio/plugins/colorspace_prophoto.so
+share/rawstudio/plugins/colorspace_srgb.la
+share/rawstudio/plugins/colorspace_srgb.so
+share/rawstudio/plugins/colorspace_transform.la
+share/rawstudio/plugins/colorspace_transform.so
+share/rawstudio/plugins/crop.la
+share/rawstudio/plugins/crop.so
+share/rawstudio/plugins/dcp.la
+share/rawstudio/plugins/dcp.so
+share/rawstudio/plugins/demosaic.la
+share/rawstudio/plugins/demosaic.so
+share/rawstudio/plugins/denoise.la
+share/rawstudio/plugins/denoise.so
+share/rawstudio/plugins/exposure_mask.la
+share/rawstudio/plugins/exposure_mask.so
+share/rawstudio/plugins/facebook-logo.svg
+share/rawstudio/plugins/flickr-logo.svg
+share/rawstudio/plugins/fuji_rotate.la
+share/rawstudio/plugins/fuji_rotate.so
+share/rawstudio/plugins/input_file.la
+share/rawstudio/plugins/input_file.so
+share/rawstudio/plugins/input_image16.la
+share/rawstudio/plugins/input_image16.so
+share/rawstudio/plugins/lensfun.la
+share/rawstudio/plugins/lensfun.so
+share/rawstudio/plugins/load_dcraw.la
+share/rawstudio/plugins/load_dcraw.so
+share/rawstudio/plugins/load_gdk.la
+share/rawstudio/plugins/load_gdk.so
+share/rawstudio/plugins/load_rawspeed.la
+share/rawstudio/plugins/load_rawspeed.so
+share/rawstudio/plugins/meta_ciff.la
+share/rawstudio/plugins/meta_ciff.so
+share/rawstudio/plugins/meta_exiv2.la
+share/rawstudio/plugins/meta_exiv2.so
+share/rawstudio/plugins/meta_mrw.la
+share/rawstudio/plugins/meta_mrw.so
+share/rawstudio/plugins/meta_raf.la
+share/rawstudio/plugins/meta_raf.so
+share/rawstudio/plugins/meta_tiff.la
+share/rawstudio/plugins/meta_tiff.so
+share/rawstudio/plugins/meta_x3f.la
+share/rawstudio/plugins/meta_x3f.so
+share/rawstudio/plugins/output_facebook.la
+share/rawstudio/plugins/output_facebook.so
+share/rawstudio/plugins/output_flickr.la
+share/rawstudio/plugins/output_flickr.so
+share/rawstudio/plugins/output_jpegfile.la
+share/rawstudio/plugins/output_jpegfile.so
+share/rawstudio/plugins/output_picasa.la
+share/rawstudio/plugins/output_picasa.so
+share/rawstudio/plugins/output_pngfile.la
+share/rawstudio/plugins/output_pngfile.so
+share/rawstudio/plugins/output_tifffile.la
+share/rawstudio/plugins/output_tifffile.so
+share/rawstudio/plugins/picasa-logo.svg
+share/rawstudio/plugins/resample.la
+share/rawstudio/plugins/resample.so
+share/rawstudio/plugins/rotate.la
+share/rawstudio/plugins/rotate.so
+share/rawstudio/profiles/
+share/rawstudio/profiles/AGFAPHOTO_DC-833m-simple.dcp
+share/rawstudio/profiles/Apple_QuickTake-simple.dcp
+share/rawstudio/profiles/CASIO_EX-S20-simple.dcp
+share/rawstudio/profiles/CASIO_EX-Z750-simple.dcp
+share/rawstudio/profiles/CINE-simple.dcp
+share/rawstudio/profiles/CINE_650-simple.dcp
+share/rawstudio/profiles/CINE_660-simple.dcp
+share/rawstudio/profiles/Canon_EOS-1D-simple.dcp
+share/rawstudio/profiles/Canon_EOS-1DS-simple.dcp
+share/rawstudio/profiles/Canon_EOS-1D_Mark_II-simple.dcp
+share/rawstudio/profiles/Canon_EOS-1D_Mark_III-simple.dcp
+share/rawstudio/profiles/Canon_EOS-1D_Mark_II_N-simple.dcp
+share/rawstudio/profiles/Canon_EOS-1D_Mark_IV-simple.dcp
+share/rawstudio/profiles/Canon_EOS-1Ds_Mark_II-simple.dcp
+share/rawstudio/profiles/Canon_EOS-1Ds_Mark_III-simple.dcp
+share/rawstudio/profiles/Canon_EOS-simple.dcp
+share/rawstudio/profiles/Canon_EOS_1000D-simple.dcp
+share/rawstudio/profiles/Canon_EOS_10D-simple.dcp
+share/rawstudio/profiles/Canon_EOS_1100D-simple.dcp
+share/rawstudio/profiles/Canon_EOS_20D-simple.dcp
+share/rawstudio/profiles/Canon_EOS_20Da-simple.dcp
+share/rawstudio/profiles/Canon_EOS_300D-simple.dcp
+share/rawstudio/profiles/Canon_EOS_30D-simple.dcp
+share/rawstudio/profiles/Canon_EOS_350D-simple.dcp
+share/rawstudio/profiles/Canon_EOS_400D-simple.dcp
+share/rawstudio/profiles/Canon_EOS_40D-simple.dcp
+share/rawstudio/profiles/Canon_EOS_450D-simple.dcp
+share/rawstudio/profiles/Canon_EOS_500D-simple.dcp
+share/rawstudio/profiles/Canon_EOS_50D-simple.dcp
+share/rawstudio/profiles/Canon_EOS_550D-simple.dcp
+share/rawstudio/profiles/Canon_EOS_5D-simple.dcp
+share/rawstudio/profiles/Canon_EOS_5D_Mark_II-simple.dcp
+share/rawstudio/profiles/Canon_EOS_600D-simple.dcp
+share/rawstudio/profiles/Canon_EOS_60D-simple.dcp
+share/rawstudio/profiles/Canon_EOS_7D-simple.dcp
+share/rawstudio/profiles/Canon_EOS_D2000-simple.dcp
+share/rawstudio/profiles/Canon_EOS_D30-simple.dcp
+share/rawstudio/profiles/Canon_EOS_D60-simple.dcp
+share/rawstudio/profiles/Canon_EOS_D6000-simple.dcp
+share/rawstudio/profiles/Canon_PowerShot_A470-simple.dcp
+share/rawstudio/profiles/Canon_PowerShot_A5-simple.dcp
+share/rawstudio/profiles/Canon_PowerShot_A50-simple.dcp
+share/rawstudio/profiles/Canon_PowerShot_A530-simple.dcp
+share/rawstudio/profiles/Canon_PowerShot_A610-simple.dcp
+share/rawstudio/profiles/Canon_PowerShot_A620-simple.dcp
+share/rawstudio/profiles/Canon_PowerShot_A630-simple.dcp
+share/rawstudio/profiles/Canon_PowerShot_A640-simple.dcp
+share/rawstudio/profiles/Canon_PowerShot_A650-simple.dcp
+share/rawstudio/profiles/Canon_PowerShot_A720-simple.dcp
+share/rawstudio/profiles/Canon_PowerShot_G1-simple.dcp
+share/rawstudio/profiles/Canon_PowerShot_G10-simple.dcp
+share/rawstudio/profiles/Canon_PowerShot_G11-simple.dcp
+share/rawstudio/profiles/Canon_PowerShot_G12-simple.dcp
+share/rawstudio/profiles/Canon_PowerShot_G2-simple.dcp
+share/rawstudio/profiles/Canon_PowerShot_G3-simple.dcp
+share/rawstudio/profiles/Canon_PowerShot_G5-simple.dcp
+share/rawstudio/profiles/Canon_PowerShot_G6-simple.dcp
+share/rawstudio/profiles/Canon_PowerShot_G9-simple.dcp
+share/rawstudio/profiles/Canon_PowerShot_Pro1-simple.dcp
+share/rawstudio/profiles/Canon_PowerShot_Pro70-simple.dcp
+share/rawstudio/profiles/Canon_PowerShot_Pro90-simple.dcp
+share/rawstudio/profiles/Canon_PowerShot_S30-simple.dcp
+share/rawstudio/profiles/Canon_PowerShot_S3_IS-simple.dcp
+share/rawstudio/profiles/Canon_PowerShot_S40-simple.dcp
+share/rawstudio/profiles/Canon_PowerShot_S45-simple.dcp
+share/rawstudio/profiles/Canon_PowerShot_S50-simple.dcp
+share/rawstudio/profiles/Canon_PowerShot_S60-simple.dcp
+share/rawstudio/profiles/Canon_PowerShot_S70-simple.dcp
+share/rawstudio/profiles/Canon_PowerShot_S90-simple.dcp
+share/rawstudio/profiles/Canon_PowerShot_S95-simple.dcp
+share/rawstudio/profiles/Canon_PowerShot_SX110_IS-simple.dcp
+share/rawstudio/profiles/Canon_PowerShot_SX1_IS-simple.dcp
+share/rawstudio/profiles/Contax_N_Digital-simple.dcp
+share/rawstudio/profiles/EPSON_R-D1-simple.dcp
+share/rawstudio/profiles/FUJIFILM_FinePix_E550-simple.dcp
+share/rawstudio/profiles/FUJIFILM_FinePix_E900-simple.dcp
+share/rawstudio/profiles/FUJIFILM_FinePix_F7-simple.dcp
+share/rawstudio/profiles/FUJIFILM_FinePix_F8-simple.dcp
+share/rawstudio/profiles/FUJIFILM_FinePix_S100FS-simple.dcp
+share/rawstudio/profiles/FUJIFILM_FinePix_S20Pro-simple.dcp
+share/rawstudio/profiles/FUJIFILM_FinePix_S2Pro-simple.dcp
+share/rawstudio/profiles/FUJIFILM_FinePix_S3Pro-simple.dcp
+share/rawstudio/profiles/FUJIFILM_FinePix_S5000-simple.dcp
+share/rawstudio/profiles/FUJIFILM_FinePix_S5100-simple.dcp
+share/rawstudio/profiles/FUJIFILM_FinePix_S5200-simple.dcp
+share/rawstudio/profiles/FUJIFILM_FinePix_S5500-simple.dcp
+share/rawstudio/profiles/FUJIFILM_FinePix_S5600-simple.dcp
+share/rawstudio/profiles/FUJIFILM_FinePix_S5Pro-simple.dcp
+share/rawstudio/profiles/FUJIFILM_FinePix_S6-simple.dcp
+share/rawstudio/profiles/FUJIFILM_FinePix_S6000fd-simple.dcp
+share/rawstudio/profiles/FUJIFILM_FinePix_S7000-simple.dcp
+share/rawstudio/profiles/FUJIFILM_FinePix_S9000-simple.dcp
+share/rawstudio/profiles/FUJIFILM_FinePix_S9100-simple.dcp
+share/rawstudio/profiles/FUJIFILM_FinePix_S9500-simple.dcp
+share/rawstudio/profiles/FUJIFILM_FinePix_S9600-simple.dcp
+share/rawstudio/profiles/FUJIFILM_IS-1-simple.dcp
+share/rawstudio/profiles/FUJIFILM_IS_Pro-simple.dcp
+share/rawstudio/profiles/Fuji_HS10-simple.dcp
+share/rawstudio/profiles/Imacon_Ixpress-simple.dcp
+share/rawstudio/profiles/KODAK_DCS420-simple.dcp
+share/rawstudio/profiles/KODAK_DCS460-simple.dcp
+share/rawstudio/profiles/KODAK_EASYSHARE_Z1015-simple.dcp
+share/rawstudio/profiles/KODAK_EOSDCS1-simple.dcp
+share/rawstudio/profiles/KODAK_EOSDCS3B-simple.dcp
+share/rawstudio/profiles/KODAK_EasyShare_Z980-simple.dcp
+share/rawstudio/profiles/KODAK_NC2000-simple.dcp
+share/rawstudio/profiles/KODAK_P712-simple.dcp
+share/rawstudio/profiles/KODAK_P850-simple.dcp
+share/rawstudio/profiles/KODAK_P880-simple.dcp
+share/rawstudio/profiles/Kodak_DCS315C-simple.dcp
+share/rawstudio/profiles/Kodak_DCS330C-simple.dcp
+share/rawstudio/profiles/Kodak_DCS520C-simple.dcp
+share/rawstudio/profiles/Kodak_DCS560C-simple.dcp
+share/rawstudio/profiles/Kodak_DCS620C-simple.dcp
+share/rawstudio/profiles/Kodak_DCS620X-simple.dcp
+share/rawstudio/profiles/Kodak_DCS660C-simple.dcp
+share/rawstudio/profiles/Kodak_DCS720X-simple.dcp
+share/rawstudio/profiles/Kodak_DCS760C-simple.dcp
+share/rawstudio/profiles/Kodak_DCS_Pro_14-simple.dcp
+share/rawstudio/profiles/Kodak_DCS_Pro_14nx-simple.dcp
+share/rawstudio/profiles/Kodak_DCS_Pro_SLR-simple.dcp
+share/rawstudio/profiles/Kodak_ProBack-simple.dcp
+share/rawstudio/profiles/Kodak_ProBack645-simple.dcp
+share/rawstudio/profiles/Konica_Minolta_DiMAGE_A2-simple.dcp
+share/rawstudio/profiles/Konica_Minolta_DiMAGE_A200-simple.dcp
+share/rawstudio/profiles/Konica_Minolta_Maxxum_5D-simple.dcp
+share/rawstudio/profiles/Konica_Minolta_Maxxum_7D-simple.dcp
+share/rawstudio/profiles/Leaf-simple.dcp
+share/rawstudio/profiles/Leaf_Aptus_54S-simple.dcp
+share/rawstudio/profiles/Leaf_Aptus_65-simple.dcp
+share/rawstudio/profiles/Leaf_Aptus_75-simple.dcp
+share/rawstudio/profiles/Leaf_CMost-simple.dcp
+share/rawstudio/profiles/Leaf_Valeo_6-simple.dcp
+share/rawstudio/profiles/Leica-M8-simple.dcp
+share/rawstudio/profiles/Leica-S2-simple.dcp
+share/rawstudio/profiles/Leica-X1-native.dcp
+share/rawstudio/profiles/MINOLTA_DYNAX_5-simple.dcp
+share/rawstudio/profiles/MINOLTA_DYNAX_7-simple.dcp
+share/rawstudio/profiles/MOTOROLA_PIXL-simple.dcp
+share/rawstudio/profiles/Mamiya_ZD-simple.dcp
+share/rawstudio/profiles/Micron_2010-simple.dcp
+share/rawstudio/profiles/Minolta_DiMAGE_5-simple.dcp
+share/rawstudio/profiles/Minolta_DiMAGE_7-simple.dcp
+share/rawstudio/profiles/Minolta_DiMAGE_7Hi-simple.dcp
+share/rawstudio/profiles/Minolta_DiMAGE_7i-simple.dcp
+share/rawstudio/profiles/Minolta_DiMAGE_A1-simple.dcp
+share/rawstudio/profiles/Minolta_DiMAGE_Z2-simple.dcp
+share/rawstudio/profiles/NIKON_COOLPIX_P6000-simple.dcp
+share/rawstudio/profiles/NIKON_COOLPIX_P7000-simple.dcp
+share/rawstudio/profiles/NIKON_D1-simple.dcp
+share/rawstudio/profiles/NIKON_D100-simple.dcp
+share/rawstudio/profiles/NIKON_D1H-simple.dcp
+share/rawstudio/profiles/NIKON_D1X-simple.dcp
+share/rawstudio/profiles/NIKON_D200-simple.dcp
+share/rawstudio/profiles/NIKON_D2H-simple.dcp
+share/rawstudio/profiles/NIKON_D2X-simple.dcp
+share/rawstudio/profiles/NIKON_D3-simple.dcp
+share/rawstudio/profiles/NIKON_D300-simple.dcp
+share/rawstudio/profiles/NIKON_D3000-simple.dcp
+share/rawstudio/profiles/NIKON_D3100-simple.dcp
+share/rawstudio/profiles/NIKON_D3S-simple.dcp
+share/rawstudio/profiles/NIKON_D3X-simple.dcp
+share/rawstudio/profiles/NIKON_D40-simple.dcp
+share/rawstudio/profiles/NIKON_D40X-simple.dcp
+share/rawstudio/profiles/NIKON_D50-simple.dcp
+share/rawstudio/profiles/NIKON_D5000-simple.dcp
+share/rawstudio/profiles/NIKON_D60-simple.dcp
+share/rawstudio/profiles/NIKON_D70-simple.dcp
+share/rawstudio/profiles/NIKON_D700-simple.dcp
+share/rawstudio/profiles/NIKON_D7000-simple.dcp
+share/rawstudio/profiles/NIKON_D70s-simple.dcp
+share/rawstudio/profiles/NIKON_D80-simple.dcp
+share/rawstudio/profiles/NIKON_D90-simple.dcp
+share/rawstudio/profiles/NIKON_E2100-simple.dcp
+share/rawstudio/profiles/NIKON_E2500-simple.dcp
+share/rawstudio/profiles/NIKON_E4300-simple.dcp
+share/rawstudio/profiles/NIKON_E4500-simple.dcp
+share/rawstudio/profiles/NIKON_E5000-simple.dcp
+share/rawstudio/profiles/NIKON_E5400-simple.dcp
+share/rawstudio/profiles/NIKON_E5700-simple.dcp
+share/rawstudio/profiles/NIKON_E8400-simple.dcp
+share/rawstudio/profiles/NIKON_E8700-simple.dcp
+share/rawstudio/profiles/NIKON_E8800-simple.dcp
+share/rawstudio/profiles/NIKON_E950-simple.dcp
+share/rawstudio/profiles/NIKON_E995-simple.dcp
+share/rawstudio/profiles/Neutral-With-Tonecurve-AdobeRGB.dcp
+share/rawstudio/profiles/Neutral-With-Tonecurve-Prophoto.dcp
+share/rawstudio/profiles/Neutral-With-Tonecurve-sRGB.dcp
+share/rawstudio/profiles/OLYMPUS_C5050-simple.dcp
+share/rawstudio/profiles/OLYMPUS_C5060-simple.dcp
+share/rawstudio/profiles/OLYMPUS_C70-simple.dcp
+share/rawstudio/profiles/OLYMPUS_C7070-simple.dcp
+share/rawstudio/profiles/OLYMPUS_C80-simple.dcp
+share/rawstudio/profiles/OLYMPUS_E-1-simple.dcp
+share/rawstudio/profiles/OLYMPUS_E-10-simple.dcp
+share/rawstudio/profiles/OLYMPUS_E-20-simple.dcp
+share/rawstudio/profiles/OLYMPUS_E-3-simple.dcp
+share/rawstudio/profiles/OLYMPUS_E-30-simple.dcp
+share/rawstudio/profiles/OLYMPUS_E-300-simple.dcp
+share/rawstudio/profiles/OLYMPUS_E-330-simple.dcp
+share/rawstudio/profiles/OLYMPUS_E-400-simple.dcp
+share/rawstudio/profiles/OLYMPUS_E-410-simple.dcp
+share/rawstudio/profiles/OLYMPUS_E-420-simple.dcp
+share/rawstudio/profiles/OLYMPUS_E-450-simple.dcp
+share/rawstudio/profiles/OLYMPUS_E-5-simple.dcp
+share/rawstudio/profiles/OLYMPUS_E-500-simple.dcp
+share/rawstudio/profiles/OLYMPUS_E-510-simple.dcp
+share/rawstudio/profiles/OLYMPUS_E-520-simple.dcp
+share/rawstudio/profiles/OLYMPUS_E-620-simple.dcp
+share/rawstudio/profiles/OLYMPUS_E-P1-simple.dcp
+share/rawstudio/profiles/OLYMPUS_E-PL1-simple.dcp
+share/rawstudio/profiles/OLYMPUS_E-PL1s-simple.dcp
+share/rawstudio/profiles/OLYMPUS_E-PL2-simple.dcp
+share/rawstudio/profiles/OLYMPUS_SP3-simple.dcp
+share/rawstudio/profiles/OLYMPUS_SP350-simple.dcp
+share/rawstudio/profiles/OLYMPUS_SP500UZ-simple.dcp
+share/rawstudio/profiles/OLYMPUS_SP510UZ-simple.dcp
+share/rawstudio/profiles/OLYMPUS_SP550UZ-simple.dcp
+share/rawstudio/profiles/OLYMPUS_SP560UZ-simple.dcp
+share/rawstudio/profiles/OLYMPUS_SP570UZ-simple.dcp
+share/rawstudio/profiles/OLYMPUS_XZ-1-simple.dcp
+share/rawstudio/profiles/PENTAX_645D-simple.dcp
+share/rawstudio/profiles/PENTAX_K-5-simple.dcp
+share/rawstudio/profiles/PENTAX_K-7-simple.dcp
+share/rawstudio/profiles/PENTAX_K-m-simple.dcp
+share/rawstudio/profiles/PENTAX_K-r-simple.dcp
+share/rawstudio/profiles/PENTAX_K-x-simple.dcp
+share/rawstudio/profiles/PENTAX_K1-simple.dcp
+share/rawstudio/profiles/PENTAX_K10D-simple.dcp
+share/rawstudio/profiles/PENTAX_K2000-simple.dcp
+share/rawstudio/profiles/PENTAX_K200D-simple.dcp
+share/rawstudio/profiles/PENTAX_K20D-simple.dcp
+share/rawstudio/profiles/Panasonic_DMC-FX150-simple.dcp
+share/rawstudio/profiles/Panasonic_DMC-FZ18-simple.dcp
+share/rawstudio/profiles/Panasonic_DMC-FZ28-simple.dcp
+share/rawstudio/profiles/Panasonic_DMC-FZ30-simple.dcp
+share/rawstudio/profiles/Panasonic_DMC-FZ35-simple.dcp
+share/rawstudio/profiles/Panasonic_DMC-FZ50-simple.dcp
+share/rawstudio/profiles/Panasonic_DMC-FZ8-simple.dcp
+share/rawstudio/profiles/Panasonic_DMC-G1-simple.dcp
+share/rawstudio/profiles/Panasonic_DMC-G10-simple.dcp
+share/rawstudio/profiles/Panasonic_DMC-G2-simple.dcp
+share/rawstudio/profiles/Panasonic_DMC-GF1-simple.dcp
+share/rawstudio/profiles/Panasonic_DMC-GF2-simple.dcp
+share/rawstudio/profiles/Panasonic_DMC-GH1-simple.dcp
+share/rawstudio/profiles/Panasonic_DMC-GH2-simple.dcp
+share/rawstudio/profiles/Panasonic_DMC-L1-simple.dcp
+share/rawstudio/profiles/Panasonic_DMC-L10-simple.dcp
+share/rawstudio/profiles/Panasonic_DMC-LC1-simple.dcp
+share/rawstudio/profiles/Panasonic_DMC-LX1-simple.dcp
+share/rawstudio/profiles/Panasonic_DMC-LX2-simple.dcp
+share/rawstudio/profiles/Panasonic_DMC-LX3-simple.dcp
+share/rawstudio/profiles/Panasonic_FZ100-simple.dcp
+share/rawstudio/profiles/Panasonic_FZ40-simple.dcp
+share/rawstudio/profiles/Panasonic_LX5-simple.dcp
+share/rawstudio/profiles/Phase_One_H_20-simple.dcp
+share/rawstudio/profiles/Phase_One_P65-simple.dcp
+share/rawstudio/profiles/Phase_One_P_2-simple.dcp
+share/rawstudio/profiles/Phase_One_P_30-simple.dcp
+share/rawstudio/profiles/Phase_One_P_45-simple.dcp
+share/rawstudio/profiles/Ricoh_A12_28mm-simple.dcp
+share/rawstudio/profiles/Ricoh_A12_50mm-simple.dcp
+share/rawstudio/profiles/Ricoh_Digital_3-simple.dcp
+share/rawstudio/profiles/Ricoh_GX200-simple.dcp
+share/rawstudio/profiles/Ricoh_S10_24-72mm-simple.dcp
+share/rawstudio/profiles/SAMSUNG_EX1-simple.dcp
+share/rawstudio/profiles/SAMSUNG_GX-1-simple.dcp
+share/rawstudio/profiles/SAMSUNG_GX-1L-simple.dcp
+share/rawstudio/profiles/SAMSUNG_GX-1S-simple.dcp
+share/rawstudio/profiles/SAMSUNG_GX10-simple.dcp
+share/rawstudio/profiles/SAMSUNG_GX20-simple.dcp
+share/rawstudio/profiles/SAMSUNG_NX10-simple.dcp
+share/rawstudio/profiles/SAMSUNG_NX100-simple.dcp
+share/rawstudio/profiles/SAMSUNG_NX11-simple.dcp
+share/rawstudio/profiles/SAMSUNG_NX5-simple.dcp
+share/rawstudio/profiles/SAMSUNG_S85-simple.dcp
+share/rawstudio/profiles/SAMSUNG_WB2000-simple.dcp
+share/rawstudio/profiles/SONY_DSC-F828-simple.dcp
+share/rawstudio/profiles/SONY_DSC-R1-simple.dcp
+share/rawstudio/profiles/SONY_DSC-V3-simple.dcp
+share/rawstudio/profiles/SONY_DSLR-A100-simple.dcp
+share/rawstudio/profiles/SONY_DSLR-A200-simple.dcp
+share/rawstudio/profiles/SONY_DSLR-A230-simple.dcp
+share/rawstudio/profiles/SONY_DSLR-A290-simple.dcp
+share/rawstudio/profiles/SONY_DSLR-A300-simple.dcp
+share/rawstudio/profiles/SONY_DSLR-A330-simple.dcp
+share/rawstudio/profiles/SONY_DSLR-A350-simple.dcp
+share/rawstudio/profiles/SONY_DSLR-A380-simple.dcp
+share/rawstudio/profiles/SONY_DSLR-A390-simple.dcp
+share/rawstudio/profiles/SONY_DSLR-A450-simple.dcp
+share/rawstudio/profiles/SONY_DSLR-A5-simple.dcp
+share/rawstudio/profiles/SONY_DSLR-A500-simple.dcp
+share/rawstudio/profiles/SONY_DSLR-A550-simple.dcp
+share/rawstudio/profiles/SONY_DSLR-A560-simple.dcp
+share/rawstudio/profiles/SONY_DSLR-A580-simple.dcp
+share/rawstudio/profiles/SONY_DSLR-A700-simple.dcp
+share/rawstudio/profiles/SONY_DSLR-A850-simple.dcp
+share/rawstudio/profiles/SONY_DSLR-A900-simple.dcp
+share/rawstudio/profiles/SONY_NEX-3-simple.dcp
+share/rawstudio/profiles/SONY_NEX-5-simple.dcp
+share/rawstudio/profiles/SONY_SLTA33-simple.dcp
+share/rawstudio/profiles/SONY_SLTA55V-simple.dcp
+share/rawstudio/profiles/Sinar-simple.dcp
+share/rawstudio/profiles/compatibleWithAdobeRGB1998-linear.icc
+share/rawstudio/profiles/compatibleWithAdobeRGB1998.icc
+share/rawstudio/profiles/generic_camera_profile.icc
+share/rawstudio/profiles/prophoto-linear.icc
+share/rawstudio/profiles/prophoto.icc
+share/rawstudio/profiles/rawstudio-cameras.xml
+share/rawstudio/profiles/sRGB-linear.icc
+share/rawstudio/profiles/sRGB.icc
 share/rawstudio/rawstudio.gtkrc
 share/rawstudio/ui.xml
 @exec %D/bin/update-desktop-database