Added fixes for various bugs (#152568, #128404 and #137530).

(Portage version: 2.1.2_rc2)

5 files changed, 217 insertions, 1 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index c0ef92a94e10..8a186061a514 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/mjpegtools
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.122 2006/11/03 16:27:53 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.123 2006/11/19 17:22:56 zzam Exp $
+
+*mjpegtools-1.8.0-r2 (19 Nov 2006)
+
+  19 Nov 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/mjpegtools-1.8.0-fix-lav2mpeg.patch,
+  +files/mjpegtools-1.8.0-lavrec-memleak.patch, +mjpegtools-1.8.0-r2.ebuild:
+  Added fixes for various bugs (#152568, #128404 and #137530).
 
   03 Nov 2006; Matthias Schwarzott <zzam@gentoo.org>
   mjpegtools-1.8.0-r1.ebuild:
diff --git a/media-video/mjpegtools/files/digest-mjpegtools-1.8.0-r2 b/media-video/mjpegtools/files/digest-mjpegtools-1.8.0-r2
new file mode 100644
index 000000000000..8846d158be9f
--- /dev/null
+++ b/media-video/mjpegtools/files/digest-mjpegtools-1.8.0-r2
@@ -0,0 +1,6 @@
+MD5 6fd98362310480bdaf7171e9659f165f mjpegtools-1.8.0.tar.gz 1475998
+RMD160 4d97a6a721f29223975605e2a5e645b4d7d129b5 mjpegtools-1.8.0.tar.gz 1475998
+SHA256 d841575c72cd0e587c1bab703d0906e3d23bf428424000557739cf5d6097209a mjpegtools-1.8.0.tar.gz 1475998
+MD5 cd55f55ddd646eb79d4e4df99d4c777f mjpegtools-m4-1.tar.bz2 4547
+RMD160 b81b89bb6364023606a1d3ca9519e143fe053ab4 mjpegtools-m4-1.tar.bz2 4547
+SHA256 10de1e206ee9c84aae111e95f655ad9394be749bfed01d337f7ff9a983aab522 mjpegtools-m4-1.tar.bz2 4547
diff --git a/media-video/mjpegtools/files/mjpegtools-1.8.0-fix-lav2mpeg.patch b/media-video/mjpegtools/files/mjpegtools-1.8.0-fix-lav2mpeg.patch
new file mode 100644
index 000000000000..ac8afc0b94de
--- /dev/null
+++ b/media-video/mjpegtools/files/mjpegtools-1.8.0-fix-lav2mpeg.patch
@@ -0,0 +1,22 @@
+diff -ru mjpegtools-1.8.0-orig/scripts/lav2mpeg mjpegtools-1.8.0-fixed-lav2mpeg/scripts/lav2mpeg
+--- mjpegtools-1.8.0-orig/scripts/lav2mpeg	2006-11-19 17:11:41.000000000 +0100
++++ mjpegtools-1.8.0-fixed-lav2mpeg/scripts/lav2mpeg	2006-11-19 17:22:21.000000000 +0100
+@@ -267,7 +267,8 @@
+ 
+ # lavinfo should set up video_frames, video_width
+ # video_height, video_inter, video_norm, audio_chans
+-eval $($LAVINFO $@ | grep "=")  # grep for = to remove Warnings
++# Add backslashes to protect contained spaces
++eval $($LAVINFO $@ | grep "=" | sed -e 's: :\\ :g')  # grep for = to remove Warnings
+ if [ "$video_frames" == "" ]; then
+    logIt "'lavinfo $@' died! exiting"
+    logIt " maybe you don't have lavinfo. or your input flags were wrong"
+@@ -401,7 +402,7 @@
+    fi
+ fi
+ 
+-if [ $video_inter -eq 1 ]; then
++if [[ ${video_inter/interlacing/} != ${video_inter} ]]; then
+    yuvdenoise_flags="$yuvdenoise_flags -F"
+ fi
+ 
diff --git a/media-video/mjpegtools/files/mjpegtools-1.8.0-lavrec-memleak.patch b/media-video/mjpegtools/files/mjpegtools-1.8.0-lavrec-memleak.patch
new file mode 100644
index 000000000000..47705044ebdb
--- /dev/null
+++ b/media-video/mjpegtools/files/mjpegtools-1.8.0-lavrec-memleak.patch
@@ -0,0 +1,78 @@
+--- mjpegtools-1.8.0/lavtools/lav_io.c	2005-08-27 13:47:20.000000000 +0200
++++ mjpegtools-1.8.0___fixed/lavtools/lav_io.c	2006-05-14 05:45:48.000000000 +0200
+@@ -540,15 +540,12 @@
+ 
+ int lav_write_audio(lav_file_t *lav_file, uint8_t *buff, long samps)
+ {
+-   int res;
++   int res = -1;
+ #ifdef HAVE_LIBQUICKTIME
+    int i, j;
+-   int16_t *qt_audio = (int16_t *)buff, **qt_audion;
++   int16_t *buff16 = (int16_t *)buff, **qt_audion;
+    int channels = lav_audio_channels(lav_file);
+-
+-   qt_audion = malloc(channels * sizeof (int16_t **));
+-   for (i = 0; i < channels; i++)
+-	qt_audion[i] = (int16_t *)malloc(samps * lav_file->bps);
++   int bits = lav_audio_bits(lav_file);
+ #endif
+ 
+    video_format = lav_file->format; internal_error = 0; /* for error messages */
+@@ -557,24 +554,43 @@
+    {
+       case 'a':
+       case 'A':
+-         res = AVI_write_audio( lav_file->avi_fd, buff, samps*lav_file->bps);
++         res = AVI_write_audio(lav_file->avi_fd, buff, samps*lav_file->bps);
+          break;
+ #ifdef HAVE_LIBQUICKTIME
+       case 'q':
+-	/* Deinterleave the audio into the two channels. */
+-	for (i = 0; i < samps; i++)
+-	    {
+-	    for (j = 0; j < channels; j++)
+-		qt_audion[j][i] = qt_audio[(channels*i) + j];
+-	    }
+-	res = lqt_encode_audio_track(lav_file->qt_fd, qt_audion, NULL,samps,0);
+-	for (j = 0; j < channels; j++)
+-	    free(qt_audion[j]);
+-	free(qt_audion);
+-        break;
++	 if (bits != 16 || channels > 1)
++	 {
++	    /* Deinterleave the audio into the two channels and/or convert
++	     * bits per sample to the required format.
++	     */
++	    qt_audion = malloc(channels * sizeof(*qt_audion));
++	    for (i = 0; i < channels; i++)
++	      qt_audion[i] = malloc(samps * sizeof(**qt_audion));
++
++	    if (bits == 16)
++	      for (i = 0; i < samps; i++)
++		for (j = 0; j < channels; j++)
++		  qt_audion[j][i] = buff16[channels * i + j];
++	    else 
++	      if (bits == 8)
++		for (i = 0; i < samps; i++)
++		  for (j = 0; j < channels; j++)
++		    qt_audion[j][i] = ((int16_t)(buff[channels * i + j]) << 8) ^ 0x8000;
++
++	    if (bits == 8 || bits == 16)
++	      res = lqt_encode_audio_track(lav_file->qt_fd, qt_audion, NULL, samps, 0);
++
++	    for (i = 0; i < channels; i++)
++	      free(qt_audion[i]);
++	    free(qt_audion);
++	  } else {
++	    qt_audion = &buff16;
++	    res = lqt_encode_audio_track(lav_file->qt_fd, qt_audion, NULL, samps, 0);
++	  }
++	  break;
+ #endif
+       default:
+-         res = -1;
++         break;
+    }
+ 
+    return res;
diff --git a/media-video/mjpegtools/mjpegtools-1.8.0-r2.ebuild b/media-video/mjpegtools/mjpegtools-1.8.0-r2.ebuild
new file mode 100644
index 000000000000..2234418ac158
--- /dev/null
+++ b/media-video/mjpegtools/mjpegtools-1.8.0-r2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.8.0-r2.ebuild,v 1.1 2006/11/19 17:22:56 zzam Exp $
+
+WANT_AUTOMAKE="latest"
+WANT_AUTOCONF="latest"
+
+inherit flag-o-matic toolchain-funcs eutils libtool autotools
+
+DESCRIPTION="Tools for MJPEG video"
+HOMEPAGE="http://mjpeg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz
+	mirror://gentoo/${PN}-m4-1.tar.bz2"
+
+LICENSE="as-is"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gtk dv quicktime sdl X yv12 v4l dga png mmx"
+
+RDEPEND="media-libs/jpeg
+	gtk? ( >=x11-libs/gtk+-2.0 )
+	dv? ( >=media-libs/libdv-0.99 )
+	quicktime? ( virtual/quicktime )
+	png? ( media-libs/libpng )
+	sdl? ( >=media-libs/libsdl-1.2.7-r3 )
+	X? ( || ( ( x11-libs/libX11
+				x11-libs/libXt
+			)
+			virtual/x11
+		)
+	)"
+
+DEPEND="${RDEPEND}
+	mmx? ( dev-lang/nasm )
+	>=sys-apps/sed-4
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}/${P}-gcc41.patch"
+	epatch "${FILESDIR}/${P}-parallelmake.patch"
+	epatch "${FILESDIR}/${P}-pkg-config.patch"
+	epatch "${FILESDIR}/${P}-as-needed.patch"
+	has_version ">=media-libs/libquicktime-0.9.9" && epatch "${FILESDIR}/${P}-libquicktime.patch"
+	epatch "${FILESDIR}/${P}-fix-lav2mpeg.patch"
+	epatch "${FILESDIR}/${P}-lavrec-memleak.patch"
+
+	# eautoreconf instead of elibtoolize
+	# as pkg-config-patch changes configure.in
+	#
+	# use m4-files from additional tarball as mjpegtools the fails if
+	# package providing m4-file is not installed
+	AT_M4DIR=${WORKDIR}/m4 eautoreconf
+
+	sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
+}
+
+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
+
+	[[ $(gcc-major-version) -eq 3 ]] && append-flags -mno-sse2
+
+	append-flags -fno-strict-aliasing
+
+	econf \
+		$(use_with X x) \
+		$(use_enable dga xfree-ext) \
+		$(use_with quicktime libquicktime) \
+		$(use_with png libpng) \
+		$(use_with v4l) \
+		$(use_with gtk) \
+		$(use_with sdl) \
+		$(use_with dv libdv /usr) \
+		$(use_enable mmx simd-accel) \
+		--enable-largefile \
+		${myconf} || die "configure failed"
+
+	emake || 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
+}