Added upstream patch for CR2 files and enabled 12/8-bit jpeg compression

(closes bug 336114).
(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 26 insertions, 3 deletions

diff --git a/media-libs/tiff/ChangeLog b/media-libs/tiff/ChangeLog
index 627a05c65ad6..5f2dcf0e4609 100644
--- a/media-libs/tiff/ChangeLog
+++ b/media-libs/tiff/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/tiff
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.162 2010/07/23 20:43:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.163 2010/09/18 18:39:13 nerdboy Exp $
+
+  18 Sep 2010; Steve Arnold <nerdboy@gentoo.org> tiff-4.0.0_beta6.ebuild,
+  +files/tiff-4.0.0_beta6-cr2-bitspersample.patch:
+  Added upstream patch for CR2 files and enabled 12/8-bit jpeg compression
+  (thanks to Reimundo Heluani for submitting the patch).
 
   23 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> tiff-3.9.4.ebuild,
   tiff-4.0.0_beta6.ebuild:
diff --git a/media-libs/tiff/files/tiff-4.0.0_beta6-cr2-bitspersample.patch b/media-libs/tiff/files/tiff-4.0.0_beta6-cr2-bitspersample.patch
new file mode 100644
index 000000000000..a1e45db195ca
--- /dev/null
+++ b/media-libs/tiff/files/tiff-4.0.0_beta6-cr2-bitspersample.patch
@@ -0,0 +1,13 @@
+diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c
+index 64c39fc..60bde82 100644
+--- a/libtiff/tif_dirread.c
++++ b/libtiff/tif_dirread.c
+@@ -2727,7 +2727,7 @@ static enum TIFFReadDirEntryErr TIFFReadDirEntryPersampleShort(TIFF* tif, TIFFDi
+ 	uint16* m;
+ 	uint16* na;
+ 	uint16 nb;
+-	if (direntry->tdir_count!=(uint64)tif->tif_dir.td_samplesperpixel)
++	if (direntry->tdir_count<(uint64)tif->tif_dir.td_samplesperpixel)
+ 		return(TIFFReadDirEntryErrCount);
+ 	err=TIFFReadDirEntryShortArray(tif,direntry,&m);
+ 	if (err!=TIFFReadDirEntryErrOk)
diff --git a/media-libs/tiff/metadata.xml b/media-libs/tiff/metadata.xml
index afea603b688a..fb7496e08948 100644
--- a/media-libs/tiff/metadata.xml
+++ b/media-libs/tiff/metadata.xml
@@ -9,4 +9,7 @@
 </maintainer>
 <longdescription>TIFF image library and tools, mostly for scanner and fax
  support, but also used by GIS and other imaging tools.</longdescription>
+<use>
+  <flag name="12-bit">Add support for 12/8-bit jpeg compression.</flag>
+</use>
 </pkgmetadata>
diff --git a/media-libs/tiff/tiff-4.0.0_beta6.ebuild b/media-libs/tiff/tiff-4.0.0_beta6.ebuild
index e222dfce51b3..dbac48fea663 100644
--- a/media-libs/tiff/tiff-4.0.0_beta6.ebuild
+++ b/media-libs/tiff/tiff-4.0.0_beta6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-4.0.0_beta6.ebuild,v 1.3 2010/07/23 20:43:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-4.0.0_beta6.ebuild,v 1.4 2010/09/18 18:39:13 nerdboy Exp $
 
 EAPI=3
 inherit eutils libtool
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/${MY_P}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cxx jbig jpeg static-libs zlib"
+IUSE="-12-bit +cxx jbig +jpeg static-libs zlib"
 
 DEPEND="jpeg? ( virtual/jpeg )
 	jbig? ( media-libs/jbigkit )
@@ -24,6 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.9.2-CVE-2009-2347.patch
+	epatch "${FILESDIR}"/${P}-cr2-bitspersample.patch
 	elibtoolize
 }
 
@@ -31,6 +32,7 @@ src_configure() {
 	econf \
 		--disable-dependency-tracking \
 		$(use_enable static-libs static) \
+		$(use_enable 12-bit jpeg12) \
 		$(use_enable cxx) \
 		$(use_enable zlib) \
 		$(use_enable jpeg) \