diff options
| author | taca <taca@pkgsrc.org> | 2011-09-12 16:52:56 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2011-09-12 16:52:56 +0000 |
| commit | f4b45109ee412790bbf55a5fd1f83bba0741d940 (patch) | |
| tree | b32817c24ab27d455c1e85cb07262cd9e5eb0022 /multimedia | |
| parent | def227490e6d4c120c6d9490a28f1d8af78edbf7 (diff) | |
| download | pkgsrc-f4b45109ee412790bbf55a5fd1f83bba0741d940.tar.gz | |
Fix build problem with jpeglib.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/mpeg_encode/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/mpeg_encode/patches/patch-ab | 23 |
2 files changed, 19 insertions, 8 deletions
diff --git a/multimedia/mpeg_encode/distinfo b/multimedia/mpeg_encode/distinfo index d0c4a3b21c5..919c2242d40 100644 --- a/multimedia/mpeg_encode/distinfo +++ b/multimedia/mpeg_encode/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.7 2009/09/01 18:23:28 hasso Exp $ +$NetBSD: distinfo,v 1.8 2011/09/12 16:52:56 taca Exp $ SHA1 (mpeg_encode-1.5b-src.tar.gz) = 853cd175f73b8064ce28deb256e4b81159a684ed RMD160 (mpeg_encode-1.5b-src.tar.gz) = 24c0a1090076630c292936639c5fb275778f6470 Size (mpeg_encode-1.5b-src.tar.gz) = 2028724 bytes SHA1 (patch-aa) = 04221eb3d4cf85b206d27a2f425719ed7c4a5ec1 -SHA1 (patch-ab) = 26b7dd8004f2df43f8a4f933a5c01be53aabb299 +SHA1 (patch-ab) = 19fcf1b6ef88f3cdba29a71eb619e467fa621f4f SHA1 (patch-ac) = 152c0bd7737a307d1aa89ae820e219300c124085 SHA1 (patch-ad) = 670a244680d09cb9f558a8777ec8f189145342f8 SHA1 (patch-ae) = 414b8c45c65892b9e161c285c5c0327103f8f474 diff --git a/multimedia/mpeg_encode/patches/patch-ab b/multimedia/mpeg_encode/patches/patch-ab index b593925bbac..58cec570aef 100644 --- a/multimedia/mpeg_encode/patches/patch-ab +++ b/multimedia/mpeg_encode/patches/patch-ab @@ -1,8 +1,16 @@ -$NetBSD: patch-ab,v 1.2 2009/09/01 18:23:28 hasso Exp $ +$NetBSD: patch-ab,v 1.3 2011/09/12 16:52:56 taca Exp $ ---- jpeg.c.orig 1995-08-05 02:35:07 +0300 -+++ jpeg.c 2009-09-01 21:00:50 +0300 -@@ -77,7 +77,7 @@ +--- jpeg.c.orig 1995-08-04 23:35:07.000000000 +0000 ++++ jpeg.c +@@ -65,6 +65,7 @@ + *==============*/ + + #include <stdio.h> ++#include <unistd.h> + #include "all.h" + #include "mtypes.h" + #include "frames.h" +@@ -77,7 +78,7 @@ /* make it happier.... */ #undef DCTSIZE2 @@ -11,12 +19,15 @@ $NetBSD: patch-ab,v 1.2 2009/09/01 18:23:28 hasso Exp $ #define HEADER_SIZE 607 /*JFIF header size used on output images*/ -@@ -514,7 +514,7 @@ ReadJPEG(mf, fp) +@@ -514,7 +515,11 @@ ReadJPEG(mf, fp) #ifdef JPEG4 buffer_height = 8; /* could be 2, 4,8 rows high */ #else -- buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_scaled_size; ++# if JPEG_LIB_VERSION < 80 + buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_scaled_size; ++# else + buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_v_scaled_size; ++# endif #endif for(cp=0,compptr = cinfo.comp_info;cp<cinfo.num_components; |