diff options
| author |   Aron Griffis <agriffis@gentoo.org> | 2003-02-21 20:41:44 +0000 |
|---|---|---|
| committer | Aron Griffis <agriffis@gentoo.org> | 2003-02-21 20:41:44 +0000 |
| commit | 8ef340fef81ec5ebd1165d68c2751b71a4000db4 (patch) | |
| tree | dee39ba229c1fb641b4c106c4fbbd087c07b8570 /media-video/mjpegtools | |
| parent | bump (diff) | |
| download | gentoo-2-8ef340fef81ec5ebd1165d68c2751b71a4000db4.tar.gz gentoo-2-8ef340fef81ec5ebd1165d68c2751b71a4000db4.tar.bz2 gentoo-2-8ef340fef81ec5ebd1165d68c2751b71a4000db4.zip | |
stable on alpha
Diffstat (limited to 'media-video/mjpegtools')
| -rw-r--r-- | media-video/mjpegtools/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/mjpegtools/mjpegtools-1.6.0-r7.ebuild | 24 |
2 files changed, 22 insertions, 8 deletions
diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog index 752bf0792561..7abdcc249ded 100644 --- a/media-video/mjpegtools/ChangeLog +++ b/media-video/mjpegtools/ChangeLog @@ -1,6 +1,6 @@ # ChangeLog for media-video/mjpegtools # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.19 2003/02/20 21:59:51 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.20 2003/02/21 20:41:44 agriffis Exp $ *mjpegtools-1.6.1 (09 Feb 2003) @@ -10,6 +10,10 @@ *mjpegtools-1.6.0-r7 (27 Dec 2002) + 21 Feb 2003; Aron Griffis <agriffis@gentoo.org> mjpegtools-1.6.0-r7.ebuild : + Disable quicktime support on alpha, where it doesn't build. + Mark stable on alpha in support of Gnome 2.2. + 20 Feb 2003; Aron Griffis <agriffis@gentoo.org> mjpegtools-1.6.0-r7.ebuild : Make svgalib dependent on USE=svga. This isn't really the best fix because it's actually libsdl that depends on svgalib, but it diff --git a/media-video/mjpegtools/mjpegtools-1.6.0-r7.ebuild b/media-video/mjpegtools/mjpegtools-1.6.0-r7.ebuild index 931c39a13bad..a187b8283f84 100644 --- a/media-video/mjpegtools/mjpegtools-1.6.0-r7.ebuild +++ b/media-video/mjpegtools/mjpegtools-1.6.0-r7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.0-r7.ebuild,v 1.6 2003/02/20 21:59:51 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.0-r7.ebuild,v 1.7 2003/02/21 20:41:44 agriffis Exp $ IUSE="sse arts gtk mmx sdl X quicktime 3dnow avi svga" @@ -8,13 +8,23 @@ inherit libtool flag-o-matic base S="${WORKDIR}/${P}" DESCRIPTION="Tools for MJPEG video" -SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz - quicktime? ( http://download.sourceforge.net/mjpeg/quicktime4linux-1.4-patched.tar.gz )" HOMEPAGE="http://mjpeg.sourceforge.net/" +# Portage currently chokes on the following nested conditional. +# SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz +# quicktime? ( !alpha? ( +# mirror://sourceforge/mjpeg/quicktime4linux-1.4-patched.tar.gz +# ) )" +if [ "$ARCH" = alpha ]; then + SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz" +else + SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz + quicktime? ( http://download.sourceforge.net/mjpeg/quicktime4linux-1.4-patched.tar.gz )" +fi + LICENSE="as-is" SLOT="1" -KEYWORDS="x86 ~ppc ~alpha" +KEYWORDS="x86 ~ppc alpha" RDEPEND="media-libs/jpeg media-libs/libpng @@ -27,7 +37,7 @@ RDEPEND="media-libs/jpeg DEPEND="${RDEPEND} x86? ( media-libs/libmovtar ) avi? ( media-video/avifile ) - quicktime? ( >=media-libs/quicktime4linux-1.5.5-r1 ) + quicktime? ( !alpha? ( >=media-libs/quicktime4linux-1.5.5-r1 ) ) mmx? ( >=media-libs/jpeg-mmx-1.1.2-r1 ) mmx? ( dev-lang/nasm ) 3dnow? ( dev-lang/nasm ) @@ -40,7 +50,7 @@ DEPEND="${RDEPEND} src_unpack() { base_src_unpack - if use quicktime; then + if use quicktime && ! use alpha; then cd ${WORKDIR}/quicktime4linux-1.4-patch cp libmjpeg.h libmjpeg.h.orig sed -e "s:\"jpeg/jpeglib.h\":<jpeglib.h>:" libmjpeg.h.orig > libmjpeg.h @@ -82,7 +92,7 @@ src_compile() { use avi \ || myconf="${myconf} --without-aviplay" - if use quicktime; then + if use quicktime && ! use alpha; then einfo "Building quicktime4linux" myconf="${myconf} --with-quicktime=${WORKDIR}/quicktime4linux-1.4-patch" |