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

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc6 i686

4 files changed, 103 insertions, 2 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/Manifest b/media-gfx/ufraw/Manifest
index 1da936fa1ae4..d08afb971c50 100644
--- a/media-gfx/ufraw/Manifest
+++ b/media-gfx/ufraw/Manifest
@@ -1,5 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX ufraw-0.13-Canon450D.patch 974 RMD160 ca73672eca50f212ccbf331799f56109c73cc4d8 SHA1 637a544cd7c2f928e8601f2693a8192d5e8445ac SHA256 8dbdfb34209e95e763dc01de3ff75e1646bdacc60f071c1b5ddb6541c448b5b4
 AUX ufraw-0.13-cflags.patch 893 RMD160 1723eb81a72e2b73b6966ebbe44582d1b32611a7 SHA1 5db57852086f7ba659626776743c3450af51ea7b SHA256 499862f216d34e01340199a402c4806cab9f59bc5168b493be16c48b19cdf9cd
 DIST ufraw-0.13.tar.gz 662029 RMD160 307053386aedb49b932b5dd098f6deb988d6c628 SHA1 880c21f79074836d6b40e42343c85a14fe0ba65f SHA256 e2beb90c96e419631b4b7d89ea5eb587a714cf26cde7cc3df42d261fa1a343b1
+EBUILD ufraw-0.13-r1.ebuild 1288 RMD160 b0c881d5ff326c1608d06baec57aa51bc0ad6523 SHA1 6a1e6e0f7c13c45aa1ac47b646e2199be46d4615 SHA256 6cd309c20e77420121e1e23e333a7bfcb383ddcd09ba7751547439e77ac7e2c9
 EBUILD ufraw-0.13.ebuild 1315 RMD160 1edd91fa76d11e0a419f5af806f0102d89b06aef SHA1 d7329167d6b756891e5f8491ba25c7f26e680778 SHA256 d78276f37eb7b66581e0614cb37add8decf84e8c6daf7668dc354b79851245dc
-MISC ChangeLog 3566 RMD160 70d004fea998fea943c0211a184aef66b191990f SHA1 276761362c0a74b7aab8c8ada4c04fecc457ed18 SHA256 fa68c3abe82b96d2a51e5c12f4a7653ab2ef7abe5f169360d6d7fc235e1f0517
+MISC ChangeLog 3790 RMD160 d36674f7ae58a00923bb8ad23046bc76fcf4580f SHA1 514a55618b01d909e0d4607ac531828e92b8ea81 SHA256 44645dc433ce488c052ae90532110e97fedd7e841d2c8f89b41e1f4db36071f8
 MISC metadata.xml 162 RMD160 724f25e8bd2d17056a9f820449e0ddc858f31cce SHA1 620b205b2cddc55f63199267eeb30e9f4c6a817b SHA256 7cccbeab15ef93a962010750e32971ffff1226321adc83df7ff572dea8ff63c2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjSqbIACgkQkKaRLQcq0GIZzQCfX7iIovndrW9kvmyv2oW1saro
+OncAnRjK/oaJCVF3fJWh0bly02HvxNK1
+=ZqxV
+-----END PGP SIGNATURE-----
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
+}