Skip to content

Commit

Permalink
synchronized texlive 73588.
Browse files Browse the repository at this point in the history
  • Loading branch information
clerkma committed Jan 25, 2025
1 parent 20ba2c0 commit 4c2f265
Show file tree
Hide file tree
Showing 76 changed files with 1,475 additions and 548 deletions.
4 changes: 2 additions & 2 deletions texlive/libs/README
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$Id: README 73427 2025-01-11 23:22:13Z kakuto $
$Id: README 73588 2025-01-25 02:34:51Z kakuto $
Public domain. Originally created by Karl Berry, 2005.

Libraries we compile for TeX Live.
Expand Down Expand Up @@ -37,7 +37,7 @@ icu 76.1 - checked 27oct24 (requires C++17, e.g., g++13)
libpaper 1.1.29 - checked 07jan24
https://ftp.debian.org/debian/pool/main/libp/libpaper/

libpng 1.6.45 - checked 08jan25
libpng 1.6.46 - checked 25jan25
https://sourceforge.net/projects/libpng/files/ - used by many

lua 5.2.4
Expand Down
10 changes: 10 additions & 0 deletions texlive/libs/libpng/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
2025-01-25 Akira Kakuto <[email protected]>

Import libpng-1.6.46.
* version.ac: Adjust.

2025-01-08 Akira Kakuto <[email protected]>

Import libpng-1.6.45.
* version.ac: Adjust.

2024-09-13 Akira Kakuto <[email protected]>

Import libpng-1.6.44.
Expand Down
2 changes: 1 addition & 1 deletion texlive/libs/libpng/README
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ copied to libs/libpng/configure.ac.
=============================

2009-07-23 Peter Breitenlohner <[email protected]>
2025-01-08 Akira Kakuto <[email protected]>
2025-01-25 Akira Kakuto <[email protected]>
4 changes: 4 additions & 0 deletions texlive/libs/libpng/TLpatches/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2025-01-25 Akira Kakuto <[email protected]>

Import libpng-1.6.46.

2025-01-08 Akira Kakuto <[email protected]>

Import libpng-1.6.45.
Expand Down
4 changes: 2 additions & 2 deletions texlive/libs/libpng/TLpatches/TL-Changes
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Changes applied to the libpng-1.6.45/ tree as obtained from:
https://sourceforge.net/projects/libpng/files/libpng16/1.6.45/
Changes applied to the libpng-1.6.46/ tree as obtained from:
https://sourceforge.net/projects/libpng/files/libpng16/1.6.46/

Copied:
scripts/pnglibconf.h.prebuilt -> pnglibconf.h
Expand Down
20 changes: 10 additions & 10 deletions texlive/libs/libpng/configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.72 for libpng (TeX Live) 1.6.45.
# Generated by GNU Autoconf 2.72 for libpng (TeX Live) 1.6.46.
#
# Report bugs to <[email protected]>.
#
Expand Down Expand Up @@ -604,8 +604,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libpng (TeX Live)'
PACKAGE_TARNAME='libpng--tex-live-'
PACKAGE_VERSION='1.6.45'
PACKAGE_STRING='libpng (TeX Live) 1.6.45'
PACKAGE_VERSION='1.6.46'
PACKAGE_STRING='libpng (TeX Live) 1.6.46'
PACKAGE_BUGREPORT='[email protected]'
PACKAGE_URL=''

Expand Down Expand Up @@ -1342,7 +1342,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
'configure' configures libpng (TeX Live) 1.6.45 to adapt to many kinds of systems.
'configure' configures libpng (TeX Live) 1.6.46 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1414,7 +1414,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of libpng (TeX Live) 1.6.45:";;
short | recursive ) echo "Configuration of libpng (TeX Live) 1.6.46:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1534,7 +1534,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
libpng (TeX Live) configure 1.6.45
libpng (TeX Live) configure 1.6.46
generated by GNU Autoconf 2.72
Copyright (C) 2023 Free Software Foundation, Inc.
Expand Down Expand Up @@ -1861,7 +1861,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by libpng (TeX Live) $as_me 1.6.45, which was
It was created by libpng (TeX Live) $as_me 1.6.46, which was
generated by GNU Autoconf 2.72. Invocation command line was
$ $0$ac_configure_args_raw
Expand Down Expand Up @@ -4822,7 +4822,7 @@ fi

# Define the identity of the package.
PACKAGE='libpng--tex-live-'
VERSION='1.6.45'
VERSION='1.6.46'


printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
Expand Down Expand Up @@ -7996,7 +7996,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by libpng (TeX Live) $as_me 1.6.45, which was
This file was extended by libpng (TeX Live) $as_me 1.6.46, which was
generated by GNU Autoconf 2.72. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -8064,7 +8064,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
libpng (TeX Live) config.status 1.6.45
libpng (TeX Live) config.status 1.6.46
configured by $0, generated by GNU Autoconf 2.72,
with options \\"\$ac_cs_config\\"
Expand Down
27 changes: 13 additions & 14 deletions texlive/libs/libpng/libpng-src/ANNOUNCE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
libpng 1.6.45 - January 7, 2025
===============================
libpng 1.6.46 - January 23, 2025
================================

This is a public release of libpng, intended for use in production code.

Expand All @@ -9,13 +9,13 @@ Files available for download

Source files with LF line endings (for Unix/Linux):

* libpng-1.6.45.tar.xz (LZMA-compressed, recommended)
* libpng-1.6.45.tar.gz (deflate-compressed)
* libpng-1.6.46.tar.xz (LZMA-compressed, recommended)
* libpng-1.6.46.tar.gz (deflate-compressed)

Source files with CRLF line endings (for Windows):

* lpng1645.7z (LZMA-compressed, recommended)
* lpng1645.zip (deflate-compressed)
* lpng1646.7z (LZMA-compressed, recommended)
* lpng1646.zip (deflate-compressed)

Other information:

Expand All @@ -25,18 +25,17 @@ Other information:
* TRADEMARK.md


Changes from version 1.6.44 to version 1.6.45
Changes from version 1.6.45 to version 1.6.46
---------------------------------------------

* Added support for the cICP chunk.
(Contributed by Lucas Chollet and John Bowler)
* Adjusted and improved various checks in colorspace calculations.
* Added support for the mDCV and cLLI chunks.
(Contributed by John Bowler)
* Rearranged the write order of colorspace chunks for better conformance
with the PNG v3 draft specification.
* Fixed a build issue affecting C89 compilers.
This was a regression introduced in libpng-1.6.45.
(Contributed by John Bowler)
* Raised the minimum required CMake version from 3.6 to 3.14.
* Forked off a development branch for libpng version 1.8.
* Added makefile.c89, specifically for testing C89 compilers.
* Cleaned up contrib/pngminus: corrected an old typo, removed an old
workaround, and updated the CMake file.


Send comments/corrections/commendations to png-mng-implement at lists.sf.net.
Expand Down
10 changes: 10 additions & 0 deletions texlive/libs/libpng/libpng-src/CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -6229,6 +6229,16 @@ Version 1.6.45 [January 7, 2025]
Raised the minimum required CMake version from 3.6 to 3.14.
Forked off a development branch for libpng version 1.8.

Version 1.6.46 [January 23, 2025]
Added support for the mDCV and cLLI chunks.
(Contributed by John Bowler)
Fixed a build issue affecting C89 compilers.
This was a regression introduced in libpng-1.6.45.
(Contributed by John Bowler)
Added makefile.c89, specifically for testing C89 compilers.
Cleaned up contrib/pngminus: corrected an old typo, removed an old
workaround, and updated the CMake file.

Send comments/corrections/commendations to png-mng-implement at lists.sf.net.
Subscription is required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
Expand Down
2 changes: 1 addition & 1 deletion texlive/libs/libpng/libpng-src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ cmake_minimum_required(VERSION 3.14)

set(PNGLIB_MAJOR 1)
set(PNGLIB_MINOR 6)
set(PNGLIB_REVISION 45)
set(PNGLIB_REVISION 46)
set(PNGLIB_SUBREVISION 0)
#set(PNGLIB_SUBREVISION "git")
set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_REVISION})
Expand Down
4 changes: 2 additions & 2 deletions texlive/libs/libpng/libpng-src/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Makefile.am, the source file for Makefile.in (and hence Makefile), is
#
# Copyright (c) 2018-2024 Cosmin Truta
# Copyright (c) 2018-2025 Cosmin Truta
# Copyright (c) 2004-2016 Glenn Randers-Pehrson
#
# This code is released under the libpng license.
Expand Down Expand Up @@ -199,7 +199,7 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \
config.sub configure depcomp install-sh ltmain.sh missing

# PNG_COPTS give extra options for the C compiler to be used on all compilation
# steps (unless targe_CFLAGS is specified; that will take precedence over
# steps (unless target_CFLAGS is specified; that will take precedence over
# AM_CFLAGS)
PNG_COPTS = @PNG_COPTS@
AM_CFLAGS = ${PNG_COPTS}
Expand Down
2 changes: 1 addition & 1 deletion texlive/libs/libpng/libpng-src/README
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
README for libpng version 1.6.45
README for libpng version 1.6.46
================================

See the note about version numbers near the top of `png.h`.
Expand Down
25 changes: 25 additions & 0 deletions texlive/libs/libpng/libpng-src/ci/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
Scripts for the Continuous Integration of the PNG Reference Library
===================================================================

Copyright Notice
----------------

Copyright (c) 2019-2024 Cosmin Truta.

Use, modification and distribution are subject to the MIT License.
Please see the accompanying file `LICENSE_MIT.txt` or visit
https://opensource.org/license/mit

File List
---------

LICENSE_MIT.txt ==> The License file
README.md ==> This file
ci_lint.sh ==> Lint the source code
ci_shellify.sh ==> Convert select definitions to shell syntax
ci_verify_cmake.sh ==> Verify the build driven by CMakeLists.txt
ci_verify_configure.sh ==> Verify the build driven by configure
ci_verify_makefiles.sh ==> Verify the build driven by scripts/makefile.*
ci_verify_version.sh ==> Verify the consistency of version definitions
lib/ci.lib.sh ==> Shell utilities for the main ci_*.sh scripts
targets/*/ci_env.*.sh ==> Shell environments for cross-platform testing
6 changes: 3 additions & 3 deletions texlive/libs/libpng/libpng-src/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ AC_PREREQ([2.68])

dnl Version number stuff here:

AC_INIT([libpng],[1.6.45],[[email protected]])
AC_INIT([libpng],[1.6.46],[[email protected]])
AC_CONFIG_MACRO_DIR([scripts/autoconf])

# libpng does not follow GNU file name conventions (hence 'foreign')
Expand All @@ -46,10 +46,10 @@ dnl automake, so the following is not necessary (and is not defined anyway):
dnl AM_PREREQ([1.11.2])
dnl stop configure from automagically running automake

PNGLIB_VERSION=1.6.45
PNGLIB_VERSION=1.6.46
PNGLIB_MAJOR=1
PNGLIB_MINOR=6
PNGLIB_RELEASE=45
PNGLIB_RELEASE=46

dnl End of version number stuff

Expand Down
24 changes: 24 additions & 0 deletions texlive/libs/libpng/libpng-src/contrib/libtests/pngunknown.c
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@ typedef png_byte *png_const_bytep;
#define png_PLTE PNG_U32( 80, 76, 84, 69)
#define png_bKGD PNG_U32( 98, 75, 71, 68)
#define png_cHRM PNG_U32( 99, 72, 82, 77)
#define png_cICP PNG_U32( 99, 73, 67, 80) /* PNGv3 */
#define png_cLLI PNG_U32( 99, 76, 76, 73) /* PNGv3 */
#define png_eXIf PNG_U32(101, 88, 73, 102) /* registered July 2017 */
#define png_fRAc PNG_U32(102, 82, 65, 99) /* registered, not defined */
#define png_gAMA PNG_U32(103, 65, 77, 65)
Expand All @@ -122,6 +124,7 @@ typedef png_byte *png_const_bytep;
#define png_hIST PNG_U32(104, 73, 83, 84)
#define png_iCCP PNG_U32(105, 67, 67, 80)
#define png_iTXt PNG_U32(105, 84, 88, 116)
#define png_mDCV PNG_U32(109, 68, 67, 86) /* PNGv3 */
#define png_oFFs PNG_U32(111, 70, 70, 115)
#define png_pCAL PNG_U32(112, 67, 65, 76)
#define png_pHYs PNG_U32(112, 72, 89, 115)
Expand Down Expand Up @@ -208,6 +211,20 @@ static struct
0,
# else
1,
# endif
1, START, 0 },
{ "cICP", PNG_INFO_cICP, png_cICP,
# ifdef PNG_READ_cICP_SUPPORTED
0,
# else
1,
# endif
1, START, 0 },
{ "cLLI", PNG_INFO_cLLI, png_cLLI,
# ifdef PNG_READ_cLLI_SUPPORTED
0,
# else
1,
# endif
1, START, 0 },
{ "eXIf", PNG_INFO_eXIf, png_eXIf,
Expand Down Expand Up @@ -245,6 +262,13 @@ static struct
1,
# endif
1, ABSENT, 0 },
{ "mDCV", PNG_INFO_mDCV, png_mDCV,
# ifdef PNG_READ_mDCV_SUPPORTED
0,
# else
1,
# endif
1, START, 0 },
{ "oFFs", PNG_INFO_oFFs, png_oFFs,
# ifdef PNG_READ_oFFs_SUPPORTED
0,
Expand Down
29 changes: 29 additions & 0 deletions texlive/libs/libpng/libpng-src/contrib/pngminus/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# https://editorconfig.org

root = true

[*]
charset = utf-8
end_of_line = unset
indent_size = unset
indent_style = space
insert_final_newline = true
max_doc_length = 79
max_line_length = 79
trim_trailing_whitespace = true

[*.[ch]]
indent_size = 2
indent_style = space

[CMakeLists.txt]
indent_size = 4
indent_style = space
max_doc_length = 79
max_line_length = 99

[{Makefile,makevms.com}]
indent_size = unset
indent_style = unset
max_doc_length = 79
max_line_length = 99
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ version 1.0 - 1999.10.15 - First version.
1.6 - 2018.08.05 - Improve portability and fix style (Cosmin Truta)
1.7 - 2019.01.22 - Change license to MIT (Willem van Schaik)
1.8 - 2024.01.09 - Fix, improve, modernize (Cosmin Truta)
1.9 - 2025.01.10 - Delete conditionally-compiled code (Cosmin Truta)
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Copyright (c) 2018-2024 Cosmin Truta
# Copyright (c) 2018-2025 Cosmin Truta
#
# This software is released under the MIT license. For conditions of
# distribution and use, see the LICENSE file part of this package.

cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.14)

project(PNGMINUS C)

Expand Down
Loading

0 comments on commit 4c2f265

Please sign in to comment.