Use jpeg patch from upstream which supports jpeg-6+, and go stable so that jpeg-7 stabilization isnt blocked.

(Portage version: 2.2_rc40/cvs/Linux x86_64)

4 files changed, 73 insertions, 18 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index d80615b94d48..f528ba8733f2 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/netpbm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.226 2009/09/29 19:32:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.227 2009/09/29 19:54:22 vapier Exp $
+
+  29 Sep 2009; Mike Frysinger <vapier@gentoo.org>
+  files/netpbm-10.26.64-min_DCT_v_scaled_size.patch,
+  netpbm-10.46.00-r1.ebuild,
+  files/netpbm-10.46.00-min_DCT_v_scaled_size.patch:
+  Use jpeg patch from upstream which supports jpeg-6+, and go stable so that
+  jpeg-7 stabilization isnt blocked.
 
 *netpbm-10.48.00 (29 Sep 2009)
 
diff --git a/media-libs/netpbm/files/netpbm-10.26.64-min_DCT_v_scaled_size.patch b/media-libs/netpbm/files/netpbm-10.26.64-min_DCT_v_scaled_size.patch
index 5ba5c555d2f8..c3e629be955b 100644
--- a/media-libs/netpbm/files/netpbm-10.26.64-min_DCT_v_scaled_size.patch
+++ b/media-libs/netpbm/files/netpbm-10.26.64-min_DCT_v_scaled_size.patch
@@ -1,11 +1,35 @@
-jpeg-7 compability
+support for jpeg-7
 
 --- netpbm-10.46.00/converter/ppm/ppmtompeg/jpeg.c
-+++ netpbm-10.46.00/converter/ppm/ppmtompeg/jpeg.c
-@@ -470,5 +470,5 @@
-   buffer_height = 8;  /* could be 2, 4,8 rows high */
- #else
++++ netpbm-10.48.00/converter/ppm/ppmtompeg/jpeg.c
+@@ -53,6 +53,17 @@
+ #define HEADER_SIZE 607   /*JFIF header size used on output images*/
+ 
+ 
++static int
++minDctVScaledSize(struct jpeg_decompress_struct const cinfo) {
++
++#if JPEG_LIB_VERSION >= 70
++    return cinfo.min_DCT_v_scaled_size;
++#else
++    return cinfo.min_DCT_scaled_size;
++#endif
++}
++
++
+ 
+ /*=======================================================================*
+  *                                                                       *
+@@ -467,11 +474,7 @@
+   max_v_samp = (temp_v<v_samp[2]) ? v_samp[2]:temp_v;
+   
+   /* Make an 8-row-high sample array that will go away when done with image */
+-#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
+-#endif
++  buffer_height = cinfo.max_v_samp_factor * minDctVScaledSize(cinfo);
    
+   for(cp=0,compptr = cinfo.comp_info;cp<cinfo.num_components;
+       cp++,compptr++) {
diff --git a/media-libs/netpbm/files/netpbm-10.46.00-min_DCT_v_scaled_size.patch b/media-libs/netpbm/files/netpbm-10.46.00-min_DCT_v_scaled_size.patch
index cff4c83e2c08..89948dceb432 100644
--- a/media-libs/netpbm/files/netpbm-10.46.00-min_DCT_v_scaled_size.patch
+++ b/media-libs/netpbm/files/netpbm-10.46.00-min_DCT_v_scaled_size.patch
@@ -1,11 +1,35 @@
-jpeg-7 compability
+support for jpeg-7
 
 --- netpbm-10.46.00/converter/ppm/ppmtompeg/jpeg.c
-+++ netpbm-10.46.00/converter/ppm/ppmtompeg/jpeg.c
-@@ -470,5 +470,5 @@
-     buffer_height = 8;  /* could be 2, 4,8 rows high */
- #else
++++ netpbm-10.48.00/converter/ppm/ppmtompeg/jpeg.c
+@@ -53,6 +53,17 @@
+ #define HEADER_SIZE 607   /*JFIF header size used on output images*/
+ 
+ 
++static int
++minDctVScaledSize(struct jpeg_decompress_struct const cinfo) {
++
++#if JPEG_LIB_VERSION >= 70
++    return cinfo.min_DCT_v_scaled_size;
++#else
++    return cinfo.min_DCT_scaled_size;
++#endif
++}
++
++
+ 
+ /*=======================================================================*
+  *                                                                       *
+@@ -467,11 +474,7 @@
+     /* Make an 8-row-high sample array that will go away when done
+        with image
+     */
+-#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
+-#endif
++    buffer_height = cinfo.max_v_samp_factor * minDctVScaledSize(cinfo);
    
+     for(cp=0,compptr = cinfo.comp_info;cp<cinfo.num_components;
+         cp++,compptr++) {
diff --git a/media-libs/netpbm/netpbm-10.46.00-r1.ebuild b/media-libs/netpbm/netpbm-10.46.00-r1.ebuild
index 9b74a6501bca..3a49a122fd0e 100644
--- a/media-libs/netpbm/netpbm-10.46.00-r1.ebuild
+++ b/media-libs/netpbm/netpbm-10.46.00-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.46.00-r1.ebuild,v 1.6 2009/09/27 20:15:44 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.46.00-r1.ebuild,v 1.7 2009/09/29 19:54:22 vapier Exp $
 
 inherit toolchain-funcs eutils multilib
 
@@ -12,10 +12,10 @@ SRC_URI="mirror://gentoo/${P}.tar.lzma
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="jbig jpeg jpeg2k png rle svga tiff X xml zlib"
 
-RDEPEND="jpeg? ( >=media-libs/jpeg-7 )
+RDEPEND="jpeg? ( >=media-libs/jpeg-6b )
 	jpeg2k? ( media-libs/jasper )
 	tiff? ( >=media-libs/tiff-3.5.5 )
 	png? ( >=media-libs/libpng-1.2.1 )