add support for canon EOS450D, by SchAmane <schamane@myeburg.net> in bug #237637

(Portage version: 2.2_rc8/cvs/Linux 2.6.27-rc6 i686)

3 files changed, 90 insertions, 1 deletions

diff --git a/media-gfx/ufraw/ChangeLog b/media-gfx/ufraw/ChangeLog
index 376dcf06c8af..29a17d3327f9 100644
--- a/media-gfx/ufraw/ChangeLog
+++ b/media-gfx/ufraw/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/ufraw
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/ufraw/ChangeLog,v 1.19 2008/01/17 19:37:14 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/ufraw/ChangeLog,v 1.20 2008/09/18 19:17:46 maekke Exp $
+
+*ufraw-0.13-r1 (18 Sep 2008)
+
+  18 Sep 2008; Markus Meier <maekke@gentoo.org>
+  +files/ufraw-0.13-Canon450D.patch, +ufraw-0.13-r1.ebuild:
+  add support for canon EOS450D, by SchAmane <schamane@myeburg.net> in bug
+  #237637
 
   17 Jan 2008; Markus Meier <maekke@gentoo.org> ufraw-0.13.ebuild:
   add pkgconfig dep (bug #205834) and do some dep-ordering
diff --git a/media-gfx/ufraw/files/ufraw-0.13-Canon450D.patch b/media-gfx/ufraw/files/ufraw-0.13-Canon450D.patch
new file mode 100644
index 000000000000..51e27b81ab90
--- /dev/null
+++ b/media-gfx/ufraw/files/ufraw-0.13-Canon450D.patch
@@ -0,0 +1,31 @@
+*** dcraw.cc.orig	2007-11-12 11:47:31.000000000 -0800
+--- dcraw.cc	2008-04-26 23:22:55.000000000 -0700
+***************
+*** 5943,5948 ****
+--- 5943,5950 ----
+  	{ 6018,-617,-965,-8645,15881,2975,-1530,1719,7642 } },
+      { "Canon EOS 400D", 0,
+  	{ 7054,-1501,-990,-8156,15544,2812,-1278,1414,7796 } },
++ 	{ "Canon EOS 450D", 0, 
++ 	{ 5784,-262,-821,-7539,15064,2672,-1982,2681,7427 } },
+      { "Canon EOS-1Ds Mark II", 0,
+  	{ 6517,-602,-867,-8180,15926,2378,-1618,1771,7633 } },
+      { "Canon EOS-1D Mark II N", 0,
+***************
+*** 6718,6723 ****
+--- 6720,6733 ----
+      width  = 4032;
+      top_margin  = 12;
+      left_margin = 48;
++   } else if (is_canon && raw_width == 4312) {
++     top_margin  = 18;
++     left_margin = 22;
++     height -= 2;
++ 	maximum = 0x390d;
++     if (unique_id == 0x80000176)
++       adobe_coeff ("Canon","EOS 450D");
++     goto canon_cr2;
+    } else if (is_canon && raw_width == 4476) {
+      top_margin  = 34;
+      left_margin = 90;
+
diff --git a/media-gfx/ufraw/ufraw-0.13-r1.ebuild b/media-gfx/ufraw/ufraw-0.13-r1.ebuild
new file mode 100644
index 000000000000..f3d365f0ebd9
--- /dev/null
+++ b/media-gfx/ufraw/ufraw-0.13-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/ufraw/ufraw-0.13-r1.ebuild,v 1.1 2008/09/18 19:17:46 maekke Exp $
+
+inherit eutils autotools fdo-mime gnome2-utils
+
+DESCRIPTION="RAW Image format viewer and GIMP plugin"
+HOMEPAGE="http://ufraw.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="exif gimp gnome"
+
+RDEPEND="media-libs/jpeg
+	>=media-libs/lcms-1.13
+	media-libs/tiff
+	>=x11-libs/gtk+-2.4.0
+	exif? ( >=media-libs/libexif-0.6.13
+	        media-gfx/exiv2 )
+	gimp? ( >=media-gfx/gimp-2.0 )
+	gnome? ( gnome-base/gconf )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-cflags.patch
+	epatch "${FILESDIR}"/${P}-Canon450D.patch
+	eautoreconf || die "failed running autoreconf"
+}
+
+src_compile() {
+	econf $(use_enable gnome mime) || die "configure failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc README TODO || die "doc installation failed"
+}
+
+pkg_postinst() {
+	if use gnome ; then
+		fdo-mime_mime_database_update
+		gnome2_gconf_install
+		fdo-mime_desktop_database_update
+	fi
+}