diff -Nu mjpegtools.orig//mjpegtools-1.9.0-jpeg-7.patch mjpegtools//mjpegtools-1.9.0-jpeg-7.patch --- mjpegtools.orig//mjpegtools-1.9.0-jpeg-7.patch 1970-01-01 01:00:00.000000000 +0100 +++ mjpegtools//mjpegtools-1.9.0-jpeg-7.patch 2010-04-19 11:00:28.099436577 +0200 @@ -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 -Nu mjpegtools.orig//PKGBUILD mjpegtools//PKGBUILD --- mjpegtools.orig//PKGBUILD 2010-04-15 06:07:08.000000000 +0200 +++ mjpegtools//PKGBUILD 2010-04-19 15:44:39.397182731 +0200 @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 63407 2010-01-17 13:34:04Z jgc $ + # Contributor: Damir Perisa # Mantainer: Roberto Carvajal pkgname=mjpegtools pkgver=1.9.0 -pkgrel=3 +pkgrel=4 pkgdesc="Set of tools that can do recording of videos and playback, simple cut-and-paste editing and the MPEG compression of audio and video" arch=(i686 x86_64) license=('GPL') @@ -15,16 +15,19 @@ options=('!makeflags' '!libtool') source=(http://downloads.sourceforge.net/sourceforge/mjpeg/${pkgname}-${pkgver}.tar.gz mjpegtools-1.9.0-glibc-2.10.patch - png2yuv-fix-memleak.patch) + png2yuv-fix-memleak.patch + mjpegtools-1.9.0-jpeg-7.patch) md5sums=('309a6fcf0900a010d6a9c1e91afc2f5c' 'b8ae66237d83be533db8eea166fd3357' - '39e1def8fb0f7c58a217b22dc251a86a') + '39e1def8fb0f7c58a217b22dc251a86a' + 'ccc7562a3933877d3362da7cf4695ea0') build() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure || return 1 patch -Np1 -i "$srcdir/mjpegtools-1.9.0-glibc-2.10.patch" || return 1 patch -Np1 -i "${srcdir}/png2yuv-fix-memleak.patch" || return 1 + patch -Np0 -i "${srcdir}/mjpegtools-1.9.0-jpeg-7.patch" || return 1 ./configure --prefix=/usr --enable-largefile || return 1 make || return 1 make DESTDIR="${pkgdir}" install || return 1