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

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

5 files changed, 80 insertions, 25 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/Manifest b/media-libs/netpbm/Manifest
index 0702f43fdd6a..b3f6c8b95108 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,12 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX netpbm-10.26.64-min_DCT_v_scaled_size.patch 362 RMD160 774dc46bac6a095a0569dc342081e4b4dae8db69 SHA1 4f89dc94e2b924438b0acef94f33142a2ba8cd68 SHA256 8b597780af6de6c244a5c696894182a7b749cda3f540dde0809b4a1aab6190e0
+AUX netpbm-10.26.64-min_DCT_v_scaled_size.patch 1056 RMD160 abc0ef32a608823033bada6bbccc01243499c575 SHA1 5e9857abe0decbae37648cc3b51d05f3d08d1132 SHA256 30652e72c0b234f2ed0d9390a3f5ab76d9e9ae2a6311e5b965aa543c9ad2c72a
 AUX netpbm-10.30-build.patch 2276 RMD160 aa69ccc2d3e332b4fa50e33621ead91f95a124ed SHA1 d14b5144c310c9182c45cefb629f2b4e77be0058 SHA256 aa7c4dcad0fe5aa71cce357236aa859b14c3794c92c5a5b848cc31618194b174
 AUX netpbm-10.31-build.patch 1629 RMD160 4226692b199871b3bfb27a9e6fec97d8ac1a4bf6 SHA1 574bd4443c6dbd8a2508bc2d2e3096cfcc815710 SHA256 eaf363941337718390856c318c8e69114c8fb9dbcea8b07755350dbdabce6323
 AUX netpbm-10.35.0-xml2.patch 850 RMD160 426cc33a622b8641bdbff8e60a8418318cdee682 SHA1 ce767bd1a0fe861cc9d1a47fa0bb53b12b4a58cc SHA256 b36d159a7e3ec7377760f30e835b8b2bed6c00a9aa992562d50de5ddb6937847
 AUX netpbm-10.42.0-gcc43.patch 541 RMD160 4162fc8f0020941d9072ce595a4586a8a9f2159e SHA1 aebb30f5196d88acd8156f6954bf2c2903700aa3 SHA256 259f194d7d55742d2d7d0915f57814642e059890157eef1eeb3c5c2ba511ef86
-AUX netpbm-10.46.00-min_DCT_v_scaled_size.patch 368 RMD160 0cba1c836b21b35d1f20223ee1af48ef88bf37d5 SHA1 f6a3ec1e60e1ddc179f8a2827034b486fe2374f7 SHA256 b1765c80539fb82e8723c8daf46cf6312008729f47b67e79c477633f36143597
+AUX netpbm-10.46.00-min_DCT_v_scaled_size.patch 1022 RMD160 8b3370958c504c9330dc47c77ab579e021bc03f8 SHA1 71cf92f4143c7831a42de7c503045b7a23bc5997 SHA256 42c21d97f73523c9668ed8700ec33fd4d44e445429d61bd65218711d8ca02135
 DIST netpbm-10.26.62.tgz 2545623 RMD160 be41d041db78c1c91b3ad82193495ade05572c6e SHA1 e9f1fa0804f90a9b6aa44fbceccb0a63d42a3585 SHA256 1156eb12165b974c52431992911e7f9a7400d7bc05e50c391e5e99ab49b90cc5
 DIST netpbm-10.26.64.tgz 2545993 RMD160 c3e922aaec320a5692fb0d71b5e34303d9dc2f9f SHA1 1518d6268a35a208b1df557d6e193236d2ec56f8 SHA256 1cf89173f141e2e8f46c54b9537f344c874f8e3ffd1d41a95d41de02d927257b
 DIST netpbm-10.30-manpages.tar.bz2 233254 RMD160 6312e1486f473f57332a5dc050a03ac1dfce7f47 SHA1 a1893e67380029ddbb76a1451833a134f4d42818 SHA256 75eb6ceaebafffb6a2d608d49f2b61c5049e5795976bbfb2d55608de1f858124
@@ -15,15 +15,15 @@ DIST netpbm-10.46.00.tar.lzma 1897731 RMD160 79230ebe58c90f9f6f7d5de13f215ac22c5
 DIST netpbm-10.48.00.tar.lzma 1908122 RMD160 597c1f2c7a276bf2200cc65e25218a92ef316000 SHA1 fc62507988d59b27b59b5ddc87ef441fa247ab44 SHA256 8847d09c3275528cedaf51fbb1c42b494bd53ec97d6f4681a5c297dcd5c405a7
 EBUILD netpbm-10.26.62.ebuild 2895 RMD160 91f714d94c546ec08e8d4fae8a428c23330d0858 SHA1 59a05481b8d6fc4558ea8fb11d8cf9608882e157 SHA256 b90fbb741700ab0020828d19e139d37886bd5d1fc23c9f668617f0de4342bb26
 EBUILD netpbm-10.26.64.ebuild 2961 RMD160 6ab18916af77364406e3658d2e1a75958f90b706 SHA1 1fb24e2d444532819558c2bab768903697ab0595 SHA256 42d3fe669df8fe3b516403c3b8eee534443c655c0dd3b37f6382f497a8b1119f
-EBUILD netpbm-10.46.00-r1.ebuild 4367 RMD160 8aa23f28b3d65dd6bc3dba5e1af9adfe08296725 SHA1 40d4cb727d1dc8fd32a6040b6518fdd55e1bfcef SHA256 013ff4eb5259ac555b7cb1a4794150120d75544aeea939cb4abd95cba9ef6e36
+EBUILD netpbm-10.46.00-r1.ebuild 4359 RMD160 846f82115daa0f1179d8b485010011aa70ddcc74 SHA1 5c7294e6dfaecc60633e2ac49559291d5034b420 SHA256 b4892c85ef94149a30f62026c5b5d25d8491c4d8371169eef0ec014d6383a104
 EBUILD netpbm-10.46.00.ebuild 4304 RMD160 57a195c49e688f36f0b580ee4da2f092b2ef645d SHA1 9bce70df1e6b423f9f5d1c2cab8dbc2387829c81 SHA256 e4a1101f879f0975999b4a01c60051fad3bab57b6f50eeb9ce6f2b476fd1ae5d
 EBUILD netpbm-10.48.00.ebuild 4364 RMD160 71ab2e170383a426bc29203010522796db04ed9d SHA1 b0af488887e9bb93d76f7c745cdbd1659cd62643 SHA256 218855b689923ca23c9e8df3e1e546b0f6a3fa5eca8eeb18fed0dc2588b245d6
-MISC ChangeLog 30582 RMD160 63ccb34f1cea71024a109fac3a965342e0c3b08e SHA1 c37afb95c0c99fc5a71fd08e438cfcfd2909617c SHA256 227ac74b0088132348ab2261aacc0158d74b66864cd7c43484f65518d4b54ac7
+MISC ChangeLog 30882 RMD160 cd660e21bc0db9a747db6c7f41f4606a85cc0e93 SHA1 b8b207218e828fff0a24fa99999bb62f9dbc6bc9 SHA256 a8c28d6fe091d70bbda5e66844040570416589b342ef863dd1440f4c8de19ee3
 MISC metadata.xml 266 RMD160 de6149ba44458a170c3f6f6d5c015a3b4e5fe3bd SHA1 bb0d212119622779ede27328c6df989b362deac3 SHA256 4db3c087a1641cf4b8ae3750db0fb27bf8ff9a4dcbe496d1c173a9f9c04df75d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkrCYU8ACgkQlPl3HsVfCDrlLACeKGtFAqsGkI3yyQjD951BMWF8
-jsIAnjpLdhqnsELRznszzNBAf8hBEziW
-=ghnU
+iEYEARECAAYFAkrCZfQACgkQlPl3HsVfCDpf7ACeOpaVMkOKKUHn78MuKLaR6Hfa
+RmsAnjJtT3/wmzY0FLLwspaJQzgwrUfm
+=ED6X
 -----END PGP SIGNATURE-----
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 )