misc fixes

3 files changed, 115 insertions, 4 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index 1f8855e6e764..a22f038c2a7a 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,14 +1,21 @@
 # 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.12 2002/12/04 03:14:42 nall Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.13 2002/12/27 21:50:08 azarah Exp $
+
+*mjpegtools-1.6.0-r7 (27 Dec 2002)
+
+  27 Dec 2002; Martin Schlemmer <azarah@gentoo.org> mjpegtools-1.6.0-r7.ebuild :
+  Moved elibtoolize to src_compile.  Remove the unneeded 'if then fi' 's for
+  the 'mmx' 'sse' and '3dnow' USE flags in [R]DEPEND, as they are already
+  in [R]DEPEND ...
 
 *mjpegtools-1.6.0-r6 (03 Dec 2002)
 
   03 Dec 2002; Jon Nall <nall@gentoo.org> mjpegtools-1.6.0-r6.ebuild :
-  i didn't create this version. there was no ChangeLog entry for -r6
-  (though i think phoen][x's comment from 25 Nov 2002 refers to -r6. 
+  I didn't create this version. there was no ChangeLog entry for -r6
+  (though i think phoen][x's comment from 25 Nov 2002 refers to -r6.)
   
-  i added ~ppc and made libmovtar mmx-dependent
+  I added ~ppc and made libmovtar mmx-dependent
 
 *mjpegtools-1.6.0-r5 (d1814 Nov 2002)
 
diff --git a/media-video/mjpegtools/files/digest-mjpegtools-1.6.0-r7 b/media-video/mjpegtools/files/digest-mjpegtools-1.6.0-r7
new file mode 100644
index 000000000000..e262f9879cee
--- /dev/null
+++ b/media-video/mjpegtools/files/digest-mjpegtools-1.6.0-r7
@@ -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-r7.ebuild b/media-video/mjpegtools/mjpegtools-1.6.0-r7.ebuild
new file mode 100644
index 000000000000..4a488c63da05
--- /dev/null
+++ b/media-video/mjpegtools/mjpegtools-1.6.0-r7.ebuild
@@ -0,0 +1,102 @@
+# 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-r7.ebuild,v 1.1 2002/12/27 21:50:08 azarah 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 ~ppc"
+
+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}
+	x86? ( 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 )"
+
+
+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
+
+		# 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() {
+	elibtoolize
+
+	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
+		cd ${S}
+	fi
+
+	einfo "Building mjpegtools"
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install() {
+
+	einstall || die
+
+	dodoc mjpeg_howto.txt
+}
+