From owner-svn-ports-head@FreeBSD.ORG Sun Jan 26 21:28:20 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0C249B17; Sun, 26 Jan 2014 21:28:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D1F9B1D25; Sun, 26 Jan 2014 21:28:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0QLSJHb042325; Sun, 26 Jan 2014 21:28:19 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0QLSJjI042324; Sun, 26 Jan 2014 21:28:19 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201401262128.s0QLSJjI042324@svn.freebsd.org> From: Raphael Kubo da Costa Date: Sun, 26 Jan 2014 21:28:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r341291 - head/graphics/shotwell/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Jan 2014 21:28:20 -0000 Author: rakuco Date: Sun Jan 26 21:28:19 2014 New Revision: 341291 URL: http://svnweb.freebsd.org/changeset/ports/341291 QAT: https://qat.redports.org/buildarchive/r341291/ Log: Add upstream patch to fix the build with libraw 0.15. Added: head/graphics/shotwell/files/patch-git_89aa167 (contents, props changed) Added: head/graphics/shotwell/files/patch-git_89aa167 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/shotwell/files/patch-git_89aa167 Sun Jan 26 21:28:19 2014 (r341291) @@ -0,0 +1,54 @@ +commit 89aa167726d12f9ae0b53c01a2fdc54601fc3cc5 +Author: Jim Nelson +Date: Wed May 29 11:52:09 2013 -0700 + + Build with LibRaw 0.15: Closes #7012 + + LibRaw 0.15 removed document-mode processing, which, as their release + notes say, "no one uses". Compile error were nothing more than + missing symbols -- Shotwell wasn't using it either. + +--- src/photos/GRaw.vala ++++ src/photos/GRaw.vala +@@ -21,12 +21,6 @@ public enum Colorspace { + XYZ = 5 + } + +-public enum DocMode { +- STANDARD = 0, +- GRAYSCALE = 1, +- GRAYSCALE_NO_WHITE_BALANCE = 2 +-} +- + public errordomain Exception { + UNSPECIFIED, + UNSUPPORTED_FILE, +@@ -167,10 +161,6 @@ public class Processor { + throw_exception("adjust_sizes_info_only", proc.adjust_sizes_info_only()); + } + +- public void document_mode_processing() throws Exception { +- throw_exception("document_mode_processing", proc.document_mode_processing()); +- } +- + public unowned LibRaw.ImageOther get_image_other() { + return proc.get_image_other(); + } +@@ -244,7 +234,6 @@ public class Processor { + // threshold + output_params->half_size = half_size; + // four_color_rgb +- output_params->document_mode = GRaw.DocMode.STANDARD; + output_params->highlight = GRaw.HighlightMode.CLIP; + output_params->use_auto_wb = true; + output_params->use_camera_wb = true; +--- vapi/libraw.vapi ++++ vapi/libraw.vapi +@@ -104,7 +104,6 @@ public struct OutputParams { + public float threshold; + public bool half_size; + public bool four_color_rgb; +- public int document_mode; + public int highlight; + public bool use_auto_wb; + public bool use_camera_wb;