Fix build with libraw-0.14.0 (bug #384165, patch by Alexandre Rostovtsev).

Package-Manager: portage-2.2.0_alpha60/cvs/Linux x86_64

diff --git a/media-gfx/shotwell/ChangeLog b/media-gfx/shotwell/ChangeLog
index fff6405a7e5d0cf9380ea0800ac7591ba6f5e6cc..69d3d02182564420919a83b767be5a4565e5540e 100644 (file)
--- a/media-gfx/shotwell/ChangeLog
+++ b/media-gfx/shotwell/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/shotwell
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/ChangeLog,v 1.26 2011/09/23 18:04:05 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/ChangeLog,v 1.27 2011/10/04 18:19:58 radhermit Exp $
+
+  04 Oct 2011; Tim Harder <radhermit@gentoo.org> shotwell-0.11.2.ebuild,
+  +files/shotwell-0.11.2-libraw-0.14.patch:
+  Fix build with libraw-0.14.0 (bug #384165, patch by Alexandre Rostovtsev).
 
 *shotwell-0.11.2 (23 Sep 2011)
 

diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index bf9e72f202cbcf7fd8ad84a2d8ed6e425fd1f265..1107ea736e027437a20f2d8c65945deec7fc23a0 100644 (file)
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,21 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 0.10-ldflags.patch 1223 RMD160 9eb78d092161abc1f92c35dfc24db717a54881ee SHA1 f090c571beef1a5ba8b05389d1e9c8a9807a3252 SHA256 84ed8a02deee8cbb049b156e8646af54bb844523220eb704fac405aab111bed7
 AUX 0.11.0-ldflags.patch 1139 RMD160 e0e73d17e759aa17c97b6254086ea92f43ce2fed SHA1 b1eb84490f5d7038318770c7b0066e2b7cf243f3 SHA256 43cdc9d1031c88beb556eb1f6e12d0e4e7b9697c50c4b8422eb98208a2819580
 AUX shotwell-0.10.1-libraw-config.patch 661 RMD160 3430d8191b72136c80a8fd46d8bfc8c0c5c9dc60 SHA1 dd0c98b309079394a975702ecd2fdc70819b95c1 SHA256 4d4588b0185599776b73753453ec445e19e748f822c271cea433504924f44d8f
+AUX shotwell-0.11.2-libraw-0.14.patch 3918 RMD160 702d82572c16c171f211aa8c36ae108f06affd89 SHA1 ffb170274d214741de277fa0f5452dd741d7c7ee SHA256 e204f2dbe270cbabef8cc1eded03e81d7befe995add35464e3f04246851312bb
 DIST shotwell-0.10.1.tar.bz2 1483679 RMD160 44cccbebf4f1bf024229da9afbcc6d4db510be96 SHA1 abd6e771168910943101b62d76f7768a49e69be9 SHA256 f6ef4782780af201402afeaf8f9484d5579cedff75fbf07b22587bb7cef69893
 DIST shotwell-0.11.1.tar.bz2 1545164 RMD160 51b96dccfe8665551fb416d7a444c5f94b0358a1 SHA1 84c85291a22bf7a95f51cf0341d12ea0355f1415 SHA256 e4539bd427ac19c40c883705caa78b67f77d6d1a1bfbcffe9202b348e5643648
 DIST shotwell-0.11.2.tar.bz2 1554533 RMD160 7f44508683e1c67c3cd3194639f17b8ecfc2f89a SHA1 4ae17d180c809a70a0e69303c6be3c3ce3f81c17 SHA256 94a10fcc17fcbe36c07fa7d69d093785c8f9e2f78be66600415aa3fd542c9ad5
 EBUILD shotwell-0.10.1.ebuild 1574 RMD160 d0c146667c4865398f9aad741dbdb5a954b59ced SHA1 652e869a2e468f24f4ffe0964d11ac40d7f737d3 SHA256 c2c690fb5dd5519d4fcbd8750e5a9aa3cceda807ddeda3eeb0f2782f101ee35a
 EBUILD shotwell-0.11.1.ebuild 1533 RMD160 9f3e1546f575bebb990bedf48600c8d53b879204 SHA1 1dbc1678ec063a10e0ebc76a17c4d559c1627f98 SHA256 28c3ae3f73b5941028b396108f029293aaa2efc196568c2052bf79d08669d87f
-EBUILD shotwell-0.11.2.ebuild 1386 RMD160 95e6ec6ba929bdd9947930d2d406ad1710c8e4bf SHA1 3928b679507809c7f33b26dca96062b25e863956 SHA256 01a1b864cb0c1955e53c3c6339ab1ef4dceaec9a9487bd9c6bf07823726c605f
-MISC ChangeLog 4579 RMD160 5095b7216e46a906c493ea164c82f105bc0f6b39 SHA1 23c84bf6665c55dc695d3db15255351d83226c0c SHA256 cbc07844a2580284f573f0c001bff5cff32868b168bb45a945e28b9fe783e666
+EBUILD shotwell-0.11.2.ebuild 1453 RMD160 456b83b5253c84a97e824f24a0fa0b43c11c7045 SHA1 638398f7ca08fcc489c7db146e4388be9a6cb235 SHA256 a30a207ed93818c95b2622b74c180b51c7b03464d72a1af0686b1d453af05d17
+MISC ChangeLog 4776 RMD160 ab701027e52a0e2412588d0545214678ca4eb0d9 SHA1 e3f2c57a68a20137d0b401b05c7b9f84b11308a2 SHA256 429faeac96f52d9b80ef1e676bb77d388db758770f7010c2d1339ec6d676d675
 MISC metadata.xml 559 RMD160 7401908d71c9cb6774d73efd5147400b26abf9a9 SHA1 33c34915641d1174b6a945ddee2680b81674394b SHA256 62028c58796cd83bc8e6c552a98830ca8ed22f852b1708eddae549e2f6ecd791
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk58yhcACgkQmWq1bYTyC0MUVAD+Lmiae2DlKgoIidnDWz3pUOBt
-pvW+3llTKY1bE81JTGkBAImX2mc+0My3VTGfXlLGRD3bGOnlpObWwJyzcKy5jU5H
-=oVL8
+iQEcBAEBCgAGBQJOi05gAAoJEEqz6FtPBkyjUUEIAInlVYoCBRnGhG4E7eTIYx3M
+FsAXSHPNDBmJnygQLYxJlJJmUeWqLYL04eTD2GZQLDXOkTpZhzj3/+BPZ7EVBoh1
+XWhW3F8i6gmxLpKBZRHR0xUuIy/fpvBjwYg7u9JHuHZyttD92k3gTLrsRqSX+kBn
+63yz0yVhh2oBSijhOu6x4MdiheLXstEHdA/bNIPRYjkSAp1Wn6FNx6cDAzj2x/+w
+JFhdU5eLhnFb80/kuf1F9/dfaDTGk5UPkVO+iQFxw3Eq0K7TIv/ak37zNs3qagIT
+RR0DzVGmk5uigUiWj/9rYaSUSylIypz/J9VgeaTaORVzG7LMPb9aKRj0aPPmLug=
+=Y8As
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/shotwell/files/shotwell-0.11.2-libraw-0.14.patch b/media-gfx/shotwell/files/shotwell-0.11.2-libraw-0.14.patch
new file mode 100644 (file)
index 0000000..cdf2948
--- /dev/null
+++ b/media-gfx/shotwell/files/shotwell-0.11.2-libraw-0.14.patch
@@ -0,0 +1,109 @@
+From 06ce5a48a3dcc6416ac81995bc9d2f7001d624f9 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gmail.com>
+Date: Sun, 2 Oct 2011 05:22:07 -0400
+Subject: [PATCH] Do not use libraw API that was dropped in libraw-0.14
+
+add_masked_borders_to_bitmap() and rotate_fuji_raw() were removed from
+0.14 API. We can safely drop their vala wrappers since they weren't
+being used anywhere. And drop CANNOT_ADDMASK error code, since it was
+dropped from the libraw API, and could only result from the removed
+add_masked_borders_to_bitmap().
+
+The LIBRAW_FILTERING_* constans were removed from the public API.
+Fortunately, the only one of them that shotwell code was using was
+LIBRAW_FILTERING_AUTOMATIC - which is now the default libraw behavior.
+Therefore, we can safely drop the LibRaw.Filtering enum.
+---
+ src/photos/GRaw.vala |   12 ------------
+ vapi/libraw.vapi     |   14 --------------
+ 2 files changed, 0 insertions(+), 26 deletions(-)
+
+--- a/src/photos/GRaw.vala
++++ b/src/photos/GRaw.vala
+@@ -163,10 +163,6 @@ public class Processor {
+         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 @@ public class Processor {
+         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 @@ public class Processor {
+         // 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 @@ private void throw_exception(string caller, LibRaw.Result result) throws Excepti
+         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);
+         
+--- a/vapi/libraw.vapi
++++ b/vapi/libraw.vapi
+@@ -14,17 +14,6 @@ public unowned string version();
+ 
+ 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 struct OutputParams {
+     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;
+@@ -171,7 +159,6 @@ public class Processor {
+     [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();
+@@ -192,7 +179,6 @@ public class Processor {
+     [CCode (cname="libraw_dcraw_ppm_tiff_writer")]
+     public Result ppm_tiff_writer(string outfile);
+     public void recycle();
+-    public Result rotate_fuji_raw();
+     [CCode (cname="libraw_dcraw_thumb_writer")]
+     public Result thumb_writer(string outfile);
+     public Result unpack();
+-- 
+1.7.7
+

diff --git a/media-gfx/shotwell/shotwell-0.11.2.ebuild b/media-gfx/shotwell/shotwell-0.11.2.ebuild
index bfe0ac16670609f52bbd3cea883d2e937423aef8..f35e960d6688e33d23839e5798943ccdc799c879 100644 (file)
--- a/media-gfx/shotwell/shotwell-0.11.2.ebuild
+++ b/media-gfx/shotwell/shotwell-0.11.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/shotwell-0.11.2.ebuild,v 1.1 2011/09/23 18:04:05 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/shotwell-0.11.2.ebuild,v 1.2 2011/10/04 18:19:58 radhermit Exp $
 
 EAPI=4
 GCONF_DEBUG="no"
@@ -29,7 +29,7 @@ RDEPEND="
        media-libs/lcms:2
        >=media-libs/libexif-0.6.16
        >=media-libs/libgphoto2-2.4.2
-       >=media-libs/libraw-0.9.0
+       >=media-libs/libraw-0.14.0
        >=net-libs/libsoup-2.26.0:2.4
        >=net-libs/webkit-gtk-1.1.5:2
        || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] )
@@ -48,6 +48,10 @@ pkg_setup() {
                --lib=$(get_libdir)"
 }
 
+src_prepare() {
+       epatch "${FILESDIR}"/${P}-libraw-0.14.patch
+}
+
 src_compile() {
        emake VALAC="$(type -p valac-0.12)"
 }