revision bump to fix nikon raw files with media-gfx/exiv2-0.18, bug #258058

(Portage version: 2.2_rc28/cvs/Linux i686)

3 files changed, 74 insertions, 2 deletions

diff --git a/media-gfx/rawstudio/ChangeLog b/media-gfx/rawstudio/ChangeLog
index ba6bf8326fc1..595cd5bc12ad 100644
--- a/media-gfx/rawstudio/ChangeLog
+++ b/media-gfx/rawstudio/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/rawstudio
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/rawstudio/ChangeLog,v 1.11 2008/11/22 17:37:14 maekke Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/rawstudio/ChangeLog,v 1.12 2009/04/05 12:26:34 maekke Exp $
+
+*rawstudio-1.1.1-r1 (05 Apr 2009)
+
+  05 Apr 2009; Markus Meier <maekke@gentoo.org>
+  +files/rawstudio-1.1.1-exiv2-0.18.patch, +rawstudio-1.1.1-r1.ebuild:
+  revision bump to fix nikon raw files with media-gfx/exiv2-0.18, bug
+  #258058
 
   22 Nov 2008; Markus Meier <maekke@gentoo.org>
   -files/rawstudio-1.0-desktop-entry-and-pixmaps-directory.patch,
diff --git a/media-gfx/rawstudio/files/rawstudio-1.1.1-exiv2-0.18.patch b/media-gfx/rawstudio/files/rawstudio-1.1.1-exiv2-0.18.patch
new file mode 100644
index 000000000000..a063174691a1
--- /dev/null
+++ b/media-gfx/rawstudio/files/rawstudio-1.1.1-exiv2-0.18.patch
@@ -0,0 +1,22 @@
+In Exiv2 v.0.18 the Nikon maker EXIF tag was renamed from NEFThumbnailSize to
+RawImageCenter. This makes rawstudio crash when exporting RAW images.
+
+http://bugzilla.rawstudio.org/show_bug.cgi?id=258
+
+diff -Naur rawstudio.orig/src/rs-exif.cc rawstudio/src/rs-exif.cc
+--- rawstudio.orig/src/rs-exif.cc	2009-01-10 19:30:36.262484000 +0100
++++ rawstudio/src/rs-exif.cc	2009-03-26 19:14:56.277628371 +0100
+@@ -58,7 +58,12 @@
+ #if EXIV2_TEST_VERSION(0,13,0)
+ 	"Exif.Nikon3.Preview",
+ #endif
+-	"Exif.Nikon3.NEFThumbnailSize",
++
++#if EXIV2_TEST_VERSION(0,18,0)
++        "Exif.Nikon3.RawImageCenter",
++#else
++        "Exif.Nikon3.NEFThumbnailSize",
++#endif
+ 
+ #if EXIV2_TEST_VERSION(0,17,91)
+ 	"Exif.NikonPreview.JPEGInterchangeFormat",
diff --git a/media-gfx/rawstudio/rawstudio-1.1.1-r1.ebuild b/media-gfx/rawstudio/rawstudio-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..9b7a619c9e30
--- /dev/null
+++ b/media-gfx/rawstudio/rawstudio-1.1.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/rawstudio/rawstudio-1.1.1-r1.ebuild,v 1.1 2009/04/05 12:26:34 maekke Exp $
+
+inherit eutils
+
+DESCRIPTION="a program to read and manipulate raw images from digital cameras."
+HOMEPAGE="http://rawstudio.org"
+SRC_URI="http://${PN}.org/files/release/${P}.tar.gz"
+
+LICENSE="GPL-2 CCPL-Attribution-NoDerivs-2.5"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/libxml2-2.4
+	>=gnome-base/gconf-2
+	media-gfx/exiv2
+	media-libs/jpeg
+	media-libs/lcms
+	media-libs/tiff
+	sys-apps/dbus
+	>=x11-libs/gtk+-2.8"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/gettext"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.1-desktop-entry-and-pixmaps-directory.patch
+	epatch "${FILESDIR}"/${P}-exiv2-0.18.patch
+}
+
+src_compile() {
+	econf --disable-dependency-tracking
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}