diff options
Diffstat (limited to 'Build/source/libs/libpng/libpng-src/scripts')
16 files changed, 210 insertions, 34 deletions
diff --git a/Build/source/libs/libpng/libpng-src/scripts/autoconf/README.md b/Build/source/libs/libpng/libpng-src/scripts/autoconf/README.md new file mode 100644 index 00000000000..64963b73645 --- /dev/null +++ b/Build/source/libs/libpng/libpng-src/scripts/autoconf/README.md @@ -0,0 +1,7 @@ +Autoconf Macro Files for the PNG Reference Library +================================================== + +The Autoconf files associated with libpng are free software. +Use, modification and distribution of each individual file +are subject to the specific licensing terms and conditions +stated at the top of the file. diff --git a/Build/source/libs/libpng/libpng-src/scripts/libtool.m4 b/Build/source/libs/libpng/libpng-src/scripts/autoconf/libtool.m4 index 79a2451ef52..79a2451ef52 100644 --- a/Build/source/libs/libpng/libpng-src/scripts/libtool.m4 +++ b/Build/source/libs/libpng/libpng-src/scripts/autoconf/libtool.m4 diff --git a/Build/source/libs/libpng/libpng-src/scripts/ltoptions.m4 b/Build/source/libs/libpng/libpng-src/scripts/autoconf/ltoptions.m4 index b0b5e9c2126..b0b5e9c2126 100644 --- a/Build/source/libs/libpng/libpng-src/scripts/ltoptions.m4 +++ b/Build/source/libs/libpng/libpng-src/scripts/autoconf/ltoptions.m4 diff --git a/Build/source/libs/libpng/libpng-src/scripts/ltsugar.m4 b/Build/source/libs/libpng/libpng-src/scripts/autoconf/ltsugar.m4 index 902508bd93a..902508bd93a 100644 --- a/Build/source/libs/libpng/libpng-src/scripts/ltsugar.m4 +++ b/Build/source/libs/libpng/libpng-src/scripts/autoconf/ltsugar.m4 diff --git a/Build/source/libs/libpng/libpng-src/scripts/ltversion.m4 b/Build/source/libs/libpng/libpng-src/scripts/autoconf/ltversion.m4 index b155d0aceca..b155d0aceca 100644 --- a/Build/source/libs/libpng/libpng-src/scripts/ltversion.m4 +++ b/Build/source/libs/libpng/libpng-src/scripts/autoconf/ltversion.m4 diff --git a/Build/source/libs/libpng/libpng-src/scripts/lt~obsolete.m4 b/Build/source/libs/libpng/libpng-src/scripts/autoconf/lt~obsolete.m4 index 0f7a8759da8..0f7a8759da8 100644 --- a/Build/source/libs/libpng/libpng-src/scripts/lt~obsolete.m4 +++ b/Build/source/libs/libpng/libpng-src/scripts/autoconf/lt~obsolete.m4 diff --git a/Build/source/libs/libpng/libpng-src/scripts/cmake/AUTHORS.md b/Build/source/libs/libpng/libpng-src/scripts/cmake/AUTHORS.md new file mode 100644 index 00000000000..1c1173ab3fa --- /dev/null +++ b/Build/source/libs/libpng/libpng-src/scripts/cmake/AUTHORS.md @@ -0,0 +1,35 @@ +CMake Files, Lists and Scripts for the PNG Reference Library +============================================================ + +Author List +----------- + + * Alex Gaynor + * Andreas Franek + * B. Scott Michel + * Cameron Cawley + * Christian Ehrlicher + * Christopher Sean Morrison + * Claudio Bley + * Clifford Yapp + * Clinton Ingram + * Cosmin Truta + * David Callu + * Gleb Mazovetskiy + * Glenn Randers-Pehrson + * Gunther Nikl + * Jeremy Maitin-Shepard + * John Bowler + * Jon Creighton + * Kyle Bentley + * Martin Storsjö + * Owen Rudge + * Roger Leigh + * Roger Lowman + * Sam Serrels + * Simon Hausmann + * Steve Robinson + * Timothy Lyanguzov + * Tyler Kropp + * Vadim Barkov + * Vicky Pfau diff --git a/Build/source/libs/libpng/libpng-src/scripts/cmake/README.md b/Build/source/libs/libpng/libpng-src/scripts/cmake/README.md new file mode 100644 index 00000000000..ca418893a95 --- /dev/null +++ b/Build/source/libs/libpng/libpng-src/scripts/cmake/README.md @@ -0,0 +1,35 @@ +CMake Files, Lists and Scripts for the PNG Reference Library +============================================================ + +Copyright Notice +---------------- + + * Copyright (c) 2018-2024 Cosmin Truta. + * Copyright (c) 2007-2018 Glenn Randers-Pehrson. + * Originally written by Christian Ehrlicher, 2007. + +Use, modification and distribution of the CMake +files in the libpng distribution are subject to +the same licensing terms and conditions as libpng. +Please see the copyright notice in `png.h` or visit +http://libpng.org/pub/png/src/libpng-LICENSE.txt + +File List +--------- + + CMakeLists.txt ==> The main CMake lists file + scripts/cmake/AUTHORS.md ==> The Authors file + scripts/cmake/README.md ==> This file + scripts/cmake/genchk.cmake.in ==> Template for genchk.cmake + scripts/cmake/genout.cmake.in ==> Template for genout.cmake + scripts/cmake/gensrc.cmake.in ==> Template for gensrc.cmake + scripts/cmake/test.cmake.in ==> Template for test.cmake + +Acknowledgements +---------------- + +See the accompanying file `scripts/cmake/AUTHORS.md` +for the list of Contributing Authors. + +If you are a Contributing Author, please make sure +that you are being acknowledged. diff --git a/Build/source/libs/libpng/libpng-src/scripts/genchk.cmake.in b/Build/source/libs/libpng/libpng-src/scripts/cmake/genchk.cmake.in index 1b6aa84ae24..5ea92dd7315 100644 --- a/Build/source/libs/libpng/libpng-src/scripts/genchk.cmake.in +++ b/Build/source/libs/libpng/libpng-src/scripts/cmake/genchk.cmake.in @@ -1,12 +1,16 @@ # genchk.cmake.in # Generate .chk from .out with awk (generic), based upon the automake logic. -# Copyright (C) 2016 Glenn Randers-Pehrson +# Copyright (c) 2022-2024 Cosmin Truta +# Copyright (c) 2016 Glenn Randers-Pehrson # Written by Roger Leigh, 2016 - -# This code is released under the libpng license. -# For conditions of distribution and use, see the disclaimer -# and license in png.h +# +# Use, modification and distribution are subject to +# the same licensing terms and conditions as libpng. +# Please see the copyright notice in png.h or visit +# http://libpng.org/pub/png/src/libpng-LICENSE.txt +# +# SPDX-License-Identifier: libpng-2.0 # Variables substituted from CMakeLists.txt set(SRCDIR "@CMAKE_CURRENT_SOURCE_DIR@") @@ -21,7 +25,7 @@ get_filename_component(OUTPUTBASE "${OUTPUT}" NAME_WE) get_filename_component(INPUTDIR "${INPUT}" PATH) get_filename_component(OUTPUTDIR "${OUTPUT}" PATH) -if("${INPUTEXT}" STREQUAL ".out" AND "${OUTPUTEXT}" STREQUAL ".chk") +if(INPUTEXT STREQUAL ".out" AND OUTPUTEXT STREQUAL ".chk") # Generate .chk from .out with awk (generic) file(REMOVE "${OUTPUT}" "${OUTPUTDIR}/${OUTPUTBASE}.new") execute_process(COMMAND "${AWK}" -f "${BINDIR}/scripts/checksym.awk" diff --git a/Build/source/libs/libpng/libpng-src/scripts/genout.cmake.in b/Build/source/libs/libpng/libpng-src/scripts/cmake/genout.cmake.in index ec685d900d7..ab828596899 100644 --- a/Build/source/libs/libpng/libpng-src/scripts/genout.cmake.in +++ b/Build/source/libs/libpng/libpng-src/scripts/cmake/genout.cmake.in @@ -1,12 +1,16 @@ # genout.cmake.in # Generate .out from .c with awk (generic), based upon the automake logic. -# Copyright (C) 2016 Glenn Randers-Pehrson +# Copyright (c) 2022-2024 Cosmin Truta +# Copyright (c) 2016 Glenn Randers-Pehrson # Written by Roger Leigh, 2016 - -# This code is released under the libpng license. -# For conditions of distribution and use, see the disclaimer -# and license in png.h +# +# Use, modification and distribution are subject to +# the same licensing terms and conditions as libpng. +# Please see the copyright notice in png.h or visit +# http://libpng.org/pub/png/src/libpng-LICENSE.txt +# +# SPDX-License-Identifier: libpng-2.0 # Variables substituted from CMakeLists.txt set(SRCDIR "@CMAKE_CURRENT_SOURCE_DIR@") @@ -41,7 +45,7 @@ get_filename_component(OUTPUTBASE "${OUTPUT}" NAME_WE) get_filename_component(INPUTDIR "${INPUT}" PATH) get_filename_component(OUTPUTDIR "${OUTPUT}" PATH) -if ("${INPUTEXT}" STREQUAL ".c" AND "${OUTPUTEXT}" STREQUAL ".out") +if(INPUTEXT STREQUAL ".c" AND OUTPUTEXT STREQUAL ".out") get_filename_component(GENDIR "${OUTPUT}" PATH) file(MAKE_DIRECTORY "${GENDIR}") diff --git a/Build/source/libs/libpng/libpng-src/scripts/gensrc.cmake.in b/Build/source/libs/libpng/libpng-src/scripts/cmake/gensrc.cmake.in index e97fada20f9..52dab8d2bcd 100644 --- a/Build/source/libs/libpng/libpng-src/scripts/gensrc.cmake.in +++ b/Build/source/libs/libpng/libpng-src/scripts/cmake/gensrc.cmake.in @@ -1,12 +1,16 @@ # gensrc.cmake.in # Generate source files with awk, based upon the automake logic. -# Copyright (C) 2016 Glenn Randers-Pehrson +# Copyright (c) 2022-2024 Cosmin Truta +# Copyright (c) 2016 Glenn Randers-Pehrson # Written by Roger Leigh, 2016 - -# This code is released under the libpng license. -# For conditions of distribution and use, see the disclaimer -# and license in png.h +# +# Use, modification and distribution are subject to +# the same licensing terms and conditions as libpng. +# Please see the copyright notice in png.h or visit +# http://libpng.org/pub/png/src/libpng-LICENSE.txt +# +# SPDX-License-Identifier: libpng-2.0 # Variables substituted from CMakeLists.txt set(SRCDIR "@CMAKE_CURRENT_SOURCE_DIR@") @@ -17,7 +21,7 @@ set(DFA_XTRA "@DFA_XTRA@") set(PNG_PREFIX "@PNG_PREFIX@") set(PNGLIB_VERSION "@PNGLIB_VERSION@") -if("${OUTPUT}" STREQUAL "scripts/pnglibconf.c") +if(OUTPUT STREQUAL "scripts/pnglibconf.c") # Generate scripts/pnglibconf.c file(REMOVE "${BINDIR}/pnglibconf.tf6" "${BINDIR}/pnglibconf.tf7") @@ -45,7 +49,7 @@ if("${OUTPUT}" STREQUAL "scripts/pnglibconf.c") file(MAKE_DIRECTORY "${BINDIR}/scripts") file(RENAME "pnglibconf.tf7" "${BINDIR}/scripts/pnglibconf.c") -elseif ("${OUTPUT}" STREQUAL "pnglibconf.c") +elseif(OUTPUT STREQUAL "pnglibconf.c") # Generate pnglibconf.c file(REMOVE "${BINDIR}/pnglibconf.tf4" "${BINDIR}/pnglibconf.tf5") @@ -72,7 +76,7 @@ elseif ("${OUTPUT}" STREQUAL "pnglibconf.c") file(MAKE_DIRECTORY "${BINDIR}/scripts") file(RENAME "pnglibconf.tf5" "${BINDIR}/pnglibconf.c") -elseif ("${OUTPUT}" STREQUAL "pnglibconf.h") +elseif(OUTPUT STREQUAL "pnglibconf.h") # Generate pnglibconf.h file(REMOVE "${BINDIR}/${OUTPUT}") @@ -101,7 +105,7 @@ elseif ("${OUTPUT}" STREQUAL "pnglibconf.h") endif() endif() -elseif ("${OUTPUT}" STREQUAL "pngprefix.h") +elseif(OUTPUT STREQUAL "pngprefix.h") # Generate pngprefix.h file(REMOVE "${BINDIR}/${OUTPUT}") @@ -123,7 +127,7 @@ elseif ("${OUTPUT}" STREQUAL "pngprefix.h") file(WRITE "${BINDIR}/${OUTPUT}" "/* No libpng symbol prefix configured. */") endif() -elseif("${OUTPUT}" STREQUAL "scripts/pnglibconf.h.prebuilt") +elseif(OUTPUT STREQUAL "scripts/pnglibconf.h.prebuilt") # Generate scripts/pnglibconf.h.prebuilt (fails build) message(STATUS "Attempting to build scripts/pnglibconf.h.prebuilt") @@ -134,5 +138,7 @@ elseif("${OUTPUT}" STREQUAL "scripts/pnglibconf.h.prebuilt") message(FATAL_ERROR "Stopping build") else() + message(FATAL_ERROR "Unsupported output: ${OUTPUT}") + endif() diff --git a/Build/source/libs/libpng/libpng-src/scripts/test.cmake.in b/Build/source/libs/libpng/libpng-src/scripts/cmake/test.cmake.in index fa6a889bbaf..a1cd30f556c 100644 --- a/Build/source/libs/libpng/libpng-src/scripts/test.cmake.in +++ b/Build/source/libs/libpng/libpng-src/scripts/cmake/test.cmake.in @@ -1,11 +1,15 @@ # test.cmake.in -# Copyright (C) 2016 Glenn Randers-Pehrson +# Copyright (c) 2024 Cosmin Truta +# Copyright (c) 2016 Glenn Randers-Pehrson # Written by Roger Leigh, 2016 - -# This code is released under the libpng license. -# For conditions of distribution and use, see the disclaimer -# and license in png.h +# +# Use, modification and distribution are subject to +# the same licensing terms and conditions as libpng. +# Please see the copyright notice in png.h or visit +# http://libpng.org/pub/png/src/libpng-LICENSE.txt +# +# SPDX-License-Identifier: libpng-2.0 set(TEST_OPTIONS "@TEST_OPTIONS@") set(TEST_FILES "@TEST_FILES@") @@ -22,8 +26,7 @@ if(WIN32) set(ENV{PATH} "${LIBPNG_DIR};$ENV{PATH}") endif() -execute_process(COMMAND "${CMAKE_COMMAND}" -E echo "Running ${TEST_COMMAND}" ${TEST_OPTIONS} ${NATIVE_TEST_FILES}) - +message("Running ${TEST_COMMAND}" ${TEST_OPTIONS} ${NATIVE_TEST_FILES}) execute_process(COMMAND "${TEST_COMMAND}" ${TEST_OPTIONS} ${NATIVE_TEST_FILES} RESULT_VARIABLE TEST_STATUS) if(TEST_STATUS) diff --git a/Build/source/libs/libpng/libpng-src/scripts/libpng-config-head.in b/Build/source/libs/libpng/libpng-src/scripts/libpng-config-head.in index b3e45a4b59b..3cc2ecb7127 100644 --- a/Build/source/libs/libpng/libpng-src/scripts/libpng-config-head.in +++ b/Build/source/libs/libpng/libpng-src/scripts/libpng-config-head.in @@ -11,7 +11,7 @@ # Modeled after libxml-config. -version=1.6.40 +version=1.6.41 prefix="" libdir="" libs="" diff --git a/Build/source/libs/libpng/libpng-src/scripts/libpng.pc.in b/Build/source/libs/libpng/libpng-src/scripts/libpng.pc.in index 142b1b51f33..d206d86a4e8 100644 --- a/Build/source/libs/libpng/libpng-src/scripts/libpng.pc.in +++ b/Build/source/libs/libpng/libpng-src/scripts/libpng.pc.in @@ -5,6 +5,6 @@ includedir=@includedir@/libpng16 Name: libpng Description: Loads and saves PNG files -Version: 1.6.40 +Version: 1.6.41 Libs: -L${libdir} -lpng16 Cflags: -I${includedir} diff --git a/Build/source/libs/libpng/libpng-src/scripts/pnglibconf.dfa b/Build/source/libs/libpng/libpng-src/scripts/pnglibconf.dfa index 003e0f2f04c..739805d2d99 100644 --- a/Build/source/libs/libpng/libpng-src/scripts/pnglibconf.dfa +++ b/Build/source/libs/libpng/libpng-src/scripts/pnglibconf.dfa @@ -8,7 +8,7 @@ com pnglibconf.h - library build configuration com version com -com Copyright (c) 2018-2023 Cosmin Truta +com Copyright (c) 2018-2024 Cosmin Truta com Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson com com This code is released under the libpng license. @@ -256,6 +256,55 @@ option POWERPC_VSX_API disabled enables SET_OPTION, option POWERPC_VSX_CHECK disabled, sets POWERPC_VSX_OPT 1 +# These options are specific to the MIPS MSA hardware optimizations. +# +# MIPS_MSA_OPT: unset: check at compile time (__mips_msa must be defined by +# the compiler, typically as a result of specifying +# "-mmsa -mfp64" compiler flags) +# 0: disable (even if the CPU supports MSA.) +# 1: check at run time (via MIPS_MSA_{API,CHECK}) +# 2: switch on unconditionally (inadvisable - instead pass +# -mmsa -mfp64 to compiler options) +# When building libpng avoid using any setting other than '0'; '1' is +# set automatically when either 'API' or 'CHECK' are configured in, +# '2' should not be necessary as "-mmsa -mfp64" will achieve the same +# effect as well as applying MSA optimizations to the rest of the +# libpng code. +# NOTE: any setting other than '0' requires ALIGNED_MEMORY +# MIPS_MSA_API: (PNG_MIPS_MSA == 1) allow the optimization to be switched on +# with png_set_option. +# MIPS_MSA_CHECK: (PNG_MIPS_MSA == 1) compile a run-time check to see if MSA +# extensions are supported. +setting MIPS_MSA_OPT +option MIPS_MSA_API disabled requires ALIGNED_MEMORY enables SET_OPTION, + sets MIPS_MSA_OPT 1 +option MIPS_MSA_CHECK disabled requires ALIGNED_MEMORY, + sets MIPS_MSA_OPT 1 + +# These options are specific to the MIPS MMI hardware optimizations. +# +# MIPS_MMI_OPT: unset: check at compile time (__mips_loongson_mmi must be defined by +# the compiler, typically as a result of specifying +# "-mloongson-mmi -march=loongson3a" compiler flags) +# 0: disable (even if the CPU supports MMI.) +# 1: check at run time (via MIPS_MMI_{API,CHECK}) +# 2: switch on unconditionally (inadvisable - instead pass +# -mloongson-mmi -march=loongson3a to compiler options) +# When building libpng avoid using any setting other than '0'; '1' is +# set automatically when either 'API' or 'CHECK' are configured in, +# '2' should not be necessary as "-mloongson-mmi -march=loongson3a" will achieve the same +# effect as well as applying MMI optimizations to the rest of the +# libpng code. +# MIPS_MMI_API: (PNG_MIPS_MMI == 1) allow the optimization to be switched on +# with png_set_option +# MIPS_MMI_CHECK: (PNG_MIPS_MMI == 1) compile a run-time check to see if MMI +# extensions are supported. +setting MIPS_MMI_OPT +option MIPS_MMI_API disabled requires ALIGNED_MEMORY enables SET_OPTION, + sets MIPS_MMI_OPT 1 +option MIPS_MMI_CHECK disabled requires ALIGNED_MEMORY, + sets MIPS_MMI_OPT 1 + # These settings configure the default compression level (0-9) and 'strategy'; # strategy is as defined by the implementors of zlib. It describes the input @@ -336,6 +385,34 @@ option BENIGN_ERRORS option BENIGN_WRITE_ERRORS requires BENIGN_ERRORS disabled option BENIGN_READ_ERRORS requires BENIGN_ERRORS +# Adler32 checksum +# +# This option allows the check of the Adler32 checksum performed by zlib to +# be turned off for IDAT chunks (only). Unless this option is enabled and +# turned on (not the default even if enabled) a failed Adler32 at the end of the +# stream will result in a decompression (inflate) failure on read even though +# the entire image might have been read successfully. +# +# This option relies on an undocumented function 'inflateValidate' which is +# present in only some versions of zlib. If the function is not present in the +# zlib used with libpng code which uses -lpng is likely to fail to link or to +# launch in the case of a DLL. +# +# Therefore this option is currently disabled by default; it has to be turned on +# in pngusr.dfa and then the application program has to explicitly turn the +# functionality on by calling png_set_option. +# +# Furthermore the option is explicitly turned off here if the zlib version +# number is below that required - libpng wouldn't compile in that case if the +# option were turned on. +option DISABLE_ADLER32_CHECK requires READ enables SET_OPTION disabled + +# ZLIB_VERNUM must be used here, not PNG_ZLIB_VERNUM, because +# scripts/options.awk ends up putting this test adhead of the setting of +# PNG_ZLIB_VERNUM (apparently above, but not because of the two-pass processing) +@#if ZLIB_VERNUM < 0x1290 +@# define PNG_NO_DISABLE_ADLER32_CHECK +@#endif # Generic options - affect both read and write. diff --git a/Build/source/libs/libpng/libpng-src/scripts/pnglibconf.h.prebuilt b/Build/source/libs/libpng/libpng-src/scripts/pnglibconf.h.prebuilt index c7033ae176f..d768a8ef087 100644 --- a/Build/source/libs/libpng/libpng-src/scripts/pnglibconf.h.prebuilt +++ b/Build/source/libs/libpng/libpng-src/scripts/pnglibconf.h.prebuilt @@ -1,8 +1,8 @@ /* pnglibconf.h - library build configuration */ -/* libpng version 1.6.40 */ +/* libpng version 1.6.41 */ -/* Copyright (c) 2018-2023 Cosmin Truta */ +/* Copyright (c) 2018-2024 Cosmin Truta */ /* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson */ /* This code is released under the libpng license. */ @@ -27,6 +27,7 @@ #define PNG_COLORSPACE_SUPPORTED #define PNG_CONSOLE_IO_SUPPORTED #define PNG_CONVERT_tIME_SUPPORTED +/*#undef PNG_DISABLE_ADLER32_CHECK_SUPPORTED*/ #define PNG_EASY_ACCESS_SUPPORTED /*#undef PNG_ERROR_NUMBERS_SUPPORTED*/ #define PNG_ERROR_TEXT_SUPPORTED @@ -41,6 +42,10 @@ #define PNG_INCH_CONVERSIONS_SUPPORTED #define PNG_INFO_IMAGE_SUPPORTED #define PNG_IO_STATE_SUPPORTED +/*#undef PNG_MIPS_MMI_API_SUPPORTED*/ +/*#undef PNG_MIPS_MMI_CHECK_SUPPORTED*/ +/*#undef PNG_MIPS_MSA_API_SUPPORTED*/ +/*#undef PNG_MIPS_MSA_CHECK_SUPPORTED*/ #define PNG_MNG_FEATURES_SUPPORTED #define PNG_POINTER_INDEXING_SUPPORTED /*#undef PNG_POWERPC_VSX_API_SUPPORTED*/ |