[gentoo-commits] gentoo-x86 commit in media-gfx/xv: ChangeLog xv-3.10a-r15.ebuild

[Joe Peterson (lavajoe)]

lavajoe     08/05/06 22:31:25

  Modified:             ChangeLog
  Added:                xv-3.10a-r15.ebuild
  Log:
  Fix -wait option (bug #149270)
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.90                 media-gfx/xv/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/xv/ChangeLog?rev=1.90&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/xv/ChangeLog?rev=1.90&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/xv/ChangeLog?r1=1.89&r2=1.90

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/xv/ChangeLog,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- ChangeLog	9 Nov 2007 22:32:58 -0000	1.89
+++ ChangeLog	6 May 2008 22:31:25 -0000	1.90
@@ -1,6 +1,12 @@
 # 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.89 2007/11/09 22:32:58 grobian Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/ChangeLog,v 1.90 2008/05/06 22:31:25 lavajoe Exp $
+
+*xv-3.10a-r15 (06 May 2008)
+
+  06 May 2008; Joe Peterson <lavajoe@g.o>
+  +files/xv-3.10a-fix-wait-20070520.patch, +xv-3.10a-r15.ebuild:
+  Fix -wait option (bug #149270)
 
   09 Nov 2007; Fabian Groffen <grobian@g.o> xv-3.10a-r12.ebuild,
   xv-3.10a-r14.ebuild:



1.1                  media-gfx/xv/xv-3.10a-r15.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/xv/xv-3.10a-r15.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/xv/xv-3.10a-r15.ebuild?rev=1.1&content-type=text/plain

Index: xv-3.10a-r15.ebuild
===================================================================
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r15.ebuild,v 1.1 2008/05/06 22:31:25 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="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 ~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

	# Fix -wait option (do not rely on obsolete CLK_TCK)
	epatch "${FILESDIR}/${P}"-fix-wait-${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}" \
			PREFIX=/usr \
			DOCDIR="/usr/share/doc/${P}" \
			LIBDIR="${T}" || die
}

src_install() {
	dodir /usr/bin
	dodir /usr/share/man/man1

	emake	DESTDIR="${D}" \
			PREFIX=/usr \
			DOCDIR="/usr/share/doc/${PF}" \
			LIBDIR="${T}" install || die

	dodoc CHANGELOG BUGS IDEAS
}



-- 
gentoo-commits@l.g.o mailing list