On Sun, Sep 13, 2009 at 09:48:57AM +0200, Bill Allombert wrote: > Package: netpbm > Version: 2:10.0-12 > Severity: important > > Hello Andreas, > > Please apply the following patch that allow netpbm to build with > both libjpeg62-dev and libjpeg7-dev. > Please also change the Build-Depends to 'libjpeg-dev' (without the version > indication).
Sorry, I missed one hunk of the patch. Please find the fixed one below. Cheers, -- Bill. <[email protected]> Imagine a large red swirl here.
diff -ur netpbm-free-10.0.old/debian/changelog netpbm-free-10.0/debian/changelog --- netpbm-free-10.0.old/debian/changelog 2009-09-11 20:34:01.000000000 +0200 +++ netpbm-free-10.0/debian/changelog 2009-09-11 20:32:19.000000000 +0200 @@ -1,3 +1,9 @@ +netpbm-free (2:10.0-13) unstable; urgency=low + + * Apply patch for compatibility with libjpeg7. + + -- Bill Allombert <[email protected]> Fri, 11 Sep 2009 20:31:34 +0200 + netpbm-free (2:10.0-12) unstable; urgency=medium * Reupload to unstable. Seulement dans netpbm-free-10.0: lib diff -ur netpbm-free-10.0.old/ppm/ppmtompeg/jpeg.c netpbm-free-10.0/ppm/ppmtompeg/jpeg.c --- netpbm-free-10.0.old/ppm/ppmtompeg/jpeg.c 2003-08-12 20:23:03.000000000 +0200 +++ netpbm-free-10.0/ppm/ppmtompeg/jpeg.c 2009-09-14 10:47:26.000000000 +0200 @@ -435,6 +435,9 @@ cinfo.want_raw_output = TRUE; #else cinfo.raw_data_out = TRUE; +#if JPEG_LIB_VERSION >= 70 + cinfo.do_fancy_downsampling = FALSE; +#endif #endif cinfo.out_color_space = JCS_YCbCr; @@ -480,6 +483,8 @@ /* 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 */ +#elif JPEG_LIB_VERSION >= 70 + buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_v_scaled_size; #else buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_scaled_size; #endif
