New patch set (20070520), which includes fix for bug #135304

(Portage version: 2.1.3.2)

7 files changed, 178 insertions, 2 deletions

diff --git a/media-gfx/xv/ChangeLog b/media-gfx/xv/ChangeLog
index 51691ebb275f..561d08811fb1 100644
--- a/media-gfx/xv/ChangeLog
+++ b/media-gfx/xv/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/xv
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/ChangeLog,v 1.81 2007/07/22 09:47:08 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/ChangeLog,v 1.82 2007/08/04 17:04:55 lavajoe Exp $
+
+*xv-3.10a-r13 (04 Aug 2007)
+
+  04 Aug 2007; Joe Peterson <lavajoe@gentoo.org>
+  +files/xv-3.10a-disable-jp2k-20070520.patch,
+  +files/xv-3.10a-osx-bsd-20070520.patch,
+  +files/xv-3.10a-vdcomp-osx-20070520.patch, metadata.xml,
+  +xv-3.10a-r13.ebuild:
+  New patch set (20070520), which includes fix for bug #135304
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; xv-3.10a-r12.ebuild:
   Drop virtual/x11 references.
diff --git a/media-gfx/xv/files/digest-xv-3.10a-r13 b/media-gfx/xv/files/digest-xv-3.10a-r13
new file mode 100644
index 000000000000..2694f385921d
--- /dev/null
+++ b/media-gfx/xv/files/digest-xv-3.10a-r13
@@ -0,0 +1,6 @@
+MD5 9fb2d0ec320498105cafeba38a588472 xv-3.10a-jumbo-patches-20070520.tar.gz 1363802
+RMD160 23bc07030416ebaca5ce4d223921e33094c37b93 xv-3.10a-jumbo-patches-20070520.tar.gz 1363802
+SHA256 221ec89fdf0772bd09c845cbb337aecf411a1aee215140b676717f49e9e65c80 xv-3.10a-jumbo-patches-20070520.tar.gz 1363802
+MD5 2d4fbeec1561304362781cc8e2f7f72d xv-3.10a.tar.gz 2259124
+RMD160 7d545e0c0e5b0120a7d026ea549cba19a53fbc0d xv-3.10a.tar.gz 2259124
+SHA256 03eb26b1e8f315c3093f4ae794862ba46637d16c055e8efbe5e3beb5d40fc451 xv-3.10a.tar.gz 2259124
diff --git a/media-gfx/xv/files/xv-3.10a-disable-jp2k-20070520.patch b/media-gfx/xv/files/xv-3.10a-disable-jp2k-20070520.patch
new file mode 100644
index 000000000000..41d30235e5be
--- /dev/null
+++ b/media-gfx/xv/files/xv-3.10a-disable-jp2k-20070520.patch
@@ -0,0 +1,23 @@
+--- Makefile~	2007-06-24 15:41:58 -0600
++++ Makefile	2007-06-24 15:42:43 -0600
+@@ -176,16 +176,16 @@
+ ### if, for whatever reason, you're unable to get the JasPer JPEG-2000 library
+ ### to compile on your machine, *COMMENT OUT* the following lines
+ ###
+-JP2K    = -DDOJP2K
++#JP2K    = -DDOJP2K
+ ###
+ #JP2KDIR = ../../jasper
+-JP2KDIR = /usr/local/lib
++#JP2KDIR = /usr/local/lib
+ ###
+ #JP2KINC = -I$(JP2KDIR)
+-JP2KINC = -I/usr/local/include
++#JP2KINC = -I/usr/local/include
+ ###
+ #JP2KLIB = -L$(JP2KDIR) -ljasper
+-JP2KLIB = $(JP2KDIR)/libjasper.a
++#JP2KLIB = $(JP2KDIR)/libjasper.a
+ 
+ 
+ ###
diff --git a/media-gfx/xv/files/xv-3.10a-osx-bsd-20070520.patch b/media-gfx/xv/files/xv-3.10a-osx-bsd-20070520.patch
new file mode 100644
index 000000000000..59a768ebceb1
--- /dev/null
+++ b/media-gfx/xv/files/xv-3.10a-osx-bsd-20070520.patch
@@ -0,0 +1,38 @@
+--- xv.h~	2007-06-24 14:30:42 -0600
++++ xv.h	2007-06-24 14:42:04 -0600
+@@ -158,7 +158,7 @@
+ 
+ #ifndef VMS
+ #  include <errno.h>
+-#  ifndef __NetBSD__
++#  if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__APPLE__)
+ #    if !(defined __GLIBC__ && __GLIBC__ >= 2)
+        extern int   errno;         /* SHOULD be in errno.h, but often isn't */
+        extern char *sys_errlist[]; /* this too... */
+@@ -171,7 +171,7 @@
+ #ifdef VMS
+ #  define ERRSTR(x) strerror(x, vaxc$errno)
+ #else
+-#  if defined(__BEOS__) || defined(__linux__) /* or all modern/glibc systems? */
++#  if defined(__BEOS__) || defined(__linux__) || defined(__APPLE__) /* or all modern/glibc systems? */
+ #    define ERRSTR(x) strerror(x)
+ #  else
+ #    define ERRSTR(x) sys_errlist[x]
+@@ -206,6 +206,8 @@
+ #ifdef NEED_MALLOC_H
+ #  if defined(hp300) || defined(hp800) || defined(NeXT)
+ #    include <sys/malloc.h>    /* it's in "sys" on HPs and NeXT */
++#  elif defined(__APPLE__)
++#   include <malloc/malloc.h> 
+ #  else
+ #    include <malloc.h>
+ #  endif
+@@ -369,7 +371,7 @@
+  *                them later. */
+ #ifndef VMS       /* VMS hates multi-line definitions */
+ #  if defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__) || \
+-      defined(__bsdi__)
++      defined(__FreeBSD__) || defined(__bsdi__) || defined(__APPLE__)
+ #    ifndef USE_MKSTEMP
+ #      define USE_MKSTEMP       /* use 'mkstemp()' instead of 'mktemp()' */
+ #    endif                      /* >> SECURITY ISSUE << */
diff --git a/media-gfx/xv/files/xv-3.10a-vdcomp-osx-20070520.patch b/media-gfx/xv/files/xv-3.10a-vdcomp-osx-20070520.patch
new file mode 100644
index 000000000000..06e9f8a8d978
--- /dev/null
+++ b/media-gfx/xv/files/xv-3.10a-vdcomp-osx-20070520.patch
@@ -0,0 +1,11 @@
+--- vdcomp.c~	2007-06-24 14:30:42 -0600
++++ vdcomp.c	2007-06-24 14:48:12 -0600
+@@ -123,6 +123,8 @@
+ 
+ #    if defined(hp300) || defined(hp800) || defined(NeXT)
+ #      include <sys/malloc.h>    /* it's in "sys" on HPs and NeXT */
++#    elif defined(__APPLE__)
++#      include <malloc/malloc.h>
+ #    else
+ #      include <malloc.h>        /* FIXME: should explicitly list systems that NEED this, not everyone that doesn't */
+ #    endif
diff --git a/media-gfx/xv/metadata.xml b/media-gfx/xv/metadata.xml
index 99ed8a0c9430..fa0705095167 100644
--- a/media-gfx/xv/metadata.xml
+++ b/media-gfx/xv/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-  <email>taviso@gentoo.org</email>
+  <email>lavajoe@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/media-gfx/xv/xv-3.10a-r13.ebuild b/media-gfx/xv/xv-3.10a-r13.ebuild
new file mode 100644
index 000000000000..29d4dcbc88ab
--- /dev/null
+++ b/media-gfx/xv/xv-3.10a-r13.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r13.ebuild,v 1.1 2007/08/04 17:04:55 lavajoe Exp $
+
+inherit flag-o-matic eutils toolchain-funcs
+
+JUMBOV=20070520
+DESCRIPTION="An interactive image manipulation program for X, supporting a wide variety of image formats"
+HOMEPAGE="http://www.trilon.com/xv/index.html http://www.sonic.net/~roelofs/greg_xv.html"
+#SRC_URI="http://downloads.sourceforge.net/png-mng/${P}-jumbo-patches-${JUMBOV}.tar.gz ftp://ftp.cis.upenn.edu/pub/xv/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/png-mng/${P}-jumbo-patches-${JUMBOV}.tar.gz ftp://ftp.cis.upenn.edu/pub/xv/${P}.tar.gz"
+
+LICENSE="xv"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="jpeg tiff png"
+
+DEPEND="x11-libs/libXt
+	jpeg? ( >=media-libs/jpeg-6b )
+	tiff? ( >=media-libs/tiff-3.6.1-r2 )
+	png? ( >=media-libs/libpng-1.2 >=sys-libs/zlib-1.1.4 )"
+RDEPEND=${DEPEND}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Apply the jumbo patch
+	epatch "${WORKDIR}/${P}"-jumbo-fix-enh-patch-${JUMBOV}.txt
+
+	# OSX and BSD xv.h define patches
+	epatch "${FILESDIR}/${P}"-osx-bsd-${JUMBOV}.patch
+
+	# OSX malloc patch
+	epatch "${FILESDIR}/${P}"-vdcomp-osx-${JUMBOV}.patch
+
+	# Disable JP2K (i.e. use system JPEG libs)
+	epatch "${FILESDIR}/${P}"-disable-jp2k-${JUMBOV}.patch
+
+	sed -i	-e 's/\(^JPEG.*\)/#\1/g' \
+			-e 's/\(^PNG.*\)/#\1/g' \
+			-e 's/\(^TIFF.*\)/#\1/g' \
+			-e 's/\(^LIBS = .*\)/\1 $(LDFLAGS) /g' Makefile
+
+	# /usr/bin/gzip => /bin/gzip
+	sed -i	-e 's#/usr\(/bin/gzip\)#\1#g' config.h
+
+	# fix installation of ps docs.
+	sed -i -e 's#$(DESTDIR)$(LIBDIR)#$(LIBDIR)#g' Makefile
+}
+
+src_compile() {
+	append-flags -DUSE_GETCWD -DLINUX -DUSLEEP
+
+	einfo "Enabling Optional Features..."
+	if use jpeg; then
+		ebegin "	jpeg"
+			append-flags -DDOJPEG
+			append-ldflags -ljpeg
+		eend
+	fi
+	if use png; then
+		ebegin "	png"
+			append-flags -DDOPNG
+			append-ldflags -lz -lpng
+		eend
+	fi
+	if use tiff; then
+		ebegin "	tiff"
+			append-flags -DDOTIFF -DUSE_TILED_TIFF_BOTLEFT_FIX
+			append-ldflags -ltiff
+		eend
+	fi
+	einfo "done."
+
+	emake CC="$(tc-getCC)" CCOPTS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
+}
+
+src_install() {
+	dodir /usr/bin
+	dodir /usr/share/man/man1
+
+	emake	DESTDIR=${D} \
+			BINDIR=/usr/bin \
+			MANDIR=/usr/share/man/man1 \
+			LIBDIR=${T} install || die
+
+	dodoc README{,.jumbo,.pcd} CHANGELOG BUGS IDEAS docs/*.ps docs/*.doc
+}