VirtualBox

Changeset 107813 in vbox for trunk/src/libs


Ignore:
Timestamp:
Jan 16, 2025 1:09:46 PM (2 months ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
166977
Message:

libpng-1.6.45: Applied and adjusted our libpng changes to 1.6.45. bugref:8515

Location:
trunk/src/libs/libpng-1.6.45
Files:
94 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/libs/libpng-1.6.45/ANNOUNCE

    r105469 r107813  
    1 libpng 1.6.43 - February 23, 2024
    2 =================================
     1libpng 1.6.45 - January 7, 2025
     2===============================
    33
    44This is a public release of libpng, intended for use in production code.
    … …  
    1010Source files with LF line endings (for Unix/Linux):
    1111
    12  * libpng-1.6.43.tar.xz (LZMA-compressed, recommended)
    13  * libpng-1.6.43.tar.gz (deflate-compressed)
     12 * libpng-1.6.45.tar.xz (LZMA-compressed, recommended)
     13 * libpng-1.6.45.tar.gz (deflate-compressed)
    1414
    1515Source files with CRLF line endings (for Windows):
    1616
    17  * lpng1643.7z (LZMA-compressed, recommended)
    18  * lpng1643.zip (deflate-compressed)
     17 * lpng1645.7z (LZMA-compressed, recommended)
     18 * lpng1645.zip (deflate-compressed)
    1919
    2020Other information:
    … …  
    2626
    2727
    28 Changes from version 1.6.42 to version 1.6.43
     28Changes from version 1.6.44 to version 1.6.45
    2929---------------------------------------------
    3030
    31  * Fixed the row width check in png_check_IHDR().
    32    This corrected a bug that was specific to the 16-bit platforms,
    33    and removed a spurious compiler warning from the 64-bit builds.
    34    (Reported by Jacek Caban; fixed by John Bowler)
    35  * Added eXIf chunk support to the push-mode reader in pngpread.c.
    36    (Contributed by Chris Blume)
    37  * Added contrib/pngexif for the benefit of the users who would like
    38    to inspect the content of eXIf chunks.
    39  * Added contrib/conftest/basic.dfa, a basic build-time configuration.
     31 * Added support for the cICP chunk.
     32   (Contributed by Lucas Chollet and John Bowler)
     33 * Adjusted and improved various checks in colorspace calculations.
    4034   (Contributed by John Bowler)
    41  * Fixed a preprocessor condition in pngread.c that broke build-time
    42    configurations like contrib/conftest/pngcp.dfa.
     35 * Rearranged the write order of colorspace chunks for better conformance
     36   with the PNG v3 draft specification.
    4337   (Contributed by John Bowler)
    44  * Added CMake build support for LoongArch LSX.
    45    (Contributed by GuXiWei)
    46  * Fixed a CMake build error that occurred under a peculiar state of the
    47    dependency tree. This was a regression introduced in libpng-1.6.41.
    48    (Contributed by Dan Rosser)
    49  * Marked the installed libpng headers as system headers in CMake.
    50    (Contributed by Benjamin Buch)
    51  * Updated the build support for RISCOS.
    52    (Contributed by Cameron Cawley)
    53  * Updated the makefiles to allow cross-platform builds to initialize
    54    conventional make variables like AR and ARFLAGS.
    55  * Added various improvements to the CI scripts in areas like version
    56    consistency verification and text linting.
    57  * Added version consistency verification to pngtest.c also.
     38 * Raised the minimum required CMake version from 3.6 to 3.14.
     39 * Forked off a development branch for libpng version 1.8.
    5840
    5941

  • trunk/src/libs/libpng-1.6.45/AUTHORS

    r105469 r107813  
    1818 * John Bowler
    1919 * Kevin Bracey
     20 * Lucas Chollet
    2021 * Magnus Holmgren
    2122 * Mandar Sahastrabuddhe

  • trunk/src/libs/libpng-1.6.45/CHANGES

    r105469 r107813  
    61976197  Added version consistency verification to pngtest.c also.
    61986198
     6199Version 1.6.44 [September 12, 2024]
     6200  Hardened calculations in chroma handling to prevent overflows, and
     6201    relaxed a constraint in cHRM validation to accomodate the standard
     6202    ACES AP1 set of color primaries.
     6203    (Contributed by John Bowler)
     6204  Removed the ASM implementation of ARM Neon optimizations and updated
     6205    the build accordingly. Only the remaining C implementation shall be
     6206    used from now on, thus ensuring the support of the PAC/BTI security
     6207    features on ARM64.
     6208    (Contributed by Ross Burton and John Bowler)
     6209  Fixed the pickup of the PNG_HARDWARE_OPTIMIZATIONS option in the
     6210    CMake build on FreeBSD/amd64. This is an important performance fix
     6211    on this platform.
     6212  Applied various fixes and improvements to the CMake build.
     6213    (Contributed by Eric Riff, Benjamin Buch and Erik Scholz)
     6214  Added fuzzing targets for the simplified read API.
     6215    (Contributed by Mikhail Khachayants)
     6216  Fixed a build error involving pngtest.c under a custom config.
     6217    This was a regression introduced in a code cleanup in libpng-1.6.43.
     6218    (Contributed by Ben Wagner)
     6219  Fixed and improved the config files for AppVeyor CI and Travis CI.
     6220
     6221Version 1.6.45 [January 7, 2025]
     6222  Added support for the cICP chunk.
     6223    (Contributed by Lucas Chollet and John Bowler)
     6224  Adjusted and improved various checks in colorspace calculations.
     6225    (Contributed by John Bowler)
     6226  Rearranged the write order of colorspace chunks for better conformance
     6227    with the PNG v3 draft specification.
     6228    (Contributed by John Bowler)
     6229  Raised the minimum required CMake version from 3.6 to 3.14.
     6230  Forked off a development branch for libpng version 1.8.
     6231
    61996232Send comments/corrections/commendations to png-mng-implement at lists.sf.net.
    62006233Subscription is required; visit

  • trunk/src/libs/libpng-1.6.45/CMakeLists.txt

    r105469 r107813  
    1 
    21# CMakeLists.txt - CMake lists for libpng
    32#
    4 # Copyright (c) 2018-2024 Cosmin Truta.
    5 # Copyright (c) 2007-2018 Glenn Randers-Pehrson.
    6 # Originally written by Christian Ehrlicher, 2007.
     3# Copyright (c) 2018-2025 Cosmin Truta
     4# Copyright (c) 2007-2018 Glenn Randers-Pehrson
     5# Originally written by Christian Ehrlicher, 2007
    76#
    87# Use, modification and distribution are subject to
    … …  
    1615# SPDX-License-Identifier: libpng-2.0
    1716
    18 cmake_minimum_required(VERSION 3.6)
     17cmake_minimum_required(VERSION 3.14)
    1918
    2019set(PNGLIB_MAJOR 1)
    2120set(PNGLIB_MINOR 6)
    22 set(PNGLIB_REVISION 43)
     21set(PNGLIB_REVISION 45)
    2322set(PNGLIB_SUBREVISION 0)
    2423#set(PNGLIB_SUBREVISION "git")
    … …  
    3029        VERSION ${PNGLIB_VERSION}
    3130        LANGUAGES C ASM)
    32 
    33 if(POLICY CMP0074)
    34   # Allow find_package() to use the ZLIB_ROOT variable, if available.
    35   cmake_policy(SET CMP0074 NEW)
    36 endif()
    3731
    3832include(CheckCSourceCompiles)
    … …  
    7064# Although these tools are targetted at development environments only,
    7165# the users are allowed to override the option to build by default.
    72 if (ANDROID OR IOS)
     66if(ANDROID OR IOS)
    7367  option(PNG_TOOLS "Build the libpng tools" OFF)
    7468else()
    … …  
    9185option(PNG_HARDWARE_OPTIMIZATIONS "Enable hardware optimizations" ON)
    9286
     87# Initialize and show the target architecture variable PNG_TARGET_ARCHITECTURE.
     88#
     89# NOTE:
     90# On macOS, CMake sets CMAKE_SYSTEM_PROCESSOR to either "x86_64" or "arm64",
     91# based upon the OS architecture, not the target architecture. As such, we need
     92# to check CMAKE_OSX_ARCHITECTURES to identify which hardware-specific flags to
     93# enable. Note that this will fail if you attempt to build a universal binary
     94# in a single CMake invocation.
     95if(APPLE AND CMAKE_OSX_ARCHITECTURES)
     96  string(TOLOWER "${CMAKE_OSX_ARCHITECTURES}" PNG_TARGET_ARCHITECTURE)
     97else()
     98  string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" PNG_TARGET_ARCHITECTURE)
     99endif()
     100message(STATUS "Building for target architecture: ${PNG_TARGET_ARCHITECTURE}")
     101
    93102# Allow the users to specify a custom location of zlib.
    94 # This option is deprecated, and no longer needed with CMake 3.12 and newer.
    95 # Under the CMake policy CMP0074, if zlib is being built alongside libpng as a
    96 # subproject, its location can be passed on to CMake via the ZLIB_ROOT variable.
    97 option(PNG_BUILD_ZLIB "Custom zlib location, else find_package is used" OFF)
    98 if(NOT PNG_BUILD_ZLIB)
    99   find_package(ZLIB REQUIRED)
    100 elseif(POLICY CMP0074)
     103# With CMake 3.12 and newer, this option is no longer necessary.
     104option(PNG_BUILD_ZLIB "[Deprecated; please use ZLIB_ROOT]" OFF)
     105if(PNG_BUILD_ZLIB)
    101106  if("x${ZLIB_ROOT}" STREQUAL "x")
    102     message(DEPRECATION
    103             "The option PNG_BUILD_ZLIB has been deprecated; please use ZLIB_ROOT instead")
     107    message(SEND_ERROR
     108            "The option PNG_BUILD_ZLIB=${PNG_BUILD_ZLIB} is no longer supported; "
     109            "please use ZLIB_ROOT instead")
    104110  else()
    105111    message(SEND_ERROR
    106             "The option PNG_BUILD_ZLIB=${PNG_BUILD_ZLIB} and "
    107             "the variable ZLIB_ROOT=\"${ZLIB_ROOT}\" are mutually exclusive")
    108   endif()
    109 endif()
    110 
    111 if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU AND NOT EMSCRIPTEN)
     112            "The option PNG_BUILD_ZLIB=${PNG_BUILD_ZLIB} is no longer supported; "
     113            "using ZLIB_ROOT=\"${ZLIB_ROOT}\"")
     114  endif()
     115endif()
     116
     117find_package(ZLIB REQUIRED)
     118
     119if(UNIX
     120   AND NOT (APPLE OR BEOS OR HAIKU)
     121   AND NOT EMSCRIPTEN)
    112122  find_library(M_LIBRARY m)
    113123  if(M_LIBRARY)
    … …  
    120130endif()
    121131
    122 # CMake currently sets CMAKE_SYSTEM_PROCESSOR to one of x86_64 or arm64 on macOS,
    123 # based upon the OS architecture, not the target architecture. As such, we need
    124 # to check CMAKE_OSX_ARCHITECTURES to identify which hardware-specific flags to
    125 # enable. Note that this will fail if you attempt to build a universal binary in
    126 # a single CMake invocation.
    127 if (APPLE AND CMAKE_OSX_ARCHITECTURES)
    128   set(TARGET_ARCH ${CMAKE_OSX_ARCHITECTURES})
    129 else()
    130   set(TARGET_ARCH ${CMAKE_SYSTEM_PROCESSOR})
    131 endif()
    132 
    133132if(PNG_HARDWARE_OPTIMIZATIONS)
    134133
    135 # Set definitions and sources for ARM.
    136 if(TARGET_ARCH MATCHES "^(ARM|arm|aarch)")
    137   if(TARGET_ARCH MATCHES "^(ARM64|arm64|aarch64)")
    138     set(PNG_ARM_NEON_POSSIBLE_VALUES on off)
    139     set(PNG_ARM_NEON "on"
    140         CACHE STRING "Enable ARM NEON optimizations: on|off; on is default")
    141   else()
    142     set(PNG_ARM_NEON_POSSIBLE_VALUES check on off)
    143     set(PNG_ARM_NEON "off"
    144         CACHE STRING "Enable ARM NEON optimizations: check|on|off; off is default")
    145   endif()
    146   set_property(CACHE PNG_ARM_NEON
    147                PROPERTY STRINGS ${PNG_ARM_NEON_POSSIBLE_VALUES})
    148   list(FIND PNG_ARM_NEON_POSSIBLE_VALUES ${PNG_ARM_NEON} index)
    149   if(index EQUAL -1)
    150     message(FATAL_ERROR "PNG_ARM_NEON must be one of [${PNG_ARM_NEON_POSSIBLE_VALUES}]")
    151   elseif(NOT PNG_ARM_NEON STREQUAL "off")
    152     set(libpng_arm_sources
    153         arm/arm_init.c
    154         arm/filter_neon_intrinsics.c
    155         arm/palette_neon_intrinsics.c)
    156     if(NOT MSVC)
    157       list(APPEND libpng_arm_sources arm/filter_neon.S)
    158     endif()
    159     if(PNG_ARM_NEON STREQUAL "on")
    160       add_definitions(-DPNG_ARM_NEON_OPT=2)
    161     elseif(PNG_ARM_NEON STREQUAL "check")
    162       add_definitions(-DPNG_ARM_NEON_CHECK_SUPPORTED)
    163     endif()
    164   else()
     134  # Set definitions and sources for ARM.
     135  if(PNG_TARGET_ARCHITECTURE MATCHES "^(arm|aarch)")
     136    if(PNG_TARGET_ARCHITECTURE MATCHES "^(arm64|aarch64)")
     137      set(PNG_ARM_NEON_POSSIBLE_VALUES on off)
     138      set(PNG_ARM_NEON "on"
     139          CACHE STRING "Enable ARM NEON optimizations: on|off; on is default")
     140    else()
     141      set(PNG_ARM_NEON_POSSIBLE_VALUES check on off)
     142      set(PNG_ARM_NEON "off"
     143          CACHE STRING "Enable ARM NEON optimizations: check|on|off; off is default")
     144    endif()
     145    set_property(CACHE PNG_ARM_NEON
     146                PROPERTY STRINGS ${PNG_ARM_NEON_POSSIBLE_VALUES})
     147    list(FIND PNG_ARM_NEON_POSSIBLE_VALUES ${PNG_ARM_NEON} index)
     148    if(index EQUAL -1)
     149      message(FATAL_ERROR "PNG_ARM_NEON must be one of [${PNG_ARM_NEON_POSSIBLE_VALUES}]")
     150    elseif(NOT PNG_ARM_NEON STREQUAL "off")
     151      set(libpng_arm_sources
     152          arm/arm_init.c
     153          arm/filter_neon_intrinsics.c
     154          arm/palette_neon_intrinsics.c)
     155      if(PNG_ARM_NEON STREQUAL "on")
     156        add_definitions(-DPNG_ARM_NEON_OPT=2)
     157      elseif(PNG_ARM_NEON STREQUAL "check")
     158        add_definitions(-DPNG_ARM_NEON_CHECK_SUPPORTED)
     159      endif()
     160    else()
     161      add_definitions(-DPNG_ARM_NEON_OPT=0)
     162    endif()
     163  endif()
     164
     165  # Set definitions and sources for PowerPC.
     166  if(PNG_TARGET_ARCHITECTURE MATCHES "^(powerpc|ppc64)")
     167    set(PNG_POWERPC_VSX_POSSIBLE_VALUES on off)
     168    set(PNG_POWERPC_VSX "on"
     169        CACHE STRING "Enable POWERPC VSX optimizations: on|off; on is default")
     170    set_property(CACHE PNG_POWERPC_VSX
     171                PROPERTY STRINGS ${PNG_POWERPC_VSX_POSSIBLE_VALUES})
     172    list(FIND PNG_POWERPC_VSX_POSSIBLE_VALUES ${PNG_POWERPC_VSX} index)
     173    if(index EQUAL -1)
     174      message(FATAL_ERROR "PNG_POWERPC_VSX must be one of [${PNG_POWERPC_VSX_POSSIBLE_VALUES}]")
     175    elseif(NOT PNG_POWERPC_VSX STREQUAL "off")
     176      set(libpng_powerpc_sources
     177          powerpc/powerpc_init.c
     178          powerpc/filter_vsx_intrinsics.c)
     179      if(PNG_POWERPC_VSX STREQUAL "on")
     180        add_definitions(-DPNG_POWERPC_VSX_OPT=2)
     181      endif()
     182    else()
     183      add_definitions(-DPNG_POWERPC_VSX_OPT=0)
     184    endif()
     185  endif()
     186
     187  # Set definitions and sources for Intel.
     188  if(PNG_TARGET_ARCHITECTURE MATCHES "^(i[3-6]86|x86|amd64)")
     189    set(PNG_INTEL_SSE_POSSIBLE_VALUES on off)
     190    set(PNG_INTEL_SSE "on"
     191        CACHE STRING "Enable INTEL_SSE optimizations: on|off; on is default")
     192    set_property(CACHE PNG_INTEL_SSE
     193                PROPERTY STRINGS ${PNG_INTEL_SSE_POSSIBLE_VALUES})
     194    list(FIND PNG_INTEL_SSE_POSSIBLE_VALUES ${PNG_INTEL_SSE} index)
     195    if(index EQUAL -1)
     196      message(FATAL_ERROR "PNG_INTEL_SSE must be one of [${PNG_INTEL_SSE_POSSIBLE_VALUES}]")
     197    elseif(NOT PNG_INTEL_SSE STREQUAL "off")
     198      set(libpng_intel_sources
     199          intel/intel_init.c
     200          intel/filter_sse2_intrinsics.c)
     201      if(PNG_INTEL_SSE STREQUAL "on")
     202        add_definitions(-DPNG_INTEL_SSE_OPT=1)
     203      endif()
     204    else()
     205      add_definitions(-DPNG_INTEL_SSE_OPT=0)
     206    endif()
     207  endif()
     208
     209  # Set definitions and sources for MIPS.
     210  if(PNG_TARGET_ARCHITECTURE MATCHES "^(mipsel|mips64el)")
     211    set(PNG_MIPS_MSA_POSSIBLE_VALUES on off)
     212    set(PNG_MIPS_MSA "on"
     213        CACHE STRING "Enable MIPS_MSA optimizations: on|off; on is default")
     214    set_property(CACHE PNG_MIPS_MSA
     215                PROPERTY STRINGS ${PNG_MIPS_MSA_POSSIBLE_VALUES})
     216    list(FIND PNG_MIPS_MSA_POSSIBLE_VALUES ${PNG_MIPS_MSA} index_msa)
     217    if(index_msa EQUAL -1)
     218      message(FATAL_ERROR "PNG_MIPS_MSA must be one of [${PNG_MIPS_MSA_POSSIBLE_VALUES}]")
     219    endif()
     220
     221    set(PNG_MIPS_MMI_POSSIBLE_VALUES on off)
     222    set(PNG_MIPS_MMI "on"
     223        CACHE STRING "Enable MIPS_MMI optimizations: on|off; on is default")
     224    set_property(CACHE PNG_MIPS_MMI
     225                PROPERTY STRINGS ${PNG_MIPS_MMI_POSSIBLE_VALUES})
     226    list(FIND PNG_MIPS_MMI_POSSIBLE_VALUES ${PNG_MIPS_MMI} index_mmi)
     227    if(index_mmi EQUAL -1)
     228      message(FATAL_ERROR "PNG_MIPS_MMI must be one of [${PNG_MIPS_MMI_POSSIBLE_VALUES}]")
     229    endif()
     230
     231    if(PNG_MIPS_MSA STREQUAL "on" AND PNG_MIPS_MMI STREQUAL "on")
     232      set(libpng_mips_sources
     233          mips/mips_init.c
     234          mips/filter_msa_intrinsics.c
     235          mips/filter_mmi_inline_assembly.c)
     236      add_definitions(-DPNG_MIPS_MSA_OPT=2)
     237      add_definitions(-DPNG_MIPS_MMI_OPT=1)
     238    elseif(PNG_MIPS_MSA STREQUAL "on")
     239      set(libpng_mips_sources
     240          mips/mips_init.c
     241          mips/filter_msa_intrinsics.c)
     242      add_definitions(-DPNG_MIPS_MSA_OPT=2)
     243      add_definitions(-DPNG_MIPS_MMI_OPT=0)
     244    elseif(PNG_MIPS_MMI STREQUAL "on")
     245      set(libpng_mips_sources
     246          mips/mips_init.c
     247          mips/filter_mmi_inline_assembly.c)
     248      add_definitions(-DPNG_MIPS_MSA_OPT=0)
     249      add_definitions(-DPNG_MIPS_MMI_OPT=1)
     250    else()
     251      add_definitions(-DPNG_MIPS_MSA_OPT=0)
     252      add_definitions(-DPNG_MIPS_MMI_OPT=0)
     253    endif()
     254  endif()
     255
     256  # Set definitions and sources for LoongArch.
     257  if(PNG_TARGET_ARCHITECTURE MATCHES "^(loongarch)")
     258    include(CheckCCompilerFlag)
     259    set(PNG_LOONGARCH_LSX_POSSIBLE_VALUES on off)
     260    set(PNG_LOONGARCH_LSX "on"
     261        CACHE STRING "Enable LOONGARCH_LSX optimizations: on|off; on is default")
     262    set_property(CACHE PNG_LOONGARCH_LSX
     263                PROPERTY STRINGS ${PNG_LOONGARCH_LSX_POSSIBLE_VALUES})
     264    list(FIND PNG_LOONGARCH_LSX_POSSIBLE_VALUES ${PNG_LOONGARCH_LSX} index)
     265    if(index EQUAL -1)
     266      message(FATAL_ERROR "PNG_LOONGARCH_LSX must be one of [${PNG_LOONGARCH_LSX_POSSIBLE_VALUES}]")
     267    elseif(NOT PNG_LOONGARCH_LSX STREQUAL "off")
     268      CHECK_C_COMPILER_FLAG("-mlsx" COMPILER_SUPPORTS_LSX)
     269      if(COMPILER_SUPPORTS_LSX)
     270        set(libpng_loongarch_sources
     271            loongarch/loongarch_lsx_init.c
     272            loongarch/filter_lsx_intrinsics.c)
     273        set_source_files_properties(${libpng_loongarch_sources}
     274                                    PROPERTIES
     275                                    COMPILE_FLAGS "-mlsx")
     276        add_definitions(-DPNG_LOONGARCH_LSX_OPT=1)
     277      else()
     278        message(FATAL_ERROR "Compiler does not support -mlsx option")
     279      endif()
     280    else()
     281      add_definitions(-DPNG_LOONGARCH_LSX_OPT=0)
     282    endif()
     283  endif()
     284
     285else(PNG_HARDWARE_OPTIMIZATIONS)
     286
     287  # Set definitions and sources for ARM.
     288  if(PNG_TARGET_ARCHITECTURE MATCHES "^(arm|aarch)")
    165289    add_definitions(-DPNG_ARM_NEON_OPT=0)
    166290  endif()
    167 endif()
    168 
    169 # Set definitions and sources for PowerPC.
    170 if(TARGET_ARCH MATCHES "^(powerpc|ppc64)")
    171   set(PNG_POWERPC_VSX_POSSIBLE_VALUES on off)
    172   set(PNG_POWERPC_VSX "on"
    173       CACHE STRING "Enable POWERPC VSX optimizations: on|off; on is default")
    174   set_property(CACHE PNG_POWERPC_VSX
    175                PROPERTY STRINGS ${PNG_POWERPC_VSX_POSSIBLE_VALUES})
    176   list(FIND PNG_POWERPC_VSX_POSSIBLE_VALUES ${PNG_POWERPC_VSX} index)
    177   if(index EQUAL -1)
    178     message(FATAL_ERROR "PNG_POWERPC_VSX must be one of [${PNG_POWERPC_VSX_POSSIBLE_VALUES}]")
    179   elseif(NOT PNG_POWERPC_VSX STREQUAL "off")
    180     set(libpng_powerpc_sources
    181         powerpc/powerpc_init.c
    182         powerpc/filter_vsx_intrinsics.c)
    183     if(PNG_POWERPC_VSX STREQUAL "on")
    184       add_definitions(-DPNG_POWERPC_VSX_OPT=2)
    185     endif()
    186   else()
     291
     292  # Set definitions and sources for PowerPC.
     293  if(PNG_TARGET_ARCHITECTURE MATCHES "^(powerpc|ppc64)")
    187294    add_definitions(-DPNG_POWERPC_VSX_OPT=0)
    188295  endif()
    189 endif()
    190 
    191 # Set definitions and sources for Intel.
    192 if(TARGET_ARCH MATCHES "^(i[3-6]86|x86|AMD64)")
    193   set(PNG_INTEL_SSE_POSSIBLE_VALUES on off)
    194   set(PNG_INTEL_SSE "on"
    195       CACHE STRING "Enable INTEL_SSE optimizations: on|off; on is default")
    196   set_property(CACHE PNG_INTEL_SSE
    197                PROPERTY STRINGS ${PNG_INTEL_SSE_POSSIBLE_VALUES})
    198   list(FIND PNG_INTEL_SSE_POSSIBLE_VALUES ${PNG_INTEL_SSE} index)
    199   if(index EQUAL -1)
    200     message(FATAL_ERROR "PNG_INTEL_SSE must be one of [${PNG_INTEL_SSE_POSSIBLE_VALUES}]")
    201   elseif(NOT PNG_INTEL_SSE STREQUAL "off")
    202     set(libpng_intel_sources
    203         intel/intel_init.c
    204         intel/filter_sse2_intrinsics.c)
    205     if(PNG_INTEL_SSE STREQUAL "on")
    206       add_definitions(-DPNG_INTEL_SSE_OPT=1)
    207     endif()
    208   else()
     296
     297  # Set definitions and sources for Intel.
     298  if(PNG_TARGET_ARCHITECTURE MATCHES "^(i[3-6]86|x86|amd64)")
    209299    add_definitions(-DPNG_INTEL_SSE_OPT=0)
    210300  endif()
    211 endif()
    212 
    213 # Set definitions and sources for MIPS.
    214 if(TARGET_ARCH MATCHES "^(mipsel|mips64el)")
    215   set(PNG_MIPS_MSA_POSSIBLE_VALUES on off)
    216   set(PNG_MIPS_MSA "on"
    217       CACHE STRING "Enable MIPS_MSA optimizations: on|off; on is default")
    218   set_property(CACHE PNG_MIPS_MSA
    219                PROPERTY STRINGS ${PNG_MIPS_MSA_POSSIBLE_VALUES})
    220   list(FIND PNG_MIPS_MSA_POSSIBLE_VALUES ${PNG_MIPS_MSA} index_msa)
    221   if(index_msa EQUAL -1)
    222     message(FATAL_ERROR "PNG_MIPS_MSA must be one of [${PNG_MIPS_MSA_POSSIBLE_VALUES}]")
    223   endif()
    224 
    225   set(PNG_MIPS_MMI_POSSIBLE_VALUES on off)
    226   set(PNG_MIPS_MMI "on"
    227       CACHE STRING "Enable MIPS_MMI optimizations: on|off; on is default")
    228   set_property(CACHE PNG_MIPS_MMI
    229                PROPERTY STRINGS ${PNG_MIPS_MMI_POSSIBLE_VALUES})
    230   list(FIND PNG_MIPS_MMI_POSSIBLE_VALUES ${PNG_MIPS_MMI} index_mmi)
    231   if(index_mmi EQUAL -1)
    232     message(FATAL_ERROR "PNG_MIPS_MMI must be one of [${PNG_MIPS_MMI_POSSIBLE_VALUES}]")
    233   endif()
    234 
    235   if(PNG_MIPS_MSA STREQUAL "on" AND PNG_MIPS_MMI STREQUAL "on")
    236     set(libpng_mips_sources
    237         mips/mips_init.c
    238         mips/filter_msa_intrinsics.c
    239         mips/filter_mmi_inline_assembly.c)
    240     add_definitions(-DPNG_MIPS_MSA_OPT=2)
    241     add_definitions(-DPNG_MIPS_MMI_OPT=1)
    242   elseif(PNG_MIPS_MSA STREQUAL "on")
    243     set(libpng_mips_sources
    244         mips/mips_init.c
    245         mips/filter_msa_intrinsics.c)
    246     add_definitions(-DPNG_MIPS_MSA_OPT=2)
    247     add_definitions(-DPNG_MIPS_MMI_OPT=0)
    248   elseif(PNG_MIPS_MMI STREQUAL "on")
    249     set(libpng_mips_sources
    250         mips/mips_init.c
    251         mips/filter_mmi_inline_assembly.c)
     301
     302  # Set definitions and sources for MIPS.
     303  if(PNG_TARGET_ARCHITECTURE MATCHES "^(mipsel|mips64el)")
    252304    add_definitions(-DPNG_MIPS_MSA_OPT=0)
    253     add_definitions(-DPNG_MIPS_MMI_OPT=1)
    254     else()
    255     add_definitions(-DPNG_MIPS_MSA_OPT=0)
    256     add_definitions(-DPNG_MIPS_MMI_OPT=0)
    257     endif()
    258 endif()
    259 
    260 # Set definitions and sources for LoongArch.
    261 if(TARGET_ARCH MATCHES "^(loongarch)")
    262   include(CheckCCompilerFlag)
    263   set(PNG_LOONGARCH_LSX_POSSIBLE_VALUES on off)
    264   set(PNG_LOONGARCH_LSX "on"
    265       CACHE STRING "Enable LOONGARCH_LSX optimizations: on|off; on is default")
    266   set_property(CACHE PNG_LOONGARCH_LSX
    267                PROPERTY STRINGS ${PNG_LOONGARCH_LSX_POSSIBLE_VALUES})
    268   list(FIND PNG_LOONGARCH_LSX_POSSIBLE_VALUES ${PNG_LOONGARCH_LSX} index)
    269   if(index EQUAL -1)
    270     message(FATAL_ERROR "PNG_LOONGARCH_LSX must be one of [${PNG_LOONGARCH_LSX_POSSIBLE_VALUES}]")
    271   elseif(NOT PNG_LOONGARCH_LSX STREQUAL "off")
    272     CHECK_C_COMPILER_FLAG("-mlsx" COMPILER_SUPPORTS_LSX)
    273     if(COMPILER_SUPPORTS_LSX)
    274       set(libpng_loongarch_sources
    275           loongarch/loongarch_lsx_init.c
    276           loongarch/filter_lsx_intrinsics.c)
    277       set_source_files_properties(${libpng_loongarch_sources}
    278                                   PROPERTIES
    279                                   COMPILE_FLAGS "-mlsx")
    280       add_definitions(-DPNG_LOONGARCH_LSX_OPT=1)
    281     else()
    282       message(FATAL_ERROR "Compiler does not support -mlsx option")
    283     endif()
    284   else()
     305  endif()
     306
     307  # Set definitions and sources for LoongArch.
     308  if(PNG_TARGET_ARCHITECTURE MATCHES "^(loongarch)")
    285309    add_definitions(-DPNG_LOONGARCH_LSX_OPT=0)
    286310  endif()
    287 endif()
    288 
    289 else(PNG_HARDWARE_OPTIMIZATIONS)
    290 
    291 # Set definitions and sources for ARM.
    292 if(TARGET_ARCH MATCHES "^(ARM|arm|aarch)")
    293   add_definitions(-DPNG_ARM_NEON_OPT=0)
    294 endif()
    295 
    296 # Set definitions and sources for PowerPC.
    297 if(TARGET_ARCH MATCHES "^(powerpc|ppc64)")
    298   add_definitions(-DPNG_POWERPC_VSX_OPT=0)
    299 endif()
    300 
    301 # Set definitions and sources for Intel.
    302 if(TARGET_ARCH MATCHES "^(i[3-6]86|x86|AMD64)")
    303   add_definitions(-DPNG_INTEL_SSE_OPT=0)
    304 endif()
    305 
    306 # Set definitions and sources for MIPS.
    307 if(TARGET_ARCH MATCHES "^(mipsel|mips64el)")
    308   add_definitions(-DPNG_MIPS_MSA_OPT=0)
    309 endif()
    310 
    311 # Set definitions and sources for LoongArch.
    312 if(TARGET_ARCH MATCHES "^(loongarch)")
    313   add_definitions(-DPNG_LOONGARCH_LSX_OPT=0)
    314 endif()
    315311
    316312endif(PNG_HARDWARE_OPTIMIZATIONS)
    317313
    318314option(ld-version-script "Enable linker version script" ON)
    319 if(ld-version-script AND NOT ANDROID AND NOT APPLE)
     315if(ld-version-script AND NOT (ANDROID OR APPLE))
    320316  # Check if LD supports linker scripts.
    321317  file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/conftest.map" "
    … …  
    363359endif()
    364360
    365 include_directories(${CMAKE_CURRENT_BINARY_DIR})
    366 
    367 if(NOT AWK OR ANDROID OR IOS)
     361if(NOT AWK OR (ANDROID OR IOS))
    368362  # No awk available to generate sources; use pre-built pnglibconf.h
    369363  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/pnglibconf.h.prebuilt
    … …  
    371365  add_custom_target(png_genfiles)
    372366else()
     367  # Include the internal module PNGGenConfig.cmake
     368  include(${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake/PNGGenConfig.cmake)
     369
    373370  # Copy the awk scripts, converting their line endings to Unix (LF)
    374371  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/checksym.awk
    … …  
    384381                 @ONLY
    385382                 NEWLINE_STYLE LF)
    386 
    387   # Generate .chk from .out with awk:
    388   # generate_chk(INPUT inputfile OUTPUT outputfile [DEPENDS dep1 [dep2...]])
    389   function(generate_chk)
    390     set(options)
    391     set(oneValueArgs INPUT OUTPUT)
    392     set(multiValueArgs DEPENDS)
    393     cmake_parse_arguments(_GC "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
    394     if(NOT _GC_INPUT)
    395       message(FATAL_ERROR "generate_chk: Missing INPUT argument")
    396     endif()
    397     if(NOT _GC_OUTPUT)
    398       message(FATAL_ERROR "generate_chk: Missing OUTPUT argument")
    399     endif()
    400 
    401     add_custom_command(OUTPUT "${_GC_OUTPUT}"
    402                        COMMAND "${CMAKE_COMMAND}"
    403                                "-DINPUT=${_GC_INPUT}"
    404                                "-DOUTPUT=${_GC_OUTPUT}"
    405                                -P "${CMAKE_CURRENT_BINARY_DIR}/scripts/cmake/genchk.cmake"
    406                        DEPENDS "${_GC_INPUT}" ${_GC_DEPENDS}
    407                        WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
    408   endfunction()
    409 
    410   # Generate .out from .c with awk
    411   # generate_out(INPUT inputfile OUTPUT outputfile [DEPENDS dep1 [dep2...]])
    412   function(generate_out)
    413     set(options)
    414     set(oneValueArgs INPUT OUTPUT)
    415     set(multiValueArgs DEPENDS)
    416     cmake_parse_arguments(_GO "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
    417     if(NOT _GO_INPUT)
    418       message(FATAL_ERROR "generate_out: Missing INPUT argument")
    419     endif()
    420     if(NOT _GO_OUTPUT)
    421       message(FATAL_ERROR "generate_out: Missing OUTPUT argument")
    422     endif()
    423 
    424     add_custom_command(OUTPUT "${_GO_OUTPUT}"
    425                        COMMAND "${CMAKE_COMMAND}"
    426                                "-DINPUT=${_GO_INPUT}"
    427                                "-DOUTPUT=${_GO_OUTPUT}"
    428                                -P "${CMAKE_CURRENT_BINARY_DIR}/scripts/cmake/genout.cmake"
    429                        DEPENDS "${_GO_INPUT}" ${_GO_DEPENDS}
    430                        WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
    431   endfunction()
    432 
    433   # Generate specific source file with awk
    434   # generate_source(OUTPUT outputfile [DEPENDS dep1 [dep2...]])
    435   function(generate_source)
    436     set(options)
    437     set(oneValueArgs OUTPUT)
    438     set(multiValueArgs DEPENDS)
    439     cmake_parse_arguments(_GSO "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
    440     if(NOT _GSO_OUTPUT)
    441       message(FATAL_ERROR "generate_source: Missing OUTPUT argument")
    442     endif()
    443 
    444     add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${_GSO_OUTPUT}"
    445                        COMMAND "${CMAKE_COMMAND}"
    446                                "-DOUTPUT=${_GSO_OUTPUT}"
    447                                -P "${CMAKE_CURRENT_BINARY_DIR}/scripts/cmake/gensrc.cmake"
    448                        DEPENDS ${_GSO_DEPENDS}
    449                        WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
    450   endfunction()
    451 
    452   # Copy file
    453   # generate_copy(INPUT inputfile OUTPUT outputfile [DEPENDS dep1 [dep2...]])
    454   function(generate_copy)
    455     set(options)
    456     set(oneValueArgs INPUT OUTPUT)
    457     set(multiValueArgs DEPENDS)
    458     cmake_parse_arguments(_GCO "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
    459     if(NOT _GCO_INPUT)
    460       message(FATAL_ERROR "generate_copy: Missing INPUT argument")
    461     endif()
    462     if(NOT _GCO_OUTPUT)
    463       message(FATAL_ERROR "generate_copy: Missing OUTPUT argument")
    464     endif()
    465 
    466     add_custom_command(OUTPUT "${_GCO_OUTPUT}"
    467                        COMMAND "${CMAKE_COMMAND}"
    468                                -E remove "${_GCO_OUTPUT}"
    469                        COMMAND "${CMAKE_COMMAND}"
    470                                -E copy "${_GCO_INPUT}" "${_GCO_OUTPUT}"
    471                        DEPENDS "${source}" ${_GCO_DEPENDS})
    472   endfunction()
    473383
    474384  # Generate scripts/pnglibconf.h
    … …  
    593503                            "${CMAKE_CURRENT_BINARY_DIR}/scripts/symbols.out" png_scripts_symbols_out
    594504                            "${CMAKE_CURRENT_BINARY_DIR}/scripts/vers.out" png_scripts_vers_out)
    595 endif(NOT AWK OR ANDROID OR IOS)
     505endif(NOT AWK OR (ANDROID OR IOS))
    596506
    597507# List the source code files.
    … …  
    607517    pngstruct.h
    608518)
    609 if(AWK AND NOT ANDROID AND NOT IOS)
     519if(AWK AND NOT (ANDROID OR IOS))
    610520  list(APPEND libpng_private_hdrs "${CMAKE_CURRENT_BINARY_DIR}/pngprefix.h")
    611521endif()
    … …  
    715625  target_include_directories(png_shared
    716626                             PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
     627  target_include_directories(png_shared
     628                             PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>)
    717629  target_include_directories(png_shared SYSTEM
    718630                             INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/libpng${PNGLIB_ABI_VERSION}>)
    … …  
    729641  target_include_directories(png_static
    730642                             PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
     643  target_include_directories(png_static
     644                             PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>)
    731645  target_include_directories(png_static SYSTEM
    732646                             INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/libpng${PNGLIB_ABI_VERSION}>)
    … …  
    758672  target_include_directories(png_framework
    759673                             PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
     674  target_include_directories(png_framework
     675                             PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>)
    760676  target_include_directories(png_framework SYSTEM
    761677                             INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/libpng${PNGLIB_ABI_VERSION}>)
    … …  
    772688  enable_testing()
    773689
    774   function(png_add_test)
    775     set(options)
    776     set(oneValueArgs NAME COMMAND)
    777     set(multiValueArgs OPTIONS FILES)
    778     cmake_parse_arguments(_PAT "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
    779     if(NOT _PAT_NAME)
    780       message(FATAL_ERROR "png_add_test: Missing NAME argument")
    781     endif()
    782     if(NOT _PAT_COMMAND)
    783       message(FATAL_ERROR "png_add_test: Missing COMMAND argument")
    784     endif()
    785 
    786     set(TEST_OPTIONS "${_PAT_OPTIONS}")
    787     set(TEST_FILES "${_PAT_FILES}")
    788 
    789     configure_file("${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake/test.cmake.in"
    790                    "${CMAKE_CURRENT_BINARY_DIR}/tests/${_PAT_NAME}.cmake"
    791                    @ONLY)
    792     add_test(NAME "${_PAT_NAME}"
    793              COMMAND "${CMAKE_COMMAND}"
    794                      "-DLIBPNG=$<TARGET_FILE:png_shared>"
    795                      "-DTEST_COMMAND=$<TARGET_FILE:${_PAT_COMMAND}>"
    796                      -P "${CMAKE_CURRENT_BINARY_DIR}/tests/${_PAT_NAME}.cmake")
    797   endfunction()
     690  # Include the internal module PNGTest.cmake
     691  include(${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake/PNGTest.cmake)
    798692
    799693  # Find test PNG files by globbing, but sort lists to ensure
    … …  
    803697  file(GLOB TEST_PNGS "${CMAKE_CURRENT_SOURCE_DIR}/contrib/testpngs/*.png")
    804698  list(SORT TEST_PNGS)
     699  file(GLOB TEST_PNG3_PNGS "${CMAKE_CURRENT_SOURCE_DIR}/contrib/testpngs/png-3/*.png")
     700  list(SORT TEST_PNG3_PNGS)
    805701
    806702  set(PNGTEST_PNG "${CMAKE_CURRENT_SOURCE_DIR}/pngtest.png")
    … …  
    812708               COMMAND pngtest
    813709               FILES "${PNGTEST_PNG}")
     710
     711  png_add_test(NAME pngtest-png-3
     712               COMMAND pngtest
     713               FILES "${TEST_PNG3_PNGS}")
    814714
    815715  add_executable(pngvalid ${pngvalid_sources})
    … …  
    969869endif()
    970870
    971 # Create a symlink from src to dest (if possible), or, alternatively,
    972 # copy src to dest if different.
     871# Create a symlink that points to a target file (if symlinking is possible),
     872# or make a copy of the target file (if symlinking is not possible):
     873# create_symlink(<destfile> [FILE <file> | TARGET <target>])
    973874function(create_symlink DEST_FILE)
     875  # TODO:
     876  # Replace this implementation with CMake's built-in create_symlink function,
     877  # which has been fully functional on all platforms, including Windows, since
     878  # CMake version 3.13.
    974879  cmake_parse_arguments(_SYM "" "FILE;TARGET" "" ${ARGN})
    975880  if(NOT _SYM_FILE AND NOT _SYM_TARGET)
    … …  
    11291034endif()
    11301035
     1036# Create a CMake Config File that can be used via find_package(PNG CONFIG)
     1037if(NOT SKIP_INSTALL_CONFIG_FILE AND NOT SKIP_INSTALL_ALL)
     1038  install(TARGETS ${PNG_LIBRARY_TARGETS}
     1039          EXPORT PNGTargets
     1040          RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
     1041          LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     1042          ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
     1043          FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR})
     1044
     1045  include(CMakePackageConfigHelpers)
     1046  write_basic_package_version_file(PNGConfigVersion.cmake
     1047                                   VERSION ${PNGLIB_VERSION}
     1048                                   COMPATIBILITY SameMinorVersion)
     1049
     1050  install(EXPORT PNGTargets
     1051          FILE PNGTargets.cmake
     1052          NAMESPACE PNG::
     1053          DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/PNG)
     1054
     1055  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake/PNGConfig.cmake
     1056                ${CMAKE_CURRENT_BINARY_DIR}/PNGConfigVersion.cmake
     1057          DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/PNG)
     1058endif()
     1059
    11311060# TODO: Create MSVC import lib for MinGW-compiled shared lib.
    11321061# pexports libpng.dll > libpng.def

  • trunk/src/libs/libpng-1.6.45/INSTALL

    r103316 r107813  
    1 
    21    Installing libpng
    32

  • trunk/src/libs/libpng-1.6.45/LICENSE

    r103316 r107813  
    55---------------------------------------
    66
    7  * Copyright (c) 1995-2024 The PNG Reference Library Authors.
    8  * Copyright (c) 2018-2024 Cosmin Truta.
     7 * Copyright (c) 1995-2025 The PNG Reference Library Authors.
     8 * Copyright (c) 2018-2025 Cosmin Truta.
    99 * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
    1010 * Copyright (c) 1996-1997 Andreas Dilger.

  • trunk/src/libs/libpng-1.6.45/Makefile.am

    r103316 r107813  
    109109if PNG_ARM_NEON
    110110libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES += arm/arm_init.c\
    111         arm/filter_neon.S arm/filter_neon_intrinsics.c \
     111        arm/filter_neon_intrinsics.c \
    112112        arm/palette_neon_intrinsics.c
    113113endif

  • trunk/src/libs/libpng-1.6.45/Makefile.in

    r103316 r107813  
    1 # Makefile.in generated by automake 1.16.5 from Makefile.am.
     1# Makefile.in generated by automake 1.17 from Makefile.am.
    22# @configure_input@
    33
    4 # Copyright (C) 1994-2021 Free Software Foundation, Inc.
     4# Copyright (C) 1994-2024 Free Software Foundation, Inc.
    55
    66# This Makefile.in is free software; the Free Software Foundation
    … …  
    8484am__make_dryrun = (target_option=n; $(am__make_running_with_option))
    8585am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
     86am__rm_f = rm -f $(am__rm_f_notfound)
     87am__rm_rf = rm -rf $(am__rm_f_notfound)
    8688pkgdatadir = $(datadir)/@PACKAGE@
    8789pkglibdir = $(libdir)/@PACKAGE@
    … …  
    109111@ENABLE_TOOLS_TRUE@     png-fix-itxt$(EXEEXT)
    110112@PNG_ARM_NEON_TRUE@am__append_2 = arm/arm_init.c\
    111 @PNG_ARM_NEON_TRUE@     arm/filter_neon.S arm/filter_neon_intrinsics.c \
     113@PNG_ARM_NEON_TRUE@     arm/filter_neon_intrinsics.c \
    112114@PNG_ARM_NEON_TRUE@     arm/palette_neon_intrinsics.c
    113115
    … …  
    178180  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
    179181am__uninstall_files_from_dir = { \
    180   test -z "$$files" \
    181     || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
    182     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
    183          $(am__cd) "$$dir" && rm -f $$files; }; \
     182  { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
     183  || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
     184       $(am__cd) "$$dir" && echo $$files | $(am__xargs_n) 40 $(am__rm_f); }; \
    184185  }
    185186LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
    … …  
    189190        pngwtran.c pngwutil.c png.h pngconf.h pngdebug.h pnginfo.h \
    190191        pngpriv.h pngstruct.h pngusr.dfa arm/arm_init.c \
    191         arm/filter_neon.S arm/filter_neon_intrinsics.c \
    192         arm/palette_neon_intrinsics.c mips/mips_init.c \
    193         mips/filter_msa_intrinsics.c mips/filter_mmi_inline_assembly.c \
    194         intel/intel_init.c intel/filter_sse2_intrinsics.c \
    195         powerpc/powerpc_init.c powerpc/filter_vsx_intrinsics.c
     192        arm/filter_neon_intrinsics.c arm/palette_neon_intrinsics.c \
     193        mips/mips_init.c mips/filter_msa_intrinsics.c \
     194        mips/filter_mmi_inline_assembly.c intel/intel_init.c \
     195        intel/filter_sse2_intrinsics.c powerpc/powerpc_init.c \
     196        powerpc/filter_vsx_intrinsics.c
    196197am__dirstamp = $(am__leading_dot)dirstamp
    197 @PNG_ARM_NEON_TRUE@am__objects_1 = arm/arm_init.lo arm/filter_neon.lo \
     198@PNG_ARM_NEON_TRUE@am__objects_1 = arm/arm_init.lo \
    198199@PNG_ARM_NEON_TRUE@     arm/filter_neon_intrinsics.lo \
    199200@PNG_ARM_NEON_TRUE@     arm/palette_neon_intrinsics.lo
    … …  
    313314        ./$(DEPDIR)/pngwio.Plo ./$(DEPDIR)/pngwrite.Plo \
    314315        ./$(DEPDIR)/pngwtran.Plo ./$(DEPDIR)/pngwutil.Plo \
    315         arm/$(DEPDIR)/arm_init.Plo arm/$(DEPDIR)/filter_neon.Plo \
     316        arm/$(DEPDIR)/arm_init.Plo \
    316317        arm/$(DEPDIR)/filter_neon_intrinsics.Plo \
    317318        arm/$(DEPDIR)/palette_neon_intrinsics.Plo \
    … …  
    334335        powerpc/$(DEPDIR)/powerpc_init.Plo
    335336am__mv = mv -f
    336 CPPASCOMPILE = $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    337         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS)
    338 LTCPPASCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
    339         $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) \
    340         $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
    341         $(AM_CCASFLAGS) $(CCASFLAGS)
    342 AM_V_CPPAS = $(am__v_CPPAS_@AM_V@)
    343 am__v_CPPAS_ = $(am__v_CPPAS_@AM_DEFAULT_V@)
    344 am__v_CPPAS_0 = @echo "  CPPAS   " $@;
    345 am__v_CPPAS_1 =
    346337COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
    347338        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
    … …  
    514505am__common_driver_flags = \
    515506  --color-tests "$$am__color_tests" \
     507  $$am__collect_skipped_logs \
    516508  --enable-hard-errors "$$am__enable_hard_errors" \
    517509  --expect-failure "$$am__expect_failure"
    … …  
    538530else dir="$(srcdir)/"; fi;                              \
    539531tst=$$dir$$f; log='$@';                                 \
     532if test -n '$(IGNORE_SKIPPED_LOGS)'; then               \
     533  am__collect_skipped_logs='--collect-skipped-logs no'; \
     534else                                                    \
     535  am__collect_skipped_logs='';                          \
     536fi;                                                     \
    540537if test -n '$(DISABLE_HARD_ERRORS)'; then               \
    541538  am__enable_hard_errors=no;                            \
    … …  
    593590am__remove_distdir = \
    594591  if test -d "$(distdir)"; then \
    595     find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
    596       && rm -rf "$(distdir)" \
     592    find "$(distdir)" -type d ! -perm -700 -exec chmod u+rwx {} ';' \
     593      ; rm -rf "$(distdir)" \
    597594      || { sleep 5 && rm -rf "$(distdir)"; }; \
    598595  else :; fi
    599596am__post_remove_distdir = $(am__remove_distdir)
    600597DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz
    601 GZIP_ENV = --best
     598GZIP_ENV = -9
    602599DIST_TARGETS = dist-xz dist-gzip
    603600# Exists only to be overridden by the user if desired.
    … …  
    606603am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
    607604  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
    608 distcleancheck_listfiles = find . -type f -print
     605distcleancheck_listfiles = \
     606  find . \( -type f -a \! \
     607            \( -name .nfs* -o -name .smb* -o -name .__afs* \) \) -print
    609608
    610609#distribute headers in /usr/include/libpng/*
    … …  
    710709am__leading_dot = @am__leading_dot@
    711710am__quote = @am__quote@
     711am__rm_f_notfound = @am__rm_f_notfound@
    712712am__tar = @am__tar@
    713713am__untar = @am__untar@
     714am__xargs_n = @am__xargs_n@
    714715
    715716# generate the -config scripts if required
    … …  
    886887
    887888.SUFFIXES:
    888 .SUFFIXES: .chk .out .S .c .lo .log .o .obj .test .test$(EXEEXT) .trs
     889.SUFFIXES: .chk .out .c .lo .log .o .obj .test .test$(EXEEXT) .trs
    889890am--refresh: Makefile
    890891        @:
    … …  
    926927
    927928stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
    928         @rm -f stamp-h1
    929         cd $(top_builddir) && $(SHELL) ./config.status config.h
     929        $(AM_V_at)rm -f stamp-h1
     930        $(AM_V_GEN)cd $(top_builddir) && $(SHELL) ./config.status config.h
    930931$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
    931         ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
    932         rm -f stamp-h1
    933         touch $@
     932        $(AM_V_GEN)($(am__cd) $(top_srcdir) && $(AUTOHEADER))
     933        $(AM_V_at)rm -f stamp-h1
     934        $(AM_V_at)touch $@
    934935
    935936distclean-hdr:
    … …  
    978979        test -n "$$list" || exit 0; \
    979980        echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
    980         cd "$(DESTDIR)$(bindir)" && rm -f $$files
     981        cd "$(DESTDIR)$(bindir)" && $(am__rm_f) $$files
    981982
    982983clean-binPROGRAMS:
    983         @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
    984         echo " rm -f" $$list; \
    985         rm -f $$list || exit $$?; \
    986         test -n "$(EXEEXT)" || exit 0; \
    987         list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
    988         echo " rm -f" $$list; \
    989         rm -f $$list
     984        $(am__rm_f) $(bin_PROGRAMS)
     985        test -z "$(EXEEXT)" || $(am__rm_f) $(bin_PROGRAMS:$(EXEEXT)=)
    990986
    991987clean-checkPROGRAMS:
    992         @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
    993         echo " rm -f" $$list; \
    994         rm -f $$list || exit $$?; \
    995         test -n "$(EXEEXT)" || exit 0; \
    996         list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
    997         echo " rm -f" $$list; \
    998         rm -f $$list
     988        $(am__rm_f) $(check_PROGRAMS)
     989        test -z "$(EXEEXT)" || $(am__rm_f) $(check_PROGRAMS:$(EXEEXT)=)
    999990
    1000991install-libLTLIBRARIES: $(lib_LTLIBRARIES)
    … …  
    10231014
    10241015clean-libLTLIBRARIES:
    1025         -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
     1016        -$(am__rm_f) $(lib_LTLIBRARIES)
    10261017        @list='$(lib_LTLIBRARIES)'; \
    10271018        locs=`for p in $$list; do echo $$p; done | \
    10281019              sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
    10291020              sort -u`; \
    1030         test -z "$$locs" || { \
    1031           echo rm -f $${locs}; \
    1032           rm -f $${locs}; \
    1033         }
     1021        echo rm -f $${locs}; \
     1022        $(am__rm_f) $${locs}
    10341023
    10351024clean-noinstLTLIBRARIES:
    1036         -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
     1025        -$(am__rm_f) $(noinst_LTLIBRARIES)
    10371026        @list='$(noinst_LTLIBRARIES)'; \
    10381027        locs=`for p in $$list; do echo $$p; done | \
    10391028              sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
    10401029              sort -u`; \
    1041         test -z "$$locs" || { \
    1042           echo rm -f $${locs}; \
    1043           rm -f $${locs}; \
    1044         }
     1030        echo rm -f $${locs}; \
     1031        $(am__rm_f) $${locs}
    10451032arm/$(am__dirstamp):
    10461033        @$(MKDIR_P) arm
    1047         @: > arm/$(am__dirstamp)
     1034        @: >>arm/$(am__dirstamp)
    10481035arm/$(DEPDIR)/$(am__dirstamp):
    10491036        @$(MKDIR_P) arm/$(DEPDIR)
    1050         @: > arm/$(DEPDIR)/$(am__dirstamp)
     1037        @: >>arm/$(DEPDIR)/$(am__dirstamp)
    10511038arm/arm_init.lo: arm/$(am__dirstamp) arm/$(DEPDIR)/$(am__dirstamp)
    1052 arm/filter_neon.lo: arm/$(am__dirstamp) arm/$(DEPDIR)/$(am__dirstamp)
    10531039arm/filter_neon_intrinsics.lo: arm/$(am__dirstamp) \
    10541040        arm/$(DEPDIR)/$(am__dirstamp)
    … …  
    10571043mips/$(am__dirstamp):
    10581044        @$(MKDIR_P) mips
    1059         @: > mips/$(am__dirstamp)
     1045        @: >>mips/$(am__dirstamp)
    10601046mips/$(DEPDIR)/$(am__dirstamp):
    10611047        @$(MKDIR_P) mips/$(DEPDIR)
    1062         @: > mips/$(DEPDIR)/$(am__dirstamp)
     1048        @: >>mips/$(DEPDIR)/$(am__dirstamp)
    10631049mips/mips_init.lo: mips/$(am__dirstamp) mips/$(DEPDIR)/$(am__dirstamp)
    10641050mips/filter_msa_intrinsics.lo: mips/$(am__dirstamp) \
    … …  
    10681054intel/$(am__dirstamp):
    10691055        @$(MKDIR_P) intel
    1070         @: > intel/$(am__dirstamp)
     1056        @: >>intel/$(am__dirstamp)
    10711057intel/$(DEPDIR)/$(am__dirstamp):
    10721058        @$(MKDIR_P) intel/$(DEPDIR)
    1073         @: > intel/$(DEPDIR)/$(am__dirstamp)
     1059        @: >>intel/$(DEPDIR)/$(am__dirstamp)
    10741060intel/intel_init.lo: intel/$(am__dirstamp) \
    10751061        intel/$(DEPDIR)/$(am__dirstamp)
    … …  
    10781064powerpc/$(am__dirstamp):
    10791065        @$(MKDIR_P) powerpc
    1080         @: > powerpc/$(am__dirstamp)
     1066        @: >>powerpc/$(am__dirstamp)
    10811067powerpc/$(DEPDIR)/$(am__dirstamp):
    10821068        @$(MKDIR_P) powerpc/$(DEPDIR)
    1083         @: > powerpc/$(DEPDIR)/$(am__dirstamp)
     1069        @: >>powerpc/$(DEPDIR)/$(am__dirstamp)
    10841070powerpc/powerpc_init.lo: powerpc/$(am__dirstamp) \
    10851071        powerpc/$(DEPDIR)/$(am__dirstamp)
    … …  
    10911077loongarch/$(am__dirstamp):
    10921078        @$(MKDIR_P) loongarch
    1093         @: > loongarch/$(am__dirstamp)
     1079        @: >>loongarch/$(am__dirstamp)
    10941080loongarch/$(DEPDIR)/$(am__dirstamp):
    10951081        @$(MKDIR_P) loongarch/$(DEPDIR)
    1096         @: > loongarch/$(DEPDIR)/$(am__dirstamp)
     1082        @: >>loongarch/$(DEPDIR)/$(am__dirstamp)
    10971083loongarch/libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@lsx_la-loongarch_lsx_init.lo:  \
    10981084        loongarch/$(am__dirstamp) loongarch/$(DEPDIR)/$(am__dirstamp)
    … …  
    11041090contrib/tools/$(am__dirstamp):
    11051091        @$(MKDIR_P) contrib/tools
    1106         @: > contrib/tools/$(am__dirstamp)
     1092        @: >>contrib/tools/$(am__dirstamp)
    11071093contrib/tools/$(DEPDIR)/$(am__dirstamp):
    11081094        @$(MKDIR_P) contrib/tools/$(DEPDIR)
    1109         @: > contrib/tools/$(DEPDIR)/$(am__dirstamp)
     1095        @: >>contrib/tools/$(DEPDIR)/$(am__dirstamp)
    11101096contrib/tools/png-fix-itxt.$(OBJEXT): contrib/tools/$(am__dirstamp) \
    11111097        contrib/tools/$(DEPDIR)/$(am__dirstamp)
    … …  
    11281114contrib/libtests/$(am__dirstamp):
    11291115        @$(MKDIR_P) contrib/libtests
    1130         @: > contrib/libtests/$(am__dirstamp)
     1116        @: >>contrib/libtests/$(am__dirstamp)
    11311117contrib/libtests/$(DEPDIR)/$(am__dirstamp):
    11321118        @$(MKDIR_P) contrib/libtests/$(DEPDIR)
    1133         @: > contrib/libtests/$(DEPDIR)/$(am__dirstamp)
     1119        @: >>contrib/libtests/$(DEPDIR)/$(am__dirstamp)
    11341120contrib/libtests/pngimage.$(OBJEXT): contrib/libtests/$(am__dirstamp) \
    11351121        contrib/libtests/$(DEPDIR)/$(am__dirstamp)
    … …  
    12381224@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pngwutil.Plo@am__quote@ # am--include-marker
    12391225@AMDEP_TRUE@@am__include@ @am__quote@arm/$(DEPDIR)/arm_init.Plo@am__quote@ # am--include-marker
    1240 @AMDEP_TRUE@@am__include@ @am__quote@arm/$(DEPDIR)/filter_neon.Plo@am__quote@ # am--include-marker
    12411226@AMDEP_TRUE@@am__include@ @am__quote@arm/$(DEPDIR)/filter_neon_intrinsics.Plo@am__quote@ # am--include-marker
    12421227@AMDEP_TRUE@@am__include@ @am__quote@arm/$(DEPDIR)/palette_neon_intrinsics.Plo@am__quote@ # am--include-marker
    … …  
    12611246$(am__depfiles_remade):
    12621247        @$(MKDIR_P) $(@D)
    1263         @echo '# dummy' >$@-t && $(am__mv) $@-t $@
     1248        @: >>$@
    12641249
    12651250am--depfiles: $(am__depfiles_remade)
    1266 
    1267 .S.o:
    1268 @am__fastdepCCAS_TRUE@  $(AM_V_CPPAS)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
    1269 @am__fastdepCCAS_TRUE@  $(CPPASCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
    1270 @am__fastdepCCAS_TRUE@  $(am__mv) $$depbase.Tpo $$depbase.Po
    1271 @AMDEP_TRUE@@am__fastdepCCAS_FALSE@     $(AM_V_CPPAS)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    1272 @AMDEP_TRUE@@am__fastdepCCAS_FALSE@     DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1273 @am__fastdepCCAS_FALSE@ $(AM_V_CPPAS@am__nodep@)$(CPPASCOMPILE) -c -o $@ $<
    1274 
    1275 .S.obj:
    1276 @am__fastdepCCAS_TRUE@  $(AM_V_CPPAS)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
    1277 @am__fastdepCCAS_TRUE@  $(CPPASCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
    1278 @am__fastdepCCAS_TRUE@  $(am__mv) $$depbase.Tpo $$depbase.Po
    1279 @AMDEP_TRUE@@am__fastdepCCAS_FALSE@     $(AM_V_CPPAS)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    1280 @AMDEP_TRUE@@am__fastdepCCAS_FALSE@     DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1281 @am__fastdepCCAS_FALSE@ $(AM_V_CPPAS@am__nodep@)$(CPPASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    1282 
    1283 .S.lo:
    1284 @am__fastdepCCAS_TRUE@  $(AM_V_CPPAS)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
    1285 @am__fastdepCCAS_TRUE@  $(LTCPPASCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
    1286 @am__fastdepCCAS_TRUE@  $(am__mv) $$depbase.Tpo $$depbase.Plo
    1287 @AMDEP_TRUE@@am__fastdepCCAS_FALSE@     $(AM_V_CPPAS)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
    1288 @AMDEP_TRUE@@am__fastdepCCAS_FALSE@     DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1289 @am__fastdepCCAS_FALSE@ $(AM_V_CPPAS@am__nodep@)$(LTCPPASCOMPILE) -c -o $@ $<
    12901251
    12911252.c.o:
    … …  
    15621523am--force-recheck:
    15631524        @:
    1564 
    15651525$(TEST_SUITE_LOG): $(TEST_LOGS)
    15661526        @$(am__set_TESTS_bases); \
    … …  
    16381598          result_count $$1 "ERROR:" $$error "$$mgn"; \
    16391599        }; \
     1600        output_system_information () \
     1601        { \
     1602          echo;                                     \
     1603          { uname -a | $(AWK) '{                    \
     1604  printf "System information (uname -a):";          \
     1605  for (i = 1; i < NF; ++i)                          \
     1606    {                                               \
     1607      if (i != 2)                                   \
     1608        printf " %s", $$i;                          \
     1609    }                                               \
     1610  printf "\n";                                      \
     1611}'; } 2>&1;                                         \
     1612          if test -r /etc/os-release; then          \
     1613            echo "Distribution information (/etc/os-release):"; \
     1614            sed 8q /etc/os-release;                 \
     1615          elif test -r /etc/issue; then             \
     1616            echo "Distribution information (/etc/issue):";      \
     1617            cat /etc/issue;                         \
     1618          fi;                                       \
     1619        }; \
     1620        please_report () \
     1621        { \
     1622echo "Some test(s) failed.  Please report this to $(PACKAGE_BUGREPORT),";    \
     1623echo "together with the test-suite.log file (gzipped) and your system";      \
     1624echo "information.  Thanks.";                                                \
     1625        }; \
    16401626        {                                                               \
    16411627          echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |       \
    16421628            $(am__rst_title);                                           \
    16431629          create_testsuite_report --no-color;                           \
     1630          output_system_information;                                    \
    16441631          echo;                                                         \
    16451632          echo ".. contents:: :depth: 2";                               \
    … …  
    16611648        echo "$$col$$br$$std";                                          \
    16621649        if $$success; then :; else                                      \
    1663           echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";         \
     1650          echo "$${col}See $(subdir)/$(TEST_SUITE_LOG) for debugging.$${std}";\
    16641651          if test -n "$(PACKAGE_BUGREPORT)"; then                       \
    1665             echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \
     1652            please_report | sed -e "s/^/$${col}/" -e s/'$$'/"$${std}"/; \
    16661653          fi;                                                           \
    16671654          echo "$$col$$br$$std";                                        \
    … …  
    16701657
    16711658check-TESTS: $(check_PROGRAMS)
    1672         @list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
    1673         @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
    1674         @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
     1659        @$(am__rm_f) $(RECHECK_LOGS)
     1660        @$(am__rm_f) $(RECHECK_LOGS:.log=.trs)
     1661        @$(am__rm_f) $(TEST_SUITE_LOG)
    16751662        @set +e; $(am__set_TESTS_bases); \
    16761663        log_list=`for i in $$bases; do echo $$i.log; done`; \
    1677         trs_list=`for i in $$bases; do echo $$i.trs; done`; \
    1678         log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
     1664        log_list=`echo $$log_list`; \
    16791665        $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
    16801666        exit $$?;
    16811667recheck: all $(check_PROGRAMS)
    1682         @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
     1668        @$(am__rm_f) $(TEST_SUITE_LOG)
    16831669        @set +e; $(am__set_TESTS_bases); \
    16841670        bases=`for i in $$bases; do echo $$i; done \
    … …  
    19331919distdir-am: $(DISTFILES)
    19341920        $(am__remove_distdir)
    1935         test -d "$(distdir)" || mkdir "$(distdir)"
     1921        $(AM_V_at)$(MKDIR_P) "$(distdir)"
    19361922        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
    19371923        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
    … …  
    20212007        case '$(DIST_ARCHIVES)' in \
    20222008        *.tar.gz*) \
    2023           eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
     2009          eval GZIP= gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
    20242010        *.tar.bz2*) \
    20252011          bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
    … …  
    20312017          uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
    20322018        *.shar.gz*) \
    2033           eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
     2019          eval GZIP= gzip -dc $(distdir).shar.gz | unshar ;;\
    20342020        *.zip*) \
    20352021          unzip $(distdir).zip ;;\
    … …  
    21392125        fi
    21402126mostlyclean-generic:
    2141         -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
    2142         -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
    2143         -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
     2127        -$(am__rm_f) $(TEST_LOGS)
     2128        -$(am__rm_f) $(TEST_LOGS:.log=.trs)
     2129        -$(am__rm_f) $(TEST_SUITE_LOG)
    21442130
    21452131clean-generic:
    2146         -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
     2132        -$(am__rm_f) $(CLEANFILES)
    21472133
    21482134distclean-generic:
    2149         -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
    2150         -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
    2151         -rm -f arm/$(DEPDIR)/$(am__dirstamp)
    2152         -rm -f arm/$(am__dirstamp)
    2153         -rm -f contrib/libtests/$(DEPDIR)/$(am__dirstamp)
    2154         -rm -f contrib/libtests/$(am__dirstamp)
    2155         -rm -f contrib/tools/$(DEPDIR)/$(am__dirstamp)
    2156         -rm -f contrib/tools/$(am__dirstamp)
    2157         -rm -f intel/$(DEPDIR)/$(am__dirstamp)
    2158         -rm -f intel/$(am__dirstamp)
    2159         -rm -f loongarch/$(DEPDIR)/$(am__dirstamp)
    2160         -rm -f loongarch/$(am__dirstamp)
    2161         -rm -f mips/$(DEPDIR)/$(am__dirstamp)
    2162         -rm -f mips/$(am__dirstamp)
    2163         -rm -f powerpc/$(DEPDIR)/$(am__dirstamp)
    2164         -rm -f powerpc/$(am__dirstamp)
     2135        -$(am__rm_f) $(CONFIG_CLEAN_FILES)
     2136        -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
     2137        -$(am__rm_f) arm/$(DEPDIR)/$(am__dirstamp)
     2138        -$(am__rm_f) arm/$(am__dirstamp)
     2139        -$(am__rm_f) contrib/libtests/$(DEPDIR)/$(am__dirstamp)
     2140        -$(am__rm_f) contrib/libtests/$(am__dirstamp)
     2141        -$(am__rm_f) contrib/tools/$(DEPDIR)/$(am__dirstamp)
     2142        -$(am__rm_f) contrib/tools/$(am__dirstamp)
     2143        -$(am__rm_f) intel/$(DEPDIR)/$(am__dirstamp)
     2144        -$(am__rm_f) intel/$(am__dirstamp)
     2145        -$(am__rm_f) loongarch/$(DEPDIR)/$(am__dirstamp)
     2146        -$(am__rm_f) loongarch/$(am__dirstamp)
     2147        -$(am__rm_f) mips/$(DEPDIR)/$(am__dirstamp)
     2148        -$(am__rm_f) mips/$(am__dirstamp)
     2149        -$(am__rm_f) powerpc/$(DEPDIR)/$(am__dirstamp)
     2150        -$(am__rm_f) powerpc/$(am__dirstamp)
    21652151
    21662152maintainer-clean-generic:
    21672153        @echo "This command is intended for maintainers to use"
    21682154        @echo "it deletes files that may require special tools to rebuild."
    2169         -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
    2170         -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
     2155        -$(am__rm_f) $(BUILT_SOURCES)
     2156        -$(am__rm_f) $(MAINTAINERCLEANFILES)
    21712157@DO_INSTALL_LIBPNG_CONFIG_FALSE@@DO_INSTALL_LINKS_FALSE@install-exec-hook:
    21722158@DO_INSTALL_LIBPNG_PC_FALSE@@DO_INSTALL_LINKS_FALSE@install-data-hook:
    … …  
    21802166distclean: distclean-am
    21812167        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
    2182                 -rm -f ./$(DEPDIR)/png.Plo
     2168        -rm -f ./$(DEPDIR)/png.Plo
    21832169        -rm -f ./$(DEPDIR)/pngerror.Plo
    21842170        -rm -f ./$(DEPDIR)/pngget.Plo
    … …  
    21972183        -rm -f ./$(DEPDIR)/pngwutil.Plo
    21982184        -rm -f arm/$(DEPDIR)/arm_init.Plo
    2199         -rm -f arm/$(DEPDIR)/filter_neon.Plo
    22002185        -rm -f arm/$(DEPDIR)/filter_neon_intrinsics.Plo
    22012186        -rm -f arm/$(DEPDIR)/palette_neon_intrinsics.Plo
    … …  
    22682253        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
    22692254        -rm -rf $(top_srcdir)/autom4te.cache
    2270                 -rm -f ./$(DEPDIR)/png.Plo
     2255        -rm -f ./$(DEPDIR)/png.Plo
    22712256        -rm -f ./$(DEPDIR)/pngerror.Plo
    22722257        -rm -f ./$(DEPDIR)/pngget.Plo
    … …  
    22852270        -rm -f ./$(DEPDIR)/pngwutil.Plo
    22862271        -rm -f arm/$(DEPDIR)/arm_init.Plo
    2287         -rm -f arm/$(DEPDIR)/filter_neon.Plo
    22882272        -rm -f arm/$(DEPDIR)/filter_neon_intrinsics.Plo
    22892273        -rm -f arm/$(DEPDIR)/palette_neon_intrinsics.Plo
    … …  
    25492533# Otherwise a system limit (for SysV at least) may be exceeded.
    25502534.NOEXPORT:
     2535
     2536# Tell GNU make to disable its built-in pattern rules.
     2537%:: %,v
     2538%:: RCS/%,v
     2539%:: RCS/%
     2540%:: s.%
     2541%:: SCCS/s.%

  • trunk/src/libs/libpng-1.6.45/README

    r105469 r107813  
    1 README for libpng version 1.6.43
     1README for libpng version 1.6.45
    22================================
    33
    … …  
    158158                          O'Reilly, 1999
    159159        libtests/     =>  Test programs
    160         oss-fuzz/     =>  Files used by the OSS-Fuzz project for fuzz-testing
    161                           libpng
    162160        pngexif/      =>  Program to inspect the EXIF information in PNG files
    163161        pngminim/     =>  Minimal decoder, encoder, and progressive decoder

  • trunk/src/libs/libpng-1.6.45/TODO

    r96425 r107813  
    1 TODO - list of things to do for libpng:
     1TODO list for libpng
     2--------------------
    23
    3 * Fix all defects (duh!)
    4 * Better C++ wrapper / full C++ implementation (?)
    5 * Fix the problems with C++ and 'extern "C"'.
    6 * cHRM transformation.
    7 * Palette creation.
    8 * "grayscale->palette" transformation and "palette->grayscale" detection.
    9 * Improved dithering.
    10 * Multi-lingual error and warning message support.
    11 * Complete sRGB transformation.  (Currently it simply uses gamma=0.45455.)
    12 * Man pages for function calls.
    13 * Better documentation.
    14 * Better filter selection
    15   (e.g., counting huffman bits/precompression; filter inertia; filter costs).
    16 * Histogram creation.
    17 * Text conversion between different code pages (e.g., Latin-1 -> Mac).
    18 * Avoid building gamma tables whenever possible.
    19 * Greater precision in changing to linear gamma for compositing against
    20   background, and in doing rgb-to-gray transformations.
    21 * Investigate pre-incremented loop counters and other loop constructions.
    22 * Interpolated method of handling interlacing.
    23 * More validations for libpng transformations.
     4 * Fix all defects (duh!)
     5 * cHRM transformation.
     6 * Palette creation.
     7 * "grayscale->palette" transformation and "palette->grayscale" detection.
     8 * Improved dithering.
     9 * Multi-lingual error and warning message support.
     10 * Complete sRGB transformation.  (Currently it simply uses gamma=0.45455.)
     11 * Man pages for function calls.
     12 * Better documentation.
     13 * Better filter selection
     14   (e.g., counting huffman bits/precompression; filter inertia; filter costs).
     15 * Histogram creation.
     16 * Text conversion between different code pages (e.g., Latin-1 to Mac).
     17 * Avoid building gamma tables whenever possible.
     18 * Greater precision in changing to linear gamma for compositing against
     19   background, and in doing rgb-to-gray transformations.
     20 * Investigate pre-incremented loop counters and other loop constructions.
     21 * Interpolated method of handling interlacing.
     22 * More validations for libpng transformations.

  • trunk/src/libs/libpng-1.6.45/aclocal.m4

    r103316 r107813  
    1 # generated automatically by aclocal 1.16.5 -*- Autoconf -*-
    2 
    3 # Copyright (C) 1996-2021 Free Software Foundation, Inc.
     1# generated automatically by aclocal 1.17 -*- Autoconf -*-
     2
     3# Copyright (C) 1996-2024 Free Software Foundation, Inc.
    44
    55# This file is free software; the Free Software Foundation
    … …  
    2121To do so, use the procedure documented by the package, typically 'autoreconf'.])])
    2222
    23 # Copyright (C) 2002-2021 Free Software Foundation, Inc.
     23# Copyright (C) 2002-2024 Free Software Foundation, Inc.
    2424#
    2525# This file is free software; the Free Software Foundation
    … …  
    3333# (This private macro should not be called outside this file.)
    3434AC_DEFUN([AM_AUTOMAKE_VERSION],
    35 [am__api_version='1.16'
     35[am__api_version='1.17'
    3636dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
    3737dnl require some minimum version.  Point them to the right macro.
    38 m4_if([$1], [1.16.5], [],
     38m4_if([$1], [1.17], [],
    3939      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
    4040])
    … …  
    5252# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
    5353AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
    54 [AM_AUTOMAKE_VERSION([1.16.5])dnl
     54[AM_AUTOMAKE_VERSION([1.17])dnl
    5555m4_ifndef([AC_AUTOCONF_VERSION],
    5656  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
    … …  
    5959# Figure out how to run the assembler.                      -*- Autoconf -*-
    6060
    61 # Copyright (C) 2001-2021 Free Software Foundation, Inc.
     61# Copyright (C) 2001-2024 Free Software Foundation, Inc.
    6262#
    6363# This file is free software; the Free Software Foundation
    … …  
    7979# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
    8080
    81 # Copyright (C) 2001-2021 Free Software Foundation, Inc.
     81# Copyright (C) 2001-2024 Free Software Foundation, Inc.
    8282#
    8383# This file is free software; the Free Software Foundation
    … …  
    131131# AM_CONDITIONAL                                            -*- Autoconf -*-
    132132
    133 # Copyright (C) 1997-2021 Free Software Foundation, Inc.
     133# Copyright (C) 1997-2024 Free Software Foundation, Inc.
    134134#
    135135# This file is free software; the Free Software Foundation
    … …  
    162162fi])])
    163163
    164 # Copyright (C) 1999-2021 Free Software Foundation, Inc.
     164# Copyright (C) 1999-2024 Free Software Foundation, Inc.
    165165#
    166166# This file is free software; the Free Software Foundation
    … …  
    294294      # or remarks (even with -Werror).  So we grep stderr for any message
    295295      # that says an option was ignored or not supported.
    296       # When given -MP, icc 7.0 and 7.1 complain thusly:
     296      # When given -MP, icc 7.0 and 7.1 complain thus:
    297297      #   icc: Command line warning: ignoring option '-M'; no argument required
    298298      # The diagnosis changed in icc 8.0:
    … …  
    353353# Generate code to set up dependency tracking.              -*- Autoconf -*-
    354354
    355 # Copyright (C) 1999-2021 Free Software Foundation, Inc.
     355# Copyright (C) 1999-2024 Free Software Foundation, Inc.
    356356#
    357357# This file is free software; the Free Software Foundation
    … …  
    421421# Do all the work for Automake.                             -*- Autoconf -*-
    422422
    423 # Copyright (C) 1996-2021 Free Software Foundation, Inc.
     423# Copyright (C) 1996-2024 Free Software Foundation, Inc.
    424424#
    425425# This file is free software; the Free Software Foundation
    … …  
    555555AC_SUBST([CSCOPE])
    556556
    557 AC_REQUIRE([AM_SILENT_RULES])dnl
     557AC_REQUIRE([_AM_SILENT_RULES])dnl
    558558dnl The testsuite driver may need to know about EXEEXT, so add the
    559559dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
    … …  
    563563  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
    564564
    565 # POSIX will say in a future version that running "rm -f" with no argument
    566 # is OK; and we want to be able to make that assumption in our Makefile
    567 # recipes.  So use an aggressive probe to check that the usage we want is
    568 # actually supported "in the wild" to an acceptable degree.
    569 # See automake bug#10828.
    570 # To make any issue more visible, cause the running configure to be aborted
    571 # by default if the 'rm' program in use doesn't match our expectations; the
    572 # user can still override this though.
    573 if rm -f && rm -fr && rm -rf; then : OK; else
    574   cat >&2 <<'END'
    575 Oops!
    576 
    577 Your 'rm' program seems unable to run without file operands specified
    578 on the command line, even when the '-f' option is present.  This is contrary
    579 to the behaviour of most rm programs out there, and not conforming with
    580 the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
    581 
    582 Please tell [email protected] about your system, including the value
    583 of your $PATH and any error possibly output before this message.  This
    584 can help us improve future automake versions.
    585 
    586 END
    587   if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
    588     echo 'Configuration will proceed anyway, since you have set the' >&2
    589     echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
    590     echo >&2
    591   else
    592     cat >&2 <<'END'
    593 Aborting the configuration process, to ensure you take notice of the issue.
    594 
    595 You can download and install GNU coreutils to get an 'rm' implementation
    596 that behaves properly: <https://www.gnu.org/software/coreutils/>.
    597 
    598 If you want to complete the configuration process using your problematic
    599 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
    600 to "yes", and re-run configure.
    601 
    602 END
    603     AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
    604   fi
    605 fi
     565AC_REQUIRE([_AM_PROG_RM_F])
     566AC_REQUIRE([_AM_PROG_XARGS_N])
     567
    606568dnl The trailing newline in this macro's definition is deliberate, for
    607569dnl backward compatibility and to allow trailing 'dnl'-style comments
    … …  
    636598echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
    637599
    638 # Copyright (C) 2001-2021 Free Software Foundation, Inc.
     600# Copyright (C) 2001-2024 Free Software Foundation, Inc.
    639601#
    640602# This file is free software; the Free Software Foundation
    … …  
    657619AC_SUBST([install_sh])])
    658620
    659 # Copyright (C) 2003-2021 Free Software Foundation, Inc.
     621# Copyright (C) 2003-2024 Free Software Foundation, Inc.
    660622#
    661623# This file is free software; the Free Software Foundation
    … …  
    679641# From Jim Meyering
    680642
    681 # Copyright (C) 1996-2021 Free Software Foundation, Inc.
     643# Copyright (C) 1996-2024 Free Software Foundation, Inc.
    682644#
    683645# This file is free software; the Free Software Foundation
    … …  
    714676# Check to see how 'make' treats includes.                  -*- Autoconf -*-
    715677
    716 # Copyright (C) 2001-2021 Free Software Foundation, Inc.
     678# Copyright (C) 2001-2024 Free Software Foundation, Inc.
    717679#
    718680# This file is free software; the Free Software Foundation
    … …  
    757719# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
    758720
    759 # Copyright (C) 1997-2021 Free Software Foundation, Inc.
     721# Copyright (C) 1997-2024 Free Software Foundation, Inc.
    760722#
    761723# This file is free software; the Free Software Foundation
    … …  
    791753# Helper functions for option handling.                     -*- Autoconf -*-
    792754
    793 # Copyright (C) 2001-2021 Free Software Foundation, Inc.
     755# Copyright (C) 2001-2024 Free Software Foundation, Inc.
    794756#
    795757# This file is free software; the Free Software Foundation
    … …  
    820782[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
    821783
    822 # Copyright (C) 1999-2021 Free Software Foundation, Inc.
     784# Copyright (C) 1999-2024 Free Software Foundation, Inc.
    823785#
    824786# This file is free software; the Free Software Foundation
    … …  
    867829AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
    868830
    869 # Copyright (C) 2001-2021 Free Software Foundation, Inc.
     831# Copyright (C) 2022-2024 Free Software Foundation, Inc.
     832#
     833# This file is free software; the Free Software Foundation
     834# gives unlimited permission to copy and/or distribute it,
     835# with or without modifications, as long as this notice is preserved.
     836
     837# _AM_PROG_RM_F
     838# ---------------
     839# Check whether 'rm -f' without any arguments works.
     840# https://bugs.gnu.org/10828
     841AC_DEFUN([_AM_PROG_RM_F],
     842[am__rm_f_notfound=
     843AS_IF([(rm -f && rm -fr && rm -rf) 2>/dev/null], [], [am__rm_f_notfound='""'])
     844AC_SUBST(am__rm_f_notfound)
     845])
     846
     847# Copyright (C) 2001-2024 Free Software Foundation, Inc.
    870848#
    871849# This file is free software; the Free Software Foundation
    … …  
    886864# Check to make sure that the build environment is sane.    -*- Autoconf -*-
    887865
    888 # Copyright (C) 1996-2021 Free Software Foundation, Inc.
    889 #
    890 # This file is free software; the Free Software Foundation
    891 # gives unlimited permission to copy and/or distribute it,
    892 # with or without modifications, as long as this notice is preserved.
     866# Copyright (C) 1996-2024 Free Software Foundation, Inc.
     867#
     868# This file is free software; the Free Software Foundation
     869# gives unlimited permission to copy and/or distribute it,
     870# with or without modifications, as long as this notice is preserved.
     871
     872# _AM_SLEEP_FRACTIONAL_SECONDS
     873# ----------------------------
     874AC_DEFUN([_AM_SLEEP_FRACTIONAL_SECONDS], [dnl
     875AC_CACHE_CHECK([whether sleep supports fractional seconds],
     876               am_cv_sleep_fractional_seconds, [dnl
     877AS_IF([sleep 0.001 2>/dev/null], [am_cv_sleep_fractional_seconds=yes],
     878                                 [am_cv_sleep_fractional_seconds=no])
     879])])
     880
     881# _AM_FILESYSTEM_TIMESTAMP_RESOLUTION
     882# -----------------------------------
     883# Determine the filesystem's resolution for file modification
     884# timestamps.  The coarsest we know of is FAT, with a resolution
     885# of only two seconds, even with the most recent "exFAT" extensions.
     886# The finest (e.g. ext4 with large inodes, XFS, ZFS) is one
     887# nanosecond, matching clock_gettime.  However, it is probably not
     888# possible to delay execution of a shell script for less than one
     889# millisecond, due to process creation overhead and scheduling
     890# granularity, so we don't check for anything finer than that. (See below.)
     891AC_DEFUN([_AM_FILESYSTEM_TIMESTAMP_RESOLUTION], [dnl
     892AC_REQUIRE([_AM_SLEEP_FRACTIONAL_SECONDS])
     893AC_CACHE_CHECK([filesystem timestamp resolution],
     894               am_cv_filesystem_timestamp_resolution, [dnl
     895# Default to the worst case.
     896am_cv_filesystem_timestamp_resolution=2
     897
     898# Only try to go finer than 1 sec if sleep can do it.
     899# Don't try 1 sec, because if 0.01 sec and 0.1 sec don't work,
     900# - 1 sec is not much of a win compared to 2 sec, and
     901# - it takes 2 seconds to perform the test whether 1 sec works.
     902#
     903# Instead, just use the default 2s on platforms that have 1s resolution,
     904# accept the extra 1s delay when using $sleep in the Automake tests, in
     905# exchange for not incurring the 2s delay for running the test for all
     906# packages.
     907#
     908am_try_resolutions=
     909if test "$am_cv_sleep_fractional_seconds" = yes; then
     910  # Even a millisecond often causes a bunch of false positives,
     911  # so just try a hundredth of a second. The time saved between .001 and
     912  # .01 is not terribly consequential.
     913  am_try_resolutions="0.01 0.1 $am_try_resolutions"
     914fi
     915
     916# In order to catch current-generation FAT out, we must *modify* files
     917# that already exist; the *creation* timestamp is finer.  Use names
     918# that make ls -t sort them differently when they have equal
     919# timestamps than when they have distinct timestamps, keeping
     920# in mind that ls -t prints the *newest* file first.
     921rm -f conftest.ts?
     922: > conftest.ts1
     923: > conftest.ts2
     924: > conftest.ts3
     925
     926# Make sure ls -t actually works.  Do 'set' in a subshell so we don't
     927# clobber the current shell's arguments. (Outer-level square brackets
     928# are removed by m4; they're present so that m4 does not expand
     929# <dollar><star>; be careful, easy to get confused.)
     930if (
     931     set X `[ls -t conftest.ts[12]]` &&
     932     {
     933       test "$[]*" != "X conftest.ts1 conftest.ts2" ||
     934       test "$[]*" != "X conftest.ts2 conftest.ts1";
     935     }
     936); then :; else
     937  # If neither matched, then we have a broken ls.  This can happen
     938  # if, for instance, CONFIG_SHELL is bash and it inherits a
     939  # broken ls alias from the environment.  This has actually
     940  # happened.  Such a system could not be considered "sane".
     941  _AS_ECHO_UNQUOTED(
     942    ["Bad output from ls -t: \"`[ls -t conftest.ts[12]]`\""],
     943    [AS_MESSAGE_LOG_FD])
     944  AC_MSG_FAILURE([ls -t produces unexpected output.
     945Make sure there is not a broken ls alias in your environment.])
     946fi
     947
     948for am_try_res in $am_try_resolutions; do
     949  # Any one fine-grained sleep might happen to cross the boundary
     950  # between two values of a coarser actual resolution, but if we do
     951  # two fine-grained sleeps in a row, at least one of them will fall
     952  # entirely within a coarse interval.
     953  echo alpha > conftest.ts1
     954  sleep $am_try_res
     955  echo beta > conftest.ts2
     956  sleep $am_try_res
     957  echo gamma > conftest.ts3
     958
     959  # We assume that 'ls -t' will make use of high-resolution
     960  # timestamps if the operating system supports them at all.
     961  if (set X `ls -t conftest.ts?` &&
     962      test "$[]2" = conftest.ts3 &&
     963      test "$[]3" = conftest.ts2 &&
     964      test "$[]4" = conftest.ts1); then
     965    #
     966    # Ok, ls -t worked. If we're at a resolution of 1 second, we're done,
     967    # because we don't need to test make.
     968    make_ok=true
     969    if test $am_try_res != 1; then
     970      # But if we've succeeded so far with a subsecond resolution, we
     971      # have one more thing to check: make. It can happen that
     972      # everything else supports the subsecond mtimes, but make doesn't;
     973      # notably on macOS, which ships make 3.81 from 2006 (the last one
     974      # released under GPLv2). https://bugs.gnu.org/68808
     975      #
     976      # We test $MAKE if it is defined in the environment, else "make".
     977      # It might get overridden later, but our hope is that in practice
     978      # it does not matter: it is the system "make" which is (by far)
     979      # the most likely to be broken, whereas if the user overrides it,
     980      # probably they did so with a better, or at least not worse, make.
     981      # https://lists.gnu.org/archive/html/automake/2024-06/msg00051.html
     982      #
     983      # Create a Makefile (real tab character here):
     984      rm -f conftest.mk
     985      echo 'conftest.ts1: conftest.ts2' >conftest.mk
     986      echo '    touch conftest.ts2' >>conftest.mk
     987      #
     988      # Now, running
     989      #   touch conftest.ts1; touch conftest.ts2; make
     990      # should touch ts1 because ts2 is newer. This could happen by luck,
     991      # but most often, it will fail if make's support is insufficient. So
     992      # test for several consecutive successes.
     993      #
     994      # (We reuse conftest.ts[12] because we still want to modify existing
     995      # files, not create new ones, per above.)
     996      n=0
     997      make=${MAKE-make}
     998      until test $n -eq 3; do
     999        echo one > conftest.ts1
     1000        sleep $am_try_res
     1001        echo two > conftest.ts2 # ts2 should now be newer than ts1
     1002        if $make -f conftest.mk | grep 'up to date' >/dev/null; then
     1003          make_ok=false
     1004          break # out of $n loop
     1005        fi
     1006        n=`expr $n + 1`
     1007      done
     1008    fi
     1009    #
     1010    if $make_ok; then
     1011      # Everything we know to check worked out, so call this resolution good.
     1012      am_cv_filesystem_timestamp_resolution=$am_try_res
     1013      break # out of $am_try_res loop
     1014    fi
     1015    # Otherwise, we'll go on to check the next resolution.
     1016  fi
     1017done
     1018rm -f conftest.ts?
     1019# (end _am_filesystem_timestamp_resolution)
     1020])])
    8931021
    8941022# AM_SANITY_CHECK
    8951023# ---------------
    8961024AC_DEFUN([AM_SANITY_CHECK],
    897 [AC_MSG_CHECKING([whether build environment is sane])
     1025[AC_REQUIRE([_AM_FILESYSTEM_TIMESTAMP_RESOLUTION])
     1026# This check should not be cached, as it may vary across builds of
     1027# different projects.
     1028AC_MSG_CHECKING([whether build environment is sane])
    8981029# Reject unsafe characters in $srcdir or the absolute working directory
    8991030# name.  Accept space and tab only in the latter.
    … …  
    9141045# (eg FreeBSD returns the mod time of the symlink's containing
    9151046# directory).
    916 if (
    917    am_has_slept=no
    918    for am_try in 1 2; do
    919      echo "timestamp, slept: $am_has_slept" > conftest.file
    920      set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
    921      if test "$[*]" = "X"; then
    922         # -L didn't work.
    923         set X `ls -t "$srcdir/configure" conftest.file`
    924      fi
    925      if test "$[*]" != "X $srcdir/configure conftest.file" \
    926         && test "$[*]" != "X conftest.file $srcdir/configure"; then
    927 
    928         # If neither matched, then we have a broken ls.  This can happen
    929         # if, for instance, CONFIG_SHELL is bash and it inherits a
    930         # broken ls alias from the environment.  This has actually
    931         # happened.  Such a system could not be considered "sane".
    932         AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
    933   alias in your environment])
    934      fi
    935      if test "$[2]" = conftest.file || test $am_try -eq 2; then
    936        break
    937      fi
    938      # Just in case.
    939      sleep 1
    940      am_has_slept=yes
    941    done
    942    test "$[2]" = conftest.file
    943    )
    944 then
    945    # Ok.
    946    :
    947 else
    948    AC_MSG_ERROR([newly created file is older than distributed files!
     1047am_build_env_is_sane=no
     1048am_has_slept=no
     1049rm -f conftest.file
     1050for am_try in 1 2; do
     1051  echo "timestamp, slept: $am_has_slept" > conftest.file
     1052  if (
     1053    set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
     1054    if test "$[]*" = "X"; then
     1055      # -L didn't work.
     1056      set X `ls -t "$srcdir/configure" conftest.file`
     1057    fi
     1058    test "$[]2" = conftest.file
     1059  ); then
     1060    am_build_env_is_sane=yes
     1061    break
     1062  fi
     1063  # Just in case.
     1064  sleep "$am_cv_filesystem_timestamp_resolution"
     1065  am_has_slept=yes
     1066done
     1067
     1068AC_MSG_RESULT([$am_build_env_is_sane])
     1069if test "$am_build_env_is_sane" = no; then
     1070  AC_MSG_ERROR([newly created file is older than distributed files!
    9491071Check your system clock])
    9501072fi
    951 AC_MSG_RESULT([yes])
     1073
    9521074# If we didn't sleep, we still need to ensure time stamps of config.status and
    9531075# generated files are strictly newer.
    9541076am_sleep_pid=
    955 if grep 'slept: no' conftest.file >/dev/null 2>&1; then
    956   ( sleep 1 ) &
     1077AS_IF([test -e conftest.file || grep 'slept: no' conftest.file >/dev/null 2>&1],, [dnl
     1078  ( sleep "$am_cv_filesystem_timestamp_resolution" ) &
    9571079  am_sleep_pid=$!
    958 fi
     1080])
    9591081AC_CONFIG_COMMANDS_PRE(
    9601082  [AC_MSG_CHECKING([that generated files are newer than configure])
    … …  
    9671089])
    9681090
    969 # Copyright (C) 2009-2021 Free Software Foundation, Inc.
    970 #
    971 # This file is free software; the Free Software Foundation
    972 # gives unlimited permission to copy and/or distribute it,
    973 # with or without modifications, as long as this notice is preserved.
    974 
    975 # AM_SILENT_RULES([DEFAULT])
    976 # --------------------------
    977 # Enable less verbose build rules; with the default set to DEFAULT
    978 # ("yes" being less verbose, "no" or empty being verbose).
    979 AC_DEFUN([AM_SILENT_RULES],
    980 [AC_ARG_ENABLE([silent-rules], [dnl
     1091# Copyright (C) 2009-2024 Free Software Foundation, Inc.
     1092#
     1093# This file is free software; the Free Software Foundation
     1094# gives unlimited permission to copy and/or distribute it,
     1095# with or without modifications, as long as this notice is preserved.
     1096
     1097# _AM_SILENT_RULES
     1098# ----------------
     1099# Enable less verbose build rules support.
     1100AC_DEFUN([_AM_SILENT_RULES],
     1101[AM_DEFAULT_VERBOSITY=1
     1102AC_ARG_ENABLE([silent-rules], [dnl
    9811103AS_HELP_STRING(
    9821104  [--enable-silent-rules],
    … …  
    9861108  [verbose build output (undo: "make V=0")])dnl
    9871109])
    988 case $enable_silent_rules in @%:@ (((
    989   yes) AM_DEFAULT_VERBOSITY=0;;
    990    no) AM_DEFAULT_VERBOSITY=1;;
    991     *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
    992 esac
    9931110dnl
    9941111dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
    … …  
    10091126  am_cv_make_support_nested_variables=no
    10101127fi])
    1011 if test $am_cv_make_support_nested_variables = yes; then
    1012   dnl Using '$V' instead of '$(V)' breaks IRIX make.
    1013   AM_V='$(V)'
    1014   AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
    1015 else
    1016   AM_V=$AM_DEFAULT_VERBOSITY
    1017   AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
    1018 fi
    10191128AC_SUBST([AM_V])dnl
    10201129AM_SUBST_NOTMAKE([AM_V])dnl
    … …  
    10251134AC_SUBST([AM_BACKSLASH])dnl
    10261135_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
    1027 ])
    1028 
    1029 # Copyright (C) 2001-2021 Free Software Foundation, Inc.
     1136dnl Delay evaluation of AM_DEFAULT_VERBOSITY to the end to allow multiple calls
     1137dnl to AM_SILENT_RULES to change the default value.
     1138AC_CONFIG_COMMANDS_PRE([dnl
     1139case $enable_silent_rules in @%:@ (((
     1140  yes) AM_DEFAULT_VERBOSITY=0;;
     1141   no) AM_DEFAULT_VERBOSITY=1;;
     1142esac
     1143if test $am_cv_make_support_nested_variables = yes; then
     1144  dnl Using '$V' instead of '$(V)' breaks IRIX make.
     1145  AM_V='$(V)'
     1146  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
     1147else
     1148  AM_V=$AM_DEFAULT_VERBOSITY
     1149  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
     1150fi
     1151])dnl
     1152])
     1153
     1154# AM_SILENT_RULES([DEFAULT])
     1155# --------------------------
     1156# Set the default verbosity level to DEFAULT ("yes" being less verbose, "no" or
     1157# empty being verbose).
     1158AC_DEFUN([AM_SILENT_RULES],
     1159[AC_REQUIRE([_AM_SILENT_RULES])
     1160AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1])])
     1161
     1162# Copyright (C) 2001-2024 Free Software Foundation, Inc.
    10301163#
    10311164# This file is free software; the Free Software Foundation
    … …  
    10551188AC_SUBST([INSTALL_STRIP_PROGRAM])])
    10561189
    1057 # Copyright (C) 2006-2021 Free Software Foundation, Inc.
     1190# Copyright (C) 2006-2024 Free Software Foundation, Inc.
    10581191#
    10591192# This file is free software; the Free Software Foundation
    … …  
    10741207# Check how to create a tarball.                            -*- Autoconf -*-
    10751208
    1076 # Copyright (C) 2004-2021 Free Software Foundation, Inc.
     1209# Copyright (C) 2004-2024 Free Software Foundation, Inc.
    10771210#
    10781211# This file is free software; the Free Software Foundation
    … …  
    11201253      am_gid=`id -g || echo unknown`
    11211254      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
    1122       if test $am_uid -le $am_max_uid; then
    1123          AC_MSG_RESULT([yes])
     1255      if test x$am_uid = xunknown; then
     1256        AC_MSG_WARN([ancient id detected; assuming current UID is ok, but dist-ustar might not work])
     1257      elif test $am_uid -le $am_max_uid; then
     1258        AC_MSG_RESULT([yes])
    11241259      else
    1125          AC_MSG_RESULT([no])
    1126          _am_tools=none
     1260        AC_MSG_RESULT([no])
     1261        _am_tools=none
    11271262      fi
    11281263      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
    1129       if test $am_gid -le $am_max_gid; then
    1130          AC_MSG_RESULT([yes])
     1264      if test x$gm_gid = xunknown; then
     1265        AC_MSG_WARN([ancient id detected; assuming current GID is ok, but dist-ustar might not work])
     1266      elif test $am_gid -le $am_max_gid; then
     1267        AC_MSG_RESULT([yes])
    11311268      else
    11321269        AC_MSG_RESULT([no])
    … …  
    12051342]) # _AM_PROG_TAR
    12061343
     1344# Copyright (C) 2022-2024 Free Software Foundation, Inc.
     1345#
     1346# This file is free software; the Free Software Foundation
     1347# gives unlimited permission to copy and/or distribute it,
     1348# with or without modifications, as long as this notice is preserved.
     1349
     1350# _AM_PROG_XARGS_N
     1351# ----------------
     1352# Check whether 'xargs -n' works.  It should work everywhere, so the fallback
     1353# is not optimized at all as we never expect to use it.
     1354AC_DEFUN([_AM_PROG_XARGS_N],
     1355[AC_CACHE_CHECK([xargs -n works], am_cv_xargs_n_works, [dnl
     1356AS_IF([test "`echo 1 2 3 | xargs -n2 echo`" = "1 2
     13573"], [am_cv_xargs_n_works=yes], [am_cv_xargs_n_works=no])])
     1358AS_IF([test "$am_cv_xargs_n_works" = yes], [am__xargs_n='xargs -n'], [dnl
     1359  am__xargs_n='am__xargs_n () { shift; sed "s/ /\\n/g" | while read am__xargs_n_arg; do "$@" "$am__xargs_n_arg"; done; }'
     1360])dnl
     1361AC_SUBST(am__xargs_n)
     1362])
     1363
    12071364m4_include([scripts/autoconf/libtool.m4])
    12081365m4_include([scripts/autoconf/ltoptions.m4])

  • trunk/src/libs/libpng-1.6.45/arm/arm_init.c

    r103316 r107813  
    1 
    21/* arm_init.c - NEON optimised filter functions
    32 *

  • trunk/src/libs/libpng-1.6.45/arm/filter_neon.S

    r96425 r107813  
    1 
    2 /* filter_neon.S - NEON optimised filter functions
     1/* filter_neon.S - placeholder file
    32 *
    4  * Copyright (c) 2018 Cosmin Truta
    5  * Copyright (c) 2014,2017 Glenn Randers-Pehrson
    6  * Written by Mans Rullgard, 2011.
     3 * Copyright (c) 2024 Cosmin Truta
    74 *
    85 * This code is released under the libpng license.
    96 * For conditions of distribution and use, see the disclaimer
    107 * and license in png.h
     8 */
     9
     10/* IMPORTANT NOTE:
     11 *
     12 * Historically, the hand-coded assembler implementation of Neon optimizations
     13 * in this module had not been in sync with the intrinsics-based implementation
     14 * in filter_neon_intrinsics.c and palette_neon_intrinsics.c, at least since
     15 * the introduction of riffled palette optimizations. Moreover, the assembler
     16 * code used to work on 32-bit ARM only, and it caused problems, even if empty,
     17 * on 64-bit ARM.
     18 *
     19 * All references to this module from our internal build scripts and projects
     20 * have been removed.
     21 *
     22 * For the external projects that might still expect this module to be present,
     23 * we leave this stub in place, for the remaining lifetime of libpng-1.6.x.
     24 * Everything should continue to function normally, as long as there are no
     25 * deliberate attempts to use the old hand-made assembler code. A build error
     26 * will be raised otherwise.
    1127 */
    1228
    … …  
    1733#include "../pngpriv.h"
    1834
    19 #if (defined(__linux__) || defined(__FreeBSD__)) && defined(__ELF__)
    20 .section .note.GNU-stack,"",%progbits /* mark stack as non-executable */
     35#ifdef PNG_READ_SUPPORTED
     36#if PNG_ARM_NEON_IMPLEMENTATION == 2 /* hand-coded assembler */
     37#if PNG_ARM_NEON_OPT > 0
     38
     39#if defined(__clang__)
     40#define GNUC_VERSION 0 /* not gcc, although it might pretend to be */
     41#elif defined(__GNUC__)
     42#define GNUC_MAJOR (__GNUC__ + 0)
     43#define GNUC_MINOR (__GNUC_MINOR__ + 0)
     44#define GNUC_PATCHLEVEL (__GNUC_PATCHLEVEL__ + 0)
     45#define GNUC_VERSION (GNUC_MAJOR * 10000 + GNUC_MINOR * 100 + GNUC_PATCHLEVEL)
     46#else
     47#define GNUC_VERSION 0 /* not gcc */
    2148#endif
    2249
    23 #ifdef PNG_READ_SUPPORTED
    24 
    25 /* Assembler NEON support - only works for 32-bit ARM (i.e. it does not work for
    26  * ARM64).  The code in arm/filter_neon_intrinsics.c supports ARM64, however it
    27  * only works if -mfpu=neon is specified on the GCC command line.  See pngpriv.h
    28  * for the logic which sets PNG_USE_ARM_NEON_ASM:
    29  */
    30 #if PNG_ARM_NEON_IMPLEMENTATION == 2 /* hand-coded assembler */
    31 
    32 #if PNG_ARM_NEON_OPT > 0
    33 
    34 #ifdef __ELF__
    35 #   define ELF
     50#if (GNUC_VERSION > 0) && (GNUC_VERSION < 40300)
     51#error "PNG_ARM_NEON is not supported with gcc versions earlier than 4.3.0"
     52#elif GNUC_VERSION == 40504
     53#error "PNG_ARM_NEON is not supported with gcc version 4.5.4"
    3654#else
    37 #   define ELF @
     55#error "Please use 'arm/*_neon_intrinsics.c' for PNG_ARM_NEON support"
    3856#endif
    3957
    40         .arch armv7-a
    41         .fpu  neon
    42 
    43 .macro  func    name, export=0
    44     .macro endfunc
    45 ELF     .size   \name, . - \name
    46         .endfunc
    47         .purgem endfunc
    48     .endm
    49         .text
    50 
    51         /* Explicitly specifying alignment here because some versions of
    52          * GAS don't align code correctly.  This is harmless in correctly
    53          * written versions of GAS.
    54          */
    55         .align 2
    56 
    57     .if \export
    58         .global \name
    59     .endif
    60 ELF     .type   \name, STT_FUNC
    61         .func   \name
    62 \name:
    63 .endm
    64 
    65 func    png_read_filter_row_sub4_neon, export=1
    66         ldr             r3,  [r0, #4]           @ rowbytes
    67         vmov.i8         d3,  #0
    68 1:
    69         vld4.32         {d4[],d5[],d6[],d7[]},    [r1,:128]
    70         vadd.u8         d0,  d3,  d4
    71         vadd.u8         d1,  d0,  d5
    72         vadd.u8         d2,  d1,  d6
    73         vadd.u8         d3,  d2,  d7
    74         vst4.32         {d0[0],d1[0],d2[0],d3[0]},[r1,:128]!
    75         subs            r3,  r3,  #16
    76         bgt             1b
    77 
    78         bx              lr
    79 endfunc
    80 
    81 func    png_read_filter_row_sub3_neon, export=1
    82         ldr             r3,  [r0, #4]           @ rowbytes
    83         vmov.i8         d3,  #0
    84         mov             r0,  r1
    85         mov             r2,  #3
    86         mov             r12, #12
    87         vld1.8          {q11},    [r0], r12
    88 1:
    89         vext.8          d5,  d22, d23, #3
    90         vadd.u8         d0,  d3,  d22
    91         vext.8          d6,  d22, d23, #6
    92         vadd.u8         d1,  d0,  d5
    93         vext.8          d7,  d23, d23, #1
    94         vld1.8          {q11},    [r0], r12
    95         vst1.32         {d0[0]},  [r1,:32], r2
    96         vadd.u8         d2,  d1,  d6
    97         vst1.32         {d1[0]},  [r1], r2
    98         vadd.u8         d3,  d2,  d7
    99         vst1.32         {d2[0]},  [r1], r2
    100         vst1.32         {d3[0]},  [r1], r2
    101         subs            r3,  r3,  #12
    102         bgt             1b
    103 
    104         bx              lr
    105 endfunc
    106 
    107 func    png_read_filter_row_up_neon, export=1
    108         ldr             r3,  [r0, #4]           @ rowbytes
    109 1:
    110         vld1.8          {q0}, [r1,:128]
    111         vld1.8          {q1}, [r2,:128]!
    112         vadd.u8         q0,  q0,  q1
    113         vst1.8          {q0}, [r1,:128]!
    114         subs            r3,  r3,  #16
    115         bgt             1b
    116 
    117         bx              lr
    118 endfunc
    119 
    120 func    png_read_filter_row_avg4_neon, export=1
    121         ldr             r12, [r0, #4]           @ rowbytes
    122         vmov.i8         d3,  #0
    123 1:
    124         vld4.32         {d4[],d5[],d6[],d7[]},    [r1,:128]
    125         vld4.32         {d16[],d17[],d18[],d19[]},[r2,:128]!
    126         vhadd.u8        d0,  d3,  d16
    127         vadd.u8         d0,  d0,  d4
    128         vhadd.u8        d1,  d0,  d17
    129         vadd.u8         d1,  d1,  d5
    130         vhadd.u8        d2,  d1,  d18
    131         vadd.u8         d2,  d2,  d6
    132         vhadd.u8        d3,  d2,  d19
    133         vadd.u8         d3,  d3,  d7
    134         vst4.32         {d0[0],d1[0],d2[0],d3[0]},[r1,:128]!
    135         subs            r12, r12, #16
    136         bgt             1b
    137 
    138         bx              lr
    139 endfunc
    140 
    141 func    png_read_filter_row_avg3_neon, export=1
    142         push            {r4,lr}
    143         ldr             r12, [r0, #4]           @ rowbytes
    144         vmov.i8         d3,  #0
    145         mov             r0,  r1
    146         mov             r4,  #3
    147         mov             lr,  #12
    148         vld1.8          {q11},    [r0], lr
    149 1:
    150         vld1.8          {q10},    [r2], lr
    151         vext.8          d5,  d22, d23, #3
    152         vhadd.u8        d0,  d3,  d20
    153         vext.8          d17, d20, d21, #3
    154         vadd.u8         d0,  d0,  d22
    155         vext.8          d6,  d22, d23, #6
    156         vhadd.u8        d1,  d0,  d17
    157         vext.8          d18, d20, d21, #6
    158         vadd.u8         d1,  d1,  d5
    159         vext.8          d7,  d23, d23, #1
    160         vld1.8          {q11},    [r0], lr
    161         vst1.32         {d0[0]},  [r1,:32], r4
    162         vhadd.u8        d2,  d1,  d18
    163         vst1.32         {d1[0]},  [r1], r4
    164         vext.8          d19, d21, d21, #1
    165         vadd.u8         d2,  d2,  d6
    166         vhadd.u8        d3,  d2,  d19
    167         vst1.32         {d2[0]},  [r1], r4
    168         vadd.u8         d3,  d3,  d7
    169         vst1.32         {d3[0]},  [r1], r4
    170         subs            r12, r12, #12
    171         bgt             1b
    172 
    173         pop             {r4,pc}
    174 endfunc
    175 
    176 .macro  paeth           rx,  ra,  rb,  rc
    177         vaddl.u8        q12, \ra, \rb           @ a + b
    178         vaddl.u8        q15, \rc, \rc           @ 2*c
    179         vabdl.u8        q13, \rb, \rc           @ pa
    180         vabdl.u8        q14, \ra, \rc           @ pb
    181         vabd.u16        q15, q12, q15           @ pc
    182         vcle.u16        q12, q13, q14           @ pa <= pb
    183         vcle.u16        q13, q13, q15           @ pa <= pc
    184         vcle.u16        q14, q14, q15           @ pb <= pc
    185         vand            q12, q12, q13           @ pa <= pb && pa <= pc
    186         vmovn.u16       d28, q14
    187         vmovn.u16       \rx, q12
    188         vbsl            d28, \rb, \rc
    189         vbsl            \rx, \ra, d28
    190 .endm
    191 
    192 func    png_read_filter_row_paeth4_neon, export=1
    193         ldr             r12, [r0, #4]           @ rowbytes
    194         vmov.i8         d3,  #0
    195         vmov.i8         d20, #0
    196 1:
    197         vld4.32         {d4[],d5[],d6[],d7[]},    [r1,:128]
    198         vld4.32         {d16[],d17[],d18[],d19[]},[r2,:128]!
    199         paeth           d0,  d3,  d16, d20
    200         vadd.u8         d0,  d0,  d4
    201         paeth           d1,  d0,  d17, d16
    202         vadd.u8         d1,  d1,  d5
    203         paeth           d2,  d1,  d18, d17
    204         vadd.u8         d2,  d2,  d6
    205         paeth           d3,  d2,  d19, d18
    206         vmov            d20, d19
    207         vadd.u8         d3,  d3,  d7
    208         vst4.32         {d0[0],d1[0],d2[0],d3[0]},[r1,:128]!
    209         subs            r12, r12, #16
    210         bgt             1b
    211 
    212         bx              lr
    213 endfunc
    214 
    215 func    png_read_filter_row_paeth3_neon, export=1
    216         push            {r4,lr}
    217         ldr             r12, [r0, #4]           @ rowbytes
    218         vmov.i8         d3,  #0
    219         vmov.i8         d4,  #0
    220         mov             r0,  r1
    221         mov             r4,  #3
    222         mov             lr,  #12
    223         vld1.8          {q11},    [r0], lr
    224 1:
    225         vld1.8          {q10},    [r2], lr
    226         paeth           d0,  d3,  d20, d4
    227         vext.8          d5,  d22, d23, #3
    228         vadd.u8         d0,  d0,  d22
    229         vext.8          d17, d20, d21, #3
    230         paeth           d1,  d0,  d17, d20
    231         vst1.32         {d0[0]},  [r1,:32], r4
    232         vext.8          d6,  d22, d23, #6
    233         vadd.u8         d1,  d1,  d5
    234         vext.8          d18, d20, d21, #6
    235         paeth           d2,  d1,  d18, d17
    236         vext.8          d7,  d23, d23, #1
    237         vld1.8          {q11},    [r0], lr
    238         vst1.32         {d1[0]},  [r1], r4
    239         vadd.u8         d2,  d2,  d6
    240         vext.8          d19, d21, d21, #1
    241         paeth           d3,  d2,  d19, d18
    242         vst1.32         {d2[0]},  [r1], r4
    243         vmov            d4,  d19
    244         vadd.u8         d3,  d3,  d7
    245         vst1.32         {d3[0]},  [r1], r4
    246         subs            r12, r12, #12
    247         bgt             1b
    248 
    249         pop             {r4,pc}
    250 endfunc
    25158#endif /* PNG_ARM_NEON_OPT > 0 */
    252 #endif /* PNG_ARM_NEON_IMPLEMENTATION == 2 (assembler) */
     59#endif /* PNG_ARM_NEON_IMPLEMENTATION == 2 */
    25360#endif /* READ */

  • trunk/src/libs/libpng-1.6.45/arm/filter_neon_intrinsics.c

    r103316 r107813  
    1 
    21/* filter_neon_intrinsics.c - NEON optimised filter functions
    32 *

  • trunk/src/libs/libpng-1.6.45/arm/palette_neon_intrinsics.c

    r103316 r107813  
    1 
    21/* palette_neon_intrinsics.c - NEON optimised palette expansion functions
    32 *
    … …  
    6564   png_uint_32 row_width = row_info->width;
    6665   const png_uint_32 *riffled_palette =
    67       (const png_uint_32 *)png_ptr->riffled_palette;
     66      png_aligncastconst(png_const_uint_32p, png_ptr->riffled_palette);
    6867   const png_uint_32 pixels_per_chunk = 4;
    6968   png_uint_32 i;

  • trunk/src/libs/libpng-1.6.45/compile

    r103316 r107813  
    22# Wrapper for compilers which do not understand '-c -o'.
    33
    4 scriptversion=2018-03-07.03; # UTC
    5 
    6 # Copyright (C) 1999-2021 Free Software Foundation, Inc.
     4scriptversion=2024-06-19.01; # UTC
     5
     6# Copyright (C) 1999-2024 Free Software Foundation, Inc.
    77# Written by Tom Tromey <[email protected]>.
    88#
    … …  
    144144          eat=1
    145145          case $2 in
    146             *.o | *.[oO][bB][jJ])
     146            *.o | *.lo | *.[oO][bB][jJ])
    147147              func_file_conv "$2"
    148148              set x "$@" -Fo"$file"
    … …  
    249249
    250250Report bugs to <[email protected]>.
     251GNU Automake home page: <https://www.gnu.org/software/automake/>.
     252General help using GNU software: <https://www.gnu.org/gethelp/>.
    251253EOF
    252254    exit $?
    253255    ;;
    254256  -v | --v*)
    255     echo "compile $scriptversion"
     257    echo "compile (GNU Automake) $scriptversion"
    256258    exit $?
    257259    ;;
    258260  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
     261  clang-cl | *[/\\]clang-cl | clang-cl.exe | *[/\\]clang-cl.exe | \
    259262  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
    260263    func_cl_wrapper "$@"      # Doesn't return...

  • trunk/src/libs/libpng-1.6.45/config.guess

    r103316 r107813  
    11#! /bin/sh
    22# Attempt to guess a canonical system name.
    3 #   Copyright 1992-2023 Free Software Foundation, Inc.
     3#   Copyright 1992-2024 Free Software Foundation, Inc.
    44
    55# shellcheck disable=SC2006,SC2268 # see below for rationale
    66
    7 timestamp='2023-08-22'
     7timestamp='2024-01-01'
    88
    99# This file is free software; you can redistribute it and/or modify it
    … …  
    6161
    6262Originally written by Per Bothner.
    63 Copyright 1992-2023 Free Software Foundation, Inc.
     63Copyright 1992-2024 Free Software Foundation, Inc.
    6464
    6565This is free software; see the source for copying conditions.  There is NO
    … …  
    166166        #elif defined(__GLIBC__)
    167167        LIBC=gnu
     168        #elif defined(__LLVM_LIBC__)
     169        LIBC=llvm
    168170        #else
    169171        #include <stdarg.h>
    … …  
    15941596        GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE
    15951597        ;;
     1598    *:Ironclad:*:*)
     1599        GUESS=$UNAME_MACHINE-unknown-ironclad
     1600        ;;
    15961601esac
    15971602

  • trunk/src/libs/libpng-1.6.45/config.sub

    r103316 r107813  
    11#! /bin/sh
    22# Configuration validation subroutine script.
    3 #   Copyright 1992-2023 Free Software Foundation, Inc.
     3#   Copyright 1992-2024 Free Software Foundation, Inc.
    44
    55# shellcheck disable=SC2006,SC2268 # see below for rationale
    66
    7 timestamp='2023-09-19'
     7timestamp='2024-01-01'
    88
    99# This file is free software; you can redistribute it and/or modify it
    … …  
    7777GNU config.sub ($timestamp)
    7878
    79 Copyright 1992-2023 Free Software Foundation, Inc.
     79Copyright 1992-2024 Free Software Foundation, Inc.
    8080
    8181This is free software; see the source for copying conditions.  There is NO
    … …  
    12231223                        | mt \
    12241224                        | msp430 \
     1225                        | nanomips* \
    12251226                        | nds32 | nds32le | nds32be \
    12261227                        | nfp \
    … …  
    12541255                        | v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
    12551256                        | vax \
     1257                        | vc4 \
    12561258                        | visium \
    12571259                        | w65 \
    … …  
    15981600                obj=elf
    15991601                ;;
    1600         mips*-*)
     1602        mips*-*|nanomips*-*)
    16011603                os=
    16021604                obj=elf
    … …  
    17221724case $os in
    17231725        # Sometimes we do "kernel-libc", so those need to count as OSes.
    1724         musl* | newlib* | relibc* | uclibc*)
     1726        llvm* | musl* | newlib* | relibc* | uclibc*)
    17251727                ;;
    17261728        # Likewise for "kernel-abi"
    … …  
    17671769             | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
    17681770             | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
    1769              | fiwix* | mlibc* | cos* | mbr* )
     1771             | fiwix* | mlibc* | cos* | mbr* | ironclad* )
    17701772                ;;
    17711773        # This one is extra strict with allowed versions
    17721774        sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
    17731775                # Don't forget version if it is 3.2v4 or newer.
     1776                ;;
     1777        # This refers to builds using the UEFI calling convention
     1778        # (which depends on the architecture) and PE file format.
     1779        # Note that this is both a different calling convention and
     1780        # different file format than that of GNU-EFI
     1781        # (x86_64-w64-mingw32).
     1782        uefi)
    17741783                ;;
    17751784        none)
    … …  
    18191828# (given a valid OS), if there is a kernel.
    18201829case $kernel-$os-$obj in
    1821         linux-gnu*- | linux-dietlibc*- | linux-android*- | linux-newlib*- \
    1822                    | linux-musl*- | linux-relibc*- | linux-uclibc*- | linux-mlibc*- )
     1830        linux-gnu*- | linux-android*- | linux-dietlibc*- | linux-llvm*- \
     1831                    | linux-mlibc*- | linux-musl*- | linux-newlib*- \
     1832                    | linux-relibc*- | linux-uclibc*- )
    18231833                ;;
    18241834        uclinux-uclibc*- )
    … …  
    18281838        windows*-msvc*-)
    18291839                ;;
    1830         -dietlibc*- | -newlib*- | -musl*- | -relibc*- | -uclibc*- | -mlibc*- )
     1840        -dietlibc*- | -llvm*- | -mlibc*- | -musl*- | -newlib*- | -relibc*- \
     1841                    | -uclibc*- )
    18311842                # These are just libc implementations, not actual OSes, and thus
    18321843                # require a kernel.

  • trunk/src/libs/libpng-1.6.45/configure

    r105469 r107813  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.72 for libpng 1.6.43.
     3# Generated by GNU Autoconf 2.72 for libpng 1.6.45.
    44#
    55# Report bugs to <[email protected]>.
    … …  
    615615PACKAGE_NAME='libpng'
    616616PACKAGE_TARNAME='libpng'
    617 PACKAGE_VERSION='1.6.43'
    618 PACKAGE_STRING='libpng 1.6.43'
     617PACKAGE_VERSION='1.6.45'
     618PACKAGE_STRING='libpng 1.6.45'
    619619PACKAGE_BUGREPORT='[email protected]'
    620620PACKAGE_URL=''
    … …  
    754754MAINTAINER_MODE_FALSE
    755755MAINTAINER_MODE_TRUE
     756am__xargs_n
     757am__rm_f_notfound
    756758AM_BACKSLASH
    757759AM_DEFAULT_VERBOSITY
    … …  
    833835enable_shared
    834836enable_static
     837enable_pic
    835838with_pic
    836839enable_fast_install
     840enable_aix_soname
    837841with_aix_soname
    838842with_sysroot
    … …  
    14181422  # This message is too long to be a string in the A/UX 3.1 sh.
    14191423  cat <<_ACEOF
    1420 'configure' configures libpng 1.6.43 to adapt to many kinds of systems.
     1424'configure' configures libpng 1.6.45 to adapt to many kinds of systems.
    14211425
    14221426Usage: $0 [OPTION]... [VAR=VALUE]...
    … …  
    14891493if test -n "$ac_init_help"; then
    14901494  case $ac_init_help in
    1491      short | recursive ) echo "Configuration of libpng 1.6.43:";;
     1495     short | recursive ) echo "Configuration of libpng 1.6.45:";;
    14921496   esac
    14931497  cat <<\_ACEOF
    … …  
    15081512  --enable-shared[=PKGS]  build shared libraries [default=yes]
    15091513  --enable-static[=PKGS]  build static libraries [default=yes]
     1514  --enable-pic[=PKGS]     try to use only PIC/non-PIC objects [default=use
     1515                          both]
    15101516  --enable-fast-install[=PKGS]
    15111517                          optimize for fast installation [default=yes]
     1518  --enable-aix-soname=aix|svr4|both
     1519                          shared library versioning (aka "SONAME") variant to
     1520                          provide on AIX, [default=aix].
    15121521  --disable-libtool-lock  avoid locking (might break parallel builds)
    15131522  --disable-tests         do not build the test programs (default is to build)
    … …  
    15871596  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
    15881597  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
    1589   --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
    1590                           both]
    1591   --with-aix-soname=aix|svr4|both
    1592                           shared library versioning (aka "SONAME") variant to
    1593                           provide on AIX, [default=aix].
    15941598  --with-sysroot[=DIR]    Search for dependent libraries within DIR (or the
    15951599                          compiler's sysroot if not specified).
    … …  
    16861690if $ac_init_version; then
    16871691  cat <<\_ACEOF
    1688 libpng configure 1.6.43
     1692libpng configure 1.6.45
    16891693generated by GNU Autoconf 2.72
    16901694
    … …  
    19491953running configure, to aid debugging if configure makes a mistake.
    19501954
    1951 It was created by libpng $as_me 1.6.43, which was
     1955It was created by libpng $as_me 1.6.45, which was
    19521956generated by GNU Autoconf 2.72.  Invocation command line was
    19531957
    … …  
    27302734# 1.12.2 fixes a security issue in 1.11.2 and 1.12.1
    27312735# 1.13 is required for parallel tests
    2732 am__api_version='1.16'
     2736am__api_version='1.17'
    27332737
    27342738
    … …  
    28332837test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
    28342838
     2839{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether sleep supports fractional seconds" >&5
     2840printf %s "checking whether sleep supports fractional seconds... " >&6; }
     2841if test ${am_cv_sleep_fractional_seconds+y}
     2842then :
     2843  printf %s "(cached) " >&6
     2844else case e in #(
     2845  e) if sleep 0.001 2>/dev/null
     2846then :
     2847  am_cv_sleep_fractional_seconds=yes
     2848else case e in #(
     2849  e) am_cv_sleep_fractional_seconds=no ;;
     2850esac
     2851fi
     2852 ;;
     2853esac
     2854fi
     2855{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_sleep_fractional_seconds" >&5
     2856printf "%s\n" "$am_cv_sleep_fractional_seconds" >&6; }
     2857
     2858{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking filesystem timestamp resolution" >&5
     2859printf %s "checking filesystem timestamp resolution... " >&6; }
     2860if test ${am_cv_filesystem_timestamp_resolution+y}
     2861then :
     2862  printf %s "(cached) " >&6
     2863else case e in #(
     2864  e) # Default to the worst case.
     2865am_cv_filesystem_timestamp_resolution=2
     2866
     2867# Only try to go finer than 1 sec if sleep can do it.
     2868# Don't try 1 sec, because if 0.01 sec and 0.1 sec don't work,
     2869# - 1 sec is not much of a win compared to 2 sec, and
     2870# - it takes 2 seconds to perform the test whether 1 sec works.
     2871#
     2872# Instead, just use the default 2s on platforms that have 1s resolution,
     2873# accept the extra 1s delay when using $sleep in the Automake tests, in
     2874# exchange for not incurring the 2s delay for running the test for all
     2875# packages.
     2876#
     2877am_try_resolutions=
     2878if test "$am_cv_sleep_fractional_seconds" = yes; then
     2879  # Even a millisecond often causes a bunch of false positives,
     2880  # so just try a hundredth of a second. The time saved between .001 and
     2881  # .01 is not terribly consequential.
     2882  am_try_resolutions="0.01 0.1 $am_try_resolutions"
     2883fi
     2884
     2885# In order to catch current-generation FAT out, we must *modify* files
     2886# that already exist; the *creation* timestamp is finer.  Use names
     2887# that make ls -t sort them differently when they have equal
     2888# timestamps than when they have distinct timestamps, keeping
     2889# in mind that ls -t prints the *newest* file first.
     2890rm -f conftest.ts?
     2891: > conftest.ts1
     2892: > conftest.ts2
     2893: > conftest.ts3
     2894
     2895# Make sure ls -t actually works.  Do 'set' in a subshell so we don't
     2896# clobber the current shell's arguments. (Outer-level square brackets
     2897# are removed by m4; they're present so that m4 does not expand
     2898# <dollar><star>; be careful, easy to get confused.)
     2899if (
     2900     set X `ls -t conftest.ts[12]` &&
     2901     {
     2902       test "$*" != "X conftest.ts1 conftest.ts2" ||
     2903       test "$*" != "X conftest.ts2 conftest.ts1";
     2904     }
     2905); then :; else
     2906  # If neither matched, then we have a broken ls.  This can happen
     2907  # if, for instance, CONFIG_SHELL is bash and it inherits a
     2908  # broken ls alias from the environment.  This has actually
     2909  # happened.  Such a system could not be considered "sane".
     2910  printf "%s\n" ""Bad output from ls -t: \"`ls -t conftest.ts[12]`\""" >&5
     2911  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
     2912printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
     2913as_fn_error $? "ls -t produces unexpected output.
     2914Make sure there is not a broken ls alias in your environment.
     2915See 'config.log' for more details" "$LINENO" 5; }
     2916fi
     2917
     2918for am_try_res in $am_try_resolutions; do
     2919  # Any one fine-grained sleep might happen to cross the boundary
     2920  # between two values of a coarser actual resolution, but if we do
     2921  # two fine-grained sleeps in a row, at least one of them will fall
     2922  # entirely within a coarse interval.
     2923  echo alpha > conftest.ts1
     2924  sleep $am_try_res
     2925  echo beta > conftest.ts2
     2926  sleep $am_try_res
     2927  echo gamma > conftest.ts3
     2928
     2929  # We assume that 'ls -t' will make use of high-resolution
     2930  # timestamps if the operating system supports them at all.
     2931  if (set X `ls -t conftest.ts?` &&
     2932      test "$2" = conftest.ts3 &&
     2933      test "$3" = conftest.ts2 &&
     2934      test "$4" = conftest.ts1); then
     2935    #
     2936    # Ok, ls -t worked. If we're at a resolution of 1 second, we're done,
     2937    # because we don't need to test make.
     2938    make_ok=true
     2939    if test $am_try_res != 1; then
     2940      # But if we've succeeded so far with a subsecond resolution, we
     2941      # have one more thing to check: make. It can happen that
     2942      # everything else supports the subsecond mtimes, but make doesn't;
     2943      # notably on macOS, which ships make 3.81 from 2006 (the last one
     2944      # released under GPLv2). https://bugs.gnu.org/68808
     2945      #
     2946      # We test $MAKE if it is defined in the environment, else "make".
     2947      # It might get overridden later, but our hope is that in practice
     2948      # it does not matter: it is the system "make" which is (by far)
     2949      # the most likely to be broken, whereas if the user overrides it,
     2950      # probably they did so with a better, or at least not worse, make.
     2951      # https://lists.gnu.org/archive/html/automake/2024-06/msg00051.html
     2952      #
     2953      # Create a Makefile (real tab character here):
     2954      rm -f conftest.mk
     2955      echo 'conftest.ts1: conftest.ts2' >conftest.mk
     2956      echo '    touch conftest.ts2' >>conftest.mk
     2957      #
     2958      # Now, running
     2959      #   touch conftest.ts1; touch conftest.ts2; make
     2960      # should touch ts1 because ts2 is newer. This could happen by luck,
     2961      # but most often, it will fail if make's support is insufficient. So
     2962      # test for several consecutive successes.
     2963      #
     2964      # (We reuse conftest.ts[12] because we still want to modify existing
     2965      # files, not create new ones, per above.)
     2966      n=0
     2967      make=${MAKE-make}
     2968      until test $n -eq 3; do
     2969        echo one > conftest.ts1
     2970        sleep $am_try_res
     2971        echo two > conftest.ts2 # ts2 should now be newer than ts1
     2972        if $make -f conftest.mk | grep 'up to date' >/dev/null; then
     2973          make_ok=false
     2974          break # out of $n loop
     2975        fi
     2976        n=`expr $n + 1`
     2977      done
     2978    fi
     2979    #
     2980    if $make_ok; then
     2981      # Everything we know to check worked out, so call this resolution good.
     2982      am_cv_filesystem_timestamp_resolution=$am_try_res
     2983      break # out of $am_try_res loop
     2984    fi
     2985    # Otherwise, we'll go on to check the next resolution.
     2986  fi
     2987done
     2988rm -f conftest.ts?
     2989# (end _am_filesystem_timestamp_resolution)
     2990 ;;
     2991esac
     2992fi
     2993{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_filesystem_timestamp_resolution" >&5
     2994printf "%s\n" "$am_cv_filesystem_timestamp_resolution" >&6; }
     2995
     2996# This check should not be cached, as it may vary across builds of
     2997# different projects.
    28352998{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
    28362999printf %s "checking whether build environment is sane... " >&6; }
    … …  
    28533016# (eg FreeBSD returns the mod time of the symlink's containing
    28543017# directory).
    2855 if (
    2856    am_has_slept=no
    2857    for am_try in 1 2; do
    2858      echo "timestamp, slept: $am_has_slept" > conftest.file
    2859      set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
    2860      if test "$*" = "X"; then
    2861         # -L didn't work.
    2862         set X `ls -t "$srcdir/configure" conftest.file`
    2863      fi
    2864      if test "$*" != "X $srcdir/configure conftest.file" \
    2865         && test "$*" != "X conftest.file $srcdir/configure"; then
    2866 
    2867         # If neither matched, then we have a broken ls.  This can happen
    2868         # if, for instance, CONFIG_SHELL is bash and it inherits a
    2869         # broken ls alias from the environment.  This has actually
    2870         # happened.  Such a system could not be considered "sane".
    2871         as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
    2872   alias in your environment" "$LINENO" 5
    2873      fi
    2874      if test "$2" = conftest.file || test $am_try -eq 2; then
    2875        break
    2876      fi
    2877      # Just in case.
    2878      sleep 1
    2879      am_has_slept=yes
    2880    done
    2881    test "$2" = conftest.file
    2882    )
    2883 then
    2884    # Ok.
    2885    :
    2886 else
    2887    as_fn_error $? "newly created file is older than distributed files!
     3018am_build_env_is_sane=no
     3019am_has_slept=no
     3020rm -f conftest.file
     3021for am_try in 1 2; do
     3022  echo "timestamp, slept: $am_has_slept" > conftest.file
     3023  if (
     3024    set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
     3025    if test "$*" = "X"; then
     3026      # -L didn't work.
     3027      set X `ls -t "$srcdir/configure" conftest.file`
     3028    fi
     3029    test "$2" = conftest.file
     3030  ); then
     3031    am_build_env_is_sane=yes
     3032    break
     3033  fi
     3034  # Just in case.
     3035  sleep "$am_cv_filesystem_timestamp_resolution"
     3036  am_has_slept=yes
     3037done
     3038
     3039{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_build_env_is_sane" >&5
     3040printf "%s\n" "$am_build_env_is_sane" >&6; }
     3041if test "$am_build_env_is_sane" = no; then
     3042  as_fn_error $? "newly created file is older than distributed files!
    28883043Check your system clock" "$LINENO" 5
    28893044fi
    2890 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
    2891 printf "%s\n" "yes" >&6; }
     3045
    28923046# If we didn't sleep, we still need to ensure time stamps of config.status and
    28933047# generated files are strictly newer.
    28943048am_sleep_pid=
    2895 if grep 'slept: no' conftest.file >/dev/null 2>&1; then
    2896   ( sleep 1 ) &
     3049if test -e conftest.file || grep 'slept: no' conftest.file >/dev/null 2>&1
     3050then :
     3051
     3052else case e in #(
     3053  e)   ( sleep "$am_cv_filesystem_timestamp_resolution" ) &
    28973054  am_sleep_pid=$!
     3055 ;;
     3056esac
    28983057fi
    28993058
    … …  
    31853344rmdir .tst 2>/dev/null
    31863345
     3346AM_DEFAULT_VERBOSITY=1
    31873347# Check whether --enable-silent-rules was given.
    31883348if test ${enable_silent_rules+y}
    … …  
    31913351fi
    31923352
    3193 case $enable_silent_rules in # (((
    3194   yes) AM_DEFAULT_VERBOSITY=0;;
    3195    no) AM_DEFAULT_VERBOSITY=1;;
    3196     *) AM_DEFAULT_VERBOSITY=1;;
    3197 esac
    31983353am_make=${MAKE-make}
    31993354{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
    … …  
    32183373{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
    32193374printf "%s\n" "$am_cv_make_support_nested_variables" >&6; }
    3220 if test $am_cv_make_support_nested_variables = yes; then
    3221     AM_V='$(V)'
    3222   AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
    3223 else
    3224   AM_V=$AM_DEFAULT_VERBOSITY
    3225   AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
    3226 fi
    32273375AM_BACKSLASH='\'
     3376
     3377am__rm_f_notfound=
     3378if (rm -f && rm -fr && rm -rf) 2>/dev/null
     3379then :
     3380
     3381else case e in #(
     3382  e) am__rm_f_notfound='""' ;;
     3383esac
     3384fi
     3385
     3386
     3387{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking xargs -n works" >&5
     3388printf %s "checking xargs -n works... " >&6; }
     3389if test ${am_cv_xargs_n_works+y}
     3390then :
     3391  printf %s "(cached) " >&6
     3392else case e in #(
     3393  e) if test "`echo 1 2 3 | xargs -n2 echo`" = "1 2
     33943"
     3395then :
     3396  am_cv_xargs_n_works=yes
     3397else case e in #(
     3398  e) am_cv_xargs_n_works=no ;;
     3399esac
     3400fi ;;
     3401esac
     3402fi
     3403{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_xargs_n_works" >&5
     3404printf "%s\n" "$am_cv_xargs_n_works" >&6; }
     3405if test "$am_cv_xargs_n_works" = yes
     3406then :
     3407  am__xargs_n='xargs -n'
     3408else case e in #(
     3409  e)   am__xargs_n='am__xargs_n () { shift; sed "s/ /\\n/g" | while read am__xargs_n_arg; do "" "$am__xargs_n_arg"; done; }'
     3410 ;;
     3411esac
     3412fi
    32283413
    32293414if test "`cd $srcdir && pwd`" != "`pwd`"; then
    … …  
    32493434# Define the identity of the package.
    32503435 PACKAGE='libpng'
    3251  VERSION='1.6.43'
     3436 VERSION='1.6.45'
    32523437
    32533438
    … …  
    33103495
    33113496
    3312 # POSIX will say in a future version that running "rm -f" with no argument
    3313 # is OK; and we want to be able to make that assumption in our Makefile
    3314 # recipes.  So use an aggressive probe to check that the usage we want is
    3315 # actually supported "in the wild" to an acceptable degree.
    3316 # See automake bug#10828.
    3317 # To make any issue more visible, cause the running configure to be aborted
    3318 # by default if the 'rm' program in use doesn't match our expectations; the
    3319 # user can still override this though.
    3320 if rm -f && rm -fr && rm -rf; then : OK; else
    3321   cat >&2 <<'END'
    3322 Oops!
    3323 
    3324 Your 'rm' program seems unable to run without file operands specified
    3325 on the command line, even when the '-f' option is present.  This is contrary
    3326 to the behaviour of most rm programs out there, and not conforming with
    3327 the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
    3328 
    3329 Please tell [email protected] about your system, including the value
    3330 of your $PATH and any error possibly output before this message.  This
    3331 can help us improve future automake versions.
    3332 
    3333 END
    3334   if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
    3335     echo 'Configuration will proceed anyway, since you have set the' >&2
    3336     echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
    3337     echo >&2
    3338   else
    3339     cat >&2 <<'END'
    3340 Aborting the configuration process, to ensure you take notice of the issue.
    3341 
    3342 You can download and install GNU coreutils to get an 'rm' implementation
    3343 that behaves properly: <https://www.gnu.org/software/coreutils/>.
    3344 
    3345 If you want to complete the configuration process using your problematic
    3346 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
    3347 to "yes", and re-run configure.
    3348 
    3349 END
    3350     as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
    3351   fi
    3352 fi
     3497
     3498
     3499
    33533500
    33543501# The following line causes --disable-maintainer-mode to be the default to
    … …  
    33823529
    33833530
    3384 PNGLIB_VERSION=1.6.43
     3531PNGLIB_VERSION=1.6.45
    33853532PNGLIB_MAJOR=1
    33863533PNGLIB_MINOR=6
    3387 PNGLIB_RELEASE=43
     3534PNGLIB_RELEASE=45
    33883535
    33893536
    … …  
    33923539
    33933540
    3394 # Check for basic programs.
     3541# Check the basic programs.
    33953542ac_ext=c
    33963543ac_cpp='$CPP $CPPFLAGS'
    … …  
    46454792      # or remarks (even with -Werror).  So we grep stderr for any message
    46464793      # that says an option was ignored or not supported.
    4647       # When given -MP, icc 7.0 and 7.1 complain thusly:
     4794      # When given -MP, icc 7.0 and 7.1 complain thus:
    46484795      #   icc: Command line warning: ignoring option '-M'; no argument required
    46494796      # The diagnosis changed in icc 8.0:
    … …  
    47804927      # or remarks (even with -Werror).  So we grep stderr for any message
    47814928      # that says an option was ignored or not supported.
    4782       # When given -MP, icc 7.0 and 7.1 complain thusly:
     4929      # When given -MP, icc 7.0 and 7.1 complain thus:
    47834930      #   icc: Command line warning: ignoring option '-M'; no argument required
    47844931      # The diagnosis changed in icc 8.0:
    … …  
    52925439printf %s "checking for ld used by $CC... " >&6; }
    52935440  case $host in
    5294   *-*-mingw*)
     5441  *-*-mingw* | *-*-windows*)
    52955442    # gcc leaves a trailing carriage return, which upsets mingw
    52965443    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
    … …  
    56345781
    56355782
    5636 macro_version='2.4.7'
    5637 macro_revision='2.4.7'
     5783macro_version='2.5.4'
     5784macro_revision='2.5.4'
    56385785
    56395786
    … …  
    56965843        # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
    56975844        case $build_os in
    5698         mingw*) lt_bad_file=conftest.nm/nofile ;;
     5845        mingw* | windows*) lt_bad_file=conftest.nm/nofile ;;
    56995846        *) lt_bad_file=/dev/null ;;
    57005847        esac
    … …  
    59116058    ;;
    59126059
    5913   gnu*)
    5914     # Under GNU Hurd, this test is not required because there is
    5915     # no limit to the length of command line arguments.
     6060  gnu* | ironclad*)
     6061    # Under GNU Hurd and Ironclad, this test is not required because there
     6062    # is no limit to the length of command line arguments.
    59166063    # Libtool will interpret -1 as no limit whatsoever
    59176064    lt_cv_sys_max_cmd_len=-1;
    59186065    ;;
    59196066
    5920   cygwin* | mingw* | cegcc*)
     6067  cygwin* | mingw* | windows* | cegcc*)
    59216068    # On Win9x/ME, this test blows up -- it succeeds, but takes
    59226069    # about 5 minutes as the teststring grows exponentially.
    … …  
    59406087    ;;
    59416088
    5942   bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*)
     6089  darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*)
    59436090    # This has been around since 386BSD, at least.  Likely further.
    59446091    if test -x /sbin/sysctl; then
    … …  
    60836230  *-*-mingw* )
    60846231    case $build in
    6085       *-*-mingw* ) # actually msys
     6232      *-*-mingw* | *-*-windows* ) # actually msys
    60866233        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
    60876234        ;;
    … …  
    60966243  *-*-cygwin* )
    60976244    case $build in
    6098       *-*-mingw* ) # actually msys
     6245      *-*-mingw* | *-*-windows* ) # actually msys
    60996246        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
    61006247        ;;
    … …  
    61326279lt_cv_to_tool_file_cmd=func_convert_file_noop
    61336280case $host in
    6134   *-*-mingw* )
     6281  *-*-mingw* | *-*-windows* )
    61356282    case $build in
    6136       *-*-mingw* ) # actually msys
     6283      *-*-mingw* | *-*-windows* ) # actually msys
    61376284        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
    61386285        ;;
    … …  
    61706317reload_cmds='$LD$reload_flag -o $output$reload_objs'
    61716318case $host_os in
    6172   cygwin* | mingw* | pw32* | cegcc*)
     6319  cygwin* | mingw* | windows* | pw32* | cegcc*)
    61736320    if test yes != "$GCC"; then
    61746321      reload_cmds=false
    … …  
    61926339
    61936340
    6194 if test -n "$ac_tool_prefix"; then
    6195   # Extract the first word of "${ac_tool_prefix}file", so it can be a program name with args.
    6196 set dummy ${ac_tool_prefix}file; ac_word=$2
     6341# Extract the first word of "file", so it can be a program name with args.
     6342set dummy file; ac_word=$2
    61976343{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    61986344printf %s "checking for $ac_word... " >&6; }
    … …  
    62156361    for ac_exec_ext in '' $ac_executable_extensions; do
    62166362  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
    6217     ac_cv_prog_FILECMD="${ac_tool_prefix}file"
     6363    ac_cv_prog_FILECMD="file"
    62186364    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
    62196365    break 2
    … …  
    62236369IFS=$as_save_IFS
    62246370
     6371  test -z "$ac_cv_prog_FILECMD" && ac_cv_prog_FILECMD=":"
    62256372fi ;;
    62266373esac
    … …  
    62356382fi
    62366383
    6237 
    6238 fi
    6239 if test -z "$ac_cv_prog_FILECMD"; then
    6240   ac_ct_FILECMD=$FILECMD
    6241   # Extract the first word of "file", so it can be a program name with args.
    6242 set dummy file; ac_word=$2
    6243 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    6244 printf %s "checking for $ac_word... " >&6; }
    6245 if test ${ac_cv_prog_ac_ct_FILECMD+y}
    6246 then :
    6247   printf %s "(cached) " >&6
    6248 else case e in #(
    6249   e) if test -n "$ac_ct_FILECMD"; then
    6250   ac_cv_prog_ac_ct_FILECMD="$ac_ct_FILECMD" # Let the user override the test.
    6251 else
    6252 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    6253 for as_dir in $PATH
    6254 do
    6255   IFS=$as_save_IFS
    6256   case $as_dir in #(((
    6257     '') as_dir=./ ;;
    6258     */) ;;
    6259     *) as_dir=$as_dir/ ;;
    6260   esac
    6261     for ac_exec_ext in '' $ac_executable_extensions; do
    6262   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
    6263     ac_cv_prog_ac_ct_FILECMD="file"
    6264     printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
    6265     break 2
    6266   fi
    6267 done
    6268   done
    6269 IFS=$as_save_IFS
    6270 
    6271 fi ;;
    6272 esac
    6273 fi
    6274 ac_ct_FILECMD=$ac_cv_prog_ac_ct_FILECMD
    6275 if test -n "$ac_ct_FILECMD"; then
    6276   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FILECMD" >&5
    6277 printf "%s\n" "$ac_ct_FILECMD" >&6; }
    6278 else
    6279   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
    6280 printf "%s\n" "no" >&6; }
    6281 fi
    6282 
    6283   if test "x$ac_ct_FILECMD" = x; then
    6284     FILECMD=":"
    6285   else
    6286     case $cross_compiling:$ac_tool_warned in
    6287 yes:)
    6288 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
    6289 printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
    6290 ac_tool_warned=yes ;;
    6291 esac
    6292     FILECMD=$ac_ct_FILECMD
    6293   fi
    6294 else
    6295   FILECMD="$ac_cv_prog_FILECMD"
    6296 fi
    62976384
    62986385
    … …  
    64276514# 'unknown' -- same as none, but documents that we really don't know.
    64286515# 'pass_all' -- all dependencies passed with no checks.
    6429 # 'test_compile' -- check by making test program.
    64306516# 'file_magic [[regex]]' -- check by looking for files in library path
    64316517# that responds to the $file_magic_cmd with a given extended regex.
    … …  
    64546540  ;;
    64556541
    6456 mingw* | pw32*)
     6542mingw* | windows* | pw32*)
    64576543  # Base MSYS/MinGW do not provide the 'file' command needed by
    64586544  # func_win32_libid shell function, so use a weaker test based on 'objdump',
    … …  
    64636549  else
    64646550    # Keep this pattern in sync with the one in func_win32_libid.
    6465     lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
     6551    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64|pe-aarch64)'
    64666552    lt_cv_file_magic_cmd='$OBJDUMP -f'
    64676553  fi
    … …  
    65366622  ;;
    65376623
    6538 netbsd*)
     6624*-mlibc)
     6625  lt_cv_deplibs_check_method=pass_all
     6626  ;;
     6627
     6628netbsd* | netbsdelf*-gnu)
    65396629  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
    65406630    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
    … …  
    65546644  ;;
    65556645
    6556 openbsd* | bitrig*)
     6646openbsd*)
    65576647  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
    65586648    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
    … …  
    65676657
    65686658rdos*)
     6659  lt_cv_deplibs_check_method=pass_all
     6660  ;;
     6661
     6662serenity*)
    65696663  lt_cv_deplibs_check_method=pass_all
    65706664  ;;
    … …  
    66226716if test "$build" = "$host"; then
    66236717  case $host_os in
    6624   mingw* | pw32*)
     6718  mingw* | windows* | pw32*)
    66256719    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
    66266720      want_nocaseglob=yes
    … …  
    67786872
    67796873case $host_os in
    6780 cygwin* | mingw* | pw32* | cegcc*)
     6874cygwin* | mingw* | windows* | pw32* | cegcc*)
    67816875  # two different shell functions defined in ltmain.sh;
    67826876  # decide which one to use based on capabilities of $DLLTOOL
    … …  
    68096903
    68106904
     6905
     6906if test -n "$ac_tool_prefix"; then
     6907  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
     6908set dummy ${ac_tool_prefix}ranlib; ac_word=$2
     6909{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     6910printf %s "checking for $ac_word... " >&6; }
     6911if test ${ac_cv_prog_RANLIB+y}
     6912then :
     6913  printf %s "(cached) " >&6
     6914else case e in #(
     6915  e) if test -n "$RANLIB"; then
     6916  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
     6917else
     6918as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     6919for as_dir in $PATH
     6920do
     6921  IFS=$as_save_IFS
     6922  case $as_dir in #(((
     6923    '') as_dir=./ ;;
     6924    */) ;;
     6925    *) as_dir=$as_dir/ ;;
     6926  esac
     6927    for ac_exec_ext in '' $ac_executable_extensions; do
     6928  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     6929    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     6930    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     6931    break 2
     6932  fi
     6933done
     6934  done
     6935IFS=$as_save_IFS
     6936
     6937fi ;;
     6938esac
     6939fi
     6940RANLIB=$ac_cv_prog_RANLIB
     6941if test -n "$RANLIB"; then
     6942  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
     6943printf "%s\n" "$RANLIB" >&6; }
     6944else
     6945  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
     6946printf "%s\n" "no" >&6; }
     6947fi
     6948
     6949
     6950fi
     6951if test -z "$ac_cv_prog_RANLIB"; then
     6952  ac_ct_RANLIB=$RANLIB
     6953  # Extract the first word of "ranlib", so it can be a program name with args.
     6954set dummy ranlib; ac_word=$2
     6955{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     6956printf %s "checking for $ac_word... " >&6; }
     6957if test ${ac_cv_prog_ac_ct_RANLIB+y}
     6958then :
     6959  printf %s "(cached) " >&6
     6960else case e in #(
     6961  e) if test -n "$ac_ct_RANLIB"; then
     6962  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
     6963else
     6964as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     6965for as_dir in $PATH
     6966do
     6967  IFS=$as_save_IFS
     6968  case $as_dir in #(((
     6969    '') as_dir=./ ;;
     6970    */) ;;
     6971    *) as_dir=$as_dir/ ;;
     6972  esac
     6973    for ac_exec_ext in '' $ac_executable_extensions; do
     6974  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     6975    ac_cv_prog_ac_ct_RANLIB="ranlib"
     6976    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     6977    break 2
     6978  fi
     6979done
     6980  done
     6981IFS=$as_save_IFS
     6982
     6983fi ;;
     6984esac
     6985fi
     6986ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
     6987if test -n "$ac_ct_RANLIB"; then
     6988  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
     6989printf "%s\n" "$ac_ct_RANLIB" >&6; }
     6990else
     6991  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
     6992printf "%s\n" "no" >&6; }
     6993fi
     6994
     6995  if test "x$ac_ct_RANLIB" = x; then
     6996    RANLIB=":"
     6997  else
     6998    case $cross_compiling:$ac_tool_warned in
     6999yes:)
     7000{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
     7001printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
     7002ac_tool_warned=yes ;;
     7003esac
     7004    RANLIB=$ac_ct_RANLIB
     7005  fi
     7006else
     7007  RANLIB="$ac_cv_prog_RANLIB"
     7008fi
    68117009
    68127010if test -n "$ac_tool_prefix"; then
    … …  
    69317129# Use ARFLAGS variable as AR's operation code to sync the variable naming with
    69327130# Automake.  If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have
    6933 # higher priority because thats what people were doing historically (setting
     7131# higher priority because that's what people were doing historically (setting
    69347132# ARFLAGS for automake and AR_FLAGS for libtool).  FIXME: Make the AR_FLAGS
    69357133# variable obsoleted/removed.
    … …  
    71237321
    71247322
    7125 if test -n "$ac_tool_prefix"; then
    7126   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
    7127 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
    7128 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    7129 printf %s "checking for $ac_word... " >&6; }
    7130 if test ${ac_cv_prog_RANLIB+y}
    7131 then :
    7132   printf %s "(cached) " >&6
    7133 else case e in #(
    7134   e) if test -n "$RANLIB"; then
    7135   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
    7136 else
    7137 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    7138 for as_dir in $PATH
    7139 do
    7140   IFS=$as_save_IFS
    7141   case $as_dir in #(((
    7142     '') as_dir=./ ;;
    7143     */) ;;
    7144     *) as_dir=$as_dir/ ;;
    7145   esac
    7146     for ac_exec_ext in '' $ac_executable_extensions; do
    7147   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
    7148     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
    7149     printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
    7150     break 2
    7151   fi
    7152 done
    7153   done
    7154 IFS=$as_save_IFS
    7155 
    7156 fi ;;
    7157 esac
    7158 fi
    7159 RANLIB=$ac_cv_prog_RANLIB
    7160 if test -n "$RANLIB"; then
    7161   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
    7162 printf "%s\n" "$RANLIB" >&6; }
    7163 else
    7164   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
    7165 printf "%s\n" "no" >&6; }
    7166 fi
    7167 
    7168 
    7169 fi
    7170 if test -z "$ac_cv_prog_RANLIB"; then
    7171   ac_ct_RANLIB=$RANLIB
    7172   # Extract the first word of "ranlib", so it can be a program name with args.
    7173 set dummy ranlib; ac_word=$2
    7174 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    7175 printf %s "checking for $ac_word... " >&6; }
    7176 if test ${ac_cv_prog_ac_ct_RANLIB+y}
    7177 then :
    7178   printf %s "(cached) " >&6
    7179 else case e in #(
    7180   e) if test -n "$ac_ct_RANLIB"; then
    7181   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
    7182 else
    7183 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    7184 for as_dir in $PATH
    7185 do
    7186   IFS=$as_save_IFS
    7187   case $as_dir in #(((
    7188     '') as_dir=./ ;;
    7189     */) ;;
    7190     *) as_dir=$as_dir/ ;;
    7191   esac
    7192     for ac_exec_ext in '' $ac_executable_extensions; do
    7193   if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
    7194     ac_cv_prog_ac_ct_RANLIB="ranlib"
    7195     printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
    7196     break 2
    7197   fi
    7198 done
    7199   done
    7200 IFS=$as_save_IFS
    7201 
    7202 fi ;;
    7203 esac
    7204 fi
    7205 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
    7206 if test -n "$ac_ct_RANLIB"; then
    7207   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
    7208 printf "%s\n" "$ac_ct_RANLIB" >&6; }
    7209 else
    7210   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
    7211 printf "%s\n" "no" >&6; }
    7212 fi
    7213 
    7214   if test "x$ac_ct_RANLIB" = x; then
    7215     RANLIB=":"
    7216   else
    7217     case $cross_compiling:$ac_tool_warned in
    7218 yes:)
    7219 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
    7220 printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
    7221 ac_tool_warned=yes ;;
    7222 esac
    7223     RANLIB=$ac_ct_RANLIB
    7224   fi
    7225 else
    7226   RANLIB="$ac_cv_prog_RANLIB"
    7227 fi
    72287323
    72297324test -z "$RANLIB" && RANLIB=:
    … …  
    72407335
    72417336if test -n "$RANLIB"; then
    7242   case $host_os in
    7243   bitrig* | openbsd*)
    7244     old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
    7245     ;;
    7246   *)
    7247     old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
    7248     ;;
    7249   esac
    72507337  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
     7338  old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
    72517339fi
    72527340
    … …  
    73287416  symcode='[BCDT]'
    73297417  ;;
    7330 cygwin* | mingw* | pw32* | cegcc*)
     7418cygwin* | mingw* | windows* | pw32* | cegcc*)
    73317419  symcode='[ABCDGISTW]'
    73327420  ;;
    … …  
    73437431  ;;
    73447432solaris*)
    7345   symcode='[BDRT]'
     7433  symcode='[BCDRT]'
    73467434  ;;
    73477435sco3.2v5*)
    … …  
    74077495opt_cr=
    74087496case $build_os in
    7409 mingw*)
     7497mingw* | windows*)
    74107498  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
    74117499  ;;
    … …  
    74587546}
    74597547#endif
    7460 int main(){nm_test_var='a';nm_test_func();return(0);}
     7548int main(void){nm_test_var='a';nm_test_func();return(0);}
    74617549_LT_EOF
    74627550
    … …  
    74687556    # Now try to grab the symbols.
    74697557    nlist=conftest.nm
    7470     if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
    7471   (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
    7472   ac_status=$?
    7473   printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    7474   test $ac_status = 0; } && test -s "$nlist"; then
     7558    $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&5
     7559    if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&5 && test -s "$nlist"; then
    74757560      # Try sorting and uniquifying the output.
    74767561      if sort "$nlist" | uniq > "$nlist"T; then
    … …  
    76437728 yes)
    76447729   if test yes = "$GCC"; then
    7645      lt_sysroot=`$CC --print-sysroot 2>/dev/null`
     7730     # Trim trailing / since we'll always append absolute paths and we want
     7731     # to avoid //, if only for less confusing output for the user.
     7732     lt_sysroot=`$CC --print-sysroot 2>/dev/null | $SED 's:/\+$::'`
    76467733   fi
    76477734   ;; #(
    … …  
    78607947
    78617948x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
    7862 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
     7949s390*-*linux*|s390*-*tpf*|sparc*-*linux*|x86_64-gnu*)
    78637950  # Find out what ABI is being produced by ac_compile, and set linker
    78647951  # options accordingly.  Note that the listed cases only cover the
    … …  
    78797966            LD="${LD-ld} -m elf_i386_fbsd"
    78807967            ;;
    7881           x86_64-*linux*)
     7968          x86_64-*linux*|x86_64-gnu*)
    78827969            case `$FILECMD conftest.o` in
    78837970              *x86-64*)
    … …  
    79087995            LD="${LD-ld} -m elf_x86_64_fbsd"
    79097996            ;;
    7910           x86_64-*linux*)
     7997          x86_64-*linux*|x86_64-gnu*)
    79117998            LD="${LD-ld} -m elf_x86_64"
    79127999            ;;
    … …  
    81298216{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
    81308217printf %s "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
    8131 if test ${lt_cv_path_mainfest_tool+y}
     8218if test ${lt_cv_path_manifest_tool+y}
    81328219then :
    81338220  printf %s "(cached) " >&6
    81348221else case e in #(
    8135   e) lt_cv_path_mainfest_tool=no
     8222  e) lt_cv_path_manifest_tool=no
    81368223  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
    81378224  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
    81388225  cat conftest.err >&5
    81398226  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
    8140     lt_cv_path_mainfest_tool=yes
     8227    lt_cv_path_manifest_tool=yes
    81418228  fi
    81428229  rm -f conftest* ;;
    81438230esac
    81448231fi
    8145 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
    8146 printf "%s\n" "$lt_cv_path_mainfest_tool" >&6; }
    8147 if test yes != "$lt_cv_path_mainfest_tool"; then
     8232{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_manifest_tool" >&5
     8233printf "%s\n" "$lt_cv_path_manifest_tool" >&6; }
     8234if test yes != "$lt_cv_path_manifest_tool"; then
    81488235  MANIFEST_TOOL=:
    81498236fi
    … …  
    87408827printf "%s\n" "$lt_cv_apple_cc_single_mod" >&6; }
    87418828
     8829    # Feature test to disable chained fixups since it is not
     8830    # compatible with '-undefined dynamic_lookup'
     8831    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -no_fixup_chains linker flag" >&5
     8832printf %s "checking for -no_fixup_chains linker flag... " >&6; }
     8833if test ${lt_cv_support_no_fixup_chains+y}
     8834then :
     8835  printf %s "(cached) " >&6
     8836else case e in #(
     8837  e)  save_LDFLAGS=$LDFLAGS
     8838        LDFLAGS="$LDFLAGS -Wl,-no_fixup_chains"
     8839        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     8840/* end confdefs.h.  */
     8841
     8842int
     8843main (void)
     8844{
     8845
     8846  ;
     8847  return 0;
     8848}
     8849_ACEOF
     8850if ac_fn_c_try_link "$LINENO"
     8851then :
     8852  lt_cv_support_no_fixup_chains=yes
     8853else case e in #(
     8854  e) lt_cv_support_no_fixup_chains=no
     8855         ;;
     8856esac
     8857fi
     8858rm -f core conftest.err conftest.$ac_objext conftest.beam \
     8859    conftest$ac_exeext conftest.$ac_ext
     8860        LDFLAGS=$save_LDFLAGS
     8861
     8862     ;;
     8863esac
     8864fi
     8865{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_support_no_fixup_chains" >&5
     8866printf "%s\n" "$lt_cv_support_no_fixup_chains" >&6; }
     8867
    87428868    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
    87438869printf %s "checking for -exported_symbols_list linker flag... " >&6; }
    … …  
    87948920      $RANLIB libconftest.a 2>&5
    87958921      cat > conftest.c << _LT_EOF
    8796 int main() { return 0;}
     8922int main(void) { return 0;}
    87978923_LT_EOF
    87988924      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
    … …  
    88238949          _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
    88248950        *)
    8825           _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
     8951          _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup'
     8952          if test yes = "$lt_cv_support_no_fixup_chains"; then
     8953            as_fn_append _lt_dar_allow_undefined ' $wl-no_fixup_chains'
     8954          fi
     8955        ;;
    88268956      esac
    88278957    ;;
    … …  
    88308960      _lt_dar_single_mod='$single_module'
    88318961    fi
     8962    _lt_dar_needs_single_mod=no
     8963    case $host_os in
     8964    rhapsody* | darwin1.*)
     8965      _lt_dar_needs_single_mod=yes ;;
     8966    darwin*)
     8967      # When targeting Mac OS X 10.4 (darwin 8) or later,
     8968      # -single_module is the default and -multi_module is unsupported.
     8969      # The toolchain on macOS 10.14 (darwin 18) and later cannot
     8970      # target any OS version that needs -single_module.
     8971      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
     8972      10.0,*-darwin[567].*|10.[0-3],*-darwin[5-9].*|10.[0-3],*-darwin1[0-7].*)
     8973        _lt_dar_needs_single_mod=yes ;;
     8974      esac
     8975    ;;
     8976    esac
    88328977    if test yes = "$lt_cv_ld_exported_symbols_list"; then
    88338978      _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
    … …  
    89239068
    89249069case $host in
    8925 *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
     9070*-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-cegcc*)
    89269071  if test -n "$ac_tool_prefix"; then
    89279072  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
    … …  
    93299474
    93309475
    9331 
    9332 # Check whether --with-pic was given.
     9476  # Check whether --enable-pic was given.
     9477if test ${enable_pic+y}
     9478then :
     9479  enableval=$enable_pic; lt_p=${PACKAGE-default}
     9480     case $enableval in
     9481     yes|no) pic_mode=$enableval ;;
     9482     *)
     9483       pic_mode=default
     9484       # Look at the argument we got.  We use all the common list separators.
     9485       lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
     9486       for lt_pkg in $enableval; do
     9487         IFS=$lt_save_ifs
     9488         if test "X$lt_pkg" = "X$lt_p"; then
     9489           pic_mode=yes
     9490         fi
     9491       done
     9492       IFS=$lt_save_ifs
     9493       ;;
     9494     esac
     9495else case e in #(
     9496  e)           # Check whether --with-pic was given.
    93339497if test ${with_pic+y}
    93349498then :
    93359499  withval=$with_pic; lt_p=${PACKAGE-default}
    9336     case $withval in
    9337     yes|no) pic_mode=$withval ;;
    9338     *)
    9339       pic_mode=default
    9340       # Look at the argument we got.  We use all the common list separators.
    9341       lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
    9342       for lt_pkg in $withval; do
    9343         IFS=$lt_save_ifs
    9344         if test "X$lt_pkg" = "X$lt_p"; then
    9345           pic_mode=yes
    9346         fi
    9347       done
    9348       IFS=$lt_save_ifs
    9349       ;;
    9350     esac
     9500        case $withval in
     9501        yes|no) pic_mode=$withval ;;
     9502        *)
     9503           pic_mode=default
     9504           # Look at the argument we got.  We use all the common list separators.
     9505           lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
     9506           for lt_pkg in $withval; do
     9507             IFS=$lt_save_ifs
     9508             if test "X$lt_pkg" = "X$lt_p"; then
     9509               pic_mode=yes
     9510             fi
     9511           done
     9512           IFS=$lt_save_ifs
     9513           ;;
     9514        esac
    93519515else case e in #(
    93529516  e) pic_mode=default ;;
     9517esac
     9518fi
     9519
     9520     ;;
    93539521esac
    93549522fi
    … …  
    93989566  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
    93999567printf %s "checking which variant of shared library versioning to provide... " >&6; }
    9400 
    9401 # Check whether --with-aix-soname was given.
     9568  # Check whether --enable-aix-soname was given.
     9569if test ${enable_aix_soname+y}
     9570then :
     9571  enableval=$enable_aix_soname; case $enableval in
     9572     aix|svr4|both)
     9573       ;;
     9574     *)
     9575       as_fn_error $? "Unknown argument to --enable-aix-soname" "$LINENO" 5
     9576       ;;
     9577     esac
     9578     lt_cv_with_aix_soname=$enable_aix_soname
     9579else case e in #(
     9580  e) # Check whether --with-aix-soname was given.
    94029581if test ${with_aix_soname+y}
    94039582then :
    94049583  withval=$with_aix_soname; case $withval in
    9405     aix|svr4|both)
    9406       ;;
    9407     *)
    9408       as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
    9409       ;;
    9410     esac
    9411     lt_cv_with_aix_soname=$with_aix_soname
     9584         aix|svr4|both)
     9585           ;;
     9586         *)
     9587           as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
     9588           ;;
     9589         esac
     9590         lt_cv_with_aix_soname=$with_aix_soname
    94129591else case e in #(
    94139592  e) if test ${lt_cv_with_aix_soname+y}
    … …  
    94189597esac
    94199598fi
    9420 
    9421     with_aix_soname=$lt_cv_with_aix_soname ;;
    9422 esac
    9423 fi
    9424 
     9599 ;;
     9600esac
     9601fi
     9602
     9603     enable_aix_soname=$lt_cv_with_aix_soname ;;
     9604esac
     9605fi
     9606
     9607  with_aix_soname=$enable_aix_soname
    94259608  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
    94269609printf "%s\n" "$with_aix_soname" >&6; }
    … …  
    97389921
    97399922# Code to be used in simple link tests
    9740 lt_simple_link_test_code='int main(){return(0);}'
     9923lt_simple_link_test_code='int main(void){return(0);}'
    97419924
    97429925
    … …  
    988010063      ;;
    988110064
    9882     mingw* | cygwin* | pw32* | os2* | cegcc*)
     10065    mingw* | windows* | cygwin* | pw32* | os2* | cegcc*)
    988310066      # This hack is so that the source file can tell whether it is being
    988410067      # built for inclusion in a dll (and should export symbols for example).
    … …  
    998310166      ;;
    998410167
    9985     mingw* | cygwin* | pw32* | os2* | cegcc*)
     10168    mingw* | windows* | cygwin* | pw32* | os2* | cegcc*)
    998610169      # This hack is so that the source file can tell whether it is being
    998710170      # built for inclusion in a dll (and should export symbols for example).
    … …  
    1002210205        lt_prog_compiler_wl='-Wl,'
    1002310206        lt_prog_compiler_pic='-KPIC'
     10207        lt_prog_compiler_static='-static'
     10208        ;;
     10209      *flang* | ftn | f18* | f95*)
     10210        # Flang compiler.
     10211        lt_prog_compiler_wl='-Wl,'
     10212        lt_prog_compiler_pic='-fPIC'
    1002410213        lt_prog_compiler_static='-static'
    1002510214        ;;
    … …  
    1010610295      ;;
    1010710296
     10297    *-mlibc)
     10298      lt_prog_compiler_wl='-Wl,'
     10299      lt_prog_compiler_pic='-fPIC'
     10300      lt_prog_compiler_static='-static'
     10301      ;;
     10302
    1010810303    *nto* | *qnx*)
    1010910304      # QNX uses GNU C++, but need to define -shared option too, otherwise
    … …  
    1012010315    rdos*)
    1012110316      lt_prog_compiler_static='-non_shared'
     10317      ;;
     10318
     10319    serenity*)
    1012210320      ;;
    1012310321
    … …  
    1049510693
    1049610694  case $host_os in
    10497   cygwin* | mingw* | pw32* | cegcc*)
     10695  cygwin* | mingw* | windows* | pw32* | cegcc*)
    1049810696    # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time
    1049910697    # When not using gcc, we currently assume that we are using
    … …  
    1050610704    # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC)
    1050710705    with_gnu_ld=yes
    10508     ;;
    10509   openbsd* | bitrig*)
    10510     with_gnu_ld=no
    1051110706    ;;
    1051210707  esac
    … …  
    1061010805      ;;
    1061110806
    10612     cygwin* | mingw* | pw32* | cegcc*)
     10807    cygwin* | mingw* | windows* | pw32* | cegcc*)
    1061310808      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
    1061410809      # as there is no search path for DLLs.
    … …  
    1062010815      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
    1062110816      exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
     10817      file_list_spec='@'
    1062210818
    1062310819      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
    … …  
    1063910835    haiku*)
    1064010836      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
    10641       link_all_deplibs=yes
     10837      link_all_deplibs=no
    1064210838      ;;
    1064310839
    … …  
    1066610862        $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
    1066710863        emximp -o $lib $output_objdir/$libname.def'
    10668       old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
     10864      old_archive_from_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
    1066910865      enable_shared_with_static_runtimes=yes
    1067010866      file_list_spec='@'
    … …  
    1074510941        case $cc_basename in
    1074610942        tcc*)
     10943          hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
    1074710944          export_dynamic_flag_spec='-rdynamic'
    1074810945          ;;
    … …  
    1076510962      ;;
    1076610963
    10767     netbsd*)
     10964    *-mlibc)
     10965        archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
     10966        archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
     10967      ;;
     10968
     10969    netbsd* | netbsdelf*-gnu)
    1076810970      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
    1076910971        archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
    … …  
    1115711359      ;;
    1115811360
    11159     cygwin* | mingw* | pw32* | cegcc*)
     11361    cygwin* | mingw* | windows* | pw32* | cegcc*)
    1116011362      # When not using gcc, we currently assume that we are using
    1116111363      # Microsoft Visual C++ or Intel C++ Compiler.
    … …  
    1117411376        shrext_cmds=.dll
    1117511377        # FIXME: Setting linknames here is a bad hack.
    11176         archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
     11378        archive_cmds='$CC -Fe$output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
    1117711379        archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[   ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([     ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
    1117811380            cp "$export_symbols" "$output_objdir/$soname.def";
    … …  
    1118111383            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
    1118211384          fi~
    11183           $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
     11385          $CC -Fe$tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
    1118411386          linknames='
    1118511387        # The linker will not automatically build a static lib if we build a DLL.
    … …  
    1146411666        ld_shlibs=yes
    1146511667        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
     11668        hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
    1146611669        ;;
    1146711670      esac
    1146811671      ;;
    1146911672
    11470     netbsd*)
     11673    *-mlibc)
     11674      ;;
     11675
     11676    netbsd* | netbsdelf*-gnu)
    1147111677      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
    1147211678        archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
    … …  
    1149011696      ;;
    1149111697
    11492     openbsd* | bitrig*)
     11698    openbsd*)
    1149311699      if test -f /usr/libexec/ld.so; then
    1149411700        hardcode_direct=yes
    … …  
    1153311739        $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
    1153411740        emximp -o $lib $output_objdir/$libname.def'
    11535       old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
     11741      old_archive_from_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
    1153611742      enable_shared_with_static_runtimes=yes
    1153711743      file_list_spec='@'
    … …  
    1156711773      archive_cmds_need_lc='no'
    1156811774      hardcode_libdir_separator=:
     11775      ;;
     11776
     11777    serenity*)
    1156911778      ;;
    1157011779
    … …  
    1197512184  esac
    1197612185  case $host_os in
    11977     mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;;
     12186    mingw* | windows* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;;
    1197812187    *) lt_sed_strip_eq='s|=/|/|g' ;;
    1197912188  esac
    … …  
    1203312242  # for these hosts.
    1203412243  case $host_os in
    12035     mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
     12244    mingw* | windows* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
    1203612245      $SED 's|/\([A-Za-z]:\)|\1|g'` ;;
    1203712246  esac
    … …  
    1210712316    # not want this to be the default eventually. Also, we use the
    1210812317    # versioned .so libs for executables only if there is the -brtl
    12109     # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
     12318    # linker flag in LDFLAGS as well, or --enable-aix-soname=svr4 only.
    1211012319    # To allow for filename-based versioning support, we need to create
    1211112320    # libNAME.so.V as an archive file, containing:
    … …  
    1220112410  ;;
    1220212411
    12203 cygwin* | mingw* | pw32* | cegcc*)
     12412cygwin* | mingw* | windows* | pw32* | cegcc*)
    1220412413  version_type=windows
    1220512414  shrext_cmds=.dll
    … …  
    1221212421    library_names_spec='$libname.dll.a'
    1221312422    # DLL is installed to $(libdir)/../bin by postinstall_cmds
    12214     postinstall_cmds='base_file=`basename \$file`~
    12215       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
    12216       dldir=$destdir/`dirname \$dlpath`~
    12217       test -d \$dldir || mkdir -p \$dldir~
    12218       $install_prog $dir/$dlname \$dldir/$dlname~
    12219       chmod a+x \$dldir/$dlname~
    12220       if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
    12221         eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
    12222       fi'
     12423    # If user builds GCC with multilib enabled,
     12424    # it should just install on $(libdir)
     12425    # not on $(libdir)/../bin or 32 bits dlls would override 64 bit ones.
     12426    if test xyes = x"$multilib"; then
     12427      postinstall_cmds='base_file=`basename \$file`~
     12428        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
     12429        dldir=$destdir/`dirname \$dlpath`~
     12430        $install_prog $dir/$dlname $destdir/$dlname~
     12431        chmod a+x $destdir/$dlname~
     12432        if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
     12433          eval '\''$striplib $destdir/$dlname'\'' || exit \$?;
     12434        fi'
     12435    else
     12436      postinstall_cmds='base_file=`basename \$file`~
     12437        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
     12438        dldir=$destdir/`dirname \$dlpath`~
     12439        test -d \$dldir || mkdir -p \$dldir~
     12440        $install_prog $dir/$dlname \$dldir/$dlname~
     12441        chmod a+x \$dldir/$dlname~
     12442        if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
     12443          eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
     12444        fi'
     12445    fi
    1222312446    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
    1222412447      dlpath=$dir/\$dldll~
    … …  
    1223312456      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
    1223412457      ;;
    12235     mingw* | cegcc*)
     12458    mingw* | windows* | cegcc*)
    1223612459      # MinGW DLLs use traditional 'lib' prefix
    1223712460      soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
    … …  
    1225212475
    1225312476    case $build_os in
    12254     mingw*)
     12477    mingw* | windows*)
    1225512478      sys_lib_search_path_spec=
    1225612479      lt_save_ifs=$IFS
    … …  
    1235912582      ;;
    1236012583  esac
     12584  case $host_cpu in
     12585    powerpc64)
     12586      # On FreeBSD bi-arch platforms, a different variable is used for 32-bit
     12587      # binaries.  See <https://man.freebsd.org/cgi/man.cgi?query=ld.so>.
     12588      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
     12589/* end confdefs.h.  */
     12590int test_pointer_size[sizeof (void *) - 5];
     12591
     12592_ACEOF
     12593if ac_fn_c_try_compile "$LINENO"
     12594then :
    1236112595  shlibpath_var=LD_LIBRARY_PATH
     12596else case e in #(
     12597  e) shlibpath_var=LD_32_LIBRARY_PATH ;;
     12598esac
     12599fi
     12600rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
     12601      ;;
     12602    *)
     12603      shlibpath_var=LD_LIBRARY_PATH
     12604      ;;
     12605  esac
    1236212606  case $host_os in
    1236312607  freebsd2.*)
    … …  
    1238912633  shlibpath_var=LIBRARY_PATH
    1239012634  shlibpath_overrides_runpath=no
    12391   sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
    12392   hardcode_into_libs=yes
     12635  sys_lib_search_path_spec='/boot/system/non-packaged/develop/lib /boot/system/develop/lib'
     12636  sys_lib_dlsearch_path_spec='/boot/home/config/non-packaged/lib /boot/home/config/lib /boot/system/non-packaged/lib /boot/system/lib'
     12637  hardcode_into_libs=no
    1239312638  ;;
    1239412639
    … …  
    1250012745  need_lib_prefix=no
    1250112746  need_version=no
    12502   library_names_spec='$libname$release$shared_ext'
     12747  library_names_spec='$libname$release$shared_ext $libname$shared_ext'
    1250312748  soname_spec='$libname$release$shared_ext'
    1250412749  finish_cmds=
    … …  
    1251212757
    1251312758  dynamic_linker='Android linker'
    12514   # Don't embed -rpath directories since the linker doesn't support them.
    12515   hardcode_libdir_flag_spec='-L$libdir'
     12759  # -rpath works at least for libraries that are not overridden by
     12760  # libraries installed in system locations.
     12761  hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
    1251612762  ;;
    1251712763
    … …  
    1257012816  hardcode_into_libs=yes
    1257112817
    12572   # Ideally, we could use ldconfig to report *all* directores which are
     12818  # Ideally, we could use ldconfig to report *all* directories which are
    1257312819  # searched for libraries, however this is still not possible.  Aside from not
    1257412820  # being certain /sbin/ldconfig is available, command
    … …  
    1258812834  # assume the GNU/Linux dynamic linker is in use.
    1258912835  dynamic_linker='GNU/Linux ld.so'
     12836  ;;
     12837
     12838netbsdelf*-gnu)
     12839  version_type=linux
     12840  need_lib_prefix=no
     12841  need_version=no
     12842  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
     12843  soname_spec='$libname$release$shared_ext$major'
     12844  shlibpath_var=LD_LIBRARY_PATH
     12845  shlibpath_overrides_runpath=no
     12846  hardcode_into_libs=yes
     12847  dynamic_linker='NetBSD ld.elf_so'
    1259012848  ;;
    1259112849
    … …  
    1260812866  ;;
    1260912867
     12868*-mlibc)
     12869  version_type=linux # correct to gnu/linux during the next big refactor
     12870  need_lib_prefix=no
     12871  need_version=no
     12872  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
     12873  soname_spec='$libname$release$shared_ext$major'
     12874  dynamic_linker='mlibc ld.so'
     12875  shlibpath_var=LD_LIBRARY_PATH
     12876  shlibpath_overrides_runpath=no
     12877  hardcode_into_libs=yes
     12878  ;;
     12879
    1261012880newsos6)
    1261112881  version_type=linux # correct to gnu/linux during the next big refactor
    … …  
    1262712897  ;;
    1262812898
    12629 openbsd* | bitrig*)
     12899openbsd*)
    1263012900  version_type=sunos
    1263112901  sys_lib_dlsearch_path_spec=/usr/lib
    … …  
    1268712957  ;;
    1268812958
     12959serenity*)
     12960  version_type=linux # correct to gnu/linux during the next big refactor
     12961  need_lib_prefix=no
     12962  need_version=no
     12963  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
     12964  soname_spec='$libname$release$shared_ext$major'
     12965  shlibpath_var=LD_LIBRARY_PATH
     12966  shlibpath_overrides_runpath=no
     12967  dynamic_linker='SerenityOS LibELF'
     12968  ;;
     12969
    1268912970solaris*)
    1269012971  version_type=linux # correct to gnu/linux during the next big refactor
    … …  
    1278413065  ;;
    1278513066
     13067emscripten*)
     13068  version_type=none
     13069  need_lib_prefix=no
     13070  need_version=no
     13071  library_names_spec='$libname$release$shared_ext'
     13072  soname_spec='$libname$release$shared_ext'
     13073  finish_cmds=
     13074  dynamic_linker="Emscripten linker"
     13075  lt_prog_compiler_wl=
     13076lt_prog_compiler_pic=
     13077lt_prog_compiler_static=
     13078
     13079
     13080  if test yes = "$GCC"; then
     13081    lt_prog_compiler_wl='-Wl,'
     13082    lt_prog_compiler_static='-static'
     13083
     13084    case $host_os in
     13085      aix*)
     13086      # All AIX code is PIC.
     13087      if test ia64 = "$host_cpu"; then
     13088        # AIX 5 now supports IA64 processor
     13089        lt_prog_compiler_static='-Bstatic'
     13090      fi
     13091      lt_prog_compiler_pic='-fPIC'
     13092      ;;
     13093
     13094    amigaos*)
     13095      case $host_cpu in
     13096      powerpc)
     13097            # see comment about AmigaOS4 .so support
     13098            lt_prog_compiler_pic='-fPIC'
     13099        ;;
     13100      m68k)
     13101            # FIXME: we need at least 68020 code to build shared libraries, but
     13102            # adding the '-m68020' flag to GCC prevents building anything better,
     13103            # like '-m68040'.
     13104            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
     13105        ;;
     13106      esac
     13107      ;;
     13108
     13109    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
     13110      # PIC is the default for these OSes.
     13111      ;;
     13112
     13113    mingw* | windows* | cygwin* | pw32* | os2* | cegcc*)
     13114      # This hack is so that the source file can tell whether it is being
     13115      # built for inclusion in a dll (and should export symbols for example).
     13116      # Although the cygwin gcc ignores -fPIC, still need this for old-style
     13117      # (--disable-auto-import) libraries
     13118      lt_prog_compiler_pic='-DDLL_EXPORT'
     13119      case $host_os in
     13120      os2*)
     13121        lt_prog_compiler_static='$wl-static'
     13122        ;;
     13123      esac
     13124      ;;
     13125
     13126    darwin* | rhapsody*)
     13127      # PIC is the default on this platform
     13128      # Common symbols not allowed in MH_DYLIB files
     13129      lt_prog_compiler_pic='-fno-common'
     13130      ;;
     13131
     13132    haiku*)
     13133      # PIC is the default for Haiku.
     13134      # The "-static" flag exists, but is broken.
     13135      lt_prog_compiler_static=
     13136      ;;
     13137
     13138    hpux*)
     13139      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
     13140      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
     13141      # sets the default TLS model and affects inlining.
     13142      case $host_cpu in
     13143      hppa*64*)
     13144        # +Z the default
     13145        ;;
     13146      *)
     13147        lt_prog_compiler_pic='-fPIC'
     13148        ;;
     13149      esac
     13150      ;;
     13151
     13152    interix[3-9]*)
     13153      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
     13154      # Instead, we relocate shared libraries at runtime.
     13155      ;;
     13156
     13157    msdosdjgpp*)
     13158      # Just because we use GCC doesn't mean we suddenly get shared libraries
     13159      # on systems that don't support them.
     13160      lt_prog_compiler_can_build_shared=no
     13161      enable_shared=no
     13162      ;;
     13163
     13164    *nto* | *qnx*)
     13165      # QNX uses GNU C++, but need to define -shared option too, otherwise
     13166      # it will coredump.
     13167      lt_prog_compiler_pic='-fPIC -shared'
     13168      ;;
     13169
     13170    sysv4*MP*)
     13171      if test -d /usr/nec; then
     13172        lt_prog_compiler_pic=-Kconform_pic
     13173      fi
     13174      ;;
     13175
     13176    *)
     13177      lt_prog_compiler_pic='-fPIC'
     13178      ;;
     13179    esac
     13180
     13181    case $cc_basename in
     13182    nvcc*) # Cuda Compiler Driver 2.2
     13183      lt_prog_compiler_wl='-Xlinker '
     13184      if test -n "$lt_prog_compiler_pic"; then
     13185        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
     13186      fi
     13187      ;;
     13188    esac
     13189  else
     13190    # PORTME Check for flag to pass linker flags through the system compiler.
     13191    case $host_os in
     13192    aix*)
     13193      lt_prog_compiler_wl='-Wl,'
     13194      if test ia64 = "$host_cpu"; then
     13195        # AIX 5 now supports IA64 processor
     13196        lt_prog_compiler_static='-Bstatic'
     13197      else
     13198        lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
     13199      fi
     13200      ;;
     13201
     13202    darwin* | rhapsody*)
     13203      # PIC is the default on this platform
     13204      # Common symbols not allowed in MH_DYLIB files
     13205      lt_prog_compiler_pic='-fno-common'
     13206      case $cc_basename in
     13207      nagfor*)
     13208        # NAG Fortran compiler
     13209        lt_prog_compiler_wl='-Wl,-Wl,,'
     13210        lt_prog_compiler_pic='-PIC'
     13211        lt_prog_compiler_static='-Bstatic'
     13212        ;;
     13213      esac
     13214      ;;
     13215
     13216    mingw* | windows* | cygwin* | pw32* | os2* | cegcc*)
     13217      # This hack is so that the source file can tell whether it is being
     13218      # built for inclusion in a dll (and should export symbols for example).
     13219      lt_prog_compiler_pic='-DDLL_EXPORT'
     13220      case $host_os in
     13221      os2*)
     13222        lt_prog_compiler_static='$wl-static'
     13223        ;;
     13224      esac
     13225      ;;
     13226
     13227    hpux9* | hpux10* | hpux11*)
     13228      lt_prog_compiler_wl='-Wl,'
     13229      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
     13230      # not for PA HP-UX.
     13231      case $host_cpu in
     13232      hppa*64*|ia64*)
     13233        # +Z the default
     13234        ;;
     13235      *)
     13236        lt_prog_compiler_pic='+Z'
     13237        ;;
     13238      esac
     13239      # Is there a better lt_prog_compiler_static that works with the bundled CC?
     13240      lt_prog_compiler_static='$wl-a ${wl}archive'
     13241      ;;
     13242
     13243    irix5* | irix6* | nonstopux*)
     13244      lt_prog_compiler_wl='-Wl,'
     13245      # PIC (with -KPIC) is the default.
     13246      lt_prog_compiler_static='-non_shared'
     13247      ;;
     13248
     13249    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
     13250      case $cc_basename in
     13251      # old Intel for x86_64, which still supported -KPIC.
     13252      ecc*)
     13253        lt_prog_compiler_wl='-Wl,'
     13254        lt_prog_compiler_pic='-KPIC'
     13255        lt_prog_compiler_static='-static'
     13256        ;;
     13257      *flang* | ftn | f18* | f95*)
     13258        # Flang compiler.
     13259        lt_prog_compiler_wl='-Wl,'
     13260        lt_prog_compiler_pic='-fPIC'
     13261        lt_prog_compiler_static='-static'
     13262        ;;
     13263      # icc used to be incompatible with GCC.
     13264      # ICC 10 doesn't accept -KPIC any more.
     13265      icc* | ifort*)
     13266        lt_prog_compiler_wl='-Wl,'
     13267        lt_prog_compiler_pic='-fPIC'
     13268        lt_prog_compiler_static='-static'
     13269        ;;
     13270      # Lahey Fortran 8.1.
     13271      lf95*)
     13272        lt_prog_compiler_wl='-Wl,'
     13273        lt_prog_compiler_pic='--shared'
     13274        lt_prog_compiler_static='--static'
     13275        ;;
     13276      nagfor*)
     13277        # NAG Fortran compiler
     13278        lt_prog_compiler_wl='-Wl,-Wl,,'
     13279        lt_prog_compiler_pic='-PIC'
     13280        lt_prog_compiler_static='-Bstatic'
     13281        ;;
     13282      tcc*)
     13283        # Fabrice Bellard et al's Tiny C Compiler
     13284        lt_prog_compiler_wl='-Wl,'
     13285        lt_prog_compiler_pic='-fPIC'
     13286        lt_prog_compiler_static='-static'
     13287        ;;
     13288      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
     13289        # Portland Group compilers (*not* the Pentium gcc compiler,
     13290        # which looks to be a dead project)
     13291        lt_prog_compiler_wl='-Wl,'
     13292        lt_prog_compiler_pic='-fpic'
     13293        lt_prog_compiler_static='-Bstatic'
     13294        ;;
     13295      ccc*)
     13296        lt_prog_compiler_wl='-Wl,'
     13297        # All Alpha code is PIC.
     13298        lt_prog_compiler_static='-non_shared'
     13299        ;;
     13300      xl* | bgxl* | bgf* | mpixl*)
     13301        # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
     13302        lt_prog_compiler_wl='-Wl,'
     13303        lt_prog_compiler_pic='-qpic'
     13304        lt_prog_compiler_static='-qstaticlink'
     13305        ;;
     13306      *)
     13307        case `$CC -V 2>&1 | $SED 5q` in
     13308        *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
     13309          # Sun Fortran 8.3 passes all unrecognized flags to the linker
     13310          lt_prog_compiler_pic='-KPIC'
     13311          lt_prog_compiler_static='-Bstatic'
     13312          lt_prog_compiler_wl=''
     13313          ;;
     13314        *Sun\ F* | *Sun*Fortran*)
     13315          lt_prog_compiler_pic='-KPIC'
     13316          lt_prog_compiler_static='-Bstatic'
     13317          lt_prog_compiler_wl='-Qoption ld '
     13318          ;;
     13319        *Sun\ C*)
     13320          # Sun C 5.9
     13321          lt_prog_compiler_pic='-KPIC'
     13322          lt_prog_compiler_static='-Bstatic'
     13323          lt_prog_compiler_wl='-Wl,'
     13324          ;;
     13325        *Intel*\ [CF]*Compiler*)
     13326          lt_prog_compiler_wl='-Wl,'
     13327          lt_prog_compiler_pic='-fPIC'
     13328          lt_prog_compiler_static='-static'
     13329          ;;
     13330        *Portland\ Group*)
     13331          lt_prog_compiler_wl='-Wl,'
     13332          lt_prog_compiler_pic='-fpic'
     13333          lt_prog_compiler_static='-Bstatic'
     13334          ;;
     13335        esac
     13336        ;;
     13337      esac
     13338      ;;
     13339
     13340    newsos6)
     13341      lt_prog_compiler_pic='-KPIC'
     13342      lt_prog_compiler_static='-Bstatic'
     13343      ;;
     13344
     13345    *-mlibc)
     13346      lt_prog_compiler_wl='-Wl,'
     13347      lt_prog_compiler_pic='-fPIC'
     13348      lt_prog_compiler_static='-static'
     13349      ;;
     13350
     13351    *nto* | *qnx*)
     13352      # QNX uses GNU C++, but need to define -shared option too, otherwise
     13353      # it will coredump.
     13354      lt_prog_compiler_pic='-fPIC -shared'
     13355      ;;
     13356
     13357    osf3* | osf4* | osf5*)
     13358      lt_prog_compiler_wl='-Wl,'
     13359      # All OSF/1 code is PIC.
     13360      lt_prog_compiler_static='-non_shared'
     13361      ;;
     13362
     13363    rdos*)
     13364      lt_prog_compiler_static='-non_shared'
     13365      ;;
     13366
     13367    serenity*)
     13368      ;;
     13369
     13370    solaris*)
     13371      lt_prog_compiler_pic='-KPIC'
     13372      lt_prog_compiler_static='-Bstatic'
     13373      case $cc_basename in
     13374      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
     13375        lt_prog_compiler_wl='-Qoption ld ';;
     13376      *)
     13377        lt_prog_compiler_wl='-Wl,';;
     13378      esac
     13379      ;;
     13380
     13381    sunos4*)
     13382      lt_prog_compiler_wl='-Qoption ld '
     13383      lt_prog_compiler_pic='-PIC'
     13384      lt_prog_compiler_static='-Bstatic'
     13385      ;;
     13386
     13387    sysv4 | sysv4.2uw2* | sysv4.3*)
     13388      lt_prog_compiler_wl='-Wl,'
     13389      lt_prog_compiler_pic='-KPIC'
     13390      lt_prog_compiler_static='-Bstatic'
     13391      ;;
     13392
     13393    sysv4*MP*)
     13394      if test -d /usr/nec; then
     13395        lt_prog_compiler_pic='-Kconform_pic'
     13396        lt_prog_compiler_static='-Bstatic'
     13397      fi
     13398      ;;
     13399
     13400    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
     13401      lt_prog_compiler_wl='-Wl,'
     13402      lt_prog_compiler_pic='-KPIC'
     13403      lt_prog_compiler_static='-Bstatic'
     13404      ;;
     13405
     13406    unicos*)
     13407      lt_prog_compiler_wl='-Wl,'
     13408      lt_prog_compiler_can_build_shared=no
     13409      ;;
     13410
     13411    uts4*)
     13412      lt_prog_compiler_pic='-pic'
     13413      lt_prog_compiler_static='-Bstatic'
     13414      ;;
     13415
     13416    *)
     13417      lt_prog_compiler_can_build_shared=no
     13418      ;;
     13419    esac
     13420  fi
     13421
     13422case $host_os in
     13423  # For platforms that do not support PIC, -DPIC is meaningless:
     13424  *djgpp*)
     13425    lt_prog_compiler_pic=
     13426    ;;
     13427  *)
     13428    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
     13429    ;;
     13430esac
     13431
     13432{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
     13433printf %s "checking for $compiler option to produce PIC... " >&6; }
     13434if test ${lt_cv_prog_compiler_pic+y}
     13435then :
     13436  printf %s "(cached) " >&6
     13437else case e in #(
     13438  e) lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ;;
     13439esac
     13440fi
     13441{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
     13442printf "%s\n" "$lt_cv_prog_compiler_pic" >&6; }
     13443lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
     13444
     13445#
     13446# Check to make sure the PIC flag actually works.
     13447#
     13448if test -n "$lt_prog_compiler_pic"; then
     13449  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
     13450printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
     13451if test ${lt_cv_prog_compiler_pic_works+y}
     13452then :
     13453  printf %s "(cached) " >&6
     13454else case e in #(
     13455  e) lt_cv_prog_compiler_pic_works=no
     13456   ac_outfile=conftest.$ac_objext
     13457   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
     13458   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"  ## exclude from sc_useless_quotes_in_assignment
     13459   # Insert the option either (1) after the last *FLAGS variable, or
     13460   # (2) before a word containing "conftest.", or (3) at the end.
     13461   # Note that $ac_compile itself does not contain backslashes and begins
     13462   # with a dollar sign (not a hyphen), so the echo should work correctly.
     13463   # The option is referenced via a variable to avoid confusing sed.
     13464   lt_compile=`echo "$ac_compile" | $SED \
     13465   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     13466   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     13467   -e 's:$: $lt_compiler_flag:'`
     13468   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
     13469   (eval "$lt_compile" 2>conftest.err)
     13470   ac_status=$?
     13471   cat conftest.err >&5
     13472   echo "$as_me:$LINENO: \$? = $ac_status" >&5
     13473   if (exit $ac_status) && test -s "$ac_outfile"; then
     13474     # The compiler can only warn and ignore the option if not recognized
     13475     # So say no if there are warnings other than the usual output.
     13476     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
     13477     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
     13478     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
     13479       lt_cv_prog_compiler_pic_works=yes
     13480     fi
     13481   fi
     13482   $RM conftest*
     13483 ;;
     13484esac
     13485fi
     13486{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
     13487printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; }
     13488
     13489if test yes = "$lt_cv_prog_compiler_pic_works"; then
     13490    case $lt_prog_compiler_pic in
     13491     "" | " "*) ;;
     13492     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
     13493     esac
     13494else
     13495    lt_prog_compiler_pic=
     13496     lt_prog_compiler_can_build_shared=no
     13497fi
     13498
     13499fi
     13500
     13501
     13502
     13503
     13504
     13505#
     13506# Check to make sure the static flag actually works.
     13507#
     13508wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
     13509{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
     13510printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
     13511if test ${lt_cv_prog_compiler_static_works+y}
     13512then :
     13513  printf %s "(cached) " >&6
     13514else case e in #(
     13515  e) lt_cv_prog_compiler_static_works=no
     13516   save_LDFLAGS=$LDFLAGS
     13517   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
     13518   echo "$lt_simple_link_test_code" > conftest.$ac_ext
     13519   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
     13520     # The linker can only warn and ignore the option if not recognized
     13521     # So say no if there are warnings
     13522     if test -s conftest.err; then
     13523       # Append any errors to the config.log.
     13524       cat conftest.err 1>&5
     13525       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
     13526       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
     13527       if diff conftest.exp conftest.er2 >/dev/null; then
     13528         lt_cv_prog_compiler_static_works=yes
     13529       fi
     13530     else
     13531       lt_cv_prog_compiler_static_works=yes
     13532     fi
     13533   fi
     13534   $RM -r conftest*
     13535   LDFLAGS=$save_LDFLAGS
     13536 ;;
     13537esac
     13538fi
     13539{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
     13540printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; }
     13541
     13542if test yes = "$lt_cv_prog_compiler_static_works"; then
     13543    :
     13544else
     13545    lt_prog_compiler_static=
     13546fi
     13547
     13548
     13549
     13550='-fPIC'
     13551  archive_cmds='$CC -sSIDE_MODULE=2 -shared $libobjs $deplibs $compiler_flags -o $lib'
     13552  archive_expsym_cmds='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -sSIDE_MODULE=2 -shared $libobjs $deplibs $compiler_flags -o $lib -s EXPORTED_FUNCTIONS=@$output_objdir/$soname.expsym'
     13553  archive_cmds_need_lc=no
     13554  no_undefined_flag=
     13555  ;;
     13556
    1278613557*)
    1278713558  dynamic_linker=no
    … …  
    1296813739    ;;
    1296913740
    12970   mingw* | pw32* | cegcc*)
     13741  mingw* | windows* | pw32* | cegcc*)
    1297113742    lt_cv_dlopen=LoadLibrary
    1297213743    lt_cv_dlopen_libs=
    … …  
    1334114112   correspondingly for the symbols needed.  */
    1334214113#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
    13343 int fnord () __attribute__((visibility("default")));
     14114int fnord (void) __attribute__((visibility("default")));
    1334414115#endif
    1334514116
    13346 int fnord () { return 42; }
    13347 int main ()
     14117int fnord (void) { return 42; }
     14118int main (void)
    1334814119{
    1334914120  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
    … …  
    1344914220   correspondingly for the symbols needed.  */
    1345014221#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
    13451 int fnord () __attribute__((visibility("default")));
     14222int fnord (void) __attribute__((visibility("default")));
    1345214223#endif
    1345314224
    13454 int fnord () { return 42; }
    13455 int main ()
     14225int fnord (void) { return 42; }
     14226int main (void)
    1345614227{
    1345714228  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
    … …  
    1490615677   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5
    1490715678printf "%s\n" "done" >&6; }
     15679case $enable_silent_rules in # (((
     15680  yes) AM_DEFAULT_VERBOSITY=0;;
     15681   no) AM_DEFAULT_VERBOSITY=1;;
     15682esac
     15683if test $am_cv_make_support_nested_variables = yes; then
     15684    AM_V='$(V)'
     15685  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
     15686else
     15687  AM_V=$AM_DEFAULT_VERBOSITY
     15688  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
     15689fi
     15690
    1490815691 if test -n "$EXEEXT"; then
    1490915692  am__EXEEXT_TRUE=
    … …  
    1538316166# values after options handling.
    1538416167ac_log="
    15385 This file was extended by libpng $as_me 1.6.43, which was
     16168This file was extended by libpng $as_me 1.6.45, which was
    1538616169generated by GNU Autoconf 2.72.  Invocation command line was
    1538716170
    … …  
    1545116234ac_cs_config='$ac_cs_config_escaped'
    1545216235ac_cs_version="\\
    15453 libpng config.status 1.6.43
     16236libpng config.status 1.6.45
    1545416237configured by $0, generated by GNU Autoconf 2.72,
    1545516238  with options \\"\$ac_cs_config\\"
    … …  
    1657917362#! $SHELL
    1658017363# Generated automatically by $as_me ($PACKAGE) $VERSION
    16581 # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
    1658217364# NOTE: Changes made to this file will be lost: look at ltmain.sh.
    1658317365
    … …  
    1658517367# Written by Gordon Matzigkeit, 1996
    1658617368
    16587 # Copyright (C) 2014 Free Software Foundation, Inc.
     17369# Copyright (C) 2024 Free Software Foundation, Inc.
    1658817370# This is free software; see the source for copying conditions.  There is NO
    1658917371# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
    … …  
    1659117373# GNU Libtool is free software; you can redistribute it and/or modify
    1659217374# it under the terms of the GNU General Public License as published by
    16593 # the Free Software Foundation; either version 2 of of the License, or
     17375# the Free Software Foundation; either version 2 of the License, or
    1659417376# (at your option) any later version.
    1659517377#
    … …  
    1697517757# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
    1697617758# DIR into the resulting binary and the resulting library dependency is
    16977 # "absolute",i.e impossible to change by setting \$shlibpath_var if the
     17759# "absolute",i.e. impossible to change by setting \$shlibpath_var if the
    1697817760# library is relocated.
    1697917761hardcode_direct_absolute=$hardcode_direct_absolute

  • trunk/src/libs/libpng-1.6.45/configure.ac

    r105469 r107813  
    2626dnl Version number stuff here:
    2727
    28 AC_INIT([libpng],[1.6.43],[[email protected]])
     28AC_INIT([libpng],[1.6.45],[[email protected]])
    2929AC_CONFIG_MACRO_DIR([scripts/autoconf])
    3030
    … …  
    4747dnl stop configure from automagically running automake
    4848
    49 PNGLIB_VERSION=1.6.43
     49PNGLIB_VERSION=1.6.45
    5050PNGLIB_MAJOR=1
    5151PNGLIB_MINOR=6
    52 PNGLIB_RELEASE=43
     52PNGLIB_RELEASE=45
    5353
    5454dnl End of version number stuff
    … …  
    5757AC_CONFIG_HEADERS([config.h])
    5858
    59 # Check for basic programs.
     59# Check the basic programs.
    6060AC_LANG([C])
    6161AC_PROG_CC

  • trunk/src/libs/libpng-1.6.45/contrib/README.txt

    r96425 r107813  
     1External contributions to libpng
     2--------------------------------
    13
    24This "contrib" directory contains contributions which are not necessarily under

  • trunk/src/libs/libpng-1.6.45/contrib/examples/README.txt

    r96425 r107813  
    1 
    21This directory (contrib/examples) contains examples of libpng usage.
    32

  • trunk/src/libs/libpng-1.6.45/contrib/libtests/pngimage.c

    r103316 r107813  
    1 
    21/* pngimage.c
    32 *
    … …  
    10201019   C(bit_depth);
    10211020   C(color_type);
    1022    C(interlace_method);
     1021#  ifdef PNG_WRITE_INTERLACING_SUPPORTED
     1022      /* If write interlace has been disabled, the PNG file is still
     1023       * written correctly, but as a regular (not-interlaced) PNG.
     1024       */
     1025      C(interlace_method);
     1026#  endif
    10231027   C(compression_method);
    10241028   C(filter_method);

  • trunk/src/libs/libpng-1.6.45/contrib/libtests/pngstest.c

    r103316 r107813  
    1 
    21/* pngstest.c
    32 *
    … …  
    35013500   int c;
    35023501
    3503 #if PNG_LIBPNG_VER >= 10700
     3502#if PNG_LIBPNG_VER == 10700
    35043503      /* This error should not exist in 1.7 or later: */
    35053504      opts |= GBG_ERROR;

  • trunk/src/libs/libpng-1.6.45/contrib/libtests/pngunknown.c

    r103316 r107813  
    1 
    21/* pngunknown.c - test the read side unknown chunk handling
    32 *

  • trunk/src/libs/libpng-1.6.45/contrib/libtests/pngvalid.c

    r105469 r107813  
    1 
    21/* pngvalid.c - validate libpng by constructing then reading png files.
    32 *
    … …  
    305304    defined PNG_WRITE_FILTER_SUPPORTED
    306305static void
    307 randomize(void *pv, size_t size)
     306randomize_bytes(void *pv, size_t size)
    308307{
    309308   static png_uint_32 random_seed[2] = {0x56789abc, 0xd};
    … …  
    311310}
    312311
    313 #define R8(this) randomize(&(this), sizeof (this))
     312#define R8(this) randomize_bytes(&(this), sizeof (this))
    314313
    315314#ifdef PNG_READ_SUPPORTED
    … …  
    318317{
    319318   unsigned char b1[1];
    320    randomize(b1, sizeof b1);
     319   randomize_bytes(b1, sizeof b1);
    321320   return b1[0];
    322321}
    … …  
    327326{
    328327   unsigned char b2[2];
    329    randomize(b2, sizeof b2);
     328   randomize_bytes(b2, sizeof b2);
    330329   return png_get_uint_16(b2);
    331330}
    … …  
    337336{
    338337   unsigned char b4[4];
    339    randomize(b4, sizeof b4);
     338   randomize_bytes(b4, sizeof b4);
    340339   return png_get_uint_32(b4);
    341340}
    … …  
    25752574 * algorithm.
    25762575 */
    2577 #define DIGITIZE PNG_LIBPNG_VER < 10700
     2576#define DIGITIZE PNG_LIBPNG_VER != 10700
    25782577
    25792578/* If pm->calculations_use_input_precision is set then operations will happen
    … …  
    39873986#  define set_write_interlace_handling(pp,type) png_set_interlace_handling(pp)
    39883987#  define do_own_interlace 0
    3989 #elif PNG_LIBPNG_VER < 10700
     3988#elif PNG_LIBPNG_VER != 10700
    39903989#  define set_write_interlace_handling(pp,type) (1)
    39913990static void
    … …  
    40154014#endif /* WRITE_INTERLACING tests */
    40164015
    4017 #if PNG_LIBPNG_VER >= 10700 || defined PNG_WRITE_INTERLACING_SUPPORTED
     4016#if PNG_LIBPNG_VER == 10700 || defined PNG_WRITE_INTERLACING_SUPPORTED
    40184017#   define CAN_WRITE_INTERLACE 1
    40194018#else
    … …  
    46344633       /* no warnings makes these errors undetectable prior to 1.7.0 */
    46354634       { sBIT0_error_fn, "sBIT(0): failed to detect error",
    4636          PNG_LIBPNG_VER < 10700 },
     4635         PNG_LIBPNG_VER != 10700 },
    46374636
    46384637       { sBIT_error_fn, "sBIT(too big): failed to detect error",
    4639          PNG_LIBPNG_VER < 10700 },
     4638         PNG_LIBPNG_VER != 10700 },
    46404639    };
    46414640
    … …  
    62376236      if (this->colour_type == PNG_COLOR_TYPE_GRAY)
    62386237      {
    6239 #        if PNG_LIBPNG_VER < 10700
     6238#        if PNG_LIBPNG_VER != 10700
    62406239            if (!for_background && this->bit_depth < 8)
    62416240               this->bit_depth = this->sample_depth = 8;
    … …  
    62476246             * tRNS chunk to expand at this point.
    62486247             */
    6249 #           if PNG_LIBPNG_VER >= 10700
     6248#           if PNG_LIBPNG_VER == 10700
    62506249               if (!for_background && this->bit_depth < 8)
    62516250                  this->bit_depth = this->sample_depth = 8;
    … …  
    71287127   const transform_display *display)
    71297128{
    7130 #if PNG_LIBPNG_VER < 10700
     7129#if PNG_LIBPNG_VER != 10700
    71317130   /* LIBPNG BUG: this always forces palette images to RGB. */
    71327131   if (that->colour_type == PNG_COLOR_TYPE_PALETTE)
    … …  
    71387137    */
    71397138   if (that->have_tRNS)
    7140 #     if PNG_LIBPNG_VER >= 10700
     7139#     if PNG_LIBPNG_VER == 10700
    71417140         if (that->colour_type != PNG_COLOR_TYPE_PALETTE &&
    71427141             (that->colour_type & PNG_COLOR_MASK_ALPHA) == 0)
    … …  
    71447143      image_pixel_add_alpha(that, &display->this, 0/*!for background*/);
    71457144
    7146 #if PNG_LIBPNG_VER < 10700
     7145#if PNG_LIBPNG_VER != 10700
    71477146   /* LIBPNG BUG: otherwise libpng still expands to 8 bits! */
    71487147   else
    … …  
    71737172    */
    71747173   return
    7175 #  if PNG_LIBPNG_VER >= 10700
     7174#  if PNG_LIBPNG_VER == 10700
    71767175      colour_type != PNG_COLOR_TYPE_PALETTE &&
    71777176#  endif
    … …  
    73147313    const transform_display *display)
    73157314{
    7316 #if PNG_LIBPNG_VER < 10700
     7315#if PNG_LIBPNG_VER != 10700
    73177316   image_transform_png_set_expand_mod(this, that, pp, display);
    73187317#else
    … …  
    73307329    const image_transform **that, png_byte colour_type, png_byte bit_depth)
    73317330{
    7332 #if PNG_LIBPNG_VER < 10700
     7331#if PNG_LIBPNG_VER != 10700
    73337332   return image_transform_png_set_expand_add(this, that, colour_type,
    73347333      bit_depth);
    … …  
    73607359
    73617360   /* NOTE: prior to 1.7 libpng does SET_EXPAND as well, so tRNS is expanded. */
    7362 #  if PNG_LIBPNG_VER < 10700
     7361#  if PNG_LIBPNG_VER != 10700
    73637362      if (that->this.has_tRNS)
    73647363         that->this.is_transparent = 1;
    … …  
    74137412{
    74147413   png_set_scale_16(pp);
    7415 #  if PNG_LIBPNG_VER < 10700
     7414#  if PNG_LIBPNG_VER != 10700
    74167415      /* libpng will limit the gamma table size: */
    74177416      that->max_gamma_8 = PNG_MAX_GAMMA_8;
    … …  
    74617460{
    74627461   png_set_strip_16(pp);
    7463 #  if PNG_LIBPNG_VER < 10700
     7462#  if PNG_LIBPNG_VER != 10700
    74647463      /* libpng will limit the gamma table size: */
    74657464      that->max_gamma_8 = PNG_MAX_GAMMA_8;
    … …  
    76487647   {
    76497648      /* The default (built in) coefficients, as above: */
    7650 #     if PNG_LIBPNG_VER < 10700
     7649#     if PNG_LIBPNG_VER != 10700
    76517650         data.red_coefficient = 6968 / 32768.;
    76527651         data.green_coefficient = 23434 / 32768.;
    … …  
    77317730          *  +/-(1<<(15-PNG_MAX_GAMMA_8)) in the 8-bit case.
    77327731          */
    7733 #        if PNG_LIBPNG_VER < 10700
     7732#        if PNG_LIBPNG_VER != 10700
    77347733            if (that->this.bit_depth < 16)
    77357734               that->max_gamma_8 = PNG_MAX_GAMMA_8;
    … …  
    79087907      double gray, err;
    79097908
    7910 #     if PNG_LIBPNG_VER < 10700
     7909#     if PNG_LIBPNG_VER != 10700
    79117910         if (that->colour_type == PNG_COLOR_TYPE_PALETTE)
    79127911            image_pixel_convert_PLTE(that);
    … …  
    80958094         double be = that->bluee;
    80968095
    8097 #        if PNG_LIBPNG_VER < 10700
     8096#        if PNG_LIBPNG_VER != 10700
    80988097            /* The true gray case involves no math in earlier versions (not
    80998098             * true, there was some if gamma correction was happening too.)
    … …  
    98749873             * an sbit less than the bit depth.
    98759874             */
    9876 #           if PNG_LIBPNG_VER < 10700
     9875#           if PNG_LIBPNG_VER != 10700
    98779876#              define SBIT_ERROR .5
    98789877#           else
    … …  
    1073410733#     define PNG_MAX_GAMMA_8 11
    1073510734#  endif
    10736 #  if defined PNG_MAX_GAMMA_8 || PNG_LIBPNG_VER < 10700
     10735#  if defined PNG_MAX_GAMMA_8 || PNG_LIBPNG_VER != 10700
    1073710736#     define SBIT_16_TO_8 PNG_MAX_GAMMA_8
    1073810737#  else
    … …  
    1173711736    * difference.
    1173811737    */
    11739    pm.assume_16_bit_calculations = PNG_LIBPNG_VER >= 10700;
     11738   pm.assume_16_bit_calculations = PNG_LIBPNG_VER == 10700;
    1174011739
    1174111740   /* Currently 16 bit expansion happens at the end of the pipeline, so the
    … …  
    1176111760   pm.test_lbg_gamma_transform = PNG_LIBPNG_VER >= 10600;
    1176211761   pm.test_lbg_gamma_sbit = 1;
    11763    pm.test_lbg_gamma_composition = PNG_LIBPNG_VER >= 10700;
     11762   pm.test_lbg_gamma_composition = PNG_LIBPNG_VER == 10700;
    1176411763
    1176511764   /* And the test encodings */
    … …  
    1176711766   pm.nencodings = ARRAY_SIZE(test_encodings);
    1176811767
    11769 #  if PNG_LIBPNG_VER < 10700
     11768#  if PNG_LIBPNG_VER != 10700
    1177011769      pm.sbitlow = 8U; /* because libpng doesn't do sBIT below 8! */
    1177111770#  else
    … …  
    1179711796   pm.maxabs16 = .00005;/* 1/20000 */
    1179811797   pm.maxcalc16 =1./65535;/* +/-1 in 16 bits for compose errors */
    11799 #  if PNG_LIBPNG_VER < 10700
     11798#  if PNG_LIBPNG_VER != 10700
    1180011799      pm.maxcalcG = 1./((1<<PNG_MAX_GAMMA_8)-1);
    1180111800#  else

  • trunk/src/libs/libpng-1.6.45/contrib/libtests/readpng.c

    r103316 r107813  
    1 
    21/* readpng.c
    32 *

  • trunk/src/libs/libpng-1.6.45/contrib/libtests/tarith.c

    r103316 r107813  
    1 
    21/* tarith.c
    32 *

  • trunk/src/libs/libpng-1.6.45/contrib/libtests/timepng.c

    r103316 r107813  
    1 
    21/* timepng.c
    32 *

  • trunk/src/libs/libpng-1.6.45/contrib/mips-msa/linux.c

    r103316 r107813  
    1 
    21/* contrib/mips-msa/linux.c
    32 *

  • trunk/src/libs/libpng-1.6.45/contrib/oss-fuzz/libpng_read_fuzzer.cc

    r103316 r107813  
    1 
    21// libpng_read_fuzzer.cc
    32// Copyright 2017-2018 Glenn Randers-Pehrson
    … …  
    205204
    206205  PNG_CLEANUP
     206
     207#ifdef PNG_SIMPLIFIED_READ_SUPPORTED
     208  // Simplified READ API
     209  png_image image;
     210  memset(&image, 0, (sizeof image));
     211  image.version = PNG_IMAGE_VERSION;
     212
     213  if (!png_image_begin_read_from_memory(&image, data, size)) {
     214    return 0;
     215  }
     216
     217  image.format = PNG_FORMAT_RGBA;
     218  std::vector<png_byte> buffer(PNG_IMAGE_SIZE(image));
     219  png_image_finish_read(&image, NULL, buffer.data(), 0, NULL);
     220#endif
     221
    207222  return 0;
    208223}

  • trunk/src/libs/libpng-1.6.45/contrib/pngminim/README

    r96425 r107813  
    1 
    21This demonstrates the use of PNG_USER_CONFIG, pngusr.h and pngusr.dfa
    32to build minimal decoder, encoder, and progressive reader applications.

  • trunk/src/libs/libpng-1.6.45/contrib/pngminus/CHANGES.txt

    r103316 r107813  
    1 
    21pnm2png / png2pnm --- conversion from PBM/PGM/PPM-file to PNG-file
    32copyright (C) 1999-2019 by Willem van Schaik <willem at schaik dot com>

  • trunk/src/libs/libpng-1.6.45/contrib/pngminus/LICENSE.txt

    r103316 r107813  
    1 
    21pnm2png / png2pnm --- conversion from PBM/PGM/PPM-file to PNG-file
    32

  • trunk/src/libs/libpng-1.6.45/contrib/pngsuite/README

    r96425 r107813  
    1 
    21pngsuite
    32--------

  • trunk/src/libs/libpng-1.6.45/contrib/pngsuite/interlaced/README

    r96425 r107813  
    1 
    21These images fail the "pngimage-quick" and "pngimage-full" tests.

  • trunk/src/libs/libpng-1.6.45/depcomp

    r103316 r107813  
    22# depcomp - compile a program generating dependencies as side-effects
    33
    4 scriptversion=2018-03-07.03; # UTC
    5 
    6 # Copyright (C) 1999-2021 Free Software Foundation, Inc.
     4scriptversion=2024-06-19.01; # UTC
     5
     6# Copyright (C) 1999-2024 Free Software Foundation, Inc.
    77
    88# This program is free software; you can redistribute it and/or modify
    … …  
    4848
    4949Report bugs to <[email protected]>.
     50GNU Automake home page: <https://www.gnu.org/software/automake/>.
     51General help using GNU software: <https://www.gnu.org/gethelp/>.
    5052EOF
    5153    exit $?
    5254    ;;
    5355  -v | --v*)
    54     echo "depcomp $scriptversion"
     56    echo "depcomp (GNU Automake) $scriptversion"
    5557    exit $?
    5658    ;;
    … …  
    114116upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
    115117lower=abcdefghijklmnopqrstuvwxyz
    116 digits=0123456789
    117118alpha=${upper}${lower}
    118119
    … …  
    129130rm -f "$tmpdepfile"
    130131
    131 # Avoid interferences from the environment.
     132# Avoid interference from the environment.
    132133gccflag= dashmflag=
    133134
    … …  
    199200
    200201gcc)
    201 ## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
    202 ## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
     202## Note that this doesn't just cater to obsolete pre-3.x GCC compilers.
     203## but also to in-use compilers like IBM xlc/xlC and the HP C compiler.
    203204## (see the conditional assignment to $gccflag above).
    204205## There are various ways to get dependency output from gcc.  Here's

  • trunk/src/libs/libpng-1.6.45/example.c

    r103316 r107813  
    1 
    21#if 0 /* in case someone actually tries to compile this */
    32

  • trunk/src/libs/libpng-1.6.45/install-sh

    r103316 r107813  
    22# install - install a program, script, or datafile
    33
    4 scriptversion=2023-11-23.18; # UTC
     4scriptversion=2024-06-19.01; # UTC
    55
    66# This originates from X11R5 (mit/util/scripts/install.sh), which was
    … …  
    171171    -T) is_target_a_directory=never;;
    172172
    173     --version) echo "$0 $scriptversion"; exit $?;;
     173    --version) echo "$0 (GNU Automake) $scriptversion"; exit $?;;
    174174
    175175    --) shift
    … …  
    346346
    347347        # Because "mkdir -p" follows existing symlinks and we likely work
    348         # directly in world-writeable /tmp, make sure that the '$tmpdir'
     348        # directly in world-writable /tmp, make sure that the '$tmpdir'
    349349        # directory is successfully created first before we actually test
    350350        # 'mkdir -p'.
    … …  
    354354        then
    355355          if test -z "$dir_arg" || {
    356                # Check for POSIX incompatibilities with -m.
     356               # Check for POSIX incompatibility with -m.
    357357               # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
    358358               # other-writable bit of parent directory when it shouldn't.

  • trunk/src/libs/libpng-1.6.45/intel/filter_sse2_intrinsics.c

    r103316 r107813  
    1 
    21/* filter_sse2_intrinsics.c - SSE2 optimized filter functions
    32 *

  • trunk/src/libs/libpng-1.6.45/intel/intel_init.c

    r96425 r107813  
    1 
    21/* intel_init.c - SSE2 optimized filter functions
    32 *

  • trunk/src/libs/libpng-1.6.45/libpng-manual.txt

    r105469 r107813  
    11libpng-manual.txt - A description on how to use and modify libpng
    22
    3  Copyright (c) 2018-2024 Cosmin Truta
     3 Copyright (c) 2018-2025 Cosmin Truta
    44 Copyright (c) 1998-2018 Glenn Randers-Pehrson
    55
    … …  
    1010 Based on:
    1111
    12  libpng version 1.6.36, December 2018, through 1.6.43 - February 2024
     12 libpng version 1.6.36, December 2018, through 1.6.45 - January 2025
    1313 Updated and distributed by Cosmin Truta
    14  Copyright (c) 2018-2024 Cosmin Truta
     14 Copyright (c) 2018-2025 Cosmin Truta
    1515
    1616 libpng versions 0.97, January 1998, through 1.6.35 - July 2018
    … …  
    51745174
    51755175The machine-generated configure files are no longer included in branches
    5176 libpng16 and later of the GIT repository.  They continue to be included
     5176libpng17 and later of the GIT repository.  They continue to be included
    51775177in the tarball releases, however.
    51785178

  • trunk/src/libs/libpng-1.6.45/libpng.3

    r105469 r107813  
    1 .TH LIBPNG 3 "February 23, 2024"
     1.TH LIBPNG 3 "January 7, 2025"
    22.SH NAME
    3 libpng \- Portable Network Graphics (PNG) Reference Library 1.6.43
     3libpng \- Portable Network Graphics (PNG) Reference Library 1.6.45
    44
    55.SH SYNOPSIS
    … …  
    520520libpng-manual.txt - A description on how to use and modify libpng
    521521
    522  Copyright (c) 2018-2024 Cosmin Truta
     522 Copyright (c) 2018-2025 Cosmin Truta
    523523 Copyright (c) 1998-2018 Glenn Randers-Pehrson
    524524
    … …  
    529529 Based on:
    530530
    531  libpng version 1.6.36, December 2018, through 1.6.43 - February 2024
     531 libpng version 1.6.36, December 2018, through 1.6.45 - January 2025
    532532 Updated and distributed by Cosmin Truta
    533  Copyright (c) 2018-2024 Cosmin Truta
     533 Copyright (c) 2018-2025 Cosmin Truta
    534534
    535535 libpng versions 0.97, January 1998, through 1.6.35 - July 2018
    … …  
    56935693
    56945694The machine-generated configure files are no longer included in branches
    5695 libpng16 and later of the GIT repository.  They continue to be included
     5695libpng17 and later of the GIT repository.  They continue to be included
    56965696in the tarball releases, however.
    56975697

  • trunk/src/libs/libpng-1.6.45/libpngpf.3

    r105469 r107813  
    1 .TH LIBPNGPF 3 "February 23, 2024"
     1.TH LIBPNGPF 3 "January 7, 2025"
    22.SH NAME
    3 libpng \- Portable Network Graphics (PNG) Reference Library 1.6.43
     3libpng \- Portable Network Graphics (PNG) Reference Library 1.6.45
    44(private functions)
    55

  • trunk/src/libs/libpng-1.6.45/ltmain.sh

    r103316 r107813  
    33##               by inline-source v2019-02-19.15
    44
    5 # libtool (GNU libtool) 2.4.7
     5# libtool (GNU libtool) 2.5.4
    66# Provide generalized library-building support services.
    77# Written by Gordon Matzigkeit <[email protected]>, 1996
    88
    9 # Copyright (C) 1996-2019, 2021-2022 Free Software Foundation, Inc.
     9# Copyright (C) 1996-2019, 2021-2024 Free Software Foundation, Inc.
    1010# This is free software; see the source for copying conditions.  There is NO
    1111# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
    … …  
    3232PROGRAM=libtool
    3333PACKAGE=libtool
    34 VERSION=2.4.7
    35 package_revision=2.4.7
     34VERSION=2.5.4
     35package_revision=2.5.4
    3636
    3737
    … …  
    7373# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
    7474#
    75 # Copyright (C) 2004-2019, 2021 Bootstrap Authors
     75# Copyright (C) 2004-2019, 2021, 2023-2024 Bootstrap Authors
    7676#
    7777# This file is dual licensed under the terms of the MIT license
    78 # <https://opensource.org/license/MIT>, and GPL version 2 or later
    79 # <http://www.gnu.org/licenses/gpl-2.0.html>.  You must apply one of
     78# <https://opensource.org/licenses/MIT>, and GPL version 2 or later
     79# <https://www.gnu.org/licenses/gpl-2.0.html>.  You must apply one of
    8080# these licenses when using or redistributing this software or any of
    8181# the files within it.  See the URLs above, or the file `LICENSE`
    … …  
    144144IFS="$sp        $nl"
    145145
    146 # There are apparently some retarded systems that use ';' as a PATH separator!
     146# There are apparently some systems that use ';' as a PATH separator!
    147147if test "${PATH_SEPARATOR+set}" != set; then
    148148  PATH_SEPARATOR=:
    … …  
    590590  # _G_HAVE_PLUSEQ_OP
    591591  # Can be empty, in which case the shell is probed, "yes" if += is
    592   # useable or anything else if it does not work.
     592  # usable or anything else if it does not work.
    593593  test -z "$_G_HAVE_PLUSEQ_OP" \
    594594    && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \
    … …  
    740740#             value returned in "$func_dirname_result"
    741741#   basename: Compute filename of FILE.
    742 #             value retuned in "$func_basename_result"
     742#             value returned in "$func_basename_result"
    743743# For efficiency, we do not delegate to the functions above but instead
    744744# duplicate the functionality here.
    … …  
    898898      while test ! -d "$_G_directory_path"; do
    899899        # ...make a list in topmost first order.  Use a colon delimited
    900         # list incase some portion of path contains whitespace.
     900        # list in case some portion of path contains whitespace.
    901901        _G_dir_list=$_G_directory_path:$_G_dir_list
    902902
    … …  
    15371537# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
    15381538#
    1539 # Copyright (C) 2010-2019, 2021 Bootstrap Authors
     1539# Copyright (C) 2010-2019, 2021, 2023-2024 Bootstrap Authors
    15401540#
    15411541# This file is dual licensed under the terms of the MIT license
    1542 # <https://opensource.org/license/MIT>, and GPL version 2 or later
    1543 # <http://www.gnu.org/licenses/gpl-2.0.html>.  You must apply one of
     1542# <https://opensource.org/licenses/MIT>, and GPL version 2 or later
     1543# <https://www.gnu.org/licenses/gpl-2.0.html>.  You must apply one of
    15441544# these licenses when using or redistributing this software or any of
    15451545# the files within it.  See the URLs above, or the file `LICENSE`
    … …  
    22162216
    22172217# Set a version string.
    2218 scriptversion='(GNU libtool) 2.4.7'
     2218scriptversion='(GNU libtool) 2.5.4'
     2219
     2220# func_version
     2221# ------------
     2222# Echo version message to standard output and exit.
     2223func_version ()
     2224{
     2225    $debug_cmd
     2226
     2227        year=`date +%Y`
     2228
     2229        cat <<EOF
     2230$progname $scriptversion
     2231Copyright (C) $year Free Software Foundation, Inc.
     2232License GPLv2+: GNU GPL version 2 or later <https://gnu.org/licenses/gpl.html>
     2233This is free software: you are free to change and redistribute it.
     2234There is NO WARRANTY, to the extent permitted by law.
     2235
     2236Originally written by Gordon Matzigkeit, 1996
     2237(See AUTHORS for complete contributor listing)
     2238EOF
     2239
     2240    exit $?
     2241}
    22192242
    22202243
    … …  
    22392262
    22402263
    2241 # func_warning ARG...
    2242 # -------------------
    2243 # Libtool warnings are not categorized, so override funclib.sh
    2244 # func_warning with this simpler definition.
    2245 func_warning ()
    2246 {
    2247     $debug_cmd
    2248 
    2249     $warning_func ${1+"$@"}
    2250 }
    2251 
    2252 
    22532264## ---------------- ##
    22542265## Options parsing. ##
    … …  
    22622273# Short help message in response to '-h'.
    22632274usage_message="Options:
    2264        --config             show all configuration variables
    2265        --debug              enable verbose shell tracing
    2266    -n, --dry-run            display commands without modifying any files
    2267        --features           display basic configuration information and exit
    2268        --mode=MODE          use operation mode MODE
    2269        --no-warnings        equivalent to '-Wnone'
    2270        --preserve-dup-deps  don't remove duplicate dependency libraries
    2271        --quiet, --silent    don't print informational messages
    2272        --tag=TAG            use configuration variables from tag TAG
    2273    -v, --verbose            print more informational messages than default
    2274        --version            print version information
    2275    -W, --warnings=CATEGORY  report the warnings falling in CATEGORY [all]
    2276    -h, --help, --help-all   print short, long, or detailed help message
     2275       --config                 show all configuration variables
     2276       --debug                  enable verbose shell tracing
     2277   -n, --dry-run                display commands without modifying any files
     2278       --features               display basic configuration information
     2279       --finish                 use operation '--mode=finish'
     2280       --mode=MODE              use operation mode MODE
     2281       --no-finish              don't update shared library cache
     2282       --no-quiet, --no-silent  print default informational messages
     2283       --no-warnings            equivalent to '-Wnone'
     2284       --preserve-dup-deps      don't remove duplicate dependency libraries
     2285       --quiet, --silent        don't print informational messages
     2286       --reorder-cache=DIRS     reorder shared library cache for preferred DIRS
     2287       --tag=TAG                use configuration variables from tag TAG
     2288   -v, --verbose                print more informational messages than default
     2289       --version                print version information
     2290   -W, --warnings=CATEGORY      report the warnings falling in CATEGORY [all]
     2291   -h, --help, --help-all       print short, long, or detailed help message
    22772292"
    22782293
    … …  
    23072322       compiler flags: $LTCFLAGS
    23082323       linker:         $LD (gnu? $with_gnu_ld)
    2309        version:        $progname (GNU libtool) 2.4.7
     2324       version:        $progname $scriptversion
    23102325       automake:       `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
    23112326       autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`
    23122327
    23132328Report bugs to <[email protected]>.
    2314 GNU libtool home page: <http://www.gnu.org/software/libtool/>.
    2315 General help using GNU software: <http://www.gnu.org/gethelp/>."
     2329GNU libtool home page: <https://www.gnu.org/software/libtool/>.
     2330General help using GNU software: <https://www.gnu.org/gethelp/>."
    23162331    exit 0
    23172332}
    … …  
    25032518    opt_help=false
    25042519    opt_mode=
     2520    opt_reorder_cache=false
    25052521    opt_preserve_dup_deps=false
    25062522    opt_quiet=false
     2523    opt_finishing=true
     2524    opt_warning=
    25072525
    25082526    nonopt=
    … …  
    25942612
    25952613                          # Catch anything else as an error
    2596                           *) func_error "invalid argument for $_G_opt"
     2614                          *) func_error "invalid argument '$1' for $_G_opt"
    25972615                             exit_cmd=exit
    2598                              break
    25992616                             ;;
    26002617                        esac
    … …  
    26022619                        ;;
    26032620
     2621        --no-finish)
     2622                        opt_finishing=false
     2623                        func_append preserve_args " $_G_opt"
     2624                        ;;
     2625
    26042626        --no-silent|--no-quiet)
    26052627                        opt_quiet=false
    … …  
    26152637                        opt_verbose=false
    26162638                        func_append preserve_args " $_G_opt"
     2639                        ;;
     2640
     2641        --reorder-cache)
     2642                        opt_reorder_cache=true
     2643                        shared_lib_dirs=$1
     2644                        if test -n "$shared_lib_dirs"; then
     2645                          case $1 in
     2646                            # Must begin with /:
     2647                            /*) ;;
     2648
     2649                            # Catch anything else as an error (relative paths)
     2650                            *) func_error "invalid argument '$1' for $_G_opt"
     2651                               func_error "absolute paths are required for $_G_opt"
     2652                               exit_cmd=exit
     2653                               ;;
     2654                          esac
     2655                        fi
     2656                        shift
    26172657                        ;;
    26182658
    … …  
    26532693
    26542694
     2695# func_warning ARG...
     2696# -------------------
     2697# Libtool warnings are not categorized, so override funclib.sh
     2698# func_warning with this simpler definition.
     2699func_warning ()
     2700{
     2701    if $opt_warning; then
     2702        $debug_cmd
     2703        $warning_func ${1+"$@"}
     2704    fi
     2705}
     2706
    26552707
    26562708# libtool_validate_options [ARG]...
    … …  
    26692721    test : = "$debug_cmd" || func_append preserve_args " --debug"
    26702722
    2671     case $host in
     2723    case $host_os in
    26722724      # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
    26732725      # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
    2674       *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
     2726      cygwin* | mingw* | windows* | pw32* | cegcc* | solaris2* | os2*)
    26752727        # don't eliminate duplications in $postdeps and $predeps
    26762728        opt_duplicate_compiler_generated_deps=:
    … …  
    30043056# func_convert_core_file_wine_to_w32 ARG
    30053057# Helper function used by file name conversion functions when $build is *nix,
    3006 # and $host is mingw, cygwin, or some other w32 environment. Relies on a
     3058# and $host is mingw, windows, cygwin, or some other w32 environment. Relies on a
    30073059# correctly configured wine environment available, with the winepath program
    30083060# in $build's $PATH.
    … …  
    30363088# func_convert_core_path_wine_to_w32 ARG
    30373089# Helper function used by path conversion functions when $build is *nix, and
    3038 # $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
    3039 # configured wine environment available, with the winepath program in $build's
    3040 # $PATH. Assumes ARG has no leading or trailing path separator characters.
     3090# $host is mingw, windows, cygwin, or some other w32 environment. Relies on a
     3091# correctly configured wine environment available, with the winepath program
     3092# in $build's $PATH. Assumes ARG has no leading or trailing path separator
     3093# characters.
    30413094#
    30423095# ARG is path to be converted from $build format to win32.
    … …  
    31793232}
    31803233# end func_convert_path_front_back_pathsep
     3234
     3235
     3236# func_convert_delimited_path PATH ORIG_DELIMITER NEW_DELIMITER
     3237# Replaces a delimiter for a given path.
     3238func_convert_delimited_path ()
     3239{
     3240        converted_path=`$ECHO "$1" | $SED "s#$2#$3#g"`
     3241}
     3242# end func_convert_delimited_path
    31813243
    31823244
    … …  
    35153577
    35163578
     3579# func_reorder_shared_lib_cache DIRS
     3580# Reorder the shared library cache by unconfiguring previous shared library cache
     3581# and configuring preferred search directories before previous search directories.
     3582# Previous shared library cache: /usr/lib /usr/local/lib
     3583# Preferred search directories: /tmp/testing
     3584# Reordered shared library cache: /tmp/testing /usr/lib /usr/local/lib
     3585func_reorder_shared_lib_cache ()
     3586{
     3587        $debug_cmd
     3588
     3589        case $host_os in
     3590          openbsd*)
     3591            get_search_directories=`PATH="$PATH:/sbin" ldconfig -r | $GREP "search directories" | $SED "s#.*search directories:\ ##g"`
     3592            func_convert_delimited_path "$get_search_directories" ':' '\ '
     3593            save_search_directories=$converted_path
     3594            func_convert_delimited_path "$1" ':' '\ '
     3595
     3596            # Ensure directories exist
     3597            for dir in $converted_path; do
     3598              # Ensure each directory is an absolute path
     3599              case $dir in
     3600                /*) ;;
     3601                *) func_error "Directory '$dir' is not an absolute path"
     3602                   exit $EXIT_FAILURE ;;
     3603              esac
     3604              # Ensure no trailing slashes
     3605              func_stripname '' '/' "$dir"
     3606              dir=$func_stripname_result
     3607              if test -d "$dir"; then
     3608                if test -n "$preferred_search_directories"; then
     3609                  preferred_search_directories="$preferred_search_directories $dir"
     3610                else
     3611                  preferred_search_directories=$dir
     3612                fi
     3613              else
     3614                func_error "Directory '$dir' does not exist"
     3615                exit $EXIT_FAILURE
     3616              fi
     3617            done
     3618
     3619            PATH="$PATH:/sbin" ldconfig -U $save_search_directories
     3620            PATH="$PATH:/sbin" ldconfig -m $preferred_search_directories $save_search_directories
     3621            get_search_directories=`PATH="$PATH:/sbin" ldconfig -r | $GREP "search directories" | $SED "s#.*search directories:\ ##g"`
     3622            func_convert_delimited_path "$get_search_directories" ':' '\ '
     3623            reordered_search_directories=$converted_path
     3624
     3625            $ECHO "Original: $save_search_directories"
     3626            $ECHO "Reordered: $reordered_search_directories"
     3627            exit $EXIT_SUCCESS
     3628          ;;
     3629          *)
     3630            func_error "--reorder-cache is not supported for host_os=$host_os."
     3631            exit $EXIT_FAILURE
     3632          ;;
     3633        esac
     3634}
     3635# end func_reorder_shared_lib_cache
     3636
     3637
    35173638# func_mode_compile arg...
    35183639func_mode_compile ()
    … …  
    36933814    # On Cygwin there's no "real" PIC flag so we must build both object types
    36943815    case $host_os in
    3695     cygwin* | mingw* | pw32* | os2* | cegcc*)
     3816    cygwin* | mingw* | windows* | pw32* | os2* | cegcc*)
    36963817      pic_mode=default
    36973818      ;;
    … …  
    40874208
    40884209
     4210# If option '--reorder-cache', reorder the shared library cache and exit.
     4211if $opt_reorder_cache; then
     4212    func_reorder_shared_lib_cache $shared_lib_dirs
     4213fi
     4214
     4215
    40894216# func_mode_execute arg...
    40904217func_mode_execute ()
    … …  
    42714398    fi
    42724399
    4273     if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
     4400    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs" && $opt_finishing; then
    42744401      for libdir in $libdirs; do
    42754402        if test -n "$finish_cmds"; then
    … …  
    42964423        $ECHO "   $libdir"
    42974424      done
     4425      if test "false" = "$opt_finishing"; then
     4426        echo
     4427        echo "NOTE: finish_cmds were not executed during testing, so you must"
     4428        echo "manually run ldconfig to add a given test directory, LIBDIR, to"
     4429        echo "the search path for generated executables."
     4430      fi
    42984431      echo
    42994432      echo "If you ever happen to want to link against installed libraries"
    … …  
    45324665
    45334666        if test -n "$relink_command"; then
     4667          # Strip any trailing slash from the destination.
     4668          func_stripname '' '/' "$libdir"
     4669          destlibdir=$func_stripname_result
     4670
     4671          func_stripname '' '/' "$destdir"
     4672          s_destdir=$func_stripname_result
     4673
    45344674          # Determine the prefix the user has applied to our future dir.
    4535           inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
     4675          inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"`
    45364676
    45374677          # Don't allow the user to place us outside of our expected
    … …  
    45704710          tstripme=$stripme
    45714711          case $host_os in
    4572           cygwin* | mingw* | pw32* | cegcc*)
     4712          cygwin* | mingw* | windows* | pw32* | cegcc*)
    45734713            case $realname in
    45744714            *.dll.a)
    … …  
    46834823        # Do a test to see if this is really a libtool program.
    46844824        case $host in
    4685         *cygwin* | *mingw*)
     4825        *cygwin* | *mingw* | *windows*)
    46864826            if func_ltwrapper_executable_p "$file"; then
    46874827              func_ltwrapper_scriptname "$file"
    … …  
    49115051              eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
    49125052              case $host in
    4913               *cygwin* | *mingw* | *cegcc* )
     5053              *cygwin* | *mingw* | *windows* | *cegcc* )
    49145054                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
    49155055                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
    … …  
    49235063              eval '$MV "$nlist"T "$nlist"'
    49245064              case $host in
    4925                 *cygwin* | *mingw* | *cegcc* )
     5065                *cygwin* | *mingw* | *windows* | *cegcc* )
    49265066                  eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
    49275067                  eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
    … …  
    49375077          name=$func_basename_result
    49385078          case $host in
    4939             *cygwin* | *mingw* | *cegcc* )
     5079            *cygwin* | *mingw* | *windows* | *cegcc* )
    49405080              # if an import library, we need to obtain dlname
    49415081              if func_win32_import_lib_p "$dlprefile"; then
    … …  
    49635103                  fi
    49645104                  func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
    4965                   eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
    4966                     $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
     5105                  case $host in
     5106                    i[3456]86-*-mingw32*)
     5107                      eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
     5108                        $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
     5109                    ;;
     5110                    *)
     5111                      eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
     5112                        $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/__nm_//' >> '$nlist'"
     5113                    ;;
     5114                  esac
    49675115                }
    49685116              else # not an import lib
    … …  
    51125260        symfileobj=$output_objdir/${my_outputname}S.$objext
    51135261        case $host in
    5114         *cygwin* | *mingw* | *cegcc* )
     5262        *cygwin* | *mingw* | *windows* | *cegcc* )
    51155263          if test -f "$output_objdir/$my_outputname.def"; then
    51165264            compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
    … …  
    51885336    # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
    51895337    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
    5190        $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
     5338       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64|pe-aarch64)' >/dev/null; then
    51915339      case $nm_interface in
    51925340      "MS dumpbin")
    … …  
    54555603# Emit a libtool wrapper script on stdout.
    54565604# Don't directly open a file because we may want to
    5457 # incorporate the script contents within a cygwin/mingw
     5605# incorporate the script contents within a cygwin/mingw/windows
    54585606# wrapper executable.  Must ONLY be called from within
    54595607# func_mode_link because it depends on a number of variables
    … …  
    54635611# variable will take.  If 'yes', then the emitted script
    54645612# will assume that the directory where it is stored is
    5465 # the $objdir directory.  This is a cygwin/mingw-specific
     5613# the $objdir directory.  This is a cygwin/mingw/windows-specific
    54665614# behavior.
    54675615func_emit_wrapper ()
    … …  
    55885736  case $host in
    55895737  # Backslashes separate directories on plain windows
    5590   *-*-mingw | *-*-os2* | *-cegcc*)
     5738  *-*-mingw* | *-*-windows* | *-*-os2* | *-cegcc*)
    55915739    $ECHO "\
    55925740      if test -n \"\$lt_option_debug\"; then
    … …  
    56565804  done
    56575805
    5658   # Usually 'no', except on cygwin/mingw when embedded into
     5806  # Usually 'no', except on cygwin/mingw/windows when embedded into
    56595807  # the cwrapper.
    56605808  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
    … …  
    57885936#include <stdio.h>
    57895937#include <stdlib.h>
    5790 #ifdef _MSC_VER
     5938#if defined _WIN32 && !defined __GNUC__
    57915939# include <direct.h>
    57925940# include <process.h>
    … …  
    58135961#if defined __MINGW32__
    58145962# ifdef __STRICT_ANSI__
    5815 int _putenv (const char *);
     5963_CRTIMP int __cdecl _putenv (const char *);
    58165964# endif
    58175965#elif defined __CYGWIN__
    … …  
    60116159EOF
    60126160            case $host in
    6013               *mingw* | *cygwin* )
     6161              *mingw* | *windows* | *cygwin* )
    60146162                # make stdout use "unix" line endings
    60156163                echo "          setmode(1,_O_BINARY);"
    … …  
    60306178          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
    60316179             namespace, but it is not one of the ones we know about and
    6032              have already dealt with, above (inluding dump-script), then
     6180             have already dealt with, above (including dump-script), then
    60336181             report an error. Otherwise, targets might begin to believe
    60346182             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
    … …  
    61146262
    61156263            case $host_os in
    6116               mingw*)
     6264              mingw* | windows*)
    61176265            cat <<"EOF"
    61186266  {
    … …  
    61566304
    61576305            case $host_os in
    6158               mingw*)
     6306              mingw* | windows*)
    61596307                cat <<"EOF"
    61606308  /* execv doesn't actually work on mingw as expected on unix */
    … …  
    65756723EOF
    65766724            case $host_os in
    6577               mingw*)
     6725              mingw* | windows*)
    65786726                cat <<"EOF"
    65796727
    … …  
    67506898
    67516899    case $host in
    6752     *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
     6900    *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-cegcc*)
    67536901      # It is impossible to link a dll without this setting, and
    67546902      # we shouldn't force the makefile maintainer to figure out
    … …  
    67746922
    67756923    compile_rpath=
     6924    compile_rpath_tail=
    67766925    finalize_rpath=
    67776926    compile_shlibpath=
    … …  
    68146963    perm_rpath=
    68156964    temp_rpath=
     6965    temp_rpath_tail=
    68166966    thread_safe=no
    68176967    vinfo=
    68186968    vinfo_number=no
    68196969    weak_libs=
     6970    rpath_arg=
    68206971    single_module=$wl-single_module
    68216972    func_infer_tag $base_compile
    … …  
    70807231          [\\/]* | [A-Za-z]:[\\/]*) ;;
    70817232          *)
    7082             func_fatal_error "only absolute run-paths are allowed"
     7233            func_fatal_error "argument to -rpath is not absolute: $arg"
    70837234            ;;
    70847235          esac
    … …  
    72567407        esac
    72577408        case $host in
    7258         *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
     7409        *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-cegcc*)
    72597410          testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
    72607411          case :$dllsearchpath: in
    … …  
    72767427        if test X-lc = "X$arg" || test X-lm = "X$arg"; then
    72777428          case $host in
    7278           *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
     7429          *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
    72797430            # These systems don't actually have a C or math library (as such)
    72807431            continue
    … …  
    72847435            test X-lc = "X$arg" && continue
    72857436            ;;
    7286           *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*)
     7437          *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-midnightbsd*)
    72877438            # Do not include libc due to us having libc/libc_r.
    72887439            test X-lc = "X$arg" && continue
    … …  
    73047455        elif test X-lc_r = "X$arg"; then
    73057456         case $host in
    7306          *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*)
     7457         *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-midnightbsd*)
    73077458           # Do not include libc_r directly, use -pthread flag.
    73087459           continue
    … …  
    73277478      # classes, name mangling, and exception handling.
    73287479      # Darwin uses the -arch flag to determine output architecture.
    7329       -model|-arch|-isysroot|--sysroot)
     7480      # -q <option> for IBM XL C/C++ compiler.
     7481      -model|-arch|-isysroot|--sysroot|-q)
    73307482        func_append compiler_flags " $arg"
    73317483        func_append compile_command " $arg"
    … …  
    73487500        ;;
    73497501      -mt|-mthreads|-kthread|-Kthread|-pthreads|--thread-safe \
    7350       |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
     7502      |-threads|-fopenmp|-fopenmp=*|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
    73517503        func_append compiler_flags " $arg"
    73527504        func_append compile_command " $arg"
    … …  
    73717523      -no-install)
    73727524        case $host in
    7373         *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
     7525        *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
    73747526          # The PATH hackery in wrapper scripts is required on Windows
    73757527          # and Darwin in order for the loader to find any dlls it needs.
    … …  
    74317583          ;;
    74327584        *)
    7433           func_fatal_error "only absolute run-paths are allowed"
     7585          func_fatal_error "argument ($arg) to '-R' is not an absolute path: $dir"
    74347586          ;;
    74357587        esac
    … …  
    75567708      # -specs=*             GCC specs files
    75577709      # -stdlib=*            select c++ std lib with clang
     7710      # -fdiagnostics-color* simply affects output
     7711      # -frecord-gcc-switches used to verify flags were respected
    75587712      # -fsanitize=*         Clang/GCC memory and address sanitizer
     7713      # -fno-sanitize*       Clang/GCC memory and address sanitizer
     7714      # -shared-libsan       Link with shared sanitizer runtimes (Clang)
     7715      # -static-libsan       Link with static sanitizer runtimes (Clang)
     7716      # -no-canonical-prefixes Do not expand any symbolic links
    75597717      # -fuse-ld=*           Linker select flags for GCC
     7718      # -static-*            direct GCC to link specific libraries statically
     7719      # -fcilkplus           Cilk Plus language extension features for C/C++
     7720      # -rtlib=*             select c runtime lib with clang
     7721      # --unwindlib=*        select unwinder library with clang
     7722      # -f{file|debug|macro|profile}-prefix-map=* needed for lto linking
    75607723      # -Wa,*                Pass flags directly to the assembler
     7724      # -Werror, -Werror=*   Report (specified) warnings as errors
    75617725      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
    75627726      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
    7563       -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
    7564       -specs=*|-fsanitize=*|-fuse-ld=*|-Wa,*)
     7727      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-no-canonical-prefixes| \
     7728      -stdlib=*|-rtlib=*|--unwindlib=*| \
     7729      -specs=*|-fsanitize=*|-fno-sanitize*|-shared-libsan|-static-libsan| \
     7730      -ffile-prefix-map=*|-fdebug-prefix-map=*|-fmacro-prefix-map=*|-fprofile-prefix-map=*| \
     7731      -fdiagnostics-color*|-frecord-gcc-switches| \
     7732      -fuse-ld=*|-static-*|-fcilkplus|-Wa,*|-Werror|-Werror=*)
    75657733        func_quote_arg pretty "$arg"
    75667734        arg=$func_quote_arg_result
    … …  
    77207888      # Now actually substitute the argument into the commands.
    77217889      if test -n "$arg"; then
    7722         func_append compile_command " $arg"
    7723         func_append finalize_command " $arg"
     7890        if test -n "$rpath_arg"; then
     7891          func_append finalize_rpath " ${arg##*,}"
     7892          unset rpath_arg
     7893        else
     7894          case $arg in
     7895          -Wl,-rpath,*)
     7896            func_append finalize_rpath " ${arg##*,}";;
     7897          -Wl,-rpath)
     7898            rpath_arg=1;;
     7899          *)
     7900            func_append compile_command " $arg"
     7901            func_append finalize_command " $arg"
     7902          esac
     7903        fi
    77247904      fi
    77257905    done # argument parsing loop
    … …  
    78928072        case $deplib in
    78938073        -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
    7894         |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
     8074        |-threads|-fopenmp|-fopenmp=*|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
    78958075          if test prog,link = "$linkmode,$pass"; then
    78968076            compile_deplibs="$deplib $compile_deplibs"
    … …  
    80698249              esac
    80708250              if $valid_a_lib; then
    8071                 echo
    8072                 $ECHO "*** Warning: Linking the shared library $output against the"
    8073                 $ECHO "*** static library $deplib is not portable!"
     8251                func_warning "Linking the shared library $output against the static library $deplib is not portable!"
    80748252                deplibs="$deplib $deplibs"
    80758253              else
    8076                 echo
    8077                 $ECHO "*** Warning: Trying to link with static lib archive $deplib."
    8078                 echo "*** I have the capability to make that library automatically link in when"
    8079                 echo "*** you link to this library.  But I can only do this if you have a"
    8080                 echo "*** shared version of the library, which you do not appear to have"
    8081                 echo "*** because the file extensions .$libext of this argument makes me believe"
    8082                 echo "*** that it is just a static archive that I should not use here."
     8254                func_warning "Trying to link with static lib archive $deplib."
     8255                func_warning "I have the capability to make that library automatically link in when"
     8256                func_warning "you link to this library.  But I can only do this if you have a"
     8257                func_warning "shared version of the library, which you do not appear to have"
     8258                func_warning "because the file extensions .$libext of this argument makes me believe"
     8259                func_warning "that it is just a static archive that I should not use here."
    80838260              fi
    80848261              ;;
    … …  
    82758452          case $host in
    82768453            # special handling for platforms with PE-DLLs.
    8277             *cygwin* | *mingw* | *cegcc* )
     8454            *cygwin* | *mingw* | *windows* | *cegcc* )
    82788455              # Linker will automatically link against shared library if both
    82798456              # static and shared are present.  Therefore, ensure we extract
    … …  
    83758552              case $temp_rpath: in
    83768553              *"$absdir:"*) ;;
    8377               *) func_append temp_rpath "$absdir:" ;;
     8554              *) case $absdir in
     8555                 "$progdir/"*) func_append temp_rpath "$absdir:" ;;
     8556                 *)            func_append temp_rpath_tail "$absdir:" ;;
     8557                 esac
    83788558              esac
    83798559            fi
    … …  
    83858565            *" $absdir "*) ;;
    83868566            *)
    8387               case "$compile_rpath " in
     8567              case "$compile_rpath$compile_rpath_tail " in
    83888568              *" $absdir "*) ;;
    8389               *) func_append compile_rpath " $absdir" ;;
     8569              *) case $absdir in
     8570                 "$progdir/"*) func_append compile_rpath " $absdir" ;;
     8571                 *) func_append compile_rpath_tail " $absdir" ;;
     8572                 esac
    83908573              esac
    83918574              ;;
    … …  
    84188601        if test -n "$library_names" &&
    84198602           { test no = "$use_static_libs" || test -z "$old_library"; }; then
    8420           case $host in
    8421           *cygwin* | *mingw* | *cegcc* | *os2*)
     8603          case $host_os in
     8604          cygwin* | mingw* | windows* | cegcc* | os2*)
    84228605              # No point in relinking DLLs because paths are not encoded
    84238606              func_append notinst_deplibs " $lib"
    … …  
    84458628            echo
    84468629            if test prog = "$linkmode"; then
    8447               $ECHO "*** Warning: Linking the executable $output against the loadable module"
     8630              func_warning "Linking the executable $output against the loadable module"
    84488631            else
    8449               $ECHO "*** Warning: Linking the shared library $output against the loadable module"
     8632              func_warning "Linking the shared library $output against the loadable module"
    84508633            fi
    8451             $ECHO "*** $linklib is not portable!"
     8634            func_warning "$linklib is not portable!"
    84528635          fi
    84538636          if test lib = "$linkmode" &&
    … …  
    84598642            *" $absdir "*) ;;
    84608643            *)
    8461               case "$compile_rpath " in
     8644              case "$compile_rpath$compile_rpath_tail " in
    84628645              *" $absdir "*) ;;
    8463               *) func_append compile_rpath " $absdir" ;;
     8646              *) case $absdir in
     8647                 "$progdir/"*) func_append compile_rpath " $absdir" ;;
     8648                 *) func_append compile_rpath_tail " $absdir" ;;
     8649                 esac
    84648650              esac
    84658651              ;;
    … …  
    84888674            elif test -n "$soname_spec"; then
    84898675              # bleh windows
    8490               case $host in
    8491               *cygwin* | mingw* | *cegcc* | *os2*)
     8676              case $host_os in
     8677              cygwin* | mingw* | windows* | cegcc* | os2*)
    84928678                func_arith $current - $age
    84938679                major=$func_arith_result
    … …  
    85368722                  *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;;
    85378723                  *-*-sysv4*uw2*) add_dir=-L$dir ;;
     8724                  *-*-emscripten*) add_dir=-L$dir ;;
    85388725                  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
    85398726                    *-*-unixware7*) add_dir=-L$dir ;;
    … …  
    85448731                         $GREP ": [^:]* bundle" >/dev/null; then
    85458732                      if test "X$dlopenmodule" != "X$lib"; then
    8546                         $ECHO "*** Warning: lib $linklib is a module, not a shared library"
     8733                        func_warning "lib $linklib is a module, not a shared library"
    85478734                        if test -z "$old_library"; then
    8548                           echo
    8549                           echo "*** And there doesn't seem to be a static archive available"
    8550                           echo "*** The link will probably fail, sorry"
     8735                          func_warning "And there doesn't seem to be a static archive available"
     8736                          func_warning "The link will probably fail, sorry"
    85518737                        else
    85528738                          add=$dir/$old_library
    … …  
    86318817              add=$libdir/$linklib
    86328818            elif test yes = "$hardcode_minus_L"; then
    8633               add_dir=-L$libdir
     8819              add_dir=-L$lt_sysroot$libdir
    86348820              add=-l$name
    86358821            elif test yes = "$hardcode_shlibpath_var"; then
    … …  
    86488834            else
    86498835              # We cannot seem to hardcode it, guess we'll fake it.
    8650               add_dir=-L$libdir
     8836              add_dir=-L$lt_sysroot$libdir
    86518837              # Try looking first in the location we're being installed to.
    86528838              if test -n "$inst_prefix_dir"; then
    … …  
    86888874            # Just print a warning and add the library to dependency_libs so
    86898875            # that the program can be linked against the static library.
    8690             echo
    8691             $ECHO "*** Warning: This system cannot link to static lib archive $lib."
    8692             echo "*** I have the capability to make that library automatically link in when"
    8693             echo "*** you link to this library.  But I can only do this if you have a"
    8694             echo "*** shared version of the library, which you do not appear to have."
     8876            func_warning "This system cannot link to static lib archive $lib."
     8877            func_warning "I have the capability to make that library automatically link in when"
     8878            func_warning "you link to this library.  But I can only do this if you have a"
     8879            func_warning "shared version of the library, which you do not appear to have."
    86958880            if test yes = "$module"; then
    8696               echo "*** But as you try to build a module library, libtool will still create "
    8697               echo "*** a static module, that should work as long as the dlopening application"
    8698               echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
     8881              func_warning "But as you try to build a module library, libtool will still create "
     8882              func_warning "a static module, that should work as long as the dlopening application"
     8883              func_warning "is linked with the -dlopen flag to resolve symbols at runtime."
    86998884              if test -z "$global_symbol_pipe"; then
    8700                 echo
    8701                 echo "*** However, this would only work if libtool was able to extract symbol"
    8702                 echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
    8703                 echo "*** not find such a program.  So, this module is probably useless."
    8704                 echo "*** 'nm' from GNU binutils and a full rebuild may help."
     8885                func_warning "However, this would only work if libtool was able to extract symbol"
     8886                func_warning "lists from a program, using 'nm' or equivalent, but libtool could"
     8887                func_warning "not find such a program.  So, this module is probably useless."
     8888                func_warning "'nm' from GNU binutils and a full rebuild may help."
    87058889              fi
    87068890              if test no = "$build_old_libs"; then
    … …  
    88259009        fi # linkmode = lib
    88269010      done # for deplib in $libs
     9011
     9012      func_append temp_rpath "$temp_rpath_tail"
     9013      func_append compile_rpath "$compile_rpath_tail"
     9014
    88279015      if test link = "$pass"; then
    88289016        if test prog = "$linkmode"; then
    … …  
    88629050          eval tmp_libs=\"\$$var\"
    88639051          new_libs=
     9052          # FIXME: Pedantically, this is the right thing to do, so
     9053          #        that some nasty dependency loop isn't accidentally
     9054          #        broken: new_libs="$deplib $new_libs"
    88649055          for deplib in $tmp_libs; do
    8865             # FIXME: Pedantically, this is the right thing to do, so
    8866             #        that some nasty dependency loop isn't accidentally
    8867             #        broken:
    8868             #new_libs="$deplib $new_libs"
    8869             # Pragmatically, this seems to cause very few problems in
    8870             # practice:
    8871             case $deplib in
    8872             -L*) new_libs="$deplib $new_libs" ;;
    8873             -R*) ;;
    8874             *)
    8875               # And here is the reason: when a library appears more
    8876               # than once as an explicit dependence of a library, or
    8877               # is implicitly linked in more than once by the
    8878               # compiler, it is considered special, and multiple
    8879               # occurrences thereof are not removed.  Compare this
    8880               # with having the same library being listed as a
    8881               # dependency of multiple other libraries: in this case,
    8882               # we know (pedantically, we assume) the library does not
    8883               # need to be listed more than once, so we keep only the
    8884               # last copy.  This is not always right, but it is rare
    8885               # enough that we require users that really mean to play
    8886               # such unportable linking tricks to link the library
    8887               # using -Wl,-lname, so that libtool does not consider it
    8888               # for duplicate removal.
    8889               case " $specialdeplibs " in
    8890               *" $deplib "*) new_libs="$deplib $new_libs" ;;
     9056            if $opt_preserve_dup_deps; then
     9057              new_libs="$deplib $new_libs"
     9058            else
     9059              # Pragmatically, this seems to cause very few problems in
     9060              # practice:
     9061              case $deplib in
     9062              -L*) new_libs="$deplib $new_libs" ;;
     9063              -R*) ;;
    88919064              *)
    8892                 case " $new_libs " in
    8893                 *" $deplib "*) ;;
    8894                 *) new_libs="$deplib $new_libs" ;;
    8895                 esac
    8896                 ;;
     9065                # And here is the reason: when a library appears more
     9066                # than once as an explicit dependence of a library, or
     9067                # is implicitly linked in more than once by the
     9068                # compiler, it is considered special, and multiple
     9069                # occurrences thereof are not removed.  Compare this
     9070                # with having the same library being listed as a
     9071                # dependency of multiple other libraries: in this case,
     9072                # we know (pedantically, we assume) the library does not
     9073                # need to be listed more than once, so we keep only the
     9074                # last copy.  This is not always right, but it is rare
     9075                # enough that we require users that really mean to play
     9076                # such unportable linking tricks to link the library
     9077                # using -Wl,-lname, so that libtool does not consider it
     9078                # for duplicate removal.  And if not possible for portability
     9079                # reasons, then --preserve-dup-deps should be used.
     9080                case " $specialdeplibs " in
     9081                *" $deplib "*) new_libs="$deplib $new_libs" ;;
     9082                *)
     9083                  case " $new_libs " in
     9084                  *" $deplib "*) ;;
     9085                  *) new_libs="$deplib $new_libs" ;;
     9086                  esac
     9087                  ;;
     9088                esac
     9089                ;;
    88979090              esac
    8898               ;;
    8899             esac
     9091            fi
    89009092          done
    89019093          tmp_libs=
    … …  
    90299221          func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs"
    90309222        else
    9031           echo
    9032           $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
    9033           $ECHO "*** objects $objs is not portable!"
     9223          func_warning "Linking the shared library $output against the non-libtool objects $objs is not portable!"
    90349224          func_append libobjs " $objs"
    90359225        fi
    … …  
    90929282          case $version_type in
    90939283          # correct linux to gnu/linux during the next big refactor
    9094           darwin|freebsd-elf|linux|midnightbsd-elf|osf|windows|none)
     9284          darwin|freebsd-elf|linux|midnightbsd-elf|osf|qnx|windows|none)
    90959285            func_arith $number_major + $number_minor
    90969286            current=$func_arith_result
    … …  
    90989288            revision=$number_revision
    90999289            ;;
    9100           freebsd-aout|qnx|sunos)
     9290          freebsd-aout|sco|sunos)
    91019291            current=$number_major
    91029292            revision=$number_minor
    … …  
    91099299            revision=$number_minor
    91109300            lt_irix_increment=no
     9301            ;;
     9302          *)
     9303            func_fatal_configuration "$modename: unknown library version type '$version_type'"
    91119304            ;;
    91129305          esac
    … …  
    92459438
    92469439        qnx)
    9247           major=.$current
    9248           versuffix=.$current
     9440          func_arith $current - $age
     9441          major=.$func_arith_result
     9442          versuffix=$major.$age.$revision
    92499443          ;;
    92509444
    … …  
    93999593        if test -n "$rpath"; then
    94009594          case $host in
    9401           *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
     9595          *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
    94029596            # these systems don't actually have a c library (as such)!
    94039597            ;;
    … …  
    94499643          # implementing what was already the behavior.
    94509644          newdeplibs=$deplibs
    9451           ;;
    9452         test_compile)
    9453           # This code stresses the "libraries are programs" paradigm to its
    9454           # limits. Maybe even breaks it.  We compile a program, linking it
    9455           # against the deplibs as a proxy for the library.  Then we can check
    9456           # whether they linked in statically or dynamically with ldd.
    9457           $opt_dry_run || $RM conftest.c
    9458           cat > conftest.c <<EOF
    9459           int main() { return 0; }
    9460 EOF
    9461           $opt_dry_run || $RM conftest
    9462           if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
    9463             ldd_output=`ldd conftest`
    9464             for i in $deplibs; do
    9465               case $i in
    9466               -l*)
    9467                 func_stripname -l '' "$i"
    9468                 name=$func_stripname_result
    9469                 if test yes = "$allow_libtool_libs_with_static_runtimes"; then
    9470                   case " $predeps $postdeps " in
    9471                   *" $i "*)
    9472                     func_append newdeplibs " $i"
    9473                     i=
    9474                     ;;
    9475                   esac
    9476                 fi
    9477                 if test -n "$i"; then
    9478                   libname=`eval "\\$ECHO \"$libname_spec\""`
    9479                   deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
    9480                   set dummy $deplib_matches; shift
    9481                   deplib_match=$1
    9482                   if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
    9483                     func_append newdeplibs " $i"
    9484                   else
    9485                     droppeddeps=yes
    9486                     echo
    9487                     $ECHO "*** Warning: dynamic linker does not accept needed library $i."
    9488                     echo "*** I have the capability to make that library automatically link in when"
    9489                     echo "*** you link to this library.  But I can only do this if you have a"
    9490                     echo "*** shared version of the library, which I believe you do not have"
    9491                     echo "*** because a test_compile did reveal that the linker did not use it for"
    9492                     echo "*** its dynamic dependency list that programs get resolved with at runtime."
    9493                   fi
    9494                 fi
    9495                 ;;
    9496               *)
    9497                 func_append newdeplibs " $i"
    9498                 ;;
    9499               esac
    9500             done
    9501           else
    9502             # Error occurred in the first compile.  Let's try to salvage
    9503             # the situation: Compile a separate program for each library.
    9504             for i in $deplibs; do
    9505               case $i in
    9506               -l*)
    9507                 func_stripname -l '' "$i"
    9508                 name=$func_stripname_result
    9509                 $opt_dry_run || $RM conftest
    9510                 if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
    9511                   ldd_output=`ldd conftest`
    9512                   if test yes = "$allow_libtool_libs_with_static_runtimes"; then
    9513                     case " $predeps $postdeps " in
    9514                     *" $i "*)
    9515                       func_append newdeplibs " $i"
    9516                       i=
    9517                       ;;
    9518                     esac
    9519                   fi
    9520                   if test -n "$i"; then
    9521                     libname=`eval "\\$ECHO \"$libname_spec\""`
    9522                     deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
    9523                     set dummy $deplib_matches; shift
    9524                     deplib_match=$1
    9525                     if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
    9526                       func_append newdeplibs " $i"
    9527                     else
    9528                       droppeddeps=yes
    9529                       echo
    9530                       $ECHO "*** Warning: dynamic linker does not accept needed library $i."
    9531                       echo "*** I have the capability to make that library automatically link in when"
    9532                       echo "*** you link to this library.  But I can only do this if you have a"
    9533                       echo "*** shared version of the library, which you do not appear to have"
    9534                       echo "*** because a test_compile did reveal that the linker did not use this one"
    9535                       echo "*** as a dynamic dependency that programs can get resolved with at runtime."
    9536                     fi
    9537                   fi
    9538                 else
    9539                   droppeddeps=yes
    9540                   echo
    9541                   $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
    9542                   echo "*** make it link in!  You will probably need to install it or some"
    9543                   echo "*** library that it depends on before this library will be fully"
    9544                   echo "*** functional.  Installing it before continuing would be even better."
    9545                 fi
    9546                 ;;
    9547               *)
    9548                 func_append newdeplibs " $i"
    9549                 ;;
    9550               esac
    9551             done
    9552           fi
    95539645          ;;
    95549646        file_magic*)
    … …  
    96159707              if test -n "$a_deplib"; then
    96169708                droppeddeps=yes
    9617                 echo
    9618                 $ECHO "*** Warning: linker path does not have real file for library $a_deplib."
    9619                 echo "*** I have the capability to make that library automatically link in when"
    9620                 echo "*** you link to this library.  But I can only do this if you have a"
    9621                 echo "*** shared version of the library, which you do not appear to have"
    9622                 echo "*** because I did check the linker path looking for a file starting"
     9709                func_warning "Linker path does not have real file for library $a_deplib."
     9710                func_warning "I have the capability to make that library automatically link in when"
     9711                func_warning "you link to this library.  But I can only do this if you have a"
     9712                func_warning "shared version of the library, which you do not appear to have"
     9713                func_warning "because I did check the linker path looking for a file starting"
    96239714                if test -z "$potlib"; then
    9624                   $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
     9715                  func_warning "with $libname but no candidates were found. (...for file magic test)"
    96259716                else
    9626                   $ECHO "*** with $libname and none of the candidates passed a file format test"
    9627                   $ECHO "*** using a file magic. Last file checked: $potlib"
     9717                  func_warning "with $libname and none of the candidates passed a file format test"
     9718                  func_warning "using a file magic. Last file checked: $potlib"
    96289719                fi
    96299720              fi
    … …  
    96699760              if test -n "$a_deplib"; then
    96709761                droppeddeps=yes
    9671                 echo
    9672                 $ECHO "*** Warning: linker path does not have real file for library $a_deplib."
    9673                 echo "*** I have the capability to make that library automatically link in when"
    9674                 echo "*** you link to this library.  But I can only do this if you have a"
    9675                 echo "*** shared version of the library, which you do not appear to have"
    9676                 echo "*** because I did check the linker path looking for a file starting"
     9762                func_warning "Linker path does not have real file for library $a_deplib."
     9763                func_warning "I have the capability to make that library automatically link in when"
     9764                func_warning "you link to this library.  But I can only do this if you have a"
     9765                func_warning "shared version of the library, which you do not appear to have"
     9766                func_warning "because I did check the linker path looking for a file starting"
    96779767                if test -z "$potlib"; then
    9678                   $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
     9768                  func_warning "with $libname but no candidates were found. (...for regex pattern test)"
    96799769                else
    9680                   $ECHO "*** with $libname and none of the candidates passed a file format test"
    9681                   $ECHO "*** using a regex pattern. Last file checked: $potlib"
     9770                  func_warning "with $libname and none of the candidates passed a file format test"
     9771                  func_warning "using a regex pattern. Last file checked: $potlib"
    96829772                fi
    96839773              fi
    … …  
    97039793            echo
    97049794            if test none = "$deplibs_check_method"; then
    9705               echo "*** Warning: inter-library dependencies are not supported in this platform."
     9795              func_warning "Inter-library dependencies are not supported in this platform."
    97069796            else
    9707               echo "*** Warning: inter-library dependencies are not known to be supported."
     9797              func_warning "Inter-library dependencies are not known to be supported."
    97089798            fi
    9709             echo "*** All declared inter-library dependencies are being dropped."
     9799            func_warning "All declared inter-library dependencies are being dropped."
    97109800            droppeddeps=yes
    97119801            ;;
    … …  
    97289818        if test yes = "$droppeddeps"; then
    97299819          if test yes = "$module"; then
    9730             echo
    9731             echo "*** Warning: libtool could not satisfy all declared inter-library"
    9732             $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
    9733             echo "*** a static module, that should work as long as the dlopening"
    9734             echo "*** application is linked with the -dlopen flag."
     9820            func_warning "libtool could not satisfy all declared inter-library"
     9821            func_warning "dependencies of module $libname.  Therefore, libtool will create"
     9822            func_warning "a static module, that should work as long as the dlopening"
     9823            func_warning "application is linked with the -dlopen flag."
    97359824            if test -z "$global_symbol_pipe"; then
    9736               echo
    9737               echo "*** However, this would only work if libtool was able to extract symbol"
    9738               echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
    9739               echo "*** not find such a program.  So, this module is probably useless."
    9740               echo "*** 'nm' from GNU binutils and a full rebuild may help."
     9825              func_warning "However, this would only work if libtool was able to extract symbol"
     9826              func_warning "lists from a program, using 'nm' or equivalent, but libtool could"
     9827              func_warning "not find such a program.  So, this module is probably useless."
     9828              func_warning "'nm' from GNU binutils and a full rebuild may help."
    97419829            fi
    97429830            if test no = "$build_old_libs"; then
    … …  
    991310001        orig_export_symbols=
    991410002        case $host_os in
    9915         cygwin* | mingw* | cegcc*)
     10003        cygwin* | mingw* | windows* | cegcc*)
    991610004          if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
    991710005            # exporting using user supplied symfile
    … …  
    1011110199          k=1
    1011210200
    10113           if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then
    10114             output=$output_objdir/$output_la.lnkscript
    10115             func_verbose "creating GNU ld script: $output"
    10116             echo 'INPUT (' > $output
    10117             for obj in $save_libobjs
    10118             do
    10119               func_to_tool_file "$obj"
    10120               $ECHO "$func_to_tool_file_result" >> $output
    10121             done
    10122             echo ')' >> $output
    10123             func_append delfiles " $output"
    10124             func_to_tool_file "$output"
    10125             output=$func_to_tool_file_result
    10126           elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then
     10201          if test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then
    1012710202            output=$output_objdir/$output_la.lnk
    1012810203            func_verbose "creating linker input file list: $output"
    … …  
    1014310218            func_to_tool_file "$output"
    1014410219            output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
     10220          elif test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then
     10221            output=$output_objdir/$output_la.lnkscript
     10222            func_verbose "creating GNU ld script: $output"
     10223            echo 'INPUT (' > $output
     10224            for obj in $save_libobjs
     10225            do
     10226              func_to_tool_file "$obj"
     10227              $ECHO "$func_to_tool_file_result" >> $output
     10228            done
     10229            echo ')' >> $output
     10230            func_append delfiles " $output"
     10231            func_to_tool_file "$output"
     10232            output=$func_to_tool_file_result
    1014510233          else
    1014610234            if test -n "$save_libobjs"; then
    … …  
    1058310671        fi
    1058410672        case $host in
    10585         *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
     10673        *-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-cegcc*)
    1058610674          testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'`
    1058710675          case :$dllsearchpath: in
    … …  
    1066110749        wrappers_required=false
    1066210750        ;;
    10663       *cygwin* | *mingw* )
     10751      *cygwin* | *mingw* | *windows* )
    1066410752        test yes = "$build_libtool_libs" || wrappers_required=false
    1066510753        ;;
    … …  
    1081510903        esac
    1081610904        case $host in
    10817           *cygwin* | *mingw* )
     10905          *cygwin* | *mingw* | windows* )
    1081810906            func_dirname_and_basename "$output" "" "."
    1081910907            output_name=$func_basename_result
    … …  
    1114911237          tdlname=$dlname
    1115011238          case $host,$output,$installed,$module,$dlname in
    11151             *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
     11239            *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *windows*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
    1115211240              # If a -bindir argument was supplied, place the dll there.
    1115311241              if test -n "$bindir"; then

  • trunk/src/libs/libpng-1.6.45/mips/filter_msa_intrinsics.c

    r103316 r107813  
    1 
    21/* filter_msa_intrinsics.c - MSA optimised filter functions
    32 *
    … …  
    4847       uint32_t val_m;                           \
    4948                                                 \
    50        asm volatile (                            \
     49       __asm__ volatile (                        \
    5150           "lw  %[val_m],  %[psrc_lw_m]  \n\t"   \
    5251                                                 \
    … …  
    6362       uint16_t val_m = (val);                   \
    6463                                                 \
    65        asm volatile (                            \
     64       __asm__ volatile (                        \
    6665           "sh  %[val_m],  %[pdst_sh_m]  \n\t"   \
    6766                                                 \
    … …  
    7675       uint32_t val_m = (val);                   \
    7776                                                 \
    78        asm volatile (                            \
     77       __asm__ volatile (                        \
    7978           "sw  %[val_m],  %[pdst_sw_m]  \n\t"   \
    8079                                                 \
    … …  
    8483   }
    8584
    86        #if (__mips == 64)
     85   #if __mips == 64
    8786        #define SD(val, pdst)                         \
    8887        {                                             \
    … …  
    9089            uint64_t val_m = (val);                   \
    9190                                                      \
    92             asm volatile (                            \
     91            __asm__ volatile (                        \
    9392                "sd  %[val_m],  %[pdst_sd_m]  \n\t"   \
    9493                                                      \
    … …  
    9796            );                                        \
    9897        }
    99     #else
     98   #else
    10099        #define SD(val, pdst)                                          \
    101100        {                                                              \
    … …  
    109108            SW(val1_m, pdst_sd_m + 4);                                 \
    110109        }
    111     #endif
     110   #endif /* __mips == 64 */
    112111#else
    113112   #define MSA_SRLI_B(a, b)   (a >> b)
    114113
    115 #if (__mips_isa_rev >= 6)
     114#if __mips_isa_rev >= 6
    116115   #define LW(psrc)                              \
    117116   ( {                                           \
    … …  
    119118       uint32_t val_m;                           \
    120119                                                 \
    121        asm volatile (                            \
     120       __asm__ volatile (                        \
    122121           "lw  %[val_m],  %[psrc_lw_m]  \n\t"   \
    123122                                                 \
    … …  
    134133       uint16_t val_m = (val);                   \
    135134                                                 \
    136        asm volatile (                            \
     135       __asm__ volatile (                        \
    137136           "sh  %[val_m],  %[pdst_sh_m]  \n\t"   \
    138137                                                 \
    … …  
    147146       uint32_t val_m = (val);                   \
    148147                                                 \
    149        asm volatile (                            \
     148       __asm__ volatile (                        \
    150149           "sw  %[val_m],  %[pdst_sw_m]  \n\t"   \
    151150                                                 \
    … …  
    155154   }
    156155
    157    #if (__mips == 64)
     156   #if __mips == 64
    158157        #define SD(val, pdst)                         \
    159158        {                                             \
    … …  
    161160            uint64_t val_m = (val);                   \
    162161                                                      \
    163             asm volatile (                            \
     162            __asm__ volatile (                        \
    164163                "sd  %[val_m],  %[pdst_sd_m]  \n\t"   \
    165164                                                      \
    … …  
    168167            );                                        \
    169168        }
    170     #else
     169   #else
    171170        #define SD(val, pdst)                                          \
    172171        {                                                              \
    … …  
    180179            SW(val1_m, pdst_sd_m + 4);                                 \
    181180        }
    182     #endif
    183 #else  // !(__mips_isa_rev >= 6)
     181   #endif /* __mips == 64 */
     182#else
    184183   #define LW(psrc)                              \
    185184   ( {                                           \
    … …  
    187186       uint32_t val_m;                           \
    188187                                                 \
    189        asm volatile (                            \
     188       __asm__ volatile (                        \
    190189           "ulw  %[val_m],  %[psrc_lw_m]  \n\t"  \
    191190                                                 \
    … …  
    202201       uint16_t val_m = (val);                   \
    203202                                                 \
    204        asm volatile (                            \
     203       __asm__ volatile (                        \
    205204           "ush  %[val_m],  %[pdst_sh_m]  \n\t"  \
    206205                                                 \
    … …  
    215214       uint32_t val_m = (val);                   \
    216215                                                 \
    217        asm volatile (                            \
     216       __asm__ volatile (                        \
    218217           "usw  %[val_m],  %[pdst_sw_m]  \n\t"  \
    219218                                                 \
    … …  
    223222   }
    224223
    225    #define SD(val, pdst)                                          \
     224   #define SD(val, pdst)                                           \
    226225    {                                                              \
    227226        uint8_t *pdst_sd_m = (uint8_t *) (pdst);                   \
    … …  
    239238        uint8_t *pdst_m = (uint8_t *) (pdst);  \
    240239                                               \
    241         asm volatile (                         \
     240        __asm__ volatile (                     \
    242241            "usw  $0,  %[pdst_m]  \n\t"        \
    243242                                               \
    … …  
    246245        );                                     \
    247246    }
    248 #endif  // (__mips_isa_rev >= 6)
     247#endif /* __mips_isa_rev >= 6 */
    249248#endif
    250249

  • trunk/src/libs/libpng-1.6.45/mips/mips_init.c

    r103316 r107813  
    1 
    21/* mips_init.c - MSA optimised filter functions
    32 *

  • trunk/src/libs/libpng-1.6.45/missing

    r103316 r107813  
    11#! /bin/sh
    2 # Common wrapper for a few potentially missing GNU programs.
    3 
    4 scriptversion=2018-03-07.03; # UTC
    5 
    6 # Copyright (C) 1996-2021 Free Software Foundation, Inc.
     2# Common wrapper for a few potentially missing GNU and other programs.
     3
     4scriptversion=2024-06-07.14; # UTC
     5
     6# shellcheck disable=SC2006,SC2268 # we must support pre-POSIX shells
     7
     8# Copyright (C) 1996-2024 Free Software Foundation, Inc.
    79# Originally written by Fran,cois Pinard <[email protected]>, 1996.
    810
    … …  
    5557
    5658Supported PROGRAM values:
    57   aclocal   autoconf  autoheader   autom4te  automake  makeinfo
    58   bison     yacc      flex         lex       help2man
     59aclocal autoconf autogen  autoheader autom4te automake autoreconf
     60bison   flex     help2man lex        makeinfo perl     yacc
    5961
    6062Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
    6163'g' are ignored when checking the name.
    6264
    63 Send bug reports to <[email protected]>."
     65Report bugs to <[email protected]>.
     66GNU Automake home page: <https://www.gnu.org/software/automake/>.
     67General help using GNU software: <https://www.gnu.org/gethelp/>."
    6468    exit $?
    6569    ;;
    6670
    6771  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
    68     echo "missing $scriptversion (GNU Automake)"
     72    echo "missing (GNU Automake) $scriptversion"
    6973    exit $?
    7074    ;;
    … …  
    109113{
    110114  case $1 in
    111     aclocal|automake)
     115    aclocal|automake|autoreconf)
    112116      echo "The '$1' program is part of the GNU Automake package:"
    113117      echo "<$gnu_software_URL/automake>"
    … …  
    123127      echo "<$gnu_software_URL/m4/>"
    124128      echo "<$perl_URL>"
     129      ;;
     130    *)
     131      :
    125132      ;;
    126133  esac
    … …  
    138145
    139146  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
     147  autoheader_deps="'acconfig.h'"
     148  automake_deps="'Makefile.am'"
     149  aclocal_deps="'acinclude.m4'"
    140150  case $normalized_program in
     151    aclocal*)
     152      echo "You should only need it if you modified $aclocal_deps or"
     153      echo "$configure_deps."
     154      ;;
    141155    autoconf*)
    142       echo "You should only need it if you modified 'configure.ac',"
    143       echo "or m4 files included by it."
    144       program_details 'autoconf'
     156      echo "You should only need it if you modified $configure_deps."
     157      ;;
     158    autogen*)
     159      echo "You should only need it if you modified a '.def' or '.tpl' file."
     160      echo "You may want to install the GNU AutoGen package:"
     161      echo "<$gnu_software_URL/autogen/>"
    145162      ;;
    146163    autoheader*)
    147       echo "You should only need it if you modified 'acconfig.h' or"
    148       echo "$configure_deps."
    149       program_details 'autoheader'
     164      echo "You should only need it if you modified $autoheader_deps or"
     165      echo "$configure_deps."
    150166      ;;
    151167    automake*)
    152       echo "You should only need it if you modified 'Makefile.am' or"
    153       echo "$configure_deps."
    154       program_details 'automake'
    155       ;;
    156     aclocal*)
    157       echo "You should only need it if you modified 'acinclude.m4' or"
    158       echo "$configure_deps."
    159       program_details 'aclocal'
    160       ;;
    161    autom4te*)
     168      echo "You should only need it if you modified $automake_deps or"
     169      echo "$configure_deps."
     170      ;;
     171    autom4te*)
    162172      echo "You might have modified some maintainer files that require"
    163173      echo "the 'autom4te' program to be rebuilt."
    164       program_details 'autom4te'
     174      ;;
     175    autoreconf*)
     176      echo "You should only need it if you modified $aclocal_deps or"
     177      echo "$automake_deps or $autoheader_deps or $automake_deps or"
     178      echo "$configure_deps."
    165179      ;;
    166180    bison*|yacc*)
    … …  
    168182      echo "You may want to install the GNU Bison package:"
    169183      echo "<$gnu_software_URL/bison/>"
    170       ;;
    171     lex*|flex*)
    172       echo "You should only need it if you modified a '.l' file."
    173       echo "You may want to install the Fast Lexical Analyzer package:"
    174       echo "<$flex_URL>"
    175184      ;;
    176185    help2man*)
    … …  
    180189      echo "<$gnu_software_URL/help2man/>"
    181190    ;;
     191    lex*|flex*)
     192      echo "You should only need it if you modified a '.l' file."
     193      echo "You may want to install the Fast Lexical Analyzer package:"
     194      echo "<$flex_URL>"
     195      ;;
    182196    makeinfo*)
    183197      echo "You should only need it if you modified a '.texi' file, or"
    … …  
    190204      echo "<$gnu_software_URL/make/>"
    191205      ;;
     206    perl*)
     207      echo "You should only need it to run GNU Autoconf, GNU Automake, "
     208      echo "  assorted other tools, or if you modified a Perl source file."
     209      echo "You may want to install the Perl 5 language interpreter:"
     210      echo "<$perl_URL>"
     211      ;;
    192212    *)
    193213      echo "You might have modified some files without having the proper"
    … …  
    198218      ;;
    199219  esac
     220  program_details "$normalized_program"
    200221}
    201222

  • trunk/src/libs/libpng-1.6.45/png.5

    r105469 r107813  
    1 .TH PNG 5 "February 23, 2024"
     1.TH PNG 5 "January 7, 2025"
    22.SH NAME
    33png \- Portable Network Graphics (PNG) format
    … …  
    2020.SH "SEE ALSO"
    2121.BR "libpng"(3), " zlib"(3), " deflate"(5), " " and " zlib"(5)
     22.LP
     23PNG Specification (Third Edition) Candidate Recommendation Draft, July 2024:
     24.IP
     25.br
     26https://www.w3.org/TR/2024/CRD-png-3-20240718/
    2227.LP
    2328PNG Specification (Second Edition), November 2003:

  • trunk/src/libs/libpng-1.6.45/png.c

    r105469 r107813  
    1 
    21/* png.c - location for general purpose libpng functions
    32 *
    4  * Copyright (c) 2018-2024 Cosmin Truta
     3 * Copyright (c) 2018-2025 Cosmin Truta
    54 * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
    65 * Copyright (c) 1996-1997 Andreas Dilger
    … …  
    1514
    1615/* Generate a compiler error if there is an old png.h in the search path. */
    17 typedef png_libpng_version_1_6_43 Your_png_h_is_not_version_1_6_43;
     16typedef png_libpng_version_1_6_45 Your_png_h_is_not_version_1_6_45;
    1817
    1918/* Tells libpng that we have already handled the first "num_bytes" bytes
    … …  
    795794#else
    796795   return PNG_STRING_NEWLINE \
    797       "libpng version 1.6.43" PNG_STRING_NEWLINE \
    798       "Copyright (c) 2018-2024 Cosmin Truta" PNG_STRING_NEWLINE \
     796      "libpng version 1.6.45" PNG_STRING_NEWLINE \
     797      "Copyright (c) 2018-2025 Cosmin Truta" PNG_STRING_NEWLINE \
    799798      "Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson" \
    800799      PNG_STRING_NEWLINE \
    … …  
    12041203
    12051204#ifdef PNG_COLORSPACE_SUPPORTED
     1205static png_int_32
     1206png_fp_add(png_int_32 addend0, png_int_32 addend1, int *error)
     1207{
     1208   /* Safely add two fixed point values setting an error flag and returning 0.5
     1209    * on overflow.
     1210    * IMPLEMENTATION NOTE: ANSI requires signed overflow not to occur, therefore
     1211    * relying on addition of two positive values producing a negative one is not
     1212    * safe.
     1213    */
     1214   if (addend0 > 0)
     1215   {
     1216      if (0x7fffffff - addend0 >= addend1)
     1217         return addend0+addend1;
     1218   }
     1219   else if (addend0 < 0)
     1220   {
     1221      if (-0x7fffffff - addend0 <= addend1)
     1222         return addend0+addend1;
     1223   }
     1224   else
     1225      return addend1;
     1226
     1227   *error = 1;
     1228   return PNG_FP_1/2;
     1229}
     1230
     1231static png_int_32
     1232png_fp_sub(png_int_32 addend0, png_int_32 addend1, int *error)
     1233{
     1234   /* As above but calculate addend0-addend1. */
     1235   if (addend1 > 0)
     1236   {
     1237      if (-0x7fffffff + addend1 <= addend0)
     1238         return addend0-addend1;
     1239   }
     1240   else if (addend1 < 0)
     1241   {
     1242      if (0x7fffffff + addend1 >= addend0)
     1243         return addend0-addend1;
     1244   }
     1245   else
     1246      return addend0;
     1247
     1248   *error = 1;
     1249   return PNG_FP_1/2;
     1250}
     1251
     1252static int
     1253png_safe_add(png_int_32 *addend0_and_result, png_int_32 addend1,
     1254      png_int_32 addend2)
     1255{
     1256   /* Safely add three integers.  Returns 0 on success, 1 on overflow.  Does not
     1257    * set the result on overflow.
     1258    */
     1259   int error = 0;
     1260   int result = png_fp_add(*addend0_and_result,
     1261                           png_fp_add(addend1, addend2, &error),
     1262                           &error);
     1263   if (!error) *addend0_and_result = result;
     1264   return error;
     1265}
     1266
    12061267/* Added at libpng-1.5.5 to support read and write of true CIEXYZ values for
    12071268 * cHRM, as opposed to using chromaticities.  These internal APIs return
    … …  
    12121273png_xy_from_XYZ(png_xy *xy, const png_XYZ *XYZ)
    12131274{
    1214    png_int_32 d, dwhite, whiteX, whiteY;
    1215 
    1216    d = XYZ->red_X + XYZ->red_Y + XYZ->red_Z;
    1217    if (png_muldiv(&xy->redx, XYZ->red_X, PNG_FP_1, d) == 0)
     1275   png_int_32 d, dred, dgreen, dblue, dwhite, whiteX, whiteY;
     1276
     1277   /* 'd' in each of the blocks below is just X+Y+Z for each component,
     1278    * x, y and z are X,Y,Z/(X+Y+Z).
     1279    */
     1280   d = XYZ->red_X;
     1281   if (png_safe_add(&d, XYZ->red_Y, XYZ->red_Z))
    12181282      return 1;
    1219    if (png_muldiv(&xy->redy, XYZ->red_Y, PNG_FP_1, d) == 0)
     1283   dred = d;
     1284   if (png_muldiv(&xy->redx, XYZ->red_X, PNG_FP_1, dred) == 0)
     1285      return 1;
     1286   if (png_muldiv(&xy->redy, XYZ->red_Y, PNG_FP_1, dred) == 0)
     1287      return 1;
     1288
     1289   d = XYZ->green_X;
     1290   if (png_safe_add(&d, XYZ->green_Y, XYZ->green_Z))
     1291      return 1;
     1292   dgreen = d;
     1293   if (png_muldiv(&xy->greenx, XYZ->green_X, PNG_FP_1, dgreen) == 0)
     1294      return 1;
     1295   if (png_muldiv(&xy->greeny, XYZ->green_Y, PNG_FP_1, dgreen) == 0)
     1296      return 1;
     1297
     1298   d = XYZ->blue_X;
     1299   if (png_safe_add(&d, XYZ->blue_Y, XYZ->blue_Z))
     1300      return 1;
     1301   dblue = d;
     1302   if (png_muldiv(&xy->bluex, XYZ->blue_X, PNG_FP_1, dblue) == 0)
     1303      return 1;
     1304   if (png_muldiv(&xy->bluey, XYZ->blue_Y, PNG_FP_1, dblue) == 0)
     1305      return 1;
     1306
     1307   /* The reference white is simply the sum of the end-point (X,Y,Z) vectors so
     1308    * the fillowing calculates (X+Y+Z) of the reference white (media white,
     1309    * encoding white) itself:
     1310    */
     1311   d = dblue;
     1312   if (png_safe_add(&d, dred, dgreen))
    12201313      return 1;
    12211314   dwhite = d;
    1222    whiteX = XYZ->red_X;
    1223    whiteY = XYZ->red_Y;
    1224 
    1225    d = XYZ->green_X + XYZ->green_Y + XYZ->green_Z;
    1226    if (png_muldiv(&xy->greenx, XYZ->green_X, PNG_FP_1, d) == 0)
     1315
     1316   /* Find the white X,Y values from the sum of the red, green and blue X,Y
     1317    * values.
     1318    */
     1319   d = XYZ->red_X;
     1320   if (png_safe_add(&d, XYZ->green_X, XYZ->blue_X))
    12271321      return 1;
    1228    if (png_muldiv(&xy->greeny, XYZ->green_Y, PNG_FP_1, d) == 0)
     1322   whiteX = d;
     1323
     1324   d = XYZ->red_Y;
     1325   if (png_safe_add(&d, XYZ->green_Y, XYZ->blue_Y))
    12291326      return 1;
    1230    dwhite += d;
    1231    whiteX += XYZ->green_X;
    1232    whiteY += XYZ->green_Y;
    1233 
    1234    d = XYZ->blue_X + XYZ->blue_Y + XYZ->blue_Z;
    1235    if (png_muldiv(&xy->bluex, XYZ->blue_X, PNG_FP_1, d) == 0)
    1236       return 1;
    1237    if (png_muldiv(&xy->bluey, XYZ->blue_Y, PNG_FP_1, d) == 0)
    1238       return 1;
    1239    dwhite += d;
    1240    whiteX += XYZ->blue_X;
    1241    whiteY += XYZ->blue_Y;
    1242 
    1243    /* The reference white is simply the sum of the end-point (X,Y,Z) vectors,
    1244     * thus:
    1245     */
     1327   whiteY = d;
     1328
    12461329   if (png_muldiv(&xy->whitex, whiteX, PNG_FP_1, dwhite) == 0)
    12471330      return 1;
    … …  
    12621345    * points, but they are used to cover the possible colors).  We check
    12631346    * xy->whitey against 5, not 0, to avoid a possible integer overflow.
    1264     */
    1265    if (xy->redx   < 0 || xy->redx > PNG_FP_1) return 1;
    1266    if (xy->redy   < 0 || xy->redy > PNG_FP_1-xy->redx) return 1;
    1267    if (xy->greenx < 0 || xy->greenx > PNG_FP_1) return 1;
    1268    if (xy->greeny < 0 || xy->greeny > PNG_FP_1-xy->greenx) return 1;
    1269    if (xy->bluex  < 0 || xy->bluex > PNG_FP_1) return 1;
    1270    if (xy->bluey  < 0 || xy->bluey > PNG_FP_1-xy->bluex) return 1;
    1271    if (xy->whitex < 0 || xy->whitex > PNG_FP_1) return 1;
    1272    if (xy->whitey < 5 || xy->whitey > PNG_FP_1-xy->whitex) return 1;
     1347    *
     1348    * The limits here will *not* accept ACES AP0, where bluey is -7700
     1349    * (-0.0770) because the PNG spec itself requires the xy values to be
     1350    * unsigned.  whitey is also required to be 5 or more to avoid overflow.
     1351    *
     1352    * Instead the upper limits have been relaxed to accomodate ACES AP1 where
     1353    * redz ends up as -600 (-0.006).  ProPhotoRGB was already "in range."
     1354    * The new limit accomodates the AP0 and AP1 ranges for z but not AP0 redy.
     1355    */
     1356   const png_fixed_point fpLimit = PNG_FP_1+(PNG_FP_1/10);
     1357   if (xy->redx   < 0 || xy->redx > fpLimit) return 1;
     1358   if (xy->redy   < 0 || xy->redy > fpLimit-xy->redx) return 1;
     1359   if (xy->greenx < 0 || xy->greenx > fpLimit) return 1;
     1360   if (xy->greeny < 0 || xy->greeny > fpLimit-xy->greenx) return 1;
     1361   if (xy->bluex  < 0 || xy->bluex > fpLimit) return 1;
     1362   if (xy->bluey  < 0 || xy->bluey > fpLimit-xy->bluex) return 1;
     1363   if (xy->whitex < 0 || xy->whitex > fpLimit) return 1;
     1364   if (xy->whitey < 5 || xy->whitey > fpLimit-xy->whitex) return 1;
    12731365
    12741366   /* The reverse calculation is more difficult because the original tristimulus
    … …  
    14151507    *
    14161508    * Accuracy:
    1417     * The input values have 5 decimal digits of accuracy.  The values are all in
    1418     * the range 0 < value < 1, so simple products are in the same range but may
    1419     * need up to 10 decimal digits to preserve the original precision and avoid
    1420     * underflow.  Because we are using a 32-bit signed representation we cannot
    1421     * match this; the best is a little over 9 decimal digits, less than 10.
     1509    * The input values have 5 decimal digits of accuracy.
     1510    *
     1511    * In the previous implementation the values were all in the range 0 < value
     1512    * < 1, so simple products are in the same range but may need up to 10
     1513    * decimal digits to preserve the original precision and avoid underflow.
     1514    * Because we are using a 32-bit signed representation we cannot match this;
     1515    * the best is a little over 9 decimal digits, less than 10.
     1516    *
     1517    * This range has now been extended to allow values up to 1.1, or 110,000 in
     1518    * fixed point.
    14221519    *
    14231520    * The approach used here is to preserve the maximum precision within the
    14241521    * signed representation.  Because the red-scale calculation above uses the
    1425     * difference between two products of values that must be in the range -1..+1
    1426     * it is sufficient to divide the product by 7; ceil(100,000/32767*2).  The
    1427     * factor is irrelevant in the calculation because it is applied to both
    1428     * numerator and denominator.
     1522    * difference between two products of values that must be in the range
     1523    * -1.1..+1.1 it is sufficient to divide the product by 8;
     1524    * ceil(121,000/32767*2).  The factor is irrelevant in the calculation
     1525    * because it is applied to both numerator and denominator.
    14291526    *
    14301527    * Note that the values of the differences of the products of the
    … …  
    14481545    *    0.258728243040113 0.724682314948566 0.016589442011321
    14491546    */
    1450    /* By the argument, above overflow should be impossible here. The return
    1451     * value of 2 indicates an internal error to the caller.
    1452     */
    1453    if (png_muldiv(&left, xy->greenx-xy->bluex, xy->redy - xy->bluey, 7) == 0)
    1454       return 2;
    1455    if (png_muldiv(&right, xy->greeny-xy->bluey, xy->redx - xy->bluex, 7) == 0)
    1456       return 2;
    1457    denominator = left - right;
     1547   int error = 0;
     1548
     1549   /* By the argument above overflow should be impossible here, however the
     1550    * code now simply returns a failure code.  The xy subtracts in the arguments
     1551    * to png_muldiv are *not* checked for overflow because the checks at the
     1552    * start guarantee they are in the range 0..110000 and png_fixed_point is a
     1553    * 32-bit signed number.
     1554    */
     1555   if (png_muldiv(&left, xy->greenx-xy->bluex, xy->redy - xy->bluey, 8) == 0)
     1556      return 1;
     1557   if (png_muldiv(&right, xy->greeny-xy->bluey, xy->redx - xy->bluex, 8) == 0)
     1558      return 1;
     1559   denominator = png_fp_sub(left, right, &error);
     1560   if (error) return 1;
    14581561
    14591562   /* Now find the red numerator. */
    1460    if (png_muldiv(&left, xy->greenx-xy->bluex, xy->whitey-xy->bluey, 7) == 0)
    1461       return 2;
    1462    if (png_muldiv(&right, xy->greeny-xy->bluey, xy->whitex-xy->bluex, 7) == 0)
    1463       return 2;
     1563   if (png_muldiv(&left, xy->greenx-xy->bluex, xy->whitey-xy->bluey, 8) == 0)
     1564      return 1;
     1565   if (png_muldiv(&right, xy->greeny-xy->bluey, xy->whitex-xy->bluex, 8) == 0)
     1566      return 1;
    14641567
    14651568   /* Overflow is possible here and it indicates an extreme set of PNG cHRM
    … …  
    14681571    * into the denominator, which tends to produce a small number.
    14691572    */
    1470    if (png_muldiv(&red_inverse, xy->whitey, denominator, left-right) == 0 ||
     1573   if (png_muldiv(&red_inverse, xy->whitey, denominator,
     1574                  png_fp_sub(left, right, &error)) == 0 || error ||
    14711575       red_inverse <= xy->whitey /* r+g+b scales = white scale */)
    14721576      return 1;
    14731577
    14741578   /* Similarly for green_inverse: */
    1475    if (png_muldiv(&left, xy->redy-xy->bluey, xy->whitex-xy->bluex, 7) == 0)
    1476       return 2;
    1477    if (png_muldiv(&right, xy->redx-xy->bluex, xy->whitey-xy->bluey, 7) == 0)
    1478       return 2;
    1479    if (png_muldiv(&green_inverse, xy->whitey, denominator, left-right) == 0 ||
     1579   if (png_muldiv(&left, xy->redy-xy->bluey, xy->whitex-xy->bluex, 8) == 0)
     1580      return 1;
     1581   if (png_muldiv(&right, xy->redx-xy->bluex, xy->whitey-xy->bluey, 8) == 0)
     1582      return 1;
     1583   if (png_muldiv(&green_inverse, xy->whitey, denominator,
     1584                  png_fp_sub(left, right, &error)) == 0 || error ||
    14801585       green_inverse <= xy->whitey)
    14811586      return 1;
    … …  
    14841589    * can still produce 0 for extreme cHRM values.
    14851590    */
    1486    blue_scale = png_reciprocal(xy->whitey) - png_reciprocal(red_inverse) -
    1487        png_reciprocal(green_inverse);
    1488    if (blue_scale <= 0)
     1591   blue_scale = png_fp_sub(png_fp_sub(png_reciprocal(xy->whitey),
     1592                                      png_reciprocal(red_inverse), &error),
     1593                           png_reciprocal(green_inverse), &error);
     1594   if (error || blue_scale <= 0)
    14891595      return 1;
    14901596
    14911597
    1492    /* And fill in the png_XYZ: */
     1598   /* And fill in the png_XYZ.  Again the subtracts are safe because of the
     1599    * checks on the xy values at the start (the subtracts just calculate the
     1600    * corresponding z values.)
     1601    */
    14931602   if (png_muldiv(&XYZ->red_X, xy->redx, PNG_FP_1, red_inverse) == 0)
    14941603      return 1;
    … …  
    15211630png_XYZ_normalize(png_XYZ *XYZ)
    15221631{
    1523    png_int_32 Y;
    1524 
    1525    if (XYZ->red_Y < 0 || XYZ->green_Y < 0 || XYZ->blue_Y < 0 ||
    1526       XYZ->red_X < 0 || XYZ->green_X < 0 || XYZ->blue_X < 0 ||
    1527       XYZ->red_Z < 0 || XYZ->green_Z < 0 || XYZ->blue_Z < 0)
     1632   png_int_32 Y, Ytemp;
     1633
     1634   /* Normalize by scaling so the sum of the end-point Y values is PNG_FP_1. */
     1635   Ytemp = XYZ->red_Y;
     1636   if (png_safe_add(&Ytemp, XYZ->green_Y, XYZ->blue_Y))
    15281637      return 1;
    15291638
    1530    /* Normalize by scaling so the sum of the end-point Y values is PNG_FP_1.
    1531     * IMPLEMENTATION NOTE: ANSI requires signed overflow not to occur, therefore
    1532     * relying on addition of two positive values producing a negative one is not
    1533     * safe.
    1534     */
    1535    Y = XYZ->red_Y;
    1536    if (0x7fffffff - Y < XYZ->green_X)
    1537       return 1;
    1538    Y += XYZ->green_Y;
    1539    if (0x7fffffff - Y < XYZ->blue_X)
    1540       return 1;
    1541    Y += XYZ->blue_Y;
     1639   Y = Ytemp;
    15421640
    15431641   if (Y != PNG_FP_1)

  • trunk/src/libs/libpng-1.6.45/png.h

    r105469 r107813  
    1 
    21/* png.h - header file for PNG reference library
    32 *
    4  * libpng version 1.6.43
    5  *
    6  * Copyright (c) 2018-2024 Cosmin Truta
     3 * libpng version 1.6.45
     4 *
     5 * Copyright (c) 2018-2025 Cosmin Truta
    76 * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
    87 * Copyright (c) 1996-1997 Andreas Dilger
    … …  
    1615 *   libpng versions 0.97, January 1998, through 1.6.35, July 2018:
    1716 *     Glenn Randers-Pehrson
    18  *   libpng versions 1.6.36, December 2018, through 1.6.43, February 2024:
     17 *   libpng versions 1.6.36, December 2018, through 1.6.45, January 2025:
    1918 *     Cosmin Truta
    2019 *   See also "Contributing Authors", below.
    … …  
    2827 * ---------------------------------------
    2928 *
    30  *  * Copyright (c) 1995-2024 The PNG Reference Library Authors.
    31  *  * Copyright (c) 2018-2024 Cosmin Truta.
     29 *  * Copyright (c) 1995-2025 The PNG Reference Library Authors.
     30 *  * Copyright (c) 2018-2025 Cosmin Truta.
    3231 *  * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
    3332 *  * Copyright (c) 1996-1997 Andreas Dilger.
    … …  
    240239 *    1.5.30                  15    10530  15.so.15.30[.0]
    241240 *    ...
    242  *    1.6.43                  16    10643  16.so.16.43[.0]
     241 *    1.6.45                  16    10645  16.so.16.45[.0]
    243242 *
    244243 *    Henceforth the source version will match the shared-library major and
    … …  
    276275
    277276/* Version information for png.h - this should match the version in png.c */
    278 #define PNG_LIBPNG_VER_STRING "1.6.43"
     277#define PNG_LIBPNG_VER_STRING "1.6.45"
    279278#define PNG_HEADER_VERSION_STRING " libpng version " PNG_LIBPNG_VER_STRING "\n"
    280279
    … …  
    287286#define PNG_LIBPNG_VER_MAJOR   1
    288287#define PNG_LIBPNG_VER_MINOR   6
    289 #define PNG_LIBPNG_VER_RELEASE 43
     288#define PNG_LIBPNG_VER_RELEASE 45
    290289
    291290/* This should be zero for a public release, or non-zero for a
    292291 * development version.
    293292 */
    294 #define PNG_LIBPNG_VER_BUILD  0
     293#define PNG_LIBPNG_VER_BUILD 0
    295294
    296295/* Release Status */
    297 #define PNG_LIBPNG_BUILD_ALPHA    1
    298 #define PNG_LIBPNG_BUILD_BETA     2
    299 #define PNG_LIBPNG_BUILD_RC       3
    300 #define PNG_LIBPNG_BUILD_STABLE   4
     296#define PNG_LIBPNG_BUILD_ALPHA               1
     297#define PNG_LIBPNG_BUILD_BETA                2
     298#define PNG_LIBPNG_BUILD_RC                  3
     299#define PNG_LIBPNG_BUILD_STABLE              4
    301300#define PNG_LIBPNG_BUILD_RELEASE_STATUS_MASK 7
    302301
    … …  
    318317 * XXYYZZ, where XX=major, YY=minor, ZZ=release
    319318 */
    320 #define PNG_LIBPNG_VER 10643 /* 1.6.43 */
     319#define PNG_LIBPNG_VER 10645 /* 1.6.45 */
    321320
    322321/* Library configuration: these options cannot be changed after
    … …  
    428427 * do not agree upon the version number.
    429428 */
    430 typedef char* png_libpng_version_1_6_43;
     429typedef char* png_libpng_version_1_6_45;
    431430
    432431/* Basic control structions.  Read libpng-manual.txt or libpng.3 for more info.
    … …  
    746745#define PNG_INFO_IDAT 0x8000U  /* ESR, 1.0.6 */
    747746#define PNG_INFO_eXIf 0x10000U /* GR-P, 1.6.31 */
     747#define PNG_INFO_cICP 0x20000U
    748748
    749749/* This is used for the transformation routines, as some of them
    … …  
    825825 * to build the library!
    826826 */
    827 PNG_FUNCTION(void, (PNGCAPI *png_longjmp_ptr), PNGARG((jmp_buf, int)), typedef);
     827PNG_FUNCTION(void, (PNGCAPI *png_longjmp_ptr), (jmp_buf, int), typedef);
    828828#endif
    829829
    … …  
    19731973    png_fixed_point int_blue_X, png_fixed_point int_blue_Y,
    19741974    png_fixed_point int_blue_Z))
     1975#endif
     1976
     1977#ifdef PNG_cICP_SUPPORTED
     1978PNG_EXPORT(250, png_uint_32, png_get_cICP, (png_const_structrp png_ptr,
     1979    png_inforp info_ptr, png_bytep colour_primaries,
     1980    png_bytep transfer_function, png_bytep matrix_coefficients,
     1981    png_bytep video_full_range_flag));
     1982PNG_EXPORT(251, void, png_set_cICP, (png_const_structrp png_ptr,
     1983    png_inforp info_ptr, png_byte colour_primaries,
     1984    png_byte transfer_function, png_byte matrix_coefficients,
     1985    png_byte video_full_range_flag));
    19751986#endif
    19761987
    … …  
    32393250 */
    32403251#ifdef PNG_EXPORT_LAST_ORDINAL
    3241   PNG_EXPORT_LAST_ORDINAL(249);
     3252  PNG_EXPORT_LAST_ORDINAL(251);
    32423253#endif
    32433254

  • trunk/src/libs/libpng-1.6.45/pngconf.h

    r105469 r107813  
    1 
    21/* pngconf.h - machine-configurable file for libpng
    32 *
    4  * libpng version 1.6.43
    5  *
    6  * Copyright (c) 2018-2024 Cosmin Truta
     3 * libpng version 1.6.45
     4 *
     5 * Copyright (c) 2018-2025 Cosmin Truta
    76 * Copyright (c) 1998-2002,2004,2006-2016,2018 Glenn Randers-Pehrson
    87 * Copyright (c) 1996-1997 Andreas Dilger
    … …  
    8988/* The PNGARG macro was used in versions of libpng prior to 1.6.0 to protect
    9089 * against legacy (pre ISOC90) compilers that did not understand function
    91  * prototypes.  It is not required for modern C compilers.
     90 * prototypes.  [Deprecated.]
    9291 */
    9392#ifndef PNGARG
    … …  
    299298#ifndef PNG_EXPORTA
    300299#  define PNG_EXPORTA(ordinal, type, name, args, attributes) \
    301       PNG_FUNCTION(PNG_EXPORT_TYPE(type), (PNGAPI name), PNGARG(args), \
     300      PNG_FUNCTION(PNG_EXPORT_TYPE(type), (PNGAPI name), args, \
    302301      PNG_LINKAGE_API attributes)
    303302#endif
    … …  
    317316
    318317#ifndef PNG_CALLBACK
    319 #  define PNG_CALLBACK(type, name, args) type (PNGCBAPI name) PNGARG(args)
     318#  define PNG_CALLBACK(type, name, args) type (PNGCBAPI name) args
    320319#endif
    321320

  • trunk/src/libs/libpng-1.6.45/pngdebug.h

    r96425 r107813  
    1 
    21/* pngdebug.h - Debugging macros for libpng, also used in pngtest.c
    32 *

  • trunk/src/libs/libpng-1.6.45/pngerror.c

    r103316 r107813  
    1 
    21/* pngerror.c - stub functions for i/o and memory allocation
    32 *
    … …  
    2120#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
    2221
    23 static PNG_FUNCTION(void, png_default_error,PNGARG((png_const_structrp png_ptr,
    24     png_const_charp error_message)),PNG_NORETURN);
     22static PNG_FUNCTION(void /* PRIVATE */,
     23png_default_error,(png_const_structrp png_ptr, png_const_charp error_message),
     24    PNG_NORETURN);
    2525
    2626#ifdef PNG_WARNINGS_SUPPORTED
    2727static void /* PRIVATE */
    28 png_default_warning PNGARG((png_const_structrp png_ptr,
    29     png_const_charp warning_message));
     28png_default_warning(png_const_structrp png_ptr,
     29    png_const_charp warning_message);
    3030#endif /* WARNINGS */
    3131

  • trunk/src/libs/libpng-1.6.45/pngget.c

    r103316 r107813  
    1 
    21/* pngget.c - retrieval of values from info struct
    32 *
    … …  
    786785#endif
    787786
     787#ifdef PNG_cICP_SUPPORTED
     788png_uint_32 PNGAPI
     789png_get_cICP(png_const_structrp png_ptr,
     790             png_inforp info_ptr, png_bytep colour_primaries,
     791             png_bytep transfer_function, png_bytep matrix_coefficients,
     792             png_bytep video_full_range_flag)
     793{
     794    png_debug1(1, "in %s retrieval function", "cICP");
     795
     796    if (png_ptr != NULL && info_ptr != NULL &&
     797        (info_ptr->valid & PNG_INFO_cICP) != 0 &&
     798        colour_primaries != NULL && transfer_function != NULL &&
     799        matrix_coefficients != NULL && video_full_range_flag != NULL)
     800    {
     801        *colour_primaries = info_ptr->cicp_colour_primaries;
     802        *transfer_function = info_ptr->cicp_transfer_function;
     803        *matrix_coefficients = info_ptr->cicp_matrix_coefficients;
     804        *video_full_range_flag = info_ptr->cicp_video_full_range_flag;
     805        return (PNG_INFO_cICP);
     806    }
     807
     808    return (0);
     809}
     810#endif
     811
    788812#ifdef PNG_eXIf_SUPPORTED
    789813png_uint_32 PNGAPI

  • trunk/src/libs/libpng-1.6.45/pnginfo.h

    r96425 r107813  
    1 
    21/* pnginfo.h - header file for PNG reference library
    32 *
    … …  
    102101#endif
    103102
     103#ifdef PNG_cICP_SUPPORTED
     104   /* cICP chunk data */
     105   png_byte cicp_colour_primaries;
     106   png_byte cicp_transfer_function;
     107   png_byte cicp_matrix_coefficients;
     108   png_byte cicp_video_full_range_flag;
     109#endif
     110
    104111#ifdef PNG_iCCP_SUPPORTED
    105112   /* iCCP chunk data. */

  • trunk/src/libs/libpng-1.6.45/pngmem.c

    r96425 r107813  
    1 
    21/* pngmem.c - stub functions for memory allocation
    32 *

  • trunk/src/libs/libpng-1.6.45/pngpread.c

    r105469 r107813  
    1 
    21/* pngpread.c - read a png file in push mode
    32 *
    … …  
    3332   { png_push_save_buffer(png_ptr); return; }
    3433
     34#ifdef PNG_READ_INTERLACING_SUPPORTED
     35/* Arrays to facilitate interlacing - use pass (0 - 6) as index. */
     36
     37/* Start of interlace block */
     38static const png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
     39/* Offset to next interlace block */
     40static const png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
     41/* Start of interlace block in the y direction */
     42static const png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
     43/* Offset to next interlace block in the y direction */
     44static const png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
     45
     46/* TODO: Move these arrays to a common utility module to avoid duplication. */
     47#endif
     48
    3549void PNGAPI
    3650png_process_data(png_structrp png_ptr, png_inforp info_ptr,
    … …  
    293307      PNG_PUSH_SAVE_BUFFER_IF_FULL
    294308      png_handle_cHRM(png_ptr, info_ptr, png_ptr->push_length);
     309   }
     310
     311#endif
     312#ifdef PNG_READ_cICP_SUPPORTED
     313   else if (png_ptr->chunk_name == png_cICP)
     314   {
     315      PNG_PUSH_SAVE_BUFFER_IF_FULL
     316      png_handle_cICP(png_ptr, info_ptr, png_ptr->push_length);
    295317   }
    296318
    … …  
    977999png_read_push_finish_row(png_structrp png_ptr)
    9781000{
    979 #ifdef PNG_READ_INTERLACING_SUPPORTED
    980    /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
    981 
    982    /* Start of interlace block */
    983    static const png_byte png_pass_start[] = {0, 4, 0, 2, 0, 1, 0};
    984 
    985    /* Offset to next interlace block */
    986    static const png_byte png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1};
    987 
    988    /* Start of interlace block in the y direction */
    989    static const png_byte png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1};
    990 
    991    /* Offset to next interlace block in the y direction */
    992    static const png_byte png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2};
    993 
    994    /* Height of interlace block.  This is not currently used - if you need
    995     * it, uncomment it here and in png.h
    996    static const png_byte png_pass_height[] = {8, 8, 4, 4, 2, 2, 1};
    997    */
    998 #endif
    999 
    10001001   png_ptr->row_number++;
    10011002   if (png_ptr->row_number < png_ptr->num_rows)

  • trunk/src/libs/libpng-1.6.45/pngpriv.h

    r103316 r107813  
    1 
    21/* pngpriv.h - private declarations for use inside libpng
    32 *
    … …  
    141140    */
    142141#  define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_neon
    143 
    144    /* By default the 'intrinsics' code in arm/filter_neon_intrinsics.c is used
    145     * if possible - if __ARM_NEON__ is set and the compiler version is not known
    146     * to be broken.  This is controlled by PNG_ARM_NEON_IMPLEMENTATION which can
    147     * be:
    148     *
    149     *    1  The intrinsics code (the default with __ARM_NEON__)
    150     *    2  The hand coded assembler (the default without __ARM_NEON__)
    151     *
    152     * It is possible to set PNG_ARM_NEON_IMPLEMENTATION in CPPFLAGS, however
    153     * this is *NOT* supported and may cease to work even after a minor revision
    154     * to libpng.  It *is* valid to do this for testing purposes, e.g. speed
    155     * testing or a new compiler, but the results should be communicated to the
    156     * libpng implementation list for incorporation in the next minor release.
    157     */
    158 #  ifndef PNG_ARM_NEON_IMPLEMENTATION
    159 #     if defined(__ARM_NEON__) || defined(__ARM_NEON)
    160 #        if defined(__clang__)
    161             /* At present it is unknown by the libpng developers which versions
    162              * of clang support the intrinsics, however some or perhaps all
    163              * versions do not work with the assembler so this may be
    164              * irrelevant, so just use the default (do nothing here.)
    165              */
    166 #        elif defined(__GNUC__)
    167             /* GCC 4.5.4 NEON support is known to be broken.  4.6.3 is known to
    168              * work, so if this *is* GCC, or G++, look for a version >4.5
    169              */
    170 #           if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6)
    171 #              define PNG_ARM_NEON_IMPLEMENTATION 2
    172 #           endif /* no GNUC support */
    173 #        endif /* __GNUC__ */
    174 #     else /* !defined __ARM_NEON__ */
    175          /* The 'intrinsics' code simply won't compile without this -mfpu=neon:
    176           */
    177 #        if !defined(__aarch64__) && !defined(_M_ARM64)
    178             /* The assembler code currently does not work on ARM64 */
    179 #          define PNG_ARM_NEON_IMPLEMENTATION 2
    180 #        endif /* __aarch64__ */
    181 #     endif /* __ARM_NEON__ */
    182 #  endif /* !PNG_ARM_NEON_IMPLEMENTATION */
    183 
    184142#  ifndef PNG_ARM_NEON_IMPLEMENTATION
    185143      /* Use the intrinsics code by default. */
    … …  
    882840#define png_bKGD PNG_U32( 98,  75,  71,  68)
    883841#define png_cHRM PNG_U32( 99,  72,  82,  77)
     842#define png_cICP PNG_U32( 99,  73,  67,  80)
    884843#define png_eXIf PNG_U32(101,  88,  73, 102) /* registered July 2017 */
    885844#define png_fRAc PNG_U32(102,  82,  65,  99) /* registered, not defined */
    … …  
    11781137#endif
    11791138
     1139#ifdef PNG_WRITE_cICP_SUPPORTED
     1140PNG_INTERNAL_FUNCTION(void,png_write_cICP,(png_structrp png_ptr,
     1141    png_byte colour_primaries, png_byte transfer_function,
     1142    png_byte matrix_coefficients, png_byte video_full_range_flag), PNG_EMPTY);
     1143#endif
     1144
    11801145#ifdef PNG_WRITE_sRGB_SUPPORTED
    11811146PNG_INTERNAL_FUNCTION(void,png_write_sRGB,(png_structrp png_ptr,
    … …  
    15191484PNG_INTERNAL_FUNCTION(void,png_handle_cHRM,(png_structrp png_ptr,
    15201485    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
     1486#endif
     1487
     1488#ifdef PNG_READ_cICP_SUPPORTED
     1489PNG_INTERNAL_FUNCTION(void,png_handle_cICP,(png_structrp png_ptr,
     1490        png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
    15211491#endif
    15221492

  • trunk/src/libs/libpng-1.6.45/pngread.c

    r105469 r107813  
    1 
    21/* pngread.c - read a PNG file
    32 *
    4  * Copyright (c) 2018-2024 Cosmin Truta
     3 * Copyright (c) 2018-2025 Cosmin Truta
    54 * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
    65 * Copyright (c) 1996-1997 Andreas Dilger
    … …  
    174173      else if (chunk_name == png_cHRM)
    175174         png_handle_cHRM(png_ptr, info_ptr, length);
     175#endif
     176
     177#ifdef PNG_READ_cICP_SUPPORTED
     178      else if (chunk_name == png_cICP)
     179         png_handle_cICP(png_ptr, info_ptr, length);
    176180#endif
    177181
    … …  
    851855      else if (chunk_name == png_cHRM)
    852856         png_handle_cHRM(png_ptr, info_ptr, length);
     857#endif
     858
     859#ifdef PNG_READ_cICP_SUPPORTED
     860      else if (chunk_name == png_cICP)
     861         png_handle_cICP(png_ptr, info_ptr, length);
    853862#endif
    854863

  • trunk/src/libs/libpng-1.6.45/pngrio.c

    r96425 r107813  
    1 
    21/* pngrio.c - functions for data input
    32 *

  • trunk/src/libs/libpng-1.6.45/pngrtran.c

    r105469 r107813  
    1 
    21/* pngrtran.c - transforms the data in a row for PNG readers
    32 *

  • trunk/src/libs/libpng-1.6.45/pngrutil.c

    r103316 r107813  
    1 
    21/* pngrutil.c - utilities to read a PNG file
    32 *
    … …  
    1817
    1918#ifdef PNG_READ_SUPPORTED
     19
     20#ifdef PNG_READ_INTERLACING_SUPPORTED
     21/* Arrays to facilitate interlacing - use pass (0 - 6) as index. */
     22
     23/* Start of interlace block */
     24static const png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
     25/* Offset to next interlace block */
     26static const png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
     27/* Start of interlace block in the y direction */
     28static const png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
     29/* Offset to next interlace block in the y direction */
     30static const png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
     31
     32/* TODO: Move these arrays to a common utility module to avoid duplication. */
     33#endif
    2034
    2135png_uint_32 PNGAPI
    … …  
    20302044
    20312045   png_set_bKGD(png_ptr, info_ptr, &background);
     2046}
     2047#endif
     2048
     2049#ifdef PNG_READ_cICP_SUPPORTED
     2050void /* PRIVATE */
     2051png_handle_cICP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
     2052{
     2053   png_byte buf[4];
     2054
     2055   png_debug(1, "in png_handle_cICP");
     2056
     2057   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
     2058      png_chunk_error(png_ptr, "missing IHDR");
     2059
     2060   else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0)
     2061   {
     2062      png_crc_finish(png_ptr, length);
     2063      png_chunk_benign_error(png_ptr, "out of place");
     2064      return;
     2065   }
     2066
     2067   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_cICP) != 0)
     2068   {
     2069      png_crc_finish(png_ptr, length);
     2070      png_chunk_benign_error(png_ptr, "duplicate");
     2071      return;
     2072   }
     2073
     2074   else if (length != 4)
     2075   {
     2076      png_crc_finish(png_ptr, length);
     2077      png_chunk_benign_error(png_ptr, "invalid");
     2078      return;
     2079   }
     2080
     2081   png_crc_read(png_ptr, buf, 4);
     2082
     2083   if (png_crc_finish(png_ptr, 0) != 0)
     2084      return;
     2085
     2086   png_set_cICP(png_ptr, info_ptr, buf[0], buf[1],  buf[2], buf[3]);
    20322087}
    20332088#endif
    … …  
    36853740    png_uint_32 transformations /* Because these may affect the byte layout */)
    36863741{
    3687    /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
    3688    /* Offset to next interlace block */
    3689    static const unsigned int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
    3690 
    36913742   png_debug(1, "in png_do_read_interlace");
    36923743   if (row != NULL && row_info != NULL)
    … …  
    43264377png_read_finish_row(png_structrp png_ptr)
    43274378{
    4328    /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
    4329 
    4330    /* Start of interlace block */
    4331    static const png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
    4332 
    4333    /* Offset to next interlace block */
    4334    static const png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
    4335 
    4336    /* Start of interlace block in the y direction */
    4337    static const png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
    4338 
    4339    /* Offset to next interlace block in the y direction */
    4340    static const png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
    4341 
    43424379   png_debug(1, "in png_read_finish_row");
    43434380   png_ptr->row_number++;
    … …  
    43914428png_read_start_row(png_structrp png_ptr)
    43924429{
    4393    /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
    4394 
    4395    /* Start of interlace block */
    4396    static const png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
    4397 
    4398    /* Offset to next interlace block */
    4399    static const png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
    4400 
    4401    /* Start of interlace block in the y direction */
    4402    static const png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
    4403 
    4404    /* Offset to next interlace block in the y direction */
    4405    static const png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
    4406 
    44074430   unsigned int max_pixel_depth;
    44084431   size_t row_bytes;

  • trunk/src/libs/libpng-1.6.45/pngset.c

    r103316 r107813  
    1 
    21/* pngset.c - storage of image information into info struct
    32 *
    4  * Copyright (c) 2018-2024 Cosmin Truta
     3 * Copyright (c) 2018-2025 Cosmin Truta
    54 * Copyright (c) 1998-2018 Glenn Randers-Pehrson
    65 * Copyright (c) 1996-1997 Andreas Dilger
    … …  
    135134#endif /* cHRM */
    136135
     136#ifdef PNG_cICP_SUPPORTED
     137void PNGAPI
     138png_set_cICP(png_const_structrp png_ptr, png_inforp info_ptr,
     139             png_byte colour_primaries, png_byte transfer_function,
     140             png_byte matrix_coefficients, png_byte video_full_range_flag)
     141{
     142   png_debug1(1, "in %s storage function", "cICP");
     143
     144   if (png_ptr == NULL || info_ptr == NULL)
     145      return;
     146
     147   info_ptr->cicp_colour_primaries = colour_primaries;
     148   info_ptr->cicp_transfer_function = transfer_function;
     149   info_ptr->cicp_matrix_coefficients = matrix_coefficients;
     150   info_ptr->cicp_video_full_range_flag = video_full_range_flag;
     151
     152   if (info_ptr->cicp_matrix_coefficients != 0)
     153   {
     154      png_warning(png_ptr, "Invalid cICP matrix coefficients");
     155      return;
     156   }
     157
     158   info_ptr->valid |= PNG_INFO_cICP;
     159}
     160#endif /* cICP */
     161
    137162#ifdef PNG_eXIf_SUPPORTED
    138163void PNGAPI
    … …  
    13961421         98,  75,  71,  68, '\0',  /* bKGD */
    13971422         99,  72,  82,  77, '\0',  /* cHRM */
     1423         99,  73,  67,  80, '\0',  /* cICP */
    13981424        101,  88,  73, 102, '\0',  /* eXIf */
    13991425        103,  65,  77,  65, '\0',  /* gAMA */

  • trunk/src/libs/libpng-1.6.45/pngstruct.h

    r103316 r107813  
    1 
    21/* pngstruct.h - header file for PNG reference library
    32 *

  • trunk/src/libs/libpng-1.6.45/pngtest.c

    r105469 r107813  
    1 
    21/* pngtest.c - a test program for libpng
    32 *
    4  * Copyright (c) 2018-2024 Cosmin Truta
     3 * Copyright (c) 2018-2025 Cosmin Truta
    54 * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
    65 * Copyright (c) 1996-1997 Andreas Dilger
    … …  
    4645#include "png.h"
    4746
     47/* This hack was introduced for historical reasons, and we are
     48 * still keeping it in libpng-1.6.x for compatibility reasons.
     49 */
     50#define STDERR stdout
     51
    4852/* Generate a compiler error if there is an old png.h in the search path. */
    49 typedef png_libpng_version_1_6_43 Your_png_h_is_not_version_1_6_43;
     53typedef png_libpng_version_1_6_45 Your_png_h_is_not_version_1_6_45;
    5054
    5155/* Ensure that all version numbers in png.h are consistent with one another. */
    … …  
    104108#endif
    105109
    106 /* This hack was introduced for historical reasons, and we are
    107  * still keeping it in libpng-1.6.x for compatibility reasons.
    108  */
    109 #define STDERR stdout
    110 
    111110#ifndef PNG_DEBUG
    112111#  define PNG_DEBUG 0
    … …  
    519518static int num_allocations = 0;
    520519
    521 png_voidp PNGCBAPI png_debug_malloc PNGARG((png_structp png_ptr,
    522     png_alloc_size_t size));
    523 void PNGCBAPI png_debug_free PNGARG((png_structp png_ptr, png_voidp ptr));
     520png_voidp PNGCBAPI png_debug_malloc(png_structp png_ptr,
     521    png_alloc_size_t size);
     522void PNGCBAPI png_debug_free(png_structp png_ptr, png_voidp ptr);
    524523
    525524png_voidp
    … …  
    11691168#endif /* Floating point */
    11701169#endif /* Fixed point */
     1170#ifdef PNG_cICP_SUPPORTED
     1171   {
     1172      png_byte colour_primaries;
     1173      png_byte transfer_function;
     1174      png_byte matrix_coefficients;
     1175      png_byte video_full_range_flag;
     1176
     1177      if (png_get_cICP(read_ptr, read_info_ptr,
     1178                       &colour_primaries, &transfer_function,
     1179                       &matrix_coefficients, &video_full_range_flag) != 0)
     1180         png_set_cICP(write_ptr, write_info_ptr,
     1181                      colour_primaries, transfer_function,
     1182                      matrix_coefficients, video_full_range_flag);
     1183   }
     1184#endif
    11711185#ifdef PNG_iCCP_SUPPORTED
    11721186   {

  • trunk/src/libs/libpng-1.6.45/pngtrans.c

    r103316 r107813  
    1 
    21/* pngtrans.c - transforms the data in a row (used by both readers and writers)
    32 *

  • trunk/src/libs/libpng-1.6.45/pngwio.c

    r96425 r107813  
    1 
    21/* pngwio.c - functions for data output
    32 *

  • trunk/src/libs/libpng-1.6.45/pngwrite.c

    r103316 r107813  
    1 
    21/* pngwrite.c - general routines to write a PNG file
    32 *
    4  * Copyright (c) 2018-2024 Cosmin Truta
     3 * Copyright (c) 2018-2025 Cosmin Truta
    54 * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
    65 * Copyright (c) 1996-1997 Andreas Dilger
    … …  
    129128       * flag here too.
    130129       */
    131 #ifdef PNG_GAMMA_SUPPORTED
    132 #  ifdef PNG_WRITE_gAMA_SUPPORTED
    133       if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 &&
    134           (info_ptr->colorspace.flags & PNG_COLORSPACE_FROM_gAMA) != 0 &&
    135           (info_ptr->valid & PNG_INFO_gAMA) != 0)
    136          png_write_gAMA_fixed(png_ptr, info_ptr->colorspace.gamma);
     130#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
     131         /* Write unknown chunks first; PNG v3 establishes a precedence order
     132          * for colourspace chunks.  It is certain therefore that new
     133          * colourspace chunks will have a precedence and very likely it will be
     134          * higher than all known so far.  Writing the unknown chunks here is
     135          * most likely to present the chunks in the most convenient order.
     136          *
     137          * FUTURE: maybe write chunks in the order the app calls png_set_chnk
     138          * to give the app control.
     139          */
     140         write_unknown_chunks(png_ptr, info_ptr, PNG_HAVE_IHDR);
     141#endif
     142
     143#ifdef PNG_WRITE_sBIT_SUPPORTED
     144         /* PNG v3: a streaming app will need to see this before cICP because
     145          * the information is helpful in handling HLG encoding (which is
     146          * natively 10 bits but gets expanded to 16 in PNG.)
     147          *
     148          * The app shouldn't care about the order ideally, but it might have
     149          * no choice.  In PNG v3, apps are allowed to reject PNGs where the
     150          * APNG chunks are out of order so it behooves libpng to be nice here.
     151          */
     152         if ((info_ptr->valid & PNG_INFO_sBIT) != 0)
     153            png_write_sBIT(png_ptr, &(info_ptr->sig_bit), info_ptr->color_type);
     154#endif
     155
     156   /* PNG v3: the July 2004 version of the TR introduced the concept of colour
     157    * space priority.  As above it therefore behooves libpng to write the colour
     158    * space chunks in the priority order so that a streaming app need not buffer
     159    * them.
     160    */
     161#ifdef PNG_COLORSPACE_SUPPORTED
     162#  ifdef PNG_WRITE_cICP_SUPPORTED /* Priority 4 */
     163   if ((info_ptr->valid & PNG_INFO_cICP) != 0)
     164      {
     165         png_write_cICP(png_ptr,
     166                        info_ptr->cicp_colour_primaries,
     167                        info_ptr->cicp_transfer_function,
     168                        info_ptr->cicp_matrix_coefficients,
     169                        info_ptr->cicp_video_full_range_flag);
     170      }
    137171#  endif
    138 #endif
    139 
    140 #ifdef PNG_COLORSPACE_SUPPORTED
    141       /* Write only one of sRGB or an ICC profile.  If a profile was supplied
    142        * and it matches one of the known sRGB ones issue a warning.
     172
     173      /* PNG v3 change: it is now permitted to write both sRGB and ICC profiles,
     174       * however because the libpng code auto-generates an sRGB for the
     175       * corresponding ICC profiles and because PNG v2 disallowed this we need
     176       * to only write one.
     177       *
     178       * Remove the PNG v2 warning about writing an sRGB ICC profile as well
     179       * because it's invalid with PNG v3.
    143180       */
    144 #  ifdef PNG_WRITE_iCCP_SUPPORTED
     181#  ifdef PNG_WRITE_iCCP_SUPPORTED /* Priority 3 */
    145182         if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 &&
    146183             (info_ptr->valid & PNG_INFO_iCCP) != 0)
    147184         {
    148 #    ifdef PNG_WRITE_sRGB_SUPPORTED
    149                if ((info_ptr->valid & PNG_INFO_sRGB) != 0)
    150                   png_app_warning(png_ptr,
    151                       "profile matches sRGB but writing iCCP instead");
    152 #     endif
    153 
    154185            png_write_iCCP(png_ptr, info_ptr->iccp_name,
    155186                info_ptr->iccp_profile);
    … …  
    160191#  endif
    161192
    162 #  ifdef PNG_WRITE_sRGB_SUPPORTED
     193#  ifdef PNG_WRITE_sRGB_SUPPORTED /* Priority 2 */
    163194         if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 &&
    164195             (info_ptr->valid & PNG_INFO_sRGB) != 0)
    … …  
    167198#endif /* COLORSPACE */
    168199
    169 #ifdef PNG_WRITE_sBIT_SUPPORTED
    170          if ((info_ptr->valid & PNG_INFO_sBIT) != 0)
    171             png_write_sBIT(png_ptr, &(info_ptr->sig_bit), info_ptr->color_type);
     200#ifdef PNG_GAMMA_SUPPORTED
     201#  ifdef PNG_WRITE_gAMA_SUPPORTED /* Priority 1 */
     202      if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 &&
     203          (info_ptr->colorspace.flags & PNG_COLORSPACE_FROM_gAMA) != 0 &&
     204          (info_ptr->valid & PNG_INFO_gAMA) != 0)
     205         png_write_gAMA_fixed(png_ptr, info_ptr->colorspace.gamma);
     206#  endif
    172207#endif
    173208
    174209#ifdef PNG_COLORSPACE_SUPPORTED
    175 #  ifdef PNG_WRITE_cHRM_SUPPORTED
     210#  ifdef PNG_WRITE_cHRM_SUPPORTED /* Also priority 1 */
    176211         if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 &&
    177212             (info_ptr->colorspace.flags & PNG_COLORSPACE_FROM_cHRM) != 0 &&
    … …  
    179214            png_write_cHRM_fixed(png_ptr, &info_ptr->colorspace.end_points_xy);
    180215#  endif
    181 #endif
    182 
    183 #ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
    184          write_unknown_chunks(png_ptr, info_ptr, PNG_HAVE_IHDR);
    185216#endif
    186217

  • trunk/src/libs/libpng-1.6.45/pngwtran.c

    r96425 r107813  
    1 
    21/* pngwtran.c - transforms the data in a row for PNG writers
    32 *

  • trunk/src/libs/libpng-1.6.45/pngwutil.c

    r103316 r107813  
    1 
    21/* pngwutil.c - utilities to write a PNG file
    32 *
    … …  
    109 * For conditions of distribution and use, see the disclaimer
    1110 * and license in png.h
     11 *
     12 * This file contains routines that are only called from within
     13 * libpng itself during the course of writing an image.
    1214 */
    1315
    … …  
    1517
    1618#ifdef PNG_WRITE_SUPPORTED
     19
     20#ifdef PNG_WRITE_INTERLACING_SUPPORTED
     21/* Arrays to facilitate interlacing - use pass (0 - 6) as index. */
     22
     23/* Start of interlace block */
     24static const png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
     25/* Offset to next interlace block */
     26static const png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
     27/* Start of interlace block in the y direction */
     28static const png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
     29/* Offset to next interlace block in the y direction */
     30static const png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
     31
     32/* TODO: Move these arrays to a common utility module to avoid duplication. */
     33#endif
    1734
    1835#ifdef PNG_WRITE_INT_FUNCTIONS_SUPPORTED
    … …  
    14721489#endif
    14731490
     1491#ifdef PNG_WRITE_cICP_SUPPORTED
     1492/* Write the cICP data */
     1493void /* PRIVATE */
     1494png_write_cICP(png_structrp png_ptr,
     1495               png_byte colour_primaries, png_byte transfer_function,
     1496               png_byte matrix_coefficients, png_byte video_full_range_flag)
     1497{
     1498   png_byte buf[4];
     1499
     1500   png_debug(1, "in png_write_cICP");
     1501
     1502   png_write_chunk_header(png_ptr, png_cICP, 4);
     1503
     1504   buf[0] = colour_primaries;
     1505   buf[1] = transfer_function;
     1506   buf[2] = matrix_coefficients;
     1507   buf[3] = video_full_range_flag;
     1508   png_write_chunk_data(png_ptr, buf, 4);
     1509
     1510   png_write_chunk_end(png_ptr);
     1511}
     1512#endif
     1513
    14741514#ifdef PNG_WRITE_eXIf_SUPPORTED
    14751515/* Write the Exif data */
    … …  
    18901930png_write_start_row(png_structrp png_ptr)
    18911931{
    1892 #ifdef PNG_WRITE_INTERLACING_SUPPORTED
    1893    /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
    1894 
    1895    /* Start of interlace block */
    1896    static const png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
    1897 
    1898    /* Offset to next interlace block */
    1899    static const png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
    1900 
    1901    /* Start of interlace block in the y direction */
    1902    static const png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
    1903 
    1904    /* Offset to next interlace block in the y direction */
    1905    static const png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
    1906 #endif
    1907 
    19081932   png_alloc_size_t buf_size;
    19091933   int usr_pixel_depth;
    … …  
    20052029png_write_finish_row(png_structrp png_ptr)
    20062030{
    2007 #ifdef PNG_WRITE_INTERLACING_SUPPORTED
    2008    /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
    2009 
    2010    /* Start of interlace block */
    2011    static const png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
    2012 
    2013    /* Offset to next interlace block */
    2014    static const png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
    2015 
    2016    /* Start of interlace block in the y direction */
    2017    static const png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1};
    2018 
    2019    /* Offset to next interlace block in the y direction */
    2020    static const png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2};
    2021 #endif
    2022 
    20232031   png_debug(1, "in png_write_finish_row");
    20242032
    … …  
    20962104png_do_write_interlace(png_row_infop row_info, png_bytep row, int pass)
    20972105{
    2098    /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
    2099 
    2100    /* Start of interlace block */
    2101    static const png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0};
    2102 
    2103    /* Offset to next interlace block */
    2104    static const png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1};
    2105 
    21062106   png_debug(1, "in png_do_write_interlace");
    21072107

  • trunk/src/libs/libpng-1.6.45/powerpc/powerpc_init.c

    r96425 r107813  
    1 
    21/* powerpc_init.c - POWERPC optimised filter functions
    32 *

  • trunk/src/libs/libpng-1.6.45/projects/vstudio/libpng/libpng.vcxproj

    r103316 r107813  
    159159    <ClCompile>
    160160      <PrecompiledHeader>Use</PrecompiledHeader>
    161       <WarningLevel>$(WarningLevel)</WarningLevel>
     161      <WarningLevel>Level3</WarningLevel>
    162162      <MinimalRebuild>false</MinimalRebuild>
    163163      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    164164      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    165       <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    166       <IntrinsicFunctions>true</IntrinsicFunctions>
    167       <FunctionLevelLinking>true</FunctionLevelLinking>
    168       <FloatingPointExceptions>false</FloatingPointExceptions>
    169       <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
    170       <PrecompiledHeaderFile>pngpriv.h</PrecompiledHeaderFile>
    171       <BrowseInformation>true</BrowseInformation>
    172       <CompileAs>CompileAsC</CompileAs>
    173       <StringPooling>true</StringPooling>
    174       <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
    175       <AdditionalIncludeDirectories>$(ZLibSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    176       <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
     165      <PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     166      <IntrinsicFunctions>true</IntrinsicFunctions>
     167      <FunctionLevelLinking>true</FunctionLevelLinking>
     168      <FloatingPointExceptions>false</FloatingPointExceptions>
     169      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
     170      <PrecompiledHeaderFile>pngpriv.h</PrecompiledHeaderFile>
     171      <BrowseInformation>true</BrowseInformation>
     172      <CompileAs>CompileAsC</CompileAs>
     173      <StringPooling>true</StringPooling>
     174      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
     175      <AdditionalIncludeDirectories>$(ZLibSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     176      <TreatWarningAsError>false</TreatWarningAsError>
    177177      <Optimization>Disabled</Optimization>
    178178      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    … …  
    189189    <ClCompile>
    190190      <PrecompiledHeader>Use</PrecompiledHeader>
    191       <WarningLevel>$(WarningLevel)</WarningLevel>
     191      <WarningLevel>Level3</WarningLevel>
    192192      <MinimalRebuild>false</MinimalRebuild>
    193193      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    194194      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    195       <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    196       <IntrinsicFunctions>true</IntrinsicFunctions>
    197       <FunctionLevelLinking>true</FunctionLevelLinking>
    198       <FloatingPointExceptions>false</FloatingPointExceptions>
    199       <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
    200       <PrecompiledHeaderFile>pngpriv.h</PrecompiledHeaderFile>
    201       <BrowseInformation>true</BrowseInformation>
    202       <CompileAs>CompileAsC</CompileAs>
    203       <StringPooling>true</StringPooling>
    204       <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
    205       <AdditionalIncludeDirectories>$(ZLibSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    206       <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
     195      <PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     196      <IntrinsicFunctions>true</IntrinsicFunctions>
     197      <FunctionLevelLinking>true</FunctionLevelLinking>
     198      <FloatingPointExceptions>false</FloatingPointExceptions>
     199      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
     200      <PrecompiledHeaderFile>pngpriv.h</PrecompiledHeaderFile>
     201      <BrowseInformation>true</BrowseInformation>
     202      <CompileAs>CompileAsC</CompileAs>
     203      <StringPooling>true</StringPooling>
     204      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
     205      <AdditionalIncludeDirectories>$(ZLibSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     206      <TreatWarningAsError>false</TreatWarningAsError>
    207207      <Optimization>Disabled</Optimization>
    208208      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    … …  
    224224      <Optimization>Disabled</Optimization>
    225225      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    226       <PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     226      <PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    227227      <IntrinsicFunctions>true</IntrinsicFunctions>
    228228      <FunctionLevelLinking>true</FunctionLevelLinking>
    … …  
    251251      <Optimization>Disabled</Optimization>
    252252      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    253       <PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     253      <PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    254254      <IntrinsicFunctions>true</IntrinsicFunctions>
    255255      <FunctionLevelLinking>true</FunctionLevelLinking>
    … …  
    272272  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    273273    <ClCompile>
    274       <WarningLevel>$(WarningLevel)</WarningLevel>
    275       <PrecompiledHeader>Use</PrecompiledHeader>
    276       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    277       <FunctionLevelLinking>true</FunctionLevelLinking>
    278       <IntrinsicFunctions>true</IntrinsicFunctions>
    279       <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    280       <FloatingPointExceptions>false</FloatingPointExceptions>
    281       <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
    282       <PrecompiledHeaderFile>pngpriv.h</PrecompiledHeaderFile>
    283       <BrowseInformation>true</BrowseInformation>
    284       <CompileAs>CompileAsC</CompileAs>
    285       <StringPooling>true</StringPooling>
    286       <MinimalRebuild>false</MinimalRebuild>
    287       <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
    288       <AdditionalIncludeDirectories>$(ZLibSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    289       <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
     274      <WarningLevel>Level3</WarningLevel>
     275      <PrecompiledHeader>Use</PrecompiledHeader>
     276      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     277      <FunctionLevelLinking>true</FunctionLevelLinking>
     278      <IntrinsicFunctions>true</IntrinsicFunctions>
     279      <PreprocessorDefinitions>WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     280      <FloatingPointExceptions>false</FloatingPointExceptions>
     281      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
     282      <PrecompiledHeaderFile>pngpriv.h</PrecompiledHeaderFile>
     283      <BrowseInformation>true</BrowseInformation>
     284      <CompileAs>CompileAsC</CompileAs>
     285      <StringPooling>true</StringPooling>
     286      <MinimalRebuild>false</MinimalRebuild>
     287      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
     288      <AdditionalIncludeDirectories>$(ZLibSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     289      <TreatWarningAsError>false</TreatWarningAsError>
    290290      <Optimization>Full</Optimization>
    291291    </ClCompile>
    … …  
    302302  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
    303303    <ClCompile>
    304       <WarningLevel>$(WarningLevel)</WarningLevel>
    305       <PrecompiledHeader>Use</PrecompiledHeader>
    306       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    307       <FunctionLevelLinking>true</FunctionLevelLinking>
    308       <IntrinsicFunctions>true</IntrinsicFunctions>
    309       <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    310       <FloatingPointExceptions>false</FloatingPointExceptions>
    311       <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
    312       <PrecompiledHeaderFile>pngpriv.h</PrecompiledHeaderFile>
    313       <BrowseInformation>true</BrowseInformation>
    314       <CompileAs>CompileAsC</CompileAs>
    315       <StringPooling>true</StringPooling>
    316       <MinimalRebuild>false</MinimalRebuild>
    317       <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
    318       <AdditionalIncludeDirectories>$(ZLibSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    319       <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
     304      <WarningLevel>Level3</WarningLevel>
     305      <PrecompiledHeader>Use</PrecompiledHeader>
     306      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     307      <FunctionLevelLinking>true</FunctionLevelLinking>
     308      <IntrinsicFunctions>true</IntrinsicFunctions>
     309      <PreprocessorDefinitions>WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     310      <FloatingPointExceptions>false</FloatingPointExceptions>
     311      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
     312      <PrecompiledHeaderFile>pngpriv.h</PrecompiledHeaderFile>
     313      <BrowseInformation>true</BrowseInformation>
     314      <CompileAs>CompileAsC</CompileAs>
     315      <StringPooling>true</StringPooling>
     316      <MinimalRebuild>false</MinimalRebuild>
     317      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
     318      <AdditionalIncludeDirectories>$(ZLibSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     319      <TreatWarningAsError>false</TreatWarningAsError>
    320320      <Optimization>Full</Optimization>
    321321    </ClCompile>
    … …  
    338338      <FunctionLevelLinking>true</FunctionLevelLinking>
    339339      <IntrinsicFunctions>true</IntrinsicFunctions>
    340       <PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     340      <PreprocessorDefinitions>WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    341341      <FloatingPointExceptions>false</FloatingPointExceptions>
    342342      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
    … …  
    370370      <FunctionLevelLinking>true</FunctionLevelLinking>
    371371      <IntrinsicFunctions>true</IntrinsicFunctions>
    372       <PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     372      <PreprocessorDefinitions>WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    373373      <FloatingPointExceptions>false</FloatingPointExceptions>
    374374      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
    … …  
    397397    <ClCompile Include="..\..\..\arm\arm_init.c">
    398398      <DeploymentContent>true</DeploymentContent>
    399       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'">WIN32;_DEBUG;PNG_ARM_NEON_OPT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     399      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'">WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;PNG_ARM_NEON_OPT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    400400      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'">NotUsing</PrecompiledHeader>
    401401      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">NotUsing</PrecompiledHeader>
    … …  
    406406    <ClCompile Include="..\..\..\arm\filter_neon_intrinsics.c">
    407407      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'">NotUsing</PrecompiledHeader>
    408       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'">WIN32;_DEBUG;PNG_ARM_NEON_OPT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     408      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'">WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;PNG_ARM_NEON_OPT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    409409      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">NotUsing</PrecompiledHeader>
    410410      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">NotUsing</PrecompiledHeader>
    … …  
    414414    <ClCompile Include="..\..\..\arm\palette_neon_intrinsics.c">
    415415      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'">NotUsing</PrecompiledHeader>
    416       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'">WIN32;_DEBUG;PNG_ARM_NEON_OPT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     416      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'">WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;PNG_ARM_NEON_OPT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    417417      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">NotUsing</PrecompiledHeader>
    418418      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">NotUsing</PrecompiledHeader>

  • trunk/src/libs/libpng-1.6.45/projects/vstudio/pnglibconf/pnglibconf.vcxproj

    r103316 r107813  
    4949  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    5050    <ClCompile>
    51       <WarningLevel>$(WarningLevel)</WarningLevel>
     51      <WarningLevel>Level3</WarningLevel>
    5252      <Optimization>MaxSpeed</Optimization>
    5353      <FunctionLevelLinking>true</FunctionLevelLinking>
    … …  
    7474  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
    7575    <ClCompile>
    76       <WarningLevel>$(WarningLevel)</WarningLevel>
     76      <WarningLevel>Level3</WarningLevel>
    7777      <Optimization>MaxSpeed</Optimization>
    7878      <FunctionLevelLinking>true</FunctionLevelLinking>

  • trunk/src/libs/libpng-1.6.45/projects/vstudio/pngstest/pngstest.vcxproj

    r103316 r107813  
    150150      <Optimization>Disabled</Optimization>
    151151      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    152       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     152      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    153153      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    154154      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
    … …  
    183183      <Optimization>Disabled</Optimization>
    184184      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    185       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     185      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    186186      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    187187      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
    … …  
    217217      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    218218      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    219       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     219      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    220220      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    221221      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
    … …  
    250250      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    251251      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    252       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     252      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    253253      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    254254      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
    … …  
    276276  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    277277    <ClCompile>
    278       <WarningLevel>$(WarningLevel)</WarningLevel>
     278      <WarningLevel>Level3</WarningLevel>
    279279      <PrecompiledHeader>NotUsing</PrecompiledHeader>
    280280      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    … …  
    282282      <FunctionLevelLinking>false</FunctionLevelLinking>
    283283      <IntrinsicFunctions>true</IntrinsicFunctions>
    284       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    285       <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    286       <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
    287       <CompileAsManaged>false</CompileAsManaged>
    288       <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
     284      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     285      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     286      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
     287      <CompileAsManaged>false</CompileAsManaged>
     288      <TreatWarningAsError>false</TreatWarningAsError>
    289289      <StringPooling>true</StringPooling>
    290290      <MinimalRebuild>false</MinimalRebuild>
    … …  
    311311  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
    312312    <ClCompile>
    313       <WarningLevel>$(WarningLevel)</WarningLevel>
     313      <WarningLevel>Level3</WarningLevel>
    314314      <PrecompiledHeader>NotUsing</PrecompiledHeader>
    315315      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    … …  
    317317      <FunctionLevelLinking>false</FunctionLevelLinking>
    318318      <IntrinsicFunctions>true</IntrinsicFunctions>
    319       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    320       <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    321       <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
    322       <CompileAsManaged>false</CompileAsManaged>
    323       <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
     319      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     320      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     321      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
     322      <CompileAsManaged>false</CompileAsManaged>
     323      <TreatWarningAsError>false</TreatWarningAsError>
    324324      <StringPooling>true</StringPooling>
    325325      <MinimalRebuild>false</MinimalRebuild>
    … …  
    353353      <FunctionLevelLinking>false</FunctionLevelLinking>
    354354      <IntrinsicFunctions>true</IntrinsicFunctions>
    355       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     355      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    356356      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    357357      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
    … …  
    389389      <FunctionLevelLinking>false</FunctionLevelLinking>
    390390      <IntrinsicFunctions>true</IntrinsicFunctions>
    391       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     391      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    392392      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    393393      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>

  • trunk/src/libs/libpng-1.6.45/projects/vstudio/pngtest/pngtest.vcxproj

    r103316 r107813  
    150150      <Optimization>Disabled</Optimization>
    151151      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    152       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     152      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    153153      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    154154      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
    … …  
    183183      <Optimization>Disabled</Optimization>
    184184      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    185       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     185      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    186186      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    187187      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
    … …  
    217217      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    218218      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    219       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     219      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    220220      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    221221      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
    … …  
    250250      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    251251      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    252       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     252      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    253253      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    254254      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
    … …  
    276276  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    277277    <ClCompile>
    278       <WarningLevel>$(WarningLevel)</WarningLevel>
     278      <WarningLevel>Level3</WarningLevel>
    279279      <PrecompiledHeader>NotUsing</PrecompiledHeader>
    280280      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    … …  
    282282      <FunctionLevelLinking>false</FunctionLevelLinking>
    283283      <IntrinsicFunctions>true</IntrinsicFunctions>
    284       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    285       <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    286       <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
    287       <CompileAsManaged>false</CompileAsManaged>
    288       <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
     284      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     285      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     286      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
     287      <CompileAsManaged>false</CompileAsManaged>
     288      <TreatWarningAsError>false</TreatWarningAsError>
    289289      <StringPooling>true</StringPooling>
    290290      <MinimalRebuild>false</MinimalRebuild>
    … …  
    311311  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
    312312    <ClCompile>
    313       <WarningLevel>$(WarningLevel)</WarningLevel>
     313      <WarningLevel>Level3</WarningLevel>
    314314      <PrecompiledHeader>NotUsing</PrecompiledHeader>
    315315      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    … …  
    317317      <FunctionLevelLinking>false</FunctionLevelLinking>
    318318      <IntrinsicFunctions>true</IntrinsicFunctions>
    319       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    320       <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    321       <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
    322       <CompileAsManaged>false</CompileAsManaged>
    323       <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
     319      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     320      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     321      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
     322      <CompileAsManaged>false</CompileAsManaged>
     323      <TreatWarningAsError>false</TreatWarningAsError>
    324324      <StringPooling>true</StringPooling>
    325325      <MinimalRebuild>false</MinimalRebuild>
    … …  
    353353      <FunctionLevelLinking>false</FunctionLevelLinking>
    354354      <IntrinsicFunctions>true</IntrinsicFunctions>
    355       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     355      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    356356      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    357357      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
    … …  
    390390      <FunctionLevelLinking>false</FunctionLevelLinking>
    391391      <IntrinsicFunctions>true</IntrinsicFunctions>
    392       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     392      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    393393      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    394394      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>

  • trunk/src/libs/libpng-1.6.45/projects/vstudio/pngunknown/pngunknown.vcxproj

    r103316 r107813  
    150150      <Optimization>Disabled</Optimization>
    151151      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    152       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     152      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    153153      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    154154      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
    … …  
    183183      <Optimization>Disabled</Optimization>
    184184      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    185       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     185      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    186186      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    187187      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
    … …  
    217217      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    218218      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    219       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     219      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    220220      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    221221      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
    … …  
    250250      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    251251      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    252       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     252      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    253253      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    254254      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
    … …  
    276276  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    277277    <ClCompile>
    278       <WarningLevel>$(WarningLevel)</WarningLevel>
     278      <WarningLevel>Level3</WarningLevel>
    279279      <PrecompiledHeader>NotUsing</PrecompiledHeader>
    280280      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    … …  
    282282      <FunctionLevelLinking>false</FunctionLevelLinking>
    283283      <IntrinsicFunctions>true</IntrinsicFunctions>
    284       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    285       <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    286       <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
    287       <CompileAsManaged>false</CompileAsManaged>
    288       <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
     284      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     285      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     286      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
     287      <CompileAsManaged>false</CompileAsManaged>
     288      <TreatWarningAsError>false</TreatWarningAsError>
    289289      <StringPooling>true</StringPooling>
    290290      <MinimalRebuild>false</MinimalRebuild>
    … …  
    311311  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
    312312    <ClCompile>
    313       <WarningLevel>$(WarningLevel)</WarningLevel>
     313      <WarningLevel>Level3</WarningLevel>
    314314      <PrecompiledHeader>NotUsing</PrecompiledHeader>
    315315      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    … …  
    317317      <FunctionLevelLinking>false</FunctionLevelLinking>
    318318      <IntrinsicFunctions>true</IntrinsicFunctions>
    319       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    320       <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    321       <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
    322       <CompileAsManaged>false</CompileAsManaged>
    323       <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
     319      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     320      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     321      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
     322      <CompileAsManaged>false</CompileAsManaged>
     323      <TreatWarningAsError>false</TreatWarningAsError>
    324324      <StringPooling>true</StringPooling>
    325325      <MinimalRebuild>false</MinimalRebuild>
    … …  
    353353      <FunctionLevelLinking>false</FunctionLevelLinking>
    354354      <IntrinsicFunctions>true</IntrinsicFunctions>
    355       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     355      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    356356      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    357357      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
    … …  
    389389      <FunctionLevelLinking>false</FunctionLevelLinking>
    390390      <IntrinsicFunctions>true</IntrinsicFunctions>
    391       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     391      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    392392      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    393393      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>

  • trunk/src/libs/libpng-1.6.45/projects/vstudio/pngvalid/pngvalid.vcxproj

    r103316 r107813  
    150150      <Optimization>Disabled</Optimization>
    151151      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    152       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     152      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    153153      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    154154      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
    … …  
    183183      <Optimization>Disabled</Optimization>
    184184      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    185       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     185      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    186186      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    187187      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
    … …  
    217217      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    218218      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    219       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     219      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    220220      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    221221      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
    … …  
    250250      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
    251251      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    252       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     252      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    253253      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    254254      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
    … …  
    276276  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    277277    <ClCompile>
    278       <WarningLevel>$(WarningLevel)</WarningLevel>
     278      <WarningLevel>Level3</WarningLevel>
    279279      <PrecompiledHeader>NotUsing</PrecompiledHeader>
    280280      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    … …  
    282282      <FunctionLevelLinking>false</FunctionLevelLinking>
    283283      <IntrinsicFunctions>true</IntrinsicFunctions>
    284       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    285       <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    286       <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
    287       <CompileAsManaged>false</CompileAsManaged>
    288       <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
     284      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     285      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     286      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
     287      <CompileAsManaged>false</CompileAsManaged>
     288      <TreatWarningAsError>false</TreatWarningAsError>
    289289      <StringPooling>true</StringPooling>
    290290      <MinimalRebuild>false</MinimalRebuild>
    … …  
    311311  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
    312312    <ClCompile>
    313       <WarningLevel>$(WarningLevel)</WarningLevel>
     313      <WarningLevel>Level3</WarningLevel>
    314314      <PrecompiledHeader>NotUsing</PrecompiledHeader>
    315315      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    … …  
    317317      <FunctionLevelLinking>false</FunctionLevelLinking>
    318318      <IntrinsicFunctions>true</IntrinsicFunctions>
    319       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    320       <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    321       <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
    322       <CompileAsManaged>false</CompileAsManaged>
    323       <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
     319      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     320      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     321      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
     322      <CompileAsManaged>false</CompileAsManaged>
     323      <TreatWarningAsError>false</TreatWarningAsError>
    324324      <StringPooling>true</StringPooling>
    325325      <MinimalRebuild>false</MinimalRebuild>
    … …  
    353353      <FunctionLevelLinking>false</FunctionLevelLinking>
    354354      <IntrinsicFunctions>true</IntrinsicFunctions>
    355       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     355      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    356356      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    357357      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
    … …  
    389389      <FunctionLevelLinking>false</FunctionLevelLinking>
    390390      <IntrinsicFunctions>true</IntrinsicFunctions>
    391       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     391      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    392392      <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    393393      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>

  • trunk/src/libs/libpng-1.6.45/projects/vstudio/zlib.props

    r96425 r107813  
    33 * zlib.props - location of zlib source
    44 *
    5  * Copyright (c) 2018 Cosmin Truta
     5 * Copyright (c) 2018-2024 Cosmin Truta
    66 * Copyright (c) 1998-2011 Glenn Randers-Pehrson
    77 *
    … …  
    1515
    1616<Project ToolsVersion="4.0"
    17    xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     17         xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    1818  <PropertyGroup Label="Globals">
    1919    <!-- Place the name of the directory containing the source of zlib used for
    20         debugging in this property.
     20        debugging in this property.
    2121
    2222         The directory need only contain the '.c' and '.h' files from the
    23         source.
     23        source.
    2424
    25         If you use a relative directory name (as below) then it must be
    26         relative to the project directories; these are one level deeper than
    27         the directories containing this file.
     25        If you use a relative directory name (as below) then it must be
     26        relative to the project directories; these are one level deeper than
     27        the directories containing this file.
    2828
    29         If the version of zlib you use does not match that used when the
    30          distribution was built you will get warnings from pngtest that the zlib
    31          versions do not match.  The zlib version used in this build is recorded
    32         below:
     29        If the version of zlib you use does not match that used when the
     30         distribution was built you will get warnings from pngtest that the
     31         zlib versions do not match.  The zlib version used in this build is
     32         recorded below:
    3333     -->
    3434    <ZLibSrcDir>..\..\..\..\zlib</ZLibSrcDir>
    … …  
    3737         Studio 2012.  Notice that this is not supported by the Visual Studio
    3838         2012 IDE and that the programs that result cannot be run unless they
    39          signed by Microsoft.  This is therefore untested; only Microsoft can
    40          test it:
     39         are signed by Microsoft.  This is therefore untested; only Microsoft
     40         can test it:
    4141     -->
    4242    <WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>
    4343
    44     <!-- The following lines provide a global (solution level) control of the
    45          warnings issued by the compiler, these are used in the individual
    46          project files (*/*.vcxproj) with, for zlib, some extra disables.
     44    <!-- The following lines provide a global (solution-level) control of the
     45         warnings issued by the compiler.
    4746
    48          Different versions of Visual Studio may require different settings,
    49          these settings work with Visual Studio 2013.  Just set
    50          TreatWarningAsError to false to check the build without failing on
    51          errors.
     47         Considering how different versions of Visual Studio sometimes require
     48         different settings, and their compilers issue different warnings, we
     49         set TreatWarningAsError to false to avoid unforeseen and undesirable
     50         build failures for the users who upgrade to a newer Visual Studio that
     51         might bring along a more pedantic compiler:
    5252     -->
    53    <WarningLevel>EnableAllWarnings</WarningLevel>
    54    <TreatWarningAsError>true</TreatWarningAsError>
    55    <DisableSpecificWarnings>4255;4668;4710;4711;4746;4820;4996</DisableSpecificWarnings>
     53   <WarningLevel>Level3</WarningLevel>
     54   <TreatWarningAsError>false</TreatWarningAsError>
    5655  </PropertyGroup>
    5756</Project>

  • trunk/src/libs/libpng-1.6.45/projects/vstudio/zlib/zlib.vcxproj

    r103316 r107813  
    155155      <PreprocessorDefinitions>WIN32;_DEBUG;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    156156      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    157       <WarningLevel>Level3</WarningLevel>
     157      <WarningLevel>$(WarningLevel)</WarningLevel>
    158158      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    159159      <Optimization>Disabled</Optimization>
    160160      <BrowseInformation>true</BrowseInformation>
    161161      <FunctionLevelLinking>true</FunctionLevelLinking>
    162       <DisableSpecificWarnings>$(DisableSpecificWarnings);4127;4131;4242;4244</DisableSpecificWarnings>
    163       <TreatWarningAsError>false</TreatWarningAsError>
     162      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
     163      <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
    164164    </ClCompile>
    165165    <Link>
    … …  
    173173      <PreprocessorDefinitions>WIN32;_DEBUG;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    174174      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
    175       <WarningLevel>Level3</WarningLevel>
     175      <WarningLevel>$(WarningLevel)</WarningLevel>
    176176      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    177177      <Optimization>Disabled</Optimization>
    178178      <BrowseInformation>true</BrowseInformation>
    179179      <FunctionLevelLinking>true</FunctionLevelLinking>
    180       <DisableSpecificWarnings>$(DisableSpecificWarnings);4127;4131;4242;4244</DisableSpecificWarnings>
    181       <TreatWarningAsError>false</TreatWarningAsError>
     180      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
     181      <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
    182182    </ClCompile>
    183183    <Link>
    … …  
    189189    <ClCompile>
    190190      <PreprocessorDefinitions>WIN32;_DEBUG;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    191       <WarningLevel>Level3</WarningLevel>
     191      <WarningLevel>$(WarningLevel)</WarningLevel>
    192192      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    193193      <Optimization>Disabled</Optimization>
    194194      <BrowseInformation>true</BrowseInformation>
    195195      <FunctionLevelLinking>true</FunctionLevelLinking>
    196       <DisableSpecificWarnings>$(DisableSpecificWarnings);4127;4131;4242;4244</DisableSpecificWarnings>
    197       <TreatWarningAsError>false</TreatWarningAsError>
     196      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
     197      <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
    198198      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    199199    </ClCompile>
    … …  
    207207    <ClCompile>
    208208      <PreprocessorDefinitions>WIN32;_DEBUG;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    209       <WarningLevel>Level3</WarningLevel>
     209      <WarningLevel>$(WarningLevel)</WarningLevel>
    210210      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    211211      <Optimization>Disabled</Optimization>
    212212      <BrowseInformation>true</BrowseInformation>
    213213      <FunctionLevelLinking>true</FunctionLevelLinking>
    214       <DisableSpecificWarnings>$(DisableSpecificWarnings);4127;4131;4242;4244</DisableSpecificWarnings>
    215       <TreatWarningAsError>false</TreatWarningAsError>
     214      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
     215      <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
    216216      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    217217    </ClCompile>
    … …  
    223223  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">
    224224    <ClCompile>
    225       <WarningLevel>Level3</WarningLevel>
     225      <WarningLevel>$(WarningLevel)</WarningLevel>
    226226      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    227227      <Optimization>Full</Optimization>
    … …  
    231231      <BrowseInformation>true</BrowseInformation>
    232232      <FunctionLevelLinking>true</FunctionLevelLinking>
    233       <DisableSpecificWarnings>$(DisableSpecificWarnings);4127;4131;4242;4244</DisableSpecificWarnings>
    234       <TreatWarningAsError>false</TreatWarningAsError>
     233      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
     234      <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
    235235      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    236236      <PreprocessorDefinitions>WIN32;NDEBUG;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    … …  
    247247  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|ARM64'">
    248248    <ClCompile>
    249       <WarningLevel>Level3</WarningLevel>
     249      <WarningLevel>$(WarningLevel)</WarningLevel>
    250250      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    251251      <Optimization>Full</Optimization>
    … …  
    255255      <BrowseInformation>true</BrowseInformation>
    256256      <FunctionLevelLinking>true</FunctionLevelLinking>
    257       <DisableSpecificWarnings>$(DisableSpecificWarnings);4127;4131;4242;4244</DisableSpecificWarnings>
    258       <TreatWarningAsError>false</TreatWarningAsError>
     257      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
     258      <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
    259259      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    260260      <PreprocessorDefinitions>WIN32;NDEBUG;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    … …  
    278278      <BrowseInformation>true</BrowseInformation>
    279279      <FunctionLevelLinking>true</FunctionLevelLinking>
    280       <DisableSpecificWarnings>$(DisableSpecificWarnings);4127;4131;4242;4244</DisableSpecificWarnings>
     280      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
    281281      <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
    282282      <PreprocessorDefinitions>WIN32;NDEBUG;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    … …  
    303303      <BrowseInformation>true</BrowseInformation>
    304304      <FunctionLevelLinking>true</FunctionLevelLinking>
    305       <DisableSpecificWarnings>$(DisableSpecificWarnings);4127;4131;4242;4244</DisableSpecificWarnings>
     305      <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
    306306      <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
    307307      <PreprocessorDefinitions>WIN32;NDEBUG;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions>

  • trunk/src/libs/libpng-1.6.45/scripts/README.txt

    r103316 r107813  
     1Scripts and makefiles for libpng
     2--------------------------------
    13
    2 Makefiles for libpng
     4    pnglibconf.h.prebuilt  =>  Configuration settings
    35
    4 pnglibconf.h.prebuilt  =>  Configuration settings
    5  makefile.linux    =>  Linux/ELF makefile
    6                        (gcc, creates shared libpng16.so.16.1.6.*)
    7  makefile.linux-opt=>  Linux/ELF makefile with hardware optimizations on
    8                        (gcc, creates shared libpng16.so.16.1.6.*)
    9  makefile.gcc      =>  Generic makefile (gcc, creates static libpng.a)
    10  makefile.acorn    =>  Acorn makefile
    11  makefile.aix      =>  AIX/gcc makefile
    12  makefile.amiga    =>  Amiga makefile
    13  makefile.atari    =>  Atari makefile
    14  makefile.bc32     =>  32-bit Borland C++ (all modules compiled in C mode)
    15  makefile.beos     =>  BeOS makefile
    16  makefile.clang    =>  Generic clang makefile
    17  makefile.darwin   =>  Darwin makefile, for macOS (formerly Mac OS X)
    18  makefile.dec      =>  DEC Alpha UNIX makefile
    19  makefile.dj2      =>  DJGPP 2 makefile
    20  makefile.freebsd  =>  FreeBSD makefile
    21  makefile.gcc      =>  Generic gcc makefile
    22  makefile.hpgcc    =>  HPUX makefile using gcc
    23  makefile.hpux     =>  HPUX (10.20 and 11.00) makefile
    24  makefile.hp64     =>  HPUX (10.20 and 11.00) makefile, 64-bit
    25  makefile.ibmc     =>  IBM C/C++ version 3.x for Win32 and OS/2 (static)
    26  makefile.intel    =>  Intel C/C++ version 4.0 and later
    27  makefile.mips     =>  MIPS makefile
    28  makefile.netbsd   =>  NetBSD/cc makefile, makes shared libpng.so
    29  makefile.openbsd  =>  OpenBSD makefile
    30  makefile.sco      =>  SCO OSr5 ELF and Unixware 7 with Native cc
    31  makefile.sggcc    =>  Silicon Graphics makefile
    32                        (gcc, creates shared libpng16.so.16.1.6.*)
    33  makefile.sgi      =>  Silicon Graphics IRIX makefile (cc, creates static lib)
    34  makefile.solaris  =>  Solaris 2.X makefile
    35                        (gcc, creates shared libpng16.so.16.1.6.*)
    36  makefile.so9      =>  Solaris 9 makefile
    37                        (gcc, creates shared libpng16.so.16.1.6.*)
    38  makefile.std      =>  Generic UNIX makefile (cc, creates static libpng.a)
    39  makefile.sunos    =>  Sun makefile
    40  makefile.32sunu   =>  Sun Ultra 32-bit makefile
    41  makefile.64sunu   =>  Sun Ultra 64-bit makefile
    42  makefile.vcwin32  =>  makefile for Microsoft Visual C++ 4.0 and later
    43  makevms.com       =>  VMS build script
    44  smakefile.ppc     =>  AMIGA smakefile for SAS C V6.58/7.00 PPC compiler
    45                        (Requires SCOPTIONS, copied from scripts/SCOPTIONS.ppc)
     6    makefile.aix      =>  AIX/gcc makefile
     7    makefile.amiga    =>  Amiga makefile
     8    makefile.atari    =>  Atari makefile
     9    makefile.bc32     =>  Borland C makefile, for Win32
     10    makefile.beos     =>  BeOS makefile
     11    makefile.clang    =>  Generic clang makefile
     12    makefile.darwin   =>  Darwin makefile, for macOS (formerly Mac OS X)
     13    makefile.dec      =>  DEC Alpha UNIX makefile
     14    makefile.dj2      =>  DJGPP 2 makefile
     15    makefile.emcc     =>  Emscripten makefile
     16    makefile.freebsd  =>  FreeBSD makefile
     17    makefile.gcc      =>  Generic gcc makefile
     18    makefile.hpgcc    =>  HPUX makefile using gcc
     19    makefile.hpux     =>  HPUX (10.20 and 11.00) makefile
     20    makefile.hp64     =>  HPUX (10.20 and 11.00) makefile, 64-bit
     21    makefile.ibmc     =>  IBM C/C++ version 3.x for Win32 and OS/2 (static lib)
     22    makefile.intel    =>  Intel C/C++ version 4.0 and later
     23    makefile.linux    =>  Linux/ELF makefile
     24                          (gcc, creates shared libpng16.so.16.1.6.*)
     25    makefile.mips     =>  MIPS makefile
     26    makefile.msys     =>  MSYS (MinGW) makefile
     27    makefile.netbsd   =>  NetBSD/cc makefile, makes shared libpng.so
     28    makefile.openbsd  =>  OpenBSD makefile
     29    makefile.riscos   =>  Acorn RISCOS makefile
     30    makefile.sco      =>  SCO OSr5 ELF and Unixware 7 with Native cc
     31    makefile.sgi      =>  Silicon Graphics IRIX makefile (cc, static lib)
     32    makefile.sggcc    =>  Silicon Graphics makefile
     33                          (gcc, creates shared libpng16.so.16.1.6.*)
     34    makefile.solaris  =>  Solaris 2.X makefile
     35                          (gcc, creates shared libpng16.so.16.1.6.*)
     36    makefile.so9      =>  Solaris 9 makefile
     37                          (gcc, creates shared libpng16.so.16.1.6.*)
     38    makefile.std      =>  Generic UNIX makefile (cc, static lib)
     39    makefile.sunos    =>  Sun makefile
     40    makefile.32sunu   =>  Sun Ultra 32-bit makefile
     41    makefile.64sunu   =>  Sun Ultra 64-bit makefile
     42    makefile.vcwin32  =>  makefile for Microsoft Visual C++ 4.0 and later
     43    makevms.com       =>  VMS build script
     44    smakefile.ppc     =>  AMIGA smakefile for SAS C V6.58/7.00 PPC compiler
     45                          (Requires SCOPTIONS, copied from SCOPTIONS.ppc)
    4646
    47 Other supporting scripts:
    48  README.txt        =>  This file
    49  descrip.mms       =>  VMS makefile for MMS or MMK
    50  libpng-config-body.in => used by several makefiles to create libpng-config
    51  libpng-config-head.in => used by several makefiles to create libpng-config
    52  libpng.pc.in      =>  Used by several makefiles to create libpng.pc
    53  pngwin.rc         =>  Used by the visualc71 project
    54  pngwin.def        =>  Used by makefile.os2
    55  pngwin.dfn        =>  Used to maintain pngwin.def
    56  SCOPTIONS.ppc     =>  Used with smakefile.ppc
     47Other supporting scripts
     48------------------------
    5749
    58  checksym.awk      =>  Used for maintaining pnglibconf.h
    59  def.dfn           =>  Used for maintaining pnglibconf.h
    60  options.awk       =>  Used for maintaining pnglibconf.h
    61  pnglibconf.dfa    =>  Used for maintaining pnglibconf.h
    62  pnglibconf.mak    =>  Used for maintaining pnglibconf.h
    63  sym.dfn           =>  Used for symbol versioning
    64  symbols.def       =>  Used for symbol versioning
    65  symbols.dfn       =>  Used for symbol versioning
    66  vers.dfn          =>  Used for symbol versioning
     50    README.txt        =>  This file
     51    descrip.mms       =>  VMS makefile for MMS or MMK
     52    libpng-config-body.in  =>  used by several makefiles to create libpng-config
     53    libpng-config-head.in  =>  used by several makefiles to create libpng-config
     54    libpng.pc.in      =>  Used by several makefiles to create libpng.pc
     55    macro.lst         =>  Used by GNU Autotools
     56    pngwin.rc         =>  Used by the visualc71 project
     57    pngwin.def        =>  Used by makefile.os2
     58    pngwin.dfn        =>  Used to maintain pngwin.def
     59    SCOPTIONS.ppc     =>  Used with smakefile.ppc
    6760
    68  libtool.m4        =>  Used by autoconf tools
    69  ltoptions.m4      =>  Used by autoconf tools
    70  ltsugar.m4        =>  Used by autoconf tools
    71  ltversion.m4      =>  Used by autoconf tools
    72  lt~obsolete.m4    =>  Used by autoconf tools
    73 
    74  intprefix.dfn     =>  Used by autoconf tools
    75  macro.lst         =>  Used by autoconf tools
    76  prefix.dfn        =>  Used by autoconf tools
     61    checksym.awk      =>  Used for maintaining pnglibconf.h
     62    dfn.awk           =>  Used for maintaining pnglibconf.h
     63    options.awk       =>  Used for maintaining pnglibconf.h
     64    pnglibconf.dfa    =>  Used for maintaining pnglibconf.h
     65    pnglibconf.mak    =>  Used for maintaining pnglibconf.h
     66    intprefix.c       =>  Used for symbol versioning
     67    prefix.c          =>  Used for symbol versioning
     68    sym.c             =>  Used for symbol versioning
     69    symbols.c         =>  Used for symbol versioning
     70    vers.c            =>  Used for symbol versioning
    7771
    7872Further information can be found in comments in the individual scripts and

  • trunk/src/libs/libpng-1.6.45/scripts/descrip.mms

    r103316 r107813  
    1 
    21cc_defs = /inc=$(ZLIBSRC)
    32c_deb =

  • trunk/src/libs/libpng-1.6.45/scripts/intprefix.c

    r103316 r107813  
    1 
    21/* intprefix.c - generate an unprefixed internal symbol list
    32 *

  • trunk/src/libs/libpng-1.6.45/scripts/libpng-config-body.in

    r96425 r107813  
    1 
    21usage()
    32{

  • trunk/src/libs/libpng-1.6.45/scripts/libpng-config-head.in

    r105469 r107813  
    1212# Modeled after libxml-config.
    1313
    14 version=1.6.43
     14version=1.6.45
    1515prefix=""
    1616libdir=""

  • trunk/src/libs/libpng-1.6.45/scripts/libpng.pc.in

    r105469 r107813  
    66Name: libpng
    77Description: Loads and saves PNG files
    8 Version: 1.6.43
     8Version: 1.6.45
    99Libs: -L${libdir} -lpng16
    1010Cflags: -I${includedir}

  • trunk/src/libs/libpng-1.6.45/scripts/pnglibconf.dfa

    r105469 r107813  
    99version
    1010com
    11 com Copyright (c) 2018-2024 Cosmin Truta
     11com Copyright (c) 2018-2025 Cosmin Truta
    1212com Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
    1313com
    … …  
    847847chunk bKGD
    848848chunk cHRM enables COLORSPACE
     849chunk cICP enables COLORSPACE, GAMMA
    849850chunk eXIf
    850851chunk gAMA enables GAMMA

  • trunk/src/libs/libpng-1.6.45/scripts/pnglibconf.h.prebuilt

    r105469 r107813  
    11/* pnglibconf.h - library build configuration */
    22
    3 /* libpng version 1.6.43 */
    4 
    5 /* Copyright (c) 2018-2024 Cosmin Truta */
     3/* libpng version 1.6.45 */
     4
     5/* Copyright (c) 2018-2025 Cosmin Truta */
    66/* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson */
    77
    … …  
    8989#define PNG_READ_bKGD_SUPPORTED
    9090#define PNG_READ_cHRM_SUPPORTED
     91#define PNG_READ_cICP_SUPPORTED
    9192#define PNG_READ_eXIf_SUPPORTED
    9293#define PNG_READ_gAMA_SUPPORTED
    … …  
    159160#define PNG_WRITE_bKGD_SUPPORTED
    160161#define PNG_WRITE_cHRM_SUPPORTED
     162#define PNG_WRITE_cICP_SUPPORTED
    161163#define PNG_WRITE_eXIf_SUPPORTED
    162164#define PNG_WRITE_gAMA_SUPPORTED
    … …  
    177179#define PNG_bKGD_SUPPORTED
    178180#define PNG_cHRM_SUPPORTED
     181#define PNG_cICP_SUPPORTED
    179182#define PNG_eXIf_SUPPORTED
    180183#define PNG_gAMA_SUPPORTED

  • trunk/src/libs/libpng-1.6.45/scripts/prefix.c

    r103316 r107813  
    1 
    21/* prefix.c - generate an unprefixed symbol list
    32 *

  • trunk/src/libs/libpng-1.6.45/scripts/sym.c

    r103316 r107813  
    1 
    21/* sym.c - define format of libpng.sym
    32 *

  • trunk/src/libs/libpng-1.6.45/scripts/symbols.c

    r103316 r107813  
    1 
    21/* symbols.c - find all exported symbols
    32 *

  • trunk/src/libs/libpng-1.6.45/scripts/symbols.def

    r96425 r107813  
    254254 png_get_eXIf_1 @248
    255255 png_set_eXIf_1 @249
     256 png_get_cICP @250
     257 png_set_cICP @251

  • trunk/src/libs/libpng-1.6.45/scripts/vers.c

    r103316 r107813  
    1 
    21/* vers.c - define format of libpng.vers
    32 *

  • trunk/src/libs/libpng-1.6.45/test-driver

    r103316 r107813  
    22# test-driver - basic testsuite driver script.
    33
    4 scriptversion=2018-03-07.03; # UTC
     4scriptversion=2024-06-19.01; # UTC
    55
    6 # Copyright (C) 2011-2021 Free Software Foundation, Inc.
     6# Copyright (C) 2011-2024 Free Software Foundation, Inc.
    77#
    88# This program is free software; you can redistribute it and/or modify
    … …  
    4545  test-driver --test-name NAME --log-file PATH --trs-file PATH
    4646              [--expect-failure {yes|no}] [--color-tests {yes|no}]
     47              [--collect-skipped-logs {yes|no}]
    4748              [--enable-hard-errors {yes|no}] [--]
    4849              TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
    … …  
    5051The '--test-name', '--log-file' and '--trs-file' options are mandatory.
    5152See the GNU Automake documentation for information.
     53
     54Report bugs to <[email protected]>.
     55GNU Automake home page: <https://www.gnu.org/software/automake/>.
     56General help using GNU software: <https://www.gnu.org/gethelp/>.
    5257END
    5358}
    … …  
    5863expect_failure=no
    5964color_tests=no
     65collect_skipped_logs=yes
    6066enable_hard_errors=yes
    6167while test $# -gt 0; do
    6268  case $1 in
    6369  --help) print_usage; exit $?;;
    64   --version) echo "test-driver $scriptversion"; exit $?;;
     70  --version) echo "test-driver (GNU Automake) $scriptversion"; exit $?;;
    6571  --test-name) test_name=$2; shift;;
    6672  --log-file) log_file=$2; shift;;
    6773  --trs-file) trs_file=$2; shift;;
    6874  --color-tests) color_tests=$2; shift;;
     75  --collect-skipped-logs) collect_skipped_logs=$2; shift;;
    6976  --expect-failure) expect_failure=$2; shift;;
    7077  --enable-hard-errors) enable_hard_errors=$2; shift;;
    … …  
    122129  0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
    123130  0:*)   col=$grn res=PASS  recheck=no  gcopy=no;;
    124   77:*)  col=$blu res=SKIP  recheck=no  gcopy=yes;;
     131  77:*)  col=$blu res=SKIP  recheck=no  gcopy=$collect_skipped_logs;;
    125132  99:*)  col=$mgn res=ERROR recheck=yes gcopy=yes;;
    126133  *:yes) col=$lgn res=XFAIL recheck=no  gcopy=yes;;
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette