diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-04-01 09:48:15 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-04-01 09:48:15 +0000 |
| commit | ff390f1393325f6524ca61f3d5d04db6ed0d31bf (patch) | |
| tree | bd2156622a979383acf0d0995689b9fc2c408aa4 /media-video/mjpegtools | |
| parent | Drop frei0r option that is availible only in trunk. (diff) | |
| download | gentoo-2-ff390f1393325f6524ca61f3d5d04db6ed0d31bf.tar.gz gentoo-2-ff390f1393325f6524ca61f3d5d04db6ed0d31bf.tar.bz2 gentoo-2-ff390f1393325f6524ca61f3d5d04db6ed0d31bf.zip | |
punt USE="X" since it's not really optional, has failed to build since 2009
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)
Diffstat (limited to 'media-video/mjpegtools')
| -rw-r--r-- | media-video/mjpegtools/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/mjpegtools/mjpegtools-1.9.0-r1.ebuild | 16 |
2 files changed, 13 insertions, 9 deletions
diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog index a131c423f177..61b571fd9887 100644 --- a/media-video/mjpegtools/ChangeLog +++ b/media-video/mjpegtools/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/mjpegtools # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.151 2011/03/23 08:46:05 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.152 2011/04/01 09:48:15 ssuominen Exp $ + + 01 Apr 2011; Samuli Suominen <ssuominen@gentoo.org> + mjpegtools-1.9.0-r1.ebuild: + Remove USE="X" and always pass --with-x wrt #259461. 23 Mar 2011; Tim Harder <radhermit@gentoo.org> -mjpegtools-1.8.0-r2.ebuild, -files/mjpegtools-1.8.0-as-needed.patch, diff --git a/media-video/mjpegtools/mjpegtools-1.9.0-r1.ebuild b/media-video/mjpegtools/mjpegtools-1.9.0-r1.ebuild index 01a9e16b0a58..b3648f836fd9 100644 --- a/media-video/mjpegtools/mjpegtools-1.9.0-r1.ebuild +++ b/media-video/mjpegtools/mjpegtools-1.9.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.9.0-r1.ebuild,v 1.8 2011/03/15 22:32:44 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.9.0-r1.ebuild,v 1.9 2011/04/01 09:48:15 ssuominen Exp $ EAPI="1" @@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/mjpeg/${MY_P}.tar.gz" LICENSE="as-is" SLOT="1" KEYWORDS="alpha amd64 ppc ppc64 sparc x86" -IUSE="gtk dv quicktime sdl X yv12 v4l dga png mmx" +IUSE="gtk dv quicktime sdl yv12 v4l dga png mmx" RDEPEND="virtual/jpeg gtk? ( x11-libs/gtk+:2 ) @@ -23,8 +23,8 @@ RDEPEND="virtual/jpeg quicktime? ( media-libs/libquicktime ) png? ( media-libs/libpng ) sdl? ( >=media-libs/libsdl-1.2.7-r3 ) - X? ( x11-libs/libX11 - x11-libs/libXt )" + x11-libs/libX11 + x11-libs/libXt" DEPEND="${RDEPEND} mmx? ( dev-lang/nasm ) @@ -55,7 +55,7 @@ src_compile() { append-flags -fno-strict-aliasing econf \ - $(use_with X x) \ + --with-x \ $(use_enable dga xfree-ext) \ $(use_with quicktime libquicktime) \ $(use_with png libpng) \ @@ -66,9 +66,9 @@ src_compile() { $(use_enable mmx simd-accel) \ --enable-largefile \ --without-jpeg-mmx \ - ${myconf} || die "configure failed" + ${myconf} - emake || die "emake failed" + emake || die cd docs local infofile @@ -81,7 +81,7 @@ src_compile() { } src_install() { - einstall || die "install failed" + einstall || die dodoc mjpeg_howto.txt README* PLANS NEWS TODO HINTS BUGS ChangeLog \ AUTHORS CHANGES } |