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

(closes bug 336114).
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 30 insertions, 6 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/Manifest b/media-libs/tiff/Manifest
index 119ad57c4b2b..da86d2430abd 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -1,7 +1,8 @@
 AUX tiff-3.9.2-CVE-2009-2347.patch 2571 RMD160 142c305b3a1cd9c0f27b482ced15104e82f43a19 SHA1 04c0bb3f6bcfa27e89f00f97c843b2f9d5220ce8 SHA256 27839133f0ddd51b7c5f53e85b7985f68284ab0da4ba589e629fe085be62074b
+AUX tiff-4.0.0_beta6-cr2-bitspersample.patch 547 RMD160 3f6f50c82b5fe0a1f0bfe070cba9958d9321fd6e SHA1 2d352696009f6ac3901984bc70e9dc42a96b6fbc SHA256 5db3d4c5bda216af0a81ff174a2675dc7e64d767d1ba42258735cdbfd99319f1
 DIST tiff-3.9.4.tar.gz 1436968 RMD160 3e0a74b6294297c16fb983ad68056a1dfbbdb1de SHA1 a4e32d55afbbcabd0391a9c89995e8e8a19961de SHA256 67b76d075fb74f7cb32e7e4b217701674755fe6cee0f463b259a753fce691da6
 DIST tiff-4.0.0beta6.tar.gz 1968829 RMD160 deab0908742a309f1b2954f1d1b5e2aaaa3180d0 SHA1 20aabb4d92bd5980a382e8ca53a2e010c7580976 SHA256 de016175742bcdd0cd6f326dd2e7bbc7154437d7bb09976ad4789016065061e6
 EBUILD tiff-3.9.4.ebuild 1516 RMD160 f4e91a52c8b7069d856a76bbd08b73ebdebf9330 SHA1 4d667bc698e93d61d98a32e4202e100e4ad5fc4e SHA256 bc8d2f8823fc4be6eed0d834fa8d5ffa06e7dcc79ce2efc8ac8426f152190f62
-EBUILD tiff-4.0.0_beta6.ebuild 1632 RMD160 6c0ce908d6f934875b4f2d045ae3ebbad54d0bbd SHA1 30a986517731a810eac4b77d6c76b646af9a757b SHA256 8a5486df9d69885b24351e672c09d8cc7d832cd5748478f5429dee46b1bd28c8
-MISC ChangeLog 22191 RMD160 2876d5d85da5f124def593175caab83d8a76da06 SHA1 32e5518351eb7b1eae8d48f316ce52047cee32ad SHA256 ede5b3e52ece3fc8611b2425253e9bfe33e5e2874165cacf23a8b706623e26fb
-MISC metadata.xml 448 RMD160 0419f91f1f20efdc94d3894f6a4fc6471f22d0a1 SHA1 d743d16f4afb124bbe57a45b217b92f71b515f20 SHA256 61b04082cf0ccec1f58146fab271f88e56009277edee28b3f297eafb0562f4c9
+EBUILD tiff-4.0.0_beta6.ebuild 1722 RMD160 b8fd82ec855f5827f0b8c4dbf4921a8d91abd922 SHA1 9ffe9169d94f9029caa8461d736f2bcf5565c670 SHA256 2fb9102952ac57d2eecc73200c4f0d3fabce69173ad2dbbd504611eb53e6b8dd
+MISC ChangeLog 22447 RMD160 f3def150950fbb8e1f4baefc85fa2c1bac19cfa7 SHA1 75cff6c518323dd8ee2bcfee97a3c994ab6625d6 SHA256 bd41594143e7b2f62f0d07ac9c4d77f93b284ca6c94a581d65c3975ae25c57f2
+MISC metadata.xml 533 RMD160 eede53debd9c9ca31faa0e174ec949e9e70a0dd1 SHA1 67cf48a7293e189c318b6bb092ee3895dd6929f1 SHA256 752d077f11f8ecb0f23113af758221605e262a40c40d438c1bf1e9b507332c69
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) \