diff options
| author | taca <taca> | 2011-09-12 16:52:56 +0000 |
|---|---|---|
| committer | taca <taca> | 2011-09-12 16:52:56 +0000 |
| commit | ccbc6fcd265dd23554854779a50c16ac0449d91c (patch) | |
| tree | b32817c24ab27d455c1e85cb07262cd9e5eb0022 /multimedia/mpeg_encode/patches | |
| parent | 1dc5bc219a4a773e44519756d3347f36b675cfcb (diff) | |
| download | pkgsrc-ccbc6fcd265dd23554854779a50c16ac0449d91c.tar.gz | |
Fix build problem with jpeglib.
Diffstat (limited to 'multimedia/mpeg_encode/patches')
| -rw-r--r-- | multimedia/mpeg_encode/patches/patch-ab | 23 |
1 files changed, 17 insertions, 6 deletions
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; |