From 4e2739240bf2ab83ed1c97e2d5297106c112748b Mon Sep 17 00:00:00 2001
From: Tim Harder <radhermit@gentoo.org>
Date: Fri, 23 Sep 2011 23:32:01 +0000
Subject: [PATCH] Fix build with libraw-0.14.0 (bug #384191).

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64
---
 media-gfx/luminance-hdr/ChangeLog             |  6 +++++-
 media-gfx/luminance-hdr/Manifest              | 19 ++++++++++---------
 .../files/luminance-hdr-2.1.0-libraw.patch    | 10 ++++++++++
 .../luminance-hdr/luminance-hdr-2.1.0.ebuild  |  4 +++-
 4 files changed, 28 insertions(+), 11 deletions(-)
 create mode 100644 media-gfx/luminance-hdr/files/luminance-hdr-2.1.0-libraw.patch

diff --git a/media-gfx/luminance-hdr/ChangeLog b/media-gfx/luminance-hdr/ChangeLog
index 7c0668d4d5bc..69ddd34842d3 100644
--- a/media-gfx/luminance-hdr/ChangeLog
+++ b/media-gfx/luminance-hdr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/luminance-hdr
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/luminance-hdr/ChangeLog,v 1.8 2011/08/26 10:42:26 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/luminance-hdr/ChangeLog,v 1.9 2011/09/23 23:32:01 radhermit Exp $
+
+  23 Sep 2011; Tim Harder <radhermit@gentoo.org> luminance-hdr-2.1.0.ebuild,
+  +files/luminance-hdr-2.1.0-libraw.patch:
+  Fix build with libraw-0.14.0 (bug #384191).
 
 *luminance-hdr-2.1.0 (26 Aug 2011)
 
diff --git a/media-gfx/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest
index c5ee21f3c6df..c7d63bda984b 100644
--- a/media-gfx/luminance-hdr/Manifest
+++ b/media-gfx/luminance-hdr/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX luminance-hdr-2.1.0-libraw.patch 311 RMD160 4bc66c7604fe60aa6c8778658b07b7913ca90143 SHA1 e3b7d7a54816ea55a43c0423605e1006417ef37b SHA256 d3be7458713693382b64a6a1fa766c14bc16be2ff9c5a06567c0e5335581151c
 DIST luminance-hdr-2.0.2.tar.gz 2681331 RMD160 05b33def6efb766662e1b910c9e003b9a7ff2b14 SHA1 52e14d0efee7e5673e4b33bdcb5b52ead8688c61 SHA256 8a13aff0041fd7f7542af0b6b11e412c01f022d509458c4a701f8ca84bade993
 DIST luminance-hdr-2.1.0.tar.gz 4086574 RMD160 cb3191f41dd9a8e55c91895e6e60f643d7baa4fe SHA1 5bc3f58c3403565cf209c0ef30fc68d5b7c58fd7 SHA256 0b0f124ada6da62c379d6e4bd6fd150643115cb46f05c527c29113f475a5eeac
 DIST luminance-hdr_2.0.0.tar.gz 2450689 RMD160 679ada53c67c4c37853ac0153e8acb6fe0ed2df7 SHA1 7981cd1ac8b7e29343ce26288796ddc74cf23ca9 SHA256 6e6f6dadbe54d2c14e1c98c2dba928b3bc09ba4dbe5c63a071a32f5c372e16e8
@@ -8,17 +9,17 @@ DIST luminance-v2.0.1.tar.gz 2435322 RMD160 d9d0faef0ccd2247a37acccb11d511d240d7
 EBUILD luminance-hdr-2.0.0.ebuild 1409 RMD160 117c2999d957444a1cc53552b9098497905030dd SHA1 5c8398206899e3bbaee89bc1a005cb52b4800691 SHA256 4db5cd2ce0c0d249022f4c050fb21d36ef45fb0a0b440fba248961a5cb77f467
 EBUILD luminance-hdr-2.0.1.ebuild 1430 RMD160 e50a093d536df0eba65819e1fa3ca7a2d562051b SHA1 abf5431c3460a9d4aa326d0951938da9f8ddc299 SHA256 9b054975faa3bf373ecd42e919e981a4f8c2555336ea2ca3924ab776e704474b
 EBUILD luminance-hdr-2.0.2.ebuild 1477 RMD160 d9d076f48a6645d1888061d0006f099158f3d28b SHA1 968707a845d8aafa02de2b5749e41665ff1c5dc0 SHA256 347de0024dc87d4df1c2f10c586c6611b95fc1b5ebb019ed93dcf2b51d53c8f8
-EBUILD luminance-hdr-2.1.0.ebuild 1477 RMD160 a91dbf188af8e3f1115edca24fae61e443c27c55 SHA1 ff07191b9c56a5a34c29ab89637120b744908ec1 SHA256 f00997f1bd9e70da325c918e84e8cba3a3650a8cf59be8898b50601d62633257
-MISC ChangeLog 4115 RMD160 36217e80c565b2773d26d0c705d81c951262ef34 SHA1 08452879c42d60ba2d1473207fca7f49f3b78bcc SHA256 d61d0b9b374f1b29e708bb1661f362ac6f8b9ffa62b5fd31a8fa16b9763fad23
+EBUILD luminance-hdr-2.1.0.ebuild 1518 RMD160 b37a411b9f171d494f1d5959e08d8ca5ba0bb507 SHA1 7b2e789619efb500b131f036f675f3db42c73319 SHA256 b2caa2af531b9e81788d284aee82d514a1ba6899a67fbcc1d050c2063af99d73
+MISC ChangeLog 4282 RMD160 8ed51768a71da1c508833c9bd33099343f20ab08 SHA1 025ad882ae744de6861d451401135a101fb3d325 SHA256 5046f2f08e033fdb02fd1b1acc9dd33b6323b8e1b655beec20e182c483b35b0a
 MISC metadata.xml 937 RMD160 188c7d5bcc2a1f029b36fb4644b45e0d4c42f5f7 SHA1 54bb4fd8c2ff64ddab7173aa25792d588f4977c5 SHA256 03752b3db20bdd5f73b81a4c7ac7a6173b7825c55aef76758cd48db98e778ef6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOV3ibAAoJEEqz6FtPBkyjXOYH/32pfI61Re0Y4GxPBHAIXODR
-ejh0377bHL58bXLUM0Dz03wR19SVCwmpMgvwM/i/5eNoALeFZuuVp43dvmPyh4yE
-ku3pQkeUFwEpsvXTlRTyMkSXorh2MvbU6UfU4RbMQ8wxbkfrpgQ5Lh0kiABeNHHd
-XC2IKvWnSqZu1EtSuxE0PiQCnFITbAqGHEpdsagWLax+UKUGcLs7l3qsrG+Radf6
-QqHwGIhiw+ovzDIUe3NeVf0xXm2dtePzM0ZnT0ITMSz2ruhwfc2peM2i7flGF65q
-pOsusAvKUGVRlMWK+hVb03bbDmAecunUNoaxdJMXutJh5pES939+BjxURHLlJPo=
-=iWCR
+iQEcBAEBCgAGBQJOfRb6AAoJEEqz6FtPBkyj/OAH/jgIqmgB3d28ISLi31oWq82C
+UKiz9XW0m7CNm9VKV/L3W8ls13F9gNTV90h0pKz45vT4KgJcQULC8g0vHWBRBJPm
+ZPIqNVv3Gzp/6979pKYwSGnIBMDM4DUIVqD1kz0g5HfCKo3r9vVbeWslOUY3VlEb
+KoLFw5Wzap9geQQCtZZkfb3ktOvBKA0TTWnfasfihpYIQIi5TF/XJpQRXrBSo5N3
+UL/tPuibRWmsh2dhTla6lmPc68FqN7+/lrm2k9SHnq2mjYSpbf/9gYZ1OcHncUvj
+IBM0mqYFflo/hO4RbS9u7jKvLx8LwpFOcZ7UJQM1mdbuBKPURc0Qhf7Ijz1jVIY=
+=QbXW
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.1.0-libraw.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.1.0-libraw.patch
new file mode 100644
index 000000000000..8472a7422221
--- /dev/null
+++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.1.0-libraw.patch
@@ -0,0 +1,10 @@
+--- luminance-hdr-2.1.0/src/Fileformat/pfsinraw.cpp.orig
++++ luminance-hdr-2.1.0/src/Fileformat/pfsinraw.cpp
+@@ -94,7 +94,6 @@
+   RawProcessor.set_progress_handler(cb, callback_data);
+   int ret;
+ 
+-  OUT.filtering_mode = LIBRAW_FILTERING_AUTOMATIC;
+   OUT.output_bps = 16;
+ 
+   //OUT.gamm[0] = 1/2.4;   //sRGB
diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.1.0.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.1.0.ebuild
index 884fec62a86f..26c9cc7e6f7b 100644
--- a/media-gfx/luminance-hdr/luminance-hdr-2.1.0.ebuild
+++ b/media-gfx/luminance-hdr/luminance-hdr-2.1.0.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/luminance-hdr/luminance-hdr-2.1.0.ebuild,v 1.1 2011/08/26 10:42:26 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/luminance-hdr/luminance-hdr-2.1.0.ebuild,v 1.2 2011/09/23 23:32:01 radhermit Exp $
 
 EAPI="4"
 
@@ -48,6 +48,8 @@ src_prepare() {
 	if ! use openmp ; then
 		sed -i -e '/-fopenmp/d' project.pro || die
 	fi
+
+	epatch "${FILESDIR}"/${P}-libraw.patch
 }
 
 src_configure() {
-- 
2.26.2