Update libpng to version 1.6.36

Fix #3131

repos/libports/lib/mk/libpng.mk

@@ -4,7 +4,9 @@ LIBS       += libc libm zlib
 # find 'config.h'
 INC_DIR += $(REP_DIR)/src/lib/libpng
 
-CC_DEF += -DHAVE_CONFIG_H -DPNG_CONFIGURE_LIBPNG
+INC_DIR += $(call select_from_ports,libpng)/include/libpng
+
+CC_DEF += -DHAVE_CONFIG_H
 
 SRC_C = png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
         pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c pngwtran.c \
@@ -13,5 +15,3 @@ SRC_C = png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
 vpath %.c $(LIBPNG_DIR)
 
 SHARED_LIB = yes
-
-CC_CXX_WARN_STRICT =

repos/libports/lib/symbols/libpng

@@ -1,211 +1,152 @@
-png_64bit_product T
 png_access_version_number T
-png_build_gamma_table T
+png_benign_error T
 png_build_grayscale_palette T
-png_calculate_crc T
 png_calloc T
-png_check_IHDR T
+png_chunk_benign_error T
-png_check_cHRM_fixed T
-png_check_chunk_name T
-png_check_keyword T
 png_chunk_error T
 png_chunk_warning T
-png_combine_row T
 png_convert_from_struct_tm T
 png_convert_from_time_t T
+png_convert_to_rfc1123_buffer T
 png_convert_to_rfc1123 T
-png_crc_error T
-png_crc_finish T
-png_crc_read T
 png_create_info_struct T
-png_create_read_struct T
 png_create_read_struct_2 T
-png_create_struct T
+png_create_read_struct T
-png_create_struct_2 T
-png_create_write_struct T
 png_create_write_struct_2 T
+png_create_write_struct T
 png_data_freer T
-png_decompress_chunk T
-png_default_flush T
-png_default_read_data T
-png_default_write_data T
 png_destroy_info_struct T
 png_destroy_read_struct T
-png_destroy_struct T
-png_destroy_struct_2 T
 png_destroy_write_struct T
-png_do_background T
-png_do_bgr T
-png_do_chop T
-png_do_expand T
-png_do_expand_palette T
-png_do_gamma T
-png_do_gray_to_rgb T
-png_do_invert T
-png_do_pack T
-png_do_packswap T
-png_do_read_filler T
-png_do_read_interlace T
-png_do_read_intrapixel T
-png_do_read_invert_alpha T
-png_do_read_swap_alpha T
-png_do_read_transformations T
-png_do_rgb_to_gray T
-png_do_shift T
-png_do_strip_filler T
-png_do_swap T
-png_do_unpack T
-png_do_unshift T
-png_do_write_interlace T
-png_do_write_intrapixel T
-png_do_write_invert_alpha T
-png_do_write_swap_alpha T
-png_do_write_transformations T
 png_error T
-png_flush T
+png_err T
-png_free T
 png_free_data T
 png_free_default T
-png_get_IHDR T
+png_free T
-png_get_PLTE T
-png_get_bKGD T
 png_get_bit_depth T
-png_get_cHRM T
+png_get_bKGD T
-png_get_cHRM_fixed T
 png_get_channels T
+png_get_cHRM_fixed T
+png_get_cHRM T
+png_get_cHRM_XYZ_fixed T
+png_get_cHRM_XYZ T
 png_get_chunk_cache_max T
 png_get_chunk_malloc_max T
 png_get_color_type T
 png_get_compression_buffer_size T
 png_get_compression_type T
 png_get_copyright T
+png_get_current_pass_number T
+png_get_current_row_number T
 png_get_error_ptr T
+png_get_eXIf_1 T
+png_get_eXIf T
 png_get_filter_type T
-png_get_gAMA T
 png_get_gAMA_fixed T
-png_get_hIST T
+png_get_gAMA T
-png_get_header_ver T
 png_get_header_version T
+png_get_header_ver T
+png_get_hIST T
 png_get_iCCP T
+png_get_IHDR T
 png_get_image_height T
 png_get_image_width T
+png_get_int_32 T
 png_get_interlace_type T
-png_get_io_chunk_name T
+png_get_io_chunk_type T
 png_get_io_ptr T
 png_get_io_state T
 png_get_libpng_ver T
 png_get_mem_ptr T
 png_get_oFFs T
+png_get_palette_max T
 png_get_pCAL T
+png_get_pHYs_dpi T
 png_get_pHYs T
+png_get_pixel_aspect_ratio_fixed T
 png_get_pixel_aspect_ratio T
+png_get_pixels_per_inch T
 png_get_pixels_per_meter T
+png_get_PLTE T
 png_get_progressive_ptr T
 png_get_rgb_to_gray_status T
 png_get_rowbytes T
 png_get_rows T
 png_get_sBIT T
+png_get_sCAL_fixed T
+png_get_sCAL_s T
 png_get_sCAL T
+png_get_signature T
 png_get_sPLT T
 png_get_sRGB T
-png_get_signature T
+png_get_text T
 png_get_tIME T
 png_get_tRNS T
-png_get_text T
+png_get_uint_16 T
 png_get_uint_31 T
+png_get_uint_32 T
 png_get_unknown_chunks T
 png_get_user_chunk_ptr T
 png_get_user_height_max T
 png_get_user_transform_ptr T
 png_get_user_width_max T
 png_get_valid T
+png_get_x_offset_inches_fixed T
+png_get_x_offset_inches T
 png_get_x_offset_microns T
 png_get_x_offset_pixels T
+png_get_x_pixels_per_inch T
 png_get_x_pixels_per_meter T
+png_get_y_offset_inches_fixed T
+png_get_y_offset_inches T
 png_get_y_offset_microns T
 png_get_y_offset_pixels T
+png_get_y_pixels_per_inch T
 png_get_y_pixels_per_meter T
-png_handle_IEND T
-png_handle_IHDR T
-png_handle_PLTE T
 png_handle_as_unknown T
-png_handle_bKGD T
+png_image_begin_read_from_file T
-png_handle_cHRM T
+png_image_begin_read_from_memory T
-png_handle_gAMA T
+png_image_begin_read_from_stdio T
-png_handle_hIST T
+png_image_finish_read T
-png_handle_iCCP T
+png_image_free T
-png_handle_iTXt T
+png_image_write_to_file T
-png_handle_oFFs T
+png_image_write_to_memory T
-png_handle_pCAL T
+png_image_write_to_stdio T
-png_handle_pHYs T
-png_handle_sBIT T
-png_handle_sCAL T
-png_handle_sPLT T
-png_handle_sRGB T
-png_handle_tEXt T
-png_handle_tIME T
-png_handle_tRNS T
-png_handle_unknown T
-png_handle_zTXt T
-png_info_destroy T
 png_info_init_3 T
 png_init_io T
-png_init_read_transformations T
+png_longjmp T
-png_malloc T
 png_malloc_default T
+png_malloc T
 png_malloc_warn T
 png_permit_mng_features T
-png_process_IDAT_data T
+png_process_data_pause T
+png_process_data_skip T
 png_process_data T
-png_process_some_data T
 png_progressive_combine_row T
-png_push_crc_finish T
-png_push_crc_skip T
-png_push_fill_buffer T
-png_push_handle_iTXt T
-png_push_handle_tEXt T
-png_push_handle_unknown T
-png_push_handle_zTXt T
-png_push_have_end T
-png_push_have_info T
-png_push_have_row T
-png_push_process_row T
-png_push_read_IDAT T
-png_push_read_chunk T
-png_push_read_iTXt T
-png_push_read_sig T
-png_push_read_tEXt T
-png_push_read_zTXt T
-png_push_restore_buffer T
-png_push_save_buffer T
-png_read_chunk_header T
-png_read_data T
-png_read_destroy T
 png_read_end T
-png_read_filter_row T
-png_read_finish_row T
 png_read_image T
 png_read_info T
 png_read_png T
-png_read_push_finish_row T
-png_read_row T
 png_read_rows T
-png_read_start_row T
+png_read_row T
-png_read_transform_info T
 png_read_update_info T
-png_reset_crc T
 png_reset_zstream T
 png_save_int_32 T
 png_save_uint_16 T
 png_save_uint_32 T
-png_set_IHDR T
-png_set_PLTE T
 png_set_add_alpha T
-png_set_bKGD T
+png_set_alpha_mode_fixed T
+png_set_alpha_mode T
+png_set_background_fixed T
 png_set_background T
+png_set_benign_errors T
 png_set_bgr T
-png_set_cHRM T
+png_set_bKGD T
+png_set_check_for_invalid_index T
 png_set_cHRM_fixed T
+png_set_cHRM T
+png_set_cHRM_XYZ_fixed T
+png_set_cHRM_XYZ T
 png_set_chunk_cache_max T
 png_set_chunk_malloc_max T
 png_set_compression_buffer_size T
@@ -216,18 +157,24 @@ png_set_compression_strategy T
 png_set_compression_window_bits T
 png_set_crc_action T
 png_set_error_fn T
-png_set_expand T
+png_set_eXIf_1 T
+png_set_eXIf T
+png_set_expand_16 T
 png_set_expand_gray_1_2_4_to_8 T
+png_set_expand T
 png_set_filler T
-png_set_filter T
+png_set_filter_heuristics_fixed T
 png_set_filter_heuristics T
+png_set_filter T
 png_set_flush T
-png_set_gAMA T
 png_set_gAMA_fixed T
+png_set_gAMA T
+png_set_gamma_fixed T
 png_set_gamma T
 png_set_gray_to_rgb T
 png_set_hIST T
 png_set_iCCP T
+png_set_IHDR T
 png_set_interlace_handling T
 png_set_invalid T
 png_set_invert_alpha T
@@ -236,35 +183,46 @@ png_set_keep_unknown_chunks T
 png_set_longjmp_fn T
 png_set_mem_fn T
 png_set_oFFs T
-png_set_pCAL T
+png_set_option T
-png_set_pHYs T
 png_set_packing T
 png_set_packswap T
 png_set_palette_to_rgb T
+png_set_pCAL T
+png_set_pHYs T
+png_set_PLTE T
 png_set_progressive_read_fn T
+png_set_quantize T
 png_set_read_fn T
 png_set_read_status_fn T
 png_set_read_user_chunk_fn T
 png_set_read_user_transform_fn T
-png_set_rgb_to_gray T
 png_set_rgb_to_gray_fixed T
+png_set_rgb_to_gray T
 png_set_rows T
 png_set_sBIT T
+png_set_scale_16 T
+png_set_sCAL_fixed T
+png_set_sCAL_s T
 png_set_sCAL T
-png_set_sPLT T
-png_set_sRGB T
-png_set_sRGB_gAMA_and_cHRM T
 png_set_shift T
 png_set_sig_bytes T
+png_set_sPLT T
+png_set_sRGB_gAMA_and_cHRM T
+png_set_sRGB T
 png_set_strip_16 T
 png_set_strip_alpha T
-png_set_swap T
+png_set_strip_error_numbers T
 png_set_swap_alpha T
+png_set_swap T
+png_set_text_compression_level T
+png_set_text_compression_mem_level T
+png_set_text_compression_method T
+png_set_text_compression_strategy T
+png_set_text_compression_window_bits T
+png_set_text T
 png_set_tIME T
 png_set_tRNS T
 png_set_tRNS_to_alpha T
-png_set_text T
-png_set_text_2 T
 png_set_unknown_chunk_location T
 png_set_unknown_chunks T
 png_set_user_limits T
@@ -275,47 +233,16 @@ png_set_write_user_transform_fn T
 png_sig_cmp T
 png_start_read_image T
 png_warning T
-png_write_IDAT T
-png_write_IEND T
-png_write_IHDR T
-png_write_PLTE T
-png_write_bKGD T
-png_write_cHRM T
-png_write_cHRM_fixed T
-png_write_chunk T
 png_write_chunk_data T
 png_write_chunk_end T
 png_write_chunk_start T
-png_write_data T
+png_write_chunk T
-png_write_destroy T
 png_write_end T
-png_write_filtered_row T
-png_write_find_filter T
-png_write_finish_row T
 png_write_flush T
-png_write_gAMA T
-png_write_gAMA_fixed T
-png_write_hIST T
-png_write_iCCP T
-png_write_iTXt T
 png_write_image T
-png_write_info T
 png_write_info_before_PLTE T
-png_write_oFFs T
+png_write_info T
-png_write_pCAL T
-png_write_pHYs T
 png_write_png T
-png_write_row T
 png_write_rows T
-png_write_sBIT T
+png_write_row T
-png_write_sCAL T
-png_write_sPLT T
-png_write_sRGB T
 png_write_sig T
-png_write_start_row T
-png_write_tEXt T
-png_write_tIME T
-png_write_tRNS T
-png_write_zTXt T
-png_zalloc T
-png_zfree T

repos/libports/ports/libpng.hash

@@ -1 +1 @@
-79a3d4b50f9bd470760acc14a856de14d87d5255
+ac05f35990279bbd8cc2f019ca51bc5d17b32be6

repos/libports/ports/libpng.port

@@ -1,10 +1,16 @@
 LICENSE   := PNG
 DOWNLOADS := libpng.archive
-VERSION   := 1.4.1
+VERSION   := 1.6.36
 
-URL(libpng) := http://prdownloads.sourceforge.net/libpng/libpng-$(VERSION).tar.gz
+URL(libpng) := http://prdownloads.sourceforge.net/libpng/libpng-$(VERSION).tar.xz
-SHA(libpng) := 0c25e1095805a626d2b1e44aafaed35b43b02d43510f8a84dce3c8b7da0d2417
+SHA(libpng) := eceb924c1fa6b79172fdfd008d335f0e59172a86a66481e09d4089df872aa319
 DIR(libpng) := src/lib/libpng
 
 DIRS := include/libpng
 DIR_CONTENT(include/libpng) := $(addprefix src/lib/libpng/,pngconf.h png.h pngpriv.h)
+
+_dirs: include/libpng/pnglibconf.h
+
+include/libpng/pnglibconf.h: src/lib/libpng/scripts/pnglibconf.h.prebuilt
+	$(VERBOSE)mkdir -p $(dir $@)
+	$(VERBOSE)cp $< $@