Fix jpeg2yuv segmentation fault with jpeg-7 and above wrt #293919 by Salah Coronya.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 122 insertions, 2 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index df7e370b92b1..7a4b652ef1c7 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/mjpegtools
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.142 2010/01/22 17:15:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.143 2010/01/23 11:49:15 ssuominen Exp $
+
+*mjpegtools-1.9.0-r1 (23 Jan 2010)
+
+  23 Jan 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +mjpegtools-1.9.0-r1.ebuild, +files/mjpegtools-1.9.0-jpeg-7.patch:
+  Fix jpeg2yuv segmentation fault with jpeg-7 and above wrt #293919 by Salah
+  Coronya.
 
   22 Jan 2010; Samuli Suominen <ssuominen@gentoo.org>
   mjpegtools-1.9.0.ebuild:
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index caa19e57d85a..4e688ee36b74 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -9,10 +9,12 @@ AUX mjpegtools-1.8.0-no-jpeg-mmx.patch 1539 RMD160 eb2b1756e65ce56b128e0c6763a27
 AUX mjpegtools-1.8.0-parallelmake.patch 829 RMD160 107cbf908041da6233a8b7340df0caff90cec253 SHA1 97de494ba20a164d06a02f6a5f869e971b8e2b0f SHA256 78e4f3288544a1e7f0733b70136f82a9927017fcde1efaa1a8b659be1f37c288
 AUX mjpegtools-1.8.0-pkg-config.patch 423 RMD160 2d3d55fb7561a9c0ceeb7ce880953cb12662489c SHA1 5d284a7754816a5e48e364f512f1f1fe71b58e00 SHA256 3b26122803c1ea805534308137323ee119fbc29777fa4a588ebe6dade0a8d490
 AUX mjpegtools-1.9.0-glibc-2.10.patch 429 RMD160 ef7f706aeda7ebfa04dbd43b70a5e3e6faf24610 SHA1 3029f0e835e693b144298ed9f8143c9566be26f3 SHA256 0a76b418df4daa1603c827001ede6a1b3da4457b5d3aefeda0a656cd88ad446b
+AUX mjpegtools-1.9.0-jpeg-7.patch 774 RMD160 22c50dd28617159eaa89aefb4647e21d4d9972e7 SHA1 2bdb1b3b8591cede11d4a133a758e8ead35db4dd SHA256 2c9b90a283e8e6d95bd9573cd16310107c654d0d701a7dff7e47ee1a773da7cf
 DIST mjpegtools-1.8.0.tar.gz 1475998 RMD160 4d97a6a721f29223975605e2a5e645b4d7d129b5 SHA1 e11d68298a64b52f98724dbf3fd14f168e140290 SHA256 d841575c72cd0e587c1bab703d0906e3d23bf428424000557739cf5d6097209a
 DIST mjpegtools-1.9.0.tar.gz 1718063 RMD160 79e0eb4bce468bb8f12da336e29abe8fab390a5f SHA1 1701233354c7ea86b5b7808c4dd5d03a71118e48 SHA256 a9322aaab1e0835fbaa00fc10e58e885833454fa0ad6f57c60c89a78f7ed1711
 DIST mjpegtools-m4-1.tar.bz2 4547 RMD160 b81b89bb6364023606a1d3ca9519e143fe053ab4 SHA1 4c69f9918dcc56fc544fef9af9aaed968da1ae67 SHA256 10de1e206ee9c84aae111e95f655ad9394be749bfed01d337f7ff9a983aab522
 EBUILD mjpegtools-1.8.0-r2.ebuild 2880 RMD160 299aa207ae34c594a5bc8406dc557d86cede7194 SHA1 0e1b6da3472e448007d739f7f6bee140c4c837e0 SHA256 c0a57f6d2c725be7bcdd14b2f64fb7d742bd38a705a7206051d5a027221ac6c6
+EBUILD mjpegtools-1.9.0-r1.ebuild 2158 RMD160 e5d6d822a87bb7a8c1899ab35c1e867f1129cd27 SHA1 d6f798fd1230fe7da06d1c5861966a7dd5ad1550 SHA256 f793ef7e42f8ddc9e6de60f0e81955bee18ddedff23b7aabc3f1d99bacbb042d
 EBUILD mjpegtools-1.9.0.ebuild 2113 RMD160 3a3dbe661cba9c59c9f451c1a4fd348a569a2ca8 SHA1 edd1de8894068d44773628e9aa55dca3f4786f23 SHA256 1c8c5c5a751efbb7cdb50254896123c5cdc67ca5d607abe92fb4ff4b84c1d971
-MISC ChangeLog 25216 RMD160 3f8374c6dc435d41222921284218ae908d7fb22a SHA1 309a05eabea83f6a4438aaea507892fde113ff4f SHA256 46a69a261c0e4ccad7025b851aed8023af3dcb4a8f7182587a86094fa8d31ff6
+MISC ChangeLog 25464 RMD160 f1d6d3f4479e559cd607daff1bfbb3dd52289cbf SHA1 3ea19d8c8b66c4e9147c8d8042b63fb5e9e081b5 SHA256 84695f3e45cc06a189e3eaddc65430978d2f61de4af0f92c8d24ae434939e7f2
 MISC metadata.xml 415 RMD160 cdbf5de3ece63e3df10d1a4e69ed5e471abb84fa SHA1 5ae767eb57a50fff79f938a01332e67f88306aff SHA256 75cf2c90452ef1a74f46812e6ffee8c2f25a979f3a0b8e366032ee60bdb8663b
diff --git a/media-video/mjpegtools/files/mjpegtools-1.9.0-jpeg-7.patch b/media-video/mjpegtools/files/mjpegtools-1.9.0-jpeg-7.patch
new file mode 100644
index 000000000000..ec367318628c
--- /dev/null
+++ b/media-video/mjpegtools/files/mjpegtools-1.9.0-jpeg-7.patch
@@ -0,0 +1,24 @@
+Fix segmentation fault with jpeg-7 and above where dinfo.do_fancy_upsampling isn't set by default to FALSE anymore.
+
+Patch by: Salah Coronya
+
+http://bugs.gentoo.org/show_bug.cgi?id=293919
+
+--- lavtools/jpegutils.c
++++ lavtools/jpegutils.c
+@@ -502,6 +502,7 @@
+ 
+    jpeg_read_header (&dinfo, TRUE);
+    dinfo.raw_data_out = TRUE;
++   dinfo.do_fancy_upsampling = FALSE;
+    dinfo.out_color_space = JCS_YCbCr;
+    dinfo.dct_method = JDCT_IFAST;
+    guarantee_huff_tables(&dinfo);
+@@ -599,6 +600,7 @@
+       if (field > 0) {
+          jpeg_read_header (&dinfo, TRUE);
+          dinfo.raw_data_out = TRUE;
++         dinfo.do_fancy_upsampling = FALSE;
+          dinfo.out_color_space = JCS_YCbCr;
+          dinfo.dct_method = JDCT_IFAST;
+          jpeg_start_decompress (&dinfo);
diff --git a/media-video/mjpegtools/mjpegtools-1.9.0-r1.ebuild b/media-video/mjpegtools/mjpegtools-1.9.0-r1.ebuild
new file mode 100644
index 000000000000..4b048f085b39
--- /dev/null
+++ b/media-video/mjpegtools/mjpegtools-1.9.0-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.9.0-r1.ebuild,v 1.1 2010/01/23 11:49:15 ssuominen Exp $
+
+EAPI="1"
+
+inherit flag-o-matic toolchain-funcs eutils libtool
+
+MY_P=${P/_/}
+
+DESCRIPTION="Tools for MJPEG video"
+HOMEPAGE="http://mjpeg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mjpeg/${MY_P}.tar.gz"
+
+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:0
+	gtk? ( x11-libs/gtk+:2 )
+	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 )"
+
+DEPEND="${RDEPEND}
+	mmx? ( dev-lang/nasm )
+	>=sys-apps/sed-4
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
+	epatch "${FILESDIR}"/${P}-glibc-2.10.patch \
+		"${FILESDIR}"/${P}-jpeg-7.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
+
+	[[ $(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 \
+		--without-jpeg-mmx \
+		${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 TODO HINTS BUGS ChangeLog \
+		AUTHORS CHANGES
+}