Files libpng-1.2.36/contrib/gregbook/toucan.png and libpng-1.2.37beta01/contrib/gregbook/toucan.png differ diff -ru4NwbB libpng-1.2.36/example.c libpng-1.2.37beta01/example.c --- libpng-1.2.36/example.c 2009-05-07 16:51:54.517796798 -0500 +++ libpng-1.2.37beta01/example.c 2009-05-14 05:09:18.191756071 -0500 @@ -1,9 +1,9 @@ #if 0 /* in case someone actually tries to compile this */ /* example.c - an example of using libpng - * Last changed in libpng 1.2.36 [May 7, 2009] + * Last changed in libpng 1.2.37 [May 14, 2009] * This file has been placed in the public domain by the authors. * Maintained 1998-2009 Glenn Randers-Pehrson * Maintained 1996, 1997 Andreas Dilger) * Written 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -180,9 +182,9 @@ * transformations only work on specific types of images, and many * are mutually exclusive. */ - /* tell libpng to strip 16 bit/color files down to 8 bits/color */ + /* Tell libpng to strip 16 bit/color files down to 8 bits/color */ png_set_strip_16(png_ptr); /* Strip alpha bytes from the input data without combining with the * background (not recommended). @@ -230,9 +232,10 @@ /* Some suggestions as to how to get a screen gamma value */ /* Note that screen gamma is the display_exponent, which includes - * the CRT_exponent and any correction for viewing conditions */ + * the CRT_exponent and any correction for viewing conditions + */ if (/* We have a user-defined screen gamma value */) { screen_gamma = user-defined screen_gamma; } @@ -243,9 +246,9 @@ } /* If we don't have another value */ else { - screen_gamma = 2.2; /* A good guess for a PC monitors in a dimly + screen_gamma = 2.2; /* A good guess for a PC monitor in a dimly lit room */ screen_gamma = 1.7 or 1.0; /* A good guess for Mac systems */ } @@ -296,31 +299,31 @@ max_screen_colors, histogram, 0); } } - /* invert monochrome files to have 0 as white and 1 as black */ + /* Invert monochrome files to have 0 as white and 1 as black */ png_set_invert_mono(png_ptr); /* If you want to shift the pixel values from the range [0,255] or * [0,65535] to the original [0,7] or [0,31], or whatever range the * colors were originally in: */ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_sBIT)) { - png_color_8p sig_bit; + png_color_8p sig_bit_p; - png_get_sBIT(png_ptr, info_ptr, &sig_bit); - png_set_shift(png_ptr, sig_bit); + png_get_sBIT(png_ptr, info_ptr, &sig_bit_p); + png_set_shift(png_ptr, sig_bit_p); } - /* flip the RGB pixels to BGR (or RGBA to BGRA) */ + /* Flip the RGB pixels to BGR (or RGBA to BGRA) */ if (color_type & PNG_COLOR_MASK_COLOR) png_set_bgr(png_ptr); - /* swap the RGBA or GA data to ARGB or AG (or BGRA to ABGR) */ + /* Swap the RGBA or GA data to ARGB or AG (or BGRA to ABGR) */ png_set_swap_alpha(png_ptr); - /* swap bytes of 16 bit files to least significant byte first */ + /* Swap bytes of 16 bit files to least significant byte first */ png_set_swap(png_ptr); /* Add filler (or alpha) byte (before/after each RGB triplet) */ png_set_filler(png_ptr, 0xff, PNG_FILLER_AFTER); @@ -376,31 +379,30 @@ number_of_rows); #endif no_sparkle /* use only one of these two methods */ } - /* if you want to display the image after every pass, do - so here */ + /* if you want to display the image after every pass, do so here */ #endif no_single /* use only one of these two methods */ } #endif no_entire /* use only one of these two methods */ - /* read rest of file, and get additional chunks in info_ptr - REQUIRED */ + /* Read rest of file, and get additional chunks in info_ptr - REQUIRED */ png_read_end(png_ptr, info_ptr); #endif hilevel /* At this point you have read the entire image */ - /* clean up after the read, and free any memory allocated - REQUIRED */ + /* Clean up after the read, and free any memory allocated - REQUIRED */ png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL); - /* close the file */ + /* Close the file */ fclose(fp); /* that's it */ return (OK); } -/* progressively read a file */ +/* Progressively read a file */ int initialize_png_reader(png_structp *png_ptr, png_infop *info_ptr) { @@ -463,9 +465,9 @@ } /* This one's new also. Simply give it chunks of data as * they arrive from the data stream (in order, of course). - * On Segmented machines, don't give it any more than 64K. + * On segmented machines, don't give it any more than 64K. * The library seems to run fine with sizes of 4K, although * you can give it much less if necessary (I assume you can * give it chunks of 1 byte, but I haven't tried with less * than 256 bytes yet). When this function returns, you may @@ -477,9 +479,9 @@ } info_callback(png_structp png_ptr, png_infop info) { -/* do any setup here, including setting any of the transformations +/* Do any setup here, including setting any of the transformations * mentioned in the Reading PNG files section. For now, you _must_ * call either png_start_read_image() or png_read_update_info() * after all the transformations are set (even if you don't set * any). You may start getting rows before png_process_data() @@ -498,9 +500,9 @@ * In this function you will receive a pointer to new row data from * libpng called new_row that is to replace a corresponding row (of * the same data format) in a buffer allocated by your application. * - * The new row data pointer new_row may be NULL, indicating there is + * The new row data pointer "new_row" may be NULL, indicating there is * no new data to be replaced (in cases of interlace loading). * * If new_row is not NULL then you need to call * png_progressive_combine_row() to replace the corresponding row as @@ -545,9 +547,9 @@ } end_callback(png_structp png_ptr, png_infop info) { -/* this function is called when the whole image has been read, +/* This function is called when the whole image has been read, * including any chunks after the image (up to and including * the IEND). You will usually have the same info chunk as you * had in the header, although some data may have been added * to the comments and time fields. @@ -556,17 +558,17 @@ * marks the image as finished. */ } -/* write a png file */ +/* Write a png file */ void write_png(char *file_name /* , ... other image information ... */) { FILE *fp; png_structp png_ptr; png_infop info_ptr; png_colorp palette; - /* open the file */ + /* Open the file */ fp = fopen(file_name, "wb"); if (fp == NULL) return (ERROR); @@ -606,24 +608,27 @@ } /* One of the following I/O initialization functions is REQUIRED */ #ifdef streams /* I/O initialization method 1 */ - /* set up the output control if you are using standard C streams */ + /* Set up the output control if you are using standard C streams */ png_init_io(png_ptr, fp); + #else no_streams /* I/O initialization method 2 */ /* If you are using replacement write functions, instead of calling - * png_init_io() here you would call */ + * png_init_io() here you would call + */ png_set_write_fn(png_ptr, (void *)user_io_ptr, user_write_fn, user_IO_flush_function); /* where user_io_ptr is a structure you want available to the callbacks */ #endif no_streams /* only use one initialization method */ #ifdef hilevel /* This is the easy way. Use it if you already have all the - * image info living info in the structure. You could "|" many + * image info living in the structure. You could "|" many * PNG_TRANSFORM flags into the png_transforms integer here. */ png_write_png(png_ptr, info_ptr, png_transforms, png_voidp_NULL); + #else /* This is the hard way */ /* Set the image information here. Width and height are up to 2^31, @@ -636,27 +641,29 @@ */ png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth, PNG_COLOR_TYPE_???, PNG_INTERLACE_????, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); - /* set the palette if there is one. REQUIRED for indexed-color images */ + /* Set the palette if there is one. REQUIRED for indexed-color images */ palette = (png_colorp)png_malloc(png_ptr, PNG_MAX_PALETTE_LENGTH * png_sizeof(png_color)); - /* ... set palette colors ... */ + /* ... Set palette colors ... */ png_set_PLTE(png_ptr, info_ptr, palette, PNG_MAX_PALETTE_LENGTH); /* You must not free palette here, because png_set_PLTE only makes a link to - the palette that you malloced. Wait until you are about to destroy - the png structure. */ + * the palette that you malloced. Wait until you are about to destroy + * the png structure. + */ - /* optional significant bit chunk */ - /* if we are dealing with a grayscale image then */ + /* Optional significant bit (sBIT) chunk */ + png_color_8 sig_bit; + /* If we are dealing with a grayscale image then */ sig_bit.gray = true_bit_depth; - /* otherwise, if we are dealing with a color image then */ + /* Otherwise, if we are dealing with a color image then */ sig_bit.red = true_red_bit_depth; sig_bit.green = true_green_bit_depth; sig_bit.blue = true_blue_bit_depth; - /* if the image has an alpha channel then */ + /* If the image has an alpha channel then */ sig_bit.alpha = true_alpha_bit_depth; - png_set_sBIT(png_ptr, info_ptr, sig_bit); + png_set_sBIT(png_ptr, info_ptr, &sig_bit); /* Optional gamma chunk is strongly suggested if you have any guess * as to the correct gamma of the image. @@ -679,11 +686,14 @@ text_ptr[2].lang = NULL; #endif png_set_text(png_ptr, info_ptr, text_ptr, 3); - /* other optional chunks like cHRM, bKGD, tRNS, tIME, oFFs, pHYs, */ - /* note that if sRGB is present the gAMA and cHRM chunks must be ignored - * on read and must be written in accordance with the sRGB profile */ + /* Other optional chunks like cHRM, bKGD, tRNS, tIME, oFFs, pHYs */ + + /* Note that if sRGB is present the gAMA and cHRM chunks must be ignored + * on read and, if your application chooses to write them, they must + * be written in accordance with the sRGB profile + */ /* Write the file header information. REQUIRED */ png_write_info(png_ptr, info_ptr); @@ -703,41 +713,41 @@ * PNG_TEXT_COMPRESSION_zTXt_WR, so it doesn't get written out again * at the end. */ - /* set up the transformations you want. Note that these are + /* Set up the transformations you want. Note that these are * all optional. Only call them if you want them. */ - /* invert monochrome pixels */ + /* Invert monochrome pixels */ png_set_invert_mono(png_ptr); /* Shift the pixels up to a legal bit depth and fill in * as appropriate to correctly scale the image. */ png_set_shift(png_ptr, &sig_bit); - /* pack pixels into bytes */ + /* Pack pixels into bytes */ png_set_packing(png_ptr); - /* swap location of alpha bytes from ARGB to RGBA */ + /* Swap location of alpha bytes from ARGB to RGBA */ png_set_swap_alpha(png_ptr); /* Get rid of filler (OR ALPHA) bytes, pack XRGB/RGBX/ARGB/RGBA into * RGB (4 channels -> 3 channels). The second parameter is not used. */ png_set_filler(png_ptr, 0, PNG_FILLER_BEFORE); - /* flip BGR pixels to RGB */ + /* Flip BGR pixels to RGB */ png_set_bgr(png_ptr); - /* swap bytes of 16-bit files to most significant byte first */ + /* Swap bytes of 16-bit files to most significant byte first */ png_set_swap(png_ptr); - /* swap bits of 1, 2, 4 bit packed pixel formats */ + /* Swap bits of 1, 2, 4 bit packed pixel formats */ png_set_packswap(png_ptr); - /* turn on interlace handling if you are not using png_write_image() */ + /* Turn on interlace handling if you are not using png_write_image() */ if (interlacing) number_passes = png_set_interlace_handling(png_ptr); else number_passes = 1; @@ -756,14 +766,16 @@ for (k = 0; k < height; k++) row_pointers[k] = image + k*width*bytes_per_pixel; /* One of the following output methods is REQUIRED */ -#ifdef entire /* write out the entire image data in one call */ + +#ifdef entire /* Write out the entire image data in one call */ png_write_image(png_ptr, row_pointers); /* the other way to write the image - deal with interlacing */ -#else no_entire /* write out the image data by one or more scanlines */ +#else no_entire /* Write out the image data by one or more scanlines */ + /* The number of passes is either 1 for non-interlaced images, * or 7 for interlaced images. */ for (pass = 0; pass < number_passes; pass++) @@ -774,12 +786,12 @@ /* If you are only writing one row at a time, this works */ for (y = 0; y < height; y++) png_write_rows(png_ptr, &row_pointers[y], 1); } -#endif no_entire /* use only one output method */ +#endif no_entire /* Use only one output method */ /* You can write optional chunks like tEXt, zTXt, and tIME at the end - * as well. Shouldn't be necessary in 1.1.0 and up as all the public + * as well. Shouldn't be necessary in 1.2.0 and up as all the public * chunks are supported and you can use png_set_unknown_chunks() to * register unknown chunks into the info structure to be written out. */ @@ -787,28 +799,35 @@ png_write_end(png_ptr, info_ptr); #endif hilevel /* If you png_malloced a palette, free it here (don't free info_ptr->palette, - as recommended in versions 1.0.5m and earlier of this example; if - libpng mallocs info_ptr->palette, libpng will free it). If you - allocated it with malloc() instead of png_malloc(), use free() instead - of png_free(). */ + * as recommended in versions 1.0.5m and earlier of this example; if + * libpng mallocs info_ptr->palette, libpng will free it). If you + * allocated it with malloc() instead of png_malloc(), use free() instead + * of png_free(). + */ png_free(png_ptr, palette); palette = NULL; /* Similarly, if you png_malloced any data that you passed in with - png_set_something(), such as a hist or trans array, free it here, - when you can be sure that libpng is through with it. */ + * png_set_something(), such as a hist or trans array, free it here, + * when you can be sure that libpng is through with it. + */ png_free(png_ptr, trans); trans = NULL; + /* Whenever you use png_free() it is a good idea to set the pointer to + * NULL in case your application inadvertently tries to png_free() it + * again. When png_free() sees a NULL it returns without action, thus + * avoiding the double-free security problem. + */ - /* clean up after the write, and free any memory allocated */ + /* Clean up after the write, and free any memory allocated */ png_destroy_write_struct(&png_ptr, &info_ptr); - /* close the file */ + /* Close the file */ fclose(fp); - /* that's it */ + /* That's it */ return (OK); } #endif /* if 0 */ diff -ru4NwbB libpng-1.2.36/png.h libpng-1.2.37beta01/png.h --- libpng-1.2.36/png.h 2009-05-07 11:05:31.275827271 -0500 +++ libpng-1.2.37beta01/png.h 2009-05-14 05:09:18.175536152 -0500 @@ -225,8 +225,9 @@ * 1.2.36beta01-05 13 10236 12.so.0.36[.0] * 1.2.36rc01 13 10236 12.so.0.36[.0] * 1.0.44 10 10044 10.so.0.44[.0] * 1.2.36 13 10236 12.so.0.36[.0] + * 1.2.37beta01 13 10237 12.so.0.37[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be * used for changes in backward compatibility, as it is intended. The diff -ru4NwbB libpng-1.2.36/pngrutil.c libpng-1.2.37beta01/pngrutil.c --- libpng-1.2.36/pngrutil.c 2009-05-07 16:52:14.828794760 -0500 +++ libpng-1.2.37beta01/pngrutil.c 2009-05-14 05:09:18.270427800 -0500 @@ -1,8 +1,8 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.2.36 [May 7, 2009] + * Last changed in libpng 1.2.37 [May 14, 2009] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -3188,9 +3188,9 @@ { png_free(png_ptr, png_ptr->big_row_buf); png_ptr->big_row_buf = (png_bytep)png_malloc(png_ptr, row_bytes + 64); if (png_ptr->interlaced) - png_memset(png_ptr->big_row_buf, 0, png_ptr->rowbytes + 64); + png_memset(png_ptr->big_row_buf, 0, row_bytes + 64); png_ptr->row_buf = png_ptr->big_row_buf + 32; png_ptr->old_big_row_buf_size = row_bytes + 64; } diff -ru4NwbB libpng-1.2.36/scripts/CMakeLists.txt libpng-1.2.37beta01/scripts/CMakeLists.txt --- libpng-1.2.36/scripts/CMakeLists.txt 2009-05-07 11:05:35.005839376 -0500 +++ libpng-1.2.37beta01/scripts/CMakeLists.txt 2009-05-14 05:09:20.832453259 -0500 @@ -168,11 +168,11 @@ ${PNG_BINARY_DIR}/${PNGLIB_NAME}-config) # SET UP LINKS set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 0.${PNGLIB_RELEASE}.1.2.37beta01 - VERSION 0.${PNGLIB_RELEASE}.0 - SOVERSION 0 +# VERSION %SONUM%.${PNGLIB_RELEASE}.1.2.37beta01 + VERSION %SONUM%.${PNGLIB_RELEASE}.0 + SOVERSION %SONUM% CLEAN_DIRECT_OUTPUT 1) if(NOT WIN32) # that's uncool on win32 - it overwrites our static import lib... set_target_properties(${PNG_LIB_NAME_STATIC} PROPERTIES diff -ru4NwbB libpng-1.2.36/scripts/CMakeLists.txt.diff libpng-1.2.37beta01/scripts/CMakeLists.txt.diff --- libpng-1.2.36/scripts/CMakeLists.txt.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/CMakeLists.txt.diff 2009-05-14 05:09:20.841910363 -0500 @@ -0,0 +1,28 @@ +1c1 +< +--- +> +79a80 +106,108c107,109 +< add_definitions(-DLIBPNG_NO_MMX) +< add_definitions(-DPNG_NO_MMX_CODE) +< +--- +> add_definitions(-DLIBPNG_NO_MMX) +> add_definitions(-DPNG_NO_MMX_CODE) +> +172,174c173,175 +< # VERSION 0.${PNGLIB_RELEASE}.1.2.37beta01 +< VERSION 0.${PNGLIB_RELEASE}.0 +< SOVERSION 0 +--- +> # VERSION %SONUM%.${PNGLIB_RELEASE}.1.2.37beta01 +> VERSION %SONUM%.${PNGLIB_RELEASE}.0 +> SOVERSION %SONUM% +187,189c188,191 +< +< install(FILES png.h pngconf.h DESTINATION include) +< install(FILES png.h pngconf.h DESTINATION include/${PNGLIB_NAME}) +--- +> install(FILES png.h pngconf.h DESTINATION include) +> install(FILES png.h pngconf.h DESTINATION include/${PNGLIB_NAME}) diff -ru4NwbB libpng-1.2.36/scripts/descrip.mms libpng-1.2.37beta01/scripts/descrip.mms --- libpng-1.2.36/scripts/descrip.mms 2001-01-05 18:22:09.000000000 -0600 +++ libpng-1.2.37beta01/scripts/descrip.mms 2009-05-02 06:37:23.002659000 -0500 @@ -28,9 +28,9 @@ test : pngtest.exe run pngtest clean : - delete *.obj;*,*.exe;* + delete *.obj;*,*.exe; # Other dependencies. png.obj : png.h, pngconf.h @@ -43,10 +43,10 @@ pngerror.obj : png.h, pngconf.h pngmem.obj : png.h, pngconf.h pngrio.obj : png.h, pngconf.h pngwio.obj : png.h, pngconf.h -pngtest.obj : png.h, pngconf.h pngtrans.obj : png.h, pngconf.h pngwrite.obj : png.h, pngconf.h pngwtran.obj : png.h, pngconf.h pngwutil.obj : png.h, pngconf.h +pngtest.obj : png.h, pngconf.h diff -ru4NwbB libpng-1.2.36/scripts/descrip.mms.diff libpng-1.2.37beta01/scripts/descrip.mms.diff --- libpng-1.2.36/scripts/descrip.mms.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/descrip.mms.diff 2009-05-07 16:59:25.034245000 -0500 @@ -0,0 +1,12 @@ +3c3 +< c_deb = +--- +> c_deb = +32c32 +< delete *.obj;*,*.exe;* +--- +> delete *.obj;*,*.exe; +47d46 +< pngtest.obj : png.h, pngconf.h +52a52 +> pngtest.obj : png.h, pngconf.h diff -ru4NwbB libpng-1.2.36/scripts/libpng-config.in.diff libpng-1.2.37beta01/scripts/libpng-config.in.diff --- libpng-1.2.36/scripts/libpng-config.in.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/libpng-config.in.diff 2009-05-14 05:09:20.483077214 -0500 @@ -0,0 +1,4 @@ +22c22,23 +< ccopts="@LIBPNG_NO_MMX@" +--- +> ccopts="@LIBPNG_NO_MMX@" diff -ru4NwbB libpng-1.2.36/scripts/libpng.pc-configure.in.diff libpng-1.2.37beta01/scripts/libpng.pc-configure.in.diff --- libpng-1.2.36/scripts/libpng.pc-configure.in.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/libpng.pc-configure.in.diff 2009-05-14 05:09:20.499060285 -0500 @@ -0,0 +1,4 @@ +11c11,12 +< Cflags: -I${includedir} @LIBPNG_NO_MMX@ +--- +> Cflags: -I${includedir} @LIBPNG_NO_MMX@ diff -ru4NwbB libpng-1.2.36/scripts/makefile.32sunu libpng-1.2.37beta01/scripts/makefile.32sunu --- libpng-1.2.36/scripts/makefile.32sunu 2009-05-07 11:05:35.077420172 -0500 +++ libpng-1.2.37beta01/scripts/makefile.32sunu 2009-05-14 05:09:20.868367380 -0500 @@ -6,9 +6,9 @@ # For conditions of distribution and use, see copyright notice in png.h # Library name: LIBNAME=libpng%N% -PNGMAJ = 0 +PNGMAJ = %SONUM% PNGMIN = 1.2.37beta01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff -ru4NwbB libpng-1.2.36/scripts/makefile.32sunu.diff libpng-1.2.37beta01/scripts/makefile.32sunu.diff --- libpng-1.2.36/scripts/makefile.32sunu.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.32sunu.diff 2009-05-07 16:59:25.123209000 -0500 @@ -0,0 +1,4 @@ +10c10 +< PNGMAJ = 0 +--- +> PNGMAJ = %SONUM% diff -ru4NwbB libpng-1.2.36/scripts/makefile.64sunu libpng-1.2.37beta01/scripts/makefile.64sunu --- libpng-1.2.36/scripts/makefile.64sunu 2009-05-07 11:05:35.116146913 -0500 +++ libpng-1.2.37beta01/scripts/makefile.64sunu 2009-05-14 05:09:20.879237463 -0500 @@ -6,9 +6,9 @@ # For conditions of distribution and use, see copyright notice in png.h # Library name: LIBNAME=libpng%N% -PNGMAJ = 0 +PNGMAJ = %SONUM% PNGMIN = 1.2.37beta01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff -ru4NwbB libpng-1.2.36/scripts/makefile.64sunu.diff libpng-1.2.37beta01/scripts/makefile.64sunu.diff --- libpng-1.2.36/scripts/makefile.64sunu.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.64sunu.diff 2009-05-07 16:59:25.136705000 -0500 @@ -0,0 +1,4 @@ +10c10 +< PNGMAJ = 0 +--- +> PNGMAJ = %SONUM% diff -ru4NwbB libpng-1.2.36/scripts/makefile.acorn.diff libpng-1.2.37beta01/scripts/makefile.acorn.diff --- libpng-1.2.36/scripts/makefile.acorn.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.acorn.diff 2009-05-07 16:59:25.149541000 -0500 @@ -0,0 +1,6 @@ +9c9 +< CMHGflags = +--- +> CMHGflags = +13d12 +< diff -ru4NwbB libpng-1.2.36/scripts/makefile.aix libpng-1.2.37beta01/scripts/makefile.aix --- libpng-1.2.36/scripts/makefile.aix 2009-05-07 11:05:35.140525730 -0500 +++ libpng-1.2.37beta01/scripts/makefile.aix 2009-05-14 05:09:20.899028225 -0500 @@ -1,6 +1,6 @@ # makefile for libpng using gcc (generic, static library) -# Copyright (C) 2002, 2006, 2008 Glenn Randers-Pehrson +# Copyright (C) 2002, 2006-2009 Glenn Randers-Pehrson # Copyright (C) 2000 Cosmin Truta # Copyright (C) 2000 Marc O. Gloor (AIX support added, from makefile.gcc) # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # For conditions of distribution and use, see copyright notice in png.h @@ -18,9 +18,9 @@ RM_F = rm -f LN_SF = ln -f -s LIBNAME=libpng%N% -PNGMAJ = 0 +PNGMAJ = %SONUM% PNGMIN = 1.2.37beta01 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local @@ -103,11 +103,11 @@ pngrio$(O): png.h pngconf.h pngrtran$(O): png.h pngconf.h pngrutil$(O): png.h pngconf.h pngset$(O): png.h pngconf.h -pngtest$(O): png.h pngconf.h pngtrans$(O): png.h pngconf.h pngwio$(O): png.h pngconf.h pngwrite$(O): png.h pngconf.h pngwtran$(O): png.h pngconf.h pngwutil$(O): png.h pngconf.h +pngtest$(O): png.h pngconf.h diff -ru4NwbB libpng-1.2.36/scripts/makefile.aix.diff libpng-1.2.37beta01/scripts/makefile.aix.diff --- libpng-1.2.36/scripts/makefile.aix.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.aix.diff 2009-05-07 16:59:25.162323000 -0500 @@ -0,0 +1,39 @@ +2c2 +< # Copyright (C) 2002, 2006, 2008 Glenn Randers-Pehrson +--- +> # Copyright (C) 2002, 2006-2009 Glenn Randers-Pehrson +22c22 +< PNGMAJ = 0 +--- +> PNGMAJ = %SONUM% +57c57 +< OBJS = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \ +--- +> OBJS = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \ +97c97 +< png$(O): png.h pngconf.h +--- +> png$(O): png.h pngconf.h +99,100c99,100 +< pngget$(O): png.h pngconf.h +< pngmem$(O): png.h pngconf.h +--- +> pngget$(O): png.h pngconf.h +> pngmem$(O): png.h pngconf.h +102,103c102,103 +< pngread$(O): png.h pngconf.h +< pngrio$(O): png.h pngconf.h +--- +> pngread$(O): png.h pngconf.h +> pngrio$(O): png.h pngconf.h +106,107c106 +< pngset$(O): png.h pngconf.h +< pngtest$(O): png.h pngconf.h +--- +> pngset$(O): png.h pngconf.h +109c108 +< pngwio$(O): png.h pngconf.h +--- +> pngwio$(O): png.h pngconf.h +113a113 +> pngtest$(O): png.h pngconf.h diff -ru4NwbB libpng-1.2.36/scripts/makefile.bc32 libpng-1.2.37beta01/scripts/makefile.bc32 --- libpng-1.2.36/scripts/makefile.bc32 2006-02-05 16:50:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.bc32 2009-05-02 08:08:28.610912000 -0500 @@ -110,27 +106,26 @@ test: pngtest.exe pngtest - ## Minor Targets -png.obj: png.c -pngerror.obj: pngerror.c -pngget.obj: pngget.c -pngmem.obj: pngmem.c -pngpread.obj: pngpread.c -pngread.obj: pngread.c -pngrio.obj: pngrio.c -pngrtran.obj: pngrtran.c -pngrutil.obj: pngrutil.c -pngset.obj: pngset.c -pngtrans.obj: pngtrans.c -pngwio.obj: pngwio.c -pngwrite.obj: pngwrite.c -pngwtran.obj: pngwtran.c -pngwutil.obj: pngwutil.c - +png.obj: png.c png.h pngconf.h +pngerror.obj: pngerror.c png.h pngconf.h +pngget.obj: pngget.c png.h pngconf.h +pngmem.obj: pngmem.c png.h pngconf.h +pngpread.obj: pngpread.c png.h pngconf.h +pngread.obj: pngread.c png.h pngconf.h +pngrio.obj: pngrio.c png.h pngconf.h +pngrtran.obj: pngrtran.c png.h pngconf.h +pngrutil.obj: pngrutil.c png.h pngconf.h +pngset.obj: pngset.c png.h pngconf.h +pngtrans.obj: pngtrans.c png.h pngconf.h +pngwio.obj: pngwio.c png.h pngconf.h +pngwrite.obj: pngwrite.c png.h pngconf.h +pngwtran.obj: pngwtran.c png.h pngconf.h +pngwutil.obj: pngwutil.c png.h pngconf.h +pngtest.obj: pngtest.c png.h pngconf.h $(LIBNAME): $(OBJS) -del $(LIBNAME) $(LIB) $(LIBNAME) @&&| diff -ru4NwbB libpng-1.2.36/scripts/makefile.bc32.diff libpng-1.2.37beta01/scripts/makefile.bc32.diff --- libpng-1.2.36/scripts/makefile.bc32.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.bc32.diff 2009-05-07 16:59:25.198047000 -0500 @@ -0,0 +1,48 @@ +14d13 +< +52d50 +< +90d87 +< +103d99 +< +114d109 +< +117,132c112,127 +< png.obj: png.c +< pngerror.obj: pngerror.c +< pngget.obj: pngget.c +< pngmem.obj: pngmem.c +< pngpread.obj: pngpread.c +< pngread.obj: pngread.c +< pngrio.obj: pngrio.c +< pngrtran.obj: pngrtran.c +< pngrutil.obj: pngrutil.c +< pngset.obj: pngset.c +< pngtrans.obj: pngtrans.c +< pngwio.obj: pngwio.c +< pngwrite.obj: pngwrite.c +< pngwtran.obj: pngwtran.c +< pngwutil.obj: pngwutil.c +< +--- +> png.obj: png.c png.h pngconf.h +> pngerror.obj: pngerror.c png.h pngconf.h +> pngget.obj: pngget.c png.h pngconf.h +> pngmem.obj: pngmem.c png.h pngconf.h +> pngpread.obj: pngpread.c png.h pngconf.h +> pngread.obj: pngread.c png.h pngconf.h +> pngrio.obj: pngrio.c png.h pngconf.h +> pngrtran.obj: pngrtran.c png.h pngconf.h +> pngrutil.obj: pngrutil.c png.h pngconf.h +> pngset.obj: pngset.c png.h pngconf.h +> pngtrans.obj: pngtrans.c png.h pngconf.h +> pngwio.obj: pngwio.c png.h pngconf.h +> pngwrite.obj: pngwrite.c png.h pngconf.h +> pngwtran.obj: pngwtran.c png.h pngconf.h +> pngwutil.obj: pngwutil.c png.h pngconf.h +> pngtest.obj: pngtest.c png.h pngconf.h +140d134 +< +151d144 +< diff -ru4NwbB libpng-1.2.36/scripts/makefile.beos libpng-1.2.37beta01/scripts/makefile.beos --- libpng-1.2.36/scripts/makefile.beos 2009-05-07 11:05:35.177653415 -0500 +++ libpng-1.2.37beta01/scripts/makefile.beos 2009-05-14 05:09:20.908522204 -0500 @@ -6,9 +6,9 @@ # For conditions of distribution and use, see copyright notice in png.h # Library name: LIBNAME=libpng%N% -PNGMAJ = 0 +PNGMAJ = %SONUM% PNGMIN = 1.2.37beta01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff -ru4NwbB libpng-1.2.36/scripts/makefile.beos.diff libpng-1.2.37beta01/scripts/makefile.beos.diff --- libpng-1.2.36/scripts/makefile.beos.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.beos.diff 2009-05-07 16:59:25.212902000 -0500 @@ -0,0 +1,6 @@ +10c10 +< PNGMAJ = 0 +--- +> PNGMAJ = %SONUM% +225a226 +> diff -ru4NwbB libpng-1.2.36/scripts/makefile.bor libpng-1.2.37beta01/scripts/makefile.bor --- libpng-1.2.36/scripts/makefile.bor 2000-03-16 16:45:03.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.bor 2009-05-02 10:51:41.712455000 -0500 @@ -115,27 +114,25 @@ test: pngtest$(MODEL).exe pngtest$(MODEL) - ## Minor Targets -png.obj: png.c -pngerror.obj: pngerror.c -pngget.obj: pngget.c -pngmem.obj: pngmem.c -pngpread.obj: pngpread.c -pngread.obj: pngread.c -pngrio.obj: pngrio.c -pngrtran.obj: pngrtran.c -pngrutil.obj: pngrutil.c -pngset.obj: pngset.c -pngtrans.obj: pngtrans.c -pngwio.obj: pngwio.c -pngwrite.obj: pngwrite.c -pngwtran.obj: pngwtran.c -pngwutil.obj: pngwutil.c - +png.obj: png.c png.h pngconf.h +pngerror.obj: pngerror.c png.h pngconf.h +pngget.obj: pngget.c png.h pngconf.h +pngmem.obj: pngmem.c png.h pngconf.h +pngpread.obj: pngpread.c png.h pngconf.h +pngread.obj: pngread.c png.h pngconf.h +pngrio.obj: pngrio.c png.h pngconf.h +pngrtran.obj: pngrtran.c png.h pngconf.h +pngrutil.obj: pngrutil.c png.h pngconf.h +pngset.obj: pngset.c png.h pngconf.h +pngtrans.obj: pngtrans.c png.h pngconf.h +pngwio.obj: pngwio.c png.h pngconf.h +pngwrite.obj: pngwrite.c png.h pngconf.h +pngwtran.obj: pngwtran.c png.h pngconf.h +pngwutil.obj: pngwutil.c png.h pngconf.h $(LIBNAME): $(OBJS) -del $(LIBNAME) $(LIB) $(LIBNAME) @&&| diff -ru4NwbB libpng-1.2.36/scripts/makefile.bor.diff libpng-1.2.37beta01/scripts/makefile.bor.diff --- libpng-1.2.36/scripts/makefile.bor.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.bor.diff 2009-05-07 16:59:25.226513000 -0500 @@ -0,0 +1,55 @@ +15d14 +< +60d58 +< +61a60 +> +98d96 +< +99a98 +> +108d106 +< +109a108 +> +119d117 +< +122,137c120,134 +< png.obj: png.c +< pngerror.obj: pngerror.c +< pngget.obj: pngget.c +< pngmem.obj: pngmem.c +< pngpread.obj: pngpread.c +< pngread.obj: pngread.c +< pngrio.obj: pngrio.c +< pngrtran.obj: pngrtran.c +< pngrutil.obj: pngrutil.c +< pngset.obj: pngset.c +< pngtrans.obj: pngtrans.c +< pngwio.obj: pngwio.c +< pngwrite.obj: pngwrite.c +< pngwtran.obj: pngwtran.c +< pngwutil.obj: pngwutil.c +< +--- +> png.obj: png.c png.h pngconf.h +> pngerror.obj: pngerror.c png.h pngconf.h +> pngget.obj: pngget.c png.h pngconf.h +> pngmem.obj: pngmem.c png.h pngconf.h +> pngpread.obj: pngpread.c png.h pngconf.h +> pngread.obj: pngread.c png.h pngconf.h +> pngrio.obj: pngrio.c png.h pngconf.h +> pngrtran.obj: pngrtran.c png.h pngconf.h +> pngrutil.obj: pngrutil.c png.h pngconf.h +> pngset.obj: pngset.c png.h pngconf.h +> pngtrans.obj: pngtrans.c png.h pngconf.h +> pngwio.obj: pngwio.c png.h pngconf.h +> pngwrite.obj: pngwrite.c png.h pngconf.h +> pngwtran.obj: pngwtran.c png.h pngconf.h +> pngwutil.obj: pngwutil.c png.h pngconf.h +145d141 +< +152d147 +< +161d155 +< diff -ru4NwbB libpng-1.2.36/scripts/makefile.cygwin libpng-1.2.37beta01/scripts/makefile.cygwin --- libpng-1.2.36/scripts/makefile.cygwin 2009-05-07 11:05:35.222456194 -0500 +++ libpng-1.2.37beta01/scripts/makefile.cygwin 2009-05-14 05:09:20.920040553 -0500 @@ -71,9 +71,9 @@ -W -Wall -O3 $(ALIGN) -funroll-loops -DPNG_NO_MMX_CODE \ -fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5 LIBNAME = libpng%N% -PNGMAJ = 0 +PNGMAJ = %SONUM% CYGDLL = %N% PNGMIN = 1.2.37beta01 PNGVER = $(PNGMAJ).$(PNGMIN) @@ -175,9 +175,9 @@ pngtest.pic.o: pngtest.c $(CC) $(CFLAGS) -c $< -o $@ -pngtest.o: pngtest.c +pngtest.o: pngtest.c png.h pngconf.h $(CC) $(CFLAGS) -c $< -o $@ test: test-static test-shared diff -ru4NwbB libpng-1.2.36/scripts/makefile.cygwin.diff libpng-1.2.37beta01/scripts/makefile.cygwin.diff --- libpng-1.2.36/scripts/makefile.cygwin.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.cygwin.diff 2009-05-14 05:09:20.516302448 -0500 @@ -0,0 +1,36 @@ +61,69c61,69 +< ### if you don't need thread safety, but want the asm accel +< #CFLAGS= $(strip $(MINGW_CCFLAGS) -DPNG_THREAD_UNSAFE_OK \ +< # $(addprefix -I,$(ZLIBINC)) -W -Wall -O $(ALIGN) -funroll-loops \ +< # -fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5 +< ### if you need thread safety and want (minimal) asm accel +< #CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ +< # -W -Wall -O $(ALIGN) -funroll-loops \ +< # -fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5 +< ### Normal (non-asm) compilation +--- +> ### if you don't need thread safety, but want the asm accel +> #CFLAGS= $(strip $(MINGW_CCFLAGS) -DPNG_THREAD_UNSAFE_OK \ +> # $(addprefix -I,$(ZLIBINC)) -W -Wall -O $(ALIGN) -funroll-loops \ +> # -fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5 +> ### if you need thread safety and want (minimal) asm accel +> #CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ +> # -W -Wall -O $(ALIGN) -funroll-loops \ +> # -fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5 +> ### Normal (non-asm) compilation +71c71,72 +< -W -Wall -O3 $(ALIGN) -funroll-loops -DPNG_NO_MMX_CODE \ +--- +> -W -Wall -O3 $(ALIGN) -funroll-loops -DPNG_NO_MMX_CODE \ +75c76 +< PNGMAJ = 0 +--- +> PNGMAJ = %SONUM% +163c164,165 +< $(SHAREDDEF): scripts/pngw32.def +--- +> $(SHAREDDEF): scripts/pngw32.def +179c181 +< pngtest.o: pngtest.c +--- +> pngtest.o: pngtest.c png.h pngconf.h diff -ru4NwbB libpng-1.2.36/scripts/makefile.darwin libpng-1.2.37beta01/scripts/makefile.darwin --- libpng-1.2.36/scripts/makefile.darwin 2009-05-07 11:05:35.258629342 -0500 +++ libpng-1.2.37beta01/scripts/makefile.darwin 2009-05-14 05:09:20.930968555 -0500 @@ -17,9 +17,9 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng%N% -PNGMAJ = 12 +PNGMAJ = %N% PNGMIN = 1.2.37beta01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff -ru4NwbB libpng-1.2.36/scripts/makefile.darwin.diff libpng-1.2.37beta01/scripts/makefile.darwin.diff --- libpng-1.2.36/scripts/makefile.darwin.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.darwin.diff 2009-05-14 05:09:20.940673388 -0500 @@ -0,0 +1,8 @@ +21c21 +< PNGMAJ = 12 +--- +> PNGMAJ = %N% +41c41,42 +< # CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE +--- +> # CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE diff -ru4NwbB libpng-1.2.36/scripts/makefile.dec libpng-1.2.37beta01/scripts/makefile.dec --- libpng-1.2.36/scripts/makefile.dec 2009-05-07 11:05:35.292373406 -0500 +++ libpng-1.2.37beta01/scripts/makefile.dec 2009-05-14 05:09:20.950339793 -0500 @@ -3,9 +3,9 @@ # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # For conditions of distribution and use, see copyright notice in png.h # Library name: -PNGMAJ = 0 +PNGMAJ = %SONUM% PNGMIN = 1.2.37beta01 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng%N% @@ -204,11 +204,11 @@ pngget.o: png.h pngconf.h pngread.o: png.h pngconf.h pngrtran.o: png.h pngconf.h pngrutil.o: png.h pngconf.h -pngtest.o: png.h pngconf.h pngtrans.o: png.h pngconf.h pngwrite.o: png.h pngconf.h pngwtran.o: png.h pngconf.h pngwutil.o: png.h pngconf.h pngpread.o: png.h pngconf.h +pngtest.o: png.h pngconf.h diff -ru4NwbB libpng-1.2.36/scripts/makefile.dec.diff libpng-1.2.37beta01/scripts/makefile.dec.diff --- libpng-1.2.36/scripts/makefile.dec.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.dec.diff 2009-05-07 16:59:25.267124000 -0500 @@ -0,0 +1,8 @@ +7c7 +< PNGMAJ = 0 +--- +> PNGMAJ = %SONUM% +208d207 +< pngtest.o: png.h pngconf.h +214a214 +> pngtest.o: png.h pngconf.h diff -ru4NwbB libpng-1.2.36/scripts/makefile.dj2 libpng-1.2.37beta01/scripts/makefile.dj2 --- libpng-1.2.36/scripts/makefile.dj2 2002-04-19 18:53:16.000000000 -0500 +++ libpng-1.2.37beta01/scripts/makefile.dj2 2009-05-02 07:08:52.252064000 -0500 @@ -1,6 +1,6 @@ # DJGPP (DOS gcc) makefile for libpng -# Copyright (C) 2002 Glenn Randers-Pehrson +# Copyright (C) 2002, 2006, 2009 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # For conditions of distribution and use, see copyright notice in png.h # where make install will put libpng.a and png.h @@ -46,10 +46,10 @@ pngread.o: png.h pngconf.h pngpread.o: png.h pngconf.h pngrtran.o: png.h pngconf.h pngrutil.o: png.h pngconf.h -pngtest.o: png.h pngconf.h pngtrans.o: png.h pngconf.h pngwrite.o: png.h pngconf.h pngwtran.o: png.h pngconf.h pngwutil.o: png.h pngconf.h +pngtest.o: png.h pngconf.h diff -ru4NwbB libpng-1.2.36/scripts/makefile.dj2.diff libpng-1.2.37beta01/scripts/makefile.dj2.diff --- libpng-1.2.36/scripts/makefile.dj2.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.dj2.diff 2009-05-07 16:59:25.280350000 -0500 @@ -0,0 +1,8 @@ +2c2 +< # Copyright (C) 2002 Glenn Randers-Pehrson +--- +> # Copyright (C) 2002, 2006, 2009 Glenn Randers-Pehrson +50d49 +< pngtest.o: png.h pngconf.h +55a55 +> pngtest.o: png.h pngconf.h diff -ru4NwbB libpng-1.2.36/scripts/makefile.elf libpng-1.2.37beta01/scripts/makefile.elf --- libpng-1.2.36/scripts/makefile.elf 2009-05-07 11:05:35.331377881 -0500 +++ libpng-1.2.37beta01/scripts/makefile.elf 2009-05-14 05:09:20.960355294 -0500 @@ -11,9 +11,9 @@ # * versioned symbols # Library name: LIBNAME = libpng%N% -PNGMAJ = 0 +PNGMAJ = %SONUM% PNGMIN = 1.2.37beta01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff -ru4NwbB libpng-1.2.36/scripts/makefile.elf.diff libpng-1.2.37beta01/scripts/makefile.elf.diff --- libpng-1.2.36/scripts/makefile.elf.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.elf.diff 2009-05-07 16:59:25.293582000 -0500 @@ -0,0 +1,4 @@ +15c15 +< PNGMAJ = 0 +--- +> PNGMAJ = %SONUM% diff -ru4NwbB libpng-1.2.36/scripts/makefile.freebsd libpng-1.2.37beta01/scripts/makefile.freebsd --- libpng-1.2.36/scripts/makefile.freebsd 2007-06-20 17:10:26.000000000 -0500 +++ libpng-1.2.37beta01/scripts/makefile.freebsd 2009-05-14 05:09:20.541365362 -0500 @@ -1,6 +1,6 @@ # makefile for libpng under FreeBSD -# Copyright (C) 2002, 2007 Glenn Randers-Pehrson and Andrey A. Chernov +# Copyright (C) 2002, 2007, 2009 Glenn Randers-Pehrson and Andrey A. Chernov # For conditions of distribution and use, see copyright notice in png.h PREFIX?= /usr/local SHLIB_VER?= 5 diff -ru4NwbB libpng-1.2.36/scripts/makefile.freebsd.diff libpng-1.2.37beta01/scripts/makefile.freebsd.diff --- libpng-1.2.36/scripts/makefile.freebsd.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.freebsd.diff 2009-05-14 05:09:20.549444251 -0500 @@ -0,0 +1,16 @@ +2c2 +< # Copyright (C) 2002, 2007 Glenn Randers-Pehrson and Andrey A. Chernov +--- +> # Copyright (C) 2002, 2007, 2009 Glenn Randers-Pehrson and Andrey A. Chernov +6c6,7 +< SHLIB_VER?= 5 +--- +> SHLIB_VER?= 5 +28,30c29,31 +< .if (${MACHINE_ARCH} != "i386") +< CFLAGS+= -DPNG_NO_MMX_CODE +< .endif +--- +> .if (${MACHINE_ARCH} != "i386") +> CFLAGS+= -DPNG_NO_MMX_CODE +> .endif diff -ru4NwbB libpng-1.2.36/scripts/makefile.gcc libpng-1.2.37beta01/scripts/makefile.gcc --- libpng-1.2.36/scripts/makefile.gcc 2008-08-02 07:20:59.000000000 -0500 +++ libpng-1.2.37beta01/scripts/makefile.gcc 2009-05-02 07:47:42.552494000 -0500 @@ -70,11 +70,11 @@ pngrio$(O): png.h pngconf.h pngrtran$(O): png.h pngconf.h pngrutil$(O): png.h pngconf.h pngset$(O): png.h pngconf.h -pngtest$(O): png.h pngconf.h pngtrans$(O): png.h pngconf.h pngwio$(O): png.h pngconf.h pngwrite$(O): png.h pngconf.h pngwtran$(O): png.h pngconf.h pngwutil$(O): png.h pngconf.h +pngtest$(O): png.h pngconf.h diff -ru4NwbB libpng-1.2.36/scripts/makefile.gcc.diff libpng-1.2.37beta01/scripts/makefile.gcc.diff --- libpng-1.2.36/scripts/makefile.gcc.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.gcc.diff 2009-05-07 16:59:25.321225000 -0500 @@ -0,0 +1,35 @@ +34,36c34,36 +< OBJS = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \ +< pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) pngset$(O) \ +< pngtrans$(O) pngwio$(O) pngwrite$(O) pngwtran$(O) pngwutil$(O) +--- +> OBJS = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \ +> pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) pngset$(O) \ +> pngtrans$(O) pngwio$(O) pngwrite$(O) pngwtran$(O) pngwutil$(O) +64c64 +< png$(O): png.h pngconf.h +--- +> png$(O): png.h pngconf.h +66,67c66,67 +< pngget$(O): png.h pngconf.h +< pngmem$(O): png.h pngconf.h +--- +> pngget$(O): png.h pngconf.h +> pngmem$(O): png.h pngconf.h +69,70c69,70 +< pngread$(O): png.h pngconf.h +< pngrio$(O): png.h pngconf.h +--- +> pngread$(O): png.h pngconf.h +> pngrio$(O): png.h pngconf.h +73,74c73 +< pngset$(O): png.h pngconf.h +< pngtest$(O): png.h pngconf.h +--- +> pngset$(O): png.h pngconf.h +76c75 +< pngwio$(O): png.h pngconf.h +--- +> pngwio$(O): png.h pngconf.h +80a80 +> pngtest$(O): png.h pngconf.h diff -ru4NwbB libpng-1.2.36/scripts/makefile.gcmmx libpng-1.2.37beta01/scripts/makefile.gcmmx --- libpng-1.2.36/scripts/makefile.gcmmx 2009-05-07 11:05:35.371605209 -0500 +++ libpng-1.2.37beta01/scripts/makefile.gcmmx 2009-05-14 05:09:20.970645245 -0500 @@ -12,9 +12,9 @@ # the background! Context switches between MMX and FPU are expensive. # Library name: LIBNAME = libpng%N% -PNGMAJ = 0 +PNGMAJ = %SONUM% PNGMIN = 1.2.37beta01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff -ru4NwbB libpng-1.2.36/scripts/makefile.gcmmx.diff libpng-1.2.37beta01/scripts/makefile.gcmmx.diff --- libpng-1.2.36/scripts/makefile.gcmmx.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.gcmmx.diff 2009-05-07 16:59:25.334813000 -0500 @@ -0,0 +1,12 @@ +16c16 +< PNGMAJ = 0 +--- +> PNGMAJ = %SONUM% +67c67 +< # $(ALIGN) -funroll-loops -funroll-all-loops -fomit-frame-pointer +--- +> # $(ALIGN) -funroll-loops -funroll-all-loops -fomit-frame-pointer +71c71 +< # $(ALIGN) -funroll-loops -funroll-all-loops -fomit-frame-pointer +--- +> # $(ALIGN) -funroll-loops -funroll-all-loops -fomit-frame-pointer diff -ru4NwbB libpng-1.2.36/scripts/makefile.hp64 libpng-1.2.37beta01/scripts/makefile.hp64 --- libpng-1.2.36/scripts/makefile.hp64 2009-05-07 11:05:35.407502147 -0500 +++ libpng-1.2.37beta01/scripts/makefile.hp64 2009-05-14 05:09:20.980368943 -0500 @@ -1,6 +1,6 @@ # makefile for libpng, HPUX (10.20 and 11.00) using the ANSI/C product. -# Copyright (C) 1999-2002 Glenn Randers-Pehrson +# Copyright (C) 1999-2002, 2006, 2009 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42 # contributed by Jim Rice and updated by Chris Schleicher, Hewlett Packard # For conditions of distribution and use, see copyright notice in png.h @@ -16,9 +16,9 @@ # SHAREDLIB=libz.sl # Library name: LIBNAME = libpng%N% -PNGMAJ = 0 +PNGMAJ = %SONUM% PNGMIN = 1.2.37beta01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: @@ -226,10 +226,11 @@ pngget.o: png.h pngconf.h pngread.o: png.h pngconf.h pngrtran.o: png.h pngconf.h pngrutil.o: png.h pngconf.h -pngtest.o: png.h pngconf.h pngtrans.o: png.h pngconf.h pngwrite.o: png.h pngconf.h pngwtran.o: png.h pngconf.h pngwutil.o: png.h pngconf.h pngpread.o: png.h pngconf.h + +pngtest.o: png.h pngconf.h diff -ru4NwbB libpng-1.2.36/scripts/makefile.hp64.diff libpng-1.2.37beta01/scripts/makefile.hp64.diff --- libpng-1.2.36/scripts/makefile.hp64.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.hp64.diff 2009-05-07 16:59:25.348698000 -0500 @@ -0,0 +1,13 @@ +2c2 +< # Copyright (C) 1999-2002 Glenn Randers-Pehrson +--- +> # Copyright (C) 1999-2002, 2006, 2009 Glenn Randers-Pehrson +20c20 +< PNGMAJ = 0 +--- +> PNGMAJ = %SONUM% +230d229 +< pngtest.o: png.h pngconf.h +235a235,236 +> +> pngtest.o: png.h pngconf.h diff -ru4NwbB libpng-1.2.36/scripts/makefile.hpgcc libpng-1.2.37beta01/scripts/makefile.hpgcc --- libpng-1.2.36/scripts/makefile.hpgcc 2009-05-07 11:05:35.444122831 -0500 +++ libpng-1.2.37beta01/scripts/makefile.hpgcc 2009-05-14 05:09:20.990168336 -0500 @@ -6,9 +6,9 @@ # For conditions of distribution and use, see copyright notice in png.h # Library name: LIBNAME = libpng%N% -PNGMAJ = 0 +PNGMAJ = %SONUM% PNGMIN = 1.2.37beta01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff -ru4NwbB libpng-1.2.36/scripts/makefile.hpgcc.diff libpng-1.2.37beta01/scripts/makefile.hpgcc.diff --- libpng-1.2.36/scripts/makefile.hpgcc.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.hpgcc.diff 2009-05-07 16:59:25.362134000 -0500 @@ -0,0 +1,4 @@ +10c10 +< PNGMAJ = 0 +--- +> PNGMAJ = %SONUM% diff -ru4NwbB libpng-1.2.36/scripts/makefile.hpux libpng-1.2.37beta01/scripts/makefile.hpux --- libpng-1.2.36/scripts/makefile.hpux 2009-05-07 11:05:35.479516593 -0500 +++ libpng-1.2.37beta01/scripts/makefile.hpux 2009-05-14 05:09:21.001128847 -0500 @@ -16,9 +16,9 @@ # SHAREDLIB=libz.sl # Library name: LIBNAME = libpng%N% -PNGMAJ = 0 +PNGMAJ = %SONUM% PNGMIN = 1.2.37beta01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: @@ -223,10 +223,11 @@ pngget.o: png.h pngconf.h pngread.o: png.h pngconf.h pngrtran.o: png.h pngconf.h pngrutil.o: png.h pngconf.h -pngtest.o: png.h pngconf.h pngtrans.o: png.h pngconf.h pngwrite.o: png.h pngconf.h pngwtran.o: png.h pngconf.h pngwutil.o: png.h pngconf.h pngpread.o: png.h pngconf.h + +pngtest.o: png.h pngconf.h diff -ru4NwbB libpng-1.2.36/scripts/makefile.hpux.diff libpng-1.2.37beta01/scripts/makefile.hpux.diff --- libpng-1.2.36/scripts/makefile.hpux.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.hpux.diff 2009-05-14 05:09:20.566655051 -0500 @@ -0,0 +1,13 @@ +20c20 +< PNGMAJ = 0 +--- +> PNGMAJ = %SONUM% +48c48,49 +< CFLAGS=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0 -DPNG_NO_MMX_CODE +--- +> CFLAGS=-I$(ZLIBINC) -O -Ae +DA1.1 +DS2.0 -DPNG_NO_MMX_CODE +227d227 +< pngtest.o: png.h pngconf.h +232a233,234 +> +> pngtest.o: png.h pngconf.h diff -ru4NwbB libpng-1.2.36/scripts/makefile.ibmc libpng-1.2.37beta01/scripts/makefile.ibmc --- libpng-1.2.36/scripts/makefile.ibmc 2001-06-11 08:06:30.000000000 -0500 +++ libpng-1.2.37beta01/scripts/makefile.ibmc 2009-05-02 07:49:25.491276000 -0500 @@ -1,6 +1,7 @@ # Makefile for libpng (static) # IBM C version 3.x for Win32 and OS/2 +# Copyright (C) 2006 Glenn Randers-Pehrson # Copyright (C) 2000 Cosmin Truta # For conditions of distribution and use, see copyright notice in png.h # Notes: # Derived from makefile.std @@ -62,10 +63,11 @@ pngrio$(O): png.h pngconf.h pngrtran$(O): png.h pngconf.h pngrutil$(O): png.h pngconf.h pngset$(O): png.h pngconf.h -pngtest$(O): png.h pngconf.h pngtrans$(O): png.h pngconf.h pngwio$(O): png.h pngconf.h pngwrite$(O): png.h pngconf.h pngwtran$(O): png.h pngconf.h pngwutil$(O): png.h pngconf.h + +pngtest$(O): png.h pngconf.h diff -ru4NwbB libpng-1.2.36/scripts/makefile.ibmc.diff libpng-1.2.37beta01/scripts/makefile.ibmc.diff --- libpng-1.2.36/scripts/makefile.ibmc.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.ibmc.diff 2009-05-07 16:59:25.388761000 -0500 @@ -0,0 +1,30 @@ +2a3 +> # Copyright (C) 2006 Glenn Randers-Pehrson +56c57 +< png$(O): png.h pngconf.h +--- +> png$(O): png.h pngconf.h +58,59c59,60 +< pngget$(O): png.h pngconf.h +< pngmem$(O): png.h pngconf.h +--- +> pngget$(O): png.h pngconf.h +> pngmem$(O): png.h pngconf.h +61,62c62,63 +< pngread$(O): png.h pngconf.h +< pngrio$(O): png.h pngconf.h +--- +> pngread$(O): png.h pngconf.h +> pngrio$(O): png.h pngconf.h +65,66c66 +< pngset$(O): png.h pngconf.h +< pngtest$(O): png.h pngconf.h +--- +> pngset$(O): png.h pngconf.h +68c68 +< pngwio$(O): png.h pngconf.h +--- +> pngwio$(O): png.h pngconf.h +71a72,73 +> +> pngtest$(O): png.h pngconf.h diff -ru4NwbB libpng-1.2.36/scripts/makefile.intel libpng-1.2.37beta01/scripts/makefile.intel --- libpng-1.2.36/scripts/makefile.intel 2007-09-01 09:31:06.000000000 -0500 +++ libpng-1.2.37beta01/scripts/makefile.intel 2009-05-02 07:55:10.402399000 -0500 @@ -1,13 +1,15 @@ # Makefile for libpng # Microsoft Visual C++ with Intel C/C++ Compiler 4.0 and later +# Copyright (C) 2006 Glenn Randers-Pehrson # Copyright (C) 2000, Pawel Mrochen, based on makefile.msc which is # copyright 1995 Guy Eric Schalnat, Group 42, Inc. # For conditions of distribution and use, see copyright notice in png.h # To use, do "nmake /f scripts\makefile.intel" +# ------------------- Intel C/C++ Compiler 4.0 and later ------------------- # Where the zlib library and include files are located ZLIBLIB=..\zlib ZLIBINC=..\zlib @@ -72,11 +73,8 @@ pngwio$(O): png.h pngconf.h $(CC) $(CFLAGS) $*.c $(ERRFILE) -pngtest$(O): png.h pngconf.h - $(CC) $(CFLAGS) $*.c $(ERRFILE) - pngtrans$(O): png.h pngconf.h $(CC) $(CFLAGS) $*.c $(ERRFILE) pngwrite$(O): png.h pngconf.h @@ -94,8 +92,11 @@ pngtest.exe: pngtest.obj libpng.lib $(LD) $(LDFLAGS) /OUT:pngtest.exe pngtest.obj libpng.lib $(ZLIBLIB)\zlib.lib +pngtest$(O): png.h pngconf.h + $(CC) $(CFLAGS) $*.c $(ERRFILE) + test: pngtest.exe pngtest.exe diff -ru4NwbB libpng-1.2.36/scripts/makefile.intel.diff libpng-1.2.37beta01/scripts/makefile.intel.diff --- libpng-1.2.36/scripts/makefile.intel.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.intel.diff 2009-05-07 16:59:25.402231000 -0500 @@ -0,0 +1,14 @@ +3a4 +> # Copyright (C) 2006 Glenn Randers-Pehrson +9a11 +> # ------------------- Intel C/C++ Compiler 4.0 and later ------------------- +29d30 +< +76,78d76 +< pngtest$(O): png.h pngconf.h +< $(CC) $(CFLAGS) $*.c $(ERRFILE) +< +97a96,98 +> pngtest$(O): png.h pngconf.h +> $(CC) $(CFLAGS) $*.c $(ERRFILE) +> diff -ru4NwbB libpng-1.2.36/scripts/makefile.knr libpng-1.2.37beta01/scripts/makefile.knr --- libpng-1.2.36/scripts/makefile.knr 2006-02-25 06:37:26.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.knr 2009-05-02 07:07:06.451133000 -0500 @@ -1,6 +1,6 @@ # makefile for libpng -# Copyright (C) 2002 Glenn Randers-Pehrson +# Copyright (C) 2002, 2006, 2009 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # For conditions of distribution and use, see copyright notice in png.h # This makefile requires the file ansi2knr.c, which you can get @@ -57,9 +57,9 @@ test: pngtest ./pngtest -install: libpng.a +install: libpng.a png.h pngconf.h -@mkdir $(DESTDIR)$(INCPATH) -@mkdir $(DESTDIR)$(INCPATH)/libpng -@mkdir $(DESTDIR)$(LIBPATH) -@rm -f $(DESTDIR)$(INCPATH)/png.h @@ -91,9 +91,10 @@ pngread.o: png.h pngconf.h pngpread.o: png.h pngconf.h pngrtran.o: png.h pngconf.h pngrutil.o: png.h pngconf.h -pngtest.o: png.h pngconf.h pngtrans.o: png.h pngconf.h pngwrite.o: png.h pngconf.h pngwtran.o: png.h pngconf.h pngwutil.o: png.h pngconf.h + +pngtest.o: png.h pngconf.h diff -ru4NwbB libpng-1.2.36/scripts/makefile.knr.diff libpng-1.2.37beta01/scripts/makefile.knr.diff --- libpng-1.2.36/scripts/makefile.knr.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.knr.diff 2009-05-07 16:59:25.415761000 -0500 @@ -0,0 +1,13 @@ +2c2 +< # Copyright (C) 2002 Glenn Randers-Pehrson +--- +> # Copyright (C) 2002, 2006, 2009 Glenn Randers-Pehrson +61c61 +< install: libpng.a +--- +> install: libpng.a png.h pngconf.h +95d94 +< pngtest.o: png.h pngconf.h +99a99,100 +> +> pngtest.o: png.h pngconf.h diff -ru4NwbB libpng-1.2.36/scripts/makefile.linux libpng-1.2.37beta01/scripts/makefile.linux --- libpng-1.2.36/scripts/makefile.linux 2009-05-07 11:05:35.517470776 -0500 +++ libpng-1.2.37beta01/scripts/makefile.linux 2009-05-14 05:09:21.012410288 -0500 @@ -5,9 +5,9 @@ # For conditions of distribution and use, see copyright notice in png.h # Library name: LIBNAME = libpng%N% -PNGMAJ = 0 +PNGMAJ = %SONUM% PNGMIN = 1.2.37beta01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff -ru4NwbB libpng-1.2.36/scripts/makefile.linux.diff libpng-1.2.37beta01/scripts/makefile.linux.diff --- libpng-1.2.36/scripts/makefile.linux.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.linux.diff 2009-05-14 05:09:20.584027744 -0500 @@ -0,0 +1,12 @@ +9c9 +< PNGMAJ = 0 +--- +> PNGMAJ = %SONUM% +51c51,52 +< CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE \ +--- +> CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE \ +77c78 +< OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ +--- +> OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ diff -ru4NwbB libpng-1.2.36/scripts/makefile.mingw libpng-1.2.37beta01/scripts/makefile.mingw --- libpng-1.2.36/scripts/makefile.mingw 2009-05-07 11:05:35.566497753 -0500 +++ libpng-1.2.37beta01/scripts/makefile.mingw 2009-05-14 05:09:21.023938319 -0500 @@ -71,9 +71,9 @@ -W -Wall -O3 $(ALIGN) -funroll-loops -DPNG_NO_MMX_CODE \ -fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5 LIBNAME = libpng%N% -PNGMAJ = 0 +PNGMAJ = %SONUM% MINGDLL = %N% PNGMIN = 1.2.37beta01 PNGVER = $(PNGMAJ).$(PNGMIN) diff -ru4NwbB libpng-1.2.36/scripts/makefile.mingw.diff libpng-1.2.37beta01/scripts/makefile.mingw.diff --- libpng-1.2.36/scripts/makefile.mingw.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.mingw.diff 2009-05-14 05:09:20.601467385 -0500 @@ -0,0 +1,32 @@ +61,69c61,69 +< ### if you don't need thread safety, but want the asm accel +< #CFLAGS= $(strip $(MINGW_CCFLAGS) -DPNG_THREAD_UNSAFE_OK \ +< # $(addprefix -I,$(ZLIBINC)) -W -Wall -O $(ALIGN) -funroll-loops \ +< # -fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5 +< ### if you need thread safety and want (minimal) asm accel +< #CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ +< # -W -Wall -O $(ALIGN) -funroll-loops \ +< # -fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5 +< ### Normal (non-asm) compilation +--- +> ### if you don't need thread safety, but want the asm accel +> #CFLAGS= $(strip $(MINGW_CCFLAGS) -DPNG_THREAD_UNSAFE_OK \ +> # $(addprefix -I,$(ZLIBINC)) -W -Wall -O $(ALIGN) -funroll-loops \ +> # -fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5 +> ### if you need thread safety and want (minimal) asm accel +> #CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ +> # -W -Wall -O $(ALIGN) -funroll-loops \ +> # -fomit-frame-pointer) # $(WARNMORE) -g -DPNG_DEBUG=5 +> ### Normal (non-asm) compilation +71c71,72 +< -W -Wall -O3 $(ALIGN) -funroll-loops -DPNG_NO_MMX_CODE \ +--- +> -W -Wall -O3 $(ALIGN) -funroll-loops -DPNG_NO_MMX_CODE \ +75c76 +< PNGMAJ = 0 +--- +> PNGMAJ = %SONUM% +287,289d287 +< +< +< diff -ru4NwbB libpng-1.2.36/scripts/makefile.mips libpng-1.2.37beta01/scripts/makefile.mips --- libpng-1.2.36/scripts/makefile.mips 2006-02-25 06:37:32.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.mips 2009-05-02 05:29:55.009730000 -0500 @@ -75,9 +75,10 @@ pngread.o: png.h pngconf.h pngpread.o: png.h pngconf.h pngrtran.o: png.h pngconf.h pngrutil.o: png.h pngconf.h -pngtest.o: png.h pngconf.h pngtrans.o: png.h pngconf.h pngwrite.o: png.h pngconf.h pngwtran.o: png.h pngconf.h pngwutil.o: png.h pngconf.h + +pngtest.o: png.h pngconf.h diff -ru4NwbB libpng-1.2.36/scripts/makefile.mips.diff libpng-1.2.37beta01/scripts/makefile.mips.diff --- libpng-1.2.36/scripts/makefile.mips.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.mips.diff 2009-05-07 16:59:25.456073000 -0500 @@ -0,0 +1,5 @@ +79d78 +< pngtest.o: png.h pngconf.h +83a83,84 +> +> pngtest.o: png.h pngconf.h diff -ru4NwbB libpng-1.2.36/scripts/makefile.msc libpng-1.2.37beta01/scripts/makefile.msc --- libpng-1.2.36/scripts/makefile.msc 2001-01-05 18:24:59.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.msc 2009-05-02 06:57:28.494695000 -0500 @@ -1,6 +1,7 @@ # makefile for libpng # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. +# Copyright (C) 2006, 2009 Glenn Randers-Pehrson # For conditions of distribution and use, see copyright notice in png.h # Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib # -------- Microsoft C 5.1 and later, does not use assembler code -------- @@ -54,11 +55,8 @@ pngwio$(O): png.h pngconf.h $(CC) -c $(CFLAGS) $*.c $(ERRFILE) -pngtest$(O): png.h pngconf.h - $(CC) -c $(CFLAGS) $*.c $(ERRFILE) - pngtrans$(O): png.h pngconf.h $(CC) -c $(CFLAGS) $*.c $(ERRFILE) pngwrite$(O): png.h pngconf.h @@ -75,8 +73,11 @@ lib libpng $(OBJS1); lib libpng $(OBJS2); lib libpng $(OBJS3); +pngtest$(O): png.h pngconf.h + $(CC) -c $(CFLAGS) $*.c $(ERRFILE) + pngtest.exe: pngtest.obj libpng.lib $(LD) $(LDFLAGS) pngtest.obj,,,libpng.lib ..\zlib\zlib.lib ; test: pngtest.exe diff -ru4NwbB libpng-1.2.36/scripts/makefile.msc.diff libpng-1.2.37beta01/scripts/makefile.msc.diff --- libpng-1.2.36/scripts/makefile.msc.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.msc.diff 2009-05-07 16:59:25.469179000 -0500 @@ -0,0 +1,10 @@ +2a3 +> # Copyright (C) 2006, 2009 Glenn Randers-Pehrson +58,60d58 +< pngtest$(O): png.h pngconf.h +< $(CC) -c $(CFLAGS) $*.c $(ERRFILE) +< +78a77,79 +> pngtest$(O): png.h pngconf.h +> $(CC) -c $(CFLAGS) $*.c $(ERRFILE) +> diff -ru4NwbB libpng-1.2.36/scripts/makefile.ne12bsd libpng-1.2.37beta01/scripts/makefile.ne12bsd --- libpng-1.2.36/scripts/makefile.ne12bsd 2009-05-07 11:05:35.586465610 -0500 +++ libpng-1.2.37beta01/scripts/makefile.ne12bsd 2009-05-14 05:09:21.033953024 -0500 @@ -1,9 +1,9 @@ # makefile for libpng for NetBSD for the standard # make obj && make depend && make && make test # make includes && make install # Copyright (C) 2002 Patrick R.L. Welche -# Copyright (C) 2007 Glenn Randers-Pehrson +# Copyright (C) 2007, 2009 Glenn Randers-Pehrson # For conditions of distribution and use, see copyright notice in png.h # You should also run makefile.netbsd @@ -11,9 +11,9 @@ LIBDIR= ${LOCALBASE}/lib MANDIR= ${LOCALBASE}/man INCSDIR=${LOCALBASE}/include/libpng%N% -LIB= png12 +LIB= png%N% SHLIB_MAJOR= 0 SHLIB_MINOR= 1.2.37beta01 SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ @@ -22,9 +22,10 @@ MAN= libpng.3 libpngpf.3 png.5 CPPFLAGS+=-I${.CURDIR} -# something like this for mmx assembler, but it core dumps for me at the moment +# We should be able to do something like this instead of the manual +# uncommenting, but it core dumps for me at the moment: # .if ${MACHINE_ARCH} == "i386" # CPPFLAGS+=-DPNG_THREAD_UNSAFE_OK # MKLINT= no # .else diff -ru4NwbB libpng-1.2.36/scripts/makefile.ne12bsd.diff libpng-1.2.37beta01/scripts/makefile.ne12bsd.diff --- libpng-1.2.36/scripts/makefile.ne12bsd.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.ne12bsd.diff 2009-05-14 05:09:21.043500293 -0500 @@ -0,0 +1,23 @@ +5c5 +< # Copyright (C) 2007 Glenn Randers-Pehrson +--- +> # Copyright (C) 2007, 2009 Glenn Randers-Pehrson +15c15 +< LIB= png12 +--- +> LIB= png%N% +26c26,27 +< # something like this for mmx assembler, but it core dumps for me at the moment +--- +> # We should be able to do something like this instead of the manual +> # uncommenting, but it core dumps for me at the moment: +28c29 +< # CPPFLAGS+=-DPNG_THREAD_UNSAFE_OK +--- +> # CPPFLAGS+=-DPNG_THREAD_UNSAFE_OK +30,31c31,32 +< # .else +< CPPFLAGS+=-DPNG_NO_MMX_CODE +--- +> # .else +> CPPFLAGS+=-DPNG_NO_MMX_CODE diff -ru4NwbB libpng-1.2.36/scripts/makefile.netbsd libpng-1.2.37beta01/scripts/makefile.netbsd --- libpng-1.2.36/scripts/makefile.netbsd 2009-05-07 11:05:35.605892719 -0500 +++ libpng-1.2.37beta01/scripts/makefile.netbsd 2009-05-14 05:09:21.053290145 -0500 @@ -1,9 +1,9 @@ # makefile for libpng for NetBSD for the standard # make obj && make depend && make && make test # make includes && make install # Copyright (C) 2002 Patrick R.L. Welche -# Copyright (C) 2007 Glenn Randers-Pehrson +# Copyright (C) 2007, 2009 Glenn Randers-Pehrson # For conditions of distribution and use, see copyright notice in png.h # You should also run makefile.ne0bsd @@ -22,9 +22,10 @@ MAN= libpng.3 libpngpf.3 png.5 CPPFLAGS+=-I${.CURDIR} -# something like this for mmx assembler, but it core dumps for me at the moment +# We should be able to do something like this instead of the manual +# uncommenting, but it core dumps for me at the moment: # .if ${MACHINE_ARCH} == "i386" # CPPFLAGS+=-DPNG_THREAD_UNSAFE_OK # MKLINT= no # .else diff -ru4NwbB libpng-1.2.36/scripts/makefile.netbsd.diff libpng-1.2.37beta01/scripts/makefile.netbsd.diff --- libpng-1.2.36/scripts/makefile.netbsd.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.netbsd.diff 2009-05-14 05:09:20.634137161 -0500 @@ -0,0 +1,19 @@ +5c5 +< # Copyright (C) 2007 Glenn Randers-Pehrson +--- +> # Copyright (C) 2007, 2009 Glenn Randers-Pehrson +26c26,27 +< # something like this for mmx assembler, but it core dumps for me at the moment +--- +> # We should be able to do something like this instead of the manual +> # uncommenting, but it core dumps for me at the moment: +28c29 +< # CPPFLAGS+=-DPNG_THREAD_UNSAFE_OK +--- +> # CPPFLAGS+=-DPNG_THREAD_UNSAFE_OK +30,31c31,32 +< # .else +< CPPFLAGS+=-DPNG_NO_MMX_CODE +--- +> # .else +> CPPFLAGS+=-DPNG_NO_MMX_CODE diff -ru4NwbB libpng-1.2.36/scripts/makefile.nommx libpng-1.2.37beta01/scripts/makefile.nommx --- libpng-1.2.36/scripts/makefile.nommx 2009-05-07 11:05:35.643285812 -0500 +++ libpng-1.2.37beta01/scripts/makefile.nommx 2009-05-14 05:09:21.064270915 -0500 @@ -5,9 +5,9 @@ # For conditions of distribution and use, see copyright notice in png.h # Library name: LIBNAME = libpng%N% -PNGMAJ = 0 +PNGMAJ = %SONUM% PNGMIN = 1.2.37beta01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: @@ -232,21 +232,21 @@ chmod a-w *.[ch35] $(DOCS) scripts/* # DO NOT DELETE THIS LINE -- make depend depends on it. -png.o png.pic.o: png.h pngconf.h -pngerror.o pngerror.pic.o: png.h pngconf.h -pngrio.o pngrio.pic.o: png.h pngconf.h -pngwio.o pngwio.pic.o: png.h pngconf.h -pngmem.o pngmem.pic.o: png.h pngconf.h -pngset.o pngset.pic.o: png.h pngconf.h -pngget.o pngget.pic.o: png.h pngconf.h -pngread.o pngread.pic.o: png.h pngconf.h -pngrtran.o pngrtran.pic.o: png.h pngconf.h -pngrutil.o pngrutil.pic.o: png.h pngconf.h -pngtrans.o pngtrans.pic.o: png.h pngconf.h -pngwrite.o pngwrite.pic.o: png.h pngconf.h -pngwtran.o pngwtran.pic.o: png.h pngconf.h -pngwutil.o pngwutil.pic.o: png.h pngconf.h -pngpread.o pngpread.pic.o: png.h pngconf.h +png.o png.pic.o: png.h pngconf.h png.c +pngerror.o pngerror.pic.o: png.h pngconf.h pngerror.c +pngrio.o pngrio.pic.o: png.h pngconf.h pngrio.c +pngwio.o pngwio.pic.o: png.h pngconf.h pngwio.c +pngmem.o pngmem.pic.o: png.h pngconf.h pngmem.c +pngset.o pngset.pic.o: png.h pngconf.h pngset.c +pngget.o pngget.pic.o: png.h pngconf.h pngget.c +pngread.o pngread.pic.o: png.h pngconf.h pngread.c +pngrtran.o pngrtran.pic.o: png.h pngconf.h pngrtran.c +pngrutil.o pngrutil.pic.o: png.h pngconf.h pngrutil.c +pngtrans.o pngtrans.pic.o: png.h pngconf.h pngtrans.c +pngwrite.o pngwrite.pic.o: png.h pngconf.h pngwrite.c +pngwtran.o pngwtran.pic.o: png.h pngconf.h pngwtran.c +pngwutil.o pngwutil.pic.o: png.h pngconf.h pngwutil.c +pngpread.o pngpread.pic.o: png.h pngconf.h pngpread.c -pngtest.o: png.h pngconf.h +pngtest.o: png.h pngconf.h pngtest.c diff -ru4NwbB libpng-1.2.36/scripts/makefile.nommx.diff libpng-1.2.37beta01/scripts/makefile.nommx.diff --- libpng-1.2.36/scripts/makefile.nommx.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.nommx.diff 2009-05-14 05:09:20.651185366 -0500 @@ -0,0 +1,52 @@ +9c9 +< PNGMAJ = 0 +--- +> PNGMAJ = %SONUM% +51c51,52 +< CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE \ +--- +> CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE \ +101c102 +< -e s!Cflags: !Cflags:\ -DPNG_NO_MMX_CODE!> libpng.pc +--- +> -e s!Cflags: !Cflags:\ -DPNG_NO_MMX_CODE!> libpng.pc +106c107,108 +< echo I_opts=\"-I$(INCPATH)/$(LIBNAME) -DPNG_NO_MMX_CODE\"; \ +--- +> echo I_opts=\"-I$(INCPATH)/$(LIBNAME) -DPNG_NO_MMX_CODE\"; \ +236,250c238,252 +< png.o png.pic.o: png.h pngconf.h +< pngerror.o pngerror.pic.o: png.h pngconf.h +< pngrio.o pngrio.pic.o: png.h pngconf.h +< pngwio.o pngwio.pic.o: png.h pngconf.h +< pngmem.o pngmem.pic.o: png.h pngconf.h +< pngset.o pngset.pic.o: png.h pngconf.h +< pngget.o pngget.pic.o: png.h pngconf.h +< pngread.o pngread.pic.o: png.h pngconf.h +< pngrtran.o pngrtran.pic.o: png.h pngconf.h +< pngrutil.o pngrutil.pic.o: png.h pngconf.h +< pngtrans.o pngtrans.pic.o: png.h pngconf.h +< pngwrite.o pngwrite.pic.o: png.h pngconf.h +< pngwtran.o pngwtran.pic.o: png.h pngconf.h +< pngwutil.o pngwutil.pic.o: png.h pngconf.h +< pngpread.o pngpread.pic.o: png.h pngconf.h +--- +> png.o png.pic.o: png.h pngconf.h png.c +> pngerror.o pngerror.pic.o: png.h pngconf.h pngerror.c +> pngrio.o pngrio.pic.o: png.h pngconf.h pngrio.c +> pngwio.o pngwio.pic.o: png.h pngconf.h pngwio.c +> pngmem.o pngmem.pic.o: png.h pngconf.h pngmem.c +> pngset.o pngset.pic.o: png.h pngconf.h pngset.c +> pngget.o pngget.pic.o: png.h pngconf.h pngget.c +> pngread.o pngread.pic.o: png.h pngconf.h pngread.c +> pngrtran.o pngrtran.pic.o: png.h pngconf.h pngrtran.c +> pngrutil.o pngrutil.pic.o: png.h pngconf.h pngrutil.c +> pngtrans.o pngtrans.pic.o: png.h pngconf.h pngtrans.c +> pngwrite.o pngwrite.pic.o: png.h pngconf.h pngwrite.c +> pngwtran.o pngwtran.pic.o: png.h pngconf.h pngwtran.c +> pngwutil.o pngwutil.pic.o: png.h pngconf.h pngwutil.c +> pngpread.o pngpread.pic.o: png.h pngconf.h pngpread.c +252c254 +< pngtest.o: png.h pngconf.h +--- +> pngtest.o: png.h pngconf.h pngtest.c diff -ru4NwbB libpng-1.2.36/scripts/makefile.openbsd.diff libpng-1.2.37beta01/scripts/makefile.openbsd.diff --- libpng-1.2.36/scripts/makefile.openbsd.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.openbsd.diff 2009-05-14 05:09:20.668324459 -0500 @@ -0,0 +1,4 @@ +21c21,22 +< CPPFLAGS+= -I${.CURDIR} -DPNG_NO_MMX_CODE +--- +> CPPFLAGS+= -I${.CURDIR} -DPNG_NO_MMX_CODE diff -ru4NwbB libpng-1.2.36/scripts/makefile.sco libpng-1.2.37beta01/scripts/makefile.sco --- libpng-1.2.36/scripts/makefile.sco 2009-05-07 11:05:35.710547306 -0500 +++ libpng-1.2.37beta01/scripts/makefile.sco 2009-05-14 05:09:21.085186565 -0500 @@ -7,9 +7,9 @@ # For conditions of distribution and use, see copyright notice in png.h # Library name: LIBNAME = libpng%N% -PNGMAJ = 0 +PNGMAJ = %SONUM% PNGMIN = 1.2.37beta01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff -ru4NwbB libpng-1.2.36/scripts/makefile.sco.diff libpng-1.2.37beta01/scripts/makefile.sco.diff --- libpng-1.2.36/scripts/makefile.sco.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.sco.diff 2009-05-14 05:09:20.685706120 -0500 @@ -0,0 +1,8 @@ +11c11 +< PNGMAJ = 0 +--- +> PNGMAJ = %SONUM% +41c41,42 +< CFLAGS= -dy -belf -I$(ZLIBINC) -O3 -DPNG_NO_MMX_CODE +--- +> CFLAGS= -dy -belf -I$(ZLIBINC) -O3 -DPNG_NO_MMX_CODE diff -ru4NwbB libpng-1.2.36/scripts/makefile.sggcc libpng-1.2.37beta01/scripts/makefile.sggcc --- libpng-1.2.36/scripts/makefile.sggcc 2009-05-07 11:05:35.746660561 -0500 +++ libpng-1.2.37beta01/scripts/makefile.sggcc 2009-05-14 05:09:21.096105520 -0500 @@ -4,9 +4,9 @@ # For conditions of distribution and use, see copyright notice in png.h # Library name: LIBNAME=libpng%N% -PNGMAJ = 0 +PNGMAJ = %SONUM% PNGMIN = 1.2.37beta01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: @@ -211,12 +211,10 @@ -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags` ./pngtesti pngtest.png clean: - $(RM_F) libpng.a pngtest pngtesti pngout.png libpng.pc libpng-config \ - $(LIBSO) $(LIBSOMAJ)* \ - $(OLDSOVER) \ - so_locations + $(RM_F) libpng.a pngtest pngtesti pngout.png libpng.pc \ + so_locations libpng-config $(LIBSO) $(LIBSOMAJ)* $(OLDSOVER) DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO writelock: chmod a-w *.[ch35] $(DOCS) scripts/* @@ -232,11 +230,11 @@ pngget.o: png.h pngconf.h pngread.o: png.h pngconf.h pngrtran.o: png.h pngconf.h pngrutil.o: png.h pngconf.h -pngtest.o: png.h pngconf.h pngtrans.o: png.h pngconf.h pngwrite.o: png.h pngconf.h pngwtran.o: png.h pngconf.h pngwutil.o: png.h pngconf.h pngpread.o: png.h pngconf.h +pngtest.o: png.h pngconf.h diff -ru4NwbB libpng-1.2.36/scripts/makefile.sggcc.diff libpng-1.2.37beta01/scripts/makefile.sggcc.diff --- libpng-1.2.36/scripts/makefile.sggcc.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.sggcc.diff 2009-05-14 05:09:20.708215728 -0500 @@ -0,0 +1,24 @@ +8c8 +< PNGMAJ = 0 +--- +> PNGMAJ = %SONUM% +47c47,48 +< CFLAGS=$(ABI) -I$(ZLIBINC) -O $(WARNMORE) -fPIC -mabi=n32 -DPNG_NO_MMX_CODE +--- +> CFLAGS=$(ABI) -I$(ZLIBINC) -O $(WARNMORE) -fPIC -mabi=n32 -DPNG_NO_MMX_CODE +100c101,102 +< echo cppflags=\"-DPNG_NO_MMX_CODE\"; \ +--- +> echo cppflags=\"-DPNG_NO_MMX_CODE\"; \ +215,218c217,218 +< $(RM_F) libpng.a pngtest pngtesti pngout.png libpng.pc libpng-config \ +< $(LIBSO) $(LIBSOMAJ)* \ +< $(OLDSOVER) \ +< so_locations +--- +> $(RM_F) libpng.a pngtest pngtesti pngout.png libpng.pc \ +> so_locations libpng-config $(LIBSO) $(LIBSOMAJ)* $(OLDSOVER) +236d235 +< pngtest.o: png.h pngconf.h +242a242 +> pngtest.o: png.h pngconf.h diff -ru4NwbB libpng-1.2.36/scripts/makefile.sgi libpng-1.2.37beta01/scripts/makefile.sgi --- libpng-1.2.36/scripts/makefile.sgi 2009-05-07 11:05:35.783019670 -0500 +++ libpng-1.2.37beta01/scripts/makefile.sgi 2009-05-14 05:09:21.107212502 -0500 @@ -4,9 +4,9 @@ # For conditions of distribution and use, see copyright notice in png.h # Library name: LIBNAME=libpng%N% -PNGMAJ = 0 +PNGMAJ = %SONUM% PNGMIN = 1.2.37beta01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: @@ -235,11 +235,11 @@ pngget.o: png.h pngconf.h pngread.o: png.h pngconf.h pngrtran.o: png.h pngconf.h pngrutil.o: png.h pngconf.h -pngtest.o: png.h pngconf.h pngtrans.o: png.h pngconf.h pngwrite.o: png.h pngconf.h pngwtran.o: png.h pngconf.h pngwutil.o: png.h pngconf.h pngpread.o: png.h pngconf.h +pngtest.o: png.h pngconf.h diff -ru4NwbB libpng-1.2.36/scripts/makefile.sgi.diff libpng-1.2.37beta01/scripts/makefile.sgi.diff --- libpng-1.2.36/scripts/makefile.sgi.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.sgi.diff 2009-05-14 05:09:20.729457969 -0500 @@ -0,0 +1,18 @@ +8c8 +< PNGMAJ = 0 +--- +> PNGMAJ = %SONUM% +48,49c48,51 +< #CFLAGS= $(ABI) -I$(ZLIBINC) -O $(WARNMORE) -KPIC -DPNG_NO_MMX_CODE # -g -DPNG_DEBUG=5 +< CFLAGS=$(ABI) -I$(ZLIBINC) -O $(WARNMORE) -DPNG_NO_MMX_CODE +--- +> #CFLAGS= $(ABI) -I$(ZLIBINC) -O $(WARNMORE) -KPIC -DPNG_NO_MMX_CODE # -g -DPNG_DEBUG=5 +> CFLAGS=$(ABI) -I$(ZLIBINC) -O $(WARNMORE) -DPNG_NO_MMX_CODE +102c104 +< echo cppflags=\"-DPNG_NO_MMX_CODE\"; \ +--- +> echo cppflags=\"-DPNG_NO_MMX_CODE\"; \ +239d240 +< pngtest.o: png.h pngconf.h +245a247 +> pngtest.o: png.h pngconf.h diff -ru4NwbB libpng-1.2.36/scripts/makefile.so9 libpng-1.2.37beta01/scripts/makefile.so9 --- libpng-1.2.36/scripts/makefile.so9 2009-05-07 11:05:35.823450009 -0500 +++ libpng-1.2.37beta01/scripts/makefile.so9 2009-05-14 05:09:21.117083910 -0500 @@ -6,9 +6,9 @@ # Copyright (C) 1996-1997 Andreas Dilger # For conditions of distribution and use, see copyright notice in png.h # Library name: -PNGMAJ = 0 +PNGMAJ = %SONUM% PNGMIN = 1.2.37beta01 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng%N% diff -ru4NwbB libpng-1.2.36/scripts/makefile.so9.diff libpng-1.2.37beta01/scripts/makefile.so9.diff --- libpng-1.2.36/scripts/makefile.so9.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.so9.diff 2009-05-07 16:59:25.587334000 -0500 @@ -0,0 +1,4 @@ +10c10 +< PNGMAJ = 0 +--- +> PNGMAJ = %SONUM% diff -ru4NwbB libpng-1.2.36/scripts/makefile.solaris libpng-1.2.37beta01/scripts/makefile.solaris --- libpng-1.2.36/scripts/makefile.solaris 2009-05-07 11:05:35.863017950 -0500 +++ libpng-1.2.37beta01/scripts/makefile.solaris 2009-05-14 05:09:21.128182836 -0500 @@ -6,9 +6,9 @@ # For conditions of distribution and use, see copyright notice in png.h # Library name: LIBNAME = libpng%N% -PNGMAJ = 0 +PNGMAJ = %SONUM% PNGMIN = 1.2.37beta01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: @@ -42,10 +42,9 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ -Wmissing-declarations -Wtraditional -Wcast-align \ -Wstrict-prototypes -Wmissing-prototypes #-Wconversion -CFLAGS=-I$(ZLIBINC) -W -Wall -O \ - -DPNG_NO_MMX_CODE; \ +CFLAGS=-I$(ZLIBINC) -W -Wall -O -DPNG_NO_MMX_CODE; \ # $(WARNMORE) -g -DPNG_DEBUG=5 LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng%N% -lz -lm INCPATH=$(prefix)/include diff -ru4NwbB libpng-1.2.36/scripts/makefile.solaris-x86 libpng-1.2.37beta01/scripts/makefile.solaris-x86 --- libpng-1.2.36/scripts/makefile.solaris-x86 2009-05-07 11:05:35.912167987 -0500 +++ libpng-1.2.37beta01/scripts/makefile.solaris-x86 2009-05-14 05:09:21.137910693 -0500 @@ -6,9 +6,9 @@ # For conditions of distribution and use, see copyright notice in png.h # Library name: LIBNAME = libpng%N% -PNGMAJ = 0 +PNGMAJ = %SONUM% PNGMIN = 1.2.37beta01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff -ru4NwbB libpng-1.2.36/scripts/makefile.solaris-x86.diff libpng-1.2.37beta01/scripts/makefile.solaris-x86.diff --- libpng-1.2.36/scripts/makefile.solaris-x86.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.solaris-x86.diff 2009-05-07 16:59:25.613042000 -0500 @@ -0,0 +1,4 @@ +10c10 +< PNGMAJ = 0 +--- +> PNGMAJ = %SONUM% diff -ru4NwbB libpng-1.2.36/scripts/makefile.solaris.diff libpng-1.2.37beta01/scripts/makefile.solaris.diff --- libpng-1.2.36/scripts/makefile.solaris.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.solaris.diff 2009-05-14 05:09:20.746795943 -0500 @@ -0,0 +1,13 @@ +10c10 +< PNGMAJ = 0 +--- +> PNGMAJ = %SONUM% +46,47c46,47 +< CFLAGS=-I$(ZLIBINC) -W -Wall -O \ +< -DPNG_NO_MMX_CODE; \ +--- +> CFLAGS=-I$(ZLIBINC) -W -Wall -O -DPNG_NO_MMX_CODE; \ +99c99,100 +< echo cppflags=\"-DPNG_NO_MMX_CODE\"; \ +--- +> echo cppflags=\"-DPNG_NO_MMX_CODE\"; \ diff -ru4NwbB libpng-1.2.36/scripts/makefile.std libpng-1.2.37beta01/scripts/makefile.std --- libpng-1.2.36/scripts/makefile.std 2006-03-06 11:06:28.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.std 2009-05-02 05:23:52.763211000 -0500 @@ -82,11 +82,11 @@ pngget.o: png.h pngconf.h pngread.o: png.h pngconf.h pngrtran.o: png.h pngconf.h pngrutil.o: png.h pngconf.h -pngtest.o: png.h pngconf.h pngtrans.o: png.h pngconf.h pngwrite.o: png.h pngconf.h pngwtran.o: png.h pngconf.h pngwutil.o: png.h pngconf.h pngpread.o: png.h pngconf.h +pngtest.o: png.h pngconf.h diff -ru4NwbB libpng-1.2.36/scripts/makefile.std.diff libpng-1.2.37beta01/scripts/makefile.std.diff --- libpng-1.2.36/scripts/makefile.std.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.std.diff 2009-05-07 16:59:25.625586000 -0500 @@ -0,0 +1,4 @@ +86d85 +< pngtest.o: png.h pngconf.h +92a92 +> pngtest.o: png.h pngconf.h diff -ru4NwbB libpng-1.2.36/scripts/makefile.sunos libpng-1.2.37beta01/scripts/makefile.sunos --- libpng-1.2.36/scripts/makefile.sunos 2006-03-08 12:34:28.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.sunos 2009-05-02 05:31:09.828282000 -0500 @@ -87,11 +87,11 @@ pngget.o: png.h pngconf.h pngread.o: png.h pngconf.h pngrtran.o: png.h pngconf.h pngrutil.o: png.h pngconf.h -pngtest.o: png.h pngconf.h pngtrans.o: png.h pngconf.h pngwrite.o: png.h pngconf.h pngwtran.o: png.h pngconf.h pngwutil.o: png.h pngconf.h pngpread.o: png.h pngconf.h +pngtest.o: png.h pngconf.h diff -ru4NwbB libpng-1.2.36/scripts/makefile.sunos.diff libpng-1.2.37beta01/scripts/makefile.sunos.diff --- libpng-1.2.36/scripts/makefile.sunos.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.sunos.diff 2009-05-07 16:59:25.637940000 -0500 @@ -0,0 +1,4 @@ +91d90 +< pngtest.o: png.h pngconf.h +97a97 +> pngtest.o: png.h pngconf.h diff -ru4NwbB libpng-1.2.36/scripts/makefile.vcawin32 libpng-1.2.37beta01/scripts/makefile.vcawin32 --- libpng-1.2.36/scripts/makefile.vcawin32 2007-09-01 09:32:54.000000000 -0500 +++ libpng-1.2.37beta01/scripts/makefile.vcawin32 2009-05-14 05:09:20.756041786 -0500 @@ -1,18 +1,19 @@ # makefile for libpng +# Copyright (C) 2006,2009 Glenn Randers-Pehrson # Copyright (C) 1998 Tim Wegner # For conditions of distribution and use, see copyright notice in png.h # Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib # To use, do "nmake /f scripts\makefile.vcawin32" -# -------- Microsoft Visual C++ 5.0 and later, uses assembler code -------- +# -------- Microsoft Visual C++ 2.0 and later, no assembler code -------- # If you don't want to use assembler (MMX) code, use makefile.vcwin32 instead. # Compiler, linker, librarian, and other tools CC = cl LD = link AR = lib -CFLAGS = -DPNG_USE_PNGVCRD -nologo -MD -O2 -W3 -I..\zlib +CFLAGS = -nologo -DPNG_USE_PNGVCRD -MD -O2 -W3 -I..\zlib LDFLAGS = -nologo ARFLAGS = -nologo RM = del @@ -63,11 +64,8 @@ pngwio$(O): png.h pngconf.h $(CC) -c $(CFLAGS) $*.c $(ERRFILE) -pngtest$(O): png.h pngconf.h - $(CC) -c $(CFLAGS) $*.c $(ERRFILE) - pngtrans$(O): png.h pngconf.h $(CC) -c $(CFLAGS) $*.c $(ERRFILE) pngwrite$(O): png.h pngconf.h @@ -82,8 +80,11 @@ libpng.lib: $(OBJS) -$(RM) $@ $(AR) $(ARFLAGS) -out:$@ $(OBJS) $(ERRFILE) +pngtest$(O): png.h pngconf.h + $(CC) -c $(CFLAGS) $*.c $(ERRFILE) + pngtest.exe: pngtest$(O) libpng.lib $(LD) $(LDFLAGS) -out:$@ pngtest$(O) libpng.lib ..\zlib\zlib.lib $(ERRFILE) test: pngtest.exe diff -ru4NwbB libpng-1.2.36/scripts/makefile.vcawin32.diff libpng-1.2.37beta01/scripts/makefile.vcawin32.diff --- libpng-1.2.36/scripts/makefile.vcawin32.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.vcawin32.diff 2009-05-14 05:09:20.764044760 -0500 @@ -0,0 +1,20 @@ +1a2 +> # Copyright (C) 2006,2009 Glenn Randers-Pehrson +7,8c8,9 +< # -------- Microsoft Visual C++ 5.0 and later, uses assembler code -------- +< # If you don't want to use assembler (MMX) code, use makefile.vcwin32 instead. +--- +> # -------- Microsoft Visual C++ 2.0 and later, no assembler code -------- +> # If you don't want to use assembler (MMX) code, use makefile.vcwin32 instead. +14c15,16 +< CFLAGS = -DPNG_USE_PNGVCRD -nologo -MD -O2 -W3 -I..\zlib +--- +> CFLAGS = -nologo -DPNG_USE_PNGVCRD -MD -O2 -W3 -I..\zlib +67,69d68 +< pngtest$(O): png.h pngconf.h +< $(CC) -c $(CFLAGS) $*.c $(ERRFILE) +< +85a85,87 +> pngtest$(O): png.h pngconf.h +> $(CC) -c $(CFLAGS) $*.c $(ERRFILE) +> diff -ru4NwbB libpng-1.2.36/scripts/makefile.vcwin32 libpng-1.2.37beta01/scripts/makefile.vcwin32 --- libpng-1.2.36/scripts/makefile.vcwin32 2007-06-19 14:08:25.000000000 -0500 +++ libpng-1.2.37beta01/scripts/makefile.vcwin32 2009-05-14 05:09:20.772389276 -0500 @@ -1,6 +1,7 @@ # makefile for libpng # Copyright (C) 1998 Tim Wegner +# Copyright (C) 2006,2009 Glenn Randers-Pehrson # For conditions of distribution and use, see copyright notice in png.h # Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib # To use, do "nmake /f scripts\makefile.vcwin32" @@ -63,11 +64,8 @@ pngwio$(O): png.h pngconf.h $(CC) -c $(CFLAGS) $*.c $(ERRFILE) -pngtest$(O): png.h pngconf.h - $(CC) -c $(CFLAGS) $*.c $(ERRFILE) - pngtrans$(O): png.h pngconf.h $(CC) -c $(CFLAGS) $*.c $(ERRFILE) pngwrite$(O): png.h pngconf.h @@ -82,8 +80,11 @@ libpng.lib: $(OBJS) -$(RM) $@ $(AR) $(ARFLAGS) -out:$@ $(OBJS) $(ERRFILE) +pngtest$(O): png.h pngconf.h + $(CC) -c $(CFLAGS) $*.c $(ERRFILE) + pngtest.exe: pngtest$(O) libpng.lib $(LD) $(LDFLAGS) -out:$@ pngtest$(O) libpng.lib ..\zlib\zlib.lib $(ERRFILE) test: pngtest.exe diff -ru4NwbB libpng-1.2.36/scripts/makefile.vcwin32.diff libpng-1.2.37beta01/scripts/makefile.vcwin32.diff --- libpng-1.2.36/scripts/makefile.vcwin32.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makefile.vcwin32.diff 2009-05-14 05:09:20.781014188 -0500 @@ -0,0 +1,18 @@ +2a3 +> # Copyright (C) 2006,2009 Glenn Randers-Pehrson +8c9 +< # If you want to use assembler (MMX) code, use makefile.vcawin32 instead. +--- +> # If you want to use assembler (MMX) code, use makefile.vcawin32 instead. +14c15,16 +< CFLAGS = -nologo -DPNG_NO_MMX_CODE -MD -O2 -W3 -I..\zlib +--- +> CFLAGS = -nologo -DPNG_NO_MMX_CODE -MD -O2 -W3 -I..\zlib +67,69d68 +< pngtest$(O): png.h pngconf.h +< $(CC) -c $(CFLAGS) $*.c $(ERRFILE) +< +85a85,87 +> pngtest$(O): png.h pngconf.h +> $(CC) -c $(CFLAGS) $*.c $(ERRFILE) +> diff -ru4NwbB libpng-1.2.36/scripts/makevms.com libpng-1.2.37beta01/scripts/makevms.com --- libpng-1.2.36/scripts/makevms.com 2001-01-12 13:12:19.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makevms.com 2009-05-02 05:28:28.713098000 -0500 @@ -54,10 +54,8 @@ $ then $ dele pngtest.obj;* $ CALL MAKE png.OBJ "cc ''CCOPT' png" - png.c png.h pngconf.h -$ CALL MAKE pngpread.OBJ "cc ''CCOPT' pngpread" - - pngpread.c png.h pngconf.h $ CALL MAKE pngset.OBJ "cc ''CCOPT' pngset" - pngset.c png.h pngconf.h $ CALL MAKE pngget.OBJ "cc ''CCOPT' pngget" - pngget.c png.h pngconf.h diff -ru4NwbB libpng-1.2.36/scripts/makevms.com.diff libpng-1.2.37beta01/scripts/makevms.com.diff --- libpng-1.2.36/scripts/makevms.com.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/makevms.com.diff 2009-05-07 16:59:25.699174000 -0500 @@ -0,0 +1,7 @@ +58,59d57 +< $ CALL MAKE pngpread.OBJ "cc ''CCOPT' pngpread" - +< pngpread.c png.h pngconf.h +67c65 +< pngpread.c png.h pngconf.h +--- +> pngpread.c png.h pngconf.h diff -ru4NwbB libpng-1.2.36/scripts/pngw32.def libpng-1.2.37beta01/scripts/pngw32.def --- libpng-1.2.36/scripts/pngw32.def 2009-05-07 11:05:35.983818694 -0500 +++ libpng-1.2.37beta01/scripts/pngw32.def 2009-05-14 05:09:21.159604222 -0500 @@ -188,8 +188,9 @@ png_set_invalid @173 ; Added at version 1.0.12 ; For compatibility with 1.0.7-1.0.11 ; png_info_init @174 +; png_read_init_3, png_info_init_3, and png_write_init_3 are deprecated. png_read_init_3 @175 png_write_init_3 @176 png_info_init_3 @177 png_destroy_struct @178 diff -ru4NwbB libpng-1.2.36/scripts/pngw32.def.diff libpng-1.2.37beta01/scripts/pngw32.def.diff --- libpng-1.2.36/scripts/pngw32.def.diff 1969-12-31 18:00:00.000000000 -0600 +++ libpng-1.2.37beta01/scripts/pngw32.def.diff 2009-05-07 16:59:25.723589000 -0500 @@ -0,0 +1,2 @@ +191a192 +> ; png_read_init_3, png_info_init_3, and png_write_init_3 are deprecated.