diff options
| -rw-r--r-- | media-video/mjpegtools/ChangeLog | 9 | ||||
| -rw-r--r-- | media-video/mjpegtools/Manifest | 5 | ||||
| -rw-r--r-- | media-video/mjpegtools/files/digest-mjpegtools-1.6.1.90-r1 | 1 | ||||
| -rw-r--r-- | media-video/mjpegtools/files/no-x11-lib.patch | 11 | ||||
| -rw-r--r-- | media-video/mjpegtools/mjpegtools-1.6.1.90-r1.ebuild | 62 |
5 files changed, 86 insertions, 2 deletions
diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog index 19aec94ac162..5b4b9fa028b3 100644 --- a/media-video/mjpegtools/ChangeLog +++ b/media-video/mjpegtools/ChangeLog @@ -1,6 +1,13 @@ # 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.35 2003/09/19 16:48:42 max Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.36 2003/09/19 23:23:18 max Exp $ + +*mjpegtools-1.6.1.90-r1 (19 Sep 2003) + + 19 Sep 2003; Max Kalika <max@gentoo.org> mjpegtools-1.6.1.90-r1.ebuild, + files/no-x11-lib.patch: + Remove dangling -lX11. Fixes bug 29070. Thanks to Christian Jiresjö for the + patch 19 Sep 2003; Max Kalika <max@gentoo.org> mjpegtools-1.6.1.90.ebuild: Less aggressive flag filtering. diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest index d59521c6ac8c..a4b0a45319e7 100644 --- a/media-video/mjpegtools/Manifest +++ b/media-video/mjpegtools/Manifest @@ -1,9 +1,12 @@ +MD5 4971c97bb453b4a8f94887446572c7c3 mjpegtools-1.6.1.90-r1.ebuild 1562 MD5 ac487ddde6a6af1ed6db4527dcde1e6f mjpegtools-1.6.0-r7.ebuild 2918 MD5 2c0240b93bb5f7730675b409594e0bc0 mjpegtools-1.6.1.90.ebuild 1476 -MD5 9e3565f6b4e2aab03f783579a4750dcf ChangeLog 6629 +MD5 1cd7c01861529ba1880ae7e52b8e75b1 ChangeLog 6855 MD5 c9bb82e3c4de92ad8ed6ce7470250e6b metadata.xml 180 MD5 9fa67243454e797c061ddd4facf262cc mjpegtools-1.6.1.ebuild 2413 +MD5 0a37dfb174825ed9a9aeee24b8e3da84 files/digest-mjpegtools-1.6.1.90-r1 72 MD5 4a594198579130cfe453fffb532b2aef files/digest-mjpegtools-1.6.1 147 MD5 961944a5d3c12bdac7baf7d12ea995d7 files/digest-mjpegtools-1.6.0-r7 147 MD5 0a37dfb174825ed9a9aeee24b8e3da84 files/digest-mjpegtools-1.6.1.90 72 +MD5 81c49bb48a8d8e3ea4eb360811c01f67 files/no-x11-lib.patch 497 MD5 94b45a7608327840f696deb03ebc5ffc files/1.6.0-r7-ppc.patch 443 diff --git a/media-video/mjpegtools/files/digest-mjpegtools-1.6.1.90-r1 b/media-video/mjpegtools/files/digest-mjpegtools-1.6.1.90-r1 new file mode 100644 index 000000000000..5f401da864e9 --- /dev/null +++ b/media-video/mjpegtools/files/digest-mjpegtools-1.6.1.90-r1 @@ -0,0 +1 @@ +MD5 a903c49ee5902710b8e44bd6c0f4b38e mjpegtools-1.6.1.90.tar.gz 1168921 diff --git a/media-video/mjpegtools/files/no-x11-lib.patch b/media-video/mjpegtools/files/no-x11-lib.patch new file mode 100644 index 000000000000..27089e0e2217 --- /dev/null +++ b/media-video/mjpegtools/files/no-x11-lib.patch @@ -0,0 +1,11 @@ +--- mjpegtools-1.6.1.90/lavtools/Makefile.in.old 2003-08-23 14:21:53.000000000 +0000 ++++ mjpegtools-1.6.1.90/lavtools/Makefile.in 2003-09-19 09:03:15.000000000 +0000 +@@ -235,7 +235,7 @@ + lavplay_SOURCES = lavplay.c ${lav_headers} + lavplay_LDADD = $(top_builddir)/utils/libmjpegutils.a \ + liblavplay.la liblavjpeg.la liblavfile.la \ +- @LIBGETOPT_LIB@ ${PTHREAD_LIBS} ${SDL_LIBS} ${X_LIBS} -lX11 ++ @LIBGETOPT_LIB@ ${PTHREAD_LIBS} ${SDL_LIBS} ${X_LIBS} + + + lavrec_SOURCES = lavrec.c $(lav_headers) diff --git a/media-video/mjpegtools/mjpegtools-1.6.1.90-r1.ebuild b/media-video/mjpegtools/mjpegtools-1.6.1.90-r1.ebuild new file mode 100644 index 000000000000..0b52899da6e8 --- /dev/null +++ b/media-video/mjpegtools/mjpegtools-1.6.1.90-r1.ebuild @@ -0,0 +1,62 @@ +# 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.1.90-r1.ebuild,v 1.1 2003/09/19 23:23:18 max Exp $ + +inherit flag-o-matic + +DESCRIPTION="Tools for MJPEG video." +HOMEPAGE="http://mjpeg.sourceforge.net/" +SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz" + +LICENSE="as-is" +SLOT="0" +KEYWORDS="x86 -ppc" +IUSE="gtk avi dv quicktime sdl X 3dnow mmx sse" + +DEPEND="media-libs/jpeg + >=sys-apps/sed-4 + =dev-libs/glib-1.2* + x86? ( media-libs/libmovtar ) + mmx? ( >=media-libs/jpeg-mmx-1.1.2-r1 dev-lang/nasm ) + 3dnow? ( dev-lang/nasm ) + sse? ( dev-lang/nasm ) + gtk? ( =x11-libs/gtk+-1.2* ) + avi? ( >=media-video/avifile-0.7.38 ) + dv? ( >=media-libs/libdv-0.99 ) + quicktime? ( virtual/quicktime ) + sdl? ( media-libs/libsdl ) + X? ( x11-base/xfree )" + +src_unpack() { + unpack ${A} && cd "${S}" + epatch "${FILESDIR}/no-x11-lib.patch" +} + +src_compile() { + local myconf + + replace-flags "-march=pentium4" "-march=pentium3" + filter-flags "-mfpmath=sse" + + myconf="${myconf} `use_with X x`" + myconf="${myconf} `use_with quicktime`" + myconf="${myconf} `use_enable x86 cmov-extensions`" + + if [ "`use dv`" ] ; then + myconf="${myconf} --with-dv=/usr" + fi + if [ "`use mmx`" -o "`use 3dnow`" -o "`use sse`" ] ; then + myconf="${myconf} --enable-simd-accel" + fi + if [ "`use mmx`" ] ; then + myconf="${myconf} --with-jpeg-mmx=/usr/include/jpeg-mmx" + fi + + econf ${myconf} + emake || die "compile problem" +} + +src_install() { + einstall + dodoc mjpeg_howto.txt +} |