- move 1.4 from DEVEL; 1.2 at libpng12.spec

Changed files:
    libpng-apng.patch -> 1.11
    libpng-export_old.patch -> 1.5
    libpng-norpath.patch -> 1.5
    libpng-opt.patch -> 1.12
    libpng-pngminus.patch -> 1.7
    libpng-revert.patch -> 1.6
    libpng.spec -> 1.177

diff --git a/libpng-apng.patch b/libpng-apng.patch
index 07d57df8fcd18346479561c96c61ea2858da46ad..656eba6c2c87fdb3e5da95c5238220106d9d0993 100644 (file)
--- a/libpng-apng.patch
+++ b/libpng-apng.patch
@@ -2,19 +2,19 @@ Index: pngread.c
 ===================================================================
 --- pngread.c
 +++ pngread.c
-@@ -423,6 +423,11 @@
+@@ -292,6 +292,11 @@
  #ifdef PNG_READ_zTXt_SUPPORTED
-       PNG_CONST PNG_zTXt;
+       PNG_zTXt;
  #endif
 +#ifdef PNG_READ_APNG_SUPPORTED
-+      PNG_CONST PNG_acTL;
-+      PNG_CONST PNG_fcTL;
-+      PNG_CONST PNG_fdAT;
++      PNG_acTL;
++      PNG_fcTL;
++      PNG_fdAT;
 +#endif
- #endif /* PNG_USE_LOCAL_ARRAYS */
        png_uint_32 length = png_read_chunk_header(png_ptr);
        PNG_CONST png_bytep chunk_name = png_ptr->chunk_name;
-@@ -467,6 +472,9 @@
+ 
+@@ -335,6 +340,9 @@
                    !(png_ptr->mode & PNG_HAVE_PLTE))
              png_error(png_ptr, "Missing PLTE before IDAT");
  
@@ -24,7 +24,7 @@ Index: pngread.c
           png_ptr->idat_size = length;
           png_ptr->mode |= PNG_HAVE_IDAT;
           break;
-@@ -539,12 +547,97 @@
+@@ -407,12 +415,95 @@
        else if (!png_memcmp(chunk_name, png_iTXt, 4))
           png_handle_iTXt(png_ptr, info_ptr, length);
  #endif
@@ -66,11 +66,9 @@ Index: pngread.c
 +    have_chunk_after_DAT = 0;
 +    for (;;)
 +    {
-+#ifdef PNG_USE_LOCAL_ARRAYS
 +        PNG_IDAT;
 +        PNG_fdAT;
 +        PNG_fcTL;
-+#endif
 +        png_byte chunk_length[4];
 +        png_uint_32 length;
 +        
@@ -122,18 +120,18 @@ Index: pngread.c
  /* Optional call to update the users info_ptr structure */
  void PNGAPI
  png_read_update_info(png_structp png_ptr, png_infop info_ptr)
-@@ -584,6 +677,10 @@
+@@ -453,6 +544,10 @@
  png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
  {
-    PNG_CONST PNG_IDAT;
+    PNG_IDAT;
 +#ifdef PNG_READ_APNG_SUPPORTED
-+   PNG_CONST PNG_fdAT;
-+   PNG_CONST PNG_IEND;
++   PNG_fdAT;
++   PNG_IEND;
 +#endif
     PNG_CONST int png_pass_dsp_mask[7] = {0xff, 0x0f, 0xff, 0x33, 0xff, 0x55,
        0xff};
     PNG_CONST int png_pass_mask[7] = {0x80, 0x08, 0x88, 0x22, 0xaa, 0x55, 0xff};
-@@ -716,13 +813,39 @@
+@@ -585,13 +680,39 @@
     {
        if (!(png_ptr->zstream.avail_in))
        {
@@ -175,8 +173,8 @@ Index: pngread.c
           }
           png_ptr->zstream.avail_in = (uInt)png_ptr->zbuf_size;
           png_ptr->zstream.next_in = png_ptr->zbuf;
-@@ -740,6 +863,9 @@
-             png_error(png_ptr, "Extra compressed data");
+@@ -609,6 +730,9 @@
+             png_benign_error(png_ptr, "Extra compressed data");
           png_ptr->mode |= PNG_AFTER_IDAT;
           png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
 +#ifdef PNG_READ_APNG_SUPPORTED
@@ -185,19 +183,19 @@ Index: pngread.c
           break;
        }
        if (ret != Z_OK)
-@@ -997,6 +1123,11 @@
+@@ -864,6 +988,11 @@
  #ifdef PNG_READ_zTXt_SUPPORTED
-       PNG_CONST PNG_zTXt;
+       PNG_zTXt;
  #endif
 +#ifdef PNG_READ_APNG_SUPPORTED
-+      PNG_CONST PNG_acTL;
-+      PNG_CONST PNG_fcTL;
-+      PNG_CONST PNG_fdAT;
++      PNG_acTL;
++      PNG_fcTL;
++      PNG_fdAT;
 +#endif
- #endif /* PNG_USE_LOCAL_ARRAYS */
        png_uint_32 length = png_read_chunk_header(png_ptr);
        PNG_CONST png_bytep chunk_name = png_ptr->chunk_name;
-@@ -1097,6 +1228,14 @@
+ 
+@@ -963,6 +1092,14 @@
        else if (!png_memcmp(chunk_name, png_iTXt, 4))
           png_handle_iTXt(png_ptr, info_ptr, length);
  #endif
@@ -273,7 +271,7 @@ Index: pngget.c
 +        width != NULL && height != NULL && 
 +        x_offset != NULL && x_offset != NULL && 
 +        delay_num != NULL && delay_den != NULL &&
-+      dispose_op != NULL && blend_op != NULL)
++        dispose_op != NULL && blend_op != NULL)
 +    {
 +        *width = info_ptr->next_frame_width;
 +        *height = info_ptr->next_frame_height;
@@ -384,27 +382,11 @@ Index: pngget.c
  #ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
  png_uint_32 PNGAPI
  png_get_unknown_chunks(png_structp png_ptr, png_infop info_ptr,
-Index: png.c
-===================================================================
---- png.c
-+++ png.c
-@@ -56,6 +56,11 @@
- PNG_tIME;
- PNG_tRNS;
- PNG_zTXt;
-+#ifdef PNG_APNG_SUPPORTED
-+PNG_acTL;
-+PNG_fcTL;
-+PNG_fdAT;
-+#endif
- 
- #ifdef PNG_READ_SUPPORTED
- /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
 Index: png.h
 ===================================================================
 --- png.h
 +++ png.h
-@@ -1029,6 +1029,19 @@
+@@ -861,6 +861,19 @@
     png_fixed_point int_y_blue PNG_DEPSTRUCT;
  #endif
  
@@ -424,7 +406,7 @@ Index: png.h
  } png_info;
  
  typedef png_info FAR * png_infop;
-@@ -1130,6 +1143,10 @@
+@@ -958,6 +971,10 @@
  #define PNG_INFO_sPLT 0x2000   /* ESR, 1.0.6 */
  #define PNG_INFO_sCAL 0x4000   /* ESR, 1.0.6 */
  #define PNG_INFO_IDAT 0x8000L  /* ESR, 1.0.6 */
@@ -435,7 +417,7 @@ Index: png.h
  
  /* This is used for the transformation routines, as some of them
   * change these values for the row.  It also should enable using
-@@ -1170,6 +1187,10 @@
+@@ -998,6 +1015,10 @@
  typedef void (PNGAPI *png_progressive_end_ptr) PNGARG((png_structp, png_infop));
  typedef void (PNGAPI *png_progressive_row_ptr) PNGARG((png_structp, png_bytep,
     png_uint_32, int));
@@ -446,8 +428,8 @@ Index: png.h
  #endif
  
  #if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
-@@ -1506,6 +1527,39 @@
-    png_uint_32 user_height_max PNG_DEPSTRUCT;
+@@ -1320,6 +1341,39 @@
+    png_uint_32 user_chunk_cache_max PNG_DEPSTRUCT;
  #endif
  
 +#ifdef PNG_APNG_SUPPORTED
@@ -486,7 +468,7 @@ Index: png.h
  /* New member added in libpng-1.0.25 and 1.2.17 */
  #ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
     /* Storage for unknown chunk that the library doesn't recognize. */
-@@ -1840,6 +1894,18 @@
+@@ -1648,6 +1702,18 @@
  extern PNG_EXPORT(void,png_write_image) PNGARG((png_structp png_ptr,
     png_bytepp image));
  
@@ -494,18 +476,18 @@ Index: png.h
 +extern PNG_EXPORT (void,png_write_frame_head) PNGARG((png_structp png_ptr,
 +   png_infop png_info, png_bytepp row_pointers,
 +   png_uint_32 width, png_uint_32 height,
-+   png_uint_32 x_offset, png_uint_32 y_offset, 
++   png_uint_32 x_offset, png_uint_32 y_offset,
 +   png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op,
 +   png_byte blend_op));
 +
 +extern PNG_EXPORT (void,png_write_frame_tail) PNGARG((png_structp png_ptr,
 +   png_infop png_info));
 +#endif
-+   
- /* Writes the end of the PNG file. */
++
+ /* Write the end of the PNG file. */
  extern PNG_EXPORT(void,png_write_end) PNGARG((png_structp png_ptr,
     png_infop info_ptr));
-@@ -2093,6 +2159,11 @@
+@@ -1891,6 +1957,11 @@
     png_voidp progressive_ptr,
     png_progressive_info_ptr info_fn, png_progressive_row_ptr row_fn,
     png_progressive_end_ptr end_fn));
@@ -517,7 +499,7 @@ Index: png.h
  
  /* Returns the user pointer associated with the push read functions */
  extern PNG_EXPORT(png_voidp,png_get_progressive_ptr)
-@@ -2533,6 +2604,59 @@
+@@ -2317,6 +2388,59 @@
  #endif
  #endif /* PNG_sCAL_SUPPORTED || PNG_WRITE_sCAL_SUPPORTED */
  
@@ -577,7 +559,11 @@ Index: png.h
  #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
  /* Provide a list of chunks and how they are to be handled, if the built-in
     handling or default unknown chunk handling is not desired.  Any chunks not
-@@ -2897,6 +3021,10 @@
+Index: pngpriv.h
+===================================================================
+--- pngpriv.h
++++ pngpriv.h
+@@ -98,6 +98,10 @@
  #define PNG_BACKGROUND_IS_GRAY     0x800
  #define PNG_HAVE_PNG_SIGNATURE    0x1000
  #define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000 /* Have another chunk after IDAT */
@@ -587,32 +573,20 @@ Index: png.h
 +#endif
  
  /* Flags for the transformations the PNG library does on the image data */
- #define PNG_BGR                0x0001
-@@ -3039,6 +3167,11 @@
- #define PNG_tIME png_byte png_tIME[5] = {116,  73,  77,  69, '\0'}
- #define PNG_tRNS png_byte png_tRNS[5] = {116,  82,  78,  83, '\0'}
- #define PNG_zTXt png_byte png_zTXt[5] = {122,  84,  88, 116, '\0'}
+ #define PNG_BGR                 0x0001
+@@ -231,6 +235,11 @@
+ #define PNG_tIME PNG_CONST png_byte png_tIME[5] = {116,  73,  77,  69, '\0'}
+ #define PNG_tRNS PNG_CONST png_byte png_tRNS[5] = {116,  82,  78,  83, '\0'}
+ #define PNG_zTXt PNG_CONST png_byte png_zTXt[5] = {122,  84,  88, 116, '\0'}
 +#ifdef PNG_APNG_SUPPORTED
-+#define PNG_acTL png_byte png_acTL[5] = { 97,  99,  84,  76, '\0'}
-+#define PNG_fcTL png_byte png_fcTL[5] = {102,  99,  84,  76, '\0'}
-+#define PNG_fdAT png_byte png_fdAT[5] = {102, 100,  65,  84, '\0'}
++#define PNG_acTL PNG_CONST png_byte png_acTL[5] = { 97,  99,  84,  76, '\0'}
++#define PNG_fcTL PNG_CONST png_byte png_fcTL[5] = {102,  99,  84,  76, '\0'}
++#define PNG_fdAT PNG_CONST png_byte png_fdAT[5] = {102, 100,  65,  84, '\0'}
 +#endif
  
- #ifdef PNG_USE_GLOBAL_ARRAYS
- PNG_EXPORT_VAR (png_byte FARDATA) png_IHDR[5];
-@@ -3062,6 +3195,11 @@
- PNG_EXPORT_VAR (png_byte FARDATA) png_tIME[5];
- PNG_EXPORT_VAR (png_byte FARDATA) png_tRNS[5];
- PNG_EXPORT_VAR (png_byte FARDATA) png_zTXt[5];
-+#ifdef PNG_APNG_SUPPORTED
-+PNG_EXPORT_VAR (png_byte FARDATA) png_acTL[5];
-+PNG_EXPORT_VAR (png_byte FARDATA) png_fcTL[5];
-+PNG_EXPORT_VAR (png_byte FARDATA) png_fdAT[5];
-+#endif
- #endif /* PNG_USE_GLOBAL_ARRAYS */
  
- #if defined(PNG_1_0_X) || defined (PNG_1_2_X)
-@@ -3344,6 +3482,17 @@
+ /* Inhibit C++ name-mangling for libpng functions but not for system calls. */
+@@ -468,6 +477,17 @@
  #endif
  #endif
  
@@ -628,11 +602,11 @@ Index: png.h
 +#endif
 +
  /* Called when finished processing a row of data */
- PNG_EXTERN void png_write_finish_row PNGARG((png_structp png_ptr)) PNG_PRIVATE;
+ PNG_EXTERN void png_write_finish_row PNGARG((png_structp png_ptr));
  
-@@ -3396,6 +3545,20 @@
+@@ -520,6 +540,20 @@
  PNG_EXTERN void png_read_transform_info PNGARG((png_structp png_ptr,
-    png_infop info_ptr)) PNG_PRIVATE;
+    png_infop info_ptr));
  
 +#ifdef PNG_READ_APNG_SUPPORTED
 +/* Private, reset some things to become ready for reading next frame */
@@ -651,8 +625,8 @@ Index: png.h
  /* These are the functions that do the transformations */
  #ifdef PNG_READ_FILLER_SUPPORTED
  PNG_EXTERN void png_do_read_filler PNGARG((png_row_infop row_info,
-@@ -3619,6 +3782,18 @@
-    png_uint_32 length)) PNG_PRIVATE;
+@@ -735,6 +769,18 @@
+    png_uint_32 length));
  #endif
  
 +#ifdef PNG_READ_APNG_SUPPORTED
@@ -668,7 +642,7 @@ Index: png.h
 +#endif
 +
  PNG_EXTERN void png_handle_unknown PNGARG((png_structp png_ptr,
-    png_infop info_ptr, png_uint_32 length)) PNG_PRIVATE;
+    png_infop info_ptr, png_uint_32 length));
  
 Index: pngwrite.c
 ===================================================================
@@ -696,7 +670,7 @@ Index: pngwrite.c
  
     /* See if user wants us to write information chunks */
     if (info_ptr != NULL)
-@@ -1582,4 +1590,39 @@
+@@ -1451,4 +1459,39 @@
     params = params;
  }
  #endif
@@ -740,18 +714,18 @@ Index: pngconf.h
 ===================================================================
 --- pngconf.h
 +++ pngconf.h
-@@ -944,6 +944,10 @@
- #  define PNG_NO_READ_tEXt
- #  define PNG_NO_READ_zTXt
+@@ -845,6 +845,10 @@
+ #  define PNG_READ_tRNS_SUPPORTED
+ #  define PNG_tRNS_SUPPORTED
  #endif
 +#ifndef PNG_NO_READ_APNG
 +#  define PNG_READ_APNG_SUPPORTED
 +#  define PNG_APNG_SUPPORTED
 +#endif
- #ifndef PNG_NO_READ_bKGD
- #  define PNG_READ_bKGD_SUPPORTED
- #  define PNG_bKGD_SUPPORTED
-@@ -1170,6 +1174,14 @@
+ #ifndef PNG_NO_READ_zTXt
+ #  define PNG_READ_zTXt_SUPPORTED
+ #  define PNG_zTXt_SUPPORTED
+@@ -1002,6 +1006,14 @@
  #    define PNG_TEXT_SUPPORTED
  #  endif
  #endif
@@ -770,19 +744,19 @@ Index: pngpread.c
 ===================================================================
 --- pngpread.c
 +++ pngpread.c
-@@ -206,6 +206,11 @@
+@@ -205,6 +205,11 @@
  #ifdef PNG_READ_zTXt_SUPPORTED
-       PNG_CONST PNG_zTXt;
+       PNG_zTXt;
  #endif
 +#ifdef PNG_READ_APNG_SUPPORTED
-+      PNG_CONST PNG_acTL;
-+      PNG_CONST PNG_fcTL;
-+      PNG_CONST PNG_fdAT;
++      PNG_acTL;
++      PNG_fcTL;
++      PNG_fdAT;
 +#endif
- #endif /* PNG_USE_LOCAL_ARRAYS */
  
     /* First we make sure we have enough data for the 4 byte chunk name
-@@ -232,6 +237,103 @@
+     * and the 4 byte chunk length before proceeding with decoding the
+@@ -230,6 +235,103 @@
        png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
     }
  
@@ -886,8 +860,8 @@ Index: pngpread.c
     if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
       if (png_ptr->mode & PNG_AFTER_IDAT)
          png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;
-@@ -327,6 +429,9 @@
-             png_error(png_ptr, "Too many IDAT's found");
+@@ -325,6 +427,9 @@
+             png_benign_error(png_ptr, "Too many IDATs found");
        }
  
 +#ifdef PNG_READ_APNG_SUPPORTED
@@ -896,7 +870,7 @@ Index: pngpread.c
        png_ptr->idat_size = png_ptr->push_length;
        png_ptr->mode |= PNG_HAVE_IDAT;
        png_ptr->process_mode = PNG_READ_IDAT_MODE;
-@@ -557,6 +662,38 @@
+@@ -555,6 +660,38 @@
     }
  
  #endif
@@ -935,17 +909,14 @@ Index: pngpread.c
     else
     {
        if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-@@ -731,13 +868,17 @@
+@@ -729,11 +866,15 @@
  png_push_read_IDAT(png_structp png_ptr)
  {
- #ifdef PNG_USE_LOCAL_ARRAYS
--   PNG_CONST PNG_IDAT;
-+   PNG_IDAT;
+    PNG_IDAT;
 +#ifdef PNG_READ_APNG_SUPPORTED
 +   PNG_fdAT;
 +   PNG_IEND;
 +#endif
- #endif
     if (!(png_ptr->mode & PNG_HAVE_CHUNK_HEADER))
     {
        png_byte chunk_length[4];
@@ -955,13 +926,13 @@ Index: pngpread.c
        {
           png_push_save_buffer(png_ptr);
           return;
-@@ -749,15 +890,62 @@
+@@ -745,15 +886,62 @@
        png_crc_read(png_ptr, png_ptr->chunk_name, 4);
        png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
  
 -      if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
 +#ifdef PNG_READ_APNG_SUPPORTED
-+      if (png_memcmp(png_ptr->chunk_name, (png_bytep)png_fdAT, 4)
++      if (png_memcmp(png_ptr->chunk_name, png_fdAT, 4)
 +          && png_ptr->num_frames_read > 0)
 +      {
 +          if (png_ptr->flags & PNG_FLAG_ZLIB_FINISHED)
@@ -1019,7 +990,7 @@ Index: pngpread.c
     }
     if (png_ptr->idat_size && png_ptr->save_buffer_size)
     {
-@@ -1719,6 +1907,17 @@
+@@ -1710,6 +1898,17 @@
     png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer);
  }
  
@@ -1041,8 +1012,8 @@ Index: pngset.c
 ===================================================================
 --- pngset.c
 +++ pngset.c
-@@ -266,6 +266,11 @@
-       info_ptr->rowbytes = (png_size_t)0;
+@@ -260,6 +260,11 @@
+       info_ptr->rowbytes = 0;
     else
        info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, width);
 +
@@ -1053,7 +1024,7 @@ Index: pngset.c
  }
  
  #ifdef PNG_oFFs_SUPPORTED
-@@ -960,6 +965,142 @@
+@@ -932,6 +937,142 @@
  }
  #endif /* PNG_sPLT_SUPPORTED */
  
@@ -1166,12 +1137,12 @@ Index: pngset.c
 +        png_error(png_ptr, "invalid y_offset in fcTL (> 2^31-1)");
 +
 +    if (dispose_op != PNG_DISPOSE_OP_NONE &&
-+      dispose_op != PNG_DISPOSE_OP_BACKGROUND &&
-+      dispose_op != PNG_DISPOSE_OP_PREVIOUS)
++        dispose_op != PNG_DISPOSE_OP_BACKGROUND &&
++        dispose_op != PNG_DISPOSE_OP_PREVIOUS)
 +        png_error(png_ptr, "invalid dispose_op in fcTL");
 +
 +    if (blend_op != PNG_BLEND_OP_SOURCE &&
-+      blend_op != PNG_BLEND_OP_OVER)
++        blend_op != PNG_BLEND_OP_OVER)
 +        png_error(png_ptr, "invalid blend_op in fcTL");
 +}
 +
@@ -1193,14 +1164,14 @@ Index: pngset.c
 +}
 +#endif /* PNG_APNG_SUPPORTED */
 +
- #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+ #ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
  void PNGAPI
  png_set_unknown_chunks(png_structp png_ptr,
 Index: pngrutil.c
 ===================================================================
 --- pngrutil.c
 +++ pngrutil.c
-@@ -425,6 +425,11 @@
+@@ -423,6 +423,11 @@
     filter_type = buf[11];
     interlace_type = buf[12];
  
@@ -1212,7 +1183,7 @@ Index: pngrutil.c
     /* Set internal variables */
     png_ptr->width = width;
     png_ptr->height = height;
-@@ -2227,6 +2232,168 @@
+@@ -2294,6 +2299,168 @@
  }
  #endif
  
@@ -1381,7 +1352,7 @@ Index: pngrutil.c
  /* This function is called when we haven't found a handler for a
     chunk.  If there isn't a problem with the chunk itself (ie bad
     chunk name, CRC, or a critical chunk), the chunk is silently ignored
-@@ -3240,4 +3407,84 @@
+@@ -3333,4 +3500,82 @@
  
     png_ptr->flags |= PNG_FLAG_ROW_INIT;
  }
@@ -1407,14 +1378,13 @@ Index: pngrutil.c
 +    png_ptr->height = info_ptr->next_frame_height;
 +    png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth,png_ptr->width);
 +    if (png_ptr->prev_row)
-+       png_memset_check(png_ptr, png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
++       png_memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
 +}
 +
 +/* same as png_read_reset() but for the progressive reader */
 +void /* PRIVATE */
 +png_progressive_read_reset(png_structp png_ptr)
 +{
-+#ifdef PNG_USE_LOCAL_ARRAYS
 +    /* start of interlace block */
 +    const int FARDATA png_pass_start[] = {0, 4, 0, 2, 0, 1, 0};
 +
@@ -1426,7 +1396,6 @@ Index: pngrutil.c
 +
 +    /* offset to next interlace block in the y direction */
 +    const int FARDATA png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2};
-+#endif
 +    png_uint_32 row_bytes;
 +    
 +    if (png_ptr->interlaced)
@@ -1470,7 +1439,7 @@ Index: pngwutil.c
 ===================================================================
 --- pngwutil.c
 +++ pngwutil.c
-@@ -515,6 +515,11 @@
+@@ -538,6 +538,11 @@
     /* Write the chunk */
     png_write_chunk(png_ptr, (png_bytep)png_IHDR, buf, (png_size_t)13);
  
@@ -1482,17 +1451,17 @@ Index: pngwutil.c
     /* Initialize zlib with PNG info */
     png_ptr->zstream.zalloc = png_zalloc;
     png_ptr->zstream.zfree = png_zfree;
-@@ -638,6 +643,9 @@
+@@ -658,6 +663,9 @@
+ png_write_IDAT(png_structp png_ptr, png_bytep data, png_size_t length)
  {
- #ifdef PNG_USE_LOCAL_ARRAYS
     PNG_IDAT;
 +#ifdef PNG_WRITE_APNG_SUPPORTED
 +   PNG_fdAT;
 +#endif
- #endif
  
     png_debug(1, "in png_write_IDAT");
-@@ -683,7 +691,28 @@
+ 
+@@ -702,7 +710,28 @@
              "Invalid zlib compression method or flags in IDAT");
     }
  
@@ -1521,7 +1490,7 @@ Index: pngwutil.c
     png_ptr->mode |= PNG_HAVE_IDAT;
  }
  
-@@ -1750,6 +1779,70 @@
+@@ -1709,6 +1738,66 @@
  }
  #endif
  
@@ -1530,9 +1499,7 @@ Index: pngwutil.c
 +png_write_acTL(png_structp png_ptr,
 +   png_uint_32 num_frames, png_uint_32 num_plays)
 +{
-+#ifdef PNG_USE_LOCAL_ARRAYS
 +    PNG_acTL;
-+#endif
 +    png_byte data[16];
 +    
 +    png_debug(1, "in png_write_acTL");
@@ -1554,9 +1521,7 @@ Index: pngwutil.c
 +    png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op, 
 +    png_byte blend_op)
 +{
-+#ifdef PNG_USE_LOCAL_ARRAYS
 +    PNG_fcTL;
-+#endif
 +    png_byte data[26];
 +    
 +    png_debug(1, "in png_write_fcTL");
@@ -1592,7 +1557,7 @@ Index: pngwutil.c
  /* Initializes the row writing capability of libpng */
  void /* PRIVATE */
  png_write_start_row(png_structp png_ptr)
-@@ -2155,8 +2248,8 @@
+@@ -2110,8 +2199,8 @@
  #ifndef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
    if (png_ptr->row_number == 0 && filter_to_do == PNG_ALL_FILTERS)
    {
@@ -1603,7 +1568,7 @@ Index: pngwutil.c
    }
  #endif 
  
-@@ -2825,4 +2918,39 @@
+@@ -2780,4 +2869,39 @@
     }
  #endif
  }
@@ -1647,7 +1612,7 @@ Index: pngrtran.c
 ===================================================================
 --- pngrtran.c
 +++ pngrtran.c
-@@ -1346,7 +1346,7 @@
+@@ -1320,7 +1320,7 @@
         * pixels.  This check added to libpng-1.2.19
         */
  #if (PNG_WARN_UNINITIALIZED_ROW==1)

diff --git a/libpng-export_old.patch b/libpng-export_old.patch
deleted file mode 100644 (file)
index e25cbd5..0000000
--- a/libpng-export_old.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- libpng-1.2.41/png.h~       2009-12-03 01:46:00.000000000 +0000
-+++ libpng-1.2.41/png.h        2009-12-04 11:43:03.564781939 +0000
-@@ -1858,16 +1858,16 @@
- extern PNG_EXPORT(void,png_destroy_read_struct) PNGARG((png_structpp
-    png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr));
- 
--/* Free all memory used by the read (old method - NOT DLL EXPORTED) */
--extern void png_read_destroy PNGARG((png_structp png_ptr, png_infop info_ptr,
--   png_infop end_info_ptr)) PNG_DEPRECATED;
-+/* Free all memory used by the read (old method) */
-+extern PNG_EXPORT(void,png_read_destroy) PNGARG((png_structp png_ptr,
-+   png_infop info_ptr, png_infop end_info_ptr)); PNG_DEPRECATED;
- 
- /* Free any memory associated with the png_struct and the png_info_structs */
- extern PNG_EXPORT(void,png_destroy_write_struct)
-    PNGARG((png_structpp png_ptr_ptr, png_infopp info_ptr_ptr));
- 
--/* Free any memory used in png_ptr struct (old method - NOT DLL EXPORTED) */
--extern void png_write_destroy PNGARG((png_structp png_ptr)) PNG_DEPRECATED;
-+/* Free any memory used in png_ptr struct (old method) */
-+extern PNG_EXPORT(void,png_write_destroy) PNGARG((png_structp png_ptr)); PNG_DEPRECATED;
- 
- /* Set the libpng method of handling chunk CRC errors */
- extern PNG_EXPORT(void,png_set_crc_action) PNGARG((png_structp png_ptr,
---- libpng-1.2.41/pngread.c~   2009-12-03 01:46:00.000000000 +0000
-+++ libpng-1.2.41/pngread.c    2009-12-04 11:44:30.031438764 +0000
-@@ -1177,7 +1177,7 @@
- }
- 
- /* Free all memory used by the read (old method) */
--void /* PRIVATE */
-+void PNGAPI
- png_read_destroy(png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr)
- {
- #ifdef PNG_SETJMP_SUPPORTED
---- libpng-1.2.41/pngwrite.c~  2009-12-03 01:46:00.000000000 +0000
-+++ libpng-1.2.41/pngwrite.c   2009-12-04 11:46:02.941431637 +0000
-@@ -1100,7 +1100,7 @@
- 
- 
- /* Free any memory used in png_ptr struct (old method) */
--void /* PRIVATE */
-+void PNGAPI
- png_write_destroy(png_structp png_ptr)
- {
- #ifdef PNG_SETJMP_SUPPORTED

diff --git a/libpng-norpath.patch b/libpng-norpath.patch
deleted file mode 100644 (file)
index 0e2ca34..0000000
--- a/libpng-norpath.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- libpng-1.2.21/scripts/makefile.gcmmx~      2007-10-08 19:52:12.000000000 +0200
-+++ libpng-1.2.21/scripts/makefile.gcmmx       2007-10-08 19:55:00.000000000 +0200
-@@ -70,8 +70,8 @@
- #     -m486 -malign-double -ffast-math \
- #     $(ALIGN) -funroll-loops -funroll-all-loops -fomit-frame-pointer 
- 
--LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm
--LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm
-+LDFLAGS=-L. -lpng12 -lz -lm
-+LDFLAGS_A=libpng.a -lz -lm
- 
- 
- INCPATH=$(prefix)/include
-@@ -124,7 +124,7 @@
-       echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
-       echo cppflags=\"-DPNG_THREAD_UNSAFE_OK \"; \
-       echo L_opts=\"-L$(LIBPATH)\"; \
--      echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \
-+      echo R_opts=\"\"; \
-       echo libs=\"-lpng12 -lz -lm\"; \
-       cat scripts/libpng-config-body.in ) > libpng-config
-       chmod +x libpng-config
-@@ -238,7 +238,6 @@
- test-installed:
-       $(CC) -I$(ZLIBINC) \
-          `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
--         -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
-          -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`
-       ./pngtesti pngtest.png
- 
---- libpng-1.2.21/scripts/makefile.linux~      2007-10-08 19:52:12.000000000 +0200
-+++ libpng-1.2.21/scripts/makefile.linux       2007-10-08 19:56:43.000000000 +0200
-@@ -50,8 +50,8 @@
- CFLAGS=-I$(ZLIBINC) -Wall $(OPT_FLAGS) -funroll-loops \
-       $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
- 
--LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm
--LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm
-+LDFLAGS=-L. -lpng12 -lz -lm
-+LDFLAGS_A=libpng.a -lz -lm
- 
- INCPATH=$(prefix)/include
- LIBPATH=$(exec_prefix)/lib
-@@ -102,7 +102,7 @@
-       echo prefix=\"$(prefix)\"; \
-       echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
-       echo L_opts=\"-L$(LIBPATH)\"; \
--      echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \
-+      echo R_opts=\"\"; \
-       echo libs=\"-lpng12 -lz -lm\"; \
-       cat scripts/libpng-config-body.in ) > libpng-config
-       chmod +x libpng-config
-@@ -214,7 +214,6 @@
- test-installed:
-       $(CC) -I$(ZLIBINC) \
-          `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
--         -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
-          -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`
-       ./pngtesti pngtest.png
- 

diff --git a/libpng-opt.patch b/libpng-opt.patch
deleted file mode 100644 (file)
index b6f5e7b..0000000
--- a/libpng-opt.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- libpng-1.2.31/scripts/makefile.gcmmx.orig  2008-08-21 12:54:14.000000000 +0200
-+++ libpng-1.2.31/scripts/makefile.gcmmx       2008-08-23 01:23:37.018625344 +0200
-@@ -43,8 +43,8 @@
- # Where the zlib library and include files are located.
- #ZLIBLIB=/usr/local/lib
- #ZLIBINC=/usr/local/include
--ZLIBLIB=../zlib
--ZLIBINC=../zlib
-+ZLIBLIB=/usr/lib
-+ZLIBINC=
- 
- ALIGN=
- # for i386:
-@@ -58,8 +58,8 @@
- 
- # Remove -DPNG_THREAD_UNSAFE_OK if you need thread safety
- ### for generic gcc:
--CFLAGS=-DPNG_THREAD_UNSAFE_OK -I$(ZLIBINC) -W -Wall -O \
--      $(ALIGN) -funroll-loops \
-+CFLAGS=-DPNG_USE_PNGGCCRC -I$(ZLIBINC) -W -Wall \
-+      $(OPT_FLAGS) $(ALIGN) \
-       -fomit-frame-pointer  # $(WARNMORE) -g -DPNG_DEBUG=5
- ### for gcc 2.95.2 on 686:
- #CFLAGS=-DPNG_THREAD_UNSAFE_OK -I$(ZLIBINC) -W -Wall -O \
---- libpng-1.2.31/scripts/makefile.linux.orig  2008-08-21 12:54:14.000000000 +0200
-+++ libpng-1.2.31/scripts/makefile.linux       2008-08-23 01:26:41.342625344 +0200
-@@ -35,8 +35,8 @@
- # Where the zlib library and include files are located.
- #ZLIBLIB=/usr/local/lib
- #ZLIBINC=/usr/local/include
--ZLIBLIB=../zlib
--ZLIBINC=../zlib
-+ZLIBLIB=/usr/lib
-+ZLIBINC=
- 
- ALIGN=
- # for i386:
-@@ -48,7 +48,7 @@
- 
- # for pgcc version 2.95.1, -O3 is buggy; don't use it.
- 
--CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE \
-+CFLAGS=-I$(ZLIBINC) -W -Wall $(OPT_FLAGS) -DPNG_NO_MMX_CODE \
-       $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
- 
- LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm

diff --git a/libpng-pngminus.patch b/libpng-pngminus.patch
index 1ef91b03be06a6d0bf141b58c50a21b2337fc124..e1361579ca4a212beea17a094433a54164eae962 100644 (file)
--- a/libpng-pngminus.patch
+++ b/libpng-pngminus.patch
@@ -5,7 +5,7 @@
  #PNGLIBS = $(PNGPATH)/lib/libpng12.a
  PNGINC = -I../..
 -PNGLIB = -L../.. -lpng
-+PNGLIB = -L../.. -L../../.libs -lpng12
++PNGLIB = -L../.. -L../../.libs -lpng14
  PNGLIBS = ../../libpng.a
  
  #ZPATH = /usr/local

diff --git a/libpng-revert.patch b/libpng-revert.patch
deleted file mode 100644 (file)
index dc50981..0000000
--- a/libpng-revert.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- libpng-1.2.12/scripts/makefile.gcmmx.orig  2006-06-29 10:10:33.974440000 +0200
-+++ libpng-1.2.12/scripts/makefile.gcmmx       2006-06-29 10:12:14.144440000 +0200
-@@ -142,12 +142,10 @@
- $(LIBSOVER): $(OBJSDLL)
-       $(CC) -shared -Wl,-soname,$(LIBSOMAJ) \
-       -o $(LIBSOVER) \
--      $(OBJSDLL)
-+      $(OBJSDLL) -lz -lm
- 
--$(OLDSOVER): $(OBJSDLL)
--      $(CC) -shared -Wl,-soname,$(OLDSOMAJ) \
--      -o $(OLDSOVER) \
--      $(OBJSDLL)
-+$(OLDSOVER): $(LIBSOVER)
-+      $(LN_SF) $(LIBSOVER) $(OLDSOVER)
- 
- pngtest: pngtest.o $(LIBSO)
-       $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
-@@ -190,9 +188,8 @@
-       -@$(RM_F) $(DL)/$(OLDSOMAJ)
-       -@$(RM_F) $(DL)/$(OLDSOVER)*
-       cp $(LIBSOVER) $(DL)
--      cp $(OLDSOVER) $(DL)
-+      $(LN_SF) $(LIBSOVER) $(DL)/$(OLDSOVER)
-       chmod 755 $(DL)/$(LIBSOVER)
--      chmod 755 $(DL)/$(OLDSOVER)
-       (cd $(DL); \
-       $(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \
-       $(LN_SF) $(OLDSOMAJ) $(OLDSO); \
---- libpng-1.2.12/scripts/makefile.linux.orig  2006-06-29 10:10:33.974440000 +0200
-+++ libpng-1.2.12/scripts/makefile.linux       2006-06-29 10:13:16.824440000 +0200
-@@ -110,12 +110,10 @@
-       $(LN_SF) $(LIBSOVER) $(LIBSOMAJ)
- 
- $(LIBSOVER): $(OBJSDLL)
--      $(CC) -shared -Wl,-soname,$(LIBSOMAJ) -o $(LIBSOVER) $(OBJSDLL)
-+      $(CC) -shared -Wl,-soname,$(LIBSOMAJ) -o $(LIBSOVER) $(OBJSDLL) -lz -lm
- 
--$(OLDSOVER): $(OBJSDLL)
--      $(CC) -shared -Wl,-soname,$(OLDSOMAJ) \
--      -o $(OLDSOVER) \
--      $(OBJSDLL)
-+$(OLDSOVER): $(LIBSOVER)
-+      $(LN_SF) $(LIBSOVER) $(OLDSOVER)
- 
- pngtest: pngtest.o $(LIBSO)
-       $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
-@@ -158,9 +156,8 @@
-       -@$(RM_F) $(DL)/$(OLDSOMAJ)
-       -@$(RM_F) $(DL)/$(OLDSOVER)*
-       cp $(LIBSOVER) $(DL)
--      cp $(OLDSOVER) $(DL)
-+      $(LN_SF) $(LIBSOVER) $(DL)/$(OLDSOVER)
-       chmod 755 $(DL)/$(LIBSOVER)
--      chmod 755 $(DL)/$(OLDSOVER)
-       (cd $(DL); \
-       $(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \
-       $(LN_SF) $(OLDSOMAJ) $(OLDSO); \

diff --git a/libpng.spec b/libpng.spec
index 3140a73107cf101bb463ab2b0bfe8be49213b68d..5c477177bb6c558942a9e4b9810a74554ad99e48 100644 (file)
--- a/libpng.spec
+++ b/libpng.spec
@@ -6,29 +6,20 @@ Summary(pl.UTF-8):    Biblioteka PNG
 Summary(pt_BR.UTF-8):  Biblioteca PNG
 Summary(tr.UTF-8):     PNG kitaplığı
 Name:          libpng
-Version:       1.2.42
-Release:       2
+Version:       1.4.0
+Release:       0.1
 Epoch:         2
 License:       distributable
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/libpng/%{name}-%{version}.tar.xz
-# Source0-md5: dcf4892946e2d6aab6e46d02ed774315
+# Source0-md5: 2ce652ebe1589d7b2357aa6d0eccd07c
 Patch0:                %{name}-pngminus.patch
-Patch1:                %{name}-opt.patch
-Patch2:                %{name}-norpath.patch
-Patch3:                %{name}-export_old.patch
-Patch4:                %{name}-revert.patch
-# http://littlesvr.ca/apng/
-Patch5:                %{name}-apng.patch
+# http://littlesvr.ca/apng/diff/%{name}-%{version}-apng.patch | dos2unix
+Patch1:                %{name}-apng.patch
 URL:           http://www.libpng.org/pub/png/libpng.html
 BuildRequires: rpmbuild(macros) >= 1.213
 BuildRequires: xz >= 1:4.999.7
 BuildRequires: zlib-devel
-%ifarch %{x8664} ia64 ppc64 s390x sparc64
-Provides:      libpng.so.3()(64bit)
-%else
-Provides:      libpng.so.3
-%endif
 Provides:      libpng(APNG) = 0.10
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -111,22 +102,22 @@ PNG kitaplığını kullanan programlar geliştirmek için gereken
 kitaplıklar ve başlık dosyaları.
 
 %package static
-Summary:       Static PNG libraries
-Summary(de.UTF-8):     Statischen PNG Libraries
-Summary(pl.UTF-8):     Biblioteki statyczne PNG
+Summary:       Static PNG library
+Summary(de.UTF-8):     Statisch PNG Library
+Summary(pl.UTF-8):     Biblioteka statyczna PNG
 Summary(pt_BR.UTF-8):  Bibliotecas estáticas para desenvolvimento com libpng
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 Provides:      libpng(APNG)-static = 0.10
 
 %description static
-Static PNG libraries.
+Static PNG library.
 
 %description static -l de.UTF-8
-Statischen PNG Libraries.
+Statisch PNG Library.
 
 %description static -l pl.UTF-8
-Biblioteki statyczne PNG.
+Biblioteka statyczna PNG.
 
 %description static -l pt_BR.UTF-8
 Bibliotecas estáticas para desenvolvimento com libpng.
@@ -148,11 +139,7 @@ Narzędzia do konwersji plików PNG z lub do plików PNM.
 %setup -q -c -T
 xzcat -dc %{SOURCE0} | tar xf - -C ..
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p0
+%patch1 -p0
 
 %build
 %configure
@@ -165,13 +152,11 @@ xzcat -dc %{SOURCE0} | tar xf - -C ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_mandir}/man{3,5}} \
-       $RPM_BUILD_ROOT{%{_pkgconfigdir},%{_examplesdir}/%{name}-%{version}}
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-ln -s libpng12 $RPM_BUILD_ROOT%{_includedir}/libpng
 install contrib/pngminus/{png2pnm,pnm2png} $RPM_BUILD_ROOT%{_bindir}
 install example.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
@@ -183,33 +168,34 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc ANNOUNCE CHANGES KNOWNBUG README LICENSE
-%attr(755,root,root) %{_libdir}/libpng12.so.*.*.*
-%attr(755,root,root) %{_libdir}/libpng.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpng12.so.0
-# alternative soname (symlink in PLD, so must be packaged)
-%attr(755,root,root) %{_libdir}/libpng.so.3
+%doc ANNOUNCE CHANGES LICENSE README TODO
+%attr(755,root,root) %{_libdir}/libpng14.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpng14.so.14
 
 %files devel
 %defattr(644,root,root,755)
-%doc *.txt
-%attr(755,root,root) %{_bindir}/libpng12-config
+%doc libpng-%{version}.txt
+%attr(755,root,root) %{_bindir}/libpng14-config
 %attr(755,root,root) %{_bindir}/libpng-config
-%attr(755,root,root) %{_libdir}/libpng12.so
+%attr(755,root,root) %{_libdir}/libpng14.so
 %attr(755,root,root) %{_libdir}/libpng.so
-%{_pkgconfigdir}/libpng12.pc
+%{_libdir}/libpng14.la
+%{_libdir}/libpng.la
+%{_pkgconfigdir}/libpng14.pc
 %{_pkgconfigdir}/libpng.pc
-%{_includedir}/libpng12
-%{_includedir}/libpng
+%{_includedir}/libpng14
 %{_includedir}/png*.h
-%{_mandir}/man?/*
+%{_mandir}/man3/libpng.3*
+%{_mandir}/man3/libpngpf.3*
+%{_mandir}/man5/png.5*
 %{_examplesdir}/%{name}-%{version}
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libpng12.a
+%{_libdir}/libpng14.a
 %{_libdir}/libpng.a
 
 %files progs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/p*
+%attr(755,root,root) %{_bindir}/png2pnm
+%attr(755,root,root) %{_bindir}/pnm2png