added a patch to fix #78404. thanks to Kevin F. Quinn <co@kevquinn.com> and Ned Ludd <solar@gentoo.org>

(Portage version: 2.0.51.19)

4 files changed, 132 insertions, 12 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index 3e23c1e1be51..1e8c62fd5ea8 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/mjpegtools
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.85 2005/04/16 12:55:34 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.86 2005/04/17 20:56:29 luckyduck Exp $
+
+*mjpegtools-1.6.2-r4 (17 Apr 2005)
+
+  17 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +mjpegtools-1.6.2-r4.ebuild:
+  added a patch to fix #78404. thanks to Kevin F. Quinn <co@kevquinn.com> and
+  Ned Ludd <solar@gentoo.org>
 
   16 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
   +files/mjpegtools-1.6.2-libquicktime094.patch, mjpegtools-1.6.2-r3.ebuild:
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index 28b17b56c7cc..f64016d910bc 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -1,8 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 67d90001abdcce65169e7fbe4cdba366 mjpegtools-1.6.2-r4.ebuild 3301
 MD5 67c0df39b977e2d13b66589bd43a78f2 mjpegtools-1.6.2-r3.ebuild 3522
-MD5 106518da15bb1110e029bb4a57134c7d ChangeLog 15644
+MD5 efd84b99a15bbdfe316acd3420245bc1 ChangeLog 15872
 MD5 fe49014257499366bdc6903a9aa33fe5 metadata.xml 311
 MD5 39b5dadaf6e522165490f099d98b954c files/mjpegtools-1.6.2-dv.patch 634
 MD5 a4cae44ea5989aed95d7b8d84aaf0af4 files/mjpegtools-1.6.2-fPIC.patch 9945
@@ -13,11 +11,5 @@ MD5 ff67ff91c5a8ae610b882510d8d9f43c files/mjpegtools-1.6.2-libquicktime094.patc
 MD5 cbcc90f9de3aaf0ac12aa6bd1c4db025 files/no-x11-lib-2.patch 469
 MD5 d67f97f3bd586946968fca9b8d31be85 files/mjpegtools-1.6.2-gcc34.patch 1601
 MD5 7c88ea787d22b8ec25b68478d037151e files/digest-mjpegtools-1.6.2-r3 135
+MD5 0d8b5844ab88ae9b60a7785572273347 files/digest-mjpegtools-1.6.2-r4 213
 MD5 1b2c526400f0a0f1e0c150c6ff42e8c6 files/mjpegtools-1.6.2-configure.patch 2592
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCYQtr06ebR+OMO78RAhcOAJ9at1VovL+cV3BZGqDO5hIZVp0pgwCcCgNc
-U/6AR+bbeF76bD3ndIiJ/Uk=
-=0E+J
------END PGP SIGNATURE-----
diff --git a/media-video/mjpegtools/files/digest-mjpegtools-1.6.2-r4 b/media-video/mjpegtools/files/digest-mjpegtools-1.6.2-r4
new file mode 100644
index 000000000000..55d19381f2ea
--- /dev/null
+++ b/media-video/mjpegtools/files/digest-mjpegtools-1.6.2-r4
@@ -0,0 +1,3 @@
+MD5 01c0120b0182de67f182ef99ad855daa mjpegtools-1.6.2.tar.gz 1256280
+MD5 cd55f55ddd646eb79d4e4df99d4c777f mjpegtools-m4-1.tar.bz2 4547
+MD5 9b80377667257536e0870cf7fffd506f mjpegtools-1.6.2-mmx-fPIC.patch.bz2 3065
diff --git a/media-video/mjpegtools/mjpegtools-1.6.2-r4.ebuild b/media-video/mjpegtools/mjpegtools-1.6.2-r4.ebuild
new file mode 100644
index 000000000000..703a16167797
--- /dev/null
+++ b/media-video/mjpegtools/mjpegtools-1.6.2-r4.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.2-r4.ebuild,v 1.1 2005/04/17 20:56:29 luckyduck Exp $
+
+inherit flag-o-matic gcc eutils
+
+M4V="1"
+
+DESCRIPTION="Tools for MJPEG video"
+HOMEPAGE="http://mjpeg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz
+	mirror://gentoo/${PN}-m4-${M4V}.tar.bz2
+	http://dev.gentoo.org/~luckyduck/patches/${P}-mmx-fPIC.patch.bz2"
+
+LICENSE="as-is"
+SLOT="1"
+KEYWORDS="~x86 ~ppc ~amd64 ~sparc ~ppc64"
+IUSE="gtk avi dv quicktime sdl X yv12 3dnow mmx sse v4l dga"
+
+RDEPEND="media-libs/jpeg
+	x86? ( media-libs/libmovtar
+		mmx? ( >=media-libs/jpeg-mmx-1.1.2-r1 )
+	)
+	gtk? ( =x11-libs/gtk+-1.2*
+		=dev-libs/glib-1.2* )
+	avi? ( media-video/avifile )
+	dv? ( >=media-libs/libdv-0.99 )
+	quicktime? ( virtual/quicktime )
+	sdl? ( >=media-libs/libsdl-1.2.7-r3 )
+	X? ( virtual/x11 )"
+
+DEPEND="${RDEPEND}
+	x86? ( mmx? ( dev-lang/nasm )
+		3dnow? ( dev-lang/nasm )
+		sse? ( dev-lang/nasm )
+		)
+	>=sys-apps/sed-4
+	sys-devel/autoconf
+	=sys-devel/automake-1.5*"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+
+	epatch ${FILESDIR}/${P}-configure.patch
+	epatch ${FILESDIR}/${P}-fPIC.patch
+	epatch ${FILESDIR}/${P}-gcc34.patch
+	epatch ${FILESDIR}/${P}-libquicktime094.patch
+	epatch ${WORKDIR}/${P}-mmx-fPIC.patch
+
+	if use ppc; then
+		# Fix an error in the detection of the altivec-support
+		# in the compiler
+		epatch "${FILESDIR}/altivec-fix-${PV}.patch"
+		sed -i -e 's:-O3::' configure.in
+		#Worst workaround ever...
+		sed -i -e "s/const vector signed short/vector signed short/g" \
+			${S}/utils/altivec/fdct_idct.c
+	fi
+
+	libtoolize --copy --force
+	ACLOCAL="aclocal -I ${WORKDIR}/m4" autoreconf || die
+
+	use X || epatch "${FILESDIR}/no-x11-lib-2.patch"
+}
+
+src_compile() {
+	local myconf
+
+	if use yv12 && use dv; then
+		myconf="${myconf} --with-dv-yv12"
+	elif use yv12; then
+		ewarn "yv12 support is possible when 'dv' is in your USE flags."
+	fi
+
+	# This could be changed to allow building on g/fbsd in the future.
+	if use x86; then
+		if use mmx || use 3dnow || use sse; then
+			myconf="${myconf} --enable-simd-accel"
+		fi
+		if use mmx; then
+			myconf="${myconf} --with-jpeg-mmx=/usr/include/jpeg-mmx"
+		fi
+
+		if [[ ${CHOST/i686/} != ${CHOST} ]] || [[ ${CHOST/x86_64/} != ${CHOST} ]]; then
+			myconf="${myconf} --enable-cmov-extension"
+		fi
+
+		[[ $(gcc-major-version) -eq 3 ]] && append-flags -mno-sse2
+	fi
+
+	econf \
+		$(use_with X x) \
+		$(use_enable dga xfree-ext) \
+		$(use_with quicktime) \
+		$(use_with v4l) \
+		$(use_with gtk) \
+		$(use_with sdl) \
+		$(use_with dv dv /usr) \
+		--enable-largefile \
+		${myconf} || die "configure failed"
+
+	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" -j1 || die "emake failed"
+	cd docs
+	local infofile
+	for infofile in mjpeg*info*; do
+		echo "INFO-DIR-SECTION Miscellaneous" >> ${infofile}
+		echo "START-INFO-DIR-ENTRY" >> ${infofile}
+		echo "* mjpeg-howto: (mjpeg-howto).                  How to use the mjpeg-tools" >> ${infofile}
+		echo "END-INFO-DIR-ENTRY" >> ${infofile}
+	done
+}
+
+src_install() {
+	einstall || die "install failed"
+	dodoc mjpeg_howto.txt README PLANS NEWS README.AltiVec README.avilib \
+		README.DV README.glav README.lavpipe README.transist TODO \
+		HINTS BUGS ChangeLog AUTHORS CHANGES
+}