Fix crash with jpeg >= 7 wrt #292575 by Salah Coronya.

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

4 files changed, 41 insertions, 16 deletions

diff --git a/media-video/cinelerra/ChangeLog b/media-video/cinelerra/ChangeLog
index 372215033242..2aacacad3343 100644
--- a/media-video/cinelerra/ChangeLog
+++ b/media-video/cinelerra/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/cinelerra
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.38 2009/10/26 13:30:53 aballier Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.39 2010/01/30 14:37:16 ssuominen Exp $
+
+*cinelerra-20090210-r1 (30 Jan 2010)
+
+  30 Jan 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +files/cinelerra-jpeg-7.patch, +cinelerra-20090210-r1.ebuild:
+  Fix crash with jpeg >= 7 wrt #292575 by Salah Coronya.
 
   26 Oct 2009; Alexis Ballier <aballier@gentoo.org>
   +files/cinelerra-x264.patch, cinelerra-20090210.ebuild:
diff --git a/media-video/cinelerra/Manifest b/media-video/cinelerra/Manifest
index 99a7ca0ba10d..7567168a9fb7 100644
--- a/media-video/cinelerra/Manifest
+++ b/media-video/cinelerra/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX cinelerra-jpeg-7.patch 1131 RMD160 128d7cf423843eeaae8a1a334a3166e9ce5295cd SHA1 8803c6d90ac76404d8151f2011eb2982f0d27fda SHA256 e6dfc3c95e8e6a21cc9b23aee2ee967b2a52a0ee208e70af0ed0814a919bb0df
 AUX cinelerra-libavutil50.patch 2140 RMD160 95720943d2bee3a7f5c5a864aef5631655a65120 SHA1 6fa5d1024adde249fe026837061ceace11b06532 SHA256 f29284a0e8b629c1ff22090c03c9fe3947adbd024dd2c05d925775c8f96f8eda
 AUX cinelerra-pkgconfig-x264.patch 649 RMD160 29d4e37c6ffb11128281a6f49e614e32b7af6510 SHA1 62817baa7a633ec568b79dd5f02bd918eb14ff55 SHA256 eaf8f936b41dd998b6a793ffad37e98c840ea3225adf61419ff7e0610f61e92e
 AUX cinelerra-x264.patch 679 RMD160 27c0bb325268a3523887d3d10da94090119247f1 SHA1 f59faeeca021a70ad41887b7ccc0278c8c29472d SHA256 a4a561def29c25d087cab8fceabba1dfed4c712c493dc2c8411cbf6d6226cd2b
 DIST cinelerra-20090210.tar.lzma 21049396 RMD160 346353eec1a796698cb95b3066058344b244416c SHA1 68e40b1de7d17da70d1087af339146be3d00fd0f SHA256 35daee11a42dec974ac45de54773022463b3daeb61da4590a9e9d57fce3298ea
-EBUILD cinelerra-20090210.ebuild 2586 RMD160 2d9539e8e419ba03b154e0a5222a8bbd4c3c1f0f SHA1 e3e7692c04f8f01d52454a7a161cb9b5a8664481 SHA256 18606fa6452ccdb979d15d107424dd5f0c979dbb9c458f4ea312a5e03dcebe3b
-MISC ChangeLog 9650 RMD160 680bc114dc31704058f37af188d258a245c1ddbd SHA1 a9bc731e2edecb8e0339ed887c5cb1fb50630ee1 SHA256 ef8fc84f3b93fdb8f4c8c5dd9aa35666ae062c582e9c89c7fd36f210281011f8
+EBUILD cinelerra-20090210-r1.ebuild 2631 RMD160 baeeeb15c7faf4876b24bc047c08c0ac1e6b15dd SHA1 973cf0bc3a55411df6c06078a9075b8964615e28 SHA256 a6c87960ba5cf0864217943f79d5fad968ac4a7b2c38a80d853c66fdecf7de70
+MISC ChangeLog 9865 RMD160 dc8d920e48528b93ee36824529ae83a1c0b83fd2 SHA1 17a5f06b33ee47bf4338039ade929f83b9617603 SHA256 b0dc166204f4e0b4fdd33009b85b718accbffcba27182eff4c206ecd7979a493
 MISC metadata.xml 159 RMD160 21717801992314b5fc85dfeb6da77bf71fc54c7e SHA1 26b6ea95dc60c40d9b482830ce7e7c54233a7698 SHA256 38df217d3a650829cd34e6c74bd2710a01751ccd5511b5be296e3f48dd4d81cb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
-
-iEYEARECAAYFAkrlpJIACgkQvFcC4BYPU0oW+QCeJx+YiNdGOMVcDna/dbAPfUzS
-s3wAoJmg8Bg4A1DV62iT2lxRNiTk4FSv
-=Z5jO
------END PGP SIGNATURE-----
diff --git a/media-video/cinelerra/cinelerra-20090210.ebuild b/media-video/cinelerra/cinelerra-20090210-r1.ebuild
index f0dbf52b7912..5d521bbcfe8d 100644
--- a/media-video/cinelerra/cinelerra-20090210.ebuild
+++ b/media-video/cinelerra/cinelerra-20090210-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-20090210.ebuild,v 1.4 2009/10/26 13:30:53 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-20090210-r1.ebuild,v 1.1 2010/01/30 14:37:16 ssuominen Exp $
 
 inherit autotools multilib eutils
 
@@ -60,6 +60,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}-libavutil50.patch"
 	epatch "${FILESDIR}/${PN}-pkgconfig-x264.patch"
 	epatch "${FILESDIR}/${PN}-x264.patch"
+	epatch "${FILESDIR}/${PN}-jpeg-7.patch"
 	AT_M4DIR="m4" eautoreconf
 }
 
diff --git a/media-video/cinelerra/files/cinelerra-jpeg-7.patch b/media-video/cinelerra/files/cinelerra-jpeg-7.patch
new file mode 100644
index 000000000000..f26e6a399997
--- /dev/null
+++ b/media-video/cinelerra/files/cinelerra-jpeg-7.patch
@@ -0,0 +1,27 @@
+diff -r -u cinelerra-20090210/quicktime/libmjpeg.c cinelerra-20090210-r1/quicktime/libmjpeg.c
+--- cinelerra-20090210/quicktime/libmjpeg.c	2009-02-10 06:19:07.000000000 -0600
++++ cinelerra-20090210-r1/quicktime/libmjpeg.c	2010-01-23 01:37:31.000000000 -0600
+@@ -653,6 +653,7 @@
+ /* Ideally the error handler would be set here but it must be called in a thread */
+ 	jpeg_create_decompress(&(engine->jpeg_decompress));
+ 	engine->jpeg_decompress.raw_data_out = TRUE;
++	engine->jpeg_decompress.do_fancy_upsampling = FALSE;
+ 	engine->jpeg_decompress.dct_method = JDCT_IFAST;
+ }
+ 
+@@ -737,6 +738,7 @@
+ 				engine->jpeg_decompress.dc_huff_tbl_ptrs );
+ // Reset by jpeg_read_header
+ 	engine->jpeg_decompress.raw_data_out = TRUE;
++	engine->jpeg_decompress.do_fancy_upsampling = FALSE;
+ 	jpeg_start_decompress(&engine->jpeg_decompress);
+ 
+ // Generate colormodel from jpeg sampling
+@@ -801,6 +803,7 @@
+ 
+ 
+ 	engine->jpeg_compress.raw_data_in = TRUE;
++	engine->jpeg_compress.do_fancy_downsampling = FALSE;
+ 	jpeg_start_compress(&engine->jpeg_compress, TRUE);
+ 
+ 	while(engine->jpeg_compress.next_scanline < engine->jpeg_compress.image_height)