libpng14.patch

   1 --- DevIL-1.7.8/devil-1.7.8/src-IL/src/il_png.c~        2009-03-08 08:10:09.000000000 +0100
   2 +++ DevIL-1.7.8/devil-1.7.8/src-IL/src/il_png.c 2010-04-21 14:42:41.194560666 +0200
   3 @@ -105,7 +105,11 @@
   4         Read = iread(Signature, 1, 8);
   5         iseek(-Read, IL_SEEK_CUR);
   6
   7 +#if PNG_LIBPNG_VER < 10400
   8         return png_check_sig(Signature, 8);
   9 +#else
  10 +       return png_sig_cmp(Signature, 0, 8) == 0;
  11 +#endif
  12  }
  13
  14
  15 @@ -278,7 +282,11 @@
  16
  17         // Expand low-bit-depth grayscale images to 8 bits
  18         if (png_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
  19 +#if PNG_LIBPNG_VER < 10400
  20                 png_set_gray_1_2_4_to_8(png_ptr);
  21 +#else
  22 +               png_set_expand_gray_1_2_4_to_8(png_ptr);
  23 +#endif
  24         }
  25
  26         // Expand RGB images with transparency to full alpha channels
  27 --- DevIL-1.7.8/devil-1.7.8/src-IL/src/il_icon.c~       2009-03-08 08:10:09.000000000 +0100
  28 +++ DevIL-1.7.8/devil-1.7.8/src-IL/src/il_icon.c        2010-04-21 15:07:23.711078866 +0200
  29 @@ -525,7 +525,11 @@
  30
  31         // Expand low-bit-depth grayscale images to 8 bits
  32         if (ico_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
  33 +#if PNG_LIBPNG_VER < 10400
  34                 png_set_gray_1_2_4_to_8(ico_png_ptr);
  35 +#else
  36 +               png_set_expand_gray_1_2_4_to_8(ico_png_ptr);
  37 +#endif
  38         }
  39
  40         // Expand RGB images with transparency to full alpha channels
  41 --- DevIL-1.7.8/devil-1.7.8/m4/devil-definitions.m4.orig        2009-03-08 08:10:05.000000000 +0100
  42 +++ DevIL-1.7.8/devil-1.7.8/m4/devil-definitions.m4     2010-10-15 09:31:19.551741882 +0200
  43 @@ -244,12 +244,12 @@
  44
  45  AC_DEFUN([SETTLE_PNG],
  46           [DEVIL_IL_LIB([png.h],
  47 -                       [png12])
  48 -          AS_IF([test "x$have_png12" = "xno"],
  49 +                       [png])
  50 +          AS_IF([test "x$have_png" = "xno"],
  51                  [DEVIL_IL_LIB([png.h],
  52 -                              [png])
  53 -                 lib_test_result="$have_png"],
  54 -                [lib_test_result="$have_png12"])
  55 +                              [png12])
  56 +                 lib_test_result="$have_png12"],
  57 +                [lib_test_result="$have_png"])
  58            AS_IF([test "x$lib_test_result" = "xyes"],
  59                  [MAYBE_OPTIONAL_DEPENDENCY([IL],
  60                                             [libpng]) ]) ])