Updated and rev-bumped to add opengl and X-Windows support (bug #274092)

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 124 insertions, 2 deletions

diff --git a/media-libs/tiff/ChangeLog b/media-libs/tiff/ChangeLog
index 1bf0b4a364bc..e407de88e785 100644
--- a/media-libs/tiff/ChangeLog
+++ b/media-libs/tiff/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/tiff
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.116 2009/05/09 10:55:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.117 2009/06/23 03:14:16 nerdboy Exp $
+
+*tiff-3.8.2-r6 (23 Jun 2009)
+
+  23 Jun 2009; Steve Arnold <nerdboy@gentoo.org>
+  +files/tiff-3.8.2-opengl.patch, +tiff-3.8.2-r6.ebuild:
+  Updated and rev-bumped to add opengl and X-Windows support (bug #274092).
+  Opengl support should be considered somewhat experimental for now...
 
   09 May 2009; Samuli Suominen <ssuominen@gentoo.org>
   -files/tiff-buffer.patch:
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index ef52441e410b..a7b5335f9c39 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -1,9 +1,11 @@
 AUX tiff-3.8.2-CVE-2008-2327.patch 2120 RMD160 0e38bd59939cb6e3602196142e99756de198665e SHA1 1da2ec6a47c0666cad9d07fb8427c1c75ca27b10 SHA256 a63665993ced33869981f052b78549e2cb540dad1302b8b71fcf1c8d4e730ad1
+AUX tiff-3.8.2-opengl.patch 437 RMD160 0302bd531617fc9439aee22b3f2ec1e5d587f6cf SHA1 6c8dbec20d66ae834accc8f50ed7567a33f1fcfc SHA256 b3c112596ff5e4902cfbfa88f34937a9ea0d240f029cc4a55f9f102e6b281f9d
 AUX tiff-3.8.2-tiffsplit.patch 646 RMD160 14633a8b89b71f6c9aa027c25233854331d8633f SHA1 445b7bbdeaadf8362127173a4908f7e5f31ac30d SHA256 79f88d303634d52478fe36fff972aa133d3bf1d23ab4c8ad35d3baba40461a48
 AUX tiff-jbig.patch 14636 RMD160 88f8069cda0e1a897961e2c69e6b787a7776124d SHA1 293c174bd1137c63a85dbfc761616752d2f3644f SHA256 73e70f6cf3e63abfd7b5569e2aae0a6811020c883065dfc36d563ca2e547ccd1
 DIST tiff-3.8.2-pdfsec-patches.tar.bz2 23447 RMD160 4660ab880b3e7c308687f662fcb8dea97e06881a SHA1 1a68c97a039acb2417ca5e0493323854753f12ce SHA256 ef965b26ba9384f4c009aa9762a87d6ddc48269a430a177c4bc36b01d9c1259d
 DIST tiff-3.8.2.tar.gz 1336295 RMD160 1b4d825e3be08764e953fc58246d0c25ab4dd17d SHA1 549e67b6a15b42bfcd72fe17cda7c9a198a393eb SHA256 be88f037080b93ce0a337b2b3ca5e8195f76885deb6c558cc3aa872ee848fc76
 EBUILD tiff-3.8.2-r4.ebuild 1676 RMD160 166ef986e50dcbd5c1ba0cb25c519c7e47ab48c6 SHA1 71a6df2515d9d999c9c5746963e53cc5511b1ae0 SHA256 488a2a035026a7a4d6360e365bd9aadce903f79c830cc21fb6df5e771f8819ac
 EBUILD tiff-3.8.2-r5.ebuild 1697 RMD160 1640ed433b90db09a0f73461bd9ab60f8d7125eb SHA1 18316a2a06723b5b703f51bcb4bbf2d76bd5ffac SHA256 018a51f8681722825c6a49da115b01b43026827e167434e1d2c4786cd642bc51
-MISC ChangeLog 16021 RMD160 7e0db4f4a04e443ec33fe596847d86b3da1f8903 SHA1 ee990a454b073c64e57e53fbe6dc7b7bd092f893 SHA256 55ab5611ec95e36a110a4b12c38bb26dc75c77a7a4cf9ef22e40bbee2a61dd67
+EBUILD tiff-3.8.2-r6.ebuild 2620 RMD160 6154eb428d993ffb641f65a6f0c0095d1be0c8ae SHA1 53d9a97c4fdb4875aa278a873663bf0c3ce105fb SHA256 10592f53f147ee1501c4665137dacf3f36cdedd66e5171735b3ad114d9b794ee
+MISC ChangeLog 16303 RMD160 3cada025773b730e0993bc4c1319dfd0117be920 SHA1 d5de5f5e4c3a9f305ce20e88a08faaa7f538205c SHA256 6d21d02f609f57e225738dedd7645fcc251e71558692deafe845c30f7849a7b2
 MISC metadata.xml 447 RMD160 8df7883ab02a353acd993037450e7bbc984c052d SHA1 8ffef6a88ae70afbdea7f3be25e1e9a28b6698c5 SHA256 ee7391b2521ef9676ead67466ad7249f05f8d3c9bd8d8984bc0ceac8dcb804b3
diff --git a/media-libs/tiff/files/tiff-3.8.2-opengl.patch b/media-libs/tiff/files/tiff-3.8.2-opengl.patch
new file mode 100644
index 000000000000..c743376b4aba
--- /dev/null
+++ b/media-libs/tiff/files/tiff-3.8.2-opengl.patch
@@ -0,0 +1,19 @@
+--- tools/tiffgt.c.orig	2009-06-20 17:40:46.366090451 -0700
++++ tools/tiffgt.c	2009-06-20 17:48:04.042265738 -0700
+@@ -31,12 +31,12 @@
+ #include <string.h>
+ #include <unistd.h>
+ 
+-#if HAVE_APPLE_OPENGL_FRAMEWORK
+-# include <OpenGL/gl.h>
+-# include <GLUT/glut.h>
+-#else
++#ifdef HAVE_APPLE_OPENGL_FRAMEWORK
+ # include <GL/gl.h>
+ # include <GL/glut.h>
++#else
++# include <OpenGL/gl.h>
++# include <GLUT/glut.h>
+ #endif
+ 
+ #include "tiffio.h"
diff --git a/media-libs/tiff/tiff-3.8.2-r6.ebuild b/media-libs/tiff/tiff-3.8.2-r6.ebuild
new file mode 100644
index 000000000000..d2c16df52df9
--- /dev/null
+++ b/media-libs/tiff/tiff-3.8.2-r6.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.8.2-r6.ebuild,v 1.1 2009/06/23 03:14:16 nerdboy Exp $
+
+EAPI="2"
+
+inherit eutils libtool multilib
+
+DESCRIPTION="Library for manipulation of TIFF (Tag Image File Format) images"
+HOMEPAGE="http://www.remotesensing.org/libtiff/"
+SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/${P}.tar.gz
+	mirror://gentoo/${P}-pdfsec-patches.tar.bz2"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="jpeg jbig nocxx opengl zlib"
+
+DEPEND="jpeg? ( >=media-libs/jpeg-6b )
+	jbig? ( >=media-libs/jbigkit-1.6-r1 )
+	zlib? ( >=sys-libs/zlib-1.1.3-r2 )
+	opengl? ( app-admin/eselect-opengl
+		sys-devel/gcc[objc]
+		x11-proto/xproto
+		x11-proto/xcb-proto
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+		x11-proto/glproto )"
+
+RDEPEND="opengl? ( media-libs/mesa
+		x11-libs/libX11
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-libs/libSM
+		x11-libs/libICE
+		x11-libs/libXi
+		x11-libs/libXxf86vm
+		x11-libs/libXext
+		x11-libs/libxcb
+		x11-libs/libXau
+		x11-libs/libXdmcp )"
+
+src_prepare() {
+#	unpack ${A}
+#	cd "${S}"
+	epatch "${WORKDIR}"/${P}-tiff2pdf-20080903.patch
+	epatch "${FILESDIR}"/${P}-tiffsplit.patch
+	use jbig && epatch "${FILESDIR}"/${PN}-jbig.patch
+	epatch "${WORKDIR}"/${P}-goo-sec.patch
+	epatch "${FILESDIR}"/${P}-CVE-2008-2327.patch
+	use opengl && epatch "${FILESDIR}"/${P}-opengl.patch
+	elibtoolize
+
+	if use opengl; then
+		sed -i -e "s|-framework GLUT|-lGLU -lGL -lglut -L/usr/$(get_libdir)|g" \
+			configure || die "sed 2 failed"
+	fi
+}
+
+src_compile() {
+	if use opengl; then
+		myconf="--with-x --with-apple-opengl-framework"
+	else
+		myconf="--without-x"
+	fi
+
+	econf \
+		$(use_enable !nocxx cxx) \
+		$(use_enable zlib) \
+		$(use_enable jpeg) \
+		$(use_enable jbig) \
+		${myconf} --with-pic \
+		--with-docdir=/usr/share/doc/${PF} \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die "make install failed"
+	dodoc README TODO VERSION
+}
+
+pkg_postinst() {
+	echo
+	elog "JBIG support is intended for Hylafax fax compression, so we"
+	elog "really need more feedback in other areas (most testing has"
+	elog "been done with fax).  Be sure to recompile anything linked"
+	elog "against tiff if you rebuild it with jbig support."
+	echo
+	elog "Opengl support also pulls in several X libraries; since it"
+	elog "hasn't been used much recently, it should be considered"
+	elog "somewhat experimental until more testing and feedback."
+	echo
+}