diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-01-30 14:37:16 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-01-30 14:37:16 +0000 |
| commit | d370138d4cfb6f6e759a47317470487f7ee5bec5 (patch) | |
| tree | 1d064732df6899aa2e9d67d1b7ce64f2a9a55534 /media-video | |
| parent | alpha/ia64/sparc/x86 stable wrt #302665 (diff) | |
| download | gentoo-2-d370138d4cfb6f6e759a47317470487f7ee5bec5.tar.gz gentoo-2-d370138d4cfb6f6e759a47317470487f7ee5bec5.tar.bz2 gentoo-2-d370138d4cfb6f6e759a47317470487f7ee5bec5.zip | |
Fix crash with jpeg >= 7 wrt #292575 by Salah Coronya.
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/cinelerra/ChangeLog | 10 | ||||
| -rw-r--r-- | media-video/cinelerra/cinelerra-20090210-r1.ebuild (renamed from media-video/cinelerra/cinelerra-20090210.ebuild) | 5 | ||||
| -rw-r--r-- | media-video/cinelerra/files/cinelerra-jpeg-7.patch | 27 |
3 files changed, 38 insertions, 4 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/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) |