[pkgsrc/trunk]: pkgsrc/multimedia/mpeg_encode Make it build with new jpeg lib...

[hasso <hasso%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/119c074b7ebe
branches:  trunk
changeset: 398525:119c074b7ebe
user:      hasso <hasso%pkgsrc.org@localhost>
date:      Tue Sep 01 18:23:28 2009 +0000

description:
Make it build with new jpeg library.

diffstat:

 multimedia/mpeg_encode/distinfo         |   4 ++--
 multimedia/mpeg_encode/patches/patch-ab |  15 ++++++++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diffs (43 lines):

diff -r 64136747e036 -r 119c074b7ebe multimedia/mpeg_encode/distinfo
--- a/multimedia/mpeg_encode/distinfo   Tue Sep 01 18:19:15 2009 +0000
+++ b/multimedia/mpeg_encode/distinfo   Tue Sep 01 18:23:28 2009 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.6 2007/07/30 10:25:42 joerg Exp $
+$NetBSD: distinfo,v 1.7 2009/09/01 18:23:28 hasso 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) = f2cdf02d49b726b4fb7fb210074e7ba53b9b380b
+SHA1 (patch-ab) = 26b7dd8004f2df43f8a4f933a5c01be53aabb299
 SHA1 (patch-ac) = 152c0bd7737a307d1aa89ae820e219300c124085
 SHA1 (patch-ad) = 670a244680d09cb9f558a8777ec8f189145342f8
 SHA1 (patch-ae) = 414b8c45c65892b9e161c285c5c0327103f8f474
diff -r 64136747e036 -r 119c074b7ebe multimedia/mpeg_encode/patches/patch-ab
--- a/multimedia/mpeg_encode/patches/patch-ab   Tue Sep 01 18:19:15 2009 +0000
+++ b/multimedia/mpeg_encode/patches/patch-ab   Tue Sep 01 18:23:28 2009 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/02/24 21:47:25 jmmv Exp $
+$NetBSD: patch-ab,v 1.2 2009/09/01 18:23:28 hasso Exp $
 
---- jpeg.c.orig        Sat Aug  5 01:35:07 1995
-+++ jpeg.c
+--- jpeg.c.orig        1995-08-05 02:35:07 +0300
++++ jpeg.c     2009-09-01 21:00:50 +0300
 @@ -77,7 +77,7 @@
  
  /* make it happier.... */
@@ -11,3 +11,12 @@
  
  
  #define HEADER_SIZE 607   /*JFIF header size used on output images*/
+@@ -514,7 +514,7 @@ 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;
++  buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_v_scaled_size;
+ #endif
+   
+   for(cp=0,compptr = cinfo.comp_info;cp<cinfo.num_components;