graphics/shotwell: Patched for LibRaw 0.14.x

3 files changed, 151 insertions, 1 deletions

diff --git a/graphics/shotwell/patch-src-photos-GRaw.vala b/graphics/shotwell/patch-src-photos-GRaw.vala
new file mode 100644
index 0000000000..cc72b6ce5c
--- /dev/null
+++ b/graphics/shotwell/patch-src-photos-GRaw.vala
@@ -0,0 +1,65 @@
+--- src/photos/GRaw.vala.orig	2012-02-15 17:13:51.000000000 -0800
++++ src/photos/GRaw.vala	2012-02-15 17:15:48.000000000 -0800
+@@ -34,11 +34,11 @@
+     OUT_OF_ORDER_CALL,
+     NO_THUMBNAIL,
+     UNSUPPORTED_THUMBNAIL,
+-    CANNOT_ADDMASK,
+     OUT_OF_MEMORY,
+     DATA_ERROR,
+     IO_ERROR,
+     CANCELLED_BY_CALLBACK,
++    BAD_CROP,
+     SYSTEM_ERROR
+ }
+ 
+@@ -163,10 +163,6 @@
+         proc = new LibRaw.Processor(options);
+     }
+     
+-    public void add_masked_borders_to_bitmap() {
+-        proc.add_masked_borders_to_bitmap();
+-    }
+-    
+     public void adjust_sizes_info_only() throws Exception {
+         throw_exception("adjust_sizes_info_only", proc.adjust_sizes_info_only());
+     }
+@@ -215,10 +211,6 @@
+         throw_exception("ppm_tiff_writer", proc.ppm_tiff_writer(filename));
+     }
+     
+-    public void rotate_fuji_raw() throws Exception {
+-        throw_exception("rotate_fuji_raw", proc.rotate_fuji_raw());
+-    }
+-    
+     public void thumb_writer(string filename) throws Exception {
+         throw_exception("thumb_writer", proc.thumb_writer(filename));
+     }
+@@ -262,7 +254,6 @@
+         // camera_profile
+         // bad_pixels
+         // dark_frame
+-        output_params->filtering_mode = LibRaw.Filtering.AUTOMATIC;
+         output_params->output_bps = 8;
+         // output_tiff
+         output_params->user_flip = GRaw.Flip.FROM_SOURCE;
+@@ -303,9 +294,6 @@
+         case LibRaw.Result.UNSUPPORTED_THUMBNAIL:
+             throw new Exception.UNSUPPORTED_THUMBNAIL(msg);
+         
+-        case LibRaw.Result.CANNOT_ADDMASK:
+-            throw new Exception.CANNOT_ADDMASK(msg);
+-        
+         case LibRaw.Result.UNSUFFICIENT_MEMORY:
+             throw new Exception.OUT_OF_MEMORY(msg);
+         
+@@ -317,6 +305,9 @@
+         
+         case LibRaw.Result.CANCELLED_BY_CALLBACK:
+             throw new Exception.CANCELLED_BY_CALLBACK(msg);
++
++        case LibRaw.Result.BAD_CROP:
++            throw new Exception.BAD_CROP(msg);
+         
+         default:
+             return;
diff --git a/graphics/shotwell/patch-vapi-libraw.vapi b/graphics/shotwell/patch-vapi-libraw.vapi
new file mode 100644
index 0000000000..712cafc219
--- /dev/null
+++ b/graphics/shotwell/patch-vapi-libraw.vapi
@@ -0,0 +1,81 @@
+--- vapi/libraw.vapi.orig	2012-02-15 17:16:39.000000000 -0800
++++ vapi/libraw.vapi	2012-02-15 17:18:38.000000000 -0800
+@@ -14,17 +14,6 @@
+ 
+ public unowned string versionNumber();
+ 
+-[CCode (cname="enum libraw_Filtering", cprefix="LIBRAW_FILTERING_")]
+-public enum Filtering {
+-    DEFAULT,
+-    NOZEROES,
+-    NOBLACK,
+-    NORAWCURVE,
+-    NONE,
+-    LIBRAWOWN,
+-    AUTOMATIC
+-}
+-
+ [SimpleType]
+ [CCode (cname="libraw_imgother_t")]
+ public struct ImageOther {
+@@ -121,7 +110,6 @@
+     public bool use_camera_wb;
+     public bool use_camera_matrix;
+     public int output_color;
+-    public Filtering filtering_mode;
+     public int output_bps;
+     public bool output_tiff;
+     public int user_flip;
+@@ -132,6 +120,30 @@
+     public bool no_auto_bright;
+     public float auto_bright_thr;
+     public int use_fuji_rotate;
++    public int green_matching;
++    
++    /* DCB parameters */
++    public int dcb_iterations;
++    public int dcb_enhance_fl;
++    public int fbdd_noiserd;
++    
++    /* VCD parameters */
++    public int eeci_refine;
++    public int es_med_passes;
++    /* AMaZE*/
++    public int ca_correc;
++    public float cared;
++    public float cablue;
++    public int cfaline;
++    public float linenoise;
++    public int cfa_clean;
++    public float lclean;
++    public float cclean;
++    public int cfa_green;
++    public float green_thresh;
++    public int exp_correc;
++    public float exp_shift;
++    public float exp_preser;
+     
+     public void set_chromatic_aberrations(double red_multiplier, double green_multiplier) {
+         aber[0] = red_multiplier;
+@@ -171,7 +183,6 @@
+     [CCode (cname="libraw_init")]
+     public Processor(Options flags = Options.NONE);
+     
+-    public void add_masked_borders_to_bitmap();
+     public Result adjust_sizes_info_only();
+     [CCode (cname="libraw_dcraw_document_mode_processing")]
+     public Result document_mode_processing();
+@@ -216,11 +227,11 @@
+     OUT_OF_ORDER_CALL,
+     NO_THUMBNAIL,
+     UNSUPPORTED_THUMBNAIL,
+-    CANNOT_ADDMASK,
+     UNSUFFICIENT_MEMORY,
+     DATA_ERROR,
+     IO_ERROR,
+-    CANCELLED_BY_CALLBACK;
++    CANCELLED_BY_CALLBACK,
++    BAD_CROP;
+     
+     [CCode (cname="LIBRAW_FATAL_ERROR")]
+     public bool is_fatal_error();
diff --git a/graphics/shotwell/shotwell.SlackBuild b/graphics/shotwell/shotwell.SlackBuild
index c9a88cc0bb..00fc9fad66 100644
--- a/graphics/shotwell/shotwell.SlackBuild
+++ b/graphics/shotwell/shotwell.SlackBuild
@@ -4,7 +4,7 @@
 
 PRGNAM=shotwell
 VERSION=0.11.6
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -43,6 +43,10 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
+# Fix building with LibRaw 0.14
+patch -p0 -i $CWD/patch-src-photos-GRaw.vala
+patch -p0 -i $CWD/patch-vapi-libraw.vapi
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \