Fixed bug 11163.

3 files changed, 118 insertions, 10 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index 380f4a102042..0ce0e300838f 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,19 +1,24 @@
 # ChangeLog for media-video/mjpegtools
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.10 2002/11/20 01:51:50 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.11 2002/11/25 14:53:42 phoenix Exp $
 
 *mjpegtools-1.6.0-r5 (d1814 Nov 2002)
 
+  25 Nov 2002; phoen][x <phoenix@gentoo.org>  mjpegtools-1.6.0-r5 :
+  Fixed a really evil bug which caused mjpegtools to fail in lavtools/
+  when merged with USE="quicktime" - the problem comes down to this:
+  lav_common.c and lav_io.c both use "dv_decoder_new(0,0,0);" which is
+  wrong because dv_decoder_new() doesn't take any arguments. I used sed
+  to work around that - it should work flawlessy now. This fixes bug #11163.
+
   14 Nov 2002; Matthew Kennedy <mkennedy@gentoo.org>
   mjpegtools-1.6.0-r5.ebuild files/digest-mjpegtools-1.6.0-r5, ChangeLog : 
-
   Filter compiler flags. Resolves bug #10962
 
 *mjpegtools-1.6.0-r4 (14 Nov 2002)
 
   14 Nov 2002; Seemant Kulleen <seemant@gentoo.org>
   mjpegtools-1.6.0-r4.ebuild files/digest-mjpegtools-1.6.0-r4 :
-
   Added avifile as a dependency (based on "avi" USE flag), so that it
   installs lav2divx utilities as well. Closes bug #10516 by
   ajacoutot@lphp.org (ajacoutot)
@@ -21,12 +26,10 @@
 *mjpegtools-1.6.0-r3 (26 Jul 2002)
 
   30 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
-
   Add missing deps on libdv and arts (tha latter one is optional); see
   bug #7081.
 
   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.
 
@@ -39,7 +42,6 @@
 
   30 May 2002; Seemant Kulleen <seemant@gentoo.org>
   mjpegtools-1.6.0-r1.ebuild files/digest-mjpegtools-1.6.0-r1 :
-
   Fixed some dependency information, thanks to: aliz@telia.com (Daniel
   Ahlberg) in bug #3108
 
@@ -47,7 +49,6 @@
 
   26 May 2002; Seemant Kulleen <seemant@gentoo.org> mjpegtools-1.6.0.ebuild
   files/digest-mjpegtools-1.6.0 :
-
   Version bump to newest stable
 
 *mjpegtools-1.5.20011611-r2 (12 Apr 2002)
@@ -58,14 +59,12 @@
 
   12 Apr 2002; Seemant Kulleen <seemant@gentoo.org> 
   mjpegtools-1.5.20011611-r1.ebuild :
-
   Changed avifile USE flag to avi USE flag instead and cleaned up ebuild
   a little.
 
 *mjpegtools-1.5.20011611-r1 (1 Feb 2002)
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
+  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :  
   Added initial ChangeLog which should be updated whenever the package is
   updated in any way. This changelog is targetted to users. This means that the
   comments should well explained and written in clean English. The details about
diff --git a/media-video/mjpegtools/files/digest-mjpegtools-1.6.0-r6 b/media-video/mjpegtools/files/digest-mjpegtools-1.6.0-r6
new file mode 100644
index 000000000000..e262f9879cee
--- /dev/null
+++ b/media-video/mjpegtools/files/digest-mjpegtools-1.6.0-r6
@@ -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-r6.ebuild b/media-video/mjpegtools/mjpegtools-1.6.0-r6.ebuild
new file mode 100644
index 000000000000..6c3259bcd918
--- /dev/null
+++ b/media-video/mjpegtools/mjpegtools-1.6.0-r6.ebuild
@@ -0,0 +1,107 @@
+# 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-r6.ebuild,v 1.1 2002/11/25 14:53:42 phoenix Exp $
+
+IUSE="sse arts gtk mmx sdl X quicktime 3dnow avi"
+
+inherit libtool flag-o-matic base
+
+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 )
+	media-libs/libdv
+	arts? ( kde-base/arts )"
+
+DEPEND="${RDEPEND}
+	media-libs/libmovtar
+	avi? ( media-video/avifile )
+	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 )
+	media-libs/libdv
+	arts? ( kde-base/arts )"
+
+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() {
+	base_src_unpack
+	if [ ! -z "`use quicktime`" ] ; 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
+		cp jpeg_old.h jpeg_old.h.orig
+		sed -e "s:\"jpeg/jpeglib.h\":<jpeglib.h>:" jpeg_old.h.orig > jpeg_old.h
+		elibtoolize
+
+		# Don't remove this - contact phoen][x <phoenix@gentoo.org> if you have problems with it.
+		cd ${S}/lavtools
+		mv lav_common.c lav_common.c.old
+		mv lav_io.c lav_io.c.old
+		sed -e "s/dv_decoder_new(0,0,0)\;/dv_decoder_new()\;/" lav_common.c.old > lav_common.c
+		sed -e "s/dv_decoder_new(0,0,0)\;/dv_decoder_new()\;/" lav_io.c.old > lav_io.c
+	fi
+}
+
+src_compile() {
+
+	local myconf
+
+	replace-flags "-march=pentium4" "-march=i686"
+	replace-flags "-march=athlon*" "-march=i686"
+
+	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"
+	
+	if [ ! -z "`use quicktime`" ] ; then
+		einfo "Building quicktime4linux"
+		myconf="${myconf} --with-quicktime=${WORKDIR}/quicktime4linux-1.4-patch"
+		cd ${WORKDIR}/quicktime4linux-1.4-patch
+		./configure || die
+		make || die
+		einfo "Building mjpegtools"
+	fi
+
+	cd ${S}
+	econf ${myconf} || die
+	emake || die
+
+}
+
+src_install () {
+
+	einstall || die
+
+	dodoc mjpeg_howto.txt
+
+}