Makes mjpegtools compile with quicktime support, added optimizations

3 files changed, 101 insertions, 1 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index bc1940f498f6..770c2419cc7d 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,9 +1,16 @@
 # ChangeLog for media-video/mjpegtools
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.6 2002/07/08 04:20:42 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.7 2002/07/26 12:48:15 aliz Exp $
 
+*mjpegtools-1.6.0-r3 (26 Jul 2002)
+
+  26 Jul 2002; Daniel AHlberg <aliz@gentoo.org> mjpegtools-1.6.0-r3.ebuild :
+
+  Closes #4702. Also added nasm to dependancy list (if 3dnow, sse or mmx are in USE)
+  to make mjpegtools more optimized.
 
 *mjpegtools-1.6.0-r2 (08 Jul 2002)
+
   08 Jul 2002; Spider <spider@gentoo.org> mjpegtools-1.6.0-r2.ebuild :
   fixed remnants of ${D} in .la files
   
diff --git a/media-video/mjpegtools/files/digest-mjpegtools-1.6.0-r3 b/media-video/mjpegtools/files/digest-mjpegtools-1.6.0-r3
new file mode 100644
index 000000000000..e262f9879cee
--- /dev/null
+++ b/media-video/mjpegtools/files/digest-mjpegtools-1.6.0-r3
@@ -0,0 +1,2 @@
+MD5 cb34077cc3460494bc3759e3655e5263 mjpegtools-1.6.0.tar.gz 928991
+MD5 963b168854e8f74590c71aaaaedf5177 quicktime4linux-1.4-patched.tar.gz 560533
diff --git a/media-video/mjpegtools/mjpegtools-1.6.0-r3.ebuild b/media-video/mjpegtools/mjpegtools-1.6.0-r3.ebuild
new file mode 100644
index 000000000000..30e41dd42621
--- /dev/null
+++ b/media-video/mjpegtools/mjpegtools-1.6.0-r3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2002 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-r3.ebuild,v 1.1 2002/07/26 12:48:15 aliz Exp $
+
+inherit libtool
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Tools for MJPEG video"
+SRC_URI="http://download.sourceforge.net/mjpeg/${P}.tar.gz
+	 quicktime? ( http://download.sourceforge.net/mjpeg/quicktime4linux-1.4-patched.tar.gz )"
+HOMEPAGE="http://mjpeg.sourceforge.net/"
+
+LICENSE="as-is"
+SLOT="1"
+KEYWORDS="x86"
+
+RDEPEND="media-libs/jpeg
+	media-libs/libpng
+	=x11-libs/gtk+-1.2*
+	X? ( x11-base/xfree )
+	sdl? ( media-libs/libsdl )"
+
+DEPEND="${RDEPEND}
+	media-libs/libmovtar
+	quicktime? ( >=media-libs/quicktime4linux-1.5.5-r1 )
+	mmx? ( >=media-libs/jpeg-mmx-1.1.2-r1 )
+	mmx? ( dev-lang/nasm )
+	3dnow? ( dev-lang/nasm )
+	sse? ( dev-lang/nasm )"
+
+if [ `use mmx` ] ; then
+	RDEPEND="$RDEPEND media-libs/jpeg-mmx"
+	DEPEND="$DEPEND media-libs/jpeg-mmx"
+fi
+
+if [ `use mmx` ] || [ `use 3dnow` ] || [ `use sse` ] ; then
+	DEPEND="$DEPEND dev-lang/nasm"
+fi
+
+src_unpack() {
+	
+	unpack ${A}
+	cd quicktime4linux-1.4-patch
+	cp libmjpeg.h libmjpeg.h.orig
+	sed -e "s:\"jpeg/jpeglib.h\":<jpeglib.h>:" libmjpeg.h.orig > libmjpeg.h
+	cp jpeg_old.h jpeg_old.h.orig
+	sed -e "s:\"jpeg/jpeglib.h\":<jpeglib.h>:" jpeg_old.h.orig > jpeg_old.h
+	elibtoolize
+}
+
+src_compile() {
+
+	local myconf
+
+	use gtk	\
+		&& myconf="${myconf} --with-gtk-prefix=/usr"
+	
+	use X	\
+		&& myconf="${myconf} --with-x"	\
+		|| myconf="${myconf} --without-x"
+	
+	use mmx	\
+		&& myconf="${myconf} --with-jpeg-mmx=/usr/include/jpeg-mmx --enable-mmx-accel"
+	
+	use avi	\
+		&& myconf="${myconf} --without-aviplay"
+	
+	use quicktime && ( \
+		myconf="${myconf} --with-quicktime=${WORKDIR}/quicktime4linux-1.4-patch"
+		cd ${WORKDIR}/quicktime4linux-1.4-patch
+		./configure || die
+		make || die
+	)
+
+	cd ${S}
+	econf ${myconf} || die
+
+	emake || die
+
+}
+
+src_install () {
+
+	make 	\
+		prefix=${D}/usr	\
+		mandir=${D}/usr/share/man	\
+		install || die
+
+	dodoc mjpeg_howto.txt
+
+}