[75929] trunk/dports/multimedia/mjpegtools

[jmr at macports.org]

Revision: 75929
          http://trac.macports.org/changeset/75929
Author:   jmr at macports.org
Date:     2011-02-12 22:26:58 -0800 (Sat, 12 Feb 2011)
Log Message:
-----------
mjpegtools: fix crash with recent libjpeg versions (#22915)

Modified Paths:
--------------
    trunk/dports/multimedia/mjpegtools/Portfile

Added Paths:
-----------
    trunk/dports/multimedia/mjpegtools/files/jpeg-7.patch

Modified: trunk/dports/multimedia/mjpegtools/Portfile
===================================================================
--- trunk/dports/multimedia/mjpegtools/Portfile	2011-02-13 06:26:14 UTC (rev 75928)
+++ trunk/dports/multimedia/mjpegtools/Portfile	2011-02-13 06:26:58 UTC (rev 75929)
@@ -4,7 +4,7 @@
 
 name		mjpegtools
 version		1.9.0
-revision        3
+revision        4
 categories	multimedia
 maintainers 	gmail.com:filippo.natali
 platforms	darwin
@@ -29,6 +29,8 @@
                 port:libdv \
                 port:libquicktime
 
+patchfiles	jpeg-7.patch
+
 configure.args  --mandir=${prefix}/share/man --infodir=${prefix}/share/info --enable-simd-accel --disable-sdltest --with-x
 
 variant no_x11 {

Added: trunk/dports/multimedia/mjpegtools/files/jpeg-7.patch
===================================================================
--- trunk/dports/multimedia/mjpegtools/files/jpeg-7.patch	                        (rev 0)
+++ trunk/dports/multimedia/mjpegtools/files/jpeg-7.patch	2011-02-13 06:26:58 UTC (rev 75929)
@@ -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);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110212/d44be87b/attachment-0001.html>