pdftex[884] branches/stable/source/src: sync from tl 54012, hoping
commits+karl at tug.org
commits+karl at tug.org
Mon Nov 14 22:05:35 CET 2022
Revision: 884
http://tug.org/svn/pdftex?view=revision&revision=884
Author: karl
Date: 2022-11-14 22:05:34 +0100 (Mon, 14 Nov 2022)
Log Message:
-----------
sync from tl 54012, hoping for libpng arm fix
Modified Paths:
--------------
branches/stable/source/src/Makefile.in
branches/stable/source/src/aclocal.m4
branches/stable/source/src/build-aux/compile
branches/stable/source/src/build-aux/config.guess
branches/stable/source/src/build-aux/config.sub
branches/stable/source/src/build-aux/depcomp
branches/stable/source/src/build-aux/texinfo.tex
branches/stable/source/src/configure
branches/stable/source/src/doc/ChangeLog
branches/stable/source/src/doc/Makefile.in
branches/stable/source/src/doc/tlbuild.info
branches/stable/source/src/doc/tlbuild.texi
branches/stable/source/src/libs/ChangeLog
branches/stable/source/src/libs/Makefile.in
branches/stable/source/src/libs/README
branches/stable/source/src/libs/aclocal.m4
branches/stable/source/src/libs/configure
branches/stable/source/src/libs/libpng/ChangeLog
branches/stable/source/src/libs/libpng/README
branches/stable/source/src/libs/libpng/TLpatches/ChangeLog
branches/stable/source/src/libs/libpng/TLpatches/TL-Changes
branches/stable/source/src/libs/libpng/configure
branches/stable/source/src/libs/libpng/libpng-src/ANNOUNCE
branches/stable/source/src/libs/libpng/libpng-src/AUTHORS
branches/stable/source/src/libs/libpng/libpng-src/CHANGES
branches/stable/source/src/libs/libpng/libpng-src/CMakeLists.txt
branches/stable/source/src/libs/libpng/libpng-src/INSTALL
branches/stable/source/src/libs/libpng/libpng-src/LICENSE
branches/stable/source/src/libs/libpng/libpng-src/Makefile.am
branches/stable/source/src/libs/libpng/libpng-src/README
branches/stable/source/src/libs/libpng/libpng-src/arm/arm_init.c
branches/stable/source/src/libs/libpng/libpng-src/arm/filter_neon_intrinsics.c
branches/stable/source/src/libs/libpng/libpng-src/arm/palette_neon_intrinsics.c
branches/stable/source/src/libs/libpng/libpng-src/config.h.in
branches/stable/source/src/libs/libpng/libpng-src/configure.ac
branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/gentests.sh
branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/makepng.c
branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngimage.c
branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngstest.c
branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngunknown.c
branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngvalid.c
branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/readpng.c
branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/tarith.c
branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/timepng.c
branches/stable/source/src/libs/libpng/libpng-src/contrib/mips-msa/linux.c
branches/stable/source/src/libs/libpng/libpng-src/contrib/oss-fuzz/libpng_read_fuzzer.cc
branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/genpng.c
branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/pngcp.c
branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/pngfix.c
branches/stable/source/src/libs/libpng/libpng-src/example.c
branches/stable/source/src/libs/libpng/libpng-src/libpng-manual.txt
branches/stable/source/src/libs/libpng/libpng-src/libpng.3
branches/stable/source/src/libs/libpng/libpng-src/libpng.pc.in
branches/stable/source/src/libs/libpng/libpng-src/libpngpf.3
branches/stable/source/src/libs/libpng/libpng-src/png.5
branches/stable/source/src/libs/libpng/libpng-src/png.c
branches/stable/source/src/libs/libpng/libpng-src/png.h
branches/stable/source/src/libs/libpng/libpng-src/pngconf.h
branches/stable/source/src/libs/libpng/libpng-src/pngget.c
branches/stable/source/src/libs/libpng/libpng-src/pnglibconf.h
branches/stable/source/src/libs/libpng/libpng-src/pngpriv.h
branches/stable/source/src/libs/libpng/libpng-src/pngread.c
branches/stable/source/src/libs/libpng/libpng-src/pngrtran.c
branches/stable/source/src/libs/libpng/libpng-src/pngrutil.c
branches/stable/source/src/libs/libpng/libpng-src/pngset.c
branches/stable/source/src/libs/libpng/libpng-src/pngstruct.h
branches/stable/source/src/libs/libpng/libpng-src/pngtest.c
branches/stable/source/src/libs/libpng/libpng-src/pngwrite.c
branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/README.txt
branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/libpng/libpng.vcxproj
branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pnglibconf/pnglibconf.vcxproj
branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pngstest/pngstest.vcxproj
branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pngtest/pngtest.vcxproj
branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pngunknown/pngunknown.vcxproj
branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pngvalid/pngvalid.vcxproj
branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/vstudio.sln
branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/zlib/zlib.vcxproj
branches/stable/source/src/libs/libpng/libpng-src/scripts/README.txt
branches/stable/source/src/libs/libpng/libpng-src/scripts/descrip.mms
branches/stable/source/src/libs/libpng/libpng-src/scripts/dfn.awk
branches/stable/source/src/libs/libpng/libpng-src/scripts/genchk.cmake.in
branches/stable/source/src/libs/libpng/libpng-src/scripts/libpng-config-head.in
branches/stable/source/src/libs/libpng/libpng-src/scripts/libpng.pc.in
branches/stable/source/src/libs/libpng/libpng-src/scripts/libtool.m4
branches/stable/source/src/libs/libpng/libpng-src/scripts/ltoptions.m4
branches/stable/source/src/libs/libpng/libpng-src/scripts/ltsugar.m4
branches/stable/source/src/libs/libpng/libpng-src/scripts/ltversion.m4
branches/stable/source/src/libs/libpng/libpng-src/scripts/lt~obsolete.m4
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.32sunu
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.64sunu
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.aix
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.amiga
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.atari
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.bc32
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.beos
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.clang
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.darwin
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.dec
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.dj2
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.freebsd
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.gcc
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.hp64
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.hpgcc
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.hpux
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.ibmc
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.intel
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.linux
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.mips
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.msys
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.netbsd
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.openbsd
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.sco
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.sggcc
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.sgi
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.so9
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.solaris
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.std
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.sunos
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.vcwin32
branches/stable/source/src/libs/libpng/libpng-src/scripts/pnglibconf.dfa
branches/stable/source/src/libs/libpng/libpng-src/scripts/pnglibconf.h.prebuilt
branches/stable/source/src/libs/libpng/libpng-src/scripts/pnglibconf.mak
branches/stable/source/src/libs/libpng/libpng-src/scripts/smakefile.ppc
branches/stable/source/src/libs/libpng/version.ac
branches/stable/source/src/libs/zlib/README
branches/stable/source/src/libs/zlib/TLpatches/ChangeLog
branches/stable/source/src/libs/zlib/TLpatches/TL-Changes
branches/stable/source/src/libs/zlib/configure
branches/stable/source/src/libs/zlib/version.ac
branches/stable/source/src/libs/zlib/zlib-src/CMakeLists.txt
branches/stable/source/src/libs/zlib/zlib-src/ChangeLog
branches/stable/source/src/libs/zlib/zlib-src/Makefile.in
branches/stable/source/src/libs/zlib/zlib-src/README
branches/stable/source/src/libs/zlib/zlib-src/compress.c
branches/stable/source/src/libs/zlib/zlib-src/configure
branches/stable/source/src/libs/zlib/zlib-src/contrib/README.contrib
branches/stable/source/src/libs/zlib/zlib-src/contrib/delphi/ZLib.pas
branches/stable/source/src/libs/zlib/zlib-src/contrib/dotzlib/DotZLib/DotZLib.csproj
branches/stable/source/src/libs/zlib/zlib-src/contrib/dotzlib/DotZLib/UnitTests.cs
branches/stable/source/src/libs/zlib/zlib-src/contrib/dotzlib/DotZLib.build
branches/stable/source/src/libs/zlib/zlib-src/contrib/dotzlib/DotZLib.sln
branches/stable/source/src/libs/zlib/zlib-src/contrib/infback9/inftree9.c
branches/stable/source/src/libs/zlib/zlib-src/contrib/infback9/inftree9.h
branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/configure.ac
branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/crypt.h
branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/ioapi.c
branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/ioapi.h
branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/iowin32.c
branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/miniunz.c
branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/minizip.c
branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/unzip.c
branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/zip.c
branches/stable/source/src/libs/zlib/zlib-src/contrib/pascal/zlibpas.pas
branches/stable/source/src/libs/zlib/zlib-src/contrib/puff/README
branches/stable/source/src/libs/zlib/zlib-src/contrib/puff/puff.c
branches/stable/source/src/libs/zlib/zlib-src/contrib/puff/pufftest.c
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/readme.txt
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/miniunz.vcxproj.filters
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/minizip.vcxproj.filters
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/testzlib.vcxproj
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/testzlib.vcxproj.filters
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/testzlibdll.vcxproj.filters
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/zlib.rc
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/zlibstat.vcxproj
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/zlibstat.vcxproj.filters
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/zlibvc.vcxproj
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/zlibvc.vcxproj.filters
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc11/testzlib.vcxproj
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc11/zlib.rc
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc11/zlibstat.vcxproj
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc11/zlibvc.vcxproj
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/testzlib.vcxproj
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/zlib.rc
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/zlibstat.vcxproj
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/zlibvc.vcxproj
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/testzlib.vcxproj
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/zlib.rc
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/zlibstat.vcxproj
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/zlibvc.vcxproj
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc9/miniunz.vcproj
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc9/minizip.vcproj
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc9/testzlib.vcproj
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc9/testzlibdll.vcproj
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc9/zlib.rc
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc9/zlibstat.vcproj
branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc9/zlibvc.vcproj
branches/stable/source/src/libs/zlib/zlib-src/crc32.c
branches/stable/source/src/libs/zlib/zlib-src/deflate.c
branches/stable/source/src/libs/zlib/zlib-src/deflate.h
branches/stable/source/src/libs/zlib/zlib-src/examples/enough.c
branches/stable/source/src/libs/zlib/zlib-src/examples/fitblk.c
branches/stable/source/src/libs/zlib/zlib-src/examples/gun.c
branches/stable/source/src/libs/zlib/zlib-src/examples/gzappend.c
branches/stable/source/src/libs/zlib/zlib-src/examples/gzlog.h
branches/stable/source/src/libs/zlib/zlib-src/examples/zran.c
branches/stable/source/src/libs/zlib/zlib-src/gzlib.c
branches/stable/source/src/libs/zlib/zlib-src/gzread.c
branches/stable/source/src/libs/zlib/zlib-src/gzwrite.c
branches/stable/source/src/libs/zlib/zlib-src/infback.c
branches/stable/source/src/libs/zlib/zlib-src/inflate.c
branches/stable/source/src/libs/zlib/zlib-src/inftrees.c
branches/stable/source/src/libs/zlib/zlib-src/inftrees.h
branches/stable/source/src/libs/zlib/zlib-src/make_vms.com
branches/stable/source/src/libs/zlib/zlib-src/os400/README400
branches/stable/source/src/libs/zlib/zlib-src/os400/bndsrc
branches/stable/source/src/libs/zlib/zlib-src/os400/zlib.inc
branches/stable/source/src/libs/zlib/zlib-src/qnx/package.qpg
branches/stable/source/src/libs/zlib/zlib-src/test/example.c
branches/stable/source/src/libs/zlib/zlib-src/test/minigzip.c
branches/stable/source/src/libs/zlib/zlib-src/treebuild.xml
branches/stable/source/src/libs/zlib/zlib-src/trees.c
branches/stable/source/src/libs/zlib/zlib-src/uncompr.c
branches/stable/source/src/libs/zlib/zlib-src/win32/README-WIN32.txt
branches/stable/source/src/libs/zlib/zlib-src/win32/zlib1.rc
branches/stable/source/src/libs/zlib/zlib-src/zconf.h.cmakein
branches/stable/source/src/libs/zlib/zlib-src/zconf.h.in
branches/stable/source/src/libs/zlib/zlib-src/zlib.3
branches/stable/source/src/libs/zlib/zlib-src/zlib.3.pdf
branches/stable/source/src/libs/zlib/zlib-src/zlib.h
branches/stable/source/src/libs/zlib/zlib-src/zlib2ansi
branches/stable/source/src/libs/zlib/zlib-src/zutil.c
branches/stable/source/src/libs/zlib/zlib-src/zutil.h
branches/stable/source/src/m4/ChangeLog
branches/stable/source/src/m4/kpse-pkgs.m4
branches/stable/source/src/texk/Makefile.in
branches/stable/source/src/texk/README
branches/stable/source/src/texk/aclocal.m4
branches/stable/source/src/texk/configure
branches/stable/source/src/texk/kpathsea/ChangeLog
branches/stable/source/src/texk/kpathsea/configure
branches/stable/source/src/texk/kpathsea/configure.ac
branches/stable/source/src/texk/kpathsea/texmf.cnf
branches/stable/source/src/texk/tests/TeXLive/TLConfig.pm
branches/stable/source/src/texk/tests/TeXLive/TLUtils.pm
branches/stable/source/src/texk/web2c/ChangeLog
branches/stable/source/src/texk/web2c/Makefile.am
branches/stable/source/src/texk/web2c/Makefile.in
branches/stable/source/src/texk/web2c/README
branches/stable/source/src/texk/web2c/ac/web2c.ac
branches/stable/source/src/texk/web2c/aclocal.m4
branches/stable/source/src/texk/web2c/am/web.am
branches/stable/source/src/texk/web2c/configure
branches/stable/source/src/texk/web2c/configure.ac
branches/stable/source/src/texk/web2c/ctangleboot.cin
branches/stable/source/src/texk/web2c/cwebdir/ChangeLog
branches/stable/source/src/texk/web2c/cwebdir/Makefile
branches/stable/source/src/texk/web2c/cwebdir/comm-mac.ch
branches/stable/source/src/texk/web2c/cwebdir/comm-mini.ch
branches/stable/source/src/texk/web2c/cwebdir/comm-ql.ch
branches/stable/source/src/texk/web2c/cwebdir/comm-w2c.ch
branches/stable/source/src/texk/web2c/cwebdir/comm-w2c.h
branches/stable/source/src/texk/web2c/cwebdir/common.h
branches/stable/source/src/texk/web2c/cwebdir/common.w
branches/stable/source/src/texk/web2c/cwebdir/ctang-bs.ch
branches/stable/source/src/texk/web2c/cwebdir/ctang-pc.ch
branches/stable/source/src/texk/web2c/cwebdir/ctang-ql.ch
branches/stable/source/src/texk/web2c/cwebdir/ctang-vms.ch
branches/stable/source/src/texk/web2c/cwebdir/ctang-w2c.ch
branches/stable/source/src/texk/web2c/cwebdir/ctang-w32.ch
branches/stable/source/src/texk/web2c/cwebdir/ctangle.c
branches/stable/source/src/texk/web2c/cwebdir/ctangle.w
branches/stable/source/src/texk/web2c/cwebdir/ctwill-mini.ch
branches/stable/source/src/texk/web2c/cwebdir/ctwill-w2c.ch
branches/stable/source/src/texk/web2c/cwebdir/cweav-bs.ch
branches/stable/source/src/texk/web2c/cwebdir/cweav-pc.ch
branches/stable/source/src/texk/web2c/cwebdir/cweav-ql.ch
branches/stable/source/src/texk/web2c/cwebdir/cweav-vms.ch
branches/stable/source/src/texk/web2c/cwebdir/cweav-w2c.ch
branches/stable/source/src/texk/web2c/cwebdir/cweav-w32.ch
branches/stable/source/src/texk/web2c/cwebdir/cweave.w
branches/stable/source/src/texk/web2c/cwebdir/cwebmac.tex
branches/stable/source/src/texk/web2c/cwebdir/cwebman-w2c.ch
branches/stable/source/src/texk/web2c/cwebdir/cwebman.tex
branches/stable/source/src/texk/web2c/cwebdir/po/cweb-tl.pot
branches/stable/source/src/texk/web2c/cwebdir/po/cweb.pot
branches/stable/source/src/texk/web2c/cwebdir/po/de/cweb-tl.po
branches/stable/source/src/texk/web2c/cwebdir/po/de/cweb.po
branches/stable/source/src/texk/web2c/cwebdir/po/it/cweb.po
branches/stable/source/src/texk/web2c/cwebdir/prod-cweave.w
branches/stable/source/src/texk/web2c/cwebdir/prod-twill.w
branches/stable/source/src/texk/web2c/cwebdir/prod.w
branches/stable/source/src/texk/web2c/cwebdir/texinputs/dctproofmac.tex
branches/stable/source/src/texk/web2c/cwebdir/texinputs/dctwimac.tex
branches/stable/source/src/texk/web2c/cwebdir/texinputs/dcwebmac.tex
branches/stable/source/src/texk/web2c/cwebdir/texinputs/dcwebstrings.tex
branches/stable/source/src/texk/web2c/cwebdir/texinputs/fcwebmac.tex
branches/stable/source/src/texk/web2c/cwebdir/texinputs/icwebmac.tex
branches/stable/source/src/texk/web2c/cwebdir/texinputs/pdfctwimac.tex
branches/stable/source/src/texk/web2c/doc/Makefile.in
branches/stable/source/src/texk/web2c/help.h
branches/stable/source/src/texk/web2c/lib/ChangeLog
branches/stable/source/src/texk/web2c/lib/Makefile.in
branches/stable/source/src/texk/web2c/lib/texmfmp.c
branches/stable/source/src/texk/web2c/man/Makefile.in
branches/stable/source/src/texk/web2c/omegafonts/Makefile.in
branches/stable/source/src/texk/web2c/otps/Makefile.in
branches/stable/source/src/texk/web2c/otps/win32/Makefile.in
branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog
branches/stable/source/src/texk/web2c/pdftexdir/writettf.c
branches/stable/source/src/texk/web2c/synctexdir/ChangeLog
branches/stable/source/src/texk/web2c/synctexdir/man1/synctex.1
branches/stable/source/src/texk/web2c/synctexdir/man5/synctex.5
branches/stable/source/src/texk/web2c/synctexdir/synctex.c
branches/stable/source/src/texk/web2c/tex.ch
branches/stable/source/src/texk/web2c/texmfmem.h
branches/stable/source/src/texk/web2c/texmfmp-help.h
branches/stable/source/src/texk/web2c/window/Makefile.in
branches/stable/source/src/utils/Makefile.in
branches/stable/source/src/utils/README
branches/stable/source/src/utils/aclocal.m4
branches/stable/source/src/utils/configure
Added Paths:
-----------
branches/stable/source/src/libs/libpng/libpng-src/ci/
branches/stable/source/src/libs/libpng/libpng-src/ci/ci_autotools.sh
branches/stable/source/src/libs/libpng/libpng-src/ci/ci_cmake.sh
branches/stable/source/src/libs/libpng/libpng-src/ci/ci_legacy.sh
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.emcc
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.vcwin-arm64
branches/stable/source/src/libs/libpng/libpng-src/tests/pngtest-all
branches/stable/source/src/libs/zlib/zlib-src/LICENSE
branches/stable/source/src/m4/kpse-potrace-flags.m4
branches/stable/source/src/texk/web2c/tests/enc-amb0.bib
branches/stable/source/src/texk/web2c/tests/enc-amb1.bib
branches/stable/source/src/texk/web2c/tests/enc-amb2.bib
branches/stable/source/src/texk/web2c/tests/enc-asc.bib
branches/stable/source/src/texk/web2c/tests/enc-ep.bbl
branches/stable/source/src/texk/web2c/tests/enc-eu.bbl
branches/stable/source/src/texk/web2c/tests/enc-euc.bib
branches/stable/source/src/texk/web2c/tests/enc-jis.bib
branches/stable/source/src/texk/web2c/tests/enc-p.bbl
branches/stable/source/src/texk/web2c/tests/enc-sjis.bib
branches/stable/source/src/texk/web2c/tests/enc-sp.bbl
branches/stable/source/src/texk/web2c/tests/enc-su.bbl
branches/stable/source/src/texk/web2c/tests/enc-u.bbl
branches/stable/source/src/texk/web2c/tests/enc-up.bbl
branches/stable/source/src/texk/web2c/tests/enc-utf8.bib
branches/stable/source/src/texk/web2c/tests/enc-utf8a.bib
branches/stable/source/src/texk/web2c/tests/enc-utf8b.bib
branches/stable/source/src/texk/web2c/tests/enc-uu.bbl
branches/stable/source/src/texk/web2c/tests/exampl.bbl
branches/stable/source/src/texk/web2c/tests/testfield.bst
Removed Paths:
-------------
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.clang-asan
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.gcc-asan
branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.linux-opt
branches/stable/source/src/libs/libpng/libpng-src/tests/pngstest
branches/stable/source/src/libs/libpng/libpng-src/tests/pngtest-badpngs
Modified: branches/stable/source/src/Makefile.in
===================================================================
--- branches/stable/source/src/Makefile.in 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/Makefile.in 2022-11-14 21:05:34 UTC (rev 884)
@@ -107,6 +107,7 @@
$(top_srcdir)/m4/kpse-options.m4 \
$(top_srcdir)/m4/kpse-pixman-flags.m4 \
$(top_srcdir)/m4/kpse-pkgs.m4 \
+ $(top_srcdir)/m4/kpse-potrace-flags.m4 \
$(top_srcdir)/m4/kpse-pplib-flags.m4 \
$(top_srcdir)/m4/kpse-ptexenc-flags.m4 \
$(top_srcdir)/m4/kpse-setup.m4 \
@@ -186,6 +187,7 @@
$(top_srcdir)/libs/cairo/ac/withenable.ac \
$(top_srcdir)/libs/pixman/ac/withenable.ac \
$(top_srcdir)/libs/gd/ac/withenable.ac \
+ $(top_srcdir)/libs/potrace/ac/withenable.ac \
$(top_srcdir)/libs/freetype2/ac/withenable.ac \
$(top_srcdir)/libs/libpng/ac/withenable.ac \
$(top_srcdir)/libs/libpaper/ac/withenable.ac \
@@ -201,6 +203,7 @@
$(top_srcdir)/libs/libpaper/ac/libpaper.ac \
$(top_srcdir)/libs/libpng/ac/libpng.ac \
$(top_srcdir)/libs/freetype2/ac/freetype2.ac \
+ $(top_srcdir)/libs/potrace/ac/potrace.ac \
$(top_srcdir)/libs/gd/ac/gd.ac \
$(top_srcdir)/libs/pixman/ac/pixman.ac \
$(top_srcdir)/libs/cairo/ac/cairo.ac \
Modified: branches/stable/source/src/aclocal.m4
===================================================================
--- branches/stable/source/src/aclocal.m4 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/aclocal.m4 2022-11-14 21:05:34 UTC (rev 884)
@@ -1202,6 +1202,7 @@
m4_include([m4/kpse-options.m4])
m4_include([m4/kpse-pixman-flags.m4])
m4_include([m4/kpse-pkgs.m4])
+m4_include([m4/kpse-potrace-flags.m4])
m4_include([m4/kpse-pplib-flags.m4])
m4_include([m4/kpse-ptexenc-flags.m4])
m4_include([m4/kpse-setup.m4])
Modified: branches/stable/source/src/build-aux/compile
===================================================================
--- branches/stable/source/src/build-aux/compile 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/build-aux/compile 2022-11-14 21:05:34 UTC (rev 884)
@@ -256,6 +256,7 @@
exit $?
;;
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+ clang-cl | *[/\\]clang-cl | clang-cl.exe | *[/\\]clang-cl.exe | \
icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
Modified: branches/stable/source/src/build-aux/config.guess
===================================================================
--- branches/stable/source/src/build-aux/config.guess 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/build-aux/config.guess 2022-11-14 21:05:34 UTC (rev 884)
@@ -4,7 +4,7 @@
# shellcheck disable=SC2006,SC2268 # see below for rationale
-timestamp='2022-01-09'
+timestamp='2022-09-17'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -966,6 +966,12 @@
GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC
;;
+ x86_64:[Mm]anagarm:*:*|i?86:[Mm]anagarm:*:*)
+ GUESS="$UNAME_MACHINE-pc-managarm-mlibc"
+ ;;
+ *:[Mm]anagarm:*:*)
+ GUESS="$UNAME_MACHINE-unknown-managarm-mlibc"
+ ;;
*:Minix:*:*)
GUESS=$UNAME_MACHINE-unknown-minix
;;
@@ -1036,7 +1042,7 @@
k1om:Linux:*:*)
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
;;
- loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*)
+ loongarch32:Linux:*:* | loongarch64:Linux:*:*)
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
;;
m32r*:Linux:*:*)
@@ -1151,16 +1157,27 @@
;;
x86_64:Linux:*:*)
set_cc_for_build
+ CPU=$UNAME_MACHINE
LIBCABI=$LIBC
if test "$CC_FOR_BUILD" != no_compiler_found; then
- if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \
- (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
- grep IS_X32 >/dev/null
- then
- LIBCABI=${LIBC}x32
- fi
+ ABI=64
+ sed 's/^ //' << EOF > "$dummy.c"
+ #ifdef __i386__
+ ABI=x86
+ #else
+ #ifdef __ILP32__
+ ABI=x32
+ #endif
+ #endif
+EOF
+ cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'`
+ eval "$cc_set_abi"
+ case $ABI in
+ x86) CPU=i686 ;;
+ x32) LIBCABI=${LIBC}x32 ;;
+ esac
fi
- GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI
+ GUESS=$CPU-pc-linux-$LIBCABI
;;
xtensa*:Linux:*:*)
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
@@ -1367,9 +1384,12 @@
BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
GUESS=i586-pc-haiku
;;
- x86_64:Haiku:*:*)
- GUESS=x86_64-unknown-haiku
+ ppc:Haiku:*:*) # Haiku running on Apple PowerPC
+ GUESS=powerpc-apple-haiku
;;
+ *:Haiku:*:*) # Haiku modern gcc (not bound by BeOS compat)
+ GUESS=$UNAME_MACHINE-unknown-haiku
+ ;;
SX-4:SUPER-UX:*:*)
GUESS=sx4-nec-superux$UNAME_RELEASE
;;
Modified: branches/stable/source/src/build-aux/config.sub
===================================================================
--- branches/stable/source/src/build-aux/config.sub 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/build-aux/config.sub 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2021 Free Software Foundation, Inc.
+# Copyright 1992-2022 Free Software Foundation, Inc.
# shellcheck disable=SC2006,SC2268 # see below for rationale
-timestamp='2021-12-25'
+timestamp='2022-09-17'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -76,7 +76,7 @@
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2021 Free Software Foundation, Inc.
+Copyright 1992-2022 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -145,7 +145,7 @@
nto-qnx* | linux-* | uclinux-uclibc* \
| uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
| netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
- | storm-chaos* | os2-emx* | rtmk-nova*)
+ | storm-chaos* | os2-emx* | rtmk-nova* | managarm-*)
basic_machine=$field1
basic_os=$maybe_os
;;
@@ -1207,7 +1207,7 @@
| k1om \
| le32 | le64 \
| lm32 \
- | loongarch32 | loongarch64 | loongarchx32 \
+ | loongarch32 | loongarch64 \
| m32c | m32r | m32rle \
| m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \
| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
@@ -1341,6 +1341,10 @@
kernel=linux
os=`echo "$basic_os" | sed -e 's|linux|gnu|'`
;;
+ managarm*)
+ kernel=managarm
+ os=`echo "$basic_os" | sed -e 's|managarm|mlibc|'`
+ ;;
*)
kernel=
os=$basic_os
@@ -1754,7 +1758,7 @@
| onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
| midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
| nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
- | fiwix* )
+ | fiwix* | mlibc* )
;;
# This one is extra strict with allowed versions
sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
@@ -1762,6 +1766,9 @@
;;
none)
;;
+ kernel* )
+ # Restricted further below
+ ;;
*)
echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2
exit 1
@@ -1772,16 +1779,26 @@
# (given a valid OS), if there is a kernel.
case $kernel-$os in
linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \
- | linux-musl* | linux-relibc* | linux-uclibc* )
+ | linux-musl* | linux-relibc* | linux-uclibc* | linux-mlibc* )
;;
uclinux-uclibc* )
;;
- -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* )
+ managarm-mlibc* | managarm-kernel* )
+ ;;
+ -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* | -mlibc* )
# These are just libc implementations, not actual OSes, and thus
# require a kernel.
echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2
exit 1
;;
+ -kernel* )
+ echo "Invalid configuration \`$1': \`$os' needs explicit kernel." 1>&2
+ exit 1
+ ;;
+ *-kernel* )
+ echo "Invalid configuration \`$1': \`$kernel' does not support \`$os'." 1>&2
+ exit 1
+ ;;
kfreebsd*-gnu* | kopensolaris*-gnu*)
;;
vxworks-simlinux | vxworks-simwindows | vxworks-spe)
Modified: branches/stable/source/src/build-aux/depcomp
===================================================================
--- branches/stable/source/src/build-aux/depcomp 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/build-aux/depcomp 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,7 +1,7 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2018-03-07.03; # UTC
+scriptversion=2022-09-18.14; # UTC
# Copyright (C) 1999-2022 Free Software Foundation, Inc.
@@ -197,7 +197,7 @@
;;
gcc)
-## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## Note that this doesn't just cater to obsolete pre-3.x GCC compilers.
## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
## (see the conditional assignment to $gccflag above).
## There are various ways to get dependency output from gcc. Here's
Modified: branches/stable/source/src/build-aux/texinfo.tex
===================================================================
--- branches/stable/source/src/build-aux/texinfo.tex 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/build-aux/texinfo.tex 2022-11-14 21:05:34 UTC (rev 884)
@@ -3,7 +3,7 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2022-04-09.08}
+\def\texinfoversion{2022-11-12.22}
%
% Copyright 1985, 1986, 1988, 1990-2022 Free Software Foundation, Inc.
%
@@ -241,9 +241,6 @@
%
\def\finalout{\overfullrule=0pt }
-\newdimen\outerhsize \newdimen\outervsize % set by the paper size routines
-\newdimen\topandbottommargin \topandbottommargin=.75in
-
% Output a mark which sets \thischapter, \thissection and \thiscolor.
% We dump everything together because we only have one kind of mark.
% This works because we only use \botmark / \topmark, not \firstmark.
@@ -317,17 +314,9 @@
\newbox\footlinebox
% When outputting the double column layout for indices, an output routine
-% is run several times, which hides the original value of \topmark. This
-% can lead to a page heading being output and duplicating the chapter heading
-% of the index. Hence, save the contents of \topmark at the beginning of
-% the output routine. The saved contents are valid until we actually
-% \shipout a page.
+% is run several times, hiding the original value of \topmark. Hence, save
+% \topmark at the beginning.
%
-% (We used to run a short output routine to actually set \topmark and
-% \firstmark to the right values, but if this was called with an empty page
-% containing whatsits for writing index entries, the whatsits would be thrown
-% away and the index auxiliary file would remain empty.)
-%
\newtoks\savedtopmark
\newif\iftopmarksaved
\topmarksavedtrue
@@ -351,15 +340,9 @@
%
\checkchapterpage
%
- % Retrieve the information for the headings from the marks in the page,
- % and call Plain TeX's \makeheadline and \makefootline, which use the
- % values in \headline and \footline.
- %
- % Common context changes for both heading and footing.
- % Do this outside of the \shipout so @code etc. will be expanded in
- % the headline as they should be, not taken literally (outputting ''code).
+ % Make the heading and footing. \makeheadline and \makefootline
+ % use the contents of \headline and \footline.
\def\commonheadfootline{\let\hsize=\txipagewidth \texinfochars}
- %
\ifodd\pageno \getoddheadingmarks \else \getevenheadingmarks \fi
\global\setbox\headlinebox = \vbox{\commonheadfootline \makeheadline}%
\ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi
@@ -617,21 +600,6 @@
% @? is an end-of-sentence query.
\def\?{?\spacefactor=\endofsentencespacefactor\space}
-% @frenchspacing on|off says whether to put extra space after punctuation.
-%
-\def\onword{on}
-\def\offword{off}
-%
-\parseargdef\frenchspacing{%
- \def\temp{#1}%
- \ifx\temp\onword \plainfrenchspacing
- \else\ifx\temp\offword \plainnonfrenchspacing
- \else
- \errhelp = \EMsimple
- \errmessage{Unknown @frenchspacing option `\temp', must be on|off}%
- \fi\fi
-}
-
% @w prevents a word break. Without the \leavevmode, @w at the
% beginning of a paragraph, when TeX is still in vertical mode, would
% produce a whole line of output instead of starting the paragraph.
@@ -725,32 +693,22 @@
\dimen2 = \ht\strutbox
\advance\dimen2 by \dp\strutbox
\ifdim\dimen0 > \dimen2
+ % This is similar to the 'needspace' module in LaTeX.
+ % The first penalty allows a break if the end of the page is
+ % not too far away. Following penalties and skips are discarded.
+ % Otherwise, require at least \dimen0 of vertical space.
%
- % Do a \strut just to make the height of this box be normal, so the
- % normal leading is inserted relative to the preceding line.
- % And a page break here is fine.
- \vtop to #1\mil{\strut\vfil}%
- %
- % TeX does not even consider page breaks if a penalty added to the
- % main vertical list is 10000 or more. But in order to see if the
- % empty box we just added fits on the page, we must make it consider
- % page breaks. On the other hand, we don't want to actually break the
- % page after the empty box. So we use a penalty of 9999.
- %
- % There is an extremely small chance that TeX will actually break the
- % page at this \penalty, if there are no other feasible breakpoints in
- % sight. (If the user is using lots of big @group commands, which
- % almost-but-not-quite fill up a page, TeX will have a hard time doing
- % good page breaking, for example.) However, I could not construct an
- % example where a page broke at this \penalty; if it happens in a real
- % document, then we can reconsider our strategy.
+ % (We used to use a \vtop to reserve space, but this had spacing issues
+ % when followed by a section heading, as it was not a "discardable item".
+ % This also has the benefit of providing glue before the page break if
+ % there isn't enough space.)
+ \vskip0pt plus \dimen0
+ \penalty-100
+ \vskip0pt plus -\dimen0
+ \vskip \dimen0
\penalty9999
- %
- % Back up by the size of the box, whether we did a page break or not.
- \kern -#1\mil
- %
- % Do not allow a page break right after this kern.
- \nobreak
+ \vskip -\dimen0
+ \penalty0\relax % this hides the above glue from \safewhatsit and \dobreak
\fi
}
@@ -2558,7 +2516,7 @@
\def\it{\fam=\itfam \setfontstyle{it}}
\def\sl{\fam=\slfam \setfontstyle{sl}}
\def\bf{\fam=\bffam \setfontstyle{bf}}\def\bfstylename{bf}
-\def\tt{\fam=\ttfam \setfontstyle{tt}}\def\ttstylename{tt}
+\def\tt{\fam=\ttfam \setfontstyle{tt}}
% Texinfo sort of supports the sans serif font style, which plain TeX does not.
% So we set up a \sf.
@@ -2586,34 +2544,30 @@
\scriptfont\sffam=\sevensf
}
-%
-% The font-changing commands (all called \...fonts) redefine the meanings
-% of \STYLEfont, instead of just \STYLE. We do this because \STYLE needs
-% to also set the current \fam for math mode. Our \STYLE (e.g., \rm)
-% commands hardwire \STYLEfont to set the current font.
+
+% \defineassignfonts{SIZE} -
+% Define sequence \assignfontsSIZE, which switches between font sizes
+% by redefining the meanings of \STYLEfont. (Just \STYLE additionally sets
+% the current \fam for math mode.)
%
-% The fonts used for \ifont are for "math italics" (\itfont is for italics
-% in regular text). \syfont is also used in math mode only.
-%
-% Each font-changing command also sets the names \lsize (one size lower)
-% and \lllsize (three sizes lower). These relative commands are used
-% in, e.g., the LaTeX logo and acronyms.
-%
-% This all needs generalizing, badly.
-%
+\def\defineassignfonts#1{%
+ \expandafter\edef\csname assignfonts#1\endcsname{%
+ \let\noexpand\rmfont\csname #1rm\endcsname
+ \let\noexpand\itfont\csname #1it\endcsname
+ \let\noexpand\slfont\csname #1sl\endcsname
+ \let\noexpand\bffont\csname #1bf\endcsname
+ \let\noexpand\ttfont\csname #1tt\endcsname
+ \let\noexpand\smallcaps\csname #1sc\endcsname
+ \let\noexpand\sffont \csname #1sf\endcsname
+ \let\noexpand\ifont \csname #1i\endcsname
+ \let\noexpand\syfont \csname #1sy\endcsname
+ \let\noexpand\ttslfont\csname #1ttsl\endcsname
+ }
+}
\def\assignfonts#1{%
- \expandafter\let\expandafter\rmfont\csname #1rm\endcsname
- \expandafter\let\expandafter\itfont\csname #1it\endcsname
- \expandafter\let\expandafter\slfont\csname #1sl\endcsname
- \expandafter\let\expandafter\bffont\csname #1bf\endcsname
- \expandafter\let\expandafter\ttfont\csname #1tt\endcsname
- \expandafter\let\expandafter\smallcaps\csname #1sc\endcsname
- \expandafter\let\expandafter\sffont \csname #1sf\endcsname
- \expandafter\let\expandafter\ifont \csname #1i\endcsname
- \expandafter\let\expandafter\syfont \csname #1sy\endcsname
- \expandafter\let\expandafter\ttslfont\csname #1ttsl\endcsname
+ \csname assignfonts#1\endcsname
}
\newif\ifrmisbold
@@ -2637,12 +2591,21 @@
\csname\curfontstyle\endcsname
}%
+% Define the font-changing commands (all called \...fonts).
+% Each font-changing command also sets the names \lsize (one size lower)
+% and \lllsize (three sizes lower). These relative commands are used
+% in, e.g., the LaTeX logo and acronyms.
+%
+% Note: The fonts used for \ifont are for "math italics" (\itfont is for
+% italics in regular text). \syfont is also used in math mode only.
+%
\def\definefontsetatsize#1#2#3#4#5{%
+ \defineassignfonts{#1}%
\expandafter\def\csname #1fonts\endcsname{%
\def\curfontsize{#1}%
\def\lsize{#2}\def\lllsize{#3}%
\csname rmisbold#5\endcsname
- \assignfonts{#1}%
+ \csname assignfonts#1\endcsname
\resetmathfonts
\setleading{#4}%
}}
@@ -2687,10 +2650,23 @@
% Check if we are currently using a typewriter font. Since all the
% Computer Modern typewriter fonts have zero interword stretch (and
% shrink), and it is reasonable to expect all typewriter fonts to have
-% this property, we can check that font parameter.
-%
-\def\ifmonospace{\ifdim\fontdimen3\font=0pt }
+% this property, we can check that font parameter. #1 is what to
+% print if we are indeed using \tt; #2 is what to print otherwise.
+\def\ifusingtt#1#2{\ifdim \fontdimen3\font=0pt #1\else #2\fi}
+% Same as above, but check for italic font. Actually this also catches
+% non-italic slanted fonts since it is impossible to distinguish them from
+% italic fonts. But since this is only used by $ and it uses \sl anyway
+% this is not a problem.
+\def\ifusingit#1#2{\ifdim \fontdimen1\font>0pt #1\else #2\fi}
+
+
+% Check if internal flag is clear, i.e. has not been @set.
+\def\ifflagclear#1#2#3{%
+ \expandafter\ifx\csname SET#1\endcsname\relax
+ #2\else#3\fi
+}
+
{
\catcode`\'=\active
\catcode`\`=\active
@@ -2706,33 +2682,28 @@
% lilypond developers report. xpdf does work with the regular 0x27.
%
\def\codequoteright{%
- \ifmonospace
- \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax
- \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax
- '%
- \else \char'15 \fi
- \else \char'15 \fi
- \else
- '%
- \fi
+ \ifusingtt
+ {\ifflagclear{txicodequoteundirected}%
+ {\ifflagclear{codequoteundirected}%
+ {'}%
+ {\char'15 }}%
+ {\char'15 }}%
+ {'}%
}
-%
+
% and a similar option for the left quote char vs. a grave accent.
% Modern fonts display ASCII 0x60 as a grave accent, so some people like
% the code environments to do likewise.
+% \relax disables Spanish ligatures ?` and !` of \tt font.
%
\def\codequoteleft{%
- \ifmonospace
- \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax
- \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax
- % [Knuth] pp. 380,381,391
- % \relax disables Spanish ligatures ?` and !` of \tt font.
- \relax`%
- \else \char'22 \fi
- \else \char'22 \fi
- \else
- \relax`%
- \fi
+ \ifusingtt
+ {\ifflagclear{txicodequotebacktick}%
+ {\ifflagclear{codequotebacktick}%
+ {\relax`}%
+ {\char'22 }}%
+ {\char'22 }}%
+ {\relax`}%
}
% Commands to set the quote options.
@@ -2779,15 +2750,16 @@
\def\dosmartslant#1#2{%
\ifusingtt
{{\ttsl #2}\let\next=\relax}%
- {\def\next{{#1#2}\futurelet\next\smartitaliccorrection}}%
+ {\def\next{{#1#2}\smartitaliccorrection}}%
\next
}
\def\smartslanted{\dosmartslant\sl}
\def\smartitalic{\dosmartslant\it}
-% Output an italic correction unless \next (presumed to be the following
-% character) is such as not to need one.
-\def\smartitaliccorrection{%
+% Output an italic correction unless the following character is such as
+% not to need one.
+\def\smartitaliccorrection{\futurelet\next\smartitaliccorrectionx}
+\def\smartitaliccorrectionx{%
\ifx\next,%
\else\ifx\next-%
\else\ifx\next.%
@@ -2798,27 +2770,41 @@
\aftersmartic
}
-% Unconditional use \ttsl, and no ic. @var is set to this for defuns.
-\def\ttslanted#1{{\ttsl #1}}
+% @cite unconditionally uses \sl with \smartitaliccorrection.
+\def\cite#1{{\sl #1}\smartitaliccorrection}
-% @cite is like \smartslanted except unconditionally use \sl. We never want
-% ttsl for book titles, do we?
-\def\cite#1{{\sl #1}\futurelet\next\smartitaliccorrection}
-
+% @var unconditionally uses \sl. This gives consistency for
+% parameter names whether they are in @def, @table @code or a
+% regular paragraph.
+% To get ttsl font for @var when used in code context, @set txicodevaristt.
+% The \null is to reset \spacefactor.
\def\aftersmartic{}
\def\var#1{%
\let\saveaftersmartic = \aftersmartic
\def\aftersmartic{\null\let\aftersmartic=\saveaftersmartic}%
- \smartslanted{#1}%
+ %
+ \ifflagclear{txicodevaristt}%
+ {\def\varnext{{{\sl #1}}\smartitaliccorrection}}%
+ {\def\varnext{\smartslanted{#1}}}%
+ \varnext
}
+% To be removed after next release
+\def\SETtxicodevaristt{}% @set txicodevaristt
+
\let\i=\smartitalic
\let\slanted=\smartslanted
\let\dfn=\smartslanted
\let\emph=\smartitalic
-% Explicit font changes: @r, @sc, undocumented @ii.
-\def\r#1{{\rm #1}} % roman font
+% @r for roman font, used for code comment
+\def\r#1{{%
+ \usenormaldash % get --, --- ligatures even if in @code
+ \defcharsdefault % in case on def line
+ \rm #1}}
+{\catcode`-=\active \gdef\usenormaldash{\let-\normaldash}}
+
+% @sc, undocumented @ii.
\def\sc#1{{\smallcaps#1}} % smallcaps font
\def\ii#1{{\it #1}} % italic font
@@ -2836,6 +2822,9 @@
\def\nohyphenation{\hyphenchar\font = -1 \aftergroup\restorehyphenation}
\def\restorehyphenation{\hyphenchar\font = `- }
+\newif\iffrenchspacing
+\frenchspacingfalse
+
% Set sfcode to normal for the chars that usually have another value.
% Can't use plain's \frenchspacing because it uses the `\x notation, and
% sometimes \x has an active definition that messes things up.
@@ -2842,21 +2831,45 @@
%
\catcode`@=11
\def\plainfrenchspacing{%
- \sfcode`\.=\@m \sfcode`\?=\@m \sfcode`\!=\@m
- \sfcode`\:=\@m \sfcode`\;=\@m \sfcode`\,=\@m
- \def\endofsentencespacefactor{1000}% for @. and friends
+ \iffrenchspacing\else
+ \frenchspacingtrue
+ \sfcode`\.=\@m \sfcode`\?=\@m \sfcode`\!=\@m
+ \sfcode`\:=\@m \sfcode`\;=\@m \sfcode`\,=\@m
+ \def\endofsentencespacefactor{1000}% for @. and friends
+ \fi
}
\def\plainnonfrenchspacing{%
- \sfcode`\.3000\sfcode`\?3000\sfcode`\!3000
- \sfcode`\:2000\sfcode`\;1500\sfcode`\,1250
- \def\endofsentencespacefactor{3000}% for @. and friends
+ \iffrenchspacing
+ \frenchspacingfalse
+ \sfcode`\.3000\sfcode`\?3000\sfcode`\!3000
+ \sfcode`\:2000\sfcode`\;1500\sfcode`\,1250
+ \def\endofsentencespacefactor{3000}% for @. and friends
+ \fi
}
\catcode`@=\other
\def\endofsentencespacefactor{3000}% default
+% @frenchspacing on|off says whether to put extra space after punctuation.
+%
+\def\onword{on}
+\def\offword{off}
+%
+\let\frenchspacingsetting\plainnonfrenchspacing % used in output routine
+\parseargdef\frenchspacing{%
+ \def\temp{#1}%
+ \ifx\temp\onword \let\frenchspacingsetting\plainfrenchspacing
+ \else\ifx\temp\offword \let\frenchspacingsetting\plainnonfrenchspacing
+ \else
+ \errhelp = \EMsimple
+ \errmessage{Unknown @frenchspacing option `\temp', must be on|off}%
+ \fi\fi
+ \frenchspacingsetting
+}
+
+
% @t, explicit typewriter.
\def\t#1{%
- {\tt \plainfrenchspacing #1}%
+ {\tt \defcharsdefault \plainfrenchspacing #1}%
\null
}
@@ -3390,8 +3403,8 @@
\let\atchar=\@
% @{ @} @lbracechar{} @rbracechar{} all generate brace characters.
-\def\lbracechar{{\ifmonospace\char123\else\ensuremath\lbrace\fi}}
-\def\rbracechar{{\ifmonospace\char125\else\ensuremath\rbrace\fi}}
+\def\lbracechar{{\ifusingtt{\char123}{\ensuremath\lbrace}}}
+\def\rbracechar{{\ifusingtt{\char125}{\ensuremath\rbrace}}}
\let\{=\lbracechar
\let\}=\rbracechar
@@ -3445,8 +3458,13 @@
% Revert to plain's \scriptsize, which is 7pt.
\count255=\the\fam $\fam\count255 \scriptstyle A$%
\else
- % For 11pt, we can use our lllsize.
- \switchtolllsize A%
+ \ifx\curfontsize\smallword
+ % For footnotes and indices
+ \count255=\the\fam $\fam\count255 \scriptstyle A$%
+ \else
+ % For 11pt, we can use our lllsize.
+ \switchtolllsize A%
+ \fi
\fi
}%
\vss
@@ -3454,6 +3472,7 @@
\kern-.15em
\TeX
}
+\def\smallword{small}
% Some math mode symbols. Define \ensuremath to switch into math mode
% unless we are already there. Expansion tricks may not be needed here,
@@ -3532,7 +3551,7 @@
% @pounds{} is a sterling sign, which Knuth put in the CM italic font.
%
-\def\pounds{\ifmonospace{\ecfont\char"BF}\else{\it\$}\fi}
+\def\pounds{{\ifusingtt{\ecfont\char"BF}{\it\$}}}
% @euro{} comes from a separate font, depending on the current style.
% We use the free feym* fonts from the eurosym package by Henrik
@@ -3646,18 +3665,17 @@
% hopefully nobody will notice/care.
\edef\ecsize{\csname\curfontsize ecsize\endcsname}%
\edef\nominalsize{\csname\curfontsize nominalsize\endcsname}%
- \ifmonospace
- % typewriter:
- \font\thisecfont = #1ctt\ecsize \space at \nominalsize
- \else
- \ifx\curfontstyle\bfstylename
- % bold:
- \font\thisecfont = #1cb\ifusingit{i}{x}\ecsize \space at \nominalsize
- \else
- % regular:
- \font\thisecfont = #1c\ifusingit{ti}{rm}\ecsize \space at \nominalsize
- \fi
- \fi
+ \ifusingtt
+ % typewriter:
+ {\font\thisecfont = #1ctt\ecsize \space at \nominalsize}%
+ % else
+ {\ifx\curfontstyle\bfstylename
+ % bold:
+ \font\thisecfont = #1cb\ifusingit{i}{x}\ecsize \space at \nominalsize
+ \else
+ % regular:
+ \font\thisecfont = #1c\ifusingit{ti}{rm}\ecsize \space at \nominalsize
+ \fi}%
\thisecfont
}
@@ -3673,7 +3691,10 @@
% @textdegree - the normal degrees sign.
%
-\def\textdegree{$^\circ$}
+\def\textdegree{%
+ \ifmmode ^\circ
+ \else {\tcfont \char 176}%
+ \fi}
% Laurent Siebenmann reports \Orb undefined with:
% Textures 1.7.7 (preloaded format=plain 93.10.14) (68K) 16 APR 2004 02:38
@@ -3690,11 +3711,11 @@
% only change font for tt for correct kerning and to avoid using
% \ecfont unless necessary.
\def\quotedblleft{%
- \ifmonospace{\ecfont\char"10}\else{\char"5C}\fi
+ \ifusingtt{{\ecfont\char"10}}{{\char"5C}}%
}
\def\quotedblright{%
- \ifmonospace{\ecfont\char"11}\else{\char`\"}\fi
+ \ifusingtt{{\ecfont\char"11}}{{\char`\"}}%
}
@@ -3824,7 +3845,7 @@
\newtoks\oddfootline % footline on odd pages
% Now make \makeheadline and \makefootline in Plain TeX use those variables
-\headline={{\textfonts\rm
+\headline={{\textfonts\rm\frenchspacingsetting
\ifchapterpage
\ifodd\pageno\the\oddchapheadline\else\the\evenchapheadline\fi
\else
@@ -3831,8 +3852,9 @@
\ifodd\pageno\the\oddheadline\else\the\evenheadline\fi
\fi}}
-\footline={{\textfonts\rm \ifodd\pageno \the\oddfootline
- \else \the\evenfootline \fi}\HEADINGShook}
+\footline={{\textfonts\rm\frenchspacingsetting
+ \ifodd\pageno \the\oddfootline \else \the\evenfootline \fi}%
+ \HEADINGShook}
\let\HEADINGShook=\relax
% Commands to set those variables.
@@ -3958,7 +3980,7 @@
\global\oddfootline={\hfil}
\global\evenheadline={\line{\folio\hfil\thistitle}}
\global\oddheadline={\line{\thischapter\hfil\folio}}
-\global\evenchapheadline={\line{\folio\hfil}}
+\global\evenchapheadline={\line{\folio\hfil\thistitle}}
\global\oddchapheadline={\line{\hfil\folio}}
\global\let\contentsalignmacro = \chapoddpage
}
@@ -4346,8 +4368,7 @@
% undo it ourselves.
\def\headitemfont{\b}% for people to use in the template row; not changeable
\def\headitem{%
- \checkenv\multitable
- \crcr
+ \crcr % must appear first
\gdef\headitemcrhook{\nobreak}% attempt to avoid page break after headings
\global\everytab={\bf}% can't use \headitemfont since the parsing differs
\the\everytab % for the first item
@@ -4432,7 +4453,7 @@
\message{conditionals,}
-% @iftex, @ifnotdocbook, @ifnothtml, @ifnotinfo, @ifnotplaintext,
+% @iftex, @ifnotdocbook, @ifnothtml, @ifnotinfo, @ifnotlatex, @ifnotplaintext,
% @ifnotxml always succeed. They currently do nothing; we don't
% attempt to check whether the conditionals are properly nested. But we
% have to remember that they are conditionals, so that @end doesn't
@@ -4446,6 +4467,7 @@
\makecond{ifnotdocbook}
\makecond{ifnothtml}
\makecond{ifnotinfo}
+\makecond{ifnotlatex}
\makecond{ifnotplaintext}
\makecond{ifnotxml}
@@ -4458,10 +4480,12 @@
\def\ifdocbook{\doignore{ifdocbook}}
\def\ifhtml{\doignore{ifhtml}}
\def\ifinfo{\doignore{ifinfo}}
+\def\iflatex{\doignore{iflatex}}
\def\ifnottex{\doignore{ifnottex}}
\def\ifplaintext{\doignore{ifplaintext}}
\def\ifxml{\doignore{ifxml}}
\def\ignore{\doignore{ignore}}
+\def\latex{\doignore{latex}}
\def\menu{\doignore{menu}}
\def\xml{\doignore{xml}}
@@ -4985,25 +5009,24 @@
\catcode`\-=13
\catcode`\`=13
\gdef\indexnonalnumdisappear{%
- \expandafter\ifx\csname SETtxiindexlquoteignore\endcsname\relax\else
+ \ifflagclear{txiindexlquoteignore}{}{%
% @set txiindexlquoteignore makes us ignore left quotes in the sort term.
% (Introduced for FSFS 2nd ed.)
\let`=\empty
- \fi
+ }%
%
- \expandafter\ifx\csname SETtxiindexbackslashignore\endcsname\relax\else
+ \ifflagclear{txiindexbackslashignore}{}{%
\backslashdisappear
- \fi
- %
- \expandafter\ifx\csname SETtxiindexhyphenignore\endcsname\relax\else
+ }%
+ \ifflagclear{txiindexhyphenignore}{}{%
\def-{}%
- \fi
- \expandafter\ifx\csname SETtxiindexlessthanignore\endcsname\relax\else
+ }%
+ \ifflagclear{txiindexlessthanignore}{}{%
\def<{}%
- \fi
- \expandafter\ifx\csname SETtxiindexatsignignore\endcsname\relax\else
+ }%
+ \ifflagclear{txiindexatsignignore}{}{%
\def\@{}%
- \fi
+ }%
}
\gdef\indexnonalnumreappear{%
@@ -5250,7 +5273,10 @@
\xdef\trimmed{\segment}%
\xdef\trimmed{\expandafter\eatspaces\expandafter{\trimmed}}%
\xdef\indexsortkey{\trimmed}%
- \ifx\indexsortkey\empty\xdef\indexsortkey{ }\fi
+ \ifx\indexsortkey\empty
+ \message{Empty index sort key near line \the\inputlineno}%
+ \xdef\indexsortkey{ }%
+ \fi
}\fi
%
% Append to \fullindexsortkey.
@@ -5295,9 +5321,7 @@
%
\atdummies
%
- \expandafter\ifx\csname SETtxiindexescapeisbackslash\endcsname\relax\else
- \escapeisbackslash
- \fi
+ \ifflagclear{txiindexescapeisbackslash}{}{\escapeisbackslash}%
%
% For texindex which always views { and } as separators.
\def\{{\lbracechar{}}%
@@ -5481,9 +5505,9 @@
% old index files using \ as the escape character. Reading this would
% at best lead to typesetting garbage, at worst a TeX syntax error.
\def\printindexzz#1#2\finish{%
- \expandafter\ifx\csname SETtxiindexescapeisbackslash\endcsname\relax
+ \ifflagclear{txiindexescapeisbackslash}{%
\uccode`\~=`\\ \uppercase{\if\noexpand~}\noexpand#1
- \expandafter\ifx\csname SETtxiskipindexfileswithbackslash\endcsname\relax
+ \ifflagclear{txiskipindexfileswithbackslash}{%
\errmessage{%
ERROR: A sorted index file in an obsolete format was skipped.
To fix this problem, please upgrade your version of 'texi2dvi'
@@ -5499,15 +5523,15 @@
If you continue to have problems, deleting the index files and starting again
might help (with 'rm \jobname.?? \jobname.??s')%
}%
- \else
+ }{%
(Skipped sorted index file in obsolete format)
- \fi
+ }%
\else
\begindoublecolumns
\input \jobname.\indexname s
\enddoublecolumns
\fi
- \else
+ }{%
\begindoublecolumns
\catcode`\\=0\relax
%
@@ -5517,7 +5541,7 @@
\catcode`\@=0\relax
\input \jobname.\indexname s
\enddoublecolumns
- \fi
+ }%
}
% These macros are used by the sorted index file itself.
@@ -6381,6 +6405,16 @@
\def\Yappendixkeyword{Yappendix}
\def\Yomitfromtockeyword{Yomitfromtoc}
%
+%
+% Definitions for @thischapter. These can be overridden in translation
+% files.
+\def\thischapterAppendix{%
+ \putwordAppendix{} \thischapternum: \thischaptername}
+
+\def\thischapterChapter{%
+ \putwordChapter{} \thischapternum: \thischaptername}
+%
+%
\def\chapmacro#1#2#3{%
\expandafter\ifx\thisenv\titlepage\else
\checkenv{}% chapters, etc., should not start inside an environment.
@@ -6403,11 +6437,7 @@
\xdef\currentchapterdefs{%
\gdef\noexpand\thischaptername{\the\toks0}%
\gdef\noexpand\thischapternum{\appendixletter}%
- % \noexpand\putwordAppendix avoids expanding indigestible
- % commands in some of the translations.
- \gdef\noexpand\thischapter{\noexpand\putwordAppendix{}
- \noexpand\thischapternum:
- \noexpand\thischaptername}%
+ \let\noexpand\thischapter\noexpand\thischapterAppendix
}%
\else
\toks0={#1}%
@@ -6414,11 +6444,7 @@
\xdef\currentchapterdefs{%
\gdef\noexpand\thischaptername{\the\toks0}%
\gdef\noexpand\thischapternum{\the\chapno}%
- % \noexpand\putwordChapter avoids expanding indigestible
- % commands in some of the translations.
- \gdef\noexpand\thischapter{\noexpand\putwordChapter{}
- \noexpand\thischapternum:
- \noexpand\thischaptername}%
+ \let\noexpand\thischapter\noexpand\thischapterChapter
}%
\fi\fi\fi
%
@@ -6504,7 +6530,13 @@
\def\subsubsecheadingskip{\subsecheadingskip}
\def\subsubsecheadingbreak{\subsecheadingbreak}
+% Definition for @thissection. This can be overridden in translation
+% files.
+\def\thissectionDef{%
+ \putwordSection{} \thissectionnum: \thissectionname}
+%
+
% Print any size, any type, section title.
%
% #1 is the text of the title,
@@ -6545,11 +6577,7 @@
\xdef\currentsectiondefs{%
\gdef\noexpand\thissectionname{\the\toks0}%
\gdef\noexpand\thissectionnum{#4}%
- % \noexpand\putwordSection avoids expanding indigestible
- % commands in some of the translations.
- \gdef\noexpand\thissection{\noexpand\putwordSection{}
- \noexpand\thissectionnum:
- \noexpand\thissectionname}%
+ \let\noexpand\thissection\noexpand\thissectionDef
}%
\fi
\else
@@ -6558,11 +6586,7 @@
\xdef\currentsectiondefs{%
\gdef\noexpand\thissectionname{\the\toks0}%
\gdef\noexpand\thissectionnum{#4}%
- % \noexpand\putwordSection avoids expanding indigestible
- % commands in some of the translations.
- \gdef\noexpand\thissection{\noexpand\putwordSection{}
- \noexpand\thissectionnum:
- \noexpand\thissectionname}%
+ \let\noexpand\thissection\noexpand\thissectionDef
}%
\fi
\fi\fi\fi
@@ -6750,6 +6774,11 @@
\ifnum\romancount=0 \global\romancount=\pagecount \fi
}
+% \raggedbottom in plain.tex hardcodes \topskip so override it
+\catcode`\@=11
+\def\raggedbottom{\advance\topskip by 0pt plus60pt \r at ggedbottomtrue}
+\catcode`\@=\other
+
% redefined for the two-volume lispref. We always output on
% \jobname.toc even if this is redefined.
%
@@ -7097,12 +7126,19 @@
\startsavinginserts
\lskip=\leftskip \rskip=\rightskip
\leftskip=0pt\rightskip=0pt % we want these *outside*.
+ %
+ % Set paragraph width for text inside cartouche. There are
+ % left and right margins of 3pt each plus two vrules 0.4pt each.
\cartinner=\hsize \advance\cartinner by-\lskip
\advance\cartinner by-\rskip
+ \advance\cartinner by -6.8pt
+ %
+ % For drawing top and bottom of cartouche. Each corner char
+ % adds 6pt and we take off the width of a rule to line up with the
+ % right boundary perfectly.
\cartouter=\hsize
- \advance\cartouter by 18.4pt % allow for 3pt kerns on either
- % side, and for 6pt waste from
- % each corner char, and rule thickness
+ \advance\cartouter by 11.6pt
+ %
\normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip
%
% If this cartouche directly follows a sectioning command, we need the
@@ -7110,7 +7146,7 @@
% collide with the section heading.
\ifnum\lastpenalty>10000 \vskip\parskip \penalty\lastpenalty \fi
%
- \setbox\groupbox=\vbox\bgroup
+ \setbox\groupbox=\vtop\bgroup
\baselineskip=0pt\parskip=0pt\lineskip=0pt
\carttop
\hbox\bgroup
@@ -7277,23 +7313,7 @@
}
\let\Eraggedright\par
-\envdef\raggedleft{%
- \parindent=0pt \leftskip0pt plus2em
- \spaceskip.3333em \xspaceskip.5em \parfillskip=0pt
- \hbadness=10000 % Last line will usually be underfull, so turn off
- % badness reporting.
-}
-\let\Eraggedleft\par
-\envdef\raggedcenter{%
- \parindent=0pt \rightskip0pt plus1em \leftskip0pt plus1em
- \spaceskip.3333em \xspaceskip.5em \parfillskip=0pt
- \hbadness=10000 % Last line will usually be underfull, so turn off
- % badness reporting.
-}
-\let\Eraggedcenter\par
-
-
% @quotation does normal linebreaking (hence we can't use \nonfillstart)
% and narrows the margins. We keep \parskip nonzero in general, since
% we're doing normal filling. So, when using \aboveenvbreak and
@@ -7515,9 +7535,11 @@
% file; b) letting users define the frontmatter in as flexible order as
% possible is desirable.
%
-\def\copying{\checkenv{}\begingroup\scanargctxt\docopying}
-\def\docopying#1 at end copying{\endgroup\def\copyingtext{#1}}
-%
+\def\copying{\checkenv{}\begingroup\macrobodyctxt\docopying}
+{\catcode`\ =\other
+\gdef\docopying#1 at end copying{\endgroup\def\copyingtext{#1}}
+}
+
\def\insertcopying{%
\begingroup
\parindent = 0pt % paragraph indentation looks wrong on title page
@@ -7599,9 +7621,9 @@
\def\Edefun{\endgraf\medbreak}
-% \makedefun{deffn} creates \deffn, \deffnx and \Edeffn;
-% the only thing remaining is to define \deffnheader.
+% \makedefun{deffoo}{ (definition of \deffooheader) }
%
+% Define \deffoo, \deffoox \Edeffoo and \deffooheader.
\def\makedefun#1{%
\expandafter\let\csname E#1\endcsname = \Edefun
\edef\temp{\noexpand\domakedefun
@@ -7608,12 +7630,6 @@
\makecsname{#1}\makecsname{#1x}\makecsname{#1header}}%
\temp
}
-
-% \domakedefun \deffn \deffnx \deffnheader { (defn. of \deffnheader) }
-%
-% Define \deffn and \deffnx, without parameters.
-% \deffnheader has to be defined explicitly.
-%
\def\domakedefun#1#2#3{%
\envdef#1{%
\startdefun
@@ -7646,74 +7662,51 @@
\fi\fi
}
-% \dosubind {index}{topic}{subtopic}
-%
-% If SUBTOPIC is present, precede it with a space, and call \doind.
-% (At some time during the 20th century, this made a two-level entry in an
-% index such as the operation index. Nobody seemed to notice the change in
-% behaviour though.)
-\def\dosubind#1#2#3{%
- \def\thirdarg{#3}%
- \ifx\thirdarg\empty
- \doind{#1}{#2}%
- \else
- \doind{#1}{#2\space#3}%
- \fi
-}
-
% Untyped functions:
% @deffn category name args
-\makedefun{deffn}{\deffngeneral{}}
+\makedefun{deffn}#1 #2 #3\endheader{%
+ \doind{fn}{\code{#2}}%
+ \defname{#1}{}{#2}\magicamp\defunargs{#3\unskip}%
+}
-% @deffn category class name args
-\makedefun{defop}#1 {\defopon{#1\ \putwordon}}
-
-% \defopon {category on}class name args
-\def\defopon#1#2 {\deffngeneral{\putwordon\ \code{#2}}{#1\ \code{#2}} }
-
-% \deffngeneral {subind}category name args
-%
-\def\deffngeneral#1#2 #3 #4\endheader{%
- \dosubind{fn}{\code{#3}}{#1}%
- \defname{#2}{}{#3}\magicamp\defunargs{#4\unskip}%
+% @defop category class name args
+\makedefun{defop}#1 {\defopheaderx{#1\ \putwordon}}
+\def\defopheaderx#1#2 #3 #4\endheader{%
+ \doind{fn}{\code{#3}\space\putwordon\ \code{#2}}%
+ \defname{#1\ \code{#2}}{}{#3}\magicamp\defunargs{#4\unskip}%
}
% Typed functions:
% @deftypefn category type name args
-\makedefun{deftypefn}{\deftypefngeneral{}}
+\makedefun{deftypefn}#1 #2 #3 #4\endheader{%
+ \doind{fn}{\code{#3}}%
+ \doingtypefntrue
+ \defname{#1}{#2}{#3}\defunargs{#4\unskip}%
+}
% @deftypeop category class type name args
-\makedefun{deftypeop}#1 {\deftypeopon{#1\ \putwordon}}
-
-% \deftypeopon {category on}class type name args
-\def\deftypeopon#1#2 {\deftypefngeneral{\putwordon\ \code{#2}}{#1\ \code{#2}} }
-
-% \deftypefngeneral {subind}category type name args
-%
-\def\deftypefngeneral#1#2 #3 #4 #5\endheader{%
- \dosubind{fn}{\code{#4}}{#1}%
+\makedefun{deftypeop}#1 {\deftypeopheaderx{#1\ \putwordon}}
+\def\deftypeopheaderx#1#2 #3 #4 #5\endheader{%
+ \doind{fn}{\code{#4}\space\putwordon\ \code{#1\ \code{#2}}}%
\doingtypefntrue
- \defname{#2}{#3}{#4}\defunargs{#5\unskip}%
+ \defname{#1\ \code{#2}}{#3}{#4}\defunargs{#5\unskip}%
}
% Typed variables:
% @deftypevr category type var args
-\makedefun{deftypevr}{\deftypecvgeneral{}}
+\makedefun{deftypevr}#1 #2 #3 #4\endheader{%
+ \doind{vr}{\code{#3}}%
+ \defname{#1}{#2}{#3}\defunargs{#4\unskip}%
+}
% @deftypecv category class type var args
-\makedefun{deftypecv}#1 {\deftypecvof{#1\ \putwordof}}
-
-% \deftypecvof {category of}class type var args
-\def\deftypecvof#1#2 {\deftypecvgeneral{\putwordof\ \code{#2}}{#1\ \code{#2}} }
-
-% \deftypecvgeneral {subind}category type var args
-%
-\def\deftypecvgeneral#1#2 #3 #4 #5\endheader{%
- \dosubind{vr}{\code{#4}}{#1}%
- \defname{#2}{#3}{#4}\defunargs{#5\unskip}%
+\makedefun{deftypecv}#1 {\deftypecvheaderx{#1\ \putwordof}}
+\def\deftypecvheaderx#1#2 #3 #4 #5\endheader{%
+ \doind{vr}{\code{#4}\space\putwordof\ \code{#2}}%
+ \defname{#1\ \code{#2}}{#3}{#4}\defunargs{#5\unskip}%
}
% Untyped variables:
@@ -7722,11 +7715,9 @@
\makedefun{defvr}#1 {\deftypevrheader{#1} {} }
% @defcv category class var args
-\makedefun{defcv}#1 {\defcvof{#1\ \putwordof}}
+\makedefun{defcv}#1 {\defcvheaderx{#1\ \putwordof}}
+\def\defcvheaderx#1#2 {\deftypecvheaderx{#1}#2 {} }
-% \defcvof {category of}class var args
-\def\defcvof#1#2 {\deftypecvof{#1}#2 {} }
-
% Types:
% @deftp category name args
@@ -7743,10 +7734,10 @@
\makedefun{defvar}{\defvrheader{\putwordDefvar} }
\makedefun{defopt}{\defvrheader{\putwordDefopt} }
\makedefun{deftypevar}{\deftypevrheader{\putwordDefvar} }
-\makedefun{defmethod}{\defopon\putwordMethodon}
-\makedefun{deftypemethod}{\deftypeopon\putwordMethodon}
-\makedefun{defivar}{\defcvof\putwordInstanceVariableof}
-\makedefun{deftypeivar}{\deftypecvof\putwordInstanceVariableof}
+\makedefun{defmethod}{\defopheaderx\putwordMethodon}
+\makedefun{deftypemethod}{\deftypeopheaderx\putwordMethodon}
+\makedefun{defivar}{\defcvheaderx\putwordInstanceVariableof}
+\makedefun{deftypeivar}{\deftypecvheaderx\putwordInstanceVariableof}
% \defname, which formats the name of the @def (not the args).
% #1 is the category, such as "Function".
@@ -7765,9 +7756,7 @@
\rettypeownlinefalse
\ifdoingtypefn % doing a typed function specifically?
% then check user option for putting return type on its own line:
- \expandafter\ifx\csname SETtxideftypefnnl\endcsname\relax \else
- \rettypeownlinetrue
- \fi
+ \ifflagclear{txideftypefnnl}{}{\rettypeownlinetrue}%
\fi
%
% How we'll format the category name. Putting it in brackets helps
@@ -7832,30 +7821,20 @@
\fi % no return type
#3% output function name
}%
- {\rm\enskip}% hskip 0.5 em of \rmfont
+ \ifflagclear{txidefnamenospace}{%
+ {\rm\enskip}% hskip 0.5 em of \rmfont
+ }{}%
%
\boldbrax
% arguments will be output next, if any.
}
-% Print arguments in slanted roman (not ttsl), inconsistently with using
-% tt for the name. This is because literal text is sometimes needed in
-% the argument list (groff manual), and ttsl and tt are not very
-% distinguishable. Prevent hyphenation at `-' chars.
-%
+% Print arguments. Use slanted for @def*, typewriter for @deftype*.
\def\defunargs#1{%
- % use sl by default (not ttsl),
- % tt for the names.
- \df \sl \hyphenchar\font=0
- %
- % On the other hand, if an argument has two dashes (for instance), we
- % want a way to get ttsl. We used to recommend @var for that, so
- % leave the code in, but it's strange for @var to lead to typewriter.
- % Nowadays we recommend @code, since the difference between a ttsl hyphen
- % and a tt hyphen is pretty tiny. @code also disables ?` !`.
- \def\var##1{{\setregularquotes\ttslanted{##1}}}%
+ \df \ifdoingtypefn \tt \else \sl \fi
+ \ifflagclear{txicodevaristt}{}%
+ {\def\var##1{{\setregularquotes \ttsl ##1}}}%
#1%
- \sl\hyphenchar\font=45
}
% We want ()&[] to print specially on the defun line.
@@ -7874,9 +7853,12 @@
% so TeX would otherwise complain about undefined control sequence.
{
\activeparens
- \global\let(=\lparen \global\let)=\rparen
- \global\let[=\lbrack \global\let]=\rbrack
- \global\let& = \&
+ \gdef\defcharsdefault{%
+ \let(=\lparen \let)=\rparen
+ \let[=\lbrack \let]=\rbrack
+ \let& = \&%
+ }
+ \globaldefs=1 \defcharsdefault
\gdef\boldbrax{\let(=\opnr\let)=\clnr\let[=\lbrb\let]=\rbrb}
\gdef\magicamp{\let&=\amprm}
@@ -8060,24 +8042,17 @@
\catcode`\_=\other
\catcode`\|=\other
\catcode`\~=\other
- \passthroughcharstrue
-}
-
-\def\scanargctxt{% used for copying and captions, not macros.
- \scanctxt
\catcode`\@=\other
- \catcode`\\=\other
\catcode`\^^M=\other
+ \catcode`\\=\active
+ \passthroughcharstrue
}
-\def\macrobodyctxt{% used for @macro definitions
+\def\macrobodyctxt{% used for @macro definitions and @copying
\scanctxt
\catcode`\ =\other
- \catcode`\@=\other
\catcode`\{=\other
\catcode`\}=\other
- \catcode`\^^M=\other
- \usembodybackslash
}
% Used when scanning braced macro arguments. Note, however, that catcode
@@ -8086,14 +8061,10 @@
\def\macroargctxt{%
\scanctxt
\catcode`\ =\active
- \catcode`\@=\other
- \catcode`\^^M=\other
- \catcode`\\=\active
}
\def\macrolineargctxt{% used for whole-line arguments without braces
\scanctxt
- \catcode`\@=\other
\catcode`\{=\other
\catcode`\}=\other
}
@@ -8137,7 +8108,7 @@
\global\expandafter\let\csname ismacro.\the\macname\endcsname=1%
\addtomacrolist{\the\macname}%
\fi
- \begingroup \macrobodyctxt
+ \begingroup \macrobodyctxt \usembodybackslash
\ifrecursive \expandafter\parsermacbody
\else \expandafter\parsemacbody
\fi}
@@ -8460,21 +8431,21 @@
\ifcase\paramno
% 0
\expandafter\xdef\csname\the\macname\endcsname{%
- \bgroup
+ \begingroup
\noexpand\spaceisspace
\noexpand\endlineisspace
\noexpand\expandafter % skip any whitespace after the macro name.
\expandafter\noexpand\csname\the\macname @@@\endcsname}%
\expandafter\xdef\csname\the\macname @@@\endcsname{%
- \egroup
+ \endgroup
\noexpand\scanmacro{\macrobody}}%
\or % 1
\expandafter\xdef\csname\the\macname\endcsname{%
- \bgroup
+ \begingroup
\noexpand\braceorline
\expandafter\noexpand\csname\the\macname @@@\endcsname}%
\expandafter\xdef\csname\the\macname @@@\endcsname##1{%
- \egroup
+ \endgroup
\noexpand\scanmacro{\macrobody}%
}%
\else % at most 9
@@ -8485,7 +8456,7 @@
% @MACNAME@@@ removes braces surrounding the argument list.
% @MACNAME@@@@ scans the macro body with arguments substituted.
\expandafter\xdef\csname\the\macname\endcsname{%
- \bgroup
+ \begingroup
\noexpand\expandafter % This \expandafter skip any spaces after the
\noexpand\macroargctxt % macro before we change the catcode of space.
\noexpand\expandafter
@@ -8499,7 +8470,7 @@
\expandafter\xdef
\expandafter\expandafter
\csname\the\macname @@@@\endcsname\paramlist{%
- \egroup\noexpand\scanmacro{\macrobody}}%
+ \endgroup\noexpand\scanmacro{\macrobody}}%
\else % 10 or more:
\expandafter\xdef\csname\the\macname\endcsname{%
\noexpand\getargvals@{\the\macname}{\argl}%
@@ -8941,12 +8912,11 @@
% output the `[mynode]' via the macro below so it can be overridden.
\xrefprintnodename\printedrefname
%
- \expandafter\ifx\csname SETtxiomitxrefpg\endcsname\relax
- % But we always want a comma and a space:
- ,\space
- %
+ \ifflagclear{txiomitxrefpg}{%
+ % We always want a comma
+ ,%
% output the `page 3'.
- \turnoffactive \putwordpage\tie\refx{#1-pg}%
+ \turnoffactive \putpageref{#1}%
% Add a , if xref followed by a space
\if\space\noexpand\tokenafterxref ,%
\else\ifx\ \tokenafterxref ,% @TAB
@@ -8956,12 +8926,16 @@
\tokenafterxref ,% @NL
\else\ifx\tie\tokenafterxref ,% @tie
\fi\fi\fi\fi\fi\fi
- \fi
+ }{}%
\fi\fi
\fi
\endlink
\endgroup}
+% can be overridden in translation files
+\def\putpageref#1{%
+ \space\putwordpage\tie\refx{#1-pg}}
+
% Output a cross-manual xref to #1. Used just above (twice).
%
% Only include the text "Section ``foo'' in" if the foo is neither
@@ -9373,6 +9347,12 @@
\imagexxx #1,,,,,\finish
\fi
}
+
+% Approximate height of a line in the standard text font.
+\newdimen\capheight
+\setbox0=\vbox{\tenrm H}
+\capheight=\ht0
+
%
% Arguments to @image:
% #1 is (mandatory) image filename; we tack on .eps extension.
@@ -9387,13 +9367,6 @@
\makevalueexpandable
\ifvmode
\imagevmodetrue
- \else \ifx\centersub\centerV
- % for @center @image, we need a vbox so we can have our vertical space
- \imagevmodetrue
- \vbox\bgroup % vbox has better behavior than vtop here
- \fi\fi
- %
- \ifimagevmode
\medskip
% Usually we'll have text after the image which will insert
% \parskip glue, so insert it here too to equalize the space
@@ -9402,17 +9375,20 @@
%
% Place image in a \vtop for a top page margin that is (close to) correct,
% as \topskip glue is relative to the first baseline.
- \vtop\bgroup\hrule height 0pt\vskip-\parskip
+ \vtop\bgroup \kern -\capheight \vskip-\parskip
\fi
%
- % Enter horizontal mode so that indentation from an enclosing
- % environment such as @quotation is respected.
- % However, if we're at the top level, we don't want the
- % normal paragraph indentation.
- % On the other hand, if we are in the case of @center @image, we don't
- % want to start a paragraph, which will create a hsize-width box and
- % eradicate the centering.
- \ifx\centersub\centerV \else \imageindent \fi
+ \ifx\centersub\centerV
+ % For @center @image, enter vertical mode and add vertical space
+ % Enter an extra \parskip because @center doesn't add space itself.
+ \vbox\bgroup\vskip\parskip\medskip\vskip\parskip
+ \else
+ % Enter horizontal mode so that indentation from an enclosing
+ % environment such as @quotation is respected.
+ % However, if we're at the top level, we don't want the
+ % normal paragraph indentation.
+ \imageindent
+ \fi
%
% Output the image.
\ifpdf
@@ -9437,7 +9413,10 @@
\egroup
\medskip % space after a standalone image
\fi
- \ifx\centersub\centerV \egroup \fi
+ \ifx\centersub\centerV % @center @image
+ \medskip
+ \egroup % close \vbox
+ \fi
\endgroup}
@@ -9604,7 +9583,7 @@
%
\def\caption{\docaption\thiscaption}
\def\shortcaption{\docaption\thisshortcaption}
-\def\docaption{\checkenv\float \bgroup\scanargctxt\defcaption}
+\def\docaption{\checkenv\float \bgroup\scanctxt\defcaption}
\def\defcaption#1#2{\egroup \def#1{#2}}
% The parameter is the control sequence identifying the counter we are
@@ -10087,7 +10066,7 @@
\gdefchar^^ae{\v Z}
\gdefchar^^af{\dotaccent Z}
%
- \gdefchar^^b0{\textdegree{}}
+ \gdefchar^^b0{\textdegree}
\gdefchar^^b1{\ogonek{a}}
\gdefchar^^b2{\ogonek{ }}
\gdefchar^^b3{\l}
@@ -10324,9 +10303,9 @@
% Given the value in \countUTFz as a Unicode code point, set \UTFviiiTmp
% to the corresponding UTF-8 sequence.
\gdef\parseXMLCharref{%
- \ifnum\countUTFz < "A0\relax
+ \ifnum\countUTFz < "20\relax
\errhelp = \EMsimple
- \errmessage{Cannot define Unicode char value < 00A0}%
+ \errmessage{Cannot define Unicode char value < 0020}%
\else\ifnum\countUTFz < "800\relax
\parseUTFviiiA,%
\parseUTFviiiB C\UTFviiiTwoOctetsName.,%
@@ -10396,6 +10375,103 @@
% least make most of the characters not bomb out.
%
\def\unicodechardefs{%
+ \DeclareUnicodeCharacter{0020}{ } % space
+ \DeclareUnicodeCharacter{0021}{\char"21 }% % space to terminate number
+ \DeclareUnicodeCharacter{0022}{\char"22 }%
+ \DeclareUnicodeCharacter{0023}{\char"23 }%
+ \DeclareUnicodeCharacter{0024}{\char"24 }%
+ \DeclareUnicodeCharacter{0025}{\char"25 }%
+ \DeclareUnicodeCharacter{0026}{\char"26 }%
+ \DeclareUnicodeCharacter{0027}{\char"27 }%
+ \DeclareUnicodeCharacter{0028}{\char"28 }%
+ \DeclareUnicodeCharacter{0029}{\char"29 }%
+ \DeclareUnicodeCharacter{002A}{\char"2A }%
+ \DeclareUnicodeCharacter{002B}{\char"2B }%
+ \DeclareUnicodeCharacter{002C}{\char"2C }%
+ \DeclareUnicodeCharacter{002D}{\char"2D }%
+ \DeclareUnicodeCharacter{002E}{\char"2E }%
+ \DeclareUnicodeCharacter{002F}{\char"2F }%
+ \DeclareUnicodeCharacter{0030}{0}%
+ \DeclareUnicodeCharacter{0031}{1}%
+ \DeclareUnicodeCharacter{0032}{2}%
+ \DeclareUnicodeCharacter{0033}{3}%
+ \DeclareUnicodeCharacter{0034}{4}%
+ \DeclareUnicodeCharacter{0035}{5}%
+ \DeclareUnicodeCharacter{0036}{6}%
+ \DeclareUnicodeCharacter{0037}{7}%
+ \DeclareUnicodeCharacter{0038}{8}%
+ \DeclareUnicodeCharacter{0039}{9}%
+ \DeclareUnicodeCharacter{003A}{\char"3A }%
+ \DeclareUnicodeCharacter{003B}{\char"3B }%
+ \DeclareUnicodeCharacter{003C}{\char"3C }%
+ \DeclareUnicodeCharacter{003D}{\char"3D }%
+ \DeclareUnicodeCharacter{003E}{\char"3E }%
+ \DeclareUnicodeCharacter{003F}{\char"3F }%
+ \DeclareUnicodeCharacter{0040}{\char"40 }%
+ \DeclareUnicodeCharacter{0041}{A}%
+ \DeclareUnicodeCharacter{0042}{B}%
+ \DeclareUnicodeCharacter{0043}{C}%
+ \DeclareUnicodeCharacter{0044}{D}%
+ \DeclareUnicodeCharacter{0045}{E}%
+ \DeclareUnicodeCharacter{0046}{F}%
+ \DeclareUnicodeCharacter{0047}{G}%
+ \DeclareUnicodeCharacter{0048}{H}%
+ \DeclareUnicodeCharacter{0049}{I}%
+ \DeclareUnicodeCharacter{004A}{J}%
+ \DeclareUnicodeCharacter{004B}{K}%
+ \DeclareUnicodeCharacter{004C}{L}%
+ \DeclareUnicodeCharacter{004D}{M}%
+ \DeclareUnicodeCharacter{004E}{N}%
+ \DeclareUnicodeCharacter{004F}{O}%
+ \DeclareUnicodeCharacter{0050}{P}%
+ \DeclareUnicodeCharacter{0051}{Q}%
+ \DeclareUnicodeCharacter{0052}{R}%
+ \DeclareUnicodeCharacter{0053}{S}%
+ \DeclareUnicodeCharacter{0054}{T}%
+ \DeclareUnicodeCharacter{0055}{U}%
+ \DeclareUnicodeCharacter{0056}{V}%
+ \DeclareUnicodeCharacter{0057}{W}%
+ \DeclareUnicodeCharacter{0058}{X}%
+ \DeclareUnicodeCharacter{0059}{Y}%
+ \DeclareUnicodeCharacter{005A}{Z}%
+ \DeclareUnicodeCharacter{005B}{\char"5B }%
+ \DeclareUnicodeCharacter{005C}{\char"5C }%
+ \DeclareUnicodeCharacter{005D}{\char"5D }%
+ \DeclareUnicodeCharacter{005E}{\char"5E }%
+ \DeclareUnicodeCharacter{005F}{\char"5F }%
+ \DeclareUnicodeCharacter{0060}{\char"60 }%
+ \DeclareUnicodeCharacter{0061}{a}%
+ \DeclareUnicodeCharacter{0062}{b}%
+ \DeclareUnicodeCharacter{0063}{c}%
+ \DeclareUnicodeCharacter{0064}{d}%
+ \DeclareUnicodeCharacter{0065}{e}%
+ \DeclareUnicodeCharacter{0066}{f}%
+ \DeclareUnicodeCharacter{0067}{g}%
+ \DeclareUnicodeCharacter{0068}{h}%
+ \DeclareUnicodeCharacter{0069}{i}%
+ \DeclareUnicodeCharacter{006A}{j}%
+ \DeclareUnicodeCharacter{006B}{k}%
+ \DeclareUnicodeCharacter{006C}{l}%
+ \DeclareUnicodeCharacter{006D}{m}%
+ \DeclareUnicodeCharacter{006E}{n}%
+ \DeclareUnicodeCharacter{006F}{o}%
+ \DeclareUnicodeCharacter{0070}{p}%
+ \DeclareUnicodeCharacter{0071}{q}%
+ \DeclareUnicodeCharacter{0072}{r}%
+ \DeclareUnicodeCharacter{0073}{s}%
+ \DeclareUnicodeCharacter{0074}{t}%
+ \DeclareUnicodeCharacter{0075}{u}%
+ \DeclareUnicodeCharacter{0076}{v}%
+ \DeclareUnicodeCharacter{0077}{w}%
+ \DeclareUnicodeCharacter{0078}{x}%
+ \DeclareUnicodeCharacter{0079}{y}%
+ \DeclareUnicodeCharacter{007A}{z}%
+ \DeclareUnicodeCharacter{007B}{\char"7B }%
+ \DeclareUnicodeCharacter{007C}{\char"7C }%
+ \DeclareUnicodeCharacter{007D}{\char"7D }%
+ \DeclareUnicodeCharacter{007E}{\char"7E }%
+ % \DeclareUnicodeCharacter{007F}{} % DEL
+ %
\DeclareUnicodeCharacter{00A0}{\tie}%
\DeclareUnicodeCharacter{00A1}{\exclamdown}%
\DeclareUnicodeCharacter{00A2}{{\tcfont \char162}}% 0242=cent
@@ -10413,7 +10489,7 @@
\DeclareUnicodeCharacter{00AE}{\registeredsymbol{}}%
\DeclareUnicodeCharacter{00AF}{\={ }}%
%
- \DeclareUnicodeCharacter{00B0}{\ringaccent{ }}%
+ \DeclareUnicodeCharacter{00B0}{\textdegree}
\DeclareUnicodeCharacter{00B1}{\ensuremath\pm}%
\DeclareUnicodeCharacter{00B2}{$^2$}%
\DeclareUnicodeCharacter{00B3}{$^3$}%
@@ -10917,7 +10993,7 @@
%
\DeclareUnicodeCharacter{20AC}{\euro{}}%
%
- \DeclareUnicodeCharacter{2192}{\expansion{}}%
+ \DeclareUnicodeCharacter{2192}{\arrow}%
\DeclareUnicodeCharacter{21D2}{\result{}}%
%
% Mathematical symbols
@@ -11080,24 +11156,26 @@
% provide a definition macro to replace/pass-through a Unicode character
%
\def\DeclareUnicodeCharacterNative#1#2{%
- \catcode"#1=\active
- \def\dodeclareunicodecharacternative##1##2##3{%
+ \ifnum"#1>"7F % only make non-ASCII chars active
+ \catcode"#1=\active
+ \def\dodeclareunicodecharacternative##1##2##3{%
+ \begingroup
+ \uccode`\~="##2\relax
+ \uppercase{\gdef~}{%
+ \ifpassthroughchars
+ ##1%
+ \else
+ ##3%
+ \fi
+ }
+ \endgroup
+ }
\begingroup
- \uccode`\~="##2\relax
- \uppercase{\gdef~}{%
- \ifpassthroughchars
- ##1%
- \else
- ##3%
- \fi
- }
+ \uccode`\.="#1\relax
+ \uppercase{\def\UTFNativeTmp{.}}%
+ \expandafter\dodeclareunicodecharacternative\UTFNativeTmp{#1}{#2}%
\endgroup
- }
- \begingroup
- \uccode`\.="#1\relax
- \uppercase{\def\UTFNativeTmp{.}}%
- \expandafter\dodeclareunicodecharacternative\UTFNativeTmp{#1}{#2}%
- \endgroup
+ \fi
}
% Native Unicode handling (XeTeX and LuaTeX) character replacing definition.
@@ -11180,13 +11258,9 @@
%
\vsize = #1\relax
\advance\vsize by \topskip
- \outervsize = \vsize
- \advance\outervsize by 2\topandbottommargin
\txipageheight = \vsize
%
\hsize = #2\relax
- \outerhsize = \hsize
- \advance\outerhsize by 0.5in
\txipagewidth = \hsize
%
\normaloffset = #4\relax
@@ -11276,7 +11350,7 @@
\textleading = 12.5pt
%
\internalpagesizes{160mm}{120mm}%
- {\voffset}{\hoffset}%
+ {\voffset}{-11.4mm}%
{\bindingoffset}{8pt}%
{210mm}{148mm}%
%
@@ -11355,9 +11429,135 @@
\hfuzz = 1pt
+\message{microtype,}
+
+% protrusion, from Thanh's protcode.tex.
+\def\mtsetprotcode#1{%
+ \rpcode#1`\!=200 \rpcode#1`\,=700 \rpcode#1`\-=700 \rpcode#1`\.=700
+ \rpcode#1`\;=500 \rpcode#1`\:=500 \rpcode#1`\?=200
+ \rpcode#1`\'=700
+ \rpcode#1 34=500 % ''
+ \rpcode#1 123=300 % --
+ \rpcode#1 124=200 % ---
+ \rpcode#1`\)=50 \rpcode#1`\A=50 \rpcode#1`\F=50 \rpcode#1`\K=50
+ \rpcode#1`\L=50 \rpcode#1`\T=50 \rpcode#1`\V=50 \rpcode#1`\W=50
+ \rpcode#1`\X=50 \rpcode#1`\Y=50 \rpcode#1`\k=50 \rpcode#1`\r=50
+ \rpcode#1`\t=50 \rpcode#1`\v=50 \rpcode#1`\w=50 \rpcode#1`\x=50
+ \rpcode#1`\y=50
+ %
+ \lpcode#1`\`=700
+ \lpcode#1 92=500 % ``
+ \lpcode#1`\(=50 \lpcode#1`\A=50 \lpcode#1`\J=50 \lpcode#1`\T=50
+ \lpcode#1`\V=50 \lpcode#1`\W=50 \lpcode#1`\X=50 \lpcode#1`\Y=50
+ \lpcode#1`\v=50 \lpcode#1`\w=50 \lpcode#1`\x=50 \lpcode#1`\y=0
+ %
+ \mtadjustprotcode#1\relax
+}
+
+\newcount\countC
+\def\mtadjustprotcode#1{%
+ \countC=0
+ \loop
+ \ifcase\lpcode#1\countC\else
+ \mtadjustcp\lpcode#1\countC
+ \fi
+ \ifcase\rpcode#1\countC\else
+ \mtadjustcp\rpcode#1\countC
+ \fi
+ \advance\countC 1
+ \ifnum\countC < 256 \repeat
+}
+
+\newcount\countB
+\def\mtadjustcp#1#2#3{%
+ \setbox\boxA=\hbox{%
+ \ifx#2\font\else#2\fi
+ \char#3}%
+ \countB=\wd\boxA
+ \multiply\countB #1#2#3\relax
+ \divide\countB \fontdimen6 #2\relax
+ #1#2#3=\countB\relax
+}
+
+\ifx\XeTeXrevision\thisisundefined
+ \ifx\luatexversion\thisisundefined
+ \ifpdf % pdfTeX
+ \mtsetprotcode\textrm
+ \def\mtfontexpand#1{\pdffontexpand#1 20 20 1 autoexpand\relax}
+ \else % TeX
+ \def\mtfontexpand#1{}
+ \fi
+ \else % LuaTeX
+ \mtsetprotcode\textrm
+ \def\mtfontexpand#1{\expandglyphsinfont#1 20 20 1\relax}
+ \fi
+\else % XeTeX
+ \mtsetprotcode\textrm
+ \def\mtfontexpand#1{}
+\fi
+
+
+\newif\ifmicrotype
+
+\def\microtypeON{%
+ \microtypetrue
+ %
+ \ifx\XeTeXrevision\thisisundefined
+ \ifx\luatexversion\thisisundefined
+ \ifpdf % pdfTeX
+ \pdfadjustspacing=2
+ \pdfprotrudechars=2
+ \fi
+ \else % LuaTeX
+ \adjustspacing=2
+ \protrudechars=2
+ \fi
+ \else % XeTeX
+ \XeTeXprotrudechars=2
+ \fi
+ %
+ \mtfontexpand\textrm
+ \mtfontexpand\textsl
+ \mtfontexpand\textbf
+}
+
+\def\microtypeOFF{%
+ \microtypefalse
+ %
+ \ifx\XeTeXrevision\thisisundefined
+ \ifx\luatexversion\thisisundefined
+ \ifpdf % pdfTeX
+ \pdfadjustspacing=0
+ \pdfprotrudechars=0
+ \fi
+ \else % LuaTeX
+ \adjustspacing=0
+ \protrudechars=0
+ \fi
+ \else % XeTeX
+ \XeTeXprotrudechars=0
+ \fi
+}
+
+\microtypeON
+
+\parseargdef\microtype{%
+ \def\txiarg{#1}%
+ \ifx\txiarg\onword
+ \microtypeON
+ \else\ifx\txiarg\offword
+ \microtypeOFF
+ \else
+ \errhelp = \EMsimple
+ \errmessage{Unknown @microtype option `\txiarg', must be on|off}%
+ \fi\fi
+}
+
+
\message{and turning on texinfo input format.}
\def^^L{\par} % remove \outer, so ^L can appear in an @comment
+\catcode`\^^K = 10 % treat vertical tab as whitespace
% DEL is a comment character, in case @c does not suffice.
\catcode`\^^? = 14
@@ -11373,23 +11573,6 @@
\catcode`\|=\other \def\normalverticalbar{|}
\catcode`\~=\other \def\normaltilde{~}
-% This macro is used to make a character print one way in \tt
-% (where it can probably be output as-is), and another way in other fonts,
-% where something hairier probably needs to be done.
-%
-% #1 is what to print if we are indeed using \tt; #2 is what to print
-% otherwise. Since all the Computer Modern typewriter fonts have zero
-% interword stretch (and shrink), and it is reasonable to expect all
-% typewriter fonts to have this, we can check that font parameter.
-%
-\def\ifusingtt#1#2{\ifdim \fontdimen3\font=0pt #1\else #2\fi}
-
-% Same as above, but check for italic font. Actually this also catches
-% non-italic slanted fonts since it is impossible to distinguish them from
-% italic fonts. But since this is only used by $ and it uses \sl anyway
-% this is not a problem.
-\def\ifusingit#1#2{\ifdim \fontdimen1\font>0pt #1\else #2\fi}
-
% Set catcodes for Texinfo file
% Active characters for printing the wanted glyph.
Modified: branches/stable/source/src/configure
===================================================================
--- branches/stable/source/src/configure 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/configure 2022-11-14 21:05:34 UTC (rev 884)
@@ -947,6 +947,9 @@
with_system_gd
with_gd_includes
with_gd_libdir
+with_system_potrace
+with_potrace_includes
+with_potrace_libdir
with_system_freetype2
with_system_libpng
with_system_libpaper
@@ -1817,6 +1820,11 @@
--with-system-gd use installed gd headers and library
--with-gd-includes=DIR gd headers installed in DIR
--with-gd-libdir=DIR gd library installed in DIR
+ --with-system-potrace use installed potrace headers and library
+ --with-potrace-includes=DIR
+ potrace headers installed in DIR
+ --with-potrace-libdir=DIR
+ potrace library installed in DIR
--with-system-freetype2 use installed freetype2 headers and library
(requires freetype-config)
--with-system-libpng use installed libpng headers and library (requires
@@ -5730,6 +5738,7 @@
test "x$enable_web2c:$enable_mflua" = xyes:yes && {
need_lua53=yes
+ need_potrace=yes
}
# Check whether --enable-mfluajit was given.
if test ${enable_mfluajit+y}
@@ -5757,6 +5766,7 @@
test "x$enable_web2c:$enable_mfluajit" = xyes:yes && {
need_luajit=yes
+ need_potrace=yes
}
# Check whether --with-mf-x-toolkit was given.
@@ -7178,6 +7188,49 @@
need_freetype2=yes
}
+## libs/potrace/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/potrace/
+## configure options and TL libraries required for potrace
+
+# Check whether --with-system-potrace was given.
+if test ${with_system_potrace+y}
+then :
+ withval=$with_system_potrace;
+fi
+
+# Check whether --with-potrace-includes was given.
+if test ${with_potrace_includes+y}
+then :
+ withval=$with_potrace_includes;
+fi
+
+# Check whether --with-potrace-libdir was given.
+if test ${with_potrace_libdir+y}
+then :
+ withval=$with_potrace_libdir;
+fi
+if test "x$with_system_potrace" = x; then
+ if test -f $srcdir/libs/potrace/configure; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`potrace' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`potrace' headers and library from TL tree" >&6;}
+ with_system_potrace=no
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`potrace' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`potrace' headers and library" >&6;}
+ with_system_potrace=yes
+ fi
+ ac_configure_args="$ac_configure_args '--with-system-potrace=$with_system_potrace'"
+elif test "x$with_system_potrace" = xyes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using installed \`potrace' headers and library" >&5
+printf "%s\n" "$as_me: Using installed \`potrace' headers and library" >&6;}
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using \`potrace' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Using \`potrace' headers and library from TL tree" >&6;}
+ if test "x$with_system_potrace" != xno; then
+ with_system_potrace=no
+ ac_configure_args="$ac_configure_args '--without-system-potrace'"
+ fi
+fi
+
## libs/freetype2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype2/
## configure options and TL libraries required for freetype2
@@ -22652,6 +22705,13 @@
as_fn_error $? "did not find PPLIB" "$LINENO" 5
fi
+if $PKG_CONFIG POTRACE; then
+ POTRACE_INCLUDES=`$PKG_CONFIG POTRACE --cflags`
+ POTRACE_LIBS=`$PKG_CONFIG POTRACE --libs`
+elif test "x$need_POTRACE:$with_system_POTRACE" = xyes:yes; then
+ as_fn_error $? "did not find POTRACE" "$LINENO" 5
+fi
+
##tldbg _KPSE_LIB_FLAGS_SYSTEM: libpaper (paper).
if test "x$with_libpaper_includes" != x && test "x$with_libpaper_includes" != xyes; then
LIBPAPER_INCLUDES="-I$with_libpaper_includes"
@@ -23356,6 +23416,38 @@
printf "%s\n" "$kpse_res" >&6; }
fi
+## libs/potrace/ac/potrace.ac: configure.ac fragment for the TeX Live subdirectory libs/potrace/
+## basic check of system potrace
+if test "x$need_potrace:$with_system_potrace" = xyes:yes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking requested system \`potrace' library" >&5
+printf %s "checking requested system \`potrace' library... " >&6; }
+ CPPFLAGS="$POTRACE_INCLUDES $CPPFLAGS"
+ LIBS="$POTRACE_LIBS $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <potracelib.h>
+int
+main (void)
+{
+potrace_state_t st;
+const char *version = potrace_version();
+potrace_state_free(&st);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+ syslib_used=yes kpse_res=ok
+else $as_nop
+ syslib_status=no kpse_res=failed
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+ conftest$ac_exeext conftest.$ac_ext
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5
+printf "%s\n" "$kpse_res" >&6; }
+fi
+
## libs/gd/ac/gd.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/
## basic check of system gd
if test "x$need_gd:$with_system_gd" = xyes:yes; then
Modified: branches/stable/source/src/doc/ChangeLog
===================================================================
--- branches/stable/source/src/doc/ChangeLog 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/doc/ChangeLog 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,3 +1,11 @@
+2022-05-29 Karl Berry <karl at tug.org>
+
+ * (mv): r
+
+2022-05-28 Karl Berry <karl at tug.org>
+
+ * tlbuild.texi (Build one package): typo, buil -> build.
+
2022-02-19 Karl Berry <karl at freefriends.org>
* tlbuild.texi (Prerequisites): C++11 required by HarfBuzz;
Modified: branches/stable/source/src/doc/Makefile.in
===================================================================
--- branches/stable/source/src/doc/Makefile.in 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/doc/Makefile.in 2022-11-14 21:05:34 UTC (rev 884)
@@ -107,6 +107,7 @@
$(top_srcdir)/m4/kpse-options.m4 \
$(top_srcdir)/m4/kpse-pixman-flags.m4 \
$(top_srcdir)/m4/kpse-pkgs.m4 \
+ $(top_srcdir)/m4/kpse-potrace-flags.m4 \
$(top_srcdir)/m4/kpse-pplib-flags.m4 \
$(top_srcdir)/m4/kpse-ptexenc-flags.m4 \
$(top_srcdir)/m4/kpse-setup.m4 \
@@ -186,6 +187,7 @@
$(top_srcdir)/libs/cairo/ac/withenable.ac \
$(top_srcdir)/libs/pixman/ac/withenable.ac \
$(top_srcdir)/libs/gd/ac/withenable.ac \
+ $(top_srcdir)/libs/potrace/ac/withenable.ac \
$(top_srcdir)/libs/freetype2/ac/withenable.ac \
$(top_srcdir)/libs/libpng/ac/withenable.ac \
$(top_srcdir)/libs/libpaper/ac/withenable.ac \
@@ -201,6 +203,7 @@
$(top_srcdir)/libs/libpaper/ac/libpaper.ac \
$(top_srcdir)/libs/libpng/ac/libpng.ac \
$(top_srcdir)/libs/freetype2/ac/freetype2.ac \
+ $(top_srcdir)/libs/potrace/ac/potrace.ac \
$(top_srcdir)/libs/gd/ac/gd.ac \
$(top_srcdir)/libs/pixman/ac/pixman.ac \
$(top_srcdir)/libs/cairo/ac/cairo.ac \
Modified: branches/stable/source/src/doc/tlbuild.info
===================================================================
--- branches/stable/source/src/doc/tlbuild.info 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/doc/tlbuild.info 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,4 +1,4 @@
-This is tlbuild.info, produced by makeinfo version 6.8 from
+This is tlbuild.info, produced by makeinfo version 5.1 from
tlbuild.texi.
This file documents the TeX Live build system and more.
@@ -59,7 +59,7 @@
1 Introduction
**************
-This manual (dated March 2022) corresponds to the TeX Live 2022 release.
+This manual (dated May 2022) corresponds to the TeX Live 2022 release.
This manual is aimed at system installers and programmers, and
focuses on how to configure, build, and develop the TeX Live (TL)
@@ -325,8 +325,8 @@
=====================
To build one package, the basic idea is to use the 'configure' option
-'--disable-all-pkgs' (*note --disable-all-pkgs::). Then all program and
-library modules are configured but none are made. However, the
+'--disable-all-pkgs' (*note '--disable-all-pkgs'::). Then all program
+and library modules are configured but none are made. However, the
'Makefile's still contain all build rules and dependencies and can be
invoked to build an individual program or library, first building any
required libraries.
@@ -355,7 +355,7 @@
cd texk/dvipdfm-x
make check
- # Run the new binary in the buil tree, finding support files
+ # Run the new binary in the build tree, finding support files
# in a separate tree for a TeX Live release YYYY
# (Bourne shell syntax):
TEXMFROOT=/usr/local/texlive/YYYY \
@@ -1108,13 +1108,13 @@
* Menu:
-* png library:: 'libs/libpng'
-* zlib library:: 'libs/zlib'
-* freetype library:: 'libs/freetype2'
-* kpathsea library:: 'texk/kpathsea'
+* 'png' library:: 'libs/libpng'
+* 'zlib' library:: 'libs/zlib'
+* 'freetype' library:: 'libs/freetype2'
+* 'kpathsea' library:: 'texk/kpathsea'
-File: tlbuild.info, Node: png library, Next: zlib library, Up: Library modules
+File: tlbuild.info, Node: 'png' library, Next: 'zlib' library, Up: Library modules
6.4.1 The 'png' library in 'libs/libpng'
----------------------------------------
@@ -1170,7 +1170,7 @@
flags required for the system library.
-File: tlbuild.info, Node: zlib library, Next: freetype library, Prev: png library, Up: Library modules
+File: tlbuild.info, Node: 'zlib' library, Next: 'freetype' library, Prev: 'png' library, Up: Library modules
6.4.2 The 'zlib' library in 'libs/zlib'
---------------------------------------
@@ -1182,7 +1182,7 @@
locations of the 'zlib' headers and/or library.
-File: tlbuild.info, Node: freetype library, Next: kpathsea library, Prev: zlib library, Up: Library modules
+File: tlbuild.info, Node: 'freetype' library, Next: 'kpathsea' library, Prev: 'zlib' library, Up: Library modules
6.4.3 The 'freetype' library in 'libs/freetype2'
------------------------------------------------
@@ -1198,7 +1198,7 @@
'freetype-config'.
-File: tlbuild.info, Node: kpathsea library, Prev: freetype library, Up: Library modules
+File: tlbuild.info, Node: 'kpathsea' library, Prev: 'freetype' library, Up: Library modules
6.4.4 The 'kpathsea' library in 'texk/kpathsea'
-----------------------------------------------
@@ -1236,13 +1236,13 @@
* Menu:
-* t1utils package:: 'utils/t1utils'
-* xindy package:: 'utils/xindy'
-* xdvik package:: 'texk/xdvik'
-* asymptote:: 'utils/asymptote'
+* 't1utils' package:: 'utils/t1utils'
+* 'xindy' package:: 'utils/xindy'
+* 'xdvik' package:: 'texk/xdvik'
+* 'asymptote':: 'utils/asymptote'
-File: tlbuild.info, Node: t1utils package, Next: xindy package, Up: Program modules
+File: tlbuild.info, Node: 't1utils' package, Next: 'xindy' package, Up: Program modules
6.5.1 The 't1utils' package in 'utils/t1utils'
----------------------------------------------
@@ -1258,7 +1258,7 @@
configure option '--disable-t1utils'.
-File: tlbuild.info, Node: xindy package, Next: xdvik package, Prev: t1utils package, Up: Program modules
+File: tlbuild.info, Node: 'xindy' package, Next: 'xdvik' package, Prev: 't1utils' package, Up: Program modules
6.5.2 The 'xindy' package in 'utils/xindy'
------------------------------------------
@@ -1284,7 +1284,7 @@
included by 'configure.ac'.
-File: tlbuild.info, Node: xdvik package, Next: asymptote, Prev: xindy package, Up: Program modules
+File: tlbuild.info, Node: 'xdvik' package, Next: 'asymptote', Prev: 'xindy' package, Up: Program modules
6.5.3 The 'xdvik' package in 'texk/xdvik'
-----------------------------------------
@@ -1309,7 +1309,7 @@
also seen at the top level.
-File: tlbuild.info, Node: asymptote, Prev: xdvik package, Up: Program modules
+File: tlbuild.info, Node: 'asymptote', Prev: 'xdvik' package, Up: Program modules
6.5.4 The subdirectory 'utils/asymptote'
----------------------------------------
@@ -1589,21 +1589,21 @@
* Menu:
-* --disable-native-texlive-build::
-* --prefix --bindir ...::
-* --disable-largefile::
-* --disable-missing::
-* --enable-compiler-warnings=LEVEL::
-* --enable-cxx-runtime-hack::
-* --enable-maintainer-mode::
-* --enable-multiplatform::
-* --enable-shared::
-* --enable-silent-rules::
-* --without-ln-s::
-* --without-x::
+* '--disable-native-texlive-build'::
+* '--prefix' '--bindir' ...::
+* '--disable-largefile'::
+* '--disable-missing'::
+* '--enable-compiler-warnings='LEVEL::
+* '--enable-cxx-runtime-hack'::
+* '--enable-maintainer-mode'::
+* '--enable-multiplatform'::
+* '--enable-shared'::
+* '--enable-silent-rules'::
+* '--without-ln-s'::
+* '--without-x'::
-File: tlbuild.info, Node: --disable-native-texlive-build, Next: --prefix --bindir ..., Up: Global configure options
+File: tlbuild.info, Node: '--disable-native-texlive-build', Next: '--prefix' '--bindir' ..., Up: Global configure options
7.1.1 '--disable-native-texlive-build'
--------------------------------------
@@ -1624,7 +1624,7 @@
TL-specific adaptations, such as installation paths.
-File: tlbuild.info, Node: --prefix --bindir ..., Next: --disable-largefile, Prev: --disable-native-texlive-build, Up: Global configure options
+File: tlbuild.info, Node: '--prefix' '--bindir' ..., Next: '--disable-largefile', Prev: '--disable-native-texlive-build', Up: Global configure options
7.1.2 '--prefix', '--bindir', ...
---------------------------------
@@ -1637,7 +1637,7 @@
location: (automake)Staged Installs.).
-File: tlbuild.info, Node: --disable-largefile, Next: --disable-missing, Prev: --prefix --bindir ..., Up: Global configure options
+File: tlbuild.info, Node: '--disable-largefile', Next: '--disable-missing', Prev: '--prefix' '--bindir' ..., Up: Global configure options
7.1.3 '--disable-largefile'
---------------------------
@@ -1651,7 +1651,7 @@
'pdftex' or PostScript files created by 'dvips'.
-File: tlbuild.info, Node: --disable-missing, Next: --enable-compiler-warnings=LEVEL, Prev: --disable-largefile, Up: Global configure options
+File: tlbuild.info, Node: '--disable-missing', Next: '--enable-compiler-warnings='LEVEL, Prev: '--disable-largefile', Up: Global configure options
7.1.4 '--disable-missing'
-------------------------
@@ -1661,7 +1661,7 @@
when figuring out a specific (sub)set of modules to enable.
-File: tlbuild.info, Node: --enable-compiler-warnings=LEVEL, Next: --enable-cxx-runtime-hack, Prev: --disable-missing, Up: Global configure options
+File: tlbuild.info, Node: '--enable-compiler-warnings='LEVEL, Next: '--enable-cxx-runtime-hack', Prev: '--disable-missing', Up: Global configure options
7.1.5 '--enable-compiler-warnings='LEVEL
----------------------------------------
@@ -1674,7 +1674,7 @@
At present, these warning flags assume options from the GNU compilers.
-File: tlbuild.info, Node: --enable-cxx-runtime-hack, Next: --enable-maintainer-mode, Prev: --enable-compiler-warnings=LEVEL, Up: Global configure options
+File: tlbuild.info, Node: '--enable-cxx-runtime-hack', Next: '--enable-maintainer-mode', Prev: '--enable-compiler-warnings='LEVEL, Up: Global configure options
7.1.6 '--enable-cxx-runtime-hack'
---------------------------------
@@ -1684,7 +1684,7 @@
resulting binary. *Note Macros for compilers::.
-File: tlbuild.info, Node: --enable-maintainer-mode, Next: --enable-multiplatform, Prev: --enable-cxx-runtime-hack, Up: Global configure options
+File: tlbuild.info, Node: '--enable-maintainer-mode', Next: '--enable-multiplatform', Prev: '--enable-cxx-runtime-hack', Up: Global configure options
7.1.7 '--enable-maintainer-mode'
--------------------------------
@@ -1696,7 +1696,7 @@
'AM_MAINTAINER_MODE': (automake)maintainer-mode.
-File: tlbuild.info, Node: --enable-multiplatform, Next: --enable-shared, Prev: --enable-maintainer-mode, Up: Global configure options
+File: tlbuild.info, Node: '--enable-multiplatform', Next: '--enable-shared', Prev: '--enable-maintainer-mode', Up: Global configure options
7.1.8 '--enable-multiplatform'
------------------------------
@@ -1709,7 +1709,7 @@
subdirectories.
-File: tlbuild.info, Node: --enable-shared, Next: --enable-silent-rules, Prev: --enable-multiplatform, Up: Global configure options
+File: tlbuild.info, Node: '--enable-shared', Next: '--enable-silent-rules', Prev: '--enable-multiplatform', Up: Global configure options
7.1.9 '--enable-shared'
-----------------------
@@ -1719,7 +1719,7 @@
'--disable-native-texlive-build' must also be specified).
-File: tlbuild.info, Node: --enable-silent-rules, Next: --without-ln-s, Prev: --enable-shared, Up: Global configure options
+File: tlbuild.info, Node: '--enable-silent-rules', Next: '--without-ln-s', Prev: '--enable-shared', Up: Global configure options
7.1.10 '--enable-silent-rules'
------------------------------
@@ -1730,7 +1730,7 @@
'V=0' to get less, regardless of this option.
-File: tlbuild.info, Node: --without-ln-s, Next: --without-x, Prev: --enable-silent-rules, Up: Global configure options
+File: tlbuild.info, Node: '--without-ln-s', Next: '--without-x', Prev: '--enable-silent-rules', Up: Global configure options
7.1.11 '--without-ln-s'
-----------------------
@@ -1740,7 +1740,7 @@
anything useful, and might fail.
-File: tlbuild.info, Node: --without-x, Prev: --without-ln-s, Up: Global configure options
+File: tlbuild.info, Node: '--without-x', Prev: '--without-ln-s', Up: Global configure options
7.1.12 '--without-x'
--------------------
@@ -1757,18 +1757,18 @@
* Menu:
-* --enable-PROG --disable-PROG::
-* --disable-all-pkgs::
-* Configure options for texk/web2c::
-* Configure options for texk/bibtex-x::
-* Configure options for texk/dvipdfm-x::
-* Configure options for texk/dvisvgm::
-* Configure options for texk/texlive::
-* Configure options for texk/xdvik::
-* Configure options for utils/xindy::
+* '--enable-PROG' '--disable-PROG'::
+* '--disable-all-pkgs'::
+* Configure options for 'texk/web2c'::
+* Configure options for 'texk/bibtex-x'::
+* Configure options for 'texk/dvipdfm-x'::
+* Configure options for 'texk/dvisvgm'::
+* Configure options for 'texk/texlive'::
+* Configure options for 'texk/xdvik'::
+* Configure options for 'utils/xindy'::
-File: tlbuild.info, Node: --enable-PROG --disable-PROG, Next: --disable-all-pkgs, Up: Program-specific configure options
+File: tlbuild.info, Node: '--enable-PROG' '--disable-PROG', Next: '--disable-all-pkgs', Up: Program-specific configure options
7.2.1 '--enable-PROG', '--disable-PROG'
---------------------------------------
@@ -1776,7 +1776,7 @@
Do or do not build and install the program(s) of module 'PROG'.
-File: tlbuild.info, Node: --disable-all-pkgs, Next: Configure options for texk/web2c, Prev: --enable-PROG --disable-PROG, Up: Program-specific configure options
+File: tlbuild.info, Node: '--disable-all-pkgs', Next: Configure options for 'texk/web2c', Prev: '--enable-PROG' '--disable-PROG', Up: Program-specific configure options
7.2.2 '--disable-all-pkgs'
--------------------------
@@ -1793,7 +1793,7 @@
fragment.
-File: tlbuild.info, Node: Configure options for texk/web2c, Next: Configure options for texk/bibtex-x, Prev: --disable-all-pkgs, Up: Program-specific configure options
+File: tlbuild.info, Node: Configure options for 'texk/web2c', Next: Configure options for 'texk/bibtex-x', Prev: '--disable-all-pkgs', Up: Program-specific configure options
7.2.3 Configure options for 'texk/web2c'
----------------------------------------
@@ -1860,7 +1860,7 @@
Do not build the 'SyncTeX' library and tool.
-File: tlbuild.info, Node: Configure options for texk/bibtex-x, Next: Configure options for texk/dvipdfm-x, Prev: Configure options for texk/web2c, Up: Program-specific configure options
+File: tlbuild.info, Node: Configure options for 'texk/bibtex-x', Next: Configure options for 'texk/dvipdfm-x', Prev: Configure options for 'texk/web2c', Up: Program-specific configure options
7.2.4 Configure options for 'texk/bibtex-x'
-------------------------------------------
@@ -1876,7 +1876,7 @@
libraries).
-File: tlbuild.info, Node: Configure options for texk/dvipdfm-x, Next: Configure options for texk/dvisvgm, Prev: Configure options for texk/bibtex-x, Up: Program-specific configure options
+File: tlbuild.info, Node: Configure options for 'texk/dvipdfm-x', Next: Configure options for 'texk/dvisvgm', Prev: Configure options for 'texk/bibtex-x', Up: Program-specific configure options
7.2.5 Configure options for 'texk/dvipdfm-x'
--------------------------------------------
@@ -1894,7 +1894,7 @@
Do not build the 'xdvipdfmx' program.
-File: tlbuild.info, Node: Configure options for texk/dvisvgm, Next: Configure options for texk/texlive, Prev: Configure options for texk/dvipdfm-x, Up: Program-specific configure options
+File: tlbuild.info, Node: Configure options for 'texk/dvisvgm', Next: Configure options for 'texk/texlive', Prev: Configure options for 'texk/dvipdfm-x', Up: Program-specific configure options
7.2.6 Configure options for 'texk/dvisvgm'
------------------------------------------
@@ -1914,7 +1914,7 @@
Specify non-standard locations of the Ghostscript headers and library.
-File: tlbuild.info, Node: Configure options for texk/texlive, Next: Configure options for texk/xdvik, Prev: Configure options for texk/dvisvgm, Up: Program-specific configure options
+File: tlbuild.info, Node: Configure options for 'texk/texlive', Next: Configure options for 'texk/xdvik', Prev: Configure options for 'texk/dvisvgm', Up: Program-specific configure options
7.2.7 Configure options for 'texk/texlive'
------------------------------------------
@@ -1924,7 +1924,7 @@
the TL scripts required to run 'texlinks'.
-File: tlbuild.info, Node: Configure options for texk/xdvik, Next: Configure options for utils/xindy, Prev: Configure options for texk/texlive, Up: Program-specific configure options
+File: tlbuild.info, Node: Configure options for 'texk/xdvik', Next: Configure options for 'utils/xindy', Prev: Configure options for 'texk/texlive', Up: Program-specific configure options
7.2.8 Configure options for 'texk/xdvik'
----------------------------------------
@@ -1941,7 +1941,7 @@
a native TL build).
-File: tlbuild.info, Node: Configure options for utils/xindy, Prev: Configure options for texk/xdvik, Up: Program-specific configure options
+File: tlbuild.info, Node: Configure options for 'utils/xindy', Prev: Configure options for 'texk/xdvik', Up: Program-specific configure options
7.2.9 Configure options for 'utils/xindy'
-----------------------------------------
@@ -1987,10 +1987,10 @@
* Menu:
-* Configure options for kpathsea::
+* Configure options for 'kpathsea'::
-File: tlbuild.info, Node: Configure options for kpathsea, Up: Library-specific configure options
+File: tlbuild.info, Node: Configure options for 'kpathsea', Up: Library-specific configure options
7.3.1 Configure options for 'kpathsea'
--------------------------------------
@@ -2014,7 +2014,7 @@
(TFM file)
to generate the specified type of file dynamically. The default can be
-overridden by the user in any case (*note kpathsea library::).
+overridden by the user in any case (*note 'kpathsea' library::).
File: tlbuild.info, Node: Variables for configure, Prev: Library-specific configure options, Up: Configure options
@@ -5194,11 +5194,11 @@
* Menu:
-* tlmgr Machine-readable update and install output::
-* tlmgr Machine-readable option output::
+* tlmgr Machine-readable 'update' and 'install' output::
+* tlmgr Machine-readable 'option' output::
-File: tlbuild.info, Node: tlmgr Machine-readable update and install output, Next: tlmgr Machine-readable option output, Up: tlmgr MACHINE-READABLE OUTPUT
+File: tlbuild.info, Node: tlmgr Machine-readable 'update' and 'install' output, Next: tlmgr Machine-readable 'option' output, Up: tlmgr MACHINE-READABLE OUTPUT
B.12.1 Machine-readable 'update' and 'install' output
-----------------------------------------------------
@@ -5316,7 +5316,7 @@
The estimated total time.
-File: tlbuild.info, Node: tlmgr Machine-readable option output, Prev: tlmgr Machine-readable update and install output, Up: tlmgr MACHINE-READABLE OUTPUT
+File: tlbuild.info, Node: tlmgr Machine-readable 'option' output, Prev: tlmgr Machine-readable 'update' and 'install' output, Up: tlmgr MACHINE-READABLE OUTPUT
B.12.2 Machine-readable 'option' output
---------------------------------------
@@ -5437,114 +5437,116 @@
[index ]
* Menu:
-* $@ target in normal make rules: Prerequisites. (line 13)
-* --bindir configure option: --prefix --bindir ....
+* '$@' target in normal 'make' rules: Prerequisites. (line 13)
+* --bindir configure option: '--prefix' '--bindir' ....
(line 6)
-* --bindir configure option <1>: --enable-multiplatform.
+* --bindir configure option <1>: '--enable-multiplatform'.
(line 6)
* --build=HOST: Cross configuring. (line 6)
* --disable-all-packages: Build one package. (line 6)
-* --disable-all-pkgs: --disable-all-pkgs. (line 6)
-* --disable-bibtex8: Configure options for texk/bibtex-x.
+* --disable-all-pkgs: '--disable-all-pkgs'.
+ (line 6)
+* --disable-bibtex8: Configure options for 'texk/bibtex-x'.
(line 9)
-* --disable-bibtexu: Configure options for texk/bibtex-x.
+* --disable-bibtexu: Configure options for 'texk/bibtex-x'.
(line 12)
-* --disable-dump-share: Configure options for texk/web2c.
+* --disable-dump-share: Configure options for 'texk/web2c'.
(line 27)
-* --disable-dvipdfmx: Configure options for texk/dvipdfm-x.
+* --disable-dvipdfmx: Configure options for 'texk/dvipdfm-x'.
(line 12)
-* --disable-etex-synctex: Configure options for texk/web2c.
+* --disable-etex-synctex: Configure options for 'texk/web2c'.
(line 59)
-* --disable-ipc: Configure options for texk/web2c.
+* --disable-ipc: Configure options for 'texk/web2c'.
(line 31)
-* --disable-largefile: --disable-largefile. (line 6)
-* --disable-linked-scripts: Configure options for texk/texlive.
+* --disable-largefile: '--disable-largefile'.
(line 6)
-* --disable-mf-nowin: Configure options for texk/web2c.
+* --disable-linked-scripts: Configure options for 'texk/texlive'.
+ (line 6)
+* --disable-mf-nowin: Configure options for 'texk/web2c'.
(line 34)
-* --disable-missing: --disable-missing. (line 6)
-* --disable-native-texlive-build: --disable-native-texlive-build.
+* --disable-missing: '--disable-missing'. (line 6)
+* --disable-native-texlive-build: '--disable-native-texlive-build'.
(line 6)
-* --disable-PROG: --enable-PROG --disable-PROG.
+* --disable-PROG: '--enable-PROG' '--disable-PROG'.
(line 6)
-* --disable-synctex: Configure options for texk/web2c.
+* --disable-synctex: Configure options for 'texk/web2c'.
(line 64)
-* --disable-tex: Configure options for texk/web2c.
+* --disable-tex: Configure options for 'texk/web2c'.
(line 37)
-* --disable-web-progs: Configure options for texk/web2c.
+* --disable-web-progs: Configure options for 'texk/web2c'.
(line 41)
-* --disable-xdvipdfmx: Configure options for texk/dvipdfm-x.
+* --disable-xdvipdfmx: Configure options for 'texk/dvipdfm-x'.
(line 15)
-* --enable-*win for Metafont window support: Configure options for texk/web2c.
+* --enable-*win for Metafont window support: Configure options for 'texk/web2c'.
(line 55)
-* --enable-auto-core: Configure options for texk/web2c.
+* --enable-auto-core: Configure options for 'texk/web2c'.
(line 45)
-* --enable-compiler-warnings=LEVEL: --enable-compiler-warnings=LEVEL.
+* --enable-compiler-warnings=LEVEL: '--enable-compiler-warnings='LEVEL.
(line 6)
* --enable-cxx-runtime-hack: Macros for compilers.
(line 29)
-* --enable-etex: Configure options for texk/web2c.
+* --enable-etex: Configure options for 'texk/web2c'.
(line 37)
-* --enable-libtool-hack: Configure options for texk/web2c.
+* --enable-libtool-hack: Configure options for 'texk/web2c'.
(line 50)
* --enable-maintainer-mode: Build system tools. (line 28)
-* --enable-maintainer-mode <1>: --enable-maintainer-mode.
+* --enable-maintainer-mode <1>: '--enable-maintainer-mode'.
(line 6)
* --enable-missing to ignore dependencies: Build one package. (line 94)
-* --enable-mktextfm-default: kpathsea library. (line 18)
-* --enable-multiplatform: --enable-multiplatform.
+* --enable-mktextfm-default: 'kpathsea' library. (line 18)
+* --enable-multiplatform: '--enable-multiplatform'.
(line 6)
-* --enable-PROG: --enable-PROG --disable-PROG.
+* --enable-PROG: '--enable-PROG' '--disable-PROG'.
(line 6)
-* --enable-shared: --enable-shared. (line 6)
-* --enable-silent-rules: --enable-silent-rules.
+* --enable-shared: '--enable-shared'. (line 6)
+* --enable-silent-rules: '--enable-silent-rules'.
(line 6)
-* --enable-tex-synctex: Configure options for texk/web2c.
+* --enable-tex-synctex: Configure options for 'texk/web2c'.
(line 59)
-* --enable-texlive-build: --disable-native-texlive-build.
+* --enable-texlive-build: '--disable-native-texlive-build'.
(line 15)
-* --enable-xi2-scrolling: Configure options for texk/xdvik.
+* --enable-xi2-scrolling: Configure options for 'texk/xdvik'.
(line 13)
-* --enable-xindy-docs: Configure options for utils/xindy.
+* --enable-xindy-docs: Configure options for 'utils/xindy'.
(line 10)
-* --enable-xindy-rules: Configure options for utils/xindy.
+* --enable-xindy-rules: Configure options for 'utils/xindy'.
(line 6)
* --host=HOST: Cross configuring. (line 6)
-* --libdir configure option: --enable-multiplatform.
+* --libdir configure option: '--enable-multiplatform'.
(line 6)
* --no-print-directory GNU make option: Build one engine. (line 56)
-* --prefix configure option: --prefix --bindir ....
+* --prefix configure option: '--prefix' '--bindir' ....
(line 6)
-* --with-banner-add=STR: Configure options for texk/web2c.
+* --with-banner-add=STR: Configure options for 'texk/web2c'.
(line 6)
-* --with-clisp-runtime=FILENAME: Configure options for utils/xindy.
+* --with-clisp-runtime=FILENAME: Configure options for 'utils/xindy'.
(line 14)
-* --with-editor=CMD: Configure options for texk/web2c.
+* --with-editor=CMD: Configure options for 'texk/web2c'.
(line 11)
-* --with-fontconfig-includes=DIR: Configure options for texk/web2c.
+* --with-fontconfig-includes=DIR: Configure options for 'texk/web2c'.
(line 16)
-* --with-fontconfig-libdir=DIR: Configure options for texk/web2c.
+* --with-fontconfig-libdir=DIR: Configure options for 'texk/web2c'.
(line 16)
-* --with-gs=FILENAME: Configure options for texk/xdvik.
+* --with-gs=FILENAME: Configure options for 'texk/xdvik'.
(line 6)
* --with-LIB-includes=DIR, -libdir: Library-specific configure options.
(line 16)
-* --with-libgs-includes, -libdir: Configure options for texk/dvisvgm.
+* --with-libgs-includes, -libdir: Configure options for 'texk/dvisvgm'.
(line 17)
-* --with-system-kpathsea: kpathsea library. (line 13)
+* --with-system-kpathsea: 'kpathsea' library. (line 13)
* --with-system-LIB: Adding a new generic library module.
(line 34)
* --with-system-LIB <1>: Library-specific configure options.
(line 9)
-* --with-system-libgs: Configure options for texk/dvisvgm.
+* --with-system-libgs: Configure options for 'texk/dvisvgm'.
(line 6)
-* --with-xdvi-x-toolkit: xdvik package. (line 21)
-* --with-xdvi-x-toolkit=KIT: Configure options for texk/xdvik.
+* --with-xdvi-x-toolkit: 'xdvik' package. (line 21)
+* --with-xdvi-x-toolkit=KIT: Configure options for 'texk/xdvik'.
(line 9)
-* --without-libgs: Configure options for texk/dvisvgm.
+* --without-libgs: Configure options for 'texk/dvisvgm'.
(line 12)
-* --without-ln-s: --without-ln-s. (line 6)
-* --without-x: --without-x. (line 6)
+* --without-ln-s: '--without-ln-s'. (line 6)
+* --without-x: '--without-x'. (line 6)
* -C configure option: Build in parallel. (line 11)
* -j make option: Build in parallel. (line 6)
* ac/withenable.ac: Adding a new program module.
@@ -5558,14 +5560,14 @@
* adding a new TeX-specific library: Adding a new TeX-specific library module.
(line 6)
* adding to TeX Live: Extending TeX Live. (line 6)
-* am/ top-level directory: Top-level directories.
+* 'am/' top-level directory: Top-level directories.
(line 14)
* ANSI C: Declarations and definitions.
(line 6)
-* ApplicationServices Mac framework, required by xetex: Prerequisites.
+* 'ApplicationServices' Mac framework, required by 'xetex': Prerequisites.
(line 40)
* asymptote: Linked scripts. (line 23)
-* asymptote <1>: asymptote. (line 6)
+* asymptote <1>: 'asymptote'. (line 6)
* Autoconf: Overview of build system.
(line 6)
* autoconf macros: Autoconf macros. (line 6)
@@ -5574,11 +5576,11 @@
* autoreconf, for new program: Adding a new program module.
(line 76)
* biber: Linked scripts. (line 23)
-* bibtex-x: Configure options for texk/bibtex-x.
+* bibtex-x: Configure options for 'texk/bibtex-x'.
(line 6)
-* bibtex8: Configure options for texk/bibtex-x.
+* bibtex8: Configure options for 'texk/bibtex-x'.
(line 6)
-* bibtexu: Configure options for texk/bibtex-x.
+* bibtexu: Configure options for 'texk/bibtex-x'.
(line 6)
* BSD distro: Distro builds. (line 6)
* build directory, required: Building. (line 17)
@@ -5589,7 +5591,7 @@
* Build script: Building. (line 6)
* build system, design of: Overview of build system.
(line 6)
-* build-aux/ top-level directory: Top-level directories.
+* 'build-aux/' top-level directory: Top-level directories.
(line 30)
* BUILDCC, BUILDCFLAGS, ...: Cross configuring. (line 42)
* building: Building. (line 6)
@@ -5601,8 +5603,8 @@
(line 6)
* C99, avoided: Declarations and definitions.
(line 6)
-* cache file, for configure: Build in parallel. (line 11)
-* cache for configure: Build in parallel. (line 6)
+* cache file, for 'configure': Build in parallel. (line 11)
+* cache for 'configure': Build in parallel. (line 6)
* callexe.c: Macros for Windows. (line 32)
* CC: Variables for configure.
(line 10)
@@ -5616,45 +5618,45 @@
(line 18)
* CLISP: Variables for configure.
(line 17)
-* CLISP <1>: Configure options for utils/xindy.
+* CLISP <1>: Configure options for 'utils/xindy'.
(line 14)
-* clisp, required by xindy: Prerequisites. (line 44)
-* Cocoa Mac framework, required by xetex: Prerequisites. (line 40)
+* 'clisp', required by 'xindy': Prerequisites. (line 44)
+* 'Cocoa' Mac framework, required by 'xetex': Prerequisites. (line 40)
* coding conventions: Coding conventions. (line 6)
* compilers, C and C++11: Prerequisites. (line 6)
* config.guess, config.sub, ...: Top-level directories.
(line 30)
-* configure options: Configure options. (line 6)
-* configure options, for bibtex-x: Configure options for texk/bibtex-x.
+* 'configure' options: Configure options. (line 6)
+* 'configure' options, for 'bibtex-x': Configure options for 'texk/bibtex-x'.
(line 6)
-* configure options, for dvipdfm-x: Configure options for texk/dvipdfm-x.
+* 'configure' options, for 'dvipdfm-x': Configure options for 'texk/dvipdfm-x'.
(line 6)
-* configure options, for dvisvgm: Configure options for texk/dvisvgm.
+* 'configure' options, for 'dvisvgm': Configure options for 'texk/dvisvgm'.
(line 6)
-* configure options, for kpathsea: Configure options for kpathsea.
+* 'configure' options, for 'kpathsea': Configure options for 'kpathsea'.
(line 6)
-* configure options, for texk/texlive: Configure options for texk/texlive.
+* 'configure' options, for 'texk/texlive': Configure options for 'texk/texlive'.
(line 6)
-* configure options, for web2c: Configure options for texk/web2c.
+* 'configure' options, for 'web2c': Configure options for 'texk/web2c'.
(line 6)
-* configure options, for xdvik: Configure options for texk/xdvik.
+* 'configure' options, for 'xdvik': Configure options for 'texk/xdvik'.
(line 6)
-* configure options, for xindy: Configure options for utils/xindy.
+* 'configure' options, for 'xindy': Configure options for 'utils/xindy'.
(line 6)
-* configure options, global: Global configure options.
+* 'configure' options, global: Global configure options.
(line 6)
-* configure options, library-specific: Library-specific configure options.
+* 'configure' options, library-specific: Library-specific configure options.
(line 6)
-* configure options, program-specific: Program-specific configure options.
+* 'configure' options, program-specific: Program-specific configure options.
(line 6)
-* configure problems, work around by removing: Build one package.
+* 'configure' problems, work around by removing: Build one package.
(line 106)
-* configure variables: Variables for configure.
+* 'configure' variables: Variables for configure.
(line 6)
* configure.ac: Adding a new program module.
(line 45)
* configuring, for cross compilation: Cross configuring. (line 6)
-* const: Const. (line 6)
+* 'const': Const. (line 6)
* continuous integration: Continuous integration.
(line 6)
* conventions, coding: Coding conventions. (line 6)
@@ -5663,7 +5665,7 @@
* cross compilation: Cross compilation. (line 6)
* cross compilation configuring: Cross configuring. (line 6)
* cross compilation problems: Cross problems. (line 6)
-* cross compilation, with host binary: xdvik package. (line 14)
+* cross compilation, with host binary: 'xdvik' package. (line 14)
* ctangle: Cross problems. (line 26)
* CXX: Variables for configure.
(line 11)
@@ -5673,7 +5675,7 @@
* declarations before statements, avoiding: Declarations and definitions.
(line 6)
* dependencies, with several output files: Build in parallel. (line 6)
-* DESTDIR: --prefix --bindir ....
+* DESTDIR: '--prefix' '--bindir' ....
(line 9)
* directories, for installation: Installation directories.
(line 6)
@@ -5680,31 +5682,32 @@
* directories, top-level: Top-level directories.
(line 6)
* discards qualifiers warning: Const. (line 30)
-* dist and distcheck targets for make: Build distribution. (line 6)
+* 'dist' and 'distcheck' targets for 'make': Build distribution.
+ (line 6)
* distribution tarball, making: Build distribution. (line 6)
* distro, building for: Distro builds. (line 6)
-* dvipdfm-x: Configure options for texk/dvipdfm-x.
+* dvipdfm-x: Configure options for 'texk/dvipdfm-x'.
(line 6)
-* dvipdfmx: Configure options for texk/dvipdfm-x.
+* dvipdfmx: Configure options for 'texk/dvipdfm-x'.
(line 6)
-* dvisvgm: Configure options for texk/dvisvgm.
+* dvisvgm: Configure options for 'texk/dvisvgm'.
(line 6)
-* dvisvgm, requires C++11: Prerequisites. (line 17)
+* 'dvisvgm', requires C++11: Prerequisites. (line 17)
* engine, adding new: Adding a new engine. (line 6)
* engine, building one: Build one engine. (line 6)
-* environment variables, for configure: Configure options. (line 16)
-* exec_prefix: --enable-multiplatform.
+* environment variables, for 'configure': Configure options. (line 16)
+* exec_prefix: '--enable-multiplatform'.
(line 6)
* extending TeX Live: Extending TeX Live. (line 6)
-* extern functions: Declarations and definitions.
+* 'extern' functions: Declarations and definitions.
(line 41)
* flags, macros for library and header: Macros for library and header flags.
(line 6)
-* fontconfig library, required by xetex: Prerequisites. (line 40)
-* freetype cross compiling: Cross problems. (line 13)
-* freetype library: freetype library. (line 6)
-* FreeType, requires gmake: Prerequisites. (line 13)
-* freetype-config: freetype library. (line 13)
+* 'fontconfig' library, required by 'xetex': Prerequisites. (line 40)
+* 'freetype' cross compiling: Cross problems. (line 13)
+* freetype library: 'freetype' library. (line 6)
+* FreeType, requires 'gmake': Prerequisites. (line 13)
+* freetype-config: 'freetype' library. (line 13)
* freetype-config <1>: Variables for configure.
(line 24)
* FT2_CONFIG: Variables for configure.
@@ -5714,14 +5717,14 @@
(line 6)
* generic library module, adding: Adding a new generic library module.
(line 6)
-* Ghostscript location for Xdvik: Configure options for texk/xdvik.
+* Ghostscript location for Xdvik: Configure options for 'texk/xdvik'.
(line 6)
* git-svn: Transfer from Subversion to Github.
(line 6)
-* global configure options: Global configure options.
+* global 'configure' options: Global configure options.
(line 6)
-* gmake, required: Prerequisites. (line 13)
-* GNU make, required: Prerequisites. (line 13)
+* 'gmake', required: Prerequisites. (line 13)
+* GNU 'make', required: Prerequisites. (line 13)
* GNU tools, needed for building: Build system tools. (line 6)
* GNU/Linux distro: Distro builds. (line 6)
* Gnulib, used for common files: Top-level directories.
@@ -5736,23 +5739,23 @@
* ICU_CONFIG: Variables for configure.
(line 22)
* infrastructure, tools needed for: Build system tools. (line 6)
-* inst/ top-level directory: Top-level directories.
+* 'inst/' top-level directory: Top-level directories.
(line 39)
* install-tl, TeX Live installer: Installing. (line 8)
* installation directories: Installation directories.
(line 6)
* installing: Installing. (line 6)
-* interprocess communication: Configure options for texk/web2c.
+* interprocess communication: Configure options for 'texk/web2c'.
(line 31)
* introduction: Introduction. (line 6)
-* iteration through sources, by configure and make: Build iteration.
+* iteration through sources, by 'configure' and 'make': Build iteration.
(line 6)
-* kpathsea library: kpathsea library. (line 6)
-* kpathsea.ac: kpathsea library. (line 18)
-* kpse-libpng-flags.m4: png library. (line 45)
+* kpathsea library: 'kpathsea' library. (line 6)
+* kpathsea.ac: 'kpathsea' library. (line 18)
+* kpse-libpng-flags.m4: 'png' library. (line 46)
* kpse-pkgs.m4: Overview of build system.
(line 30)
-* kpse-zlib-flags.m4: zlib library. (line 6)
+* kpse-zlib-flags.m4: 'zlib' library. (line 6)
* kpsewhich: Variables for configure.
(line 30)
* KPSEWHICH: Variables for configure.
@@ -5791,7 +5794,7 @@
(line 8)
* KPSE_LIBPNG_FLAGS: Macros for library and header flags.
(line 10)
-* KPSE_LIBPNG_FLAGS <1>: png library. (line 45)
+* KPSE_LIBPNG_FLAGS <1>: 'png' library. (line 46)
* kpse_libs_pkgs: Adding a new generic library module.
(line 6)
* KPSE_LIB_FLAGS: Macros for library and header flags.
@@ -5807,10 +5810,10 @@
(line 6)
* kpse_texlibs_pkgs: Adding a new TeX-specific library module.
(line 11)
-* KPSE_TRY_LIB: png library. (line 17)
+* KPSE_TRY_LIB: 'png' library. (line 18)
* KPSE_TRY_LIB <1>: Adding a new generic library module.
(line 20)
-* KPSE_TRY_LIBXX: png library. (line 30)
+* KPSE_TRY_LIBXX: 'png' library. (line 31)
* KPSE_TRY_LIBXX <1>: Adding a new generic library module.
(line 20)
* kpse_utils_pkgs: Adding a new program module.
@@ -5820,44 +5823,46 @@
(line 11)
* KPSE_WITH_TEXLIB: Adding a new TeX-specific library module.
(line 14)
-* large file support: --disable-largefile. (line 6)
+* large file support: '--disable-largefile'.
+ (line 6)
* LATEX: Variables for configure.
(line 40)
* layout of sources: Layout and infrastructure.
(line 6)
-* LFS (large file support): --disable-largefile. (line 6)
-* libexpat, dependency of libfontconfig: Configure options for texk/web2c.
+* LFS (large file support): '--disable-largefile'.
+ (line 6)
+* libexpat, dependency of 'libfontconfig': Configure options for 'texk/web2c'.
(line 50)
-* libfontconfig, hack for avoiding linking dependencies: Configure options for texk/web2c.
+* libfontconfig, hack for avoiding linking dependencies: Configure options for 'texk/web2c'.
(line 50)
* libfreetype: Variables for configure.
(line 24)
-* libfreetype, and const: Const. (line 21)
-* libpng library: png library. (line 6)
+* 'libfreetype', and 'const': Const. (line 21)
+* libpng library: 'png' library. (line 6)
* library module, generic, adding: Adding a new generic library module.
(line 6)
* library module, TeX-specific, adding: Adding a new TeX-specific library module.
(line 6)
* library modules: Library modules. (line 6)
-* library-specific configure options: Library-specific configure options.
+* library-specific 'configure' options: Library-specific configure options.
(line 6)
-* libsigsegv, required by xindy: Prerequisites. (line 44)
+* 'libsigsegv', required by 'xindy': Prerequisites. (line 44)
* libstc++, statically linking: Macros for compilers.
(line 29)
* Libtool: Overview of build system.
(line 6)
-* libtool, hack for avoiding excessive linking: Configure options for texk/web2c.
+* libtool, hack for avoiding excessive linking: Configure options for 'texk/web2c'.
(line 50)
-* libXt: Configure options for texk/web2c.
+* libXt: Configure options for 'texk/web2c'.
(line 22)
* linked scripts: Linked scripts. (line 6)
* linking C++ libraries statically: Macros for compilers.
(line 29)
-* lisp.run, lisp.exe: Configure options for utils/xindy.
+* lisp.run, lisp.exe: Configure options for 'utils/xindy'.
(line 14)
-* LittleEndian architectures: Configure options for texk/web2c.
+* LittleEndian architectures: Configure options for 'texk/web2c'.
(line 27)
-* m4/ top-level directory: Top-level directories.
+* 'm4/' top-level directory: Top-level directories.
(line 14)
* macros, for compilers: Macros for compilers.
(line 6)
@@ -5872,19 +5877,19 @@
* MAKE: Variables for configure.
(line 33)
* make -t: Build system tools. (line 43)
-* make rules, verbose vs. silent: --enable-silent-rules.
+* 'make' rules, verbose vs. silent: '--enable-silent-rules'.
(line 6)
* Makefile.am: Adding a new program module.
(line 46)
-* mf-nowin: Configure options for texk/web2c.
+* mf-nowin: Configure options for 'texk/web2c'.
(line 34)
-* mingw32: Cross configuring. (line 27)
+* 'mingw32': Cross configuring. (line 27)
* MINGW32, Automake conditional: Macros for Windows. (line 20)
-* mktex.ac: kpathsea library. (line 18)
-* mktextfm: kpathsea library. (line 18)
+* mktex.ac: 'kpathsea' library. (line 18)
+* mktextfm: 'kpathsea' library. (line 18)
* modules, for libraries: Library modules. (line 6)
* modules, for programs: Program modules. (line 6)
-* motif: Configure options for texk/xdvik.
+* motif: Configure options for 'texk/xdvik'.
(line 9)
* native cross compilation: Cross compilation. (line 10)
* NEWPROG-SRC, original source subdirectory: Adding a new program module.
@@ -5892,7 +5897,7 @@
* OBJCXX=OBJC-COMPILER: Build one package. (line 77)
* one engine, building: Build one engine. (line 6)
* one package, building: Build one package. (line 6)
-* OpenGL, required for Asymptote: asymptote. (line 6)
+* OpenGL, required for Asymptote: 'asymptote'. (line 6)
* operating system distribution, building for: Distro builds. (line 6)
* otangle: Cross problems. (line 26)
* overall build process: Building. (line 6)
@@ -5899,27 +5904,29 @@
* parallel build: Build in parallel. (line 6)
* paths, for installation: Installation directories.
(line 6)
-* PDF files, size of: --disable-largefile. (line 11)
+* PDF files, size of: '--disable-largefile'.
+ (line 11)
* PDFLATEX: Variables for configure.
(line 41)
* PERL: Variables for configure.
(line 39)
-* perl, required by web2c, etc.: Prerequisites. (line 29)
+* 'perl', required by 'web2c', etc.: Prerequisites. (line 29)
* PKG_CONFIG: Variables for configure.
(line 23)
* plain.tex, not in source tree: Installing. (line 8)
-* png library: png library. (line 6)
-* PostScript files, size of: --disable-largefile. (line 11)
+* png library: 'png' library. (line 6)
+* PostScript files, size of: '--disable-largefile'.
+ (line 11)
* Preining, Norbert: Distro builds. (line 54)
-* preloaded binaries: Configure options for texk/web2c.
+* preloaded binaries: Configure options for 'texk/web2c'.
(line 45)
* prerequisites for building: Prerequisites. (line 6)
* program module, adding: Adding a new program module.
(line 6)
* program modules: Program modules. (line 6)
-* program-specific configure options: Program-specific configure options.
+* program-specific 'configure' options: Program-specific configure options.
(line 6)
-* proxy build system: png library. (line 35)
+* proxy build system: 'png' library. (line 36)
* Python, required by ICU: Prerequisites. (line 23)
* reautoconf: Build system tools. (line 28)
* reautoconf, for new program: Adding a new program module.
@@ -5928,7 +5935,7 @@
* requirements for building: Prerequisites. (line 6)
* runscript.exe: Macros for Windows. (line 25)
* scripts, linked and not maintained: Linked scripts. (line 6)
-* scrolling, smooth: Configure options for texk/xdvik.
+* scrolling, smooth: Configure options for 'texk/xdvik'.
(line 13)
* SED: Variables for configure.
(line 34)
@@ -5935,7 +5942,8 @@
* setup macros, general: General setup macros.
(line 6)
* shared libraries, using vs. avoiding: Distro builds. (line 11)
-* size of PDF and PS files: --disable-largefile. (line 11)
+* size of PDF and PS files: '--disable-largefile'.
+ (line 11)
* size of source tree: Build one package. (line 63)
* source code declarations: Declarations and definitions.
(line 6)
@@ -5943,8 +5951,8 @@
* source tree: Layout and infrastructure.
(line 6)
* squeeze: Cross problems. (line 13)
-* squeeze/configure.ac: xdvik package. (line 14)
-* static functions: Declarations and definitions.
+* squeeze/configure.ac: 'xdvik' package. (line 14)
+* 'static' functions: Declarations and definitions.
(line 35)
* static linking for C++: Macros for compilers.
(line 29)
@@ -5953,12 +5961,12 @@
* Subversion repository: Build system tools. (line 38)
* support files, separate from build: Installing. (line 8)
* symlinks, used for scripts: Linked scripts. (line 6)
-* synctex: Configure options for texk/web2c.
+* synctex: Configure options for 'texk/web2c'.
(line 59)
-* synctex <1>: Configure options for texk/web2c.
+* synctex <1>: Configure options for 'texk/web2c'.
(line 64)
* system distribution, building for: Distro builds. (line 6)
-* t1utils package: t1utils package. (line 6)
+* t1utils package: 't1utils' package. (line 6)
* tangle: Cross problems. (line 26)
* tests, running: Overview of build system.
(line 6)
@@ -5985,13 +5993,13 @@
* use-commit-times, Subversion: Build system tools. (line 38)
* variable declarations, in source code: Declarations and definitions.
(line 52)
-* variables for configure: Variables for configure.
+* variables for 'configure': Variables for configure.
(line 6)
* warning, discards qualifiers: Const. (line 30)
* WARNING_C[XX]FLAGS: Macros for compilers.
(line 9)
* web2c program: Cross problems. (line 13)
-* web2c.ac: Configure options for texk/web2c.
+* web2c.ac: Configure options for 'texk/web2c'.
(line 37)
* wget: Linked scripts. (line 23)
* WIN32, Automake conditional: Macros for Windows. (line 16)
@@ -6000,33 +6008,33 @@
* Windows, macros for: Macros for Windows. (line 6)
* withenable.ac, for new modules: Adding a new program module.
(line 14)
-* Work/ top-level directory: Top-level directories.
+* 'Work/' top-level directory: Top-level directories.
(line 39)
* wrapper binary for scripts on Windows: Linked scripts. (line 6)
-* wrapper build system: freetype library. (line 6)
-* X toolkit: Configure options for texk/web2c.
+* wrapper build system: 'freetype' library. (line 6)
+* X toolkit: Configure options for 'texk/web2c'.
(line 22)
* X11 development, required by X clients: Prerequisites. (line 36)
-* X11 headers, and const: Const. (line 21)
-* xasy: asymptote. (line 6)
-* xaw: Configure options for texk/xdvik.
+* X11 headers, and 'const': Const. (line 21)
+* xasy: 'asymptote'. (line 6)
+* xaw: Configure options for 'texk/xdvik'.
(line 9)
-* xdvik: xdvik package. (line 6)
-* xdvik <1>: Configure options for texk/xdvik.
+* xdvik: 'xdvik' package. (line 6)
+* xdvik <1>: Configure options for 'texk/xdvik'.
(line 6)
-* xdvipdfmx: Configure options for texk/dvipdfm-x.
+* xdvipdfmx: Configure options for 'texk/dvipdfm-x'.
(line 6)
* xindy: Linked scripts. (line 23)
-* xindy <1>: xindy package. (line 6)
-* xindy <2>: Configure options for utils/xindy.
+* xindy <1>: 'xindy' package. (line 6)
+* xindy <2>: Configure options for 'utils/xindy'.
(line 6)
-* xindy cross compiling requires clisp: Cross problems. (line 33)
-* XInput: Configure options for texk/xdvik.
+* 'xindy' cross compiling requires 'clisp': Cross problems. (line 33)
+* XInput: Configure options for 'texk/xdvik'.
(line 13)
-* Xlib: Configure options for texk/web2c.
+* Xlib: Configure options for 'texk/web2c'.
(line 22)
* xz: Linked scripts. (line 23)
-* zlib library: zlib library. (line 6)
+* zlib library: 'zlib' library. (line 6)
@@ -6033,405 +6041,400 @@
Tag Table:
Node: Top1208
Node: Introduction2118
-Node: Overview of build system3943
-Node: Prerequisites5994
-Ref: Prerequisites-Footnote-18993
-Node: Building9296
-Node: Build iteration10638
-Node: Build in parallel11682
-Node: Build distribution12287
-Node: Build one package12935
-Node: Build one engine17647
-Node: Cross compilation20072
-Node: Cross configuring21351
-Node: Cross problems23028
-Node: Installing24690
-Node: Installation directories25710
-Node: Linked scripts27528
-Node: Distro builds29019
-Node: Layout and infrastructure31395
-Node: Build system tools32226
-Node: Top-level directories34443
-Node: Autoconf macros36679
-Node: General setup macros37441
-Node: Macros for programs38316
-Node: Macros for compilers39117
-Node: Macros for libraries40525
-Node: Macros for library and header flags40951
-Node: Macros for Windows42862
-Node: Library modules44449
-Node: png library44938
-Node: zlib library47286
-Node: freetype library47801
-Node: kpathsea library48497
-Node: Program modules49876
-Node: t1utils package50304
-Node: xindy package50849
-Node: xdvik package51965
-Node: asymptote53024
-Node: Extending TeX Live53528
-Node: Adding a new program module54335
-Node: Adding a new engine59098
-Node: Adding a new generic library module60883
-Node: Adding a new TeX-specific library module63104
-Node: Configure options63802
-Node: Global configure options65183
-Node: --disable-native-texlive-build65725
-Node: --prefix --bindir ...66687
-Node: --disable-largefile67227
-Node: --disable-missing67769
-Node: --enable-compiler-warnings=LEVEL68170
-Node: --enable-cxx-runtime-hack68826
-Node: --enable-maintainer-mode69246
-Node: --enable-multiplatform69775
-Node: --enable-shared70348
-Node: --enable-silent-rules70719
-Node: --without-ln-s71171
-Node: --without-x71518
-Node: Program-specific configure options71706
-Node: --enable-PROG --disable-PROG72349
-Node: --disable-all-pkgs72622
-Node: Configure options for texk/web2c73405
-Node: Configure options for texk/bibtex-x75943
-Node: Configure options for texk/dvipdfm-x76486
-Node: Configure options for texk/dvisvgm77262
-Node: Configure options for texk/texlive78143
-Node: Configure options for texk/xdvik78564
-Node: Configure options for utils/xindy79185
-Node: Library-specific configure options80075
-Node: Configure options for kpathsea81036
-Node: Variables for configure81740
-Node: Coding conventions83166
-Node: Declarations and definitions83881
-Node: Const86055
-Node: Continuous integration87919
-Node: Transfer from Subversion to Github88583
-Node: Automatic update of the Git mirror90745
-Node: CI testing on Travis-CI91327
-Node: Releases on Github92036
-Node: install-tl92476
-Node: install-tl NAME92845
-Node: install-tl SYNOPSIS93003
-Node: install-tl DESCRIPTION93219
-Node: install-tl REFERENCES94279
-Node: install-tl OPTIONS94803
-Ref: install-tl *-gui* [[=]_module_]95144
-Ref: install-tl text95352
-Ref: install-tl tcl (or "perltk" or "wizard" or "expert" or nothing)95537
-Ref: install-tl *-no-gui*96169
-Ref: install-tl *-lang* _llcode_96259
-Ref: install-tl *-repository* _url|path_96883
-Ref: install-tl *-select-repository*97772
-Ref: install-tl *-all-options*98190
-Ref: install-tl *-custom-bin* _path_98445
-Ref: install-tl *-debug-fakenet*99275
-Ref: install-tl *-debug-translation*99451
-Ref: install-tl *-force-platform* _platform_99727
-Ref: install-tl *-help*, *--help*, *-?*99971
-Ref: install-tl *-in-place*100384
-Ref: install-tl *-init-from-profile* _profile_file_100929
-Ref: install-tl *-logfile* _file_101198
-Ref: install-tl *-no-cls*101549
-Ref: install-tl *-no-persistent-downloads*101697
-Ref: install-tl *-persistent-downloads*101722
-Ref: install-tl *-no-verify-downloads*102340
-Ref: install-tl *-non-admin*102703
-Ref: install-tl *-portable*102796
-Ref: install-tl *-print-platform*102935
-Ref: install-tl *-profile* _profile_file_103133
-Ref: install-tl *-q*103354
-Ref: install-tl *-scheme* _scheme_103416
-Ref: install-tl *-v*103890
-Ref: install-tl *-version*, *--version*104045
-Node: install-tl PROFILES104179
-Ref: install-tl instopt_adjustpath (default 0 on Unix, 1 on Windows)107045
-Ref: install-tl instopt_adjustrepo (default 1)107121
-Ref: install-tl instopt_letter (default 0)107258
-Ref: install-tl instopt_portable (default 0)107349
-Ref: install-tl instopt_write18_restricted (default 1)107445
-Node: install-tl ENVIRONMENT VARIABLES108784
-Ref: install-tl TEXLIVE_DOWNLOADER109162
-Ref: install-tl TL_DOWNLOAD_PROGRAM109185
-Ref: install-tl TL_DOWNLOAD_ARGS109205
-Ref: install-tl TEXLIVE_INSTALL_ENV_NOCHECK109409
-Ref: install-tl TEXLIVE_INSTALL_NO_CONTEXT_CACHE109611
-Ref: install-tl TEXLIVE_INSTALL_NO_RESUME109720
-Ref: install-tl TEXLIVE_INSTALL_NO_WELCOME109872
-Ref: install-tl TEXLIVE_INSTALL_PAPER109993
-Ref: install-tl TEXLIVE_INSTALL_PREFIX110139
-Ref: install-tl TEXLIVE_INSTALL_TEXMFCONFIG110170
-Ref: install-tl TEXLIVE_INSTALL_TEXMFVAR110198
-Ref: install-tl TEXLIVE_INSTALL_TEXMFHOME110227
-Ref: install-tl TEXLIVE_INSTALL_TEXMFLOCAL110257
-Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSCONFIG110291
-Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSVAR110322
-Ref: install-tl NOPERLDOC110737
-Node: install-tl AUTHORS AND COPYRIGHT110801
-Node: tlmgr111214
-Node: tlmgr NAME111699
-Node: tlmgr SYNOPSIS111831
-Node: tlmgr DESCRIPTION112021
-Node: tlmgr EXAMPLES113120
-Ref: tlmgr tlmgr option repository ctan113371
-Ref: tlmgr tlmgr option repository https://mirror.ctan.org/systems/texlive/tlnet113444
-Ref: tlmgr tlmgr update --list114049
-Ref: tlmgr tlmgr update --all114142
-Ref: tlmgr tlmgr info _what_114299
-Node: tlmgr OPTIONS114561
-Ref: tlmgr *--repository* _url|path_115081
-Ref: tlmgr /some/local/dir116267
-Ref: tlmgr file:/some/local/dir116296
-Ref: tlmgr ctan116369
-Ref: tlmgr https://mirror.ctan.org/systems/texlive/tlnet116423
-Ref: tlmgr http://server/path/to/tlnet116764
-Ref: tlmgr https://server/path/to/tlnet117145
-Ref: tlmgr ftp://server/path/to/tlnet117613
-Ref: tlmgr user at machine:/path/to/tlnet117745
-Ref: tlmgr scp://user@machine/path/to/tlnet117786
-Ref: tlmgr ssh://user@machine/path/to/tlnet117827
-Ref: tlmgr *--gui* [_action_]118220
-Ref: tlmgr *--gui-lang* _llcode_119033
-Ref: tlmgr *--command-logfile* _file_119774
-Ref: tlmgr *--debug-translation*120040
-Ref: tlmgr *--machine-readable*120243
-Ref: tlmgr *--no-execute-actions*120511
-Ref: tlmgr *--package-logfile* _file_120704
-Ref: tlmgr *--pause*120958
-Ref: tlmgr *--persistent-downloads*121113
-Ref: tlmgr *--no-persistent-downloads*121141
-Ref: tlmgr *--pin-file*121635
-Ref: tlmgr *--usermode*121853
-Ref: tlmgr *--usertree* _dir_121973
-Ref: tlmgr *--verify-repo=[none|main|all]*122099
-Node: tlmgr ACTIONS122998
-Node: tlmgr help123859
-Node: tlmgr version124336
-Node: tlmgr backup124599
-Ref: tlmgr *backup [_option_...] --all*124770
-Ref: tlmgr *backup [_option_...] _pkg_...*124803
-Ref: tlmgr *--backupdir* _directory_125869
-Ref: tlmgr *--all*126086
-Ref: tlmgr *--clean*[=_N_]126338
-Ref: tlmgr *--dry-run*126665
-Node: tlmgr candidates _pkg_126795
-Node: tlmgr check [_option_...] [depends|executes|files|runfiles|texmfdbs|all]127150
-Ref: tlmgr *depends*127664
-Ref: tlmgr *executes*128006
-Ref: tlmgr *files*128121
-Ref: tlmgr *runfiles*128257
-Ref: tlmgr *texmfdbs*128394
-Ref: tlmgr - all items in TEXMFDBS have the !! prefix.128624
-Ref: tlmgr - all items in TEXMFBDS have an ls-R file (if they exist at all).128700
-Ref: tlmgr - all items in TEXMF with !! are listed in TEXMFDBS.128765
-Ref: tlmgr - all items in TEXMF with an ls-R file are listed in TEXMFDBS.128840
-Ref: tlmgr *--use-svn*128865
-Node: tlmgr conf129006
-Ref: tlmgr *conf [texmf|tlmgr|updmap [--conffile _file_] [--delete] [_key_ [_value_]]]*129294
-Ref: tlmgr *conf auxtrees [--conffile _file_] [show|add|remove] [_value_]*129358
-Node: tlmgr dump-tlpdb [_option_...] [--json]131773
-Ref: tlmgr *--local*132206
-Ref: tlmgr *--remote*132245
-Ref: tlmgr *--json*132283
-Node: tlmgr generate132854
-Ref: tlmgr *generate [_option_...] language*133050
-Ref: tlmgr *generate [_option_...] language.dat*133089
-Ref: tlmgr *generate [_option_...] language.def*133128
-Ref: tlmgr *generate [_option_...] language.dat.lua*133171
-Ref: tlmgr *--dest* _output_file_135498
-Ref: tlmgr *--localcfg* _local_conf_file_136074
-Ref: tlmgr *--rebuild-sys*136197
-Node: tlmgr gui137012
-Node: tlmgr info137190
-Ref: tlmgr *info [_option_...] _pkg_...*137352
-Ref: tlmgr *info [_option_...] collections*137386
-Ref: tlmgr *info [_option_...] schemes*137416
-Ref: tlmgr *--list*138946
-Ref: tlmgr *--only-installed*139260
-Ref: tlmgr *--only-remote*139448
-Ref: tlmgr *--data item1,item2,...*139752
-Ref: tlmgr *--json* 1141124
-Node: tlmgr init-usertree141507
-Node: tlmgr install [_option_...] _pkg_...141888
-Ref: tlmgr *--dry-run* 1142396
-Ref: tlmgr *--file*142513
-Ref: tlmgr *--force*142735
-Ref: tlmgr *--no-depends*142955
-Ref: tlmgr *--no-depends-at-all*143114
-Ref: tlmgr *--reinstall*143514
-Ref: tlmgr *--with-doc*143892
-Ref: tlmgr *--with-src*143905
-Node: tlmgr key144633
-Ref: tlmgr *key list*144791
-Ref: tlmgr *key add _file_*144809
-Ref: tlmgr *key remove _keyid_*144831
-Node: tlmgr list145425
-Node: tlmgr option145587
-Ref: tlmgr *option [--json] [show]*145742
-Ref: tlmgr *option [--json] showall|help*145773
-Ref: tlmgr *option _key_ [_value_]*145799
-Node: tlmgr paper150378
-Ref: tlmgr *paper [a4|letter]*150527
-Ref: tlmgr *<[xdvi|pdftex|dvips|dvipdfmx|context|psutils] paper [_papersize_|--list]*>150603
-Ref: tlmgr *paper --json*150618
-Node: tlmgr path151833
-Ref: tlmgr *path [--w32mode=user|admin] add*151994
-Ref: tlmgr *path [--w32mode=user|admin] remove*152031
-Node: tlmgr pinning153516
-Ref: tlmgr pinning show153757
-Ref: tlmgr pinning add _repo_ _pkgglob_...153830
-Ref: tlmgr pinning remove _repo_ _pkgglob_...153949
-Ref: tlmgr pinning remove _repo_ --all154102
-Node: tlmgr platform154156
-Ref: tlmgr *platform list|add|remove _platform_...*154342
-Ref: tlmgr *platform set _platform_*154369
-Ref: tlmgr *platform set auto*154390
-Ref: tlmgr *--dry-run* 2155267
-Node: tlmgr postaction155386
-Ref: tlmgr *postaction [_option_...] install [shortcut|fileassoc|script] [_pkg_...]*155616
-Ref: tlmgr *postaction [_option_...] remove [shortcut|fileassoc|script] [_pkg_...]*155690
-Ref: tlmgr *--w32mode=[user|admin]*156005
-Ref: tlmgr *--fileassocmode=[1|2]*156421
-Ref: tlmgr *--all* 1156706
-Node: tlmgr print-platform156761
-Node: tlmgr print-platform-info157092
-Node: tlmgr remove [_option_...] _pkg_...157392
-Ref: tlmgr *--all* 2157876
-Ref: tlmgr *--backup*157986
-Ref: tlmgr *--backupdir* _directory_ 1158012
-Ref: tlmgr *--no-depends* 1158417
-Ref: tlmgr *--no-depends-at-all* 1158479
-Ref: tlmgr *--force* 1158582
-Ref: tlmgr *--dry-run* 3159055
-Node: tlmgr repository159432
-Ref: tlmgr *repository list*159620
-Ref: tlmgr *repository list _path|url|tag_*159654
-Ref: tlmgr *repository add _path_ [_tag_]*159687
-Ref: tlmgr *repository remove _path|tag_*159719
-Ref: tlmgr *repository set _path_[#_tag_] [_path_[#_tag_] ...]*159773
-Ref: tlmgr *repository status*159794
-Ref: tlmgr The tag (which can be the same as the url);161021
-Node: tlmgr restore161499
-Ref: tlmgr *restore [_option_...] _pkg_ [_rev_]*161678
-Ref: tlmgr *restore [_option_...] --all*161708
-Ref: tlmgr *--all* 3162408
-Ref: tlmgr *--backupdir* _directory_ 2162622
-Ref: tlmgr *--dry-run* 4162803
-Ref: tlmgr *--force* 2162935
-Ref: tlmgr *--json* 2162981
-Node: tlmgr search163308
-Ref: tlmgr *search [_option_...] _what_*163472
-Ref: tlmgr *search [_option_...] --file _what_*163509
-Ref: tlmgr *search [_option_...] --all _what_*163545
-Ref: tlmgr *--file* 1163765
-Ref: tlmgr *--all* 4163827
-Ref: tlmgr *--global*163916
-Ref: tlmgr *--word*164043
-Node: tlmgr shell164358
-Ref: tlmgr protocol165093
-Ref: tlmgr help 1165157
-Ref: tlmgr version 1165210
-Ref: tlmgr quit, end, bye, byebye, EOF165278
-Ref: tlmgr restart165299
-Ref: tlmgr load [local|remote]165422
-Ref: tlmgr save165492
-Ref: tlmgr get [_var_] =item set [_var_ [_val_]]165615
-Node: tlmgr show166216
-Node: tlmgr uninstall166383
-Node: tlmgr update [_option_...] [_pkg_...]166613
-Ref: tlmgr *--all* 5166984
-Ref: tlmgr *--self*169163
-Ref: tlmgr *--dry-run* 5169927
-Ref: tlmgr *--list* [_pkg_]170104
-Ref: tlmgr *--exclude* _pkg_170793
-Ref: tlmgr *--no-auto-remove* [_pkg_...]171593
-Ref: tlmgr *--no-auto-install* [_pkg_...]172077
-Ref: tlmgr *--reinstall-forcibly-removed*172839
-Ref: tlmgr *--backup* 1173374
-Ref: tlmgr *--backupdir* _directory_ 3173400
-Ref: tlmgr *--no-depends* 2174566
-Ref: tlmgr *--no-depends-at-all* 2174769
-Ref: tlmgr *--force* 3174872
-Node: tlmgr CONFIGURATION FILE FOR TLMGR175863
-Ref: tlmgr auto-remove = 0 or 1 (default 1), same as command-line option.176865
-Ref: tlmgr gui-expertmode = 0 or 1 (default 1). This switches between the full GUI and a simplified GUI with only the most common settings.176997
-Ref: tlmgr gui-lang = _llcode_, with a language code value as with the command-line option.177081
-Ref: tlmgr no-checksums = 0 or 1 (default 0, see below).177130
-Ref: tlmgr persistent-downloads = 0 or 1 (default 1), same as command-line option.177205
-Ref: tlmgr require-verification = 0 or 1 (default 0), same as command-line option.177280
-Ref: tlmgr tkfontscale = _floating-point number_ (default 1.0); scaling factor for fonts in the Tk-based frontends.177388
-Ref: tlmgr update-exclude = _comma-separated list of packages_ (no spaces allowed). Same as the command line option --exclude for the update action.177533
-Ref: tlmgr verify-downloads = 0 or 1 (default 1), same as command-line option.177604
-Ref: tlmgr allowed-actions = _action1_[,_action2_,...] The value is a comma-separated list (no spaces) of tlmgr actions which are allowed to be executed when tlmgr is invoked in system mode (that is, without --usermode). This allows distributors to include tlmgr in their packaging, but allow only a restricted set of actions that do not interfere with their distro package manager. For native TeX Live installations, it doesn't make sense to set this.178121
-Node: tlmgr CRYPTOGRAPHIC VERIFICATION178953
-Node: tlmgr Configuration of GnuPG invocation181126
-Node: tlmgr USER MODE181764
-Node: tlmgr User mode install184610
-Node: tlmgr User mode backup, restore, remove, update185754
-Node: tlmgr User mode generate, option, paper186196
-Node: tlmgr MULTIPLE REPOSITORIES186530
-Node: tlmgr Pinning188259
-Node: tlmgr GUI FOR TLMGR190182
-Node: tlmgr Main display191831
-Node: tlmgr Display configuration area192083
-Ref: tlmgr Status192444
-Ref: tlmgr Category192608
-Ref: tlmgr Match192794
-Ref: tlmgr Selection192975
-Ref: tlmgr Display configuration buttons193179
-Node: tlmgr Package list area193362
-Ref: tlmgr a checkbox193946
-Ref: tlmgr package name194082
-Ref: tlmgr local revision (and version)194181
-Ref: tlmgr remote revision (and version)194556
-Ref: tlmgr short description194853
-Node: tlmgr Main display action buttons194898
-Ref: tlmgr Update all installed195164
-Ref: tlmgr Update195536
-Ref: tlmgr Install195586
-Ref: tlmgr Remove195772
-Ref: tlmgr Backup195950
-Node: tlmgr Menu bar196107
-Ref: tlmgr tlmgr menu196330
-Ref: tlmgr Options menu196638
-Ref: tlmgr Actions menu197721
-Ref: tlmgr Help menu198149
-Node: tlmgr GUI options198283
-Ref: tlmgr -background _color_198529
-Ref: tlmgr -font " _fontname_ _fontsize_ "198594
-Ref: tlmgr -foreground _color_198752
-Ref: tlmgr -geometry _geomspec_198804
-Ref: tlmgr -xrm _xresource_198996
-Node: tlmgr MACHINE-READABLE OUTPUT199265
-Node: tlmgr Machine-readable update and install output200075
-Ref: tlmgr location-url _location_201351
-Ref: tlmgr total-bytes _count_201567
-Ref: tlmgr _pkgname_201977
-Ref: tlmgr _status_202187
-Ref: tlmgr d202265
-Ref: tlmgr f202325
-Ref: tlmgr u202504
-Ref: tlmgr r202550
-Ref: tlmgr a202673
-Ref: tlmgr i202851
-Ref: tlmgr I202970
-Ref: tlmgr _localrev_203072
-Ref: tlmgr _serverrev_203179
-Ref: tlmgr _size_203291
-Ref: tlmgr _runtime_203460
-Ref: tlmgr _esttot_203530
-Node: tlmgr Machine-readable option output203563
-Node: tlmgr ENVIRONMENT VARIABLES204075
-Ref: tlmgr TEXLIVE_COMPRESSOR204586
-Ref: tlmgr TEXLIVE_DOWNLOADER205434
-Ref: tlmgr TL_DOWNLOAD_PROGRAM205457
-Ref: tlmgr TL_DOWNLOAD_ARGS205477
-Ref: tlmgr TEXLIVE_PREFER_OWN206503
-Node: tlmgr AUTHORS AND COPYRIGHT207327
-Node: Index207729
+Node: Overview of build system3941
+Node: Prerequisites5992
+Ref: Prerequisites-Footnote-18991
+Node: Building9294
+Node: Build iteration10636
+Node: Build in parallel11680
+Node: Build distribution12285
+Node: Build one package12933
+Node: Build one engine17648
+Node: Cross compilation20073
+Node: Cross configuring21352
+Node: Cross problems23029
+Node: Installing24691
+Node: Installation directories25711
+Node: Linked scripts27529
+Node: Distro builds29020
+Node: Layout and infrastructure31396
+Node: Build system tools32227
+Node: Top-level directories34444
+Node: Autoconf macros36680
+Node: General setup macros37442
+Node: Macros for programs38317
+Node: Macros for compilers39118
+Node: Macros for libraries40526
+Node: Macros for library and header flags40952
+Node: Macros for Windows42863
+Node: Library modules44450
+Node: 'png' library44947
+Node: 'zlib' library47299
+Node: 'freetype' library47820
+Node: 'kpathsea' library48522
+Node: Program modules49905
+Node: 't1utils' package50341
+Node: 'xindy' package50890
+Node: 'xdvik' package52012
+Node: 'asymptote'53077
+Node: Extending TeX Live53585
+Node: Adding a new program module54392
+Node: Adding a new engine59155
+Node: Adding a new generic library module60940
+Node: Adding a new TeX-specific library module63161
+Node: Configure options63859
+Node: Global configure options65240
+Node: '--disable-native-texlive-build'65808
+Node: '--prefix' '--bindir' ...66776
+Node: '--disable-largefile'67324
+Node: '--disable-missing'67874
+Node: '--enable-compiler-warnings='LEVEL68281
+Node: '--enable-cxx-runtime-hack'68943
+Node: '--enable-maintainer-mode'69369
+Node: '--enable-multiplatform'69904
+Node: '--enable-shared'70483
+Node: '--enable-silent-rules'70860
+Node: '--without-ln-s'71318
+Node: '--without-x'71671
+Node: Program-specific configure options71863
+Node: '--enable-PROG' '--disable-PROG'72526
+Node: '--disable-all-pkgs'72805
+Node: Configure options for 'texk/web2c'73596
+Node: Configure options for 'texk/bibtex-x'76140
+Node: Configure options for 'texk/dvipdfm-x'76689
+Node: Configure options for 'texk/dvisvgm'77471
+Node: Configure options for 'texk/texlive'78358
+Node: Configure options for 'texk/xdvik'78785
+Node: Configure options for 'utils/xindy'79412
+Node: Library-specific configure options80306
+Node: Configure options for 'kpathsea'81269
+Node: Variables for configure81977
+Node: Coding conventions83403
+Node: Declarations and definitions84118
+Node: Const86292
+Node: Continuous integration88156
+Node: Transfer from Subversion to Github88820
+Node: Automatic update of the Git mirror90982
+Node: CI testing on Travis-CI91564
+Node: Releases on Github92273
+Node: install-tl92713
+Node: install-tl NAME93082
+Node: install-tl SYNOPSIS93240
+Node: install-tl DESCRIPTION93456
+Node: install-tl REFERENCES94516
+Node: install-tl OPTIONS95040
+Ref: install-tl *-gui* [[=]_module_]95381
+Ref: install-tl 'text'95589
+Ref: install-tl 'tcl' (or "perltk" or "wizard" or "expert" or nothing)95774
+Ref: install-tl *-no-gui*96406
+Ref: install-tl *-lang* _llcode_96496
+Ref: install-tl *-repository* _url|path_97120
+Ref: install-tl *-select-repository*98009
+Ref: install-tl *-all-options*98427
+Ref: install-tl *-custom-bin* _path_98682
+Ref: install-tl *-debug-fakenet*99512
+Ref: install-tl *-debug-translation*99688
+Ref: install-tl *-force-platform* _platform_99964
+Ref: install-tl *-help*, *--help*, *-?*100208
+Ref: install-tl *-in-place*100621
+Ref: install-tl *-init-from-profile* _profile_file_101166
+Ref: install-tl *-logfile* _file_101435
+Ref: install-tl *-no-cls*101786
+Ref: install-tl *-no-persistent-downloads*101934
+Ref: install-tl *-persistent-downloads*101959
+Ref: install-tl *-no-verify-downloads*102577
+Ref: install-tl *-non-admin*102940
+Ref: install-tl *-portable*103033
+Ref: install-tl *-print-platform*103172
+Ref: install-tl *-profile* _profile_file_103370
+Ref: install-tl *-q*103591
+Ref: install-tl *-scheme* _scheme_103653
+Ref: install-tl *-v*104127
+Ref: install-tl *-version*, *--version*104282
+Node: install-tl PROFILES104416
+Ref: install-tl 'instopt_adjustpath' (default 0 on Unix, 1 on Windows)107282
+Ref: install-tl 'instopt_adjustrepo' (default 1)107358
+Ref: install-tl 'instopt_letter' (default 0)107495
+Ref: install-tl 'instopt_portable' (default 0)107586
+Ref: install-tl 'instopt_write18_restricted' (default 1)107682
+Node: install-tl ENVIRONMENT VARIABLES109021
+Ref: install-tl 'TEXLIVE_DOWNLOADER'109399
+Ref: install-tl 'TL_DOWNLOAD_PROGRAM'109422
+Ref: install-tl 'TL_DOWNLOAD_ARGS'109442
+Ref: install-tl 'TEXLIVE_INSTALL_ENV_NOCHECK'109646
+Ref: install-tl 'TEXLIVE_INSTALL_NO_CONTEXT_CACHE'109848
+Ref: install-tl 'TEXLIVE_INSTALL_NO_RESUME'109957
+Ref: install-tl 'TEXLIVE_INSTALL_NO_WELCOME'110109
+Ref: install-tl 'TEXLIVE_INSTALL_PAPER'110230
+Ref: install-tl 'TEXLIVE_INSTALL_PREFIX'110376
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFCONFIG'110407
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFVAR'110435
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFHOME'110464
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFLOCAL'110494
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFSYSCONFIG'110528
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFSYSVAR'110559
+Ref: install-tl 'NOPERLDOC'110974
+Node: install-tl AUTHORS AND COPYRIGHT111038
+Node: tlmgr111451
+Node: tlmgr NAME111936
+Node: tlmgr SYNOPSIS112068
+Node: tlmgr DESCRIPTION112258
+Node: tlmgr EXAMPLES113357
+Ref: tlmgr 'tlmgr option repository ctan'113608
+Ref: tlmgr 'tlmgr option repository https://mirror.ctan.org/systems/texlive/tlnet'113681
+Ref: tlmgr 'tlmgr update --list'114286
+Ref: tlmgr 'tlmgr update --all'114379
+Ref: tlmgr 'tlmgr info' _what_114536
+Node: tlmgr OPTIONS114798
+Ref: tlmgr *--repository* _url|path_115318
+Ref: tlmgr '/some/local/dir'116504
+Ref: tlmgr 'file:/some/local/dir'116533
+Ref: tlmgr 'ctan'116606
+Ref: tlmgr 'https://mirror.ctan.org/systems/texlive/tlnet'116660
+Ref: tlmgr 'http://server/path/to/tlnet'117001
+Ref: tlmgr 'https://server/path/to/tlnet'117382
+Ref: tlmgr 'ftp://server/path/to/tlnet'117850
+Ref: tlmgr 'user at machine:/path/to/tlnet'117982
+Ref: tlmgr 'scp://user@machine/path/to/tlnet'118023
+Ref: tlmgr 'ssh://user@machine/path/to/tlnet'118064
+Ref: tlmgr *--gui* [_action_]118457
+Ref: tlmgr *--gui-lang* _llcode_119270
+Ref: tlmgr *--command-logfile* _file_120011
+Ref: tlmgr *--debug-translation*120277
+Ref: tlmgr *--machine-readable*120480
+Ref: tlmgr *--no-execute-actions*120748
+Ref: tlmgr *--package-logfile* _file_120941
+Ref: tlmgr *--pause*121195
+Ref: tlmgr *--persistent-downloads*121350
+Ref: tlmgr *--no-persistent-downloads*121378
+Ref: tlmgr *--pin-file*121872
+Ref: tlmgr *--usermode*122090
+Ref: tlmgr *--usertree* _dir_122210
+Ref: tlmgr *--verify-repo=[none|main|all]*122336
+Node: tlmgr ACTIONS123235
+Node: tlmgr help124096
+Node: tlmgr version124573
+Node: tlmgr backup124836
+Ref: tlmgr *backup [_option_...] --all*125007
+Ref: tlmgr *backup [_option_...] _pkg_...*125040
+Ref: tlmgr *--backupdir* _directory_126106
+Ref: tlmgr *--all*126323
+Ref: tlmgr *--clean*[=_N_]126575
+Ref: tlmgr *--dry-run*126902
+Node: tlmgr candidates _pkg_127032
+Node: tlmgr check [_option_...] [depends|executes|files|runfiles|texmfdbs|all]127387
+Ref: tlmgr *depends*127901
+Ref: tlmgr *executes*128243
+Ref: tlmgr *files*128358
+Ref: tlmgr *runfiles*128494
+Ref: tlmgr *texmfdbs*128631
+Ref: tlmgr - all items in 'TEXMFDBS' have the '!!' prefix.128861
+Ref: tlmgr - all items in 'TEXMFBDS' have an 'ls-R' file (if they exist at all).128937
+Ref: tlmgr - all items in 'TEXMF' with '!!' are listed in 'TEXMFDBS'.129002
+Ref: tlmgr - all items in 'TEXMF' with an 'ls-R' file are listed in 'TEXMFDBS'.129077
+Ref: tlmgr *--use-svn*129102
+Node: tlmgr conf129243
+Ref: tlmgr *conf [texmf|tlmgr|updmap [--conffile _file_] [--delete] [_key_ [_value_]]]*129531
+Ref: tlmgr *conf auxtrees [--conffile _file_] [show|add|remove] [_value_]*129595
+Node: tlmgr dump-tlpdb [_option_...] [--json]132010
+Ref: tlmgr *--local*132443
+Ref: tlmgr *--remote*132482
+Ref: tlmgr *--json*132520
+Node: tlmgr generate133091
+Ref: tlmgr *generate [_option_...] language*133287
+Ref: tlmgr *generate [_option_...] language.dat*133326
+Ref: tlmgr *generate [_option_...] language.def*133365
+Ref: tlmgr *generate [_option_...] language.dat.lua*133408
+Ref: tlmgr *--dest* _output_file_135735
+Ref: tlmgr *--localcfg* _local_conf_file_136311
+Ref: tlmgr *--rebuild-sys*136434
+Node: tlmgr gui137249
+Node: tlmgr info137427
+Ref: tlmgr *info [_option_...] _pkg_...*137589
+Ref: tlmgr *info [_option_...] collections*137623
+Ref: tlmgr *info [_option_...] schemes*137653
+Ref: tlmgr *--list*139183
+Ref: tlmgr *--only-installed*139497
+Ref: tlmgr *--only-remote*139685
+Ref: tlmgr *--data 'item1,item2,...'*139989
+Ref: tlmgr *--json* 1141361
+Node: tlmgr init-usertree141744
+Node: tlmgr install [_option_...] _pkg_...142125
+Ref: tlmgr *--dry-run* 1142633
+Ref: tlmgr *--file*142750
+Ref: tlmgr *--force*142972
+Ref: tlmgr *--no-depends*143192
+Ref: tlmgr *--no-depends-at-all*143351
+Ref: tlmgr *--reinstall*143751
+Ref: tlmgr *--with-doc*144129
+Ref: tlmgr *--with-src*144142
+Node: tlmgr key144870
+Ref: tlmgr *key list*145028
+Ref: tlmgr *key add _file_*145046
+Ref: tlmgr *key remove _keyid_*145068
+Node: tlmgr list145662
+Node: tlmgr option145824
+Ref: tlmgr *option [--json] [show]*145979
+Ref: tlmgr *option [--json] showall|help*146010
+Ref: tlmgr *option _key_ [_value_]*146036
+Node: tlmgr paper150615
+Ref: tlmgr *paper [a4|letter]*150764
+Ref: tlmgr *<[xdvi|pdftex|dvips|dvipdfmx|context|psutils] paper [_papersize_|--list]*>150840
+Ref: tlmgr *paper --json*150855
+Node: tlmgr path152070
+Ref: tlmgr *path [--w32mode=user|admin] add*152231
+Ref: tlmgr *path [--w32mode=user|admin] remove*152268
+Node: tlmgr pinning153753
+Ref: tlmgr 'pinning show'153994
+Ref: tlmgr 'pinning add' _repo_ _pkgglob_...154067
+Ref: tlmgr 'pinning remove' _repo_ _pkgglob_...154186
+Ref: tlmgr 'pinning remove _repo_ --all'154339
+Node: tlmgr platform154393
+Ref: tlmgr *platform list|add|remove _platform_...*154579
+Ref: tlmgr *platform set _platform_*154606
+Ref: tlmgr *platform set auto*154627
+Ref: tlmgr *--dry-run* 2155504
+Node: tlmgr postaction155623
+Ref: tlmgr *postaction [_option_...] install [shortcut|fileassoc|script] [_pkg_...]*155853
+Ref: tlmgr *postaction [_option_...] remove [shortcut|fileassoc|script] [_pkg_...]*155927
+Ref: tlmgr *--w32mode=[user|admin]*156242
+Ref: tlmgr *--fileassocmode=[1|2]*156658
+Ref: tlmgr *--all* 1156943
+Node: tlmgr print-platform156998
+Node: tlmgr print-platform-info157329
+Node: tlmgr remove [_option_...] _pkg_...157629
+Ref: tlmgr *--all* 2158113
+Ref: tlmgr *--backup*158223
+Ref: tlmgr *--backupdir* _directory_ 1158249
+Ref: tlmgr *--no-depends* 1158654
+Ref: tlmgr *--no-depends-at-all* 1158716
+Ref: tlmgr *--force* 1158819
+Ref: tlmgr *--dry-run* 3159292
+Node: tlmgr repository159669
+Ref: tlmgr *repository list*159857
+Ref: tlmgr *repository list _path|url|tag_*159891
+Ref: tlmgr *repository add _path_ [_tag_]*159924
+Ref: tlmgr *repository remove _path|tag_*159956
+Ref: tlmgr *repository set _path_[#_tag_] [_path_[#_tag_] ...]*160010
+Ref: tlmgr *repository status*160031
+Ref: tlmgr The tag (which can be the same as the url);161258
+Node: tlmgr restore161736
+Ref: tlmgr *restore [_option_...] _pkg_ [_rev_]*161915
+Ref: tlmgr *restore [_option_...] --all*161945
+Ref: tlmgr *--all* 3162645
+Ref: tlmgr *--backupdir* _directory_ 2162859
+Ref: tlmgr *--dry-run* 4163040
+Ref: tlmgr *--force* 2163172
+Ref: tlmgr *--json* 2163218
+Node: tlmgr search163545
+Ref: tlmgr *search [_option_...] _what_*163709
+Ref: tlmgr *search [_option_...] --file _what_*163746
+Ref: tlmgr *search [_option_...] --all _what_*163782
+Ref: tlmgr *--file* 1164002
+Ref: tlmgr *--all* 4164064
+Ref: tlmgr *--global*164153
+Ref: tlmgr *--word*164280
+Node: tlmgr shell164595
+Ref: tlmgr protocol165330
+Ref: tlmgr help 1165394
+Ref: tlmgr version 1165447
+Ref: tlmgr quit, end, bye, byebye, EOF165515
+Ref: tlmgr restart165536
+Ref: tlmgr load [local|remote]165659
+Ref: tlmgr save165729
+Ref: tlmgr get [_var_] =item set [_var_ [_val_]]165852
+Node: tlmgr show166453
+Node: tlmgr uninstall166620
+Node: tlmgr update [_option_...] [_pkg_...]166850
+Ref: tlmgr *--all* 5167221
+Ref: tlmgr *--self*169400
+Ref: tlmgr *--dry-run* 5170164
+Ref: tlmgr *--list* [_pkg_]170341
+Ref: tlmgr *--exclude* _pkg_171030
+Ref: tlmgr *--no-auto-remove* [_pkg_...]171830
+Ref: tlmgr *--no-auto-install* [_pkg_...]172314
+Ref: tlmgr *--reinstall-forcibly-removed*173076
+Ref: tlmgr *--backup* 1173611
+Ref: tlmgr *--backupdir* _directory_ 3173637
+Ref: tlmgr *--no-depends* 2174803
+Ref: tlmgr *--no-depends-at-all* 2175006
+Ref: tlmgr *--force* 3175109
+Node: tlmgr CONFIGURATION FILE FOR TLMGR176100
+Ref: tlmgr 'auto-remove =' 0 or 1 (default 1), same as command-line option.177102
+Ref: tlmgr 'gui-expertmode =' 0 or 1 (default 1). This switches between the full GUI and a simplified GUI with only the most common settings.177234
+Ref: tlmgr 'gui-lang =' _llcode_, with a language code value as with the command-line option.177318
+Ref: tlmgr 'no-checksums =' 0 or 1 (default 0, see below).177367
+Ref: tlmgr 'persistent-downloads =' 0 or 1 (default 1), same as command-line option.177442
+Ref: tlmgr 'require-verification =' 0 or 1 (default 0), same as command-line option.177517
+Ref: tlmgr 'tkfontscale =' _floating-point number_ (default 1.0); scaling factor for fonts in the Tk-based frontends.177625
+Ref: tlmgr 'update-exclude =' _comma-separated list of packages_ (no spaces allowed). Same as the command line option '--exclude' for the 'update' action.177770
+Ref: tlmgr 'verify-downloads =' 0 or 1 (default 1), same as command-line option.177841
+Ref: tlmgr 'allowed-actions =' _action1_[,_action2_,...] The value is a comma-separated list (no spaces) of 'tlmgr' actions which are allowed to be executed when 'tlmgr' is invoked in system mode (that is, without '--usermode'). This allows distributors to include 'tlmgr' in their packaging, but allow only a restricted set of actions that do not interfere with their distro package manager. For native TeX Live installations, it doesn't make sense to set this.178358
+Node: tlmgr CRYPTOGRAPHIC VERIFICATION179190
+Node: tlmgr Configuration of GnuPG invocation181363
+Node: tlmgr USER MODE182001
+Node: tlmgr User mode install184847
+Node: tlmgr User mode backup, restore, remove, update185991
+Node: tlmgr User mode generate, option, paper186433
+Node: tlmgr MULTIPLE REPOSITORIES186767
+Node: tlmgr Pinning188496
+Node: tlmgr GUI FOR TLMGR190419
+Node: tlmgr Main display192068
+Node: tlmgr Display configuration area192320
+Ref: tlmgr Status192681
+Ref: tlmgr Category192845
+Ref: tlmgr Match193031
+Ref: tlmgr Selection193212
+Ref: tlmgr Display configuration buttons193416
+Node: tlmgr Package list area193599
+Ref: tlmgr a checkbox194183
+Ref: tlmgr package name194319
+Ref: tlmgr local revision (and version)194418
+Ref: tlmgr remote revision (and version)194793
+Ref: tlmgr short description195090
+Node: tlmgr Main display action buttons195135
+Ref: tlmgr Update all installed195401
+Ref: tlmgr Update195773
+Ref: tlmgr Install195823
+Ref: tlmgr Remove196009
+Ref: tlmgr Backup196187
+Node: tlmgr Menu bar196344
+Ref: tlmgr 'tlmgr' menu196567
+Ref: tlmgr 'Options menu'196875
+Ref: tlmgr 'Actions menu'197958
+Ref: tlmgr 'Help menu'198386
+Node: tlmgr GUI options198520
+Ref: tlmgr '-background' _color_198766
+Ref: tlmgr '-font "' _fontname_ _fontsize_ '"'198831
+Ref: tlmgr '-foreground' _color_198989
+Ref: tlmgr '-geometry' _geomspec_199041
+Ref: tlmgr '-xrm' _xresource_199233
+Node: tlmgr MACHINE-READABLE OUTPUT199502
+Node: tlmgr Machine-readable 'update' and 'install' output200318
+Ref: tlmgr 'location-url' _location_201600
+Ref: tlmgr 'total-bytes' _count_201816
+Ref: tlmgr _pkgname_202226
+Ref: tlmgr _status_202436
+Ref: tlmgr 'd'202514
+Ref: tlmgr 'f'202574
+Ref: tlmgr 'u'202753
+Ref: tlmgr 'r'202799
+Ref: tlmgr 'a'202922
+Ref: tlmgr 'i'203100
+Ref: tlmgr 'I'203219
+Ref: tlmgr _localrev_203321
+Ref: tlmgr _serverrev_203428
+Ref: tlmgr _size_203540
+Ref: tlmgr _runtime_203709
+Ref: tlmgr _esttot_203779
+Node: tlmgr Machine-readable 'option' output203812
+Node: tlmgr ENVIRONMENT VARIABLES204330
+Ref: tlmgr 'TEXLIVE_COMPRESSOR'204841
+Ref: tlmgr 'TEXLIVE_DOWNLOADER'205689
+Ref: tlmgr 'TL_DOWNLOAD_PROGRAM'205712
+Ref: tlmgr 'TL_DOWNLOAD_ARGS'205732
+Ref: tlmgr 'TEXLIVE_PREFER_OWN'206758
+Node: tlmgr AUTHORS AND COPYRIGHT207582
+Node: Index207984
End Tag Table
-
-
-Local Variables:
-coding: utf-8
-End:
Modified: branches/stable/source/src/doc/tlbuild.texi
===================================================================
--- branches/stable/source/src/doc/tlbuild.texi 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/doc/tlbuild.texi 2022-11-14 21:05:34 UTC (rev 884)
@@ -2,7 +2,7 @@
@setfilename tlbuild.info
@set version 2022
- at set month-year March 2022
+ at set month-year May 2022
@set mytitle Building @TeX{} Live (@value{version})
@settitle @value{mytitle}
@@ -466,7 +466,7 @@
cd texk/dvipdfm-x
make check
-# Run the new binary in the buil tree, finding support files
+# Run the new binary in the build tree, finding support files
# in a separate tree for a TeX Live release YYYY
# (Bourne shell syntax):
TEXMFROOT=/usr/local/texlive/YYYY \
Modified: branches/stable/source/src/libs/ChangeLog
===================================================================
--- branches/stable/source/src/libs/ChangeLog 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/ChangeLog 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,3 +1,7 @@
+2022-08-29 Hironobu Yamashita <h.y.acetaminophen at gmail.com>
+
+ * potrace: re-installed for mflua/mfluajit besides dvisvgm.
+
2020-05-14 Karl Berry <karl at freefriends.org>
* poppler: remove.
Modified: branches/stable/source/src/libs/Makefile.in
===================================================================
--- branches/stable/source/src/libs/Makefile.in 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/Makefile.in 2022-11-14 21:05:34 UTC (rev 884)
@@ -107,6 +107,7 @@
$(top_srcdir)/../m4/kpse-options.m4 \
$(top_srcdir)/../m4/kpse-pixman-flags.m4 \
$(top_srcdir)/../m4/kpse-pkgs.m4 \
+ $(top_srcdir)/../m4/kpse-potrace-flags.m4 \
$(top_srcdir)/../m4/kpse-ptexenc-flags.m4 \
$(top_srcdir)/../m4/kpse-setup.m4 \
$(top_srcdir)/../m4/kpse-teckit-flags.m4 \
@@ -183,6 +184,7 @@
$(top_srcdir)/../libs/cairo/ac/withenable.ac \
$(top_srcdir)/../libs/pixman/ac/withenable.ac \
$(top_srcdir)/../libs/gd/ac/withenable.ac \
+ $(top_srcdir)/../libs/potrace/ac/withenable.ac \
$(top_srcdir)/../libs/freetype2/ac/withenable.ac \
$(top_srcdir)/../libs/libpng/ac/withenable.ac \
$(top_srcdir)/../libs/libpaper/ac/withenable.ac \
Modified: branches/stable/source/src/libs/README
===================================================================
--- branches/stable/source/src/libs/README 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/README 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,4 +1,4 @@
-$Id: README 63128 2022-04-24 23:31:44Z kakuto $
+$Id: README 64898 2022-11-02 21:16:57Z kakuto $
Public domain. Originally created by Karl Berry, 2005.
Libraries we compile for TeX Live.
@@ -12,7 +12,7 @@
cairo 1.16.0 - checked 20oct18
http://cairographics.org/releases/
-freetype2 2.11.1 - checked 03dec21
+freetype2 2.12.1 - checked 07may22
http://download.savannah.gnu.org/releases/freetype/
gd 2.3.3 - checked 13sep21
@@ -25,16 +25,16 @@
http://sourceforge.net/projects/silgraphite/files/graphite2/
(requires C++11)
-harfbuzz 4.2.1 - checked 25apr22
- https://github.com/harfbuzz/harfbuzz/releases/download/4.2.1/
+harfbuzz 5.3.1 - checked 20oct22
+ https://github.com/harfbuzz/harfbuzz/releases/tag/5.3.1
icu 70.1 - checked 16jan22
https://github.com/unicode-org/icu/releases/
-libpaper 1.1.24+nmu2 - checked 24oct13
- ftp://ftp.de.debian.org/debian/pool/main/libp/libpaper/
+libpaper 1.1.28 - checked 10sep22
+ http://ftp.debian.org/debian/pool/main/libp/libpaper/
-libpng 1.6.37 - checked 03may19
+libpng 1.6.38 - checked 16sep22
https://sourceforge.net/projects/libpng/files/ - used by many
lua 5.2.4 - checked 11mar15
@@ -49,9 +49,12 @@
mpfr 4.1.0 - checked 12jul20
http://ftp.gnu.org/gnu/mpfr/
-pixman 0.40.0 - checked 21apr20
+pixman 0.42.2 - checked 03nov22
http://cairographics.org/releases/
+potrace 1.16 - checked 29aug22
+ http://potrace.sourceforge.net
+
pplib 2.05.0 - checked 21apr20
https://github.com/contextgarden/pplib
@@ -62,8 +65,8 @@
http://www.xpdfreader.com/download.html
with modifications for pdftex
-zlib 1.2.12 - checked 05apr22
+zlib 1.2.13 - checked 15oct22
http://www.zlib.net/ - used by many
-zziplib 0.13.71 - checked 23apr20
+zziplib 0.13.72 - checked 10sep22
https://github.com/gdraheim/zziplib/releases
Modified: branches/stable/source/src/libs/aclocal.m4
===================================================================
--- branches/stable/source/src/libs/aclocal.m4 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/aclocal.m4 2022-11-14 21:05:34 UTC (rev 884)
@@ -1202,6 +1202,7 @@
m4_include([../m4/kpse-options.m4])
m4_include([../m4/kpse-pixman-flags.m4])
m4_include([../m4/kpse-pkgs.m4])
+m4_include([../m4/kpse-potrace-flags.m4])
m4_include([../m4/kpse-ptexenc-flags.m4])
m4_include([../m4/kpse-setup.m4])
m4_include([../m4/kpse-teckit-flags.m4])
Modified: branches/stable/source/src/libs/configure
===================================================================
--- branches/stable/source/src/libs/configure 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/configure 2022-11-14 21:05:34 UTC (rev 884)
@@ -860,6 +860,9 @@
with_system_gd
with_gd_includes
with_gd_libdir
+with_system_potrace
+with_potrace_includes
+with_potrace_libdir
with_system_freetype2
with_system_libpng
with_system_libpaper
@@ -1702,6 +1705,11 @@
--with-system-gd use installed gd headers and library
--with-gd-includes=DIR gd headers installed in DIR
--with-gd-libdir=DIR gd library installed in DIR
+ --with-system-potrace use installed potrace headers and library
+ --with-potrace-includes=DIR
+ potrace headers installed in DIR
+ --with-potrace-libdir=DIR
+ potrace library installed in DIR
--with-system-freetype2 use installed freetype2 headers and library
(requires freetype-config)
--with-system-libpng use installed libpng headers and library (requires
@@ -4802,6 +4810,7 @@
test "x$enable_web2c:$enable_mflua" = xyes:yes && {
need_lua53=yes
+ need_potrace=yes
}
# Check whether --enable-mfluajit was given.
if test ${enable_mfluajit+y}
@@ -4829,6 +4838,7 @@
test "x$enable_web2c:$enable_mfluajit" = xyes:yes && {
need_luajit=yes
+ need_potrace=yes
}
# Check whether --with-mf-x-toolkit was given.
@@ -6140,6 +6150,39 @@
need_freetype2=yes
}
+## libs/potrace/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/potrace/
+## configure options and TL libraries required for potrace
+
+# Check whether --with-system-potrace was given.
+if test ${with_system_potrace+y}
+then :
+ withval=$with_system_potrace;
+fi
+
+# Check whether --with-potrace-includes was given.
+if test ${with_potrace_includes+y}
+then :
+ withval=$with_potrace_includes;
+fi
+
+# Check whether --with-potrace-libdir was given.
+if test ${with_potrace_libdir+y}
+then :
+ withval=$with_potrace_libdir;
+fi
+if test "x$with_system_potrace" = x; then
+ if test -f $srcdir/../libs/potrace/configure; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`potrace' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`potrace' headers and library from TL tree" >&6;}
+ with_system_potrace=no
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`potrace' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`potrace' headers and library" >&6;}
+ with_system_potrace=yes
+ fi
+ ac_configure_args="$ac_configure_args '--with-system-potrace=$with_system_potrace'"
+fi
+
## libs/freetype2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype2/
## configure options and TL libraries required for freetype2
@@ -7396,6 +7439,12 @@
else
echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/gd/configure' >&5
fi
+if test -x $srcdir/potrace/configure; then
+ test "x$with_system_potrace" != xyes && test "x$need_potrace" = xyes && MAKE_SUBDIRS="potrace $MAKE_SUBDIRS"
+ CONF_SUBDIRS="potrace $CONF_SUBDIRS"
+else
+ echo 'tldbg:_KPSE_RECURSE skipping subdir, no (executable) configure: '"$srcdir"'/potrace/configure' >&5
+fi
if test -x $srcdir/freetype2/configure; then
test "x$with_system_freetype2" != xyes && test "x$need_freetype2" = xyes && MAKE_SUBDIRS="freetype2 $MAKE_SUBDIRS"
CONF_SUBDIRS="freetype2 $CONF_SUBDIRS"
Modified: branches/stable/source/src/libs/libpng/ChangeLog
===================================================================
--- branches/stable/source/src/libs/libpng/ChangeLog 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/ChangeLog 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,3 +1,8 @@
+2022-09-16 Akira Kakuto <kakuto at jcom.zaq.ne.jp>
+
+ Import libpng-1.6.38.
+ * version.ac: Adjust.
+
2020-03-14 Karl Berry <karl at freefriends.org>
Import VSX support from upstream to TL configure.
Modified: branches/stable/source/src/libs/libpng/README
===================================================================
--- branches/stable/source/src/libs/libpng/README 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/README 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,4 +1,4 @@
- Building libpng-1.6.37 as part of the TL tree
+ Building libpng-1.6.38 as part of the TL tree
=============================================
This directory libs/libpng/ uses a proxy Makefile.am to build the libpng library
@@ -14,4 +14,4 @@
=============================
2009-07-23 Peter Breitenlohner <peb at mppmu.mpg.de>
-2019-05-03 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+2022-09-16 Akira Kakuto <kakuto at jcom.zaq.ne.jp>
Modified: branches/stable/source/src/libs/libpng/TLpatches/ChangeLog
===================================================================
--- branches/stable/source/src/libs/libpng/TLpatches/ChangeLog 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/TLpatches/ChangeLog 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,3 +1,7 @@
+2022-09-16 Akira Kakuto <kakuto at jcom.zaq.ne.jp>
+
+ Import libpng-1.6.38.
+
2019-05-03 Akira Kakuto <kakuto at w32tex.org>
Import libpng-1.6.37.
Modified: branches/stable/source/src/libs/libpng/TLpatches/TL-Changes
===================================================================
--- branches/stable/source/src/libs/libpng/TLpatches/TL-Changes 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/TLpatches/TL-Changes 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,10 +1,13 @@
-Changes applied to the libpng-1.6.37/ tree as obtained from:
- https://sourceforge.net/projects/libpng/files/libpng16/1.6.37/
+Changes applied to the libpng-1.6.38/ tree as obtained from:
+ https://sourceforge.net/projects/libpng/files/libpng16/1.6.38/
Copied:
scripts/pnglibconf.h.prebuilt -> pnglibconf.h
Removed:
+ .appveyor.yml
+ .gitignore
+ .travis.yml
Makefile.in
aclocal.m4
compile
Modified: branches/stable/source/src/libs/libpng/configure
===================================================================
--- branches/stable/source/src/libs/libpng/configure 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/configure 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for libpng (TeX Live) 1.6.37.
+# Generated by GNU Autoconf 2.71 for libpng (TeX Live) 1.6.38.
#
# Report bugs to <tex-k at tug.org>.
#
@@ -611,8 +611,8 @@
# Identity of this package.
PACKAGE_NAME='libpng (TeX Live)'
PACKAGE_TARNAME='libpng--tex-live-'
-PACKAGE_VERSION='1.6.37'
-PACKAGE_STRING='libpng (TeX Live) 1.6.37'
+PACKAGE_VERSION='1.6.38'
+PACKAGE_STRING='libpng (TeX Live) 1.6.38'
PACKAGE_BUGREPORT='tex-k at tug.org'
PACKAGE_URL=''
@@ -1337,7 +1337,7 @@
# 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.37 to adapt to many kinds of systems.
+\`configure' configures libpng (TeX Live) 1.6.38 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1405,7 +1405,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libpng (TeX Live) 1.6.37:";;
+ short | recursive ) echo "Configuration of libpng (TeX Live) 1.6.38:";;
esac
cat <<\_ACEOF
@@ -1525,7 +1525,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libpng (TeX Live) configure 1.6.37
+libpng (TeX Live) configure 1.6.38
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1843,7 +1843,7 @@
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.37, which was
+It was created by libpng (TeX Live) $as_me 1.6.38, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -4386,7 +4386,7 @@
# Define the identity of the package.
PACKAGE='libpng--tex-live-'
- VERSION='1.6.37'
+ VERSION='1.6.38'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -7236,7 +7236,7 @@
# 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.37, which was
+This file was extended by libpng (TeX Live) $as_me 1.6.38, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7304,7 +7304,7 @@
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.37
+libpng (TeX Live) config.status 1.6.38
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
Modified: branches/stable/source/src/libs/libpng/libpng-src/ANNOUNCE
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/ANNOUNCE 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/ANNOUNCE 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,5 +1,5 @@
-libpng 1.6.37 - April 14, 2019
-==============================
+libpng 1.6.38 - September 14, 2022
+==================================
This is a public release of libpng, intended for use in production code.
@@ -9,13 +9,13 @@
Source files with LF line endings (for Unix/Linux):
- * libpng-1.6.37.tar.xz (LZMA-compressed, recommended)
- * libpng-1.6.37.tar.gz
+ * libpng-1.6.38.tar.xz (LZMA-compressed, recommended)
+ * libpng-1.6.38.tar.gz
Source files with CRLF line endings (for Windows):
- * lp1637.7z (LZMA-compressed, recommended)
- * lp1637.zip
+ * lp1638.7z (LZMA-compressed, recommended)
+ * lp1638.zip
Other information:
@@ -25,20 +25,13 @@
* TRADEMARK.md
-Changes since the previous public release (version 1.6.36)
+Changes since the previous public release (version 1.6.37)
----------------------------------------------------------
- * Fixed a use-after-free vulnerability (CVE-2019-7317) in png_image_free.
- * Fixed a memory leak in the ARM NEON implementation of png_do_expand_palette.
- * Fixed a memory leak in pngtest.c.
- * Fixed two vulnerabilities (CVE-2018-14048, CVE-2018-14550) in
- contrib/pngminus; refactor.
- * Changed the license of contrib/pngminus to MIT; refresh makefile and docs.
- (Contributed by Willem van Schaik)
- * Fixed a typo in the libpng license v2.
- (Contributed by Miguel Ojeda)
- * Added makefiles for AddressSanitizer-enabled builds.
- * Cleaned up various makefiles.
+ * Added configurations and scripts for continuous integration.
+ * Fixed various errors in the handling of tRNS, hIST and eXIf.
+ * Implemented many stability improvements across all platforms.
+ * Updated the internal documentation.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net.
Modified: branches/stable/source/src/libs/libpng/libpng-src/AUTHORS
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/AUTHORS 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/AUTHORS 2022-11-14 21:05:34 UTC (rev 884)
@@ -20,7 +20,9 @@
* Mans Rullgard
* Matt Sarett
* Mike Klein
+ * Pascal Massimino
* Paul Schmidt
+ * Qiang Zhou
* Sam Bushell
* Samuel Williams
* Simon-Pierre Cadieux
@@ -35,10 +37,12 @@
* Google Inc.
- Matt Sarett
- Mike Klein
+ - Dan Field
+ - Sami Boukortt
The build projects, the build scripts, the test scripts, and other
-files in the "projects", "scripts" and "tests" directories, have other
-copyright owners, but are released under the libpng license.
+files in the "ci", "projects", "scripts" and "tests" directories, have
+other copyright owners, but are released under the libpng license.
Some files in the "contrib" directory, and some tools-generated files
that are distributed with libpng, have other copyright owners, and are
Modified: branches/stable/source/src/libs/libpng/libpng-src/CHANGES
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/CHANGES 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/CHANGES 2022-11-14 21:05:34 UTC (rev 884)
@@ -2295,7 +2295,7 @@
Clarified usage of sig_bit versus sig_bit_p in example.c (Vincent Torri)
Version 1.4.0beta59 [May 15, 2009]
- Reformated sources in libpng style (3-space intentation, comment format)
+ Reformated sources in libpng style (3-space indentation, comment format)
Fixed typo in libpng docs (PNG_FILTER_AVE should be PNG_FILTER_AVG)
Added sections about the git repository and our coding style to the
documentation
@@ -3886,7 +3886,7 @@
Version 1.6.0beta07 [January 28, 2012]
Eliminated Intel icc/icl compiler warnings. The Intel (GCC derived)
compiler issues slightly different warnings from those issued by the
- current vesions of GCC. This eliminates those warnings by
+ current versions of GCC. This eliminates those warnings by
adding/removing casts and small code rewrites.
Updated configure.ac from autoupdate: added --enable-werror option.
Also some layout regularization and removal of introduced tab characters
@@ -6103,6 +6103,12 @@
Added makefiles for AddressSanitizer-enabled builds.
Cleaned up various makefiles.
+Version 1.6.38 [September 14, 2022]
+ Added configurations and scripts for continuous integration.
+ Fixed various errors in the handling of tRNS, hIST and eXIf.
+ Implemented many stability improvements across all platforms.
+ Updated the internal documentation.
+
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
Modified: branches/stable/source/src/libs/libpng/libpng-src/CMakeLists.txt
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/CMakeLists.txt 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/CMakeLists.txt 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,7 +1,7 @@
# CMakeLists.txt
-# Copyright (C) 2018 Cosmin Truta
-# Copyright (C) 2007,2009-2018 Glenn Randers-Pehrson
+# Copyright (c) 2018-2022 Cosmin Truta
+# Copyright (c) 2007,2009-2018 Glenn Randers-Pehrson
# Written by Christian Ehrlicher, 2007
# Revised by Roger Lowman, 2009-2010
# Revised by Clifford Yapp, 2011-2012,2017
@@ -10,9 +10,15 @@
# Revised by Sam Serrels, 2017
# Revised by Vadim Barkov, 2017
# Revised by Vicky Pfau, 2018
-# Revised by Cameron Cawley, 2018
-# Revised by Cosmin Truta, 2018
+# Revised by Cameron Cawley, 2018,2021
# Revised by Kyle Bentley, 2018
+# Revised by David Callu, 2020
+# Revised by Steve Robinson, 2020
+# Revised by Simon Hausmann, 2020
+# Revised by Alex Gaynor, 2020
+# Revised by Owen Rudge, 2020
+# Revised by Gleb Mazovetskiy, 2021
+# Revised by Christopher Sean Morrison, 2022
# This code is released under the libpng license.
# For conditions of distribution and use, see the disclaimer
@@ -26,36 +32,42 @@
set(PNGLIB_MAJOR 1)
set(PNGLIB_MINOR 6)
-set(PNGLIB_RELEASE 37)
+set(PNGLIB_REVISION 38)
+set(PNGLIB_SUBREVISION 0)
+#set(PNGLIB_SUBREVISION "git")
set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR})
-set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE})
+set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_REVISION})
+set(PNGLIB_SHARED_SOVERSION ${PNGLIB_MAJOR}${PNGLIB_MINOR})
+set(PNGLIB_SHARED_VERSION ${PNGLIB_SHARED_SOVERSION}.${PNGLIB_REVISION}.${PNGLIB_SUBREVISION})
include(GNUInstallDirs)
-# needed packages
-
-# Allow users to specify location of Zlib.
+# Allow users to specify location of zlib.
# Useful if zlib is being built alongside this as a sub-project.
option(PNG_BUILD_ZLIB "Custom zlib Location, else find_package is used" OFF)
if(NOT PNG_BUILD_ZLIB)
find_package(ZLIB REQUIRED)
- include_directories(${ZLIB_INCLUDE_DIR})
+ include_directories(${ZLIB_INCLUDE_DIRS})
endif()
-if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU)
+if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU AND NOT EMSCRIPTEN)
find_library(M_LIBRARY m)
+ if(NOT M_LIBRARY)
+ set(M_LIBRARY "")
+ endif()
else()
- # libm is not needed and/or not available
+ # libm is not needed and/or not available.
set(M_LIBRARY "")
endif()
-# COMMAND LINE OPTIONS
+# Public CMake configuration variables.
option(PNG_SHARED "Build shared lib" ON)
option(PNG_STATIC "Build static lib" ON)
-option(PNG_TESTS "Build libpng tests" ON)
+option(PNG_EXECUTABLES "Build libpng executables" ON)
+option(PNG_TESTS "Build libpng tests" ON)
-# Many more configuration options could be added here
+# Many more configuration options could be added here.
option(PNG_FRAMEWORK "Build OS X framework" OFF)
option(PNG_DEBUG "Build with debug output" OFF)
option(PNG_HARDWARE_OPTIMIZATIONS "Enable hardware optimizations" ON)
@@ -63,29 +75,43 @@
set(PNG_PREFIX "" CACHE STRING "Prefix to add to the API function names")
set(DFA_XTRA "" CACHE FILEPATH "File containing extra configuration settings")
+# CMake currently sets CMAKE_SYSTEM_PROCESSOR to one of x86_64 or arm64 on macOS,
+# based upon the OS architecture, not the target architecture. As such, we need
+# to check CMAKE_OSX_ARCHITECTURES to identify which hardware-specific flags to
+# enable. Note that this will fail if you attempt to build a universal binary in
+# a single CMake invocation.
+if (APPLE AND CMAKE_OSX_ARCHITECTURES)
+ set(TARGET_ARCH ${CMAKE_OSX_ARCHITECTURES})
+else()
+ set(TARGET_ARCH ${CMAKE_SYSTEM_PROCESSOR})
+endif()
+
if(PNG_HARDWARE_OPTIMIZATIONS)
-# set definitions and sources for arm
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm" OR
- CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")
- set(PNG_ARM_NEON_POSSIBLE_VALUES check on off)
- set(PNG_ARM_NEON "check" CACHE STRING "Enable ARM NEON optimizations:
- check: (default) use internal checking code;
- off: disable the optimizations;
- on: turn on unconditionally.")
- set_property(CACHE PNG_ARM_NEON PROPERTY STRINGS
- ${PNG_ARM_NEON_POSSIBLE_VALUES})
+# Set definitions and sources for ARM.
+if(TARGET_ARCH MATCHES "^arm" OR
+ TARGET_ARCH MATCHES "^aarch64")
+ if(TARGET_ARCH MATCHES "^arm64" OR
+ TARGET_ARCH MATCHES "^aarch64")
+ set(PNG_ARM_NEON_POSSIBLE_VALUES on off)
+ set(PNG_ARM_NEON "on"
+ CACHE STRING "Enable ARM NEON optimizations: on|off; on is default")
+ else()
+ set(PNG_ARM_NEON_POSSIBLE_VALUES check on off)
+ set(PNG_ARM_NEON "check"
+ CACHE STRING "Enable ARM NEON optimizations: check|on|off; check is default")
+ endif()
+ set_property(CACHE PNG_ARM_NEON
+ PROPERTY STRINGS ${PNG_ARM_NEON_POSSIBLE_VALUES})
list(FIND PNG_ARM_NEON_POSSIBLE_VALUES ${PNG_ARM_NEON} index)
if(index EQUAL -1)
- message(FATAL_ERROR
- "PNG_ARM_NEON must be one of [${PNG_ARM_NEON_POSSIBLE_VALUES}]")
+ message(FATAL_ERROR "PNG_ARM_NEON must be one of [${PNG_ARM_NEON_POSSIBLE_VALUES}]")
elseif(NOT ${PNG_ARM_NEON} STREQUAL "off")
set(libpng_arm_sources
- arm/arm_init.c
- arm/filter_neon.S
- arm/filter_neon_intrinsics.c
- arm/palette_neon_intrinsics.c)
-
+ arm/arm_init.c
+ arm/filter_neon.S
+ arm/filter_neon_intrinsics.c
+ arm/palette_neon_intrinsics.c)
if(${PNG_ARM_NEON} STREQUAL "on")
add_definitions(-DPNG_ARM_NEON_OPT=2)
elseif(${PNG_ARM_NEON} STREQUAL "check")
@@ -96,22 +122,21 @@
endif()
endif()
-# set definitions and sources for powerpc
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^powerpc*" OR
- CMAKE_SYSTEM_PROCESSOR MATCHES "^ppc64*")
+# Set definitions and sources for PowerPC.
+if(TARGET_ARCH MATCHES "^powerpc*" OR
+ TARGET_ARCH MATCHES "^ppc64*")
set(PNG_POWERPC_VSX_POSSIBLE_VALUES on off)
- set(PNG_POWERPC_VSX "on" CACHE STRING "Enable POWERPC VSX optimizations:
- off: disable the optimizations.")
- set_property(CACHE PNG_POWERPC_VSX PROPERTY STRINGS
- ${PNG_POWERPC_VSX_POSSIBLE_VALUES})
+ set(PNG_POWERPC_VSX "on"
+ CACHE STRING "Enable POWERPC VSX optimizations: on|off; on is default")
+ set_property(CACHE PNG_POWERPC_VSX
+ PROPERTY STRINGS ${PNG_POWERPC_VSX_POSSIBLE_VALUES})
list(FIND PNG_POWERPC_VSX_POSSIBLE_VALUES ${PNG_POWERPC_VSX} index)
if(index EQUAL -1)
- message(FATAL_ERROR
- "PNG_POWERPC_VSX must be one of [${PNG_POWERPC_VSX_POSSIBLE_VALUES}]")
+ message(FATAL_ERROR "PNG_POWERPC_VSX must be one of [${PNG_POWERPC_VSX_POSSIBLE_VALUES}]")
elseif(NOT ${PNG_POWERPC_VSX} STREQUAL "off")
set(libpng_powerpc_sources
- powerpc/powerpc_init.c
- powerpc/filter_vsx_intrinsics.c)
+ powerpc/powerpc_init.c
+ powerpc/filter_vsx_intrinsics.c)
if(${PNG_POWERPC_VSX} STREQUAL "on")
add_definitions(-DPNG_POWERPC_VSX_OPT=2)
endif()
@@ -120,22 +145,21 @@
endif()
endif()
-# set definitions and sources for intel
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^i?86" OR
- CMAKE_SYSTEM_PROCESSOR MATCHES "^x86_64*")
+# Set definitions and sources for Intel.
+if(TARGET_ARCH MATCHES "^i?86" OR
+ TARGET_ARCH MATCHES "^x86_64*")
set(PNG_INTEL_SSE_POSSIBLE_VALUES on off)
- set(PNG_INTEL_SSE "on" CACHE STRING "Enable INTEL_SSE optimizations:
- off: disable the optimizations")
- set_property(CACHE PNG_INTEL_SSE PROPERTY STRINGS
- ${PNG_INTEL_SSE_POSSIBLE_VALUES})
+ set(PNG_INTEL_SSE "on"
+ CACHE STRING "Enable INTEL_SSE optimizations: on|off; on is default")
+ set_property(CACHE PNG_INTEL_SSE
+ PROPERTY STRINGS ${PNG_INTEL_SSE_POSSIBLE_VALUES})
list(FIND PNG_INTEL_SSE_POSSIBLE_VALUES ${PNG_INTEL_SSE} index)
if(index EQUAL -1)
- message(FATAL_ERROR
- "PNG_INTEL_SSE must be one of [${PNG_INTEL_SSE_POSSIBLE_VALUES}]")
+ message(FATAL_ERROR "PNG_INTEL_SSE must be one of [${PNG_INTEL_SSE_POSSIBLE_VALUES}]")
elseif(NOT ${PNG_INTEL_SSE} STREQUAL "off")
set(libpng_intel_sources
- intel/intel_init.c
- intel/filter_sse2_intrinsics.c)
+ intel/intel_init.c
+ intel/filter_sse2_intrinsics.c)
if(${PNG_INTEL_SSE} STREQUAL "on")
add_definitions(-DPNG_INTEL_SSE_OPT=1)
endif()
@@ -144,22 +168,21 @@
endif()
endif()
-# set definitions and sources for MIPS
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "mipsel*" OR
- CMAKE_SYSTEM_PROCESSOR MATCHES "mips64el*")
+# Set definitions and sources for MIPS.
+if(TARGET_ARCH MATCHES "mipsel*" OR
+ TARGET_ARCH MATCHES "mips64el*")
set(PNG_MIPS_MSA_POSSIBLE_VALUES on off)
- set(PNG_MIPS_MSA "on" CACHE STRING "Enable MIPS_MSA optimizations:
- off: disable the optimizations")
- set_property(CACHE PNG_MIPS_MSA PROPERTY STRINGS
- ${PNG_MIPS_MSA_POSSIBLE_VALUES})
+ set(PNG_MIPS_MSA "on"
+ CACHE STRING "Enable MIPS_MSA optimizations: on|off; on is default")
+ set_property(CACHE PNG_MIPS_MSA
+ PROPERTY STRINGS ${PNG_MIPS_MSA_POSSIBLE_VALUES})
list(FIND PNG_MIPS_MSA_POSSIBLE_VALUES ${PNG_MIPS_MSA} index)
if(index EQUAL -1)
- message(FATAL_ERROR
- "PNG_MIPS_MSA must be one of [${PNG_MIPS_MSA_POSSIBLE_VALUES}]")
+ message(FATAL_ERROR "PNG_MIPS_MSA must be one of [${PNG_MIPS_MSA_POSSIBLE_VALUES}]")
elseif(NOT ${PNG_MIPS_MSA} STREQUAL "off")
set(libpng_mips_sources
- mips/mips_init.c
- mips/filter_msa_intrinsics.c)
+ mips/mips_init.c
+ mips/filter_msa_intrinsics.c)
if(${PNG_MIPS_MSA} STREQUAL "on")
add_definitions(-DPNG_MIPS_MSA_OPT=2)
endif()
@@ -170,43 +193,44 @@
else(PNG_HARDWARE_OPTIMIZATIONS)
-# set definitions and sources for arm
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm" OR
- CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")
+# Set definitions and sources for ARM.
+if(TARGET_ARCH MATCHES "^arm" OR
+ TARGET_ARCH MATCHES "^aarch64")
add_definitions(-DPNG_ARM_NEON_OPT=0)
endif()
-# set definitions and sources for powerpc
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^powerpc*" OR
- CMAKE_SYSTEM_PROCESSOR MATCHES "^ppc64*")
+# Set definitions and sources for PowerPC.
+if(TARGET_ARCH MATCHES "^powerpc*" OR
+ TARGET_ARCH MATCHES "^ppc64*")
add_definitions(-DPNG_POWERPC_VSX_OPT=0)
endif()
-# set definitions and sources for intel
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^i?86" OR
- CMAKE_SYSTEM_PROCESSOR MATCHES "^x86_64*")
+# Set definitions and sources for Intel.
+if(TARGET_ARCH MATCHES "^i?86" OR
+ TARGET_ARCH MATCHES "^x86_64*")
add_definitions(-DPNG_INTEL_SSE_OPT=0)
endif()
-# set definitions and sources for MIPS
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "mipsel*" OR
- CMAKE_SYSTEM_PROCESSOR MATCHES "mips64el*")
+# Set definitions and sources for MIPS.
+if(TARGET_ARCH MATCHES "mipsel*" OR
+ TARGET_ARCH MATCHES "mips64el*")
add_definitions(-DPNG_MIPS_MSA_OPT=0)
endif()
endif(PNG_HARDWARE_OPTIMIZATIONS)
-# SET LIBNAME
+# Set PNG_LIB_NAME.
set(PNG_LIB_NAME png${PNGLIB_MAJOR}${PNGLIB_MINOR})
-# to distinguish between debug and release lib
+# Distinguish between debug and release builds.
set(CMAKE_DEBUG_POSTFIX "d")
include(CheckCSourceCompiles)
option(ld-version-script "Enable linker version script" ON)
-if(ld-version-script AND NOT APPLE)
+if(ld-version-script AND NOT ANDROID AND NOT APPLE)
# Check if LD supports linker scripts.
- file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/conftest.map" "VERS_1 {
+ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/conftest.map" "
+VERS_1 {
global: sym;
local: *;
};
@@ -272,15 +296,29 @@
include_directories(${CMAKE_CURRENT_BINARY_DIR})
-if(NOT AWK OR ANDROID)
+if(NOT AWK OR ANDROID OR IOS)
# No awk available to generate sources; use pre-built pnglibconf.h
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/pnglibconf.h.prebuilt
${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h)
add_custom_target(genfiles) # Dummy
else()
+ # Copy the awk scripts, converting their line endings to Unix (LF)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/checksym.awk
+ ${CMAKE_CURRENT_BINARY_DIR}/scripts/checksym.awk
+ @ONLY
+ NEWLINE_STYLE LF)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/options.awk
+ ${CMAKE_CURRENT_BINARY_DIR}/scripts/options.awk
+ @ONLY
+ NEWLINE_STYLE LF)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/dfn.awk
+ ${CMAKE_CURRENT_BINARY_DIR}/scripts/dfn.awk
+ @ONLY
+ NEWLINE_STYLE LF)
+
+ # Generate .chk from .out with awk:
+ # generate_chk(INPUT inputfile OUTPUT outputfile [DEPENDS dep1 [dep2...]])
include(CMakeParseArguments)
- # Generate .chk from .out with awk
- # generate_chk(INPUT inputfile OUTPUT outputfile [DEPENDS dep1 [dep2...]])
function(generate_chk)
set(options)
set(oneValueArgs INPUT OUTPUT)
@@ -345,25 +383,33 @@
endfunction()
# Copy file
- function(generate_copy source destination)
- add_custom_command(OUTPUT "${destination}"
- COMMAND "${CMAKE_COMMAND}" -E remove "${destination}"
- COMMAND "${CMAKE_COMMAND}" -E copy "${source}"
- "${destination}"
- DEPENDS "${source}")
+ # generate_copy(INPUT inputfile OUTPUT outputfile [DEPENDS dep1 [dep2...]])
+ function(generate_copy)
+ set(options)
+ set(oneValueArgs INPUT OUTPUT)
+ set(multiValueArgs DEPENDS)
+ cmake_parse_arguments(_GCO "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+ add_custom_command(OUTPUT "${_GCO_OUTPUT}"
+ COMMAND "${CMAKE_COMMAND}"
+ -E remove "${_GCO_OUTPUT}"
+ COMMAND "${CMAKE_COMMAND}"
+ -E copy "${_GCO_INPUT}" "${_GCO_OUTPUT}"
+ DEPENDS "${source}" ${_GCO_DEPENDS})
endfunction()
# Generate scripts/pnglibconf.h
generate_source(OUTPUT "scripts/pnglibconf.c"
DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/scripts/pnglibconf.dfa"
- "${CMAKE_CURRENT_SOURCE_DIR}/scripts/options.awk"
+ "${CMAKE_CURRENT_BINARY_DIR}/scripts/options.awk"
"${CMAKE_CURRENT_SOURCE_DIR}/pngconf.h")
+ add_custom_target(scripts_pnglibconf_c DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/scripts/pnglibconf.c")
# Generate pnglibconf.c
generate_source(OUTPUT "pnglibconf.c"
DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/scripts/pnglibconf.dfa"
- "${CMAKE_CURRENT_SOURCE_DIR}/scripts/options.awk"
+ "${CMAKE_CURRENT_BINARY_DIR}/scripts/options.awk"
"${CMAKE_CURRENT_SOURCE_DIR}/pngconf.h")
+ add_custom_target(pnglibconf_c DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.c")
if(PNG_PREFIX)
set(PNGLIBCONF_H_EXTRA_DEPENDS
@@ -374,30 +420,37 @@
endif()
generate_out(INPUT "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.c"
- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.out")
+ OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.out"
+ DEPENDS pnglibconf_c)
+ add_custom_target(pnglibconf_out DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.out")
# Generate pnglibconf.h
generate_source(OUTPUT "pnglibconf.h"
- DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.out"
+ DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.out" pnglibconf_out
${PNGLIBCONF_H_EXTRA_DEPENDS})
+ add_custom_target(pnglibconf_h DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h")
generate_out(INPUT "${CMAKE_CURRENT_SOURCE_DIR}/scripts/intprefix.c"
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/scripts/intprefix.out"
- DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h")
+ DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h" pnglibconf_h)
+ add_custom_target(scripts_intprefix_out DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/scripts/intprefix.out")
generate_out(INPUT "${CMAKE_CURRENT_SOURCE_DIR}/scripts/prefix.c"
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/scripts/prefix.out"
DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/png.h"
"${CMAKE_CURRENT_SOURCE_DIR}/pngconf.h"
- "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.out")
+ "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.out" pnglibconf_out)
+ add_custom_target(scripts_prefix_out DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/scripts/prefix.out")
# Generate pngprefix.h
generate_source(OUTPUT "pngprefix.h"
DEPENDS ${PNGPREFIX_H_EXTRA_DEPENDS})
+ add_custom_target(pngprefix_h DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/pngprefix.h")
generate_out(INPUT "${CMAKE_CURRENT_SOURCE_DIR}/scripts/sym.c"
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/scripts/sym.out"
- DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h")
+ DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h" pnglibconf_h)
+ add_custom_target(scripts_sym_out DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/scripts/sym.out")
generate_out(INPUT "${CMAKE_CURRENT_SOURCE_DIR}/scripts/symbols.c"
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/scripts/symbols.out"
@@ -404,28 +457,35 @@
DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/png.h"
"${CMAKE_CURRENT_SOURCE_DIR}/pngconf.h"
"${CMAKE_CURRENT_SOURCE_DIR}/scripts/pnglibconf.h.prebuilt")
+ add_custom_target(scripts_symbols_out DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/scripts/symbols.out")
generate_out(INPUT "${CMAKE_CURRENT_SOURCE_DIR}/scripts/vers.c"
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/scripts/vers.out"
DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/png.h"
"${CMAKE_CURRENT_SOURCE_DIR}/pngconf.h"
- "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h")
+ "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h" pnglibconf_h)
+ add_custom_target(scripts_vers_out DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/scripts/vers.out")
generate_chk(INPUT "${CMAKE_CURRENT_BINARY_DIR}/scripts/symbols.out"
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/scripts/symbols.chk"
- DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/scripts/checksym.awk"
+ DEPENDS scripts_symbols_out
+ "${CMAKE_CURRENT_BINARY_DIR}/scripts/checksym.awk"
"${CMAKE_CURRENT_SOURCE_DIR}/scripts/symbols.def")
- add_custom_target(symbol-check DEPENDS
- "${CMAKE_CURRENT_BINARY_DIR}/scripts/symbols.chk")
+ add_custom_target(scripts_symbols_chk
+ DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/scripts/symbols.chk")
- generate_copy("${CMAKE_CURRENT_BINARY_DIR}/scripts/sym.out"
- "${CMAKE_CURRENT_BINARY_DIR}/libpng.sym")
- generate_copy("${CMAKE_CURRENT_BINARY_DIR}/scripts/vers.out"
- "${CMAKE_CURRENT_BINARY_DIR}/libpng.vers")
+ generate_copy(INPUT "${CMAKE_CURRENT_BINARY_DIR}/scripts/sym.out"
+ OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/libpng.sym"
+ DEPENDS scripts_sym_out)
+ generate_copy(INPUT "${CMAKE_CURRENT_BINARY_DIR}/scripts/vers.out"
+ OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/libpng.vers"
+ DEPENDS scripts_vers_out)
- add_custom_target(genvers DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/libpng.vers")
- add_custom_target(gensym DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/libpng.sym")
+ add_custom_target(genvers
+ DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/libpng.vers")
+ add_custom_target(gensym
+ DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/libpng.sym")
add_custom_target("genprebuilt"
COMMAND "${CMAKE_COMMAND}"
@@ -433,84 +493,81 @@
-P "${CMAKE_CURRENT_BINARY_DIR}/scripts/gensrc.cmake"
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
- # A single target handles generation of all generated files. If
- # they are depended upon separately by multiple targets, this
- # confuses parallel make (it would require a separate top-level
- # target for each file to track the dependencies properly).
- add_custom_target(genfiles DEPENDS
- "${CMAKE_CURRENT_BINARY_DIR}/libpng.sym"
- "${CMAKE_CURRENT_BINARY_DIR}/libpng.vers"
- "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.c"
- "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h"
- "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.out"
- "${CMAKE_CURRENT_BINARY_DIR}/pngprefix.h"
- "${CMAKE_CURRENT_BINARY_DIR}/scripts/intprefix.out"
- "${CMAKE_CURRENT_BINARY_DIR}/scripts/pnglibconf.c"
- "${CMAKE_CURRENT_BINARY_DIR}/scripts/prefix.out"
- "${CMAKE_CURRENT_BINARY_DIR}/scripts/sym.out"
- "${CMAKE_CURRENT_BINARY_DIR}/scripts/symbols.chk"
- "${CMAKE_CURRENT_BINARY_DIR}/scripts/symbols.out"
- "${CMAKE_CURRENT_BINARY_DIR}/scripts/vers.out")
-endif(NOT AWK OR ANDROID)
+ # A single target handles generation of all generated files.
+ add_custom_target(genfiles
+ DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/libpng.sym" gensym
+ "${CMAKE_CURRENT_BINARY_DIR}/libpng.vers" genvers
+ "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.c" pnglibconf_c
+ "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h" pnglibconf_h
+ "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.out" pnglibconf_out
+ "${CMAKE_CURRENT_BINARY_DIR}/pngprefix.h" pngprefix_h
+ "${CMAKE_CURRENT_BINARY_DIR}/scripts/intprefix.out" scripts_intprefix_out
+ "${CMAKE_CURRENT_BINARY_DIR}/scripts/pnglibconf.c" scripts_pnglibconf_c
+ "${CMAKE_CURRENT_BINARY_DIR}/scripts/prefix.out" scripts_prefix_out
+ "${CMAKE_CURRENT_BINARY_DIR}/scripts/sym.out" scripts_sym_out
+ "${CMAKE_CURRENT_BINARY_DIR}/scripts/symbols.chk" scripts_symbols_chk
+ "${CMAKE_CURRENT_BINARY_DIR}/scripts/symbols.out" scripts_symbols_out
+ "${CMAKE_CURRENT_BINARY_DIR}/scripts/vers.out" scripts_vers_out)
+endif(NOT AWK OR ANDROID OR IOS)
-# OUR SOURCES
+# List the source code files.
set(libpng_public_hdrs
- png.h
- pngconf.h
- "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h"
+ png.h
+ pngconf.h
+ "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h"
)
set(libpng_private_hdrs
- pngpriv.h
- pngdebug.h
- pnginfo.h
- pngstruct.h
+ pngpriv.h
+ pngdebug.h
+ pnginfo.h
+ pngstruct.h
)
-if(AWK AND NOT ANDROID)
+if(AWK AND NOT ANDROID AND NOT IOS)
list(APPEND libpng_private_hdrs "${CMAKE_CURRENT_BINARY_DIR}/pngprefix.h")
endif()
set(libpng_sources
- ${libpng_public_hdrs}
- ${libpng_private_hdrs}
- png.c
- pngerror.c
- pngget.c
- pngmem.c
- pngpread.c
- pngread.c
- pngrio.c
- pngrtran.c
- pngrutil.c
- pngset.c
- pngtrans.c
- pngwio.c
- pngwrite.c
- pngwtran.c
- pngwutil.c
- ${libpng_arm_sources}
- ${libpng_intel_sources}
- ${libpng_mips_sources}
- ${libpng_powerpc_sources}
+ ${libpng_public_hdrs}
+ ${libpng_private_hdrs}
+ png.c
+ pngerror.c
+ pngget.c
+ pngmem.c
+ pngpread.c
+ pngread.c
+ pngrio.c
+ pngrtran.c
+ pngrutil.c
+ pngset.c
+ pngtrans.c
+ pngwio.c
+ pngwrite.c
+ pngwtran.c
+ pngwutil.c
+ ${libpng_arm_sources}
+ ${libpng_intel_sources}
+ ${libpng_mips_sources}
+ ${libpng_powerpc_sources}
)
set(pngtest_sources
- pngtest.c
+ pngtest.c
)
set(pngvalid_sources
- contrib/libtests/pngvalid.c
+ contrib/libtests/pngvalid.c
)
set(pngstest_sources
- contrib/libtests/pngstest.c
+ contrib/libtests/pngstest.c
)
set(pngunknown_sources
- contrib/libtests/pngunknown.c
+ contrib/libtests/pngunknown.c
)
set(pngimage_sources
- contrib/libtests/pngimage.c
+ contrib/libtests/pngimage.c
)
set(pngfix_sources
- contrib/tools/pngfix.c
+ contrib/tools/pngfix.c
)
set(png_fix_itxt_sources
- contrib/tools/png-fix-itxt.c
+ contrib/tools/png-fix-itxt.c
)
if(MSVC)
@@ -521,8 +578,8 @@
add_definitions(-DPNG_DEBUG)
endif()
-# NOW BUILD OUR TARGET
-include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${ZLIB_INCLUDE_DIR})
+# Now build our target.
+include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${ZLIB_INCLUDE_DIRS})
unset(PNG_LIB_TARGETS)
@@ -532,19 +589,19 @@
set_target_properties(png PROPERTIES OUTPUT_NAME ${PNG_LIB_NAME})
add_dependencies(png genfiles)
if(MSVC)
- # msvc does not append 'lib' - do it here to have consistent name
+ # MVC does not append 'lib'. Do it here, to have consistent name.
set_target_properties(png PROPERTIES PREFIX "lib")
set_target_properties(png PROPERTIES IMPORT_PREFIX "lib")
endif()
- target_link_libraries(png ${ZLIB_LIBRARY} ${M_LIBRARY})
+ target_link_libraries(png ${ZLIB_LIBRARIES} ${M_LIBRARY})
if(UNIX AND AWK)
if(HAVE_LD_VERSION_SCRIPT)
- set_target_properties(png PROPERTIES LINK_FLAGS
- "-Wl,--version-script='${CMAKE_CURRENT_BINARY_DIR}/libpng.vers'")
+ set_target_properties(png PROPERTIES
+ LINK_FLAGS "-Wl,--version-script='${CMAKE_CURRENT_BINARY_DIR}/libpng.vers'")
elseif(HAVE_SOLARIS_LD_VERSION_SCRIPT)
- set_target_properties(png PROPERTIES LINK_FLAGS
- "-Wl,-M -Wl,'${CMAKE_CURRENT_BINARY_DIR}/libpng.vers'")
+ set_target_properties(png PROPERTIES
+ LINK_FLAGS "-Wl,-M -Wl,'${CMAKE_CURRENT_BINARY_DIR}/libpng.vers'")
endif()
endif()
endif()
@@ -555,23 +612,23 @@
add_library(png_static STATIC ${libpng_sources})
add_dependencies(png_static genfiles)
# MSVC doesn't use a different file extension for shared vs. static
- # libs. We are able to change OUTPUT_NAME to remove the _static
+ # libs. We are able to change OUTPUT_NAME to remove the _static
# for all other platforms.
if(NOT MSVC)
set_target_properties(png_static PROPERTIES
- OUTPUT_NAME "${PNG_LIB_NAME}"
- CLEAN_DIRECT_OUTPUT 1)
+ OUTPUT_NAME "${PNG_LIB_NAME}"
+ CLEAN_DIRECT_OUTPUT 1)
else()
set_target_properties(png_static PROPERTIES
- OUTPUT_NAME "${PNG_LIB_NAME}_static"
- CLEAN_DIRECT_OUTPUT 1)
+ OUTPUT_NAME "${PNG_LIB_NAME}_static"
+ CLEAN_DIRECT_OUTPUT 1)
endif()
list(APPEND PNG_LIB_TARGETS png_static)
if(MSVC)
- # msvc does not append 'lib' - do it here to have consistent name
+ # MSVC does not append 'lib'. Do it here, to have consistent name.
set_target_properties(png_static PROPERTIES PREFIX "lib")
endif()
- target_link_libraries(png_static ${ZLIB_LIBRARY} ${M_LIBRARY})
+ target_link_libraries(png_static ${ZLIB_LIBRARIES} ${M_LIBRARY})
endif()
if(PNG_FRAMEWORK)
@@ -580,26 +637,26 @@
add_dependencies(png_framework genfiles)
list(APPEND PNG_LIB_TARGETS png_framework)
set_target_properties(png_framework PROPERTIES
- FRAMEWORK TRUE
- FRAMEWORK_VERSION ${PNGLIB_VERSION}
- MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${PNGLIB_MAJOR}.${PNGLIB_MINOR}
- MACOSX_FRAMEWORK_BUNDLE_VERSION ${PNGLIB_VERSION}
- MACOSX_FRAMEWORK_IDENTIFIER org.libpng.libpng
- XCODE_ATTRIBUTE_INSTALL_PATH "@rpath"
- PUBLIC_HEADER "${libpng_public_hdrs}"
- OUTPUT_NAME png)
- target_link_libraries(png_framework ${ZLIB_LIBRARY} ${M_LIBRARY})
+ FRAMEWORK TRUE
+ FRAMEWORK_VERSION ${PNGLIB_VERSION}
+ MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${PNGLIB_MAJOR}.${PNGLIB_MINOR}
+ MACOSX_FRAMEWORK_BUNDLE_VERSION ${PNGLIB_VERSION}
+ MACOSX_FRAMEWORK_IDENTIFIER org.libpng.libpng
+ XCODE_ATTRIBUTE_INSTALL_PATH "@rpath"
+ PUBLIC_HEADER "${libpng_public_hdrs}"
+ OUTPUT_NAME png)
+ target_link_libraries(png_framework ${ZLIB_LIBRARIES} ${M_LIBRARY})
endif()
if(NOT PNG_LIB_TARGETS)
- message(SEND_ERROR
- "No library variant selected to build. "
- "Please enable at least one of the following options: "
- "PNG_STATIC, PNG_SHARED, PNG_FRAMEWORK")
+ message(SEND_ERROR "No library variant selected to build. "
+ "Please enable at least one of the following options: "
+ "PNG_STATIC, PNG_SHARED, PNG_FRAMEWORK")
endif()
if(PNG_SHARED AND WIN32)
- set_target_properties(png PROPERTIES DEFINE_SYMBOL PNG_BUILD_DLL)
+ set_target_properties(png PROPERTIES
+ DEFINE_SYMBOL PNG_BUILD_DLL)
endif()
function(png_add_test)
@@ -619,12 +676,13 @@
set(TEST_FILES "${_PAT_FILES}")
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/scripts/test.cmake.in"
- "${CMAKE_CURRENT_BINARY_DIR}/tests/${_PAT_NAME}.cmake" @ONLY)
+ "${CMAKE_CURRENT_BINARY_DIR}/tests/${_PAT_NAME}.cmake"
+ @ONLY)
add_test(NAME "${_PAT_NAME}"
COMMAND "${CMAKE_COMMAND}"
- "-DLIBPNG=$<TARGET_FILE:png>"
- "-DTEST_COMMAND=$<TARGET_FILE:${_PAT_COMMAND}>"
- -P "${CMAKE_CURRENT_BINARY_DIR}/tests/${_PAT_NAME}.cmake")
+ "-DLIBPNG=$<TARGET_FILE:png>"
+ "-DTEST_COMMAND=$<TARGET_FILE:${_PAT_COMMAND}>"
+ -P "${CMAKE_CURRENT_BINARY_DIR}/tests/${_PAT_NAME}.cmake")
endfunction()
if(PNG_TESTS AND PNG_SHARED)
@@ -640,39 +698,55 @@
add_executable(pngtest ${pngtest_sources})
target_link_libraries(pngtest png)
- png_add_test(NAME pngtest COMMAND pngtest FILES "${PNGTEST_PNG}")
+ png_add_test(NAME pngtest
+ COMMAND pngtest
+ FILES "${PNGTEST_PNG}")
add_executable(pngvalid ${pngvalid_sources})
target_link_libraries(pngvalid png)
png_add_test(NAME pngvalid-gamma-16-to-8
- COMMAND pngvalid OPTIONS --gamma-16-to-8)
+ COMMAND pngvalid
+ OPTIONS --gamma-16-to-8)
png_add_test(NAME pngvalid-gamma-alpha-mode
- COMMAND pngvalid OPTIONS --gamma-alpha-mode)
+ COMMAND pngvalid
+ OPTIONS --gamma-alpha-mode)
png_add_test(NAME pngvalid-gamma-background
- COMMAND pngvalid OPTIONS --gamma-background)
+ COMMAND pngvalid
+ OPTIONS --gamma-background)
png_add_test(NAME pngvalid-gamma-expand16-alpha-mode
- COMMAND pngvalid OPTIONS --gamma-alpha-mode --expand16)
+ COMMAND pngvalid
+ OPTIONS --gamma-alpha-mode --expand16)
png_add_test(NAME pngvalid-gamma-expand16-background
- COMMAND pngvalid OPTIONS --gamma-background --expand16)
+ COMMAND pngvalid
+ OPTIONS --gamma-background --expand16)
png_add_test(NAME pngvalid-gamma-expand16-transform
- COMMAND pngvalid OPTIONS --gamma-transform --expand16)
+ COMMAND pngvalid
+ OPTIONS --gamma-transform --expand16)
png_add_test(NAME pngvalid-gamma-sbit
- COMMAND pngvalid OPTIONS --gamma-sbit)
+ COMMAND pngvalid
+ OPTIONS --gamma-sbit)
png_add_test(NAME pngvalid-gamma-threshold
- COMMAND pngvalid OPTIONS --gamma-threshold)
+ COMMAND pngvalid
+ OPTIONS --gamma-threshold)
png_add_test(NAME pngvalid-gamma-transform
- COMMAND pngvalid OPTIONS --gamma-transform)
+ COMMAND pngvalid
+ OPTIONS --gamma-transform)
png_add_test(NAME pngvalid-progressive-interlace-standard
- COMMAND pngvalid OPTIONS --standard --progressive-read --interlace)
+ COMMAND pngvalid
+ OPTIONS --standard --progressive-read --interlace)
png_add_test(NAME pngvalid-progressive-size
- COMMAND pngvalid OPTIONS --size --progressive-read)
+ COMMAND pngvalid
+ OPTIONS --size --progressive-read)
png_add_test(NAME pngvalid-progressive-standard
- COMMAND pngvalid OPTIONS --standard --progressive-read)
+ COMMAND pngvalid
+ OPTIONS --standard --progressive-read)
png_add_test(NAME pngvalid-standard
- COMMAND pngvalid OPTIONS --standard)
+ COMMAND pngvalid
+ OPTIONS --standard)
png_add_test(NAME pngvalid-transform
- COMMAND pngvalid OPTIONS --transform)
+ COMMAND pngvalid
+ OPTIONS --transform)
add_executable(pngstest ${pngstest_sources})
target_link_libraries(pngstest png)
@@ -732,38 +806,62 @@
add_executable(pngunknown ${pngunknown_sources})
target_link_libraries(pngunknown png)
- png_add_test(NAME pngunknown-discard COMMAND pngunknown OPTIONS --strict default=discard FILES "${PNGTEST_PNG}")
- png_add_test(NAME pngunknown-IDAT COMMAND pngunknown OPTIONS --strict default=discard IDAT=save FILES "${PNGTEST_PNG}")
- png_add_test(NAME pngunknown-if-safe COMMAND pngunknown OPTIONS --strict default=if-safe FILES "${PNGTEST_PNG}")
- png_add_test(NAME pngunknown-sAPI COMMAND pngunknown OPTIONS --strict bKGD=save cHRM=save gAMA=save all=discard iCCP=save sBIT=save sRGB=save FILES "${PNGTEST_PNG}")
- png_add_test(NAME pngunknown-save COMMAND pngunknown OPTIONS --strict default=save FILES "${PNGTEST_PNG}")
- png_add_test(NAME pngunknown-sTER COMMAND pngunknown OPTIONS --strict sTER=if-safe FILES "${PNGTEST_PNG}")
- png_add_test(NAME pngunknown-vpAg COMMAND pngunknown OPTIONS --strict vpAg=if-safe FILES "${PNGTEST_PNG}")
+ png_add_test(NAME pngunknown-discard
+ COMMAND pngunknown
+ OPTIONS --strict default=discard
+ FILES "${PNGTEST_PNG}")
+ png_add_test(NAME pngunknown-IDAT
+ COMMAND pngunknown
+ OPTIONS --strict default=discard IDAT=save
+ FILES "${PNGTEST_PNG}")
+ png_add_test(NAME pngunknown-if-safe
+ COMMAND pngunknown
+ OPTIONS --strict default=if-safe
+ FILES "${PNGTEST_PNG}")
+ png_add_test(NAME pngunknown-sAPI
+ COMMAND pngunknown
+ OPTIONS --strict bKGD=save cHRM=save gAMA=save all=discard iCCP=save sBIT=save sRGB=save
+ FILES "${PNGTEST_PNG}")
+ png_add_test(NAME pngunknown-save
+ COMMAND pngunknown
+ OPTIONS --strict default=save
+ FILES "${PNGTEST_PNG}")
+ png_add_test(NAME pngunknown-sTER
+ COMMAND pngunknown
+ OPTIONS --strict sTER=if-safe
+ FILES "${PNGTEST_PNG}")
+ png_add_test(NAME pngunknown-vpAg
+ COMMAND pngunknown
+ OPTIONS --strict vpAg=if-safe
+ FILES "${PNGTEST_PNG}")
add_executable(pngimage ${pngimage_sources})
target_link_libraries(pngimage png)
- png_add_test(NAME pngimage-quick COMMAND pngimage OPTIONS --list-combos --log FILES ${PNGSUITE_PNGS})
- png_add_test(NAME pngimage-full COMMAND pngimage OPTIONS --exhaustive --list-combos --log FILES ${PNGSUITE_PNGS})
+ png_add_test(NAME pngimage-quick
+ COMMAND pngimage
+ OPTIONS --list-combos --log
+ FILES ${PNGSUITE_PNGS})
+ png_add_test(NAME pngimage-full
+ COMMAND pngimage
+ OPTIONS --exhaustive --list-combos --log
+ FILES ${PNGSUITE_PNGS})
endif()
-if(PNG_SHARED)
+if(PNG_SHARED AND PNG_EXECUTABLES)
add_executable(pngfix ${pngfix_sources})
target_link_libraries(pngfix png)
set(PNG_BIN_TARGETS pngfix)
add_executable(png-fix-itxt ${png_fix_itxt_sources})
- target_link_libraries(png-fix-itxt ${ZLIB_LIBRARY} ${M_LIBRARY})
+ target_link_libraries(png-fix-itxt ${ZLIB_LIBRARIES} ${M_LIBRARY})
list(APPEND PNG_BIN_TARGETS png-fix-itxt)
endif()
-# Set a variable with CMake code which:
-# Creates a symlink from src to dest (if possible) or alternatively
-# copies if different.
+# Creates a symlink from src to dest (if possible), or, alternatively,
+# copies src to dest if different.
include(CMakeParseArguments)
-
function(create_symlink DEST_FILE)
-
cmake_parse_arguments(S "" "FILE;TARGET" "" ${ARGN})
if(NOT S_TARGET AND NOT S_FILE)
@@ -771,7 +869,9 @@
endif()
if(S_TARGET AND S_FILE)
- message(FATAL_ERROR "create_symlink: Both source file ${S_FILE} and build target ${S_TARGET} arguments are present; can only have one.")
+ message(FATAL_ERROR "create_symlink: "
+ "Both source file ${S_FILE} and build target ${S_TARGET} arguments are present; "
+ "can only have one")
endif()
if(S_FILE)
@@ -778,38 +878,50 @@
# If we don't need to symlink something that's coming from a build target,
# we can go ahead and symlink/copy at configure time.
if(CMAKE_HOST_WIN32 AND NOT CYGWIN)
- execute_process(
- COMMAND "${CMAKE_COMMAND}" -E copy_if_different ${S_FILE} ${DEST_FILE}
- WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
+ execute_process(COMMAND "${CMAKE_COMMAND}"
+ -E copy_if_different
+ ${S_FILE} ${DEST_FILE}
+ WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
else()
- execute_process(
- COMMAND ${CMAKE_COMMAND} -E create_symlink ${S_FILE} ${DEST_FILE}
- WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
+ execute_process(COMMAND "${CMAKE_COMMAND}"
+ -E create_symlink
+ ${S_FILE} ${DEST_FILE}
+ WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
endif()
endif()
if(S_TARGET)
- # We need to use generator expressions, which can be a bit tricky, so for
- # simplicity make the symlink a POST_BUILD step and use the TARGET
+ # We need to use generator expressions, which can be a bit tricky.
+ # For simplicity, make the symlink a POST_BUILD step, and use the TARGET
# signature of add_custom_command.
if(CMAKE_HOST_WIN32 AND NOT CYGWIN)
- add_custom_command(TARGET ${S_TARGET} POST_BUILD
- COMMAND "${CMAKE_COMMAND}" -E copy_if_different $<TARGET_LINKER_FILE_NAME:${S_TARGET}> $<TARGET_LINKER_FILE_DIR:${S_TARGET}>/${DEST_FILE})
+ add_custom_command(TARGET ${S_TARGET}
+ POST_BUILD
+ COMMAND "${CMAKE_COMMAND}"
+ -E copy_if_different
+ $<TARGET_LINKER_FILE_NAME:${S_TARGET}>
+ $<TARGET_LINKER_FILE_DIR:${S_TARGET}>/${DEST_FILE})
else()
- add_custom_command(TARGET ${S_TARGET} POST_BUILD
- COMMAND "${CMAKE_COMMAND}" -E create_symlink $<TARGET_LINKER_FILE_NAME:${S_TARGET}> $<TARGET_LINKER_FILE_DIR:${S_TARGET}>/${DEST_FILE})
+ add_custom_command(TARGET ${S_TARGET}
+ POST_BUILD
+ COMMAND "${CMAKE_COMMAND}"
+ -E create_symlink
+ $<TARGET_LINKER_FILE_NAME:${S_TARGET}>
+ $<TARGET_LINKER_FILE_DIR:${S_TARGET}>/${DEST_FILE})
endif()
endif()
-
endfunction()
# Create source generation scripts.
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/genchk.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/scripts/genchk.cmake @ONLY)
+ ${CMAKE_CURRENT_BINARY_DIR}/scripts/genchk.cmake
+ @ONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/genout.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/scripts/genout.cmake @ONLY)
+ ${CMAKE_CURRENT_BINARY_DIR}/scripts/genout.cmake
+ @ONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/gensrc.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/scripts/gensrc.cmake @ONLY)
+ ${CMAKE_CURRENT_BINARY_DIR}/scripts/gensrc.cmake
+ @ONLY)
# libpng is a library so default to 'lib'
if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
@@ -816,10 +928,10 @@
set(CMAKE_INSTALL_LIBDIR lib)
endif()
-# CREATE PKGCONFIG FILES
+# Create pkgconfig files.
# We use the same files like ./configure, so we have to set its vars.
-# Only do this on Windows for Cygwin - the files don't make much sense outside
-# of a UNIX look-alike.
+# Only do this on Windows for Cygwin - the files don't make much sense
+# outside of a UNIX look-alike.
if(NOT WIN32 OR CYGWIN OR MINGW)
set(prefix ${CMAKE_INSTALL_PREFIX})
set(exec_prefix ${CMAKE_INSTALL_PREFIX})
@@ -827,24 +939,24 @@
set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR})
set(LIBS "-lz -lm")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng.pc.in
- ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc @ONLY)
+ ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc
+ @ONLY)
create_symlink(libpng.pc FILE ${PNGLIB_NAME}.pc)
-
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng-config.in
- ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config @ONLY)
+ ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config
+ @ONLY)
create_symlink(libpng-config FILE ${PNGLIB_NAME}-config)
endif()
-# SET UP LINKS
+# Set up links.
if(PNG_SHARED)
set_target_properties(png PROPERTIES
-# VERSION 16.${PNGLIB_RELEASE}.1.6.37
- VERSION 16.${PNGLIB_RELEASE}.0
- SOVERSION 16
+ VERSION ${PNGLIB_SHARED_VERSION}
+ SOVERSION ${PNGLIB_SHARED_SOVERSION}
CLEAN_DIRECT_OUTPUT 1)
endif()
-# INSTALL
+# Install.
if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
install(TARGETS ${PNG_LIB_TARGETS}
EXPORT libpng
@@ -878,13 +990,17 @@
endif()
if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL)
- install(FILES ${libpng_public_hdrs} DESTINATION include)
- install(FILES ${libpng_public_hdrs} DESTINATION include/${PNGLIB_NAME})
+ install(FILES ${libpng_public_hdrs}
+ DESTINATION include)
+ install(FILES ${libpng_public_hdrs}
+ DESTINATION include/${PNGLIB_NAME})
endif()
if(NOT SKIP_INSTALL_EXECUTABLES AND NOT SKIP_INSTALL_ALL)
if(NOT WIN32 OR CYGWIN OR MINGW)
- install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/libpng-config DESTINATION bin)
- install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config DESTINATION bin)
+ install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/libpng-config
+ DESTINATION bin)
+ install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config
+ DESTINATION bin)
endif()
endif()
@@ -894,38 +1010,31 @@
endif()
if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL)
- # Install man pages
- if(NOT PNG_MAN_DIR)
- set(PNG_MAN_DIR "share/man")
- endif()
- install(FILES libpng.3 libpngpf.3 DESTINATION ${PNG_MAN_DIR}/man3)
- install(FILES png.5 DESTINATION ${PNG_MAN_DIR}/man5)
- # Install pkg-config files
+ # Install the man pages.
+ install(FILES libpng.3 libpngpf.3
+ DESTINATION ${CMAKE_INSTALL_MANDIR}/man3)
+ install(FILES png.5
+ DESTINATION ${CMAKE_INSTALL_MANDIR}/man5)
+ # Install the pkg-config files.
if(NOT CMAKE_HOST_WIN32 OR CYGWIN OR MINGW)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng.pc
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/libpng-config
- DESTINATION bin)
+ DESTINATION ${CMAKE_INSTALL_BINDIR})
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config
- DESTINATION bin)
+ DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
endif()
# Create an export file that CMake users can include() to import our targets.
if(NOT SKIP_INSTALL_EXPORT AND NOT SKIP_INSTALL_ALL)
- install(EXPORT libpng DESTINATION lib/libpng FILE lib${PNG_LIB_NAME}.cmake)
+ install(EXPORT libpng
+ DESTINATION lib/libpng
+ FILE lib${PNG_LIB_NAME}.cmake)
endif()
-# what's with libpng-manual.txt and all the extra files?
-
-# UNINSTALL
-# do we need this?
-
-# DIST
-# do we need this?
-
-# to create msvc import lib for mingw compiled shared lib
+# TODO: Create MSVC import lib for MinGW-compiled shared lib.
# pexports libpng.dll > libpng.def
# lib /def:libpng.def /machine:x86
Modified: branches/stable/source/src/libs/libpng/libpng-src/INSTALL
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/INSTALL 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/INSTALL 2022-11-14 21:05:34 UTC (rev 884)
@@ -128,16 +128,18 @@
README
*.h, *.c => libpng source files
CMakeLists.txt => "cmake" script
+ ci
+ ci_*.sh
configuration files:
configure.ac, configure, Makefile.am, Makefile.in,
autogen.sh, config.guess, ltmain.sh, missing, libpng.pc.in,
libpng-config.in, aclocal.m4, config.h.in, config.sub,
- depcomp, install-sh, mkinstalldirs, test-pngtest.sh
+ depcomp, install-sh, mkinstalldirs, test-pngtest.sh, etc.
contrib
arm-neon, conftest, examples, gregbook, libtests, pngminim,
pngminus, pngsuite, tools, visupng
projects
- cbuilder5, owatcom, visualc71, vstudio, xcode
+ owatcom, visualc71, vstudio
scripts
makefile.*
*.def (module definition files)
@@ -145,7 +147,7 @@
pngtest.png
etc.
zlib
- README, *.h, *.c contrib, etc.
+ README, *.h, *.c, contrib, etc.
If the line endings in the files look funny, you may wish to get the other
distribution of libpng. It is available in both tar.gz (UNIX style line
@@ -153,13 +155,13 @@
VI. Building with project files
-If you are building libpng with MSVC, you can enter the
-libpng projects\visualc71 or vstudio directory and follow the instructions
-in README.txt.
+If you are building libpng with Microsoft Visual Studio, you can enter
+the directory projects\visualc71 or projects\vstudio and follow the
+instructions in README.txt.
-Otherwise enter the zlib directory and follow the instructions in zlib/README,
-then come back here and run "configure" or choose the appropriate
-makefile.sys in the scripts directory.
+Otherwise, enter the zlib directory and follow the instructions in
+zlib/README, then come back here and run "configure" or choose the
+appropriate makefile in the scripts directory.
VII. Building with makefiles
@@ -166,15 +168,14 @@
Copy the file (or files) that you need from the
scripts directory into this directory, for example
-MSDOS example:
+UNIX example:
- copy scripts\makefile.msc makefile
- copy scripts\pnglibconf.h.prebuilt pnglibconf.h
+ cp scripts/makefile.std Makefile
+ make
-UNIX example:
+Windows example:
- cp scripts/makefile.std makefile
- cp scripts/pnglibconf.h.prebuilt pnglibconf.h
+ nmake -f scripts\makefile.vcwin32
Read the makefile to see if you need to change any source or
target directories to match your preferences.
@@ -197,30 +198,27 @@
Some also allow you to run "make test-installed" after you have
run "make install".
-VIII. Configuring libpng for 16-bit platforms
+VIII. Configuring for DOS and other 16-bit platforms
-You will want to look into zconf.h to tell zlib (and thus libpng) that
-it cannot allocate more than 64K at a time. Even if you can, the memory
-won't be accessible. So limit zlib and libpng to 64K by defining MAXSEG_64K.
+Officially, the support for 16-bit platforms has been removed.
-IX. Configuring for DOS
-
For DOS users who only have access to the lower 640K, you will
have to limit zlib's memory usage via a png_set_compression_mem_level()
call. See zlib.h or zconf.h in the zlib library for more information.
-X. Configuring for Medium Model
+You may be or may not be in luck if you target the "large" memory model,
+but all the smaller models ("small", "compact" and "medium") are known
+to be unworkable. For DOS users who have access beyond the lower 640K,
+a "flat" 32-bit DOS model (such as DJGPP) is strongly recommended.
-Libpng's support for medium model has been tested on most of the popular
-compilers. Make sure MAXSEG_64K gets defined, USE_FAR_KEYWORD gets
-defined, and FAR gets defined to far in pngconf.h, and you should be
-all set. Everything in the library (except for zlib's structure) is
-expecting far data. You must use the typedefs with the p or pp on
-the end for pointers (or at least look at them and be careful). Make
-note that the rows of data are defined as png_bytepp, which is
-an "unsigned char far * far *".
+For DOS users who only have access to the lower 640K, you will have to
+limit zlib's memory usage via a png_set_compression_mem_level() call.
+You will also have to look into zconf.h to tell zlib (and thus libpng)
+that it cannot allocate more than 64K at a time. Even if you can, the
+memory won't be accessible. Therefore, you should limit zlib and libpng
+to 64K by defining MAXSEG_64K.
-XI. Prepending a prefix to exported symbols
+IX. Prepending a prefix to exported symbols
Starting with libpng-1.6.0, you can configure libpng (when using the
"configure" script) to prefix all exported symbols by means of the
@@ -231,7 +229,7 @@
transparent to applications; their function calls get transformed by
the macros to use the modified names.
-XII. Configuring for compiler xxx:
+X. Configuring for compiler xxx:
All includes for libpng are in pngconf.h. If you need to add, change
or delete an include, this is the place to do it.
@@ -243,7 +241,7 @@
files, pngstruct.h, pnginfo.h, and pngdebug.h, which contain material
that previously appeared in the public headers.
-XIII. Removing unwanted object code
+XI. Removing unwanted object code
There are a bunch of #define's in pngconf.h that control what parts of
libpng are compiled. All the defines end in _SUPPORTED. If you are
@@ -282,7 +280,7 @@
The size of the library itself should not be an issue, because only
those sections that are actually used will be loaded into memory.
-XIV. Enabling or disabling hardware optimizations
+XII. Enabling or disabling hardware optimizations
Certain hardware capabilities, such as the Intel SSE instructions,
are normally detected at run time. Enable them with configure options
@@ -332,7 +330,7 @@
cmake . -DPNG_HARDWARE_OPTIMIZATIONS=no
-XV. Changes to the build and configuration of libpng in libpng-1.5.x
+XIII. Changes to the build and configuration of libpng in libpng-1.5.x
Details of internal changes to the library code can be found in the CHANGES
file and in the GIT repository logs. These will be of no concern to the vast
@@ -423,7 +421,7 @@
libpng, because than the settings would not accurately reflect the settings
that were used to build libpng.
-XVI. Setjmp/longjmp issues
+XIV. Setjmp/longjmp issues
Libpng uses setjmp()/longjmp() for error handling. Unfortunately setjmp()
is known to be not thread-safe on some platforms and we don't know of
@@ -441,7 +439,7 @@
with PNG_SETJMP_SUPPORTED defined, or with PNG_SIMPLIFIED_READ_SUPPORTED
and PNG_SIMPLIFIED_WRITE_SUPPORTED undefined.
-XVII. Common linking failures
+XV. Common linking failures
If your application fails to find libpng or zlib entries while linking:
@@ -453,12 +451,13 @@
If you are using the vstudio project, observe the WARNING in
project/vstudio/README.txt.
-XVIII. Other sources of information about libpng:
+XVI. Other sources of information about libpng:
Further information can be found in the README and libpng-manual.txt
files, in the individual makefiles, in png.h, and the manual pages
libpng.3 and png.5.
+Copyright (c) 2022 Cosmin Truta
Copyright (c) 1998-2002,2006-2016 Glenn Randers-Pehrson
This document is released under the libpng license.
For conditions of distribution and use, see the disclaimer
Modified: branches/stable/source/src/libs/libpng/libpng-src/LICENSE
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/LICENSE 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/LICENSE 2022-11-14 21:05:34 UTC (rev 884)
@@ -4,8 +4,8 @@
PNG Reference Library License version 2
---------------------------------------
- * Copyright (c) 1995-2019 The PNG Reference Library Authors.
- * Copyright (c) 2018-2019 Cosmin Truta.
+ * Copyright (c) 1995-2022 The PNG Reference Library Authors.
+ * Copyright (c) 2018-2022 Cosmin Truta.
* Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
* Copyright (c) 1996-1997 Andreas Dilger.
* Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
Modified: branches/stable/source/src/libs/libpng/libpng-src/Makefile.am
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/Makefile.am 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/Makefile.am 2022-11-14 21:05:34 UTC (rev 884)
@@ -59,8 +59,7 @@
# Generally these are single line shell scripts to run a test with a particular
# set of parameters:
TESTS =\
- tests/pngtest\
- tests/pngtest-badpngs\
+ tests/pngtest-all\
tests/pngvalid-gamma-16-to-8 tests/pngvalid-gamma-alpha-mode\
tests/pngvalid-gamma-background tests/pngvalid-gamma-expand16-alpha-mode\
tests/pngvalid-gamma-expand16-background\
Modified: branches/stable/source/src/libs/libpng/libpng-src/README
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/README 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/README 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,12 +1,12 @@
-README for libpng version 1.6.37 - April 14, 2019
-=================================================
+README for libpng version 1.6.38
+================================
See the note about version numbers near the top of png.h.
See INSTALL for instructions on how to install libpng.
Libpng comes in several distribution formats. Get libpng-*.tar.gz or
-libpng-*.tar.xz or if you want UNIX-style line endings in the text
-files, or lpng*.7z or lpng*.zip if you want DOS-style line endings.
+libpng-*.tar.xz if you want UNIX-style line endings in the text files,
+or lpng*.7z or lpng*.zip if you want DOS-style line endings.
Version 0.89 was the first official release of libpng. Don't let the
fact that it's the first release fool you. The libpng library has been
Modified: branches/stable/source/src/libs/libpng/libpng-src/arm/arm_init.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/arm/arm_init.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/arm/arm_init.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,7 +1,7 @@
/* arm_init.c - NEON optimised filter functions
*
- * Copyright (c) 2018 Cosmin Truta
+ * Copyright (c) 2018-2022 Cosmin Truta
* Copyright (c) 2014,2016 Glenn Randers-Pehrson
* Written by Mans Rullgard, 2011.
*
@@ -10,9 +10,7 @@
* and license in png.h
*/
-/* Below, after checking __linux__, various non-C90 POSIX 1003.1 functions are
- * called.
- */
+/* This module requires POSIX 1003.1 functions. */
#define _POSIX_SOURCE 1
#include "../pngpriv.h"
@@ -33,21 +31,23 @@
* has partial support is contrib/arm-neon/linux.c - a generic Linux
* implementation which reads /proc/cpufino.
*/
+#include <signal.h> /* for sig_atomic_t */
+
#ifndef PNG_ARM_NEON_FILE
-# ifdef __linux__
-# define PNG_ARM_NEON_FILE "contrib/arm-neon/linux.c"
+# if defined(__aarch64__) || defined(_M_ARM64)
+ /* ARM Neon is expected to be unconditionally available on ARM64. */
+# error "PNG_ARM_NEON_CHECK_SUPPORTED must not be defined on this platform"
+# elif defined(__linux__)
+# define PNG_ARM_NEON_FILE "contrib/arm-neon/linux.c"
+# else
+# error "No support for run-time ARM Neon checking; use compile-time options"
# endif
#endif
+static int png_have_neon(png_structp png_ptr);
#ifdef PNG_ARM_NEON_FILE
-
-#include <signal.h> /* for sig_atomic_t */
-static int png_have_neon(png_structp png_ptr);
-#include PNG_ARM_NEON_FILE
-
-#else /* PNG_ARM_NEON_FILE */
-# error "PNG_ARM_NEON_FILE undefined: no support for run-time ARM NEON checks"
-#endif /* PNG_ARM_NEON_FILE */
+# include PNG_ARM_NEON_FILE
+#endif
#endif /* PNG_ARM_NEON_CHECK_SUPPORTED */
#ifndef PNG_ALIGNED_MEMORY_SUPPORTED
Modified: branches/stable/source/src/libs/libpng/libpng-src/arm/filter_neon_intrinsics.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/arm/filter_neon_intrinsics.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/arm/filter_neon_intrinsics.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -18,7 +18,7 @@
/* This code requires -mfpu=neon on the command line: */
#if PNG_ARM_NEON_IMPLEMENTATION == 1 /* intrinsics code from pngpriv.h */
-#if defined(_MSC_VER) && defined(_M_ARM64)
+#if defined(_MSC_VER) && !defined(__clang__) && defined(_M_ARM64)
# include <arm64_neon.h>
#else
# include <arm_neon.h>
Modified: branches/stable/source/src/libs/libpng/libpng-src/arm/palette_neon_intrinsics.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/arm/palette_neon_intrinsics.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/arm/palette_neon_intrinsics.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -14,7 +14,7 @@
#if PNG_ARM_NEON_IMPLEMENTATION == 1
-#if defined(_MSC_VER) && defined(_M_ARM64)
+#if defined(_MSC_VER) && !defined(__clang__) && defined(_M_ARM64)
# include <arm64_neon.h>
#else
# include <arm_neon.h>
@@ -30,8 +30,6 @@
int num_trans = png_ptr->num_trans;
int i;
- png_debug(1, "in png_riffle_palette_neon");
-
/* Initially black, opaque. */
uint8x16x4_t w = {{
vdupq_n_u8(0x00),
@@ -40,6 +38,8 @@
vdupq_n_u8(0xff),
}};
+ png_debug(1, "in png_riffle_palette_neon");
+
/* First, riffle the RGB colours into an RGBA8 palette.
* The alpha component is set to opaque for now.
*/
@@ -65,11 +65,12 @@
png_uint_32 row_width = row_info->width;
const png_uint_32 *riffled_palette =
(const png_uint_32 *)png_ptr->riffled_palette;
- const png_int_32 pixels_per_chunk = 4;
- int i;
+ const png_uint_32 pixels_per_chunk = 4;
+ png_uint_32 i;
png_debug(1, "in png_do_expand_palette_rgba8_neon");
+ PNG_UNUSED(row)
if (row_width < pixels_per_chunk)
return 0;
@@ -109,10 +110,11 @@
png_uint_32 row_width = row_info->width;
png_const_bytep palette = (png_const_bytep)png_ptr->palette;
const png_uint_32 pixels_per_chunk = 8;
- int i;
+ png_uint_32 i;
png_debug(1, "in png_do_expand_palette_rgb8_neon");
+ PNG_UNUSED(row)
if (row_width <= pixels_per_chunk)
return 0;
Added: branches/stable/source/src/libs/libpng/libpng-src/ci/ci_autotools.sh
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/ci/ci_autotools.sh (rev 0)
+++ branches/stable/source/src/libs/libpng/libpng-src/ci/ci_autotools.sh 2022-11-14 21:05:34 UTC (rev 884)
@@ -0,0 +1,117 @@
+#!/usr/bin/env bash
+set -e
+
+# ci_autotools.sh
+# Continuously integrate libpng using the GNU Autotools.
+#
+# Copyright (c) 2019-2022 Cosmin Truta.
+#
+# This software is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h.
+
+CI_SCRIPTNAME="$(basename "$0")"
+CI_SCRIPTDIR="$(cd "$(dirname "$0")" && pwd)"
+CI_SRCDIR="$(dirname "$CI_SCRIPTDIR")"
+CI_BUILDDIR="$CI_SRCDIR/out/autotools.build"
+CI_INSTALLDIR="$CI_SRCDIR/out/autotools.install"
+
+function ci_info {
+ printf >&2 "%s: %s\\n" "$CI_SCRIPTNAME" "$*"
+}
+
+function ci_err {
+ printf >&2 "%s: error: %s\\n" "$CI_SCRIPTNAME" "$*"
+ exit 2
+}
+
+function ci_spawn {
+ printf >&2 "%s: executing:" "$CI_SCRIPTNAME"
+ printf >&2 " %q" "$@"
+ printf >&2 "\\n"
+ "$@"
+}
+
+function ci_init_autotools {
+ CI_SYSTEM_NAME="$(uname -s)"
+ CI_MACHINE_NAME="$(uname -m)"
+ CI_MAKE="${CI_MAKE:-make}"
+ # Set CI_CC to cc by default, if the cc command is available.
+ # The configure script defaults CC to gcc, which is not always a good idea.
+ [[ -x $(command -v cc) ]] && CI_CC="${CI_CC:-cc}"
+ # Ensure that the CI_ variables that cannot be customized reliably are not initialized.
+ [[ ! $CI_CONFIGURE_VARS ]] || ci_err "unexpected: \$CI_CONFIGURE_VARS='$CI_CONFIGURE_VARS'"
+ [[ ! $CI_MAKE_VARS ]] || ci_err "unexpected: \$CI_MAKE_VARS='$CI_MAKE_VARS'"
+}
+
+function ci_trace_autotools {
+ ci_info "## START OF CONFIGURATION ##"
+ ci_info "system name: $CI_SYSTEM_NAME"
+ ci_info "machine hardware name: $CI_MACHINE_NAME"
+ ci_info "source directory: $CI_SRCDIR"
+ ci_info "build directory: $CI_BUILDDIR"
+ ci_info "install directory: $CI_INSTALLDIR"
+ ci_info "environment option: \$CI_CONFIGURE_FLAGS: '$CI_CONFIGURE_FLAGS'"
+ ci_info "environment option: \$CI_MAKE: '$CI_MAKE'"
+ ci_info "environment option: \$CI_MAKE_FLAGS: '$CI_MAKE_FLAGS'"
+ ci_info "environment option: \$CI_CC: '$CI_CC'"
+ ci_info "environment option: \$CI_CC_FLAGS: '$CI_CC_FLAGS'"
+ ci_info "environment option: \$CI_CPP: '$CI_CPP'"
+ ci_info "environment option: \$CI_CPP_FLAGS: '$CI_CPP_FLAGS'"
+ ci_info "environment option: \$CI_AR: '$CI_AR'"
+ ci_info "environment option: \$CI_RANLIB: '$CI_RANLIB'"
+ ci_info "environment option: \$CI_LD: '$CI_LD'"
+ ci_info "environment option: \$CI_LD_FLAGS: '$CI_LD_FLAGS'"
+ ci_info "environment option: \$CI_SANITIZERS: '$CI_SANITIZERS'"
+ ci_info "environment option: \$CI_NO_TEST: '$CI_NO_TEST'"
+ ci_info "environment option: \$CI_NO_INSTALL: '$CI_NO_INSTALL'"
+ ci_info "environment option: \$CI_NO_CLEAN: '$CI_NO_CLEAN'"
+ ci_info "executable: \$CI_MAKE: $(command -V "$CI_MAKE")"
+ [[ $CI_CC ]] &&
+ ci_info "executable: \$CI_CC: $(command -V "$CI_CC")"
+ [[ $CI_CPP ]] &&
+ ci_info "executable: \$CI_CPP: $(command -V "$CI_CPP")"
+ [[ $CI_AR ]] &&
+ ci_info "executable: \$CI_AR: $(command -V "$CI_AR")"
+ [[ $CI_RANLIB ]] &&
+ ci_info "executable: \$CI_RANLIB: $(command -V "$CI_RANLIB")"
+ [[ $CI_LD ]] &&
+ ci_info "executable: \$CI_LD: $(command -V "$CI_LD")"
+ ci_info "## END OF CONFIGURATION ##"
+}
+
+function ci_build_autotools {
+ ci_info "## START OF BUILD ##"
+ # Export the configure build environment.
+ [[ $CI_CC ]] && ci_spawn export CC="$CI_CC"
+ [[ $CI_CC_FLAGS ]] && ci_spawn export CFLAGS="$CI_CC_FLAGS"
+ [[ $CI_CPP ]] && ci_spawn export CPP="$CI_CPP"
+ [[ $CI_CPP_FLAGS ]] && ci_spawn export CPPFLAGS="$CI_CPP_FLAGS"
+ [[ $CI_AR ]] && ci_spawn export AR="$CI_AR"
+ [[ $CI_RANLIB ]] && ci_spawn export RANLIB="$CI_RANLIB"
+ [[ $CI_LD ]] && ci_spawn export CPP="$CI_LD"
+ [[ $CI_LD_FLAGS ]] && ci_spawn export LDFLAGS="$CI_LD_FLAGS"
+ [[ $CI_SANITIZERS ]] && {
+ ci_spawn export CFLAGS="-fsanitize=$CI_SANITIZERS ${CFLAGS:-"-O2"}"
+ ci_spawn export LDFLAGS="-fsanitize=$CI_SANITIZERS $LDFLAGS"
+ }
+ # Build and install.
+ ci_spawn rm -fr "$CI_BUILDDIR" "$CI_INSTALLDIR"
+ ci_spawn mkdir -p "$CI_BUILDDIR"
+ ci_spawn cd "$CI_BUILDDIR"
+ ci_spawn "$CI_SRCDIR/configure" --prefix="$CI_INSTALLDIR" $CI_CONFIGURE_FLAGS
+ ci_spawn "$CI_MAKE" $CI_MAKE_FLAGS
+ [[ $CI_NO_TEST ]] || ci_spawn "$CI_MAKE" $CI_MAKE_FLAGS test
+ [[ $CI_NO_INSTALL ]] || ci_spawn "$CI_MAKE" $CI_MAKE_FLAGS install
+ [[ $CI_NO_CLEAN ]] || ci_spawn "$CI_MAKE" $CI_MAKE_FLAGS clean
+ [[ $CI_NO_CLEAN ]] || ci_spawn "$CI_MAKE" $CI_MAKE_FLAGS distclean
+ ci_info "## END OF BUILD ##"
+}
+
+ci_init_autotools
+ci_trace_autotools
+[[ $# -eq 0 ]] || {
+ ci_info "note: this program accepts environment options only"
+ ci_err "unexpected command arguments: '$*'"
+}
+ci_build_autotools
Property changes on: branches/stable/source/src/libs/libpng/libpng-src/ci/ci_autotools.sh
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/ci/ci_cmake.sh
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/ci/ci_cmake.sh (rev 0)
+++ branches/stable/source/src/libs/libpng/libpng-src/ci/ci_cmake.sh 2022-11-14 21:05:34 UTC (rev 884)
@@ -0,0 +1,169 @@
+#!/usr/bin/env bash
+set -e
+
+# ci_cmake.sh
+# Continuously integrate libpng using CMake.
+#
+# Copyright (c) 2019-2022 Cosmin Truta.
+#
+# This software is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h.
+
+CI_SCRIPTNAME="$(basename "$0")"
+CI_SCRIPTDIR="$(cd "$(dirname "$0")" && pwd)"
+CI_SRCDIR="$(dirname "$CI_SCRIPTDIR")"
+CI_BUILDDIR="$CI_SRCDIR/out/cmake.build"
+CI_INSTALLDIR="$CI_SRCDIR/out/cmake.install"
+
+function ci_info {
+ printf >&2 "%s: %s\\n" "$CI_SCRIPTNAME" "$*"
+}
+
+function ci_err {
+ printf >&2 "%s: error: %s\\n" "$CI_SCRIPTNAME" "$*"
+ exit 2
+}
+
+function ci_spawn {
+ printf >&2 "%s: executing:" "$CI_SCRIPTNAME"
+ printf >&2 " %q" "$@"
+ printf >&2 "\\n"
+ "$@"
+}
+
+function ci_init_cmake {
+ CI_SYSTEM_NAME="$(uname -s)"
+ CI_MACHINE_NAME="$(uname -m)"
+ CI_CMAKE="${CI_CMAKE:-cmake}"
+ CI_CTEST="${CI_CTEST:-ctest}"
+ CI_CMAKE_BUILD_TYPE="${CI_CMAKE_BUILD_TYPE:-Release}"
+ [[ -x $(command -v ninja) ]] && CI_CMAKE_GENERATOR="${CI_CMAKE_GENERATOR:-Ninja}"
+ if [[ $CI_CMAKE_GENERATOR == "Visual Studio"* ]]
+ then
+ # Initialize the CI_...DIR_NATIVE variables, for the benefit of
+ # the native Windows build tools. The regular CI_...DIR variables
+ # can only be used inside Bash-on-Windows.
+ mkdir -p "$CI_BUILDDIR"
+ mkdir -p "$CI_INSTALLDIR"
+ if [[ -x $CYGPATH ]]
+ then
+ CI_SRCDIR_NATIVE="$("$CYGPATH" -w "$CI_SRCDIR")"
+ CI_BUILDDIR_NATIVE="$("$CYGPATH" -w "$CI_BUILDDIR")"
+ CI_INSTALLDIR_NATIVE="$("$CYGPATH" -w "$CI_INSTALLDIR")"
+ else
+ CI_SRCDIR_NATIVE="$(cd "$CI_SRCDIR" ; pwd -W || pwd -P)"
+ CI_BUILDDIR_NATIVE="$(cd "$CI_BUILDDIR" ; pwd -W || pwd -P)"
+ CI_INSTALLDIR_NATIVE="$(cd "$CI_INSTALLDIR" ; pwd -W || pwd -P)"
+ fi
+ # Clean up incidental mixtures of Windows and Bash-on-Windows
+ # environment variables, to avoid confusing MSBuild.
+ [[ $TEMP && ( $Temp || $temp ) ]] && unset TEMP
+ [[ $TMP && ( $Tmp || $tmp ) ]] && unset TMP
+ # Ensure that CI_CMAKE_GENERATOR_PLATFORM is initialized for this generator.
+ [[ $CI_CMAKE_GENERATOR_PLATFORM ]] || ci_err "missing: \$CI_CMAKE_GENERATOR_PLATFORM"
+ fi
+}
+
+function ci_trace_cmake {
+ ci_info "## START OF CONFIGURATION ##"
+ ci_info "system name: $CI_SYSTEM_NAME"
+ ci_info "machine hardware name: $CI_MACHINE_NAME"
+ ci_info "source directory: $CI_SRCDIR"
+ [[ $CI_SRCDIR_NATIVE ]] &&
+ ci_info "source directory (native): $CI_SRCDIR_NATIVE"
+ ci_info "build directory: $CI_BUILDDIR"
+ [[ $CI_BUILDDIR_NATIVE ]] &&
+ ci_info "build directory (native): $CI_BUILDDIR_NATIVE"
+ ci_info "install directory: $CI_INSTALLDIR"
+ [[ $CI_INSTALLDIR_NATIVE ]] &&
+ ci_info "install directory (native): $CI_INSTALLDIR_NATIVE"
+ ci_info "environment option: \$CI_CMAKE: '$CI_CMAKE'"
+ ci_info "environment option: \$CI_CMAKE_GENERATOR: '$CI_CMAKE_GENERATOR'"
+ ci_info "environment option: \$CI_CMAKE_GENERATOR_PLATFORM: '$CI_CMAKE_GENERATOR_PLATFORM'"
+ ci_info "environment option: \$CI_CMAKE_BUILD_TYPE: '$CI_CMAKE_BUILD_TYPE'"
+ ci_info "environment option: \$CI_CMAKE_BUILD_FLAGS: '$CI_CMAKE_BUILD_FLAGS'"
+ ci_info "environment option: \$CI_CMAKE_VARS: '$CI_CMAKE_VARS'"
+ ci_info "environment option: \$CI_CTEST: '$CI_CTEST'"
+ ci_info "environment option: \$CI_CTEST_FLAGS: '$CI_CTEST_FLAGS'"
+ ci_info "environment option: \$CI_CC: '$CI_CC'"
+ ci_info "environment option: \$CI_CC_FLAGS: '$CI_CC_FLAGS'"
+ ci_info "environment option: \$CI_AR: '$CI_AR'"
+ ci_info "environment option: \$CI_RANLIB: '$CI_RANLIB'"
+ ci_info "environment option: \$CI_SANITIZERS: '$CI_SANITIZERS'"
+ ci_info "environment option: \$CI_NO_TEST: '$CI_NO_TEST'"
+ ci_info "environment option: \$CI_NO_INSTALL: '$CI_NO_INSTALL'"
+ ci_info "environment option: \$CI_NO_CLEAN: '$CI_NO_CLEAN'"
+ ci_info "executable: \$CI_CMAKE: $(command -V "$CI_CMAKE")"
+ ci_info "executable: \$CI_CTEST: $(command -V "$CI_CTEST")"
+ [[ $CI_CMAKE_GENERATOR == *"Ninja"* ]] &&
+ ci_info "executable: $(command -V ninja)"
+ [[ $CI_CC ]] &&
+ ci_info "executable: \$CI_CC: $(command -V "$CI_CC")"
+ [[ $CI_AR ]] &&
+ ci_info "executable: \$CI_AR: $(command -V "$CI_AR")"
+ [[ $CI_RANLIB ]] &&
+ ci_info "executable: \$CI_RANLIB: $(command -V "$CI_RANLIB")"
+ ci_info "## END OF CONFIGURATION ##"
+}
+
+function ci_build_cmake {
+ ci_info "## START OF BUILD ##"
+ ci_spawn "$(command -v "$CI_CMAKE")" --version
+ ci_spawn "$(command -v "$CI_CTEST")" --version
+ # Initialize ALL_CC_FLAGS as a string.
+ local ALL_CC_FLAGS="$CI_CC_FLAGS"
+ [[ $CI_SANITIZERS ]] && ALL_CC_FLAGS="-fsanitize=$CI_SANITIZERS $ALL_CC_FLAGS"
+ # Initialize ALL_CMAKE_VARS, ALL_CMAKE_BUILD_FLAGS and ALL_CTEST_FLAGS as arrays.
+ local -a ALL_CMAKE_VARS=()
+ [[ $CI_CC ]] && ALL_CMAKE_VARS+=(-DCMAKE_C_COMPILER="$CI_CC")
+ [[ $ALL_CC_FLAGS ]] && ALL_CMAKE_VARS+=(-DCMAKE_C_FLAGS="$ALL_CC_FLAGS")
+ [[ $CI_AR ]] && ALL_CMAKE_VARS+=(-DCMAKE_AR="$CI_AR")
+ [[ $CI_RANLIB ]] && ALL_CMAKE_VARS+=(-DCMAKE_RANLIB="$CI_RANLIB")
+ ALL_CMAKE_VARS+=(-DCMAKE_BUILD_TYPE="$CI_CMAKE_BUILD_TYPE")
+ ALL_CMAKE_VARS+=(-DCMAKE_VERBOSE_MAKEFILE=ON)
+ [[ $CI_NO_TEST ]] && ALL_CMAKE_VARS+=(-DPNG_TESTS=OFF)
+ ALL_CMAKE_VARS+=($CI_CMAKE_VARS)
+ local -a ALL_CMAKE_BUILD_FLAGS=($CI_CMAKE_BUILD_FLAGS)
+ local -a ALL_CTEST_FLAGS=($CI_CTEST_FLAGS)
+ # Initialize SRCDIR_NATIVE and INSTALLDIR_NATIVE.
+ local SRCDIR_NATIVE="${CI_SRCDIR_NATIVE:-"$CI_SRCDIR"}"
+ local INSTALLDIR_NATIVE="${CI_INSTALLDIR_NATIVE:-"$CI_INSTALLDIR"}"
+ # Export the CMake environment variables.
+ [[ $CI_CMAKE_GENERATOR ]] &&
+ ci_spawn export CMAKE_GENERATOR="$CI_CMAKE_GENERATOR"
+ [[ $CI_CMAKE_GENERATOR_PLATFORM ]] &&
+ ci_spawn export CMAKE_GENERATOR_PLATFORM="$CI_CMAKE_GENERATOR_PLATFORM"
+ # Build and install.
+ ci_spawn rm -fr "$CI_BUILDDIR" "$CI_INSTALLDIR"
+ ci_spawn mkdir -p "$CI_BUILDDIR"
+ ci_spawn cd "$CI_BUILDDIR"
+ ci_spawn "$CI_CMAKE" "${ALL_CMAKE_VARS[@]}" \
+ -DCMAKE_INSTALL_PREFIX="$INSTALLDIR_NATIVE" \
+ "$SRCDIR_NATIVE"
+ ci_spawn "$CI_CMAKE" --build . \
+ --config "$CI_CMAKE_BUILD_TYPE" \
+ "${ALL_CMAKE_BUILD_FLAGS[@]}"
+ [[ $CI_NO_TEST ]] ||
+ ci_spawn "$CI_CTEST" --build-config "$CI_CMAKE_BUILD_TYPE" \
+ "${ALL_CTEST_FLAGS[@]}"
+ [[ $CI_NO_INSTALL ]] ||
+ ci_spawn "$CI_CMAKE" --build . \
+ --config "$CI_CMAKE_BUILD_TYPE" \
+ --target install \
+ "${ALL_CMAKE_BUILD_FLAGS[@]}"
+ [[ $CI_NO_CLEAN ]] ||
+ ci_spawn "$CI_CMAKE" --build . \
+ --config "$CI_CMAKE_BUILD_TYPE" \
+ --target clean \
+ "${ALL_CMAKE_BUILD_FLAGS[@]}"
+ ci_info "## END OF BUILD ##"
+}
+
+ci_init_cmake
+ci_trace_cmake
+[[ $# -eq 0 ]] || {
+ ci_info "note: this program accepts environment options only"
+ ci_err "unexpected command arguments: '$*'"
+}
+ci_build_cmake
Property changes on: branches/stable/source/src/libs/libpng/libpng-src/ci/ci_cmake.sh
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: branches/stable/source/src/libs/libpng/libpng-src/ci/ci_legacy.sh
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/ci/ci_legacy.sh (rev 0)
+++ branches/stable/source/src/libs/libpng/libpng-src/ci/ci_legacy.sh 2022-11-14 21:05:34 UTC (rev 884)
@@ -0,0 +1,147 @@
+#!/usr/bin/env bash
+set -e
+
+# ci_legacy.sh
+# Continuously integrate libpng using the legacy makefiles.
+#
+# Copyright (c) 2019-2022 Cosmin Truta.
+#
+# This software is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h.
+
+CI_SCRIPTNAME="$(basename "$0")"
+CI_SCRIPTDIR="$(cd "$(dirname "$0")" && pwd)"
+CI_SRCDIR="$(dirname "$CI_SCRIPTDIR")"
+CI_BUILDDIR="$CI_SRCDIR"
+
+function ci_info {
+ printf >&2 "%s: %s\\n" "$CI_SCRIPTNAME" "$*"
+}
+
+function ci_err {
+ printf >&2 "%s: error: %s\\n" "$CI_SCRIPTNAME" "$*"
+ exit 2
+}
+
+function ci_spawn {
+ printf >&2 "%s: executing:" "$CI_SCRIPTNAME"
+ printf >&2 " %q" "$@"
+ printf >&2 "\\n"
+ "$@"
+}
+
+function ci_init_legacy {
+ CI_SYSTEM_NAME="$(uname -s)"
+ CI_MACHINE_NAME="$(uname -m)"
+ CI_MAKE="${CI_MAKE:-make}"
+ case "$CI_SYSTEM_NAME" in
+ ( Darwin | *BSD | DragonFly )
+ [[ -x $(command -v clang) ]] && CI_CC="${CI_CC:-clang}" ;;
+ ( * )
+ [[ -x $(command -v gcc) ]] && CI_CC="${CI_CC:-gcc}" ;;
+ esac
+ CI_CC="${CI_CC:-cc}"
+ case "$CI_CC" in
+ ( *clang* )
+ CI_LEGACY_MAKEFILES="${CI_LEGACY_MAKEFILES:-"scripts/makefile.clang"}" ;;
+ ( *gcc* )
+ CI_LEGACY_MAKEFILES="${CI_LEGACY_MAKEFILES:-"scripts/makefile.gcc"}" ;;
+ ( cc | c89 | c99 )
+ CI_LEGACY_MAKEFILES="${CI_LEGACY_MAKEFILES:-"scripts/makefile.std"}" ;;
+ esac
+ CI_LD="${CI_LD:-"$CI_CC"}"
+ CI_LIBS="${CI_LIBS:-"-lz -lm"}"
+}
+
+function ci_trace_legacy {
+ ci_info "## START OF CONFIGURATION ##"
+ ci_info "system name: $CI_SYSTEM_NAME"
+ ci_info "machine hardware name: $CI_MACHINE_NAME"
+ ci_info "source directory: $CI_SRCDIR"
+ ci_info "build directory: $CI_BUILDDIR"
+ ci_info "environment option: \$CI_LEGACY_MAKEFILES: '$CI_LEGACY_MAKEFILES'"
+ ci_info "environment option: \$CI_MAKE: '$CI_MAKE'"
+ ci_info "environment option: \$CI_MAKE_FLAGS: '$CI_MAKE_FLAGS'"
+ ci_info "environment option: \$CI_MAKE_VARS: '$CI_MAKE_VARS'"
+ ci_info "environment option: \$CI_CC: '$CI_CC'"
+ ci_info "environment option: \$CI_CC_FLAGS: '$CI_CC_FLAGS'"
+ ci_info "environment option: \$CI_CPP: '$CI_CPP'"
+ ci_info "environment option: \$CI_CPP_FLAGS: '$CI_CPP_FLAGS'"
+ ci_info "environment option: \$CI_AR: '$CI_AR'"
+ ci_info "environment option: \$CI_RANLIB: '$CI_RANLIB'"
+ ci_info "environment option: \$CI_LD: '$CI_LD'"
+ ci_info "environment option: \$CI_LD_FLAGS: '$CI_LD_FLAGS'"
+ ci_info "environment option: \$CI_LIBS: '$CI_LIBS'"
+ ci_info "environment option: \$CI_SANITIZERS: '$CI_SANITIZERS'"
+ ci_info "environment option: \$CI_NO_TEST: '$CI_NO_TEST'"
+ ci_info "environment option: \$CI_NO_CLEAN: '$CI_NO_CLEAN'"
+ ci_info "executable: \$CI_MAKE: $(command -V "$CI_MAKE")"
+ [[ $CI_CC ]] &&
+ ci_info "executable: \$CI_CC: $(command -V "$CI_CC")"
+ [[ $CI_CPP ]] &&
+ ci_info "executable: \$CI_CPP: $(command -V "$CI_CPP")"
+ [[ $CI_AR ]] &&
+ ci_info "executable: \$CI_AR: $(command -V "$CI_AR")"
+ [[ $CI_RANLIB ]] &&
+ ci_info "executable: \$CI_RANLIB: $(command -V "$CI_RANLIB")"
+ [[ $CI_LD ]] &&
+ ci_info "executable: \$CI_LD: $(command -V "$CI_LD")"
+ ci_info "## END OF CONFIGURATION ##"
+}
+
+function ci_build_legacy {
+ ci_info "## START OF BUILD ##"
+ # Initialize ALL_CC_FLAGS and ALL_LD_FLAGS as strings.
+ local ALL_CC_FLAGS="$CI_CC_FLAGS"
+ local ALL_LD_FLAGS="$CI_LD_FLAGS"
+ [[ $CI_SANITIZERS ]] && {
+ ALL_CC_FLAGS="-fsanitize=$CI_SANITIZERS ${ALL_CC_FLAGS:-"-O2"}"
+ ALL_LD_FLAGS="-fsanitize=$CI_SANITIZERS $ALL_LD_FLAGS"
+ }
+ # Initialize ALL_MAKE_FLAGS and ALL_MAKE_VARS as arrays.
+ local -a ALL_MAKE_FLAGS=($CI_MAKE_FLAGS)
+ local -a ALL_MAKE_VARS=()
+ [[ $CI_CC ]] && ALL_MAKE_VARS+=(CC="$CI_CC")
+ [[ $ALL_CC_FLAGS ]] && ALL_MAKE_VARS+=(CFLAGS="$ALL_CC_FLAGS")
+ [[ $CI_CPP ]] && ALL_MAKE_VARS+=(CPP="$CI_CPP")
+ [[ $CI_CPP_FLAGS ]] && ALL_MAKE_VARS+=(CPPFLAGS="$CI_CPP_FLAGS")
+ [[ $CI_AR ]] && ALL_MAKE_VARS+=(
+ AR="${CI_AR:-ar}"
+ AR_RC="${CI_AR:-ar} rc"
+ )
+ [[ $CI_RANLIB ]] && ALL_MAKE_VARS+=(RANLIB="$CI_RANLIB")
+ [[ $CI_LD ]] && ALL_MAKE_VARS+=(LD="$CI_LD")
+ [[ $ALL_LD_FLAGS ]] && ALL_MAKE_VARS+=(LDFLAGS="$ALL_LD_FLAGS")
+ ALL_MAKE_VARS+=(LIBS="$CI_LIBS")
+ ALL_MAKE_VARS+=($CI_MAKE_VARS)
+ # Build!
+ ci_spawn cd "$CI_SRCDIR"
+ local MY_MAKEFILE
+ for MY_MAKEFILE in $CI_LEGACY_MAKEFILES
+ do
+ ci_info "using makefile: $MY_MAKEFILE"
+ ci_spawn "$CI_MAKE" -f "$MY_MAKEFILE" \
+ "${ALL_MAKE_FLAGS[@]}" \
+ "${ALL_MAKE_VARS[@]}"
+ [[ $CI_NO_TEST ]] ||
+ ci_spawn "$CI_MAKE" -f "$MY_MAKEFILE" \
+ "${ALL_MAKE_FLAGS[@]}" \
+ "${ALL_MAKE_VARS[@]}" \
+ test
+ [[ $CI_NO_CLEAN ]] ||
+ ci_spawn "$CI_MAKE" -f "$MY_MAKEFILE" \
+ "${ALL_MAKE_FLAGS[@]}" \
+ "${ALL_MAKE_VARS[@]}" \
+ clean
+ done
+ ci_info "## END OF BUILD ##"
+}
+
+ci_init_legacy
+ci_trace_legacy
+[[ $# -eq 0 ]] || {
+ ci_info "note: this program accepts environment options only"
+ ci_err "unexpected command arguments: '$*'"
+}
+ci_build_legacy
Property changes on: branches/stable/source/src/libs/libpng/libpng-src/ci/ci_legacy.sh
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Modified: branches/stable/source/src/libs/libpng/libpng-src/config.h.in
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/config.h.in 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/config.h.in 2022-11-14 21:05:34 UTC (rev 884)
@@ -15,9 +15,6 @@
/* Define to 1 if you have the `z' library (-lz). */
#undef HAVE_LIBZ
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
/* Define to 1 if you have the `pow' function. */
#undef HAVE_POW
@@ -24,6 +21,9 @@
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
+/* Define to 1 if you have the <stdio.h> header file. */
+#undef HAVE_STDIO_H
+
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
@@ -96,7 +96,9 @@
/* Enable POWERPC VSX optimizations */
#undef PNG_POWERPC_VSX_OPT
-/* Define to 1 if you have the ANSI C header files. */
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
+ required in a freestanding environment). This macro is provided for
+ backward compatibility; new code need not use it. */
#undef STDC_HEADERS
/* Define to 1 if your <sys/time.h> declares `struct tm'. */
@@ -105,22 +107,17 @@
/* Version number of package */
#undef VERSION
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
-
/* Define to the equivalent of the C99 'restrict' keyword, or to
nothing if this is not supported. Do not define if restrict is
- supported directly. */
+ supported only directly. */
#undef restrict
-/* Work around a bug in Sun C++: it does not support _Restrict or
- __restrict__, even though the corresponding Sun C compiler ends up with
- "#define restrict _Restrict" or "#define restrict __restrict__" in the
- previous line. Perhaps some future version of Sun C++ will work with
- restrict; if so, hopefully it defines __RESTRICT like Sun C does. */
-#if defined __SUNPRO_CC && !defined __RESTRICT
+/* Work around a bug in older versions of Sun C++, which did not
+ #define __restrict__ or support _Restrict or __restrict__
+ even though the corresponding Sun C compiler ended up with
+ "#define restrict _Restrict" or "#define restrict __restrict__"
+ in the previous line. This workaround can be removed once
+ we assume Oracle Developer Studio 12.5 (2016) or later. */
+#if defined __SUNPRO_CC && !defined __RESTRICT && !defined __restrict__
# define _Restrict
# define __restrict__
#endif
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-#undef size_t
Modified: branches/stable/source/src/libs/libpng/libpng-src/configure.ac
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/configure.ac 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/configure.ac 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,6 +1,6 @@
# configure.ac
-# Copyright (c) 2018 Cosmin Truta
+# Copyright (c) 2018-2022 Cosmin Truta
# Copyright (c) 2004-2016 Glenn Randers-Pehrson
# This code is released under the libpng license.
@@ -25,7 +25,7 @@
dnl Version number stuff here:
-AC_INIT([libpng],[1.6.37],[png-mng-implement at lists.sourceforge.net])
+AC_INIT([libpng],[1.6.38],[png-mng-implement at lists.sourceforge.net])
AC_CONFIG_MACRO_DIR([scripts])
# libpng does not follow GNU file name conventions (hence 'foreign')
@@ -46,10 +46,10 @@
dnl AM_PREREQ([1.11.2])
dnl stop configure from automagically running automake
-PNGLIB_VERSION=1.6.37
+PNGLIB_VERSION=1.6.38
PNGLIB_MAJOR=1
PNGLIB_MINOR=6
-PNGLIB_RELEASE=37
+PNGLIB_RELEASE=38
dnl End of version number stuff
@@ -89,9 +89,9 @@
DFNCPP="$CPP"
AC_SUBST(DFNCPP)
-# -Werror cannot be passed to GCC in CFLAGS because configure will fail (it
-# checks the compiler with a program that generates a warning), add the
-# following option to deal with this
+# -Werror cannot be passed to GCC in CFLAGS because configure will fail
+# (it checks the compiler with a program that generates a warning).
+# Add the following option to deal with this:
AC_ARG_VAR(PNG_COPTS,
[additional flags for the C compiler, use this for options that would]
[cause configure itself to fail])
@@ -114,10 +114,10 @@
CFLAGS="$sav_CFLAGS"
fi],)
-# For GCC 5 the default mode for C is -std=gnu11 instead of -std=gnu89
-# In pngpriv.h we request just the POSIX 1003.1 and C89 APIs by defining _POSIX_SOURCE to 1
-# This is incompatible with the new default mode, so we test for that and force the
-# "-std=c89" compiler option:
+# For GCC 5 the default mode for C is -std=gnu11 instead of -std=gnu89.
+# In pngpriv.h we request just the POSIX 1003.1 and C89 APIs by defining
+# _POSIX_SOURCE to 1. This is incompatible with the new default mode, so
+# we test for that and force the "-std=c89" compiler option:
AC_MSG_CHECKING([if we need to force back C standard to C89])
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM([
@@ -133,22 +133,16 @@
CFLAGS="$CFLAGS -std=c89"
])
-# Checks for header files.
-AC_HEADER_STDC
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
+# Checks for structures and compiler characteristics.
AC_STRUCT_TM
AC_C_RESTRICT
# Checks for library functions.
-AC_FUNC_STRTOD
-AC_CHECK_FUNCS([pow], , AC_CHECK_LIB(m, pow, , AC_MSG_ERROR(cannot find pow)) )
+AC_CHECK_FUNCS([pow], , AC_CHECK_LIB(m, pow, , AC_MSG_ERROR(cannot find pow)))
-# Some later POSIX 1003.1 functions are required for test programs, failure here
-# is soft (the corresponding test program is not built).
-AC_CHECK_FUNC([clock_gettime],,[AC_MSG_WARN([not building timepng])])
+# Some later POSIX 1003.1 functions are required for test programs, failure
+# here is soft (the corresponding test program is not built).
+AC_CHECK_FUNC([clock_gettime], , [AC_MSG_WARN([not building timepng])])
AM_CONDITIONAL([HAVE_CLOCK_GETTIME], [test "$ac_cv_func_clock_gettime" = "yes"])
AC_ARG_WITH(zlib-prefix,
@@ -296,7 +290,7 @@
AM_CONDITIONAL([DO_INSTALL_LIBPNG_CONFIG],
[test "$enable_unversioned_libpng_config" != "no"])
-# HOST SPECIFIC OPTIONS
+# HOST-SPECIFIC OPTIONS
# =====================
#
# DEFAULT
@@ -326,12 +320,12 @@
case "$host_cpu" in
arm*|aarch64*)
enable_arm_neon=yes
- AC_DEFINE([PNG_ARM_NEON_OPT], [0],
+ AC_DEFINE([PNG_ARM_NEON_OPT], [2],
[Enable ARM_NEON optimizations])
;;
mipsel*|mips64el*)
enable_mips_msa=yes
- AC_DEFINE([PNG_MIPS_MSA_OPT], [0],
+ AC_DEFINE([PNG_MIPS_MSA_OPT], [2],
[Enable MIPS_MSA optimizations])
;;
i?86|x86_64)
@@ -366,7 +360,7 @@
AC_DEFINE([PNG_ARM_NEON_OPT], [0],
[Disable ARM Neon optimizations])
# Prevent inclusion of the assembler files below:
- enable_arm_neon=no;;
+ enable_arm_neon=no ;;
check)
AC_DEFINE([PNG_ARM_NEON_CHECK_SUPPORTED], [],
[Check for ARM Neon support at run-time]);;
@@ -383,19 +377,19 @@
AC_MSG_ERROR([--enable-arm-neon=${enable_arm_neon}: invalid value])
esac])
-# Add ARM specific files to all builds where the host_cpu is arm ('arm*') or
-# where ARM optimizations were explicitly requested (this allows a fallback if a
-# future host CPU does not match 'arm*')
+# Add ARM-specific files to all builds where $host_cpu is arm ('arm*') or
+# where ARM optimizations were explicitly requested (this allows a fallback
+# if a future host CPU does not match 'arm*')
AM_CONDITIONAL([PNG_ARM_NEON],
[test "$enable_arm_neon" != 'no' &&
case "$host_cpu" in
- arm*|aarch64*) :;;
- *) test "$enable_arm_neon" != '';;
+ arm*|aarch64*) : ;;
+ *) test "$enable_arm_neon" != '' ;;
esac])
# MIPS
-# ===
+# ====
#
# MIPS MSA (SIMD) support.
@@ -412,7 +406,7 @@
AC_DEFINE([PNG_MIPS_MSA_OPT], [0],
[Disable MIPS MSA optimizations])
# Prevent inclusion of the assembler files below:
- enable_mips_msa=no;;
+ enable_mips_msa=no ;;
check)
AC_DEFINE([PNG_MIPS_MSA_CHECK_SUPPORTED], [],
[Check for MIPS MSA support at run-time]);;
@@ -429,14 +423,14 @@
AC_MSG_ERROR([--enable-mips-msa=${enable_mips_msa}: invalid value])
esac])
-# Add MIPS specific files to all builds where the host_cpu is mips ('mips*') or
-# where MIPS optimizations were explicitly requested (this allows a fallback if a
-# future host CPU does not match 'mips*')
+# Add MIPS-specific files to all builds where $host_cpu is mips ('mips*') or
+# where MIPS optimizations were explicitly requested (this allows a fallback
+# if a future host CPU does not match 'mips*')
AM_CONDITIONAL([PNG_MIPS_MSA],
[test "$enable_mips_msa" != 'no' &&
case "$host_cpu" in
- mipsel*|mips64el*) :;;
+ mipsel*|mips64el*) : ;;
esac])
# INTEL
@@ -456,7 +450,7 @@
AC_DEFINE([PNG_INTEL_SSE_OPT], [0],
[Disable Intel SSE optimizations])
# Prevent inclusion of the assembler files below:
- enable_intel_sse=no;;
+ enable_intel_sse=no ;;
yes|on)
AC_DEFINE([PNG_INTEL_SSE_OPT], [1],
[Enable Intel SSE optimizations]);;
@@ -464,18 +458,18 @@
AC_MSG_ERROR([--enable-intel-sse=${enable_intel_sse}: invalid value])
esac])
-# Add Intel specific files to all builds where the host_cpu is Intel ('x86*')
-# or where Intel optimizations were explicitly requested (this allows a
-# fallback if a future host CPU does not match 'x86*')
+# Add Intel-specific files to all builds where $host_cpu is Intel ('x86*') or
+# where Intel optimizations were explicitly requested (this allows a fallback
+# if a future host CPU does not match 'x86*')
AM_CONDITIONAL([PNG_INTEL_SSE],
[test "$enable_intel_sse" != 'no' &&
case "$host_cpu" in
- i?86|x86_64) :;;
- *) test "$enable_intel_sse" != '';;
+ i?86|x86_64) : ;;
+ *) test "$enable_intel_sse" != '' ;;
esac])
# PowerPC
-# ===
+# =======
#
# PowerPC VSX (SIMD) support.
@@ -491,8 +485,8 @@
# disable the default enabling on __ppc64__ systems:
AC_DEFINE([PNG_POWERPC_VSX_OPT], [0],
[Disable POWERPC VSX optimizations])
- # Prevent inclusion of the platform specific files below:
- enable_powerpc_vsx=no;;
+ # Prevent inclusion of the platform-specific files below:
+ enable_powerpc_vsx=no ;;
check)
AC_DEFINE([PNG_POWERPC_VSX_CHECK_SUPPORTED], [],
[Check for POWERPC VSX support at run-time])
@@ -506,22 +500,21 @@
[Enable POWERPC VSX optimizations])
AC_MSG_WARN([--enable-powerpc-vsx: please specify 'check' or 'api', if]
[you want the optimizations unconditionally pass '-maltivec -mvsx']
- [or '-mcpu=power8'to the compiler.]);;
+ [or '-mcpu=power8' to the compiler.]);;
*)
AC_MSG_ERROR([--enable-powerpc-vsx=${enable_powerpc_vsx}: invalid value])
esac])
-# Add PowerPC specific files to all builds where the host_cpu is powerpc('powerpc*') or
-# where POWERPC optimizations were explicitly requested (this allows a fallback if a
-# future host CPU does not match 'powerpc*')
+# Add PowerPC-specific files to all builds where $host_cpu is powerpc('powerpc*')
+# or where PowerPC optimizations were explicitly requested (this allows a fallback
+# if a future host CPU does not match 'powerpc*')
AM_CONDITIONAL([PNG_POWERPC_VSX],
[test "$enable_powerpc_vsx" != 'no' &&
case "$host_cpu" in
- powerpc*|ppc64*) :;;
+ powerpc*|ppc64*) : ;;
esac])
-
AC_MSG_NOTICE([[Extra options for compiler: $PNG_COPTS]])
# Config files, substituting as above
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/gentests.sh
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/gentests.sh 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/gentests.sh 2022-11-14 21:05:34 UTC (rev 884)
@@ -2,8 +2,6 @@
#
# Copyright (c) 2013 John Cunningham Bowler
#
-# Last changed in libpng 1.6.0 [February 14, 2013]
-#
# This code is released under the libpng license.
# For conditions of distribution and use, see the disclaimer
# and license in png.h
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/makepng.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/makepng.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/makepng.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -3,8 +3,6 @@
/* Copyright: */
#define COPYRIGHT "\251 2013,2015 John Cunningham Bowler"
/*
- * Last changed in libpng 1.6.20 [November 24, 2015]
- *
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
* and license in png.h
@@ -299,25 +297,28 @@
unsigned int x, y;
volatile unsigned int ip = 0;
- for (x=0; x<size; ++x) for (y=0; y<size; ++y)
+ for (x=0; x<size; ++x)
{
- ip = x + (size * y);
+ for (y=0; y<size; ++y)
+ {
+ ip = x + (size * y);
- /* size is at most 16, so the scaled value below fits in 16 bits
- */
-# define interp(pos, c1, c2) ((pos * c1) + ((size-pos) * c2))
-# define xyinterp(x, y, c1, c2, c3, c4) (((size * size / 2) +\
- (interp(x, c1, c2) * y + (size-y) * interp(x, c3, c4))) /\
- (size*size))
+ /* size is at most 16, so the scaled value below fits in 16 bits
+ */
+# define interp(pos, c1, c2) ((pos * c1) + ((size-pos) * c2))
+# define xyinterp(x, y, c1, c2, c3, c4) (((size * size / 2) +\
+ (interp(x, c1, c2) * y + (size-y) * interp(x, c3, c4))) /\
+ (size*size))
- set_color(palette+ip, trans+ip,
- /* color: green, red,blue,white */
- xyinterp(x, y, 0, 255, 0, 255),
- xyinterp(x, y, 255, 0, 0, 255),
- xyinterp(x, y, 0, 0, 255, 255),
- /* alpha: 0, 102, 204, 255) */
- xyinterp(x, y, 0, 102, 204, 255),
- gamma_table);
+ set_color(palette+ip, trans+ip,
+ /* color: green, red,blue,white */
+ xyinterp(x, y, 0, 255, 0, 255),
+ xyinterp(x, y, 255, 0, 0, 255),
+ xyinterp(x, y, 0, 0, 255, 255),
+ /* alpha: 0, 102, 204, 255) */
+ xyinterp(x, y, 0, 102, 204, 255),
+ gamma_table);
+ }
}
return ip+1;
@@ -396,7 +397,7 @@
image_size_of_type(color_type, bit_depth, colors, small)-1;
png_uint_32 depth_max = (1U << bit_depth)-1; /* up to 65536 */
- if (colors[0] == 0) if (small)
+ if (colors[0] == 0 && small)
{
unsigned int pixel_depth = pixel_depth_of_type(color_type, bit_depth);
@@ -858,10 +859,13 @@
{
unsigned int i;
- if (real_gamma == 45455) for (i=0; i<256; ++i)
+ if (real_gamma == 45455)
{
- gamma_table[i] = (png_byte)i;
- conv = 1.;
+ for (i=0; i<256; ++i)
+ {
+ gamma_table[i] = (png_byte)i;
+ conv = 1.;
+ }
}
else
@@ -1430,10 +1434,13 @@
for (i=0; *param && i<nparams; ++i)
{
list[i] = param;
- while (*++param) if (*param == '\n' || *param == ':')
+ while (*++param)
{
- *param++ = 0; /* Terminate last parameter */
- break; /* And start a new one. */
+ if (*param == '\n' || *param == ':')
+ {
+ *param++ = 0; /* Terminate last parameter */
+ break; /* And start a new one. */
+ }
}
}
@@ -1869,7 +1876,7 @@
}
}
- /* small and colors are incomparible (will probably crash if both are used at
+ /* small and colors are incompatible (will probably crash if both are used at
* the same time!)
*/
if (small && colors[0] != 0)
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngimage.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngimage.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngimage.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,9 +1,9 @@
+
/* pngimage.c
*
+ * Copyright (c) 2021 Cosmin Truta
* Copyright (c) 2015,2016 John Cunningham Bowler
*
- * Last changed in libpng 1.6.24 [August 4, 2016]
- *
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
* and license in png.h
@@ -12,6 +12,7 @@
* using png_read_png and then write with png_write_png. Test all possible
* transforms.
*/
+
#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
@@ -317,11 +318,10 @@
t &= -t; /* first set bit */
- for (i=0; i<TTABLE_SIZE; ++i) if (transform_info[i].name != NULL)
- {
- if ((transform_info[i].transform & t) != 0)
- return transform_info[i].name;
- }
+ for (i=0; i<TTABLE_SIZE; ++i)
+ if (transform_info[i].name != NULL)
+ if ((transform_info[i].transform & t) != 0)
+ return transform_info[i].name;
return "invalid transform";
}
@@ -338,13 +338,16 @@
{
unsigned int i;
- for (i=0; i<TTABLE_SIZE; ++i) if (transform_info[i].name != NULL)
+ for (i=0; i<TTABLE_SIZE; ++i)
{
- if (transform_info[i].when & TRANSFORM_R)
- read_transforms |= transform_info[i].transform;
+ if (transform_info[i].name != NULL)
+ {
+ if (transform_info[i].when & TRANSFORM_R)
+ read_transforms |= transform_info[i].transform;
- if (transform_info[i].when & TRANSFORM_W)
- write_transforms |= transform_info[i].transform;
+ if (transform_info[i].when & TRANSFORM_W)
+ write_transforms |= transform_info[i].transform;
+ }
}
/* Reversible transforms are those which are supported on both read and
@@ -962,21 +965,24 @@
int bd = dp->bit_depth;
unsigned int i;
- for (i=0; i<TTABLE_SIZE; ++i) if (transform_info[i].name != NULL)
+ for (i=0; i<TTABLE_SIZE; ++i)
{
- int transform = transform_info[i].transform;
+ if (transform_info[i].name != NULL)
+ {
+ int transform = transform_info[i].transform;
- if ((transform_info[i].valid_chunks == 0 ||
- (transform_info[i].valid_chunks & chunks) != 0) &&
- (transform_info[i].color_mask_required & ct) ==
- transform_info[i].color_mask_required &&
- (transform_info[i].color_mask_absent & ct) == 0 &&
- (transform_info[i].bit_depths & bd) != 0 &&
- (transform_info[i].when & TRANSFORM_R) != 0)
- active |= transform;
+ if ((transform_info[i].valid_chunks == 0 ||
+ (transform_info[i].valid_chunks & chunks) != 0) &&
+ (transform_info[i].color_mask_required & ct) ==
+ transform_info[i].color_mask_required &&
+ (transform_info[i].color_mask_absent & ct) == 0 &&
+ (transform_info[i].bit_depths & bd) != 0 &&
+ (transform_info[i].when & TRANSFORM_R) != 0)
+ active |= transform;
- else if ((transform_info[i].when & TRANSFORM_R) != 0)
- inactive |= transform;
+ else if ((transform_info[i].when & TRANSFORM_R) != 0)
+ inactive |= transform;
+ }
}
/* Some transforms appear multiple times in the table; the 'active' status
@@ -1000,8 +1006,9 @@
int interlace_method, compression_method, filter_method;
const char *e = NULL;
- png_get_IHDR(dp->read_pp, dp->read_ip, &width, &height, &bit_depth,
- &color_type, &interlace_method, &compression_method, &filter_method);
+ if (!png_get_IHDR(dp->read_pp, dp->read_ip, &width, &height, &bit_depth,
+ &color_type, &interlace_method, &compression_method, &filter_method))
+ display_log(dp, LIBPNG_BUG, "png_get_IHDR failed");
# define C(item) if (item != dp->item) \
display_log(dp, APP_WARNING, "IHDR " #item "(%lu) changed to %lu",\
@@ -1081,8 +1088,9 @@
size_t x;
/* Find the first error */
- for (x=0; x<rowbytes-1; ++x) if (row[x] != orig[x])
- break;
+ for (x=0; x<rowbytes-1; ++x)
+ if (row[x] != orig[x])
+ break;
display_log(dp, APP_FAIL,
"byte(%lu,%lu) changed 0x%.2x -> 0x%.2x",
@@ -1137,6 +1145,7 @@
display_log(dp, LIBPNG_ERROR, "invalid colour type %d",
color_type);
/*NOTREACHED*/
+ memset(sig_bits, 0, sizeof(sig_bits));
bpp = 0;
break;
}
@@ -1198,7 +1207,7 @@
sig_bits[0] = (png_byte)b;
break;
- case 4: /* Relicate twice */
+ case 4: /* Replicate twice */
/* Value is 1, 2, 3 or 4 */
b = 0xf & ((0xf << 4) >> sig_bits[0]);
b |= b << 4;
@@ -1686,8 +1695,9 @@
printf("%s: pngimage ", pass ? "PASS" : "FAIL");
- for (j=1; j<option_end; ++j) if (j != ilog)
- printf("%s ", argv[j]);
+ for (j=1; j<option_end; ++j)
+ if (j != ilog)
+ printf("%s ", argv[j]);
printf("%s\n", d.filename);
}
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngstest.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngstest.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngstest.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,7 +1,7 @@
-/*-
- * pngstest.c
+
+/* pngstest.c
*
- * Last changed in libpng 1.6.31 [July 27, 2017]
+ * Copyright (c) 2021 Cosmin Truta
* Copyright (c) 2013-2017 John Cunningham Bowler
*
* This code is released under the libpng license.
@@ -10,8 +10,9 @@
*
* Test for the PNG 'simplified' APIs.
*/
+
#define _ISOC90_SOURCE 1
-#define MALLOC_CHECK_ 2/*glibc facility: turn on debugging*/
+#define MALLOC_CHECK_ 2 /*glibc facility: turn on debugging*/
#include <stddef.h>
#include <stdlib.h>
@@ -2701,7 +2702,7 @@
{
if ((a->opts & ACCUMULATE) == 0)
{
- char pindex[9];
+ char pindex[16];
sprintf(pindex, "%lu[%lu]", (unsigned long)y,
(unsigned long)a->image.colormap_entries);
logerror(a, a->file_name, ": bad pixel index: ", pindex);
@@ -2712,12 +2713,12 @@
else if (y >= b->image.colormap_entries)
{
if ((b->opts & ACCUMULATE) == 0)
- {
- char pindex[9];
+ {
+ char pindex[16];
sprintf(pindex, "%lu[%lu]", (unsigned long)y,
(unsigned long)b->image.colormap_entries);
logerror(b, b->file_name, ": bad pixel index: ", pindex);
- }
+ }
result = 0;
}
@@ -2820,8 +2821,11 @@
bchannels = component_loc(bloc, formatb);
/* Hence the btoa array. */
- for (i=0; i<4; ++i) if (bloc[i] < 4)
- btoa[bloc[i]] = aloc[i]; /* may be '4' for alpha */
+ for (i=0; i<4; ++i)
+ {
+ if (bloc[i] < 4)
+ btoa[bloc[i]] = aloc[i]; /* may be '4' for alpha */
+ }
if (alpha_added)
alpha_added = bloc[0]; /* location of alpha channel in image b */
@@ -3209,10 +3213,10 @@
else if (image->opts & USE_FILE)
{
#ifdef PNG_SIMPLIFIED_WRITE_STDIO_SUPPORTED
- static int counter = 0;
+ static unsigned int counter = 0;
char name[32];
- sprintf(name, "%s%d.png", tmpf, ++counter);
+ sprintf(name, "%s%u.png", tmpf, ++counter);
if (png_image_write_to_file(&image->image, name, convert_to_8bit,
image->buffer+16, (png_int_32)image->stride, image->colormap))
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngunknown.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngunknown.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngunknown.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,7 +1,7 @@
/* pngunknown.c - test the read side unknown chunk handling
*
- * Last changed in libpng 1.6.32 [August 24, 2017]
+ * Copyright (c) 2021 Cosmin Truta
* Copyright (c) 2015,2017 Glenn Randers-Pehrson
* Written by John Cunningham Bowler
*
@@ -370,7 +370,9 @@
{
int i = NINFO;
- while (--i >= 0) if (chunk_info[i].flag == flag) return i;
+ while (--i >= 0)
+ if (chunk_info[i].flag == flag)
+ return i;
fprintf(stderr, "pngunknown: internal error\n");
exit(4);
@@ -547,12 +549,12 @@
case PNG_HANDLE_CHUNK_AS_DEFAULT:
case PNG_HANDLE_CHUNK_NEVER:
- discard = 1/*handled; discard*/;
+ discard = 1; /*handled; discard*/
break;
case PNG_HANDLE_CHUNK_IF_SAFE:
case PNG_HANDLE_CHUNK_ALWAYS:
- discard = 0/*not handled; keep*/;
+ discard = 0; /*not handled; keep*/
break;
}
@@ -559,15 +561,18 @@
/* Also store information about this chunk in the display, the relevant flag
* is set if the chunk is to be kept ('not handled'.)
*/
- if (chunk >= 0) if (!discard) /* stupidity to stop a GCC warning */
+ if (chunk >= 0)
{
- png_uint_32 flag = chunk_info[chunk].flag;
+ if (!discard) /* stupidity to stop a GCC warning */
+ {
+ png_uint_32 flag = chunk_info[chunk].flag;
- if (pc->location & PNG_AFTER_IDAT)
- d->after_IDAT |= flag;
+ if (pc->location & PNG_AFTER_IDAT)
+ d->after_IDAT |= flag;
- else
- d->before_IDAT |= flag;
+ else
+ d->before_IDAT |= flag;
+ }
}
/* However if there is no support to store unknown chunks don't ask libpng to
@@ -841,8 +846,9 @@
{
png_uint_32 y;
- for (y=0; y<height; ++y) if (PNG_ROW_IN_INTERLACE_PASS(y, ipass))
- png_read_row(d->png_ptr, NULL, NULL);
+ for (y=0; y<height; ++y)
+ if (PNG_ROW_IN_INTERLACE_PASS(y, ipass))
+ png_read_row(d->png_ptr, NULL, NULL);
}
}
} /* interlaced */
@@ -1091,15 +1097,15 @@
static const char *standard_tests[] =
{
- "discard", "default=discard", 0,
- "save", "default=save", 0,
- "if-safe", "default=if-safe", 0,
- "vpAg", "vpAg=if-safe", 0,
- "sTER", "sTER=if-safe", 0,
- "IDAT", "default=discard", "IDAT=save", 0,
- "sAPI", "bKGD=save", "cHRM=save", "gAMA=save", "all=discard", "iCCP=save",
- "sBIT=save", "sRGB=save", "eXIf=save", 0,
- 0/*end*/
+ "discard", "default=discard", NULL,
+ "save", "default=save", NULL,
+ "if-safe", "default=if-safe", NULL,
+ "vpAg", "vpAg=if-safe", NULL,
+ "sTER", "sTER=if-safe", NULL,
+ "IDAT", "default=discard", "IDAT=save", NULL,
+ "sAPI", "bKGD=save", "cHRM=save", "gAMA=save", "all=discard", "iCCP=save",
+ "sBIT=save", "sRGB=save", "eXIf=save", NULL,
+ NULL /*end*/
};
static PNG_NORETURN void
@@ -1115,7 +1121,7 @@
main(int argc, const char **argv)
{
FILE *fp;
- png_uint_32 default_flags[4/*valid,unknown{before,after}*/];
+ png_uint_32 default_flags[4]; /*valid,unknown{before,after}*/
int strict = 0, default_tests = 0;
const char *count_argv = "default=save";
const char *touch_file = NULL;
@@ -1153,8 +1159,9 @@
/* GCC BUG: if (default_tests && argc != 1) triggers some weird GCC argc
* optimization which causes warnings with -Wstrict-overflow!
*/
- else if (default_tests) if (argc != 1)
- usage(d.program, "extra arguments");
+ else if (default_tests)
+ if (argc != 1)
+ usage(d.program, "extra arguments");
/* The name of the test file is the last argument; remove it. */
d.file = argv[--argc];
@@ -1216,7 +1223,11 @@
const char *result;
int arg_count = 0;
- while (*next) ++next, ++arg_count;
+ while (*next != NULL)
+ {
+ ++next;
+ ++arg_count;
+ }
perform_one_test_safe(fp, arg_count, test, default_flags, &d,
this_test);
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngvalid.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngvalid.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/pngvalid.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,7 +1,7 @@
/* pngvalid.c - validate libpng by constructing then reading png files.
*
- * Last changed in libpng 1.6.31 [July 27, 2017]
+ * Copyright (c) 2021 Cosmin Truta
* Copyright (c) 2014-2017 John Cunningham Bowler
*
* This code is released under the libpng license.
@@ -22,6 +22,7 @@
#define _ISOC99_SOURCE 1 /* For floating point */
#define _GNU_SOURCE 1 /* For the floating point exception extension */
#define _BSD_SOURCE 1 /* For the floating point exception extension */
+#define _DEFAULT_SOURCE 1 /* For the floating point exception extension */
#include <signal.h>
#include <stdio.h>
@@ -5822,8 +5823,9 @@
for (interlace_type = PNG_INTERLACE_NONE;
interlace_type < INTERLACE_LAST; ++interlace_type)
{
- standard_test(&pm->this, FILEID(colour_type, DEPTH(bdlo), 0/*palette*/,
- interlace_type, 0, 0, 0), do_read_interlace, pm->use_update_info);
+ standard_test(&pm->this, FILEID(colour_type, DEPTH(bdlo),
+ 0/*palette*/, interlace_type, 0, 0, 0), do_read_interlace,
+ pm->use_update_info);
if (fail(pm))
return 0;
@@ -5876,47 +5878,50 @@
{
png_uint_32 h, w;
- for (h=1; h<=16; h+=hinc[bdlo]) for (w=1; w<=16; w+=winc[bdlo])
+ for (h=1; h<=16; h+=hinc[bdlo])
{
- /* First test all the 'size' images against the sequential
- * reader using libpng to deinterlace (where required.) This
- * validates the write side of libpng. There are four possibilities
- * to validate.
- */
- standard_test(&pm->this, FILEID(colour_type, DEPTH(bdlo), 0/*palette*/,
- PNG_INTERLACE_NONE, w, h, 0), 0/*do_interlace*/,
- pm->use_update_info);
+ for (w=1; w<=16; w+=winc[bdlo])
+ {
+ /* First test all the 'size' images against the sequential
+ * reader using libpng to deinterlace (where required.) This
+ * validates the write side of libpng. There are four possibilities
+ * to validate.
+ */
+ standard_test(&pm->this, FILEID(colour_type, DEPTH(bdlo),
+ 0/*palette*/, PNG_INTERLACE_NONE, w, h, 0), 0/*do_interlace*/,
+ pm->use_update_info);
- if (fail(pm))
- return 0;
+ if (fail(pm))
+ return 0;
- standard_test(&pm->this, FILEID(colour_type, DEPTH(bdlo), 0/*palette*/,
- PNG_INTERLACE_NONE, w, h, 1), 0/*do_interlace*/,
- pm->use_update_info);
+ standard_test(&pm->this, FILEID(colour_type, DEPTH(bdlo),
+ 0/*palette*/, PNG_INTERLACE_NONE, w, h, 1), 0/*do_interlace*/,
+ pm->use_update_info);
- if (fail(pm))
- return 0;
+ if (fail(pm))
+ return 0;
- /* Now validate the interlaced read side - do_interlace true,
- * in the progressive case this does actually make a difference
- * to the code used in the non-interlaced case too.
- */
- standard_test(&pm->this, FILEID(colour_type, DEPTH(bdlo), 0/*palette*/,
- PNG_INTERLACE_NONE, w, h, 0), 1/*do_interlace*/,
- pm->use_update_info);
+ /* Now validate the interlaced read side - do_interlace true,
+ * in the progressive case this does actually make a difference
+ * to the code used in the non-interlaced case too.
+ */
+ standard_test(&pm->this, FILEID(colour_type, DEPTH(bdlo),
+ 0/*palette*/, PNG_INTERLACE_NONE, w, h, 0), 1/*do_interlace*/,
+ pm->use_update_info);
- if (fail(pm))
- return 0;
+ if (fail(pm))
+ return 0;
-# if CAN_WRITE_INTERLACE
- /* Validate the pngvalid code itself: */
- standard_test(&pm->this, FILEID(colour_type, DEPTH(bdlo), 0/*palette*/,
- PNG_INTERLACE_ADAM7, w, h, 1), 1/*do_interlace*/,
- pm->use_update_info);
+# if CAN_WRITE_INTERLACE
+ /* Validate the pngvalid code itself: */
+ standard_test(&pm->this, FILEID(colour_type, DEPTH(bdlo),
+ 0/*palette*/, PNG_INTERLACE_ADAM7, w, h, 1), 1/*do_interlace*/,
+ pm->use_update_info);
- if (fail(pm))
- return 0;
-# endif
+ if (fail(pm))
+ return 0;
+# endif
+ }
}
}
@@ -5927,45 +5932,48 @@
{
png_uint_32 h, w;
- for (h=1; h<=16; h+=hinc[bdlo]) for (w=1; w<=16; w+=winc[bdlo])
+ for (h=1; h<=16; h+=hinc[bdlo])
{
-# ifdef PNG_READ_INTERLACING_SUPPORTED
- /* Test with pngvalid generated interlaced images first; we have
- * already verify these are ok (unless pngvalid has self-consistent
- * read/write errors, which is unlikely), so this detects errors in the
- * read side first:
- */
-# if CAN_WRITE_INTERLACE
- standard_test(&pm->this, FILEID(colour_type, DEPTH(bdlo), 0/*palette*/,
- PNG_INTERLACE_ADAM7, w, h, 1), 0/*do_interlace*/,
- pm->use_update_info);
+ for (w=1; w<=16; w+=winc[bdlo])
+ {
+# ifdef PNG_READ_INTERLACING_SUPPORTED
+ /* Test with pngvalid generated interlaced images first; we have
+ * already verify these are ok (unless pngvalid has self-consistent
+ * read/write errors, which is unlikely), so this detects errors in
+ * the read side first:
+ */
+# if CAN_WRITE_INTERLACE
+ standard_test(&pm->this, FILEID(colour_type, DEPTH(bdlo),
+ 0/*palette*/, PNG_INTERLACE_ADAM7, w, h, 1), 0/*do_interlace*/,
+ pm->use_update_info);
- if (fail(pm))
- return 0;
-# endif
-# endif /* READ_INTERLACING */
+ if (fail(pm))
+ return 0;
+# endif
+# endif /* READ_INTERLACING */
-# ifdef PNG_WRITE_INTERLACING_SUPPORTED
- /* Test the libpng write side against the pngvalid read side: */
- standard_test(&pm->this, FILEID(colour_type, DEPTH(bdlo), 0/*palette*/,
- PNG_INTERLACE_ADAM7, w, h, 0), 1/*do_interlace*/,
- pm->use_update_info);
+# ifdef PNG_WRITE_INTERLACING_SUPPORTED
+ /* Test the libpng write side against the pngvalid read side: */
+ standard_test(&pm->this, FILEID(colour_type, DEPTH(bdlo),
+ 0/*palette*/, PNG_INTERLACE_ADAM7, w, h, 0), 1/*do_interlace*/,
+ pm->use_update_info);
- if (fail(pm))
- return 0;
-# endif
+ if (fail(pm))
+ return 0;
+# endif
-# ifdef PNG_READ_INTERLACING_SUPPORTED
-# ifdef PNG_WRITE_INTERLACING_SUPPORTED
- /* Test both together: */
- standard_test(&pm->this, FILEID(colour_type, DEPTH(bdlo), 0/*palette*/,
- PNG_INTERLACE_ADAM7, w, h, 0), 0/*do_interlace*/,
- pm->use_update_info);
+# ifdef PNG_READ_INTERLACING_SUPPORTED
+# ifdef PNG_WRITE_INTERLACING_SUPPORTED
+ /* Test both together: */
+ standard_test(&pm->this, FILEID(colour_type, DEPTH(bdlo),
+ 0/*palette*/, PNG_INTERLACE_ADAM7, w, h, 0), 0/*do_interlace*/,
+ pm->use_update_info);
- if (fail(pm))
- return 0;
-# endif
-# endif /* READ_INTERLACING */
+ if (fail(pm))
+ return 0;
+# endif
+# endif /* READ_INTERLACING */
+ }
}
}
@@ -7635,7 +7643,7 @@
else
{
- /* The default (built in) coeffcients, as above: */
+ /* The default (built in) coefficients, as above: */
# if PNG_LIBPNG_VER < 10700
data.red_coefficient = 6968 / 32768.;
data.green_coefficient = 23434 / 32768.;
@@ -10649,16 +10657,21 @@
{
unsigned int i, j;
- for (i=0; i<pm->ngamma_tests; ++i) for (j=0; j<pm->ngamma_tests; ++j)
- if (i != j)
+ for (i=0; i<pm->ngamma_tests; ++i)
+ {
+ for (j=0; j<pm->ngamma_tests; ++j)
{
- gamma_transform_test(pm, colour_type, bit_depth, palette_number,
- pm->interlace_type, 1/pm->gammas[i], pm->gammas[j], 0/*sBIT*/,
- pm->use_input_precision, 0 /*do not scale16*/);
+ if (i != j)
+ {
+ gamma_transform_test(pm, colour_type, bit_depth, palette_number,
+ pm->interlace_type, 1/pm->gammas[i], pm->gammas[j],
+ 0/*sBIT*/, pm->use_input_precision, 0/*do not scale16*/);
- if (fail(pm))
- return;
+ if (fail(pm))
+ return;
+ }
}
+ }
}
}
@@ -10687,14 +10700,17 @@
{
unsigned int j;
- for (j=0; j<pm->ngamma_tests; ++j) if (i != j)
+ for (j=0; j<pm->ngamma_tests; ++j)
{
- gamma_transform_test(pm, colour_type, bit_depth, npalette,
- pm->interlace_type, 1/pm->gammas[i], pm->gammas[j],
- sbit, pm->use_input_precision_sbit, 0 /*scale16*/);
+ if (i != j)
+ {
+ gamma_transform_test(pm, colour_type, bit_depth, npalette,
+ pm->interlace_type, 1/pm->gammas[i], pm->gammas[j],
+ sbit, pm->use_input_precision_sbit, 0 /*scale16*/);
- if (fail(pm))
- return;
+ if (fail(pm))
+ return;
+ }
}
}
}
@@ -10946,14 +10962,17 @@
unsigned int i, j;
/* Don't skip the i==j case here - it's relevant. */
- for (i=0; i<pm->ngamma_tests; ++i) for (j=0; j<pm->ngamma_tests; ++j)
+ for (i=0; i<pm->ngamma_tests; ++i)
{
- gamma_composition_test(pm, colour_type, bit_depth, palette_number,
- pm->interlace_type, 1/pm->gammas[i], pm->gammas[j],
- pm->use_input_precision, do_background, expand_16);
+ for (j=0; j<pm->ngamma_tests; ++j)
+ {
+ gamma_composition_test(pm, colour_type, bit_depth, palette_number,
+ pm->interlace_type, 1/pm->gammas[i], pm->gammas[j],
+ pm->use_input_precision, do_background, expand_16);
- if (fail(pm))
- return;
+ if (fail(pm))
+ return;
+ }
}
}
}
@@ -11056,7 +11075,7 @@
pm->calculations_use_input_precision = 0;
if (summary)
- summarize_gamma_errors(pm, 0/*who*/, 1/*low bit depth*/, 1/*indexed*/);
+ summarize_gamma_errors(pm, NULL/*who*/, 1/*low bit depth*/, 1/*indexed*/);
if (fail(pm))
return;
@@ -11182,8 +11201,10 @@
{
int x, y;
++pass;
- for (y=0; y<8; ++y) for (x=0; x<8; ++x) if (adam7[y][x] == pass)
- return y;
+ for (y=0; y<8; ++y)
+ for (x=0; x<8; ++x)
+ if (adam7[y][x] == pass)
+ return y;
return 0xf;
}
@@ -11192,8 +11213,10 @@
{
int x, y;
++pass;
- for (x=0; x<8; ++x) for (y=0; y<8; ++y) if (adam7[y][x] == pass)
- return x;
+ for (x=0; x<8; ++x)
+ for (y=0; y<8; ++y)
+ if (adam7[y][x] == pass)
+ return x;
return 0xf;
}
@@ -11202,18 +11225,24 @@
{
int x, y, base=(-1), inc=8;
++pass;
- for (y=0; y<8; ++y) for (x=0; x<8; ++x) if (adam7[y][x] == pass)
+ for (y=0; y<8; ++y)
{
- if (base == (-1))
- base = y;
- else if (base == y)
- {}
- else if (inc == y-base)
- base=y;
- else if (inc == 8)
- inc = y-base, base=y;
- else if (inc != y-base)
- return 0xff; /* error - more than one 'inc' value! */
+ for (x=0; x<8; ++x)
+ {
+ if (adam7[y][x] == pass)
+ {
+ if (base == (-1))
+ base = y;
+ else if (base == y)
+ {}
+ else if (inc == y-base)
+ base=y;
+ else if (inc == 8)
+ inc = y-base, base=y;
+ else if (inc != y-base)
+ return 0xff; /* error - more than one 'inc' value! */
+ }
+ }
}
if (base == (-1)) return 0xfe; /* error - no row in pass! */
@@ -11236,18 +11265,24 @@
{
int x, y, base=(-1), inc=8;
++pass;
- for (x=0; x<8; ++x) for (y=0; y<8; ++y) if (adam7[y][x] == pass)
+ for (x=0; x<8; ++x)
{
- if (base == (-1))
- base = x;
- else if (base == x)
- {}
- else if (inc == x-base)
- base=x;
- else if (inc == 8)
- inc = x-base, base=x;
- else if (inc != x-base)
- return 0xff; /* error - more than one 'inc' value! */
+ for (y=0; y<8; ++y)
+ {
+ if (adam7[y][x] == pass)
+ {
+ if (base == (-1))
+ base = x;
+ else if (base == x)
+ {}
+ else if (inc == x-base)
+ base=x;
+ else if (inc == 8)
+ inc = x-base, base=x;
+ else if (inc != x-base)
+ return 0xff; /* error - more than one 'inc' value! */
+ }
+ }
}
if (base == (-1)) return 0xfe; /* error - no row in pass! */
@@ -11311,8 +11346,9 @@
int x;
y &= 7;
++pass;
- for (x=0; x<8; ++x) if (adam7[y][x] == pass)
- return 1;
+ for (x=0; x<8; ++x)
+ if (adam7[y][x] == pass)
+ return 1;
return 0;
}
@@ -11324,8 +11360,9 @@
int y;
x &= 7;
++pass;
- for (y=0; y<8; ++y) if (adam7[y][x] == pass)
- return 1;
+ for (y=0; y<8; ++y)
+ if (adam7[y][x] == pass)
+ return 1;
return 0;
}
@@ -11339,11 +11376,17 @@
height &= 7;
++pass;
- for (y=0; y<8; ++y) for (x=0; x<8; ++x) if (adam7[y][x] == pass)
+ for (y=0; y<8; ++y)
{
- rows += tiles;
- if (y < height) ++rows;
- break; /* i.e. break the 'x', column, loop. */
+ for (x=0; x<8; ++x)
+ {
+ if (adam7[y][x] == pass)
+ {
+ rows += tiles;
+ if (y < height) ++rows;
+ break; /* i.e. break the 'x', column, loop. */
+ }
+ }
}
return rows;
@@ -11358,11 +11401,17 @@
width &= 7;
++pass;
- for (x=0; x<8; ++x) for (y=0; y<8; ++y) if (adam7[y][x] == pass)
+ for (x=0; x<8; ++x)
{
- cols += tiles;
- if (x < width) ++cols;
- break; /* i.e. break the 'y', row, loop. */
+ for (y=0; y<8; ++y)
+ {
+ if (adam7[y][x] == pass)
+ {
+ cols += tiles;
+ if (x < width) ++cols;
+ break; /* i.e. break the 'y', row, loop. */
+ }
+ }
}
return cols;
@@ -11719,7 +11768,7 @@
/* The following allows results to pass if they correspond to anything in the
* transformed range [input-.5,input+.5]; this is is required because of the
- * way libpng treates the 16_TO_8 flag when building the gamma tables in
+ * way libpng treats the 16_TO_8 flag when building the gamma tables in
* releases up to 1.6.0.
*
* TODO: review this
@@ -11810,21 +11859,21 @@
#ifdef PNG_READ_TRANSFORMS_SUPPORTED
else if (strncmp(*argv, "--transform-disable=",
sizeof "--transform-disable") == 0)
- {
+ {
pm.test_transform = 1;
transform_disable(*argv + sizeof "--transform-disable");
- }
+ }
else if (strncmp(*argv, "--transform-enable=",
sizeof "--transform-enable") == 0)
- {
+ {
pm.test_transform = 1;
transform_enable(*argv + sizeof "--transform-enable");
- }
+ }
#endif /* PNG_READ_TRANSFORMS_SUPPORTED */
else if (strcmp(*argv, "--gamma") == 0)
- {
+ {
/* Just do two gamma tests here (2.2 and linear) for speed: */
pm.ngamma_tests = 2U;
pm.test_gamma_threshold = 1;
@@ -11833,7 +11882,7 @@
pm.test_gamma_scale16 = 1;
pm.test_gamma_background = 1; /* composition */
pm.test_gamma_alpha_mode = 1;
- }
+ }
else if (strcmp(*argv, "--nogamma") == 0)
pm.ngamma_tests = 0;
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/readpng.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/readpng.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/readpng.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,9 +1,8 @@
+
/* readpng.c
*
* Copyright (c) 2013 John Cunningham Bowler
*
- * Last changed in libpng 1.6.1 [March 28, 2013]
- *
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
* and license in png.h
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/tarith.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/tarith.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/tarith.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,10 +1,9 @@
/* tarith.c
*
+ * Copyright (c) 2021 Cosmin Truta
* Copyright (c) 2011-2013 John Cunningham Bowler
*
- * Last changed in libpng 1.6.0 [February 14, 2013]
- *
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
* and license in png.h
@@ -88,6 +87,7 @@
int minorarith = 0;
while (--argc > 0)
+ {
if (strcmp(*++argv, "-a") == 0)
showall = 1;
else if (strcmp(*argv, "-e") == 0 && argc > 0)
@@ -105,6 +105,7 @@
fprintf(stderr, "unknown argument %s\n", *argv);
return 1;
}
+ }
do
{
@@ -130,8 +131,8 @@
*/
if (buffer[precision+7] != 71)
{
- fprintf(stderr, "%g[%d] -> '%s'[%lu] buffer overflow\n", test,
- precision, buffer, (unsigned long)strlen(buffer));
+ fprintf(stderr, "%g[%d] -> '%s'[%lu] buffer overflow\n",
+ test, precision, buffer, (unsigned long)strlen(buffer));
failed = 1;
}
@@ -146,8 +147,8 @@
if (test >= 0 && strcmp(buffer, "inf") ||
test < 0 && strcmp(buffer, "-inf"))
{
- fprintf(stderr, "%g[%d] -> '%s' but expected 'inf'\n", test,
- precision, buffer);
+ fprintf(stderr, "%g[%d] -> '%s' but expected 'inf'\n",
+ test, precision, buffer);
failed = 1;
}
}
@@ -154,8 +155,8 @@
else if (!png_check_fp_number(buffer, precision+10, &state, &index) ||
buffer[index] != 0)
{
- fprintf(stderr, "%g[%d] -> '%s' but has bad format ('%c')\n", test,
- precision, buffer, buffer[index]);
+ fprintf(stderr, "%g[%d] -> '%s' but has bad format ('%c')\n",
+ test, precision, buffer, buffer[index]);
failed = 1;
}
else if (PNG_FP_IS_NEGATIVE(state) && !(test < 0))
@@ -187,7 +188,7 @@
/* Check the result against the original. */
double out = atof(buffer);
double change = fabs((out - test)/test);
- double allow = .5/pow(10,
+ double allow = .5 / pow(10,
(precision >= DBL_DIG) ? DBL_DIG-1 : precision-1);
/* NOTE: if you hit this error case are you compiling with gcc
@@ -257,8 +258,9 @@
}
while (--count);
- printf("Tested %d finite values, %d non-finite, %d OK (%d failed) %d minor "
- "arithmetic errors\n", finite, nonfinite, ok, failcount, minorarith);
+ printf("Tested %d finite values, %d non-finite, %d OK (%d failed) "
+ "%d minor arithmetic errors\n",
+ finite, nonfinite, ok, failcount, minorarith);
printf(" Error with >=%d digit precision %.2f%%\n", DBL_DIG, max_abs);
printf(" Error with < %d digit precision %.2f%%\n", DBL_DIG, max);
@@ -371,8 +373,8 @@
/* This should never fail (it's a serious bug if it does): */
if (index != 0 && index != 1)
{
- fprintf(stderr, "%s: read beyond end of string (%lu)\n", co->number,
- (unsigned long)index);
+ fprintf(stderr, "%s: read beyond end of string (%lu)\n",
+ co->number, (unsigned long)index);
return 0;
}
@@ -503,8 +505,8 @@
if (number_is_valid != c.number_was_valid)
{
fprintf(stderr,
- "%s: character '%c' [0x%.2x] changed number validity\n", co->number,
- ch, ch);
+ "%s: character '%c' [0x%.2x] changed number validity\n",
+ co->number, ch, ch);
return 0;
}
@@ -521,10 +523,13 @@
{
int ch;
- if (c.cnumber+4 < sizeof co->number) for (ch=0; ch<256; ++ch)
+ if (c.cnumber+4 < sizeof co->number)
{
- if (!check_one_character(co, c, ch))
- return 0;
+ for (ch=0; ch<256; ++ch)
+ {
+ if (!check_one_character(co, c, ch))
+ return 0;
+ }
}
return 1;
@@ -539,10 +544,13 @@
if (c.cnumber+4 < sizeof co->number && c.limit >= 0)
{
- if (c.limit > 0) for (i=0; tests[i]; ++i)
+ if (c.limit > 0)
{
- if (!check_one_character(co, c, tests[i]))
- return 0;
+ for (i=0; tests[i]; ++i)
+ {
+ if (!check_one_character(co, c, tests[i]))
+ return 0;
+ }
}
/* At the end check all the characters. */
@@ -616,10 +624,10 @@
png_int_32 times, div;
while (--argc > 0)
- {
- fprintf(stderr, "unknown argument %s\n", *++argv);
- return 1;
- }
+ {
+ fprintf(stderr, "unknown argument %s\n", *++argv);
+ return 1;
+ }
/* Find out about the random number generator. */
randbuffer = RAND_MAX;
@@ -687,8 +695,8 @@
ok = 0, ++overflow, fpround = fp/*misleading*/;
if (verbose)
- fprintf(stderr, "TEST %d * %d / %d -> %lld (%s)\n", a, times, div,
- fp, ok ? "ok" : "overflow");
+ fprintf(stderr, "TEST %d * %d / %d -> %lld (%s)\n",
+ a, times, div, fp, ok ? "ok" : "overflow");
++tested;
if (png_muldiv(&result, a, times, div) != ok)
@@ -695,17 +703,17 @@
{
++error;
if (ok)
- fprintf(stderr, "%d * %d / %d -> overflow (expected %lld)\n", a,
- times, div, fp);
+ fprintf(stderr, "%d * %d / %d -> overflow (expected %lld)\n",
+ a, times, div, fp);
else
- fprintf(stderr, "%d * %d / %d -> %d (expected overflow %lld)\n", a,
- times, div, result, fp);
+ fprintf(stderr, "%d * %d / %d -> %d (expected overflow %lld)\n",
+ a, times, div, result, fp);
}
else if (ok && result != fpround)
{
++error;
- fprintf(stderr, "%d * %d / %d -> %d not %lld\n", a, times, div, result,
- fp);
+ fprintf(stderr, "%d * %d / %d -> %d not %lld\n",
+ a, times, div, result, fp);
}
else
++passed;
@@ -721,8 +729,8 @@
}
while (--count > 0);
- printf("%d tests including %d overflows, %d passed, %d failed (%d 64-bit "
- "errors)\n", tested, overflow, passed, error, error64);
+ printf("%d tests including %d overflows, %d passed, %d failed "
+ "(%d 64-bit errors)\n", tested, overflow, passed, error, error64);
return 0;
}
@@ -821,8 +829,9 @@
{
if (error > .68) /* By experiment error is less than .68 */
{
- fprintf(stderr, "16-bit log error: %d: got %u, expected %f"
- " error: %f\n", i, png_log16bit(i), correct, error);
+ fprintf(stderr,
+ "16-bit log error: %d: got %u, expected %f error: %f\n",
+ i, png_log16bit(i), correct, error);
}
}
}
@@ -841,8 +850,9 @@
maxerr = fabs(error);
if (fabs(error) > 1883) /* By experiment. */
{
- fprintf(stderr, "32-bit exp error: %d: got %u, expected %f"
- " error: %f\n", i, png_exp(i), correct, error);
+ fprintf(stderr,
+ "32-bit exp error: %d: got %u, expected %f error: %f\n",
+ i, png_exp(i), correct, error);
}
}
@@ -859,8 +869,9 @@
maxerr = fabs(error);
if (fabs(error) > .50002) /* By experiment */
{
- fprintf(stderr, "8-bit exp error: %d: got %u, expected %f"
- " error: %f\n", i, png_exp8bit(i), correct, error);
+ fprintf(stderr,
+ "8-bit exp error: %d: got %u, expected %f error: %f\n",
+ i, png_exp8bit(i), correct, error);
}
}
@@ -877,8 +888,9 @@
maxerr = fabs(error);
if (fabs(error) > .524) /* By experiment */
{
- fprintf(stderr, "16-bit exp error: %d: got %u, expected %f"
- " error: %f\n", i, png_exp16bit(i), correct, error);
+ fprintf(stderr,
+ "16-bit exp error: %d: got %u, expected %f error: %f\n",
+ i, png_exp16bit(i), correct, error);
}
}
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/timepng.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/timepng.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/libtests/timepng.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,9 +1,8 @@
+
/* timepng.c
*
* Copyright (c) 2013,2016 John Cunningham Bowler
*
- * Last changed in libpng 1.6.22 [May 26, 2016]
- *
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
* and license in png.h
@@ -528,7 +527,7 @@
}
}
- else if (nfiles == 0) /* Read from stdin withoout --dissemble */
+ else if (nfiles == 0) /* Read from stdin without --dissemble */
{
char filename[FILENAME_MAX+1];
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/mips-msa/linux.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/mips-msa/linux.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/mips-msa/linux.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,8 +1,9 @@
+
/* contrib/mips-msa/linux.c
*
+ * Copyright (c) 2020 Cosmin Truta
* Copyright (c) 2016 Glenn Randers-Pehrson
* Written by Mandar Sahastrabuddhe, 2016.
- * Last changed in libpng 1.6.25beta03 [August 29, 2016]
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
@@ -47,8 +48,10 @@
int val = strcmp(string, word);
- if (val == 0)
+ if (val == 0) {
+ fclose(f);
return 1;
+ }
i = 0;
memset(word, 0, 10);
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/oss-fuzz/libpng_read_fuzzer.cc
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/oss-fuzz/libpng_read_fuzzer.cc 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/oss-fuzz/libpng_read_fuzzer.cc 2022-11-14 21:05:34 UTC (rev 884)
@@ -78,6 +78,22 @@
buf_state->data += length;
}
+void* limited_malloc(png_structp, png_alloc_size_t size) {
+ // libpng may allocate large amounts of memory that the fuzzer reports as
+ // an error. In order to silence these errors, make libpng fail when trying
+ // to allocate a large amount. This allocator used to be in the Chromium
+ // version of this fuzzer.
+ // This number is chosen to match the default png_user_chunk_malloc_max.
+ if (size > 8000000)
+ return nullptr;
+
+ return malloc(size);
+}
+
+void default_free(png_structp, png_voidp ptr) {
+ return free(ptr);
+}
+
static const int kPngHeaderSize = 8;
// Entry point for LibFuzzer.
@@ -118,6 +134,9 @@
return 0;
}
+ // Use a custom allocator that fails for large allocations to avoid OOM.
+ png_set_mem_fn(png_handler.png_ptr, nullptr, limited_malloc, default_free);
+
png_set_crc_action(png_handler.png_ptr, PNG_CRC_QUIET_USE, PNG_CRC_QUIET_USE);
#ifdef PNG_IGNORE_ADLER32
png_set_option(png_handler.png_ptr, PNG_IGNORE_ADLER32, PNG_OPTION_ON);
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/genpng.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/genpng.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/genpng.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -453,7 +453,7 @@
* { inside_circle_filled, check_circle_filled },
* { inside_circle, check_circle }
*
- * The functions here are analoguous to the square ones; however, they check
+ * The functions here are analogous to the square ones; however, they check
* the corresponding ellipse as opposed to the rectangle.
*/
static int
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/pngcp.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/pngcp.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/pngcp.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -336,7 +336,7 @@
# define VLC(name) VLCIDAT(name) VLCiCCP(name) VLCzTXt(name)
# ifdef PNG_SW_COMPRESS_png_level
- /* The libpng compression level isn't searched because it justs sets the
+ /* The libpng compression level isn't searched because it just sets the
* other things that are searched!
*/
VLO("compression", compression, 0)
Modified: branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/pngfix.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/pngfix.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/contrib/tools/pngfix.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -1598,7 +1598,7 @@
chunk->chunk_length = file->length;
chunk->chunk_type = file->type;
- /* Compresssed/uncompressed size information (from the zlib control structure
+ /* Compressed/uncompressed size information (from the zlib control structure
* that is used to check the compressed data in a chunk.)
*/
chunk->uncompressed_digits = 0;
@@ -2929,7 +2929,7 @@
}
/* Control reaches this point if the chunk must be skipped. For chunks other
- * than IDAT this means that the zlib compressed data is fatally damanged and
+ * than IDAT this means that the zlib compressed data is fatally damaged and
* the chunk will not be passed to libpng. For IDAT it means that the end of
* the IDAT stream has not yet been reached and we must handle the next
* (IDAT) chunk. If the LZ data in an IDAT stream cannot be read 'stop' must
Modified: branches/stable/source/src/libs/libpng/libpng-src/example.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/example.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/example.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -125,6 +125,7 @@
png_image_free(&image);
else
free(buffer);
+ }
}
/* Something went wrong reading or writing the image. libpng stores a
Modified: branches/stable/source/src/libs/libpng/libpng-src/libpng-manual.txt
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/libpng-manual.txt 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/libpng-manual.txt 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,6 +1,6 @@
libpng-manual.txt - A description on how to use and modify libpng
- Copyright (c) 2018-2019 Cosmin Truta
+ Copyright (c) 2018-2022 Cosmin Truta
Copyright (c) 1998-2018 Glenn Randers-Pehrson
This document is released under the libpng license.
@@ -9,9 +9,9 @@
Based on:
- libpng version 1.6.36, December 2018, through 1.6.37 - April 2019
+ libpng version 1.6.36, December 2018, through 1.6.38 - September 2022
Updated and distributed by Cosmin Truta
- Copyright (c) 2018-2019 Cosmin Truta
+ Copyright (c) 2018-2022 Cosmin Truta
libpng versions 0.97, January 1998, through 1.6.35 - July 2018
Updated and distributed by Glenn Randers-Pehrson
@@ -1792,7 +1792,7 @@
version with no alpha channel use png_set_background; see below.
As of libpng version 1.5.2, almost all useful expansions are supported, the
-major ommissions are conversion of grayscale to indexed images (which can be
+major omissions are conversion of grayscale to indexed images (which can be
done trivially in the application) and conversion of indexed to grayscale (which
can be done by a trivial manipulation of the palette.)
Modified: branches/stable/source/src/libs/libpng/libpng-src/libpng.3
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/libpng.3 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/libpng.3 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "April 14, 2019"
+.TH LIBPNG 3 "September 14, 2022"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.6.37
+libpng \- Portable Network Graphics (PNG) Reference Library 1.6.38
.SH SYNOPSIS
\fB#include <png.h>\fP
@@ -519,7 +519,7 @@
.SH LIBPNG.TXT
libpng-manual.txt - A description on how to use and modify libpng
- Copyright (c) 2018-2019 Cosmin Truta
+ Copyright (c) 2018-2022 Cosmin Truta
Copyright (c) 1998-2018 Glenn Randers-Pehrson
This document is released under the libpng license.
@@ -528,9 +528,9 @@
Based on:
- libpng version 1.6.36, December 2018, through 1.6.37 - April 2019
+ libpng version 1.6.36, December 2018, through 1.6.38 - September 2022
Updated and distributed by Cosmin Truta
- Copyright (c) 2018-2019 Cosmin Truta
+ Copyright (c) 2018-2022 Cosmin Truta
libpng versions 0.97, January 1998, through 1.6.35 - July 2018
Updated and distributed by Glenn Randers-Pehrson
@@ -2311,7 +2311,7 @@
version with no alpha channel use png_set_background; see below.
As of libpng version 1.5.2, almost all useful expansions are supported, the
-major ommissions are conversion of grayscale to indexed images (which can be
+major omissions are conversion of grayscale to indexed images (which can be
done trivially in the application) and conversion of indexed to grayscale (which
can be done by a trivial manipulation of the palette.)
Modified: branches/stable/source/src/libs/libpng/libpng-src/libpng.pc.in
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/libpng.pc.in 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/libpng.pc.in 2022-11-14 21:05:34 UTC (rev 884)
@@ -6,7 +6,7 @@
Name: libpng
Description: Loads and saves PNG files
Version: @PNGLIB_VERSION@
-Requires: zlib
+Requires.private: zlib
Libs: -L${libdir} -lpng at PNGLIB_MAJOR@@PNGLIB_MINOR@
Libs.private: @LIBS@
Cflags: -I${includedir}
Modified: branches/stable/source/src/libs/libpng/libpng-src/libpngpf.3
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/libpngpf.3 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/libpngpf.3 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "April 14, 2019"
+.TH LIBPNGPF 3 "September 14, 2022"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.6.37
+libpng \- Portable Network Graphics (PNG) Reference Library 1.6.38
(private functions)
.SH SYNOPSIS
Modified: branches/stable/source/src/libs/libpng/libpng-src/png.5
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/png.5 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/png.5 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,4 +1,4 @@
-.TH PNG 5 "April 14, 2019"
+.TH PNG 5 "September 14, 2022"
.SH NAME
png \- Portable Network Graphics (PNG) format
@@ -43,7 +43,7 @@
https://www.w3.org/TR/REC-png-961001
.SH AUTHORS
-This man page: Cosmin Truta, Glenn Randers-Pehrson
+This man page: Glenn Randers-Pehrson, Cosmin Truta
.LP
Portable Network Graphics (PNG) Specification (Second Edition)
Information technology - Computer graphics and image processing -
@@ -60,7 +60,7 @@
.LP
This man page is
.br
-Copyright (c) 2018-2019 Cosmin Truta.
+Copyright (c) 2018 Cosmin Truta.
.br
Copyright (c) 1998-2006 Glenn Randers-Pehrson.
.br
Modified: branches/stable/source/src/libs/libpng/libpng-src/png.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/png.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/png.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,7 +1,7 @@
/* png.c - location for general purpose libpng functions
*
- * Copyright (c) 2018-2019 Cosmin Truta
+ * Copyright (c) 2018-2022 Cosmin Truta
* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
* Copyright (c) 1996-1997 Andreas Dilger
* Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -14,7 +14,7 @@
#include "pngpriv.h"
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef png_libpng_version_1_6_37 Your_png_h_is_not_version_1_6_37;
+typedef png_libpng_version_1_6_38 Your_png_h_is_not_version_1_6_38;
#ifdef __GNUC__
/* The version tests may need to be added to, but the problem warning has
@@ -720,7 +720,7 @@
*
* Where UNSIGNED_MAX is the appropriate maximum unsigned value, so when the
* negative integral value is added the result will be an unsigned value
- * correspnding to the 2's complement representation.
+ * corresponding to the 2's complement representation.
*/
void PNGAPI
png_save_int_32(png_bytep buf, png_int_32 i)
@@ -815,8 +815,8 @@
return PNG_STRING_COPYRIGHT
#else
return PNG_STRING_NEWLINE \
- "libpng version 1.6.37" PNG_STRING_NEWLINE \
- "Copyright (c) 2018-2019 Cosmin Truta" PNG_STRING_NEWLINE \
+ "libpng version 1.6.38" PNG_STRING_NEWLINE \
+ "Copyright (c) 2018-2022 Cosmin Truta" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson" \
PNG_STRING_NEWLINE \
"Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
@@ -1843,12 +1843,12 @@
# ifdef PNG_WARNINGS_SUPPORTED
else
{
- char number[PNG_NUMBER_BUFFER_SIZE]; /* +24 = 114*/
+ char number[PNG_NUMBER_BUFFER_SIZE]; /* +24 = 114 */
pos = png_safecat(message, (sizeof message), pos,
png_format_number(number, number+(sizeof number),
PNG_NUMBER_FORMAT_x, value));
- pos = png_safecat(message, (sizeof message), pos, "h: "); /*+2 = 116*/
+ pos = png_safecat(message, (sizeof message), pos, "h: "); /* +2 = 116 */
}
# endif
/* The 'reason' is an arbitrary message, allow +79 maximum 195 */
Modified: branches/stable/source/src/libs/libpng/libpng-src/png.h
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/png.h 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/png.h 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,9 +1,9 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.6.37 - April 14, 2019
+ * libpng version 1.6.38 - September 14, 2022
*
- * Copyright (c) 2018-2019 Cosmin Truta
+ * Copyright (c) 2018-2022 Cosmin Truta
* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
* Copyright (c) 1996-1997 Andreas Dilger
* Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -15,7 +15,7 @@
* libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger
* libpng versions 0.97, January 1998, through 1.6.35, July 2018:
* Glenn Randers-Pehrson
- * libpng versions 1.6.36, December 2018, through 1.6.37, April 2019:
+ * libpng versions 1.6.36, December 2018, through 1.6.38, September 2022:
* Cosmin Truta
* See also "Contributing Authors", below.
*/
@@ -27,8 +27,8 @@
* PNG Reference Library License version 2
* ---------------------------------------
*
- * * Copyright (c) 1995-2019 The PNG Reference Library Authors.
- * * Copyright (c) 2018-2019 Cosmin Truta.
+ * * Copyright (c) 1995-2022 The PNG Reference Library Authors.
+ * * Copyright (c) 2018-2022 Cosmin Truta.
* * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
* * Copyright (c) 1996-1997 Andreas Dilger.
* * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -239,7 +239,7 @@
* ...
* 1.5.30 15 10530 15.so.15.30[.0]
* ...
- * 1.6.37 16 10637 16.so.16.37[.0]
+ * 1.6.38 16 10638 16.so.16.38[.0]
*
* Henceforth the source version will match the shared-library major and
* minor numbers; the shared-library major version number will be used for
@@ -278,8 +278,8 @@
*/
/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.6.37"
-#define PNG_HEADER_VERSION_STRING " libpng version 1.6.37 - April 14, 2019\n"
+#define PNG_LIBPNG_VER_STRING "1.6.38"
+#define PNG_HEADER_VERSION_STRING " libpng version 1.6.38 - September 14, 2022\n"
#define PNG_LIBPNG_VER_SONUM 16
#define PNG_LIBPNG_VER_DLLNUM 16
@@ -287,7 +287,7 @@
/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
#define PNG_LIBPNG_VER_MAJOR 1
#define PNG_LIBPNG_VER_MINOR 6
-#define PNG_LIBPNG_VER_RELEASE 37
+#define PNG_LIBPNG_VER_RELEASE 38
/* This should be zero for a public release, or non-zero for a
* development version. [Deprecated]
@@ -318,7 +318,7 @@
* From version 1.0.1 it is:
* XXYYZZ, where XX=major, YY=minor, ZZ=release
*/
-#define PNG_LIBPNG_VER 10637 /* 1.6.37 */
+#define PNG_LIBPNG_VER 10638 /* 1.6.38 */
/* Library configuration: these options cannot be changed after
* the library has been built.
@@ -428,7 +428,7 @@
/* This triggers a compiler error in png.c, if png.c and png.h
* do not agree upon the version number.
*/
-typedef char* png_libpng_version_1_6_37;
+typedef char* png_libpng_version_1_6_38;
/* Basic control structions. Read libpng-manual.txt or libpng.3 for more info.
*
@@ -1446,7 +1446,7 @@
* mainly useful for testing, as the defaults should work with most users.
* Those users who are tight on memory or want faster performance at the
* expense of compression can modify them. See the compression library
- * header file (zlib.h) for an explination of the compression functions.
+ * header file (zlib.h) for an explanation of the compression functions.
*/
/* Set the filtering method(s) used by libpng. Currently, the only valid
@@ -1501,7 +1501,7 @@
* 0 - 9, corresponding directly to the zlib compression levels 0 - 9
* (0 - no compression, 9 - "maximal" compression). Note that tests have
* shown that zlib compression levels 3-6 usually perform as well as level 9
- * for PNG images, and do considerably fewer caclulations. In the future,
+ * for PNG images, and do considerably fewer calculations. In the future,
* these values may not correspond directly to the zlib compression levels.
*/
#ifdef PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED
Modified: branches/stable/source/src/libs/libpng/libpng-src/pngconf.h
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngconf.h 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngconf.h 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,9 +1,9 @@
/* pngconf.h - machine-configurable file for libpng
*
- * libpng version 1.6.37
+ * libpng version 1.6.38
*
- * Copyright (c) 2018-2019 Cosmin Truta
+ * Copyright (c) 2018-2022 Cosmin Truta
* Copyright (c) 1998-2002,2004,2006-2016,2018 Glenn Randers-Pehrson
* Copyright (c) 1996-1997 Andreas Dilger
* Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -180,8 +180,8 @@
* compiler-specific macros to the values required to change the calling
* conventions of the various functions.
*/
-#if defined(_Windows) || defined(_WINDOWS) || defined(WIN32) ||\
- defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+#if defined(_WIN32) || defined(__WIN32__) || defined(__NT__) || \
+ defined(__CYGWIN__)
/* Windows system (DOS doesn't support DLLs). Includes builds under Cygwin or
* MinGW on any architecture currently supported by Windows. Also includes
* Watcom builds but these need special treatment because they are not
Modified: branches/stable/source/src/libs/libpng/libpng-src/pngget.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngget.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngget.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -1151,7 +1151,7 @@
#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
png_byte PNGAPI
-png_get_rgb_to_gray_status (png_const_structrp png_ptr)
+png_get_rgb_to_gray_status(png_const_structrp png_ptr)
{
return (png_byte)(png_ptr ? png_ptr->rgb_to_gray_status : 0);
}
@@ -1192,13 +1192,13 @@
/* These functions were added to libpng 1.2.6 and were enabled
* by default in libpng-1.4.0 */
png_uint_32 PNGAPI
-png_get_user_width_max (png_const_structrp png_ptr)
+png_get_user_width_max(png_const_structrp png_ptr)
{
return (png_ptr ? png_ptr->user_width_max : 0);
}
png_uint_32 PNGAPI
-png_get_user_height_max (png_const_structrp png_ptr)
+png_get_user_height_max(png_const_structrp png_ptr)
{
return (png_ptr ? png_ptr->user_height_max : 0);
}
@@ -1205,7 +1205,7 @@
/* This function was added to libpng 1.4.0 */
png_uint_32 PNGAPI
-png_get_chunk_cache_max (png_const_structrp png_ptr)
+png_get_chunk_cache_max(png_const_structrp png_ptr)
{
return (png_ptr ? png_ptr->user_chunk_cache_max : 0);
}
@@ -1212,7 +1212,7 @@
/* This function was added to libpng 1.4.1 */
png_alloc_size_t PNGAPI
-png_get_chunk_malloc_max (png_const_structrp png_ptr)
+png_get_chunk_malloc_max(png_const_structrp png_ptr)
{
return (png_ptr ? png_ptr->user_chunk_malloc_max : 0);
}
@@ -1221,13 +1221,13 @@
/* These functions were added to libpng 1.4.0 */
#ifdef PNG_IO_STATE_SUPPORTED
png_uint_32 PNGAPI
-png_get_io_state (png_const_structrp png_ptr)
+png_get_io_state(png_const_structrp png_ptr)
{
return png_ptr->io_state;
}
png_uint_32 PNGAPI
-png_get_io_chunk_type (png_const_structrp png_ptr)
+png_get_io_chunk_type(png_const_structrp png_ptr)
{
return png_ptr->chunk_name;
}
Modified: branches/stable/source/src/libs/libpng/libpng-src/pnglibconf.h
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pnglibconf.h 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/pnglibconf.h 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,8 +1,8 @@
/* pnglibconf.h - library build configuration */
-/* libpng version 1.6.37 */
+/* libpng version 1.6.38 */
-/* Copyright (c) 2018-2019 Cosmin Truta */
+/* Copyright (c) 2018-2022 Cosmin Truta */
/* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson */
/* This code is released under the libpng license. */
Modified: branches/stable/source/src/libs/libpng/libpng-src/pngpriv.h
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngpriv.h 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngpriv.h 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,7 +1,7 @@
/* pngpriv.h - private declarations for use inside libpng
*
- * Copyright (c) 2018-2019 Cosmin Truta
+ * Copyright (c) 2018-2022 Cosmin Truta
* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
* Copyright (c) 1996-1997 Andreas Dilger
* Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -174,7 +174,7 @@
# else /* !defined __ARM_NEON__ */
/* The 'intrinsics' code simply won't compile without this -mfpu=neon:
*/
-# if !defined(__aarch64__)
+# if !defined(__aarch64__) && !defined(_M_ARM64)
/* The assembler code currently does not work on ARM64 */
# define PNG_ARM_NEON_IMPLEMENTATION 2
# endif /* __aarch64__ */
@@ -185,6 +185,8 @@
/* Use the intrinsics code by default. */
# define PNG_ARM_NEON_IMPLEMENTATION 1
# endif
+#else /* PNG_ARM_NEON_OPT == 0 */
+# define PNG_ARM_NEON_IMPLEMENTATION 0
#endif /* PNG_ARM_NEON_OPT > 0 */
#ifndef PNG_MIPS_MSA_OPT
@@ -263,11 +265,15 @@
# ifndef PNG_MIPS_MSA_IMPLEMENTATION
# define PNG_MIPS_MSA_IMPLEMENTATION 1
# endif
+#else
+# define PNG_MIPS_MSA_IMPLEMENTATION 0
#endif /* PNG_MIPS_MSA_OPT > 0 */
#if PNG_POWERPC_VSX_OPT > 0
# define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_vsx
# define PNG_POWERPC_VSX_IMPLEMENTATION 1
+#else
+# define PNG_POWERPC_VSX_IMPLEMENTATION 0
#endif
@@ -492,16 +498,7 @@
static_cast<type>(static_cast<const void*>(value))
#else
# define png_voidcast(type, value) (value)
-# ifdef _WIN64
-# ifdef __GNUC__
- typedef unsigned long long png_ptruint;
-# else
- typedef unsigned __int64 png_ptruint;
-# endif
-# else
- typedef unsigned long png_ptruint;
-# endif
-# define png_constcast(type, value) ((type)(png_ptruint)(const void*)(value))
+# define png_constcast(type, value) ((type)(void*)(const void*)(value))
# define png_aligncast(type, value) ((void*)(value))
# define png_aligncastconst(type, value) ((const void*)(value))
#endif /* __cplusplus */
@@ -543,9 +540,8 @@
# include <alloc.h>
#endif
-#if defined(WIN32) || defined(_Windows) || defined(_WINDOWS) || \
- defined(_WIN32) || defined(__WIN32__)
-# include <windows.h> /* defines _WINDOWS_ macro */
+#if defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
+# include <windows.h>
#endif
#endif /* PNG_VERSION_INFO_ONLY */
@@ -554,24 +550,20 @@
* functions that are passed far data must be model-independent.
*/
-/* Memory model/platform independent fns */
+/* Platform-independent functions */
#ifndef PNG_ABORT
-# ifdef _WINDOWS_
-# define PNG_ABORT() ExitProcess(0)
-# else
-# define PNG_ABORT() abort()
-# endif
+# define PNG_ABORT() abort()
#endif
/* These macros may need to be architecture dependent. */
-#define PNG_ALIGN_NONE 0 /* do not use data alignment */
-#define PNG_ALIGN_ALWAYS 1 /* assume unaligned accesses are OK */
+#define PNG_ALIGN_NONE 0 /* do not use data alignment */
+#define PNG_ALIGN_ALWAYS 1 /* assume unaligned accesses are OK */
#ifdef offsetof
-# define PNG_ALIGN_OFFSET 2 /* use offsetof to determine alignment */
+# define PNG_ALIGN_OFFSET 2 /* use offsetof to determine alignment */
#else
# define PNG_ALIGN_OFFSET -1 /* prevent the use of this */
#endif
-#define PNG_ALIGN_SIZE 3 /* use sizeof to determine alignment */
+#define PNG_ALIGN_SIZE 3 /* use sizeof to determine alignment */
#ifndef PNG_ALIGN_TYPE
/* Default to using aligned access optimizations and requiring alignment to a
@@ -585,26 +577,25 @@
/* This is used because in some compiler implementations non-aligned
* structure members are supported, so the offsetof approach below fails.
* Set PNG_ALIGN_SIZE=0 for compiler combinations where unaligned access
- * is good for performance. Do not do this unless you have tested the result
- * and understand it.
+ * is good for performance. Do not do this unless you have tested the
+ * result and understand it.
*/
-# define png_alignof(type) (sizeof (type))
+# define png_alignof(type) (sizeof(type))
#else
# if PNG_ALIGN_TYPE == PNG_ALIGN_OFFSET
-# define png_alignof(type) offsetof(struct{char c; type t;}, t)
+# define png_alignof(type) offsetof(struct{char c; type t;}, t)
# else
-# if PNG_ALIGN_TYPE == PNG_ALIGN_ALWAYS
-# define png_alignof(type) (1)
-# endif
- /* Else leave png_alignof undefined to prevent use thereof */
+# if PNG_ALIGN_TYPE == PNG_ALIGN_ALWAYS
+# define png_alignof(type) 1
+# endif
+ /* Else leave png_alignof undefined to prevent use thereof */
# endif
#endif
-/* This implicitly assumes alignment is always to a power of 2. */
+/* This implicitly assumes alignment is always a multiple of 2. */
#ifdef png_alignof
-# define png_isaligned(ptr, type)\
- (((type)((const char*)ptr-(const char*)0) & \
- (type)(png_alignof(type)-1)) == 0)
+# define png_isaligned(ptr, type) \
+ (((type)(size_t)((const void*)(ptr)) & (type)(png_alignof(type)-1)) == 0)
#else
# define png_isaligned(ptr, type) 0
#endif
Modified: branches/stable/source/src/libs/libpng/libpng-src/pngread.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngread.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngread.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -3452,7 +3452,6 @@
for (pass = 0; pass < passes; ++pass)
{
- png_bytep row = png_voidcast(png_bytep, display->first_row);
unsigned int startx, stepx, stepy;
png_uint_32 y;
@@ -3557,8 +3556,6 @@
inrow += 2; /* gray and alpha channel */
}
-
- row += display->row_bytes;
}
}
}
Modified: branches/stable/source/src/libs/libpng/libpng-src/pngrtran.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngrtran.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngrtran.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -21,7 +21,7 @@
#ifdef PNG_ARM_NEON_IMPLEMENTATION
# if PNG_ARM_NEON_IMPLEMENTATION == 1
# define PNG_ARM_NEON_INTRINSICS_AVAILABLE
-# if defined(_MSC_VER) && defined(_M_ARM64)
+# if defined(_MSC_VER) && !defined(__clang__) && defined(_M_ARM64)
# include <arm64_neon.h>
# else
# include <arm_neon.h>
Modified: branches/stable/source/src/libs/libpng/libpng-src/pngrutil.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngrutil.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngrutil.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,7 +1,7 @@
/* pngrutil.c - utilities to read a PNG file
*
- * Copyright (c) 2018 Cosmin Truta
+ * Copyright (c) 2018-2022 Cosmin Truta
* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
* Copyright (c) 1996-1997 Andreas Dilger
* Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -302,7 +302,6 @@
if (buffer != NULL && new_size > png_ptr->read_buffer_size)
{
png_ptr->read_buffer = NULL;
- png_ptr->read_buffer = NULL;
png_ptr->read_buffer_size = 0;
png_free(png_ptr, buffer);
buffer = NULL;
@@ -2076,22 +2075,23 @@
png_byte buf[1];
png_crc_read(png_ptr, buf, 1);
info_ptr->eXIf_buf[i] = buf[0];
- if (i == 1 && buf[0] != 'M' && buf[0] != 'I'
- && info_ptr->eXIf_buf[0] != buf[0])
+ if (i == 1)
{
- png_crc_finish(png_ptr, length);
- png_chunk_benign_error(png_ptr, "incorrect byte-order specifier");
- png_free(png_ptr, info_ptr->eXIf_buf);
- info_ptr->eXIf_buf = NULL;
- return;
+ if ((buf[0] != 'M' && buf[0] != 'I') ||
+ (info_ptr->eXIf_buf[0] != buf[0]))
+ {
+ png_crc_finish(png_ptr, length - 2);
+ png_chunk_benign_error(png_ptr, "incorrect byte-order specifier");
+ png_free(png_ptr, info_ptr->eXIf_buf);
+ info_ptr->eXIf_buf = NULL;
+ return;
+ }
}
}
- if (png_crc_finish(png_ptr, 0) != 0)
- return;
+ if (png_crc_finish(png_ptr, 0) == 0)
+ png_set_eXIf_1(png_ptr, info_ptr, length, info_ptr->eXIf_buf);
- png_set_eXIf_1(png_ptr, info_ptr, length, info_ptr->eXIf_buf);
-
png_free(png_ptr, info_ptr->eXIf_buf);
info_ptr->eXIf_buf = NULL;
}
@@ -2126,8 +2126,9 @@
num = length / 2 ;
- if (num != (unsigned int) png_ptr->num_palette ||
- num > (unsigned int) PNG_MAX_PALETTE_LENGTH)
+ if (length != num * 2 ||
+ num != (unsigned int)png_ptr->num_palette ||
+ num > (unsigned int)PNG_MAX_PALETTE_LENGTH)
{
png_crc_finish(png_ptr, length);
png_chunk_benign_error(png_ptr, "invalid");
@@ -4621,14 +4622,13 @@
*/
{
png_bytep temp = png_ptr->big_row_buf + 32;
- int extra = (int)((temp - (png_bytep)0) & 0x0f);
+ size_t extra = (size_t)temp & 0x0f;
png_ptr->row_buf = temp - extra - 1/*filter byte*/;
temp = png_ptr->big_prev_row + 32;
- extra = (int)((temp - (png_bytep)0) & 0x0f);
+ extra = (size_t)temp & 0x0f;
png_ptr->prev_row = temp - extra - 1/*filter byte*/;
}
-
#else
/* Use 31 bytes of padding before and 17 bytes after row_buf. */
png_ptr->row_buf = png_ptr->big_row_buf + 31;
Modified: branches/stable/source/src/libs/libpng/libpng-src/pngset.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngset.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngset.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,7 +1,7 @@
/* pngset.c - storage of image information into info struct
*
- * Copyright (c) 2018 Cosmin Truta
+ * Copyright (c) 2018-2022 Cosmin Truta
* Copyright (c) 1998-2018 Glenn Randers-Pehrson
* Copyright (c) 1996-1997 Andreas Dilger
* Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -1019,6 +1019,9 @@
info_ptr->trans_alpha = png_voidcast(png_bytep,
png_malloc(png_ptr, PNG_MAX_PALETTE_LENGTH));
memcpy(info_ptr->trans_alpha, trans_alpha, (size_t)num_trans);
+
+ info_ptr->valid |= PNG_INFO_tRNS;
+ info_ptr->free_me |= PNG_FREE_TRNS;
}
png_ptr->trans_alpha = info_ptr->trans_alpha;
}
@@ -1326,7 +1329,7 @@
#ifdef PNG_MNG_FEATURES_SUPPORTED
png_uint_32 PNGAPI
-png_permit_mng_features (png_structrp png_ptr, png_uint_32 mng_features)
+png_permit_mng_features(png_structrp png_ptr, png_uint_32 mng_features)
{
png_debug(1, "in png_permit_mng_features");
@@ -1633,7 +1636,7 @@
#ifdef PNG_SET_USER_LIMITS_SUPPORTED
/* This function was added to libpng 1.2.6 */
void PNGAPI
-png_set_user_limits (png_structrp png_ptr, png_uint_32 user_width_max,
+png_set_user_limits(png_structrp png_ptr, png_uint_32 user_width_max,
png_uint_32 user_height_max)
{
/* Images with dimensions larger than these limits will be
@@ -1649,7 +1652,7 @@
/* This function was added to libpng 1.4.0 */
void PNGAPI
-png_set_chunk_cache_max (png_structrp png_ptr, png_uint_32 user_chunk_cache_max)
+png_set_chunk_cache_max(png_structrp png_ptr, png_uint_32 user_chunk_cache_max)
{
if (png_ptr != NULL)
png_ptr->user_chunk_cache_max = user_chunk_cache_max;
@@ -1657,7 +1660,7 @@
/* This function was added to libpng 1.4.1 */
void PNGAPI
-png_set_chunk_malloc_max (png_structrp png_ptr,
+png_set_chunk_malloc_max(png_structrp png_ptr,
png_alloc_size_t user_chunk_malloc_max)
{
if (png_ptr != NULL)
Modified: branches/stable/source/src/libs/libpng/libpng-src/pngstruct.h
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngstruct.h 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngstruct.h 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,7 +1,7 @@
/* pngstruct.h - header file for PNG reference library
*
- * Copyright (c) 2018-2019 Cosmin Truta
+ * Copyright (c) 2018-2022 Cosmin Truta
* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
* Copyright (c) 1996-1997 Andreas Dilger
* Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -334,18 +334,8 @@
size_t current_buffer_size; /* amount of data now in current_buffer */
int process_mode; /* what push library is currently doing */
int cur_palette; /* current push library palette index */
-
#endif /* PROGRESSIVE_READ */
-#if defined(__TURBOC__) && !defined(_Windows) && !defined(__FLAT__)
-/* For the Borland special 64K segment handler */
- png_bytepp offset_table_ptr;
- png_bytep offset_table;
- png_uint_16 offset_table_number;
- png_uint_16 offset_table_count;
- png_uint_16 offset_table_count_free;
-#endif
-
#ifdef PNG_READ_QUANTIZE_SUPPORTED
png_bytep palette_lookup; /* lookup table for quantizing */
png_bytep quantize_index; /* index translation for palette files */
Modified: branches/stable/source/src/libs/libpng/libpng-src/pngtest.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngtest.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngtest.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -2155,4 +2155,4 @@
#endif
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef png_libpng_version_1_6_37 Your_png_h_is_not_version_1_6_37;
+typedef png_libpng_version_1_6_38 Your_png_h_is_not_version_1_6_38;
Modified: branches/stable/source/src/libs/libpng/libpng-src/pngwrite.c
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/pngwrite.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/pngwrite.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,7 +1,7 @@
/* pngwrite.c - general routines to write a PNG file
*
- * Copyright (c) 2018-2019 Cosmin Truta
+ * Copyright (c) 2018-2022 Cosmin Truta
* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
* Copyright (c) 1996-1997 Andreas Dilger
* Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -489,6 +489,16 @@
png_debug(1, "in png_convert_from_time_t");
tbuf = gmtime(&ttime);
+ if (tbuf == NULL)
+ {
+ /* TODO: add a safe function which takes a png_ptr argument and raises
+ * a png_error if the ttime argument is invalid and the call to gmtime
+ * fails as a consequence.
+ */
+ memset(ptime, 0, sizeof(*ptime));
+ return;
+ }
+
png_convert_from_struct_tm(ptime, tbuf);
}
#endif
Modified: branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/README.txt
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/README.txt 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/README.txt 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,7 +1,7 @@
Instructions for building libpng using Microsoft Visual Studio
==============================================================
-Copyright (c) 2018 Cosmin Truta
+Copyright (c) 2018,2022 Cosmin Truta
Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson
This code is released under the libpng license.
@@ -9,9 +9,9 @@
in png.h
This directory contains a solution for building libpng under Microsoft
-Visual Studio 2010. It may also work under later versions of Visual
-Studio. You should be familiar with Visual Studio before using this
-solution.
+Visual Studio 2019. It may also work under earlier or later versions
+of Visual Studio. You should be familiar with Visual Studio before
+using this solution.
Initial preparations
--------------------
Modified: branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/libpng/libpng.vcxproj
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/libpng/libpng.vcxproj 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/libpng/libpng.vcxproj 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,18 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug Library|ARM64">
+ <Configuration>Debug Library</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Debug Library|Win32">
<Configuration>Debug Library</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|ARM64">
+ <Configuration>Debug</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release Library|ARM64">
+ <Configuration>Release Library</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release Library|Win32">
<Configuration>Release Library</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release|ARM64">
+ <Configuration>Release</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
@@ -29,20 +45,46 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|ARM64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
@@ -49,15 +91,27 @@
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+ </ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|ARM64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>false</LinkIncremental>
@@ -65,11 +119,21 @@
</CustomBuildBeforeTargets>
<TargetName>$(ProjectName)16</TargetName>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+ <LinkIncremental>false</LinkIncremental>
+ <CustomBuildBeforeTargets />
+ <TargetName>$(ProjectName)16</TargetName>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">
<LinkIncremental>false</LinkIncremental>
<CustomBuildBeforeTargets />
<TargetName>$(ProjectName)16</TargetName>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'">
+ <LinkIncremental>false</LinkIncremental>
+ <CustomBuildBeforeTargets />
+ <TargetName>$(ProjectName)16</TargetName>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<CustomBuildBeforeTargets>
@@ -76,11 +140,21 @@
</CustomBuildBeforeTargets>
<TargetName>$(ProjectName)16</TargetName>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+ <LinkIncremental>false</LinkIncremental>
+ <CustomBuildBeforeTargets />
+ <TargetName>$(ProjectName)16</TargetName>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">
<LinkIncremental>false</LinkIncremental>
<CustomBuildBeforeTargets />
<TargetName>$(ProjectName)16</TargetName>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|ARM64'">
+ <LinkIncremental>false</LinkIncremental>
+ <CustomBuildBeforeTargets />
+ <TargetName>$(ProjectName)16</TargetName>
+ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -88,7 +162,7 @@
<MinimalRebuild>false</MinimalRebuild>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<IntrinsicFunctions>true</IntrinsicFunctions>
<FunctionLevelLinking>true</FunctionLevelLinking>
<FloatingPointExceptions>false</FloatingPointExceptions>
@@ -111,15 +185,45 @@
<AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>$(WarningLevel)</WarningLevel>
<MinimalRebuild>false</MinimalRebuild>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <FloatingPointExceptions>false</FloatingPointExceptions>
+ <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
+ <PrecompiledHeaderFile>pngpriv.h</PrecompiledHeaderFile>
+ <BrowseInformation>true</BrowseInformation>
+ <CompileAs>CompileAsC</CompileAs>
+ <StringPooling>true</StringPooling>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <AdditionalIncludeDirectories>$(ZLibSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
<Optimization>Disabled</Optimization>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <AdditionalDependencies>zlib.lib</AdditionalDependencies>
+ <Version>16</Version>
+ <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">
+ <ClCompile>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <MinimalRebuild>false</MinimalRebuild>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <Optimization>Disabled</Optimization>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<IntrinsicFunctions>true</IntrinsicFunctions>
<FunctionLevelLinking>true</FunctionLevelLinking>
<FloatingPointExceptions>false</FloatingPointExceptions>
@@ -130,7 +234,7 @@
<StringPooling>true</StringPooling>
<DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
<AdditionalIncludeDirectories>$(ZLibSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
+ <TreatWarningAsError>false</TreatWarningAsError>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
@@ -138,6 +242,33 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'">
+ <ClCompile>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <MinimalRebuild>false</MinimalRebuild>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <Optimization>Disabled</Optimization>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <FloatingPointExceptions>false</FloatingPointExceptions>
+ <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
+ <PrecompiledHeaderFile>pngpriv.h</PrecompiledHeaderFile>
+ <BrowseInformation>true</BrowseInformation>
+ <CompileAs>CompileAsC</CompileAs>
+ <StringPooling>true</StringPooling>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <AdditionalIncludeDirectories>$(ZLibSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <TreatWarningAsError>false</TreatWarningAsError>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ </Link>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>$(WarningLevel)</WarningLevel>
@@ -145,7 +276,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FloatingPointExceptions>false</FloatingPointExceptions>
<TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
<PrecompiledHeaderFile>pngpriv.h</PrecompiledHeaderFile>
@@ -168,15 +299,14 @@
<AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<ClCompile>
<WarningLevel>$(WarningLevel)</WarningLevel>
<PrecompiledHeader>Use</PrecompiledHeader>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FloatingPointExceptions>false</FloatingPointExceptions>
<TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
<PrecompiledHeaderFile>pngpriv.h</PrecompiledHeaderFile>
@@ -188,6 +318,37 @@
<AdditionalIncludeDirectories>$(ZLibSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
<Optimization>Full</Optimization>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ <AdditionalDependencies>zlib.lib</AdditionalDependencies>
+ <Version>16</Version>
+ <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <FloatingPointExceptions>false</FloatingPointExceptions>
+ <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
+ <PrecompiledHeaderFile>pngpriv.h</PrecompiledHeaderFile>
+ <BrowseInformation>true</BrowseInformation>
+ <CompileAs>CompileAsC</CompileAs>
+ <StringPooling>true</StringPooling>
+ <MinimalRebuild>false</MinimalRebuild>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <AdditionalIncludeDirectories>$(ZLibSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <TreatWarningAsError>false</TreatWarningAsError>
+ <Optimization>Full</Optimization>
<WholeProgramOptimization>true</WholeProgramOptimization>
</ClCompile>
<Link>
@@ -200,12 +361,73 @@
<LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
</Lib>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|ARM64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <FloatingPointExceptions>false</FloatingPointExceptions>
+ <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
+ <PrecompiledHeaderFile>pngpriv.h</PrecompiledHeaderFile>
+ <BrowseInformation>true</BrowseInformation>
+ <CompileAs>CompileAsC</CompileAs>
+ <StringPooling>true</StringPooling>
+ <MinimalRebuild>false</MinimalRebuild>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <AdditionalIncludeDirectories>$(ZLibSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <TreatWarningAsError>false</TreatWarningAsError>
+ <Optimization>Full</Optimization>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ <Lib>
+ <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
+ </Lib>
+ </ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\..\arm\arm_init.c">
+ <DeploymentContent>true</DeploymentContent>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'">WIN32;_DEBUG;PNG_ARM_NEON_OPT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'">NotUsing</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">NotUsing</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">NotUsing</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+ </ClCompile>
+ <ClCompile Include="..\..\..\arm\filter_neon_intrinsics.c">
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'">NotUsing</PrecompiledHeader>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'">WIN32;_DEBUG;PNG_ARM_NEON_OPT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">NotUsing</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">NotUsing</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+ </ClCompile>
+ <ClCompile Include="..\..\..\arm\palette_neon_intrinsics.c">
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'">NotUsing</PrecompiledHeader>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'">WIN32;_DEBUG;PNG_ARM_NEON_OPT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">NotUsing</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">NotUsing</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+ </ClCompile>
<ClCompile Include="..\..\..\png.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Library|ARM64'">Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\..\..\pngerror.c" />
<ClCompile Include="..\..\..\pngget.c" />
@@ -225,7 +447,9 @@
<ItemGroup>
<ResourceCompile Include="..\..\..\scripts\pngwin.rc">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Library|ARM64'">true</ExcludedFromBuild>
</ResourceCompile>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Modified: branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pnglibconf/pnglibconf.vcxproj
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pnglibconf/pnglibconf.vcxproj 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pnglibconf/pnglibconf.vcxproj 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Release|ARM64">
+ <Configuration>Release</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
@@ -16,7 +20,15 @@
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
<Import Project="$(SolutionDir)\zlib.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -24,10 +36,16 @@
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<CustomBuildBeforeTargets>Build</CustomBuildBeforeTargets>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+ <CustomBuildBeforeTargets>Build</CustomBuildBeforeTargets>
+ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>$(WarningLevel)</WarningLevel>
@@ -53,6 +71,31 @@
<Inputs>..\..\..\scripts\pnglibconf.h.prebuilt</Inputs>
</CustomBuildStep>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+ <ClCompile>
+ <WarningLevel>$(WarningLevel)</WarningLevel>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ <CustomBuildStep>
+ <Command>copy ..\..\..\scripts\pnglibconf.h.prebuilt ..\..\..\pnglibconf.h</Command>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Message>Generating pnglibconf.h</Message>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Outputs>..\..\..\pnglibconf.h</Outputs>
+ </CustomBuildStep>
+ <CustomBuildStep>
+ <Inputs>..\..\..\scripts\pnglibconf.h.prebuilt</Inputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
<ItemGroup>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Modified: branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pngstest/pngstest.vcxproj
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pngstest/pngstest.vcxproj 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pngstest/pngstest.vcxproj 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,18 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug Library|ARM64">
+ <Configuration>Debug Library</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Debug Library|Win32">
<Configuration>Debug Library</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|ARM64">
+ <Configuration>Debug</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release Library|ARM64">
+ <Configuration>Release Library</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release Library|Win32">
<Configuration>Release Library</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release|ARM64">
+ <Configuration>Release</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
@@ -28,19 +44,43 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|ARM64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
@@ -47,36 +87,64 @@
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+ </ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|ARM64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>false</LinkIncremental>
<CustomBuildAfterTargets />
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+ <LinkIncremental>false</LinkIncremental>
+ <CustomBuildAfterTargets />
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">
<LinkIncremental>false</LinkIncremental>
<CustomBuildAfterTargets />
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'">
+ <LinkIncremental>false</LinkIncremental>
+ <CustomBuildAfterTargets />
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<CustomBuildAfterTargets />
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+ <LinkIncremental>false</LinkIncremental>
+ <CustomBuildAfterTargets />
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">
<LinkIncremental>false</LinkIncremental>
<CustomBuildAfterTargets />
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|ARM64'">
+ <LinkIncremental>false</LinkIncremental>
+ <CustomBuildAfterTargets />
+ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
- <WarningLevel>$(WarningLevel)</WarningLevel>
+ <WarningLevel>Level3</WarningLevel>
<MinimalRebuild>false</MinimalRebuild>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Disabled</Optimization>
@@ -85,7 +153,7 @@
<AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
<CompileAsManaged>false</CompileAsManaged>
- <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
+ <TreatWarningAsError>false</TreatWarningAsError>
<IntrinsicFunctions>true</IntrinsicFunctions>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>false</FunctionLevelLinking>
@@ -106,10 +174,43 @@
<Inputs>$(OutDir)pngstest.exe</Inputs>
</CustomBuildStep>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+ <ClCompile>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <MinimalRebuild>false</MinimalRebuild>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <Optimization>Disabled</Optimization>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <CompileAsManaged>false</CompileAsManaged>
+ <TreatWarningAsError>false</TreatWarningAsError>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <StringPooling>true</StringPooling>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <BrowseInformation>true</BrowseInformation>
+ <FloatingPointExceptions>false</FloatingPointExceptions>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <AdditionalDependencies>libpng16.lib</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
+ </Link>
+ <CustomBuildStep>
+ <Message>Executing libpng simplified API test program</Message>
+ <Command>"$(OutDir)pngstest.exe" --strict --log --touch "$(IntDir)pngstest.out" ../../../contrib/pngsuite/basn0g01.png ../../../contrib/pngsuite/basn0g02.png ../../../contrib/pngsuite/basn0g04.png ../../../contrib/pngsuite/basn0g08.png ../../../contrib/pngsuite/basn0g16.png ../../../contrib/pngsuite/basn2c08.png ../../../contrib/pngsuite/basn2c16.png ../../../contrib/pngsuite/basn3p01.png ../../../contrib/pngsuite/basn3p02.png ../../../contrib/pngsuite/basn3p04.png ../../../contrib/pngsuite/basn3p08.png ../../../contrib/pngsuite/basn4a08.png ../../../contrib/pngsuite/basn4a16.png ../../../contrib/pngsuite/basn6a08.png ../../../contrib/pngsuite/basn6a16.png ../../../contrib/pngsuite/ftbbn0g01.png ../../../contrib/pngsuite/ftbbn0g02.png ../../../contrib/pngsuite/ftbbn0g04.png ../../../contrib/pngsuite/ftbbn2c16.png ../../../contrib/pngsuite/ftbbn3p08.png ../../../contrib/pngsuite/ftbgn2c16.png ../../../contrib/pngsuite/ftbgn3p08.png ../../../contrib/pngsuite/ftbrn2c08.png ../../../contrib/pngsuite/ftbwn0g16.png ../../../contrib/pngsuite/ftbwn3p08.png ../../../contrib/pngsuite/ftbyn3p08.png ../../../contrib/pngsuite/ftp0n0g08.png ../../../contrib/pngsuite/ftp0n2c08.png ../../../contrib/pngsuite/ftp0n3p08.png ../../../contrib/pngsuite/ftp1n3p08.png</Command>
+ <Outputs>$(IntDir)pngstest.out</Outputs>
+ <Inputs>$(OutDir)pngstest.exe</Inputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
- <WarningLevel>$(WarningLevel)</WarningLevel>
+ <WarningLevel>Level3</WarningLevel>
<MinimalRebuild>false</MinimalRebuild>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Disabled</Optimization>
@@ -119,7 +220,7 @@
<AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
<CompileAsManaged>false</CompileAsManaged>
- <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
+ <TreatWarningAsError>false</TreatWarningAsError>
<IntrinsicFunctions>true</IntrinsicFunctions>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>false</FunctionLevelLinking>
@@ -139,6 +240,39 @@
<Inputs>$(OutDir)pngstest.exe</Inputs>
</CustomBuildStep>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'">
+ <ClCompile>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <MinimalRebuild>false</MinimalRebuild>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <Optimization>Disabled</Optimization>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <CompileAsManaged>false</CompileAsManaged>
+ <TreatWarningAsError>false</TreatWarningAsError>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <StringPooling>true</StringPooling>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <BrowseInformation>true</BrowseInformation>
+ <FloatingPointExceptions>false</FloatingPointExceptions>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
+ </Link>
+ <CustomBuildStep>
+ <Message>Executing libpng simplified API test program</Message>
+ <Command>"$(OutDir)pngstest.exe" --strict --log --touch "$(IntDir)pngstest.out" ../../../contrib/pngsuite/basn0g01.png ../../../contrib/pngsuite/basn0g02.png ../../../contrib/pngsuite/basn0g04.png ../../../contrib/pngsuite/basn0g08.png ../../../contrib/pngsuite/basn0g16.png ../../../contrib/pngsuite/basn2c08.png ../../../contrib/pngsuite/basn2c16.png ../../../contrib/pngsuite/basn3p01.png ../../../contrib/pngsuite/basn3p02.png ../../../contrib/pngsuite/basn3p04.png ../../../contrib/pngsuite/basn3p08.png ../../../contrib/pngsuite/basn4a08.png ../../../contrib/pngsuite/basn4a16.png ../../../contrib/pngsuite/basn6a08.png ../../../contrib/pngsuite/basn6a16.png ../../../contrib/pngsuite/ftbbn0g01.png ../../../contrib/pngsuite/ftbbn0g02.png ../../../contrib/pngsuite/ftbbn0g04.png ../../../contrib/pngsuite/ftbbn2c16.png ../../../contrib/pngsuite/ftbbn3p08.png ../../../contrib/pngsuite/ftbgn2c16.png ../../../contrib/pngsuite/ftbgn3p08.png ../../../contrib/pngsuite/ftbrn2c08.png ../../../contrib/pngsuite/ftbwn0g16.png ../../../contrib/pngsuite/ftbwn3p08.png ../../../contrib/pngsuite/ftbyn3p08.png ../../../contrib/pngsuite/ftp0n0g08.png ../../../contrib/pngsuite/ftp0n2c08.png ../../../contrib/pngsuite/ftp0n3p08.png ../../../contrib/pngsuite/ftp1n3p08.png</Command>
+ <Outputs>$(IntDir)pngstest.out</Outputs>
+ <Inputs>$(OutDir)pngstest.exe</Inputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>$(WarningLevel)</WarningLevel>
@@ -174,12 +308,47 @@
<Inputs>$(OutDir)pngstest.exe</Inputs>
</CustomBuildStep>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<ClCompile>
<WarningLevel>$(WarningLevel)</WarningLevel>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Full</Optimization>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <CompileAsManaged>false</CompileAsManaged>
+ <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
+ <StringPooling>true</StringPooling>
+ <MinimalRebuild>false</MinimalRebuild>
+ <BrowseInformation>true</BrowseInformation>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <FloatingPointExceptions>false</FloatingPointExceptions>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ <AdditionalDependencies>libpng16.lib</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
+ <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+ </Link>
+ <CustomBuildStep>
+ <Message>Executing libpng simplified API test program</Message>
+ <Command>"$(OutDir)pngstest.exe" --strict --log --touch "$(IntDir)pngstest.out" ../../../contrib/pngsuite/basn0g01.png ../../../contrib/pngsuite/basn0g02.png ../../../contrib/pngsuite/basn0g04.png ../../../contrib/pngsuite/basn0g08.png ../../../contrib/pngsuite/basn0g16.png ../../../contrib/pngsuite/basn2c08.png ../../../contrib/pngsuite/basn2c16.png ../../../contrib/pngsuite/basn3p01.png ../../../contrib/pngsuite/basn3p02.png ../../../contrib/pngsuite/basn3p04.png ../../../contrib/pngsuite/basn3p08.png ../../../contrib/pngsuite/basn4a08.png ../../../contrib/pngsuite/basn4a16.png ../../../contrib/pngsuite/basn6a08.png ../../../contrib/pngsuite/basn6a16.png ../../../contrib/pngsuite/ftbbn0g01.png ../../../contrib/pngsuite/ftbbn0g02.png ../../../contrib/pngsuite/ftbbn0g04.png ../../../contrib/pngsuite/ftbbn2c16.png ../../../contrib/pngsuite/ftbbn3p08.png ../../../contrib/pngsuite/ftbgn2c16.png ../../../contrib/pngsuite/ftbgn3p08.png ../../../contrib/pngsuite/ftbrn2c08.png ../../../contrib/pngsuite/ftbwn0g16.png ../../../contrib/pngsuite/ftbwn3p08.png ../../../contrib/pngsuite/ftbyn3p08.png ../../../contrib/pngsuite/ftp0n0g08.png ../../../contrib/pngsuite/ftp0n2c08.png ../../../contrib/pngsuite/ftp0n3p08.png ../../../contrib/pngsuite/ftp1n3p08.png</Command>
+ <Outputs>$(IntDir)pngstest.out</Outputs>
+ <Inputs>$(OutDir)pngstest.exe</Inputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <Optimization>Full</Optimization>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>false</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
@@ -187,7 +356,7 @@
<AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
<CompileAsManaged>false</CompileAsManaged>
- <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
+ <TreatWarningAsError>false</TreatWarningAsError>
<StringPooling>true</StringPooling>
<MinimalRebuild>false</MinimalRebuild>
<BrowseInformation>true</BrowseInformation>
@@ -210,6 +379,42 @@
<Inputs>$(OutDir)pngstest.exe</Inputs>
</CustomBuildStep>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|ARM64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <Optimization>Full</Optimization>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <CompileAsManaged>false</CompileAsManaged>
+ <TreatWarningAsError>false</TreatWarningAsError>
+ <StringPooling>true</StringPooling>
+ <MinimalRebuild>false</MinimalRebuild>
+ <BrowseInformation>true</BrowseInformation>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <FloatingPointExceptions>false</FloatingPointExceptions>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
+ <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+ </Link>
+ <CustomBuildStep>
+ <Message>Executing libpng simplified API test program</Message>
+ <Command>"$(OutDir)pngstest.exe" --strict --log --touch "$(IntDir)pngstest.out" ../../../contrib/pngsuite/basn0g01.png ../../../contrib/pngsuite/basn0g02.png ../../../contrib/pngsuite/basn0g04.png ../../../contrib/pngsuite/basn0g08.png ../../../contrib/pngsuite/basn0g16.png ../../../contrib/pngsuite/basn2c08.png ../../../contrib/pngsuite/basn2c16.png ../../../contrib/pngsuite/basn3p01.png ../../../contrib/pngsuite/basn3p02.png ../../../contrib/pngsuite/basn3p04.png ../../../contrib/pngsuite/basn3p08.png ../../../contrib/pngsuite/basn4a08.png ../../../contrib/pngsuite/basn4a16.png ../../../contrib/pngsuite/basn6a08.png ../../../contrib/pngsuite/basn6a16.png ../../../contrib/pngsuite/ftbbn0g01.png ../../../contrib/pngsuite/ftbbn0g02.png ../../../contrib/pngsuite/ftbbn0g04.png ../../../contrib/pngsuite/ftbbn2c16.png ../../../contrib/pngsuite/ftbbn3p08.png ../../../contrib/pngsuite/ftbgn2c16.png ../../../contrib/pngsuite/ftbgn3p08.png ../../../contrib/pngsuite/ftbrn2c08.png ../../../contrib/pngsuite/ftbwn0g16.png ../../../contrib/pngsuite/ftbwn3p08.png ../../../contrib/pngsuite/ftbyn3p08.png ../../../contrib/pngsuite/ftp0n0g08.png ../../../contrib/pngsuite/ftp0n2c08.png ../../../contrib/pngsuite/ftp0n3p08.png ../../../contrib/pngsuite/ftp1n3p08.png</Command>
+ <Outputs>$(IntDir)pngstest.out</Outputs>
+ <Inputs>$(OutDir)pngstest.exe</Inputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\contrib\libtests\pngstest.c" />
</ItemGroup>
Modified: branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pngtest/pngtest.vcxproj
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pngtest/pngtest.vcxproj 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pngtest/pngtest.vcxproj 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,18 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug Library|ARM64">
+ <Configuration>Debug Library</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Debug Library|Win32">
<Configuration>Debug Library</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|ARM64">
+ <Configuration>Debug</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release Library|ARM64">
+ <Configuration>Release Library</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release Library|Win32">
<Configuration>Release Library</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release|ARM64">
+ <Configuration>Release</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
@@ -28,19 +44,43 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|ARM64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
@@ -47,36 +87,64 @@
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+ </ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|ARM64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>false</LinkIncremental>
<CustomBuildAfterTargets />
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+ <LinkIncremental>false</LinkIncremental>
+ <CustomBuildAfterTargets />
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">
<LinkIncremental>false</LinkIncremental>
<CustomBuildAfterTargets />
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'">
+ <LinkIncremental>false</LinkIncremental>
+ <CustomBuildAfterTargets />
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<CustomBuildAfterTargets />
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+ <LinkIncremental>false</LinkIncremental>
+ <CustomBuildAfterTargets />
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">
<LinkIncremental>false</LinkIncremental>
<CustomBuildAfterTargets />
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|ARM64'">
+ <LinkIncremental>false</LinkIncremental>
+ <CustomBuildAfterTargets />
+ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
- <WarningLevel>$(WarningLevel)</WarningLevel>
+ <WarningLevel>Level3</WarningLevel>
<MinimalRebuild>false</MinimalRebuild>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Disabled</Optimization>
@@ -85,7 +153,7 @@
<AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
<CompileAsManaged>false</CompileAsManaged>
- <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
+ <TreatWarningAsError>false</TreatWarningAsError>
<IntrinsicFunctions>true</IntrinsicFunctions>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>false</FunctionLevelLinking>
@@ -106,10 +174,43 @@
<Inputs>..\..\..\pngtest.png;$(OutDir)pngtest.exe</Inputs>
</CustomBuildStep>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+ <ClCompile>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <MinimalRebuild>false</MinimalRebuild>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <Optimization>Disabled</Optimization>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <CompileAsManaged>false</CompileAsManaged>
+ <TreatWarningAsError>false</TreatWarningAsError>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <StringPooling>true</StringPooling>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <BrowseInformation>true</BrowseInformation>
+ <FloatingPointExceptions>false</FloatingPointExceptions>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <AdditionalDependencies>libpng16.lib</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
+ </Link>
+ <CustomBuildStep>
+ <Message>Executing PNG test program</Message>
+ <Command>"$(OutDir)pngtest.exe" ..\..\..\pngtest.png "$(IntDir)pngout.png"</Command>
+ <Outputs>$(IntDir)pngout.png</Outputs>
+ <Inputs>..\..\..\pngtest.png;$(OutDir)pngtest.exe</Inputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
- <WarningLevel>$(WarningLevel)</WarningLevel>
+ <WarningLevel>Level3</WarningLevel>
<MinimalRebuild>false</MinimalRebuild>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Disabled</Optimization>
@@ -119,7 +220,7 @@
<AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
<CompileAsManaged>false</CompileAsManaged>
- <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
+ <TreatWarningAsError>false</TreatWarningAsError>
<IntrinsicFunctions>true</IntrinsicFunctions>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>false</FunctionLevelLinking>
@@ -139,6 +240,39 @@
<Inputs>..\..\..\pngtest.png;$(OutDir)pngtest.exe</Inputs>
</CustomBuildStep>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'">
+ <ClCompile>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <MinimalRebuild>false</MinimalRebuild>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <Optimization>Disabled</Optimization>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <CompileAsManaged>false</CompileAsManaged>
+ <TreatWarningAsError>false</TreatWarningAsError>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <StringPooling>true</StringPooling>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <BrowseInformation>true</BrowseInformation>
+ <FloatingPointExceptions>false</FloatingPointExceptions>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
+ </Link>
+ <CustomBuildStep>
+ <Message>Executing PNG test program</Message>
+ <Command>"$(OutDir)pngtest.exe" ..\..\..\pngtest.png "$(IntDir)pngout.png"</Command>
+ <Outputs>$(IntDir)pngout.png</Outputs>
+ <Inputs>..\..\..\pngtest.png;$(OutDir)pngtest.exe</Inputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>$(WarningLevel)</WarningLevel>
@@ -174,13 +308,12 @@
<Inputs>..\..\..\pngtest.png;$(OutDir)pngtest.exe</Inputs>
</CustomBuildStep>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<ClCompile>
<WarningLevel>$(WarningLevel)</WarningLevel>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Full</Optimization>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>false</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -199,6 +332,42 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+ <AdditionalDependencies>libpng16.lib</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
+ </Link>
+ <CustomBuildStep>
+ <Message>Executing PNG test program</Message>
+ <Command>"$(OutDir)pngtest.exe" ..\..\..\pngtest.png "$(IntDir)pngout.png"</Command>
+ <Outputs>$(IntDir)pngout.png</Outputs>
+ <Inputs>..\..\..\pngtest.png;$(OutDir)pngtest.exe</Inputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <Optimization>Full</Optimization>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <CompileAsManaged>false</CompileAsManaged>
+ <TreatWarningAsError>false</TreatWarningAsError>
+ <StringPooling>true</StringPooling>
+ <MinimalRebuild>false</MinimalRebuild>
+ <BrowseInformation>true</BrowseInformation>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <FloatingPointExceptions>false</FloatingPointExceptions>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
<AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
@@ -211,6 +380,43 @@
<Inputs>..\..\..\pngtest.png;$(OutDir)pngtest.exe</Inputs>
</CustomBuildStep>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|ARM64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <Optimization>Full</Optimization>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <CompileAsManaged>false</CompileAsManaged>
+ <TreatWarningAsError>false</TreatWarningAsError>
+ <StringPooling>true</StringPooling>
+ <MinimalRebuild>false</MinimalRebuild>
+ <BrowseInformation>true</BrowseInformation>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <FloatingPointExceptions>false</FloatingPointExceptions>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies>
+ <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+ <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
+ </Link>
+ <CustomBuildStep>
+ <Message>Executing PNG test program</Message>
+ <Command>$(OutDir)pngtest.exe ..\..\..\pngtest.png $(IntDir)pngout.png</Command>
+ <Command>"$(OutDir)pngtest.exe" ..\..\..\pngtest.png "$(IntDir)pngout.png"</Command>
+ <Outputs>$(IntDir)pngout.png</Outputs>
+ <Inputs>..\..\..\pngtest.png;$(OutDir)pngtest.exe</Inputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\pngtest.c" />
</ItemGroup>
Modified: branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pngunknown/pngunknown.vcxproj
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pngunknown/pngunknown.vcxproj 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pngunknown/pngunknown.vcxproj 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,18 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug Library|ARM64">
+ <Configuration>Debug Library</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Debug Library|Win32">
<Configuration>Debug Library</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|ARM64">
+ <Configuration>Debug</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release Library|ARM64">
+ <Configuration>Release Library</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release Library|Win32">
<Configuration>Release Library</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release|ARM64">
+ <Configuration>Release</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
@@ -28,19 +44,43 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|ARM64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
@@ -47,36 +87,64 @@
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+ </ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|ARM64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>false</LinkIncremental>
<CustomBuildAfterTargets />
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+ <LinkIncremental>false</LinkIncremental>
+ <CustomBuildAfterTargets />
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">
<LinkIncremental>false</LinkIncremental>
<CustomBuildAfterTargets />
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'">
+ <LinkIncremental>false</LinkIncremental>
+ <CustomBuildAfterTargets />
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<CustomBuildAfterTargets />
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+ <LinkIncremental>false</LinkIncremental>
+ <CustomBuildAfterTargets />
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">
<LinkIncremental>false</LinkIncremental>
<CustomBuildAfterTargets />
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|ARM64'">
+ <LinkIncremental>false</LinkIncremental>
+ <CustomBuildAfterTargets />
+ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
- <WarningLevel>$(WarningLevel)</WarningLevel>
+ <WarningLevel>Level3</WarningLevel>
<MinimalRebuild>false</MinimalRebuild>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Disabled</Optimization>
@@ -85,7 +153,7 @@
<AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
<CompileAsManaged>false</CompileAsManaged>
- <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
+ <TreatWarningAsError>false</TreatWarningAsError>
<IntrinsicFunctions>true</IntrinsicFunctions>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>false</FunctionLevelLinking>
@@ -106,10 +174,43 @@
<Inputs>$(OutDir)pngunknown.exe</Inputs>
</CustomBuildStep>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+ <ClCompile>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <MinimalRebuild>false</MinimalRebuild>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <Optimization>Disabled</Optimization>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <CompileAsManaged>false</CompileAsManaged>
+ <TreatWarningAsError>false</TreatWarningAsError>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <StringPooling>true</StringPooling>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <BrowseInformation>true</BrowseInformation>
+ <FloatingPointExceptions>false</FloatingPointExceptions>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <AdditionalDependencies>libpng16.lib</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
+ </Link>
+ <CustomBuildStep>
+ <Message>Executing PNG validation program</Message>
+ <Command>"$(OutDir)pngunknown.exe" --strict --default --touch "$(IntDir)pngunknown.out" ../../../pngtest.png</Command>
+ <Outputs>$(IntDir)pngunknown.out</Outputs>
+ <Inputs>$(OutDir)pngunknown.exe</Inputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
- <WarningLevel>$(WarningLevel)</WarningLevel>
+ <WarningLevel>Level3</WarningLevel>
<MinimalRebuild>false</MinimalRebuild>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Disabled</Optimization>
@@ -119,7 +220,7 @@
<AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
<CompileAsManaged>false</CompileAsManaged>
- <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
+ <TreatWarningAsError>false</TreatWarningAsError>
<IntrinsicFunctions>true</IntrinsicFunctions>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>false</FunctionLevelLinking>
@@ -139,6 +240,39 @@
<Inputs>$(OutDir)pngunknown.exe</Inputs>
</CustomBuildStep>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'">
+ <ClCompile>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <MinimalRebuild>false</MinimalRebuild>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <Optimization>Disabled</Optimization>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <CompileAsManaged>false</CompileAsManaged>
+ <TreatWarningAsError>false</TreatWarningAsError>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <StringPooling>true</StringPooling>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <BrowseInformation>true</BrowseInformation>
+ <FloatingPointExceptions>false</FloatingPointExceptions>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
+ </Link>
+ <CustomBuildStep>
+ <Message>Executing PNG validation program</Message>
+ <Command>"$(OutDir)pngunknown.exe" --strict --default --touch "$(IntDir)pngunknown.out" ../../../pngtest.png</Command>
+ <Outputs>$(IntDir)pngunknown.out</Outputs>
+ <Inputs>$(OutDir)pngunknown.exe</Inputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>$(WarningLevel)</WarningLevel>
@@ -174,12 +308,47 @@
<Inputs>$(OutDir)pngunknown.exe</Inputs>
</CustomBuildStep>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<ClCompile>
<WarningLevel>$(WarningLevel)</WarningLevel>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Full</Optimization>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <CompileAsManaged>false</CompileAsManaged>
+ <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
+ <StringPooling>true</StringPooling>
+ <MinimalRebuild>false</MinimalRebuild>
+ <BrowseInformation>true</BrowseInformation>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <FloatingPointExceptions>false</FloatingPointExceptions>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ <AdditionalDependencies>libpng16.lib</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
+ <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+ </Link>
+ <CustomBuildStep>
+ <Message>Executing PNG validation program</Message>
+ <Command>"$(OutDir)pngunknown.exe" --strict --default --touch "$(IntDir)pngunknown.out" ../../../pngtest.png</Command>
+ <Outputs>$(IntDir)pngunknown.out</Outputs>
+ <Inputs>$(OutDir)pngunknown.exe</Inputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <Optimization>Full</Optimization>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>false</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
@@ -187,7 +356,7 @@
<AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
<CompileAsManaged>false</CompileAsManaged>
- <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
+ <TreatWarningAsError>false</TreatWarningAsError>
<StringPooling>true</StringPooling>
<MinimalRebuild>false</MinimalRebuild>
<BrowseInformation>true</BrowseInformation>
@@ -210,6 +379,42 @@
<Inputs>$(OutDir)pngunknown.exe</Inputs>
</CustomBuildStep>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|ARM64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <Optimization>Full</Optimization>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <CompileAsManaged>false</CompileAsManaged>
+ <TreatWarningAsError>false</TreatWarningAsError>
+ <StringPooling>true</StringPooling>
+ <MinimalRebuild>false</MinimalRebuild>
+ <BrowseInformation>true</BrowseInformation>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <FloatingPointExceptions>false</FloatingPointExceptions>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
+ <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+ </Link>
+ <CustomBuildStep>
+ <Message>Executing PNG validation program</Message>
+ <Command>"$(OutDir)pngunknown.exe" --strict --default --touch "$(IntDir)pngunknown.out" ../../../pngtest.png</Command>
+ <Outputs>$(IntDir)pngunknown.out</Outputs>
+ <Inputs>$(OutDir)pngunknown.exe</Inputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\contrib\libtests\pngunknown.c" />
</ItemGroup>
Modified: branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pngvalid/pngvalid.vcxproj
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pngvalid/pngvalid.vcxproj 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/pngvalid/pngvalid.vcxproj 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,18 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug Library|ARM64">
+ <Configuration>Debug Library</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Debug Library|Win32">
<Configuration>Debug Library</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|ARM64">
+ <Configuration>Debug</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release Library|ARM64">
+ <Configuration>Release Library</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release Library|Win32">
<Configuration>Release Library</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release|ARM64">
+ <Configuration>Release</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
@@ -28,19 +44,43 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|ARM64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
@@ -47,36 +87,64 @@
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+ </ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|ARM64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>false</LinkIncremental>
<CustomBuildAfterTargets />
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+ <LinkIncremental>false</LinkIncremental>
+ <CustomBuildAfterTargets />
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">
<LinkIncremental>false</LinkIncremental>
<CustomBuildAfterTargets />
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'">
+ <LinkIncremental>false</LinkIncremental>
+ <CustomBuildAfterTargets />
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<CustomBuildAfterTargets />
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+ <LinkIncremental>false</LinkIncremental>
+ <CustomBuildAfterTargets />
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">
<LinkIncremental>false</LinkIncremental>
<CustomBuildAfterTargets />
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|ARM64'">
+ <LinkIncremental>false</LinkIncremental>
+ <CustomBuildAfterTargets />
+ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
- <WarningLevel>$(WarningLevel)</WarningLevel>
+ <WarningLevel>Level3</WarningLevel>
<MinimalRebuild>false</MinimalRebuild>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Disabled</Optimization>
@@ -85,7 +153,7 @@
<AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
<CompileAsManaged>false</CompileAsManaged>
- <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
+ <TreatWarningAsError>false</TreatWarningAsError>
<IntrinsicFunctions>true</IntrinsicFunctions>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>false</FunctionLevelLinking>
@@ -106,10 +174,43 @@
<Inputs>$(OutDir)pngvalid.exe</Inputs>
</CustomBuildStep>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+ <ClCompile>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <MinimalRebuild>false</MinimalRebuild>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <Optimization>Disabled</Optimization>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <CompileAsManaged>false</CompileAsManaged>
+ <TreatWarningAsError>false</TreatWarningAsError>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <StringPooling>true</StringPooling>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <BrowseInformation>true</BrowseInformation>
+ <FloatingPointExceptions>false</FloatingPointExceptions>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
+ </Link>
+ <CustomBuildStep>
+ <Message>Executing PNG validation program</Message>
+ <Command>"$(OutDir)pngvalid.exe" --touch "$(IntDir)pngvalid.out"</Command>
+ <Outputs>$(IntDir)pngvalid.out</Outputs>
+ <Inputs>$(OutDir)pngvalid.exe</Inputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
- <WarningLevel>$(WarningLevel)</WarningLevel>
+ <WarningLevel>Level3</WarningLevel>
<MinimalRebuild>false</MinimalRebuild>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Disabled</Optimization>
@@ -119,7 +220,7 @@
<AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
<CompileAsManaged>false</CompileAsManaged>
- <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
+ <TreatWarningAsError>false</TreatWarningAsError>
<IntrinsicFunctions>true</IntrinsicFunctions>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>false</FunctionLevelLinking>
@@ -139,6 +240,39 @@
<Inputs>$(OutDir)pngvalid.exe</Inputs>
</CustomBuildStep>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'">
+ <ClCompile>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <MinimalRebuild>false</MinimalRebuild>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <Optimization>Disabled</Optimization>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <CompileAsManaged>false</CompileAsManaged>
+ <TreatWarningAsError>false</TreatWarningAsError>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <StringPooling>true</StringPooling>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <BrowseInformation>true</BrowseInformation>
+ <FloatingPointExceptions>false</FloatingPointExceptions>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
+ </Link>
+ <CustomBuildStep>
+ <Message>Executing PNG validation program</Message>
+ <Command>"$(OutDir)pngvalid.exe" --touch "$(IntDir)pngvalid.out"</Command>
+ <Outputs>$(IntDir)pngvalid.out</Outputs>
+ <Inputs>$(OutDir)pngvalid.exe</Inputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>$(WarningLevel)</WarningLevel>
@@ -174,12 +308,47 @@
<Inputs>$(OutDir)pngvalid.exe</Inputs>
</CustomBuildStep>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<ClCompile>
<WarningLevel>$(WarningLevel)</WarningLevel>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Full</Optimization>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <CompileAsManaged>false</CompileAsManaged>
+ <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
+ <StringPooling>true</StringPooling>
+ <MinimalRebuild>false</MinimalRebuild>
+ <BrowseInformation>true</BrowseInformation>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <FloatingPointExceptions>false</FloatingPointExceptions>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
+ <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+ </Link>
+ <CustomBuildStep>
+ <Message>Executing PNG validation program</Message>
+ <Command>"$(OutDir)pngvalid.exe" --touch "$(IntDir)pngvalid.out"</Command>
+ <Outputs>$(IntDir)pngvalid.out</Outputs>
+ <Inputs>$(OutDir)pngvalid.exe</Inputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <Optimization>Full</Optimization>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>false</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
@@ -187,7 +356,7 @@
<AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
<CompileAsManaged>false</CompileAsManaged>
- <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
+ <TreatWarningAsError>false</TreatWarningAsError>
<StringPooling>true</StringPooling>
<MinimalRebuild>false</MinimalRebuild>
<BrowseInformation>true</BrowseInformation>
@@ -210,6 +379,42 @@
<Inputs>$(OutDir)pngvalid.exe</Inputs>
</CustomBuildStep>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|ARM64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <Optimization>Full</Optimization>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <CompileAsManaged>false</CompileAsManaged>
+ <TreatWarningAsError>false</TreatWarningAsError>
+ <StringPooling>true</StringPooling>
+ <MinimalRebuild>false</MinimalRebuild>
+ <BrowseInformation>true</BrowseInformation>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <FloatingPointExceptions>false</FloatingPointExceptions>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ <AdditionalDependencies>libpng16.lib;zlib.lib</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
+ <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+ </Link>
+ <CustomBuildStep>
+ <Message>Executing PNG validation program</Message>
+ <Command>"$(OutDir)pngvalid.exe" --touch "$(IntDir)pngvalid.out"</Command>
+ <Outputs>$(IntDir)pngvalid.out</Outputs>
+ <Inputs>$(OutDir)pngvalid.exe</Inputs>
+ </CustomBuildStep>
+ </ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\contrib\libtests\pngvalid.c" />
</ItemGroup>
Modified: branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/vstudio.sln
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/vstudio.sln 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/vstudio.sln 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,5 +1,7 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31515.178
+MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib\zlib.vcxproj", "{60F89955-91C6-3A36-8000-13C592FEC2DF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pnglibconf", "pnglibconf\pnglibconf.vcxproj", "{EB33566E-DA7F-4D28-9077-88C0B7C77E35}"
@@ -40,66 +42,126 @@
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug Library|ARM64 = Debug Library|ARM64
Debug Library|Win32 = Debug Library|Win32
+ Debug|ARM64 = Debug|ARM64
Debug|Win32 = Debug|Win32
+ Release Library|ARM64 = Release Library|ARM64
Release Library|Win32 = Release Library|Win32
+ Release|ARM64 = Release|ARM64
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug Library|ARM64.ActiveCfg = Debug Library|ARM64
+ {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug Library|ARM64.Build.0 = Debug Library|ARM64
+ {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug Library|Win32.ActiveCfg = Debug Library|Win32
+ {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug Library|Win32.Build.0 = Debug Library|Win32
+ {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug|ARM64.Build.0 = Debug|ARM64
+ {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug|Win32.ActiveCfg = Debug|Win32
+ {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug|Win32.Build.0 = Debug|Win32
+ {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release Library|ARM64.ActiveCfg = Release Library|ARM64
+ {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release Library|ARM64.Build.0 = Release Library|ARM64
+ {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release Library|Win32.ActiveCfg = Release Library|Win32
+ {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release Library|Win32.Build.0 = Release Library|Win32
+ {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release|ARM64.ActiveCfg = Release|ARM64
+ {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release|ARM64.Build.0 = Release|ARM64
+ {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release|Win32.ActiveCfg = Release|Win32
+ {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release|Win32.Build.0 = Release|Win32
+ {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug Library|ARM64.ActiveCfg = Release|ARM64
+ {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug Library|ARM64.Build.0 = Release|ARM64
+ {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug Library|Win32.ActiveCfg = Release|Win32
+ {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug Library|Win32.Build.0 = Release|Win32
+ {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug|ARM64.ActiveCfg = Release|ARM64
+ {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug|ARM64.Build.0 = Release|ARM64
+ {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug|Win32.ActiveCfg = Release|Win32
+ {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug|Win32.Build.0 = Release|Win32
+ {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release Library|ARM64.ActiveCfg = Release|ARM64
+ {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release Library|ARM64.Build.0 = Release|ARM64
+ {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release Library|Win32.ActiveCfg = Release|Win32
+ {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release Library|Win32.Build.0 = Release|Win32
+ {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release|ARM64.ActiveCfg = Release|ARM64
+ {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release|ARM64.Build.0 = Release|ARM64
+ {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release|Win32.ActiveCfg = Release|Win32
+ {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release|Win32.Build.0 = Release|Win32
+ {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug Library|ARM64.ActiveCfg = Debug Library|ARM64
+ {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug Library|ARM64.Build.0 = Debug Library|ARM64
{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug Library|Win32.ActiveCfg = Debug Library|Win32
{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug Library|Win32.Build.0 = Debug Library|Win32
+ {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|ARM64.Build.0 = Debug|ARM64
{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|Win32.ActiveCfg = Debug|Win32
{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|Win32.Build.0 = Debug|Win32
+ {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release Library|ARM64.ActiveCfg = Release Library|ARM64
+ {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release Library|ARM64.Build.0 = Release Library|ARM64
{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release Library|Win32.ActiveCfg = Release Library|Win32
{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release Library|Win32.Build.0 = Release Library|Win32
+ {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|ARM64.ActiveCfg = Release|ARM64
+ {D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|ARM64.Build.0 = Release|ARM64
{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|Win32.ActiveCfg = Release|Win32
{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|Win32.Build.0 = Release|Win32
+ {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Debug Library|ARM64.ActiveCfg = Debug Library|ARM64
+ {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Debug Library|ARM64.Build.0 = Debug Library|ARM64
{228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Debug Library|Win32.ActiveCfg = Debug Library|Win32
{228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Debug Library|Win32.Build.0 = Debug Library|Win32
+ {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Debug|ARM64.Build.0 = Debug|ARM64
{228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Debug|Win32.ActiveCfg = Debug|Win32
{228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Debug|Win32.Build.0 = Debug|Win32
+ {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Release Library|ARM64.ActiveCfg = Release Library|ARM64
+ {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Release Library|ARM64.Build.0 = Release Library|ARM64
{228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Release Library|Win32.ActiveCfg = Release Library|Win32
{228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Release Library|Win32.Build.0 = Release Library|Win32
+ {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Release|ARM64.ActiveCfg = Release|ARM64
+ {228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Release|ARM64.Build.0 = Release|ARM64
{228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Release|Win32.ActiveCfg = Release|Win32
{228BA965-50D5-42B2-8BCF-AFCC227E3C1D}.Release|Win32.Build.0 = Release|Win32
- {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug Library|Win32.ActiveCfg = Debug Library|Win32
- {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug Library|Win32.Build.0 = Debug Library|Win32
- {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug|Win32.ActiveCfg = Debug|Win32
- {60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug|Win32.Build.0 = Debug|Win32
- {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release Library|Win32.ActiveCfg = Release Library|Win32
- {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release Library|Win32.Build.0 = Release Library|Win32
- {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release|Win32.ActiveCfg = Release|Win32
- {60F89955-91C6-3A36-8000-13C592FEC2DF}.Release|Win32.Build.0 = Release|Win32
+ {9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Debug Library|ARM64.ActiveCfg = Debug Library|ARM64
+ {9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Debug Library|ARM64.Build.0 = Debug Library|ARM64
{9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Debug Library|Win32.ActiveCfg = Debug Library|Win32
{9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Debug Library|Win32.Build.0 = Debug Library|Win32
+ {9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Debug|ARM64.Build.0 = Debug|ARM64
{9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Debug|Win32.ActiveCfg = Debug|Win32
{9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Debug|Win32.Build.0 = Debug|Win32
+ {9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Release Library|ARM64.ActiveCfg = Release Library|ARM64
+ {9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Release Library|ARM64.Build.0 = Release Library|ARM64
{9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Release Library|Win32.ActiveCfg = Release Library|Win32
{9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Release Library|Win32.Build.0 = Release Library|Win32
+ {9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Release|ARM64.ActiveCfg = Release|ARM64
+ {9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Release|ARM64.Build.0 = Release|ARM64
{9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Release|Win32.ActiveCfg = Release|Win32
{9B36B6FE-7FC0-434F-A71F-BBEF8099F1D8}.Release|Win32.Build.0 = Release|Win32
- {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug Library|Win32.ActiveCfg = Release|Win32
- {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug Library|Win32.Build.0 = Release|Win32
- {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug|Win32.ActiveCfg = Release|Win32
- {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Debug|Win32.Build.0 = Release|Win32
- {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release Library|Win32.ActiveCfg = Release|Win32
- {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release Library|Win32.Build.0 = Release|Win32
- {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release|Win32.ActiveCfg = Release|Win32
- {EB33566E-DA7F-4D28-9077-88C0B7C77E35}.Release|Win32.Build.0 = Release|Win32
+ {277AC57F-313B-4D06-B119-A3CDB672D2FF}.Debug Library|ARM64.ActiveCfg = Debug Library|ARM64
+ {277AC57F-313B-4D06-B119-A3CDB672D2FF}.Debug Library|ARM64.Build.0 = Debug Library|ARM64
{277AC57F-313B-4D06-B119-A3CDB672D2FF}.Debug Library|Win32.ActiveCfg = Debug Library|Win32
{277AC57F-313B-4D06-B119-A3CDB672D2FF}.Debug Library|Win32.Build.0 = Debug Library|Win32
+ {277AC57F-313B-4D06-B119-A3CDB672D2FF}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {277AC57F-313B-4D06-B119-A3CDB672D2FF}.Debug|ARM64.Build.0 = Debug|ARM64
{277AC57F-313B-4D06-B119-A3CDB672D2FF}.Debug|Win32.ActiveCfg = Debug|Win32
{277AC57F-313B-4D06-B119-A3CDB672D2FF}.Debug|Win32.Build.0 = Debug|Win32
+ {277AC57F-313B-4D06-B119-A3CDB672D2FF}.Release Library|ARM64.ActiveCfg = Release Library|ARM64
+ {277AC57F-313B-4D06-B119-A3CDB672D2FF}.Release Library|ARM64.Build.0 = Release Library|ARM64
{277AC57F-313B-4D06-B119-A3CDB672D2FF}.Release Library|Win32.ActiveCfg = Release Library|Win32
{277AC57F-313B-4D06-B119-A3CDB672D2FF}.Release Library|Win32.Build.0 = Release Library|Win32
+ {277AC57F-313B-4D06-B119-A3CDB672D2FF}.Release|ARM64.ActiveCfg = Release|ARM64
+ {277AC57F-313B-4D06-B119-A3CDB672D2FF}.Release|ARM64.Build.0 = Release|ARM64
{277AC57F-313B-4D06-B119-A3CDB672D2FF}.Release|Win32.ActiveCfg = Release|Win32
{277AC57F-313B-4D06-B119-A3CDB672D2FF}.Release|Win32.Build.0 = Release|Win32
+ {C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Debug Library|ARM64.ActiveCfg = Debug Library|ARM64
+ {C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Debug Library|ARM64.Build.0 = Debug Library|ARM64
{C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Debug Library|Win32.ActiveCfg = Debug Library|Win32
{C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Debug Library|Win32.Build.0 = Debug Library|Win32
+ {C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Debug|ARM64.Build.0 = Debug|ARM64
{C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Debug|Win32.ActiveCfg = Debug|Win32
{C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Debug|Win32.Build.0 = Debug|Win32
+ {C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Release Library|ARM64.ActiveCfg = Release Library|ARM64
+ {C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Release Library|ARM64.Build.0 = Release Library|ARM64
{C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Release Library|Win32.ActiveCfg = Release Library|Win32
{C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Release Library|Win32.Build.0 = Release Library|Win32
+ {C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Release|ARM64.ActiveCfg = Release|ARM64
+ {C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Release|ARM64.Build.0 = Release|ARM64
{C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Release|Win32.ActiveCfg = Release|Win32
{C5D3156C-8C8C-4936-B35F-2B829BA36FEC}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
@@ -106,4 +168,7 @@
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {785775C5-509E-4727-A290-F1B65E1B68B2}
+ EndGlobalSection
EndGlobal
Modified: branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/zlib/zlib.vcxproj
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/zlib/zlib.vcxproj 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/projects/vstudio/zlib/zlib.vcxproj 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,18 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug Library|ARM64">
+ <Configuration>Debug Library</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Debug Library|Win32">
<Configuration>Debug Library</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|ARM64">
+ <Configuration>Debug</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release Library|ARM64">
+ <Configuration>Release Library</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release Library|Win32">
<Configuration>Release Library</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release|ARM64">
+ <Configuration>Release</Configuration>
+ <Platform>ARM64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
@@ -40,19 +56,42 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
+ <PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
+ <PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
+ <PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|ARM64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
+ <PlatformToolset>v142</PlatformToolset>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+ <ConfigurationType>StaticLibrary</ConfigurationType>
+ <PlatformToolset>v142</PlatformToolset>
+ </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
@@ -59,42 +98,69 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|ARM64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+ </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'">
+ <LinkIncremental>true</LinkIncremental>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+ <LinkIncremental>true</LinkIncremental>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|ARM64'">
+ <LinkIncremental>true</LinkIncremental>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+ <LinkIncremental>true</LinkIncremental>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+ <LinkIncremental>true</LinkIncremental>
+ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|Win32'">
<ClCompile>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <WarningLevel>$(WarningLevel)</WarningLevel>
+ <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Disabled</Optimization>
<BrowseInformation>true</BrowseInformation>
<FunctionLevelLinking>true</FunctionLevelLinking>
<DisableSpecificWarnings>$(DisableSpecificWarnings);4127;4131;4242;4244</DisableSpecificWarnings>
- <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
+ <TreatWarningAsError>false</TreatWarningAsError>
</ClCompile>
<Link>
<TargetMachine>MachineX86</TargetMachine>
@@ -102,16 +168,33 @@
<SubSystem>Windows</SubSystem>
</Link>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Library|ARM64'">
+ <ClCompile>
+ <PreprocessorDefinitions>WIN32;_DEBUG;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <Optimization>Disabled</Optimization>
+ <BrowseInformation>true</BrowseInformation>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings);4127;4131;4242;4244</DisableSpecificWarnings>
+ <TreatWarningAsError>false</TreatWarningAsError>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ </Link>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <WarningLevel>$(WarningLevel)</WarningLevel>
+ <PreprocessorDefinitions>WIN32;_DEBUG;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Disabled</Optimization>
<BrowseInformation>true</BrowseInformation>
<FunctionLevelLinking>true</FunctionLevelLinking>
<DisableSpecificWarnings>$(DisableSpecificWarnings);4127;4131;4242;4244</DisableSpecificWarnings>
- <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
+ <TreatWarningAsError>false</TreatWarningAsError>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile>
<Link>
@@ -120,9 +203,26 @@
<SubSystem>Windows</SubSystem>
</Link>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+ <ClCompile>
+ <PreprocessorDefinitions>WIN32;_DEBUG;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <Optimization>Disabled</Optimization>
+ <BrowseInformation>true</BrowseInformation>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings);4127;4131;4242;4244</DisableSpecificWarnings>
+ <TreatWarningAsError>false</TreatWarningAsError>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ </Link>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|Win32'">
<ClCompile>
- <WarningLevel>$(WarningLevel)</WarningLevel>
+ <WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Full</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
@@ -131,9 +231,9 @@
<BrowseInformation>true</BrowseInformation>
<FunctionLevelLinking>true</FunctionLevelLinking>
<DisableSpecificWarnings>$(DisableSpecificWarnings);4127;4131;4242;4244</DisableSpecificWarnings>
- <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
+ <TreatWarningAsError>false</TreatWarningAsError>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<TargetMachine>MachineX86</TargetMachine>
@@ -144,6 +244,29 @@
<LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
</Lib>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Library|ARM64'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <Optimization>Full</Optimization>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <BufferSecurityCheck>false</BufferSecurityCheck>
+ <BrowseInformation>true</BrowseInformation>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings);4127;4131;4242;4244</DisableSpecificWarnings>
+ <TreatWarningAsError>false</TreatWarningAsError>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <PreprocessorDefinitions>WIN32;NDEBUG;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ </Link>
+ <Lib>
+ <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
+ </Lib>
+ </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>$(WarningLevel)</WarningLevel>
@@ -156,7 +279,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<DisableSpecificWarnings>$(DisableSpecificWarnings);4127;4131;4242;4244</DisableSpecificWarnings>
<TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<TargetMachine>MachineX86</TargetMachine>
@@ -169,6 +292,30 @@
<LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
</Lib>
</ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+ <ClCompile>
+ <WarningLevel>$(WarningLevel)</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <Optimization>Full</Optimization>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <BufferSecurityCheck>false</BufferSecurityCheck>
+ <BrowseInformation>true</BrowseInformation>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <DisableSpecificWarnings>$(DisableSpecificWarnings);4127;4131;4242;4244</DisableSpecificWarnings>
+ <TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
+ <PreprocessorDefinitions>WIN32;NDEBUG;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ </Link>
+ <Lib>
+ <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
+ </Lib>
+ </ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/README.txt
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/README.txt 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/README.txt 2022-11-14 21:05:34 UTC (rev 884)
@@ -75,5 +75,5 @@
macro.lst => Used by autoconf tools
prefix.dfn => Used by autoconf tools
-
-Further information can be found in comments in the individual makefiles.
+Further information can be found in comments in the individual scripts and
+makefiles.
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/descrip.mms
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/descrip.mms 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/descrip.mms 2022-11-14 21:05:34 UTC (rev 884)
@@ -6,15 +6,12 @@
pref = /prefix=all
.endif
+OBJS = png.obj, pngerror.obj, pngget.obj, pngmem.obj, pngpread.obj,\
+ pngread.obj, pngrio.obj, pngrtran.obj, pngrutil.obj, pngset.obj,\
+ pngtrans.obj, pngwio.obj, pngwrite.obj, pngwtran.obj, pngwutil.obj
+CFLAGS = $(C_DEB) $(CC_DEFS) $(PREF)
-OBJS = png.obj, pngset.obj, pngget.obj, pngrutil.obj, pngtrans.obj,\
- pngwutil.obj, pngread.obj, pngmem.obj, pngwrite.obj, pngrtran.obj,\
- pngwtran.obj, pngrio.obj, pngwio.obj, pngerror.obj, pngpread.obj
-
-
-CFLAGS= $(C_DEB) $(CC_DEFS) $(PREF)
-
all : pngtest.exe libpng.olb
@ write sys$output " pngtest available"
@@ -21,32 +18,30 @@
libpng.olb : libpng.olb($(OBJS))
@ write sys$output " libpng available"
-
pngtest.exe : pngtest.obj libpng.olb
- link pngtest,libpng.olb/lib,$(ZLIBSRC)libz.olb/lib
+ link pngtest,libpng.olb/lib,$(ZLIBSRC)libz.olb/lib
test : pngtest.exe
- run pngtest
+ run pngtest
clean :
delete *.obj;*,*.exe;
-
# Other dependencies.
-png.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h,pnginfo.h, pngdebug.h
+png.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h,pnginfo.h, pngdebug.h
+pngerror.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h,pnginfo.h, pngdebug.h
+pngget.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h,pnginfo.h, pngdebug.h
+pngmem.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h,pnginfo.h, pngdebug.h
pngpread.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h,pnginfo.h, pngdebug.h
-pngset.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h,pnginfo.h, pngdebug.h
-pngget.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h,pnginfo.h, pngdebug.h
-pngread.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h,pnginfo.h, pngdebug.h
+pngread.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h,pnginfo.h, pngdebug.h
+pngrio.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h,pnginfo.h, pngdebug.h
pngrtran.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h,pnginfo.h, pngdebug.h
pngrutil.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h,pnginfo.h, pngdebug.h
-pngerror.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h,pnginfo.h, pngdebug.h
-pngmem.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h,pnginfo.h, pngdebug.h
-pngrio.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h,pnginfo.h, pngdebug.h
-pngwio.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h,pnginfo.h, pngdebug.h
+pngset.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h,pnginfo.h, pngdebug.h
pngtrans.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h,pnginfo.h, pngdebug.h
+pngwio.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h,pnginfo.h, pngdebug.h
pngwrite.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h,pnginfo.h, pngdebug.h
pngwtran.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h,pnginfo.h, pngdebug.h
pngwutil.obj : png.h, pngconf.h, pnglibconf.h, pngpriv.h, pngstruct.h,pnginfo.h, pngdebug.h
-pngtest.obj : png.h, pngconf.h, pnglibconf.h
+pngtest.obj : png.h, pngconf.h, pnglibconf.h
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/dfn.awk
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/dfn.awk 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/dfn.awk 2022-11-14 21:05:34 UTC (rev 884)
@@ -125,7 +125,7 @@
# There is no matching "@. Assume a split line
else while (1) {
if (getline nextline) {
- # If the line starts with '#' it is a preprocesor line directive
+ # If the line starts with '#' it is a preprocessor line directive
# from cc -E; skip it:
if (nextline !~ /^#/) {
line = line " " nextline
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/genchk.cmake.in
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/genchk.cmake.in 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/genchk.cmake.in 2022-11-14 21:05:34 UTC (rev 884)
@@ -10,6 +10,7 @@
# Variables substituted from CMakeLists.txt
set(SRCDIR "@CMAKE_CURRENT_SOURCE_DIR@")
+set(BINDIR "@CMAKE_CURRENT_BINARY_DIR@")
set(AWK "@AWK@")
@@ -23,7 +24,7 @@
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 "${SRCDIR}/scripts/checksym.awk"
+ execute_process(COMMAND "${AWK}" -f "${BINDIR}/scripts/checksym.awk"
"${SRCDIR}/scripts/${INPUTBASE}.def"
"of=${OUTPUTDIR}/${OUTPUTBASE}.new"
"${INPUT}"
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/libpng-config-head.in
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/libpng-config-head.in 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/libpng-config-head.in 2022-11-14 21:05:34 UTC (rev 884)
@@ -11,7 +11,7 @@
# Modeled after libxml-config.
-version=1.6.37
+version=1.6.38
prefix=""
libdir=""
libs=""
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/libpng.pc.in
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/libpng.pc.in 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/libpng.pc.in 2022-11-14 21:05:34 UTC (rev 884)
@@ -5,6 +5,6 @@
Name: libpng
Description: Loads and saves PNG files
-Version: 1.6.37
+Version: 1.6.38
Libs: -L${libdir} -lpng16
Cflags: -I${includedir}
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/libtool.m4
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/libtool.m4 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/libtool.m4 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,6 +1,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
#
-# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2001, 2003-2019, 2021-2022 Free Software
+# Foundation, Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is free software; the Free Software Foundation gives
@@ -31,7 +32,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
])
-# serial 58 LT_INIT
+# serial 59 LT_INIT
# LT_PREREQ(VERSION)
@@ -181,6 +182,7 @@
m4_require([_LT_CHECK_SHELL_FEATURES])dnl
m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
m4_require([_LT_CMD_RELOAD])dnl
+m4_require([_LT_DECL_FILECMD])dnl
m4_require([_LT_CHECK_MAGIC_METHOD])dnl
m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
m4_require([_LT_CMD_OLD_ARCHIVE])dnl
@@ -219,8 +221,8 @@
ofile=libtool
can_build_shared=yes
-# All known linkers require a '.a' archive for static linking (except MSVC,
-# which needs '.lib').
+# All known linkers require a '.a' archive for static linking (except MSVC and
+# ICC, which need '.lib').
libext=a
with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -778,7 +780,7 @@
# if finds mixed CR/LF and LF-only lines. Since sed operates in
# text mode, it properly converts lines to CR/LF. This bash problem
# is reportedly fixed, but why not run on old versions too?
- sed '$q' "$ltmain" >> "$cfgfile" \
+ $SED '$q' "$ltmain" >> "$cfgfile" \
|| (rm -f "$cfgfile"; exit 1)
mv -f "$cfgfile" "$ofile" ||
@@ -1042,8 +1044,8 @@
_LT_EOF
echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
$LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
- echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
- $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+ echo "$AR $AR_FLAGS libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+ $AR $AR_FLAGS libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
$RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
cat > conftest.c << _LT_EOF
@@ -1067,17 +1069,12 @@
_lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
darwin1.*)
_lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
- darwin*) # darwin 5.x on
- # if running on 10.5 or later, the deployment target defaults
- # to the OS version, if on x86, and 10.4, the deployment
- # target defaults to 10.4. Don't you love it?
- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
- 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
- _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
- 10.[[012]][[,.]]*)
- _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
- 10.*)
- _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+ darwin*)
+ case $MACOSX_DEPLOYMENT_TARGET,$host in
+ 10.[[012]],*|,*powerpc*-darwin[[5-8]]*)
+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+ *)
+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
esac
;;
esac
@@ -1126,12 +1123,12 @@
output_verbose_link_cmd=func_echo_all
_LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
_LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
- _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+ _LT_TAGVAR(module_expsym_cmds, $1)="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
m4_if([$1], [CXX],
[ if test yes != "$lt_cv_apple_cc_single_mod"; then
_LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
fi
],[])
else
@@ -1245,7 +1242,8 @@
# _LT_WITH_SYSROOT
# ----------------
AC_DEFUN([_LT_WITH_SYSROOT],
-[AC_MSG_CHECKING([for sysroot])
+[m4_require([_LT_DECL_SED])dnl
+AC_MSG_CHECKING([for sysroot])
AC_ARG_WITH([sysroot],
[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@],
[Search for dependent libraries within DIR (or the compiler's sysroot
@@ -1262,7 +1260,7 @@
fi
;; #(
/*)
- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+ lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"`
;; #(
no|'')
;; #(
@@ -1292,7 +1290,7 @@
# options accordingly.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
- case `/usr/bin/file conftest.$ac_objext` in
+ case `$FILECMD conftest.$ac_objext` in
*ELF-32*)
HPUX_IA64_MODE=32
;;
@@ -1309,7 +1307,7 @@
echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
if test yes = "$lt_cv_prog_gnu_ld"; then
- case `/usr/bin/file conftest.$ac_objext` in
+ case `$FILECMD conftest.$ac_objext` in
*32-bit*)
LD="${LD-ld} -melf32bsmip"
;;
@@ -1321,7 +1319,7 @@
;;
esac
else
- case `/usr/bin/file conftest.$ac_objext` in
+ case `$FILECMD conftest.$ac_objext` in
*32-bit*)
LD="${LD-ld} -32"
;;
@@ -1343,7 +1341,7 @@
echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
emul=elf
- case `/usr/bin/file conftest.$ac_objext` in
+ case `$FILECMD conftest.$ac_objext` in
*32-bit*)
emul="${emul}32"
;;
@@ -1351,7 +1349,7 @@
emul="${emul}64"
;;
esac
- case `/usr/bin/file conftest.$ac_objext` in
+ case `$FILECMD conftest.$ac_objext` in
*MSB*)
emul="${emul}btsmip"
;;
@@ -1359,7 +1357,7 @@
emul="${emul}ltsmip"
;;
esac
- case `/usr/bin/file conftest.$ac_objext` in
+ case `$FILECMD conftest.$ac_objext` in
*N32*)
emul="${emul}n32"
;;
@@ -1379,7 +1377,7 @@
# not appear in the list.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
- case `/usr/bin/file conftest.o` in
+ case `$FILECMD conftest.o` in
*32-bit*)
case $host in
x86_64-*kfreebsd*-gnu)
@@ -1386,7 +1384,7 @@
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
- case `/usr/bin/file conftest.o` in
+ case `$FILECMD conftest.o` in
*x86-64*)
LD="${LD-ld} -m elf32_x86_64"
;;
@@ -1454,7 +1452,7 @@
# options accordingly.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
- case `/usr/bin/file conftest.o` in
+ case `$FILECMD conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
yes*)
@@ -1493,10 +1491,23 @@
m4_defun([_LT_PROG_AR],
[AC_CHECK_TOOLS(AR, [ar], false)
: ${AR=ar}
-: ${AR_FLAGS=cru}
_LT_DECL([], [AR], [1], [The archiver])
-_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
+# Use ARFLAGS variable as AR's operation code to sync the variable naming with
+# Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have
+# higher priority because thats what people were doing historically (setting
+# ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS
+# variable obsoleted/removed.
+
+test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr}
+lt_ar_flags=$AR_FLAGS
+_LT_DECL([], [lt_ar_flags], [0], [Flags to create an archive (by configure)])
+
+# Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override
+# by AR_FLAGS because that was never working and AR_FLAGS is about to die.
+_LT_DECL([], [AR_FLAGS], [\@S|@{ARFLAGS-"\@S|@lt_ar_flags"}],
+ [Flags to create an archive])
+
AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
[lt_cv_ar_at_file=no
AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
@@ -1714,7 +1725,7 @@
lt_cv_sys_max_cmd_len=8192;
;;
- bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
+ bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*)
# This has been around since 386BSD, at least. Likely further.
if test -x /sbin/sysctl; then
lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -1757,7 +1768,7 @@
sysv5* | sco5v6* | sysv4.2uw2*)
kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
if test -n "$kargmax"; then
- lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'`
+ lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[[ ]]//'`
else
lt_cv_sys_max_cmd_len=32768
fi
@@ -2207,26 +2218,35 @@
striplib=
old_striplib=
AC_MSG_CHECKING([whether stripping libraries is possible])
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- AC_MSG_RESULT([yes])
+if test -z "$STRIP"; then
+ AC_MSG_RESULT([no])
else
-# FIXME - insert some real tests, host_os isn't really good enough
- case $host_os in
- darwin*)
- if test -n "$STRIP"; then
+ if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+ old_striplib="$STRIP --strip-debug"
+ striplib="$STRIP --strip-unneeded"
+ AC_MSG_RESULT([yes])
+ else
+ case $host_os in
+ darwin*)
+ # FIXME - insert some real tests, host_os isn't really good enough
striplib="$STRIP -x"
old_striplib="$STRIP -S"
AC_MSG_RESULT([yes])
- else
+ ;;
+ freebsd*)
+ if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then
+ old_striplib="$STRIP --strip-debug"
+ striplib="$STRIP --strip-unneeded"
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ fi
+ ;;
+ *)
AC_MSG_RESULT([no])
- fi
- ;;
- *)
- AC_MSG_RESULT([no])
- ;;
- esac
+ ;;
+ esac
+ fi
fi
_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
_LT_DECL([], [striplib], [1])
@@ -2549,7 +2569,7 @@
case $host_os in
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+ soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
m4_if([$1], [],[
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
;;
@@ -2559,14 +2579,14 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
- library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+ library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
;;
esac
dynamic_linker='Win32 ld.exe'
;;
- *,cl*)
- # Native MSVC
+ *,cl* | *,icl*)
+ # Native MSVC or ICC
libname_spec='$name'
soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
library_names_spec='$libname.dll.lib'
@@ -2585,7 +2605,7 @@
done
IFS=$lt_save_ifs
# Convert to MSYS style.
- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
;;
cygwin*)
# Convert to unix form, then to dos form, then back to unix form
@@ -2622,7 +2642,7 @@
;;
*)
- # Assume MSVC wrapper
+ # Assume MSVC and ICC wrapper
library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib'
dynamic_linker='Win32 ld.exe'
;;
@@ -2655,7 +2675,7 @@
shlibpath_var=LD_LIBRARY_PATH
;;
-freebsd* | dragonfly*)
+freebsd* | dragonfly* | midnightbsd*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
if test -x /usr/bin/objformat; then
@@ -3454,7 +3474,7 @@
bsdi[[45]]*)
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
- lt_cv_file_magic_cmd='/usr/bin/file -L'
+ lt_cv_file_magic_cmd='$FILECMD -L'
lt_cv_file_magic_test_file=/shlib/libc.so
;;
@@ -3488,7 +3508,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-freebsd* | dragonfly*)
+freebsd* | dragonfly* | midnightbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
@@ -3495,7 +3515,7 @@
# Not sure whether the presence of OpenBSD here was a mistake.
# Let's accept both of them until this is cleared up.
lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
- lt_cv_file_magic_cmd=/usr/bin/file
+ lt_cv_file_magic_cmd=$FILECMD
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
esac
@@ -3509,7 +3529,7 @@
;;
hpux10.20* | hpux11*)
- lt_cv_file_magic_cmd=/usr/bin/file
+ lt_cv_file_magic_cmd=$FILECMD
case $host_cpu in
ia64*)
lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
@@ -3556,7 +3576,7 @@
newos6*)
lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
- lt_cv_file_magic_cmd=/usr/bin/file
+ lt_cv_file_magic_cmd=$FILECMD
lt_cv_file_magic_test_file=/usr/lib/libnls.so
;;
@@ -3683,13 +3703,13 @@
mingw*) lt_bad_file=conftest.nm/nofile ;;
*) lt_bad_file=/dev/null ;;
esac
- case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+ case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in
*$lt_bad_file* | *'Invalid file or object type'*)
lt_cv_path_NM="$tmp_nm -B"
break 2
;;
*)
- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+ case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in
*/dev/null*)
lt_cv_path_NM="$tmp_nm -p"
break 2
@@ -3715,7 +3735,7 @@
# Let the user override the test.
else
AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
- case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
+ case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in
*COFF*)
DUMPBIN="$DUMPBIN -symbols -headers"
;;
@@ -3955,7 +3975,7 @@
if test "$lt_cv_nm_interface" = "MS dumpbin"; then
# Gets list of data symbols to import.
- lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
+ lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'"
# Adjust the below global symbol transforms to fixup imported variables.
lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'"
@@ -3973,13 +3993,13 @@
# Transform an extracted symbol line into a proper C declaration.
# Some systems (esp. on ia64) link data and code symbols differently,
# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+lt_cv_sys_global_symbol_to_cdecl="$SED -n"\
$lt_cdecl_hook\
" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\
$lt_c_name_hook\
" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'"
@@ -3986,7 +4006,7 @@
# Transform an extracted symbol line into symbol name with lib prefix and
# symbol address.
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\
$lt_c_name_lib_hook\
" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\
@@ -4010,7 +4030,7 @@
if test "$lt_cv_nm_interface" = "MS dumpbin"; then
# Fake it for dumpbin and say T for any non-static function,
# D for any global variable and I for any imported variable.
- # Also find C++ and __fastcall symbols from MSVC++,
+ # Also find C++ and __fastcall symbols from MSVC++ or ICC,
# which start with @ or ?.
lt_cv_sys_global_symbol_pipe="$AWK ['"\
" {last_section=section; section=\$ 3};"\
@@ -4028,9 +4048,9 @@
" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
" ' prfx=^$ac_symprfx]"
else
- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+ lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
fi
- lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'"
# Check to see that the pipe works correctly.
pipe_works=no
@@ -4317,7 +4337,7 @@
;;
esac
;;
- freebsd* | dragonfly*)
+ freebsd* | dragonfly* | midnightbsd*)
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
@@ -4400,7 +4420,7 @@
_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
;;
*)
- case `$CC -V 2>&1 | sed 5q` in
+ case `$CC -V 2>&1 | $SED 5q` in
*Sun\ C*)
# Sun C++ 5.9
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
@@ -4736,7 +4756,7 @@
_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
;;
*)
- case `$CC -V 2>&1 | sed 5q` in
+ case `$CC -V 2>&1 | $SED 5q` in
*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
# Sun Fortran 8.3 passes all unrecognized flags to the linker
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
@@ -4919,7 +4939,7 @@
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
_LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
else
- _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
fi
;;
pw32*)
@@ -4927,7 +4947,7 @@
;;
cygwin* | mingw* | cegcc*)
case $cc_basename in
- cl*)
+ cl* | icl*)
_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
;;
*)
@@ -4984,15 +5004,15 @@
case $host_os in
cygwin* | mingw* | pw32* | cegcc*)
- # FIXME: the MSVC++ port hasn't been tested in a loooong time
+ # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
- # Microsoft Visual C++.
+ # Microsoft Visual C++ or Intel C++ Compiler.
if test yes != "$GCC"; then
with_gnu_ld=no
fi
;;
interix*)
- # we just hope/assume this is gcc and not c89 (= MSVC++)
+ # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC)
with_gnu_ld=yes
;;
openbsd* | bitrig*)
@@ -5044,7 +5064,7 @@
_LT_TAGVAR(whole_archive_flag_spec, $1)=
fi
supports_anon_versioning=no
- case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in
+ case `$LD -v | $SED -e 's/([[^)]]\+)\s\+//' 2>&1` in
*GNU\ gold*) supports_anon_versioning=yes ;;
*\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
@@ -5156,6 +5176,7 @@
emximp -o $lib $output_objdir/$libname.def'
_LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ _LT_TAGVAR(file_list_spec, $1)='@'
;;
interix[[3-9]]*)
@@ -5170,7 +5191,7 @@
# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
# time. Moving up from 0x10000000 also allows more sbrk(2) space.
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
@@ -5213,7 +5234,7 @@
_LT_TAGVAR(compiler_needs_object, $1)=yes
;;
esac
- case `$CC -V 2>&1 | sed 5q` in
+ case `$CC -V 2>&1 | $SED 5q` in
*Sun\ C*) # Sun C 5.9
_LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
_LT_TAGVAR(compiler_needs_object, $1)=yes
@@ -5225,7 +5246,7 @@
if test yes = "$supports_anon_versioning"; then
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
fi
@@ -5241,7 +5262,7 @@
_LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
if test yes = "$supports_anon_versioning"; then
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
echo "local: *; };" >> $output_objdir/$libname.ver~
$LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
fi
@@ -5373,7 +5394,7 @@
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
_LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
else
- _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
fi
aix_use_runtimelinking=no
@@ -5556,12 +5577,12 @@
cygwin* | mingw* | pw32* | cegcc*)
# When not using gcc, we currently assume that we are using
- # Microsoft Visual C++.
+ # Microsoft Visual C++ or Intel C++ Compiler.
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
case $cc_basename in
- cl*)
- # Native MSVC
+ cl* | icl*)
+ # Native MSVC or ICC
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_TAGVAR(always_export_symbols, $1)=yes
@@ -5602,7 +5623,7 @@
fi'
;;
*)
- # Assume MSVC wrapper
+ # Assume MSVC and ICC wrapper
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
# Tell ltmain to make .lib files, not .a files.
@@ -5650,7 +5671,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | dragonfly*)
+ freebsd* | dragonfly* | midnightbsd*)
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_TAGVAR(hardcode_direct, $1)=yes
@@ -5861,6 +5882,7 @@
emximp -o $lib $output_objdir/$libname.def'
_LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ _LT_TAGVAR(file_list_spec, $1)='@'
;;
osf3*)
@@ -6631,8 +6653,8 @@
cygwin* | mingw* | pw32* | cegcc*)
case $GXX,$cc_basename in
- ,cl* | no,cl*)
- # Native MSVC
+ ,cl* | no,cl* | ,icl* | no,icl*)
+ # Native MSVC or ICC
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -6730,6 +6752,7 @@
emximp -o $lib $output_objdir/$libname.def'
_LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ _LT_TAGVAR(file_list_spec, $1)='@'
;;
dgux*)
@@ -6760,7 +6783,7 @@
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
;;
- freebsd* | dragonfly*)
+ freebsd* | dragonfly* | midnightbsd*)
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_TAGVAR(ld_shlibs, $1)=yes
@@ -6897,7 +6920,7 @@
# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
# time. Moving up from 0x10000000 also allows more sbrk(2) space.
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
irix5* | irix6*)
case $cc_basename in
@@ -7037,13 +7060,13 @@
_LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
if test yes = "$supports_anon_versioning"; then
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
echo "local: *; };" >> $output_objdir/$libname.ver~
$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
fi
;;
*)
- case `$CC -V 2>&1 | sed 5q` in
+ case `$CC -V 2>&1 | $SED 5q` in
*Sun\ C*)
# Sun C++ 5.9
_LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -8189,6 +8212,14 @@
AC_SUBST([DLLTOOL])
])
+# _LT_DECL_FILECMD
+# ----------------
+# Check for a file(cmd) program that can be used to detect file type and magic
+m4_defun([_LT_DECL_FILECMD],
+[AC_CHECK_TOOL([FILECMD], [file], [:])
+_LT_DECL([], [FILECMD], [1], [A file(cmd) program that detects file types])
+])# _LD_DECL_FILECMD
+
# _LT_DECL_SED
# ------------
# Check for a fully-functional sed program, that truncates
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/ltoptions.m4
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/ltoptions.m4 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/ltoptions.m4 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,7 +1,7 @@
# Helper functions for option handling. -*- Autoconf -*-
#
-# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software
-# Foundation, Inc.
+# Copyright (C) 2004-2005, 2007-2009, 2011-2019, 2021-2022 Free
+# Software Foundation, Inc.
# Written by Gary V. Vaughan, 2004
#
# This file is free software; the Free Software Foundation gives
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/ltsugar.m4
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/ltsugar.m4 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/ltsugar.m4 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,6 +1,6 @@
# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
#
-# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
+# Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021-2022 Free Software
# Foundation, Inc.
# Written by Gary V. Vaughan, 2004
#
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/ltversion.m4
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/ltversion.m4 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/ltversion.m4 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,6 +1,7 @@
# ltversion.m4 -- version numbers -*- Autoconf -*-
#
-# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2011-2019, 2021-2022 Free Software Foundation,
+# Inc.
# Written by Scott James Remnant, 2004
#
# This file is free software; the Free Software Foundation gives
@@ -9,15 +10,15 @@
# @configure_input@
-# serial 4179 ltversion.m4
+# serial 4245 ltversion.m4
# This file is part of GNU Libtool
-m4_define([LT_PACKAGE_VERSION], [2.4.6])
-m4_define([LT_PACKAGE_REVISION], [2.4.6])
+m4_define([LT_PACKAGE_VERSION], [2.4.7])
+m4_define([LT_PACKAGE_REVISION], [2.4.7])
AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.6'
-macro_revision='2.4.6'
+[macro_version='2.4.7'
+macro_revision='2.4.7'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/lt~obsolete.m4
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/lt~obsolete.m4 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/lt~obsolete.m4 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,7 +1,7 @@
# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
#
-# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
-# Foundation, Inc.
+# Copyright (C) 2004-2005, 2007, 2009, 2011-2019, 2021-2022 Free
+# Software Foundation, Inc.
# Written by Scott James Remnant, 2004.
#
# This file is free software; the Free Software Foundation gives
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.32sunu
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.32sunu 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.32sunu 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,5 +1,6 @@
# makefile for libpng on Solaris 2.x with cc
# Contributed by William L. Sebok, based on makefile.linux
+# Copyright (C) 2020-2022 Cosmin Truta
# Copyright (C) 2002, 2006, 2010-2014 Glenn Randers-Pehrson
# Copyright (C) 1998 Greg Roelofs
# Copyright (C) 1996, 1997 Andreas Dilger
@@ -21,9 +22,9 @@
# Utilities:
CC=cc
AR_RC=ar rc
+RANLIB=echo
MKDIR_P=mkdir -p
LN_SF=ln -f -s
-RANLIB=echo
RM_F=/bin/rm -f
SUN_CC_FLAGS=-fast -xtarget=ultra
@@ -44,7 +45,7 @@
WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
-Wmissing-declarations -Wtraditional -Wcast-align \
- -Wstrict-prototypes -Wmissing-prototypes #-Wconversion
+ -Wstrict-prototypes -Wmissing-prototypes # -Wconversion
CPPFLAGS=-I$(ZLIBINC) # -DPNG_DEBUG=5
CFLAGS=$(SUN_CC_FLAGS) # $(WARNMORE) -g
LDFLAGS=$(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) libpng.a -lz -lm
@@ -69,9 +70,9 @@
DL=$(DESTDIR)$(LIBPATH)
DM=$(DESTDIR)$(MANPATH)
-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
- pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
- pngwtran.o pngmem.o pngerror.o pngpread.o
+OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \
+ pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o \
+ pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o
OBJSDLL = $(OBJS:.o=.pic.o)
@@ -219,26 +220,22 @@
libpng-config $(LIBSO) $(LIBSOMAJ)* \
libpng.pc
-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO
-writelock:
- chmod a-w *.[ch35] $(DOCS) scripts/*
-
# DO NOT DELETE THIS LINE -- make depend depends on it.
-png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngerror.o pngerror.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngrtran.o pngrtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngrutil.o pngrutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngtrans.o pngtrans.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwrite.o pngwrite.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwtran.o pngwtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwutil.o pngwutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngtest.o: png.h pngconf.h pnglibconf.h
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.64sunu
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.64sunu 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.64sunu 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,5 +1,6 @@
# makefile for libpng on Solaris 2.x with cc
# Contributed by William L. Sebok, based on makefile.linux
+# Copyright (C) 2020-2022 Cosmin Truta
# Copyright (C) 2002, 2006, 2010-2014 Glenn Randers-Pehrson
# Copyright (C) 1998 Greg Roelofs
# Copyright (C) 1996, 1997 Andreas Dilger
@@ -21,9 +22,9 @@
# Utilities:
CC=cc
AR_RC=ar rc
+RANLIB=echo
MKDIR_P=mkdir -p
LN_SF=ln -f -s
-RANLIB=echo
RM_F=/bin/rm -f
SUN_CC_FLAGS=-fast -xtarget=ultra -xarch=v9
@@ -44,7 +45,7 @@
WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
-Wmissing-declarations -Wtraditional -Wcast-align \
- -Wstrict-prototypes -Wmissing-prototypes #-Wconversion
+ -Wstrict-prototypes -Wmissing-prototypes # -Wconversion
CPPFLAGS=-I$(ZLIBINC) # -DPNG_DEBUG=5
CFLAGS= $(SUN_CC_FLAGS) # $(WARNMORE) -g
LDFLAGS=-L. -R. $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng16 -lz -lm
@@ -69,9 +70,9 @@
DL=$(DESTDIR)$(LIBPATH)
DM=$(DESTDIR)$(MANPATH)
-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
- pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
- pngwtran.o pngmem.o pngerror.o pngpread.o
+OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \
+ pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o \
+ pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o
OBJSDLL = $(OBJS:.o=.pic.o)
@@ -219,26 +220,22 @@
libpng-config $(LIBSO) $(LIBSOMAJ)* \
libpng.pc
-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO
-writelock:
- chmod a-w *.[ch35] $(DOCS) scripts/*
-
# DO NOT DELETE THIS LINE -- make depend depends on it.
-png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngerror.o pngerror.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngrtran.o pngrtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngrutil.o pngrutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngtrans.o pngtrans.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwrite.o pngwrite.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwtran.o pngwtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwutil.o pngwutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngtest.o: png.h pngconf.h pnglibconf.h
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.aix
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.aix 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.aix 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,6 +1,6 @@
# makefile for libpng using gcc (generic, static library)
+# Copyright (C) 2000, 2022 Cosmin Truta
# Copyright (C) 2002, 2006-2009, 2014 Glenn Randers-Pehrson
-# Copyright (C) 2000 Cosmin Truta
# Copyright (C) 2000 Marc O. Gloor (AIX support added, from makefile.gcc)
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
#
@@ -16,8 +16,8 @@
CC = gcc
LD = $(CC)
AR_RC = ar rcs
+RANLIB = ranlib
MKDIR_P = mkdir -p
-RANLIB = ranlib
RM_F = rm -f
LN_SF = ln -f -s
@@ -43,13 +43,13 @@
WARNMORE =
CPPFLAGS = -I$(ZLIBINC) # -DPNG_DEBUG=5
-CFLAGS = -W -Wall -O2 # $(WARNMORE) -g
-LDFLAGS = -L. -L$(ZLIBLIB) -lpng16 -lz -lm
+CFLAGS = -O2 -Wall -Wextra -Wundef # $(WARNMORE) -g
+LDFLAGS = -L. -L$(ZLIBLIB) -lpng16 -lz -lm # -g
-# Variables
-OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \
- pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o \
- pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o
+# File lists
+OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \
+ pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o \
+ pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o
# Targets
.c.o:
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.amiga
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.amiga 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.amiga 2022-11-14 21:05:34 UTC (rev 884)
@@ -33,9 +33,9 @@
# See scripts/pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
- pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
- pngwtran.o pngmem.o pngerror.o pngpread.o
+OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \
+ pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o \
+ pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o
all: libpng.lib pngtest
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.atari
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.atari 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.atari 2022-11-14 21:05:34 UTC (rev 884)
@@ -33,11 +33,11 @@
# See scripts/pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
-OBJS = $(LBR)(png.o) $(LBR)(pngset.o) $(LBR)(pngget.o) $(LBR)(pngrutil.o)\
- $(LBR)(pngtrans.o) $(LBR)(pngwutil.o)\
- $(LBR)(pngread.o) $(LBR)(pngerror.o) $(LBR)(pngwrite.o)\
- $(LBR)(pngrtran.o) $(LBR)(pngwtran.o)\
- $(LBR)(pngmem.o) $(LBR)(pngrio.o) $(LBR)(pngwio.o) $(LBR)(pngpread.o)
+OBJS = $(LBR)(png.o) $(LBR)(pngerror.o) $(LBR)(pngget.o) $(LBR)(pngmem.o) \
+ $(LBR)(pngpread.o) $(LBR)(pngread.o) $(LBR)(pngrio.o) \
+ $(LBR)(pngrtran.o) $(LBR)(pngrutil.o) $(LBR)(pngset.o) \
+ $(LBR)(pngtrans.o) $(LBR)(pngwio.o) $(LBR)(pngwrite.o) \
+ $(LBR)(pngwtran.o) $(LBR)(pngwutil.o)
all: $(LBR) pngtest.ttp
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.bc32
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.bc32 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.bc32 2022-11-14 21:05:34 UTC (rev 884)
@@ -50,13 +50,13 @@
# -M generate map file
LDFLAGS=-L$(ZLIB_DIR) -M $(LDEBUG)
-# Pre-built configuration
+## Pre-built configuration
# See scripts\pnglibconf.mak for more options
!ifndef PNGLIBCONF_H_PREBUILT
PNGLIBCONF_H_PREBUILT = scripts\pnglibconf.h.prebuilt
!endif
-## Variables
+## File lists
OBJS = \
png.obj \
pngerror.obj \
@@ -121,22 +121,22 @@
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
$(CP) $(PNGLIBCONF_H_PREBUILT) $@
-png.obj: png.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+png.obj: png.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngerror.obj: pngerror.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngget.obj: pngget.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngmem.obj: pngmem.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngget.obj: pngget.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngmem.obj: pngmem.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngpread.obj: pngpread.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngread.obj: pngread.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngrio.obj: pngrio.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngread.obj: pngread.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngrio.obj: pngrio.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngrtran.obj: pngrtran.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngrutil.obj: pngrutil.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngset.obj: pngset.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngset.obj: pngset.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngtrans.obj: pngtrans.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngwio.obj: pngwio.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngwio.obj: pngwio.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwrite.obj: pngwrite.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwtran.obj: pngwtran.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwutil.obj: pngwutil.c png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngtest.obj: pngtest.c png.h pngconf.h pnglibconf.h
+pngtest.obj: pngtest.c png.h pngconf.h pnglibconf.h
$(LIBNAME): $(OBJS)
-del $(LIBNAME)
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.beos
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.beos 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.beos 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,5 +1,6 @@
# makefile for libpng on BeOS x86 ELF with gcc
# modified from makefile.linux by Sander Stoks
+# Copyright (C) 2020-2022 Cosmin Truta
# Copyright (C) 2002, 2006, 2008, 2010-2014 Glenn Randers-Pehrson
# Copyright (C) 1999 Greg Roelofs
# Copyright (C) 1996, 1997 Andreas Dilger
@@ -21,9 +22,9 @@
# Utilities:
CC=gcc
AR_RC=ar rc
+RANLIB=ranlib
MKDIR_P=mkdir -p
LN_SF=ln -sf
-RANLIB=ranlib
CP=cp
RM_F=/bin/rm -f
@@ -37,14 +38,14 @@
WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
-Wmissing-declarations -Wtraditional -Wcast-align \
- -Wstrict-prototypes -Wmissing-prototypes #-Wconversion
+ -Wstrict-prototypes -Wmissing-prototypes # -Wconversion
# On BeOS, -O1 is actually better than -O3. This is a known bug but it's
# still here in R4.5
CPPFLAGS=-I$(ZLIBINC) # -DPNG_DEBUG=5
-CFLAGS=-W -Wall -O1 -funroll-loops $(ALIGN) # $(WARNMORE) -g
+CFLAGS=-O1 -funroll-loops $(ALIGN) -Wall -Wextra -Wundef # $(WARNMORE) -g
# LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng -lz
-LDFLAGS=-L. -Wl,-soname=$(LIBSOMAJ) -L$(ZLIBLIB) -lz
+LDFLAGS=-L. -Wl,-soname=$(LIBSOMAJ) -L$(ZLIBLIB) -lz # -g
# where make install puts libpng.a, libpng16.so*, and png.h
prefix=/usr/local
@@ -73,9 +74,9 @@
# See scripts/pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
- pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
- pngwtran.o pngmem.o pngerror.o pngpread.o
+OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \
+ pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o \
+ pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o
OBJSDLL = $(OBJS)
@@ -203,20 +204,20 @@
# DO NOT DELETE THIS LINE -- make depend depends on it.
-png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngerror.o pngerror.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngrtran.o pngrtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngrutil.o pngrutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngtrans.o pngtrans.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwrite.o pngwrite.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwtran.o pngwtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwutil.o pngwutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngtest.o: png.h pngconf.h pnglibconf.h
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.clang
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.clang 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.clang 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,6 +1,6 @@
# makefile for libpng using clang (generic, static library)
+# Copyright (C) 2000, 2014, 2019-2022 Cosmin Truta
# Copyright (C) 2008, 2014 Glenn Randers-Pehrson
-# Copyright (C) 2000, 2014, 2019 Cosmin Truta
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
#
# This code is released under the libpng license.
@@ -19,12 +19,16 @@
CP = cp
RM_F = rm -f
+# Compiler and linker flags
+NOHWOPT = -DPNG_ARM_NEON_OPT=0 -DPNG_MIPS_MSA_OPT=0 \
+ -DPNG_POWERPC_VSX_OPT=0 -DPNG_INTEL_SSE_OPT=0
WARNMORE = -Wwrite-strings -Wpointer-arith -Wshadow \
-Wmissing-declarations -Wtraditional -Wcast-align \
-Wstrict-prototypes -Wmissing-prototypes # -Wconversion
-CPPFLAGS = -I$(ZLIBINC) # -DPNG_DEBUG=5
-CFLAGS = -W -Wall -O2 # $(WARNMORE) -g
-LDFLAGS = -L$(ZLIBLIB)
+DEFS = $(NOHWOPT)
+CPPFLAGS = -I$(ZLIBINC) $(DEFS) # -DPNG_DEBUG=5
+CFLAGS = -O2 -Wall -Wextra -Wundef # $(WARNMORE) -g
+LDFLAGS = -L$(ZLIBLIB) # -g
LIBS = -lz -lm
# File extensions
@@ -34,10 +38,10 @@
# See scripts/pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
-# Variables
-OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \
- pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o \
- pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o
+# File lists
+OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \
+ pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o \
+ pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o
# Targets
all: static
Deleted: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.clang-asan
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.clang-asan 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.clang-asan 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,87 +0,0 @@
-# makefile for libpng using clang + address sanitizer (generic, static library)
-# Copyright (C) 2008, 2014 Glenn Randers-Pehrson
-# Copyright (C) 2000, 2014, 2019 Cosmin Truta
-# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
-#
-# This code is released under the libpng license.
-# For conditions of distribution and use, see the disclaimer
-# and license in png.h
-
-# Location of the zlib library and include files
-ZLIBINC = ../zlib
-ZLIBLIB = ../zlib
-
-# Compiler, linker, lib and other tools
-CC = clang
-LD = $(CC)
-AR_RC = ar rcs
-RANLIB = ranlib
-CP = cp
-RM_F = rm -f
-
-WARNMORE = -Wwrite-strings -Wpointer-arith -Wshadow \
- -Wmissing-declarations -Wtraditional -Wcast-align \
- -Wstrict-prototypes -Wmissing-prototypes # -Wconversion
-CPPFLAGS = -I$(ZLIBINC) # -DPNG_DEBUG=5
-CFLAGS = -W -Wall -O0 -g -fsanitize=address
-LDFLAGS = -L$(ZLIBLIB) -g -fsanitize=address
-LIBS = -lz -lm
-
-# File extensions
-EXEEXT =
-
-# Pre-built configuration
-# See scripts/pnglibconf.mak for more options
-PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
-
-# Variables
-OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \
- pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o \
- pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o
-
-# Targets
-all: static
-
-pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
- $(CP) $(PNGLIBCONF_H_PREBUILT) $@
-
-.c.o:
- $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
-
-static: libpng.a pngtest$(EXEEXT)
-
-shared:
- @echo This is a generic makefile that cannot create shared libraries.
- @echo Please use a configuration that is specific to your platform.
- @false
-
-libpng.a: $(OBJS)
- $(AR_RC) $@ $(OBJS)
- $(RANLIB) $@
-
-test: pngtest$(EXEEXT)
- ./pngtest$(EXEEXT)
-
-pngtest$(EXEEXT): pngtest.o libpng.a
- $(LD) $(LDFLAGS) -o $@ pngtest.o libpng.a $(LIBS)
-
-clean:
- $(RM_F) *.o libpng.a pngtest$(EXEEXT) pngout.png pnglibconf.h
-
-png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngrtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngrutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngtrans.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngwrite.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngwtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngwutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-
-pngtest.o: png.h pngconf.h pnglibconf.h
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.darwin
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.darwin 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.darwin 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,4 +1,5 @@
-# makefile for libpng on Darwin / Mac OS X
+# makefile for libpng on Darwin / macOS
+# Copyright (C) 2020-2022 Cosmin Truta
# Copyright (C) 2002, 2004, 2006, 2008, 2010-2014 Glenn Randers-Pehrson
# Copyright (C) 2001 Christoph Pfisterer
# derived from makefile.linux:
@@ -11,6 +12,7 @@
# where "make install" puts libpng.a, libpng16.dylib, png.h, pngconf.h,
# and pnglibconf.h
+
prefix=/usr/local
exec_prefix=$(prefix)
@@ -21,6 +23,7 @@
# Library name:
LIBNAME = libpng16
PNGMAJ = 16
+RELEASE = 38
# Shared library names:
LIBSO=$(LIBNAME).dylib
@@ -31,15 +34,17 @@
# Utilities:
CC=cc
AR_RC=ar rc
+RANLIB=ranlib
MKDIR_P=mkdir -p
LN_SF=ln -sf
-RANLIB=ranlib
CP=cp
-RM_F=/bin/rm -f
+RM_F=rm -f
-CPPFLAGS=-I$(ZLIBINC)
-# CFLAGS=-W -Wall -O3 -funroll-loops
-CFLAGS=-W -Wall -O -funroll-loops
+NOHWOPT=-DPNG_ARM_NEON_OPT=0 -DPNG_MIPS_MSA_OPT=0 \
+ -DPNG_POWERPC_VSX_OPT=0 -DPNG_INTEL_SSE_OPT=0
+DEFS=$(NOHWOPT)
+CPPFLAGS=-I$(ZLIBINC) $(DEFS)
+CFLAGS=-O3 -funroll-loops -Wall -Wextra -Wundef
LDFLAGS=-L. -L$(ZLIBLIB) -lpng16 -lz
INCPATH=$(prefix)/include
@@ -66,9 +71,10 @@
# See scripts/pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
- pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
- pngwtran.o pngmem.o pngerror.o pngpread.o
+# File lists
+OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \
+ pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o \
+ pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o
OBJSDLL = $(OBJS:.o=.pic.o)
@@ -200,26 +206,22 @@
$(RM_F) *.o libpng.a pngtest pngout.png libpng-config \
libpng.pc $(LIBNAME).*dylib pngtesti pnglibconf.h
-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO
-writelock:
- chmod a-w *.[ch35] $(DOCS) scripts/*
-
# DO NOT DELETE THIS LINE -- make depend depends on it.
-png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngerror.o pngerror.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngrtran.o pngrtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngrutil.o pngrutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngtrans.o pngtrans.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwrite.o pngwrite.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwtran.o pngwtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwutil.o pngwutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngtest.o: png.h pngconf.h pnglibconf.h
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.dec
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.dec 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.dec 2022-11-14 21:05:34 UTC (rev 884)
@@ -17,11 +17,11 @@
OLDSO=libpng.so
# Utilities:
+CC=cc
AR_RC=ar rc
-CC=cc
+RANLIB=ranlib
MKDIR_P=mkdir
LN_SF=ln -f -s
-RANLIB=ranlib
CP=cp
RM_F=/bin/rm -f
@@ -62,9 +62,9 @@
# See scripts/pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
- pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
- pngwtran.o pngmem.o pngerror.o pngpread.o
+OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \
+ pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o \
+ pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o
.c.o:
$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
@@ -75,7 +75,7 @@
$(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng.a: $(OBJS)
- $(AR_RC) $@ $(OBJS)
+ $(AR_RC) $@ $(OBJS)
$(RANLIB) $@
libpng.pc:
@@ -191,20 +191,20 @@
# DO NOT DELETE THIS LINE -- make depend depends on it.
-png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngrtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngrutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngtrans.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwrite.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngtest.o: png.h pngconf.h pnglibconf.h
+pngtest.o: png.h pngconf.h pnglibconf.h
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.dj2
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.dj2 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.dj2 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,4 +1,5 @@
# DJGPP (DOS gcc) makefile for libpng
+# Copyright (C) 2020-2022 Cosmin Truta
# Copyright (C) 2002, 2006, 2009-2014 Glenn Randers-Pehrson
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
#
@@ -17,8 +18,6 @@
CFLAGS=-O
LDFLAGS=-L. -L../zlib/ -lpng -lz -lm
-RANLIB=ranlib
-
CP=cp
RM_F=rm -f
@@ -26,9 +25,9 @@
# See scripts/pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
- pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o pngwtran.o \
- pngmem.o pngerror.o pngpread.o
+OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \
+ pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o \
+ pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o
.c.o:
$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
@@ -39,8 +38,8 @@
$(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng.a: $(OBJS)
- ar rc $@ $(OBJS)
- $(RANLIB) $@
+ ar rc $@ $(OBJS)
+ ranlib $@
pngtest: pngtest.o libpng.a
$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
@@ -53,14 +52,14 @@
# DO NOT DELETE THIS LINE -- make depend depends on it.
-png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngrtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngrutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
@@ -69,4 +68,4 @@
pngwtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngtest.o: png.h pngconf.h pnglibconf.h
+pngtest.o: png.h pngconf.h pnglibconf.h
Added: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.emcc
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.emcc (rev 0)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.emcc 2022-11-14 21:05:34 UTC (rev 884)
@@ -0,0 +1,83 @@
+# makefile for libpng using emscripten
+# Copyright (C) 2000, 2014, 2019-2022 Cosmin Truta
+# Copyright (C) 2021 Kirk Roerig
+# Copyright (C) 2008, 2014 Glenn Randers-Pehrson
+# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
+#
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
+
+# Location of the zlib library and include files
+ZLIBINC = ../zlib
+ZLIBLIB = ../zlib
+
+# Compiler, linker, lib and other tools
+CC = emcc
+LD = $(CC)
+AR_RC = emar rcs
+RANLIB = emranlib
+CP = cp
+RM_F = rm -f
+
+CPPFLAGS = -I$(ZLIBINC) # -DPNG_DEBUG=5
+CFLAGS = -O2 -Wall -Wextra -Wundef
+LDFLAGS = -L$(ZLIBLIB)
+PNGTEST_LDFLAGS = --preload-file=pngtest.png
+LIBS = -lz -lm
+
+# Pre-built configuration
+# See scripts/pnglibconf.mak for more options
+PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
+
+# File lists
+OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \
+ pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o \
+ pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o
+
+# Targets
+all: static
+
+pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
+ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
+
+.c.o:
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
+
+static: libpng.a pngtest
+
+shared:
+ @echo This makefile cannot create shared libraries.
+ @false
+
+libpng.a: $(OBJS)
+ $(AR_RC) $@ $(OBJS)
+ $(RANLIB) $@
+
+test: pngtest
+ node ./pngtest
+
+pngtest: pngtest.o libpng.a
+ $(LD) $(LDFLAGS) $(PNGTEST_LDFLAGS) -o $@ pngtest.o libpng.a $(LIBS)
+
+clean:
+ $(RM_F) *.o libpng.a pngtest pngout.png pnglibconf.h
+ $(RM_F) pngtest.data pngtest.wasm
+
+png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngrtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngrutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngtrans.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngwrite.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngwtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngwutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+
+pngtest.o: png.h pngconf.h pnglibconf.h
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.freebsd
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.freebsd 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.freebsd 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,4 +1,5 @@
# makefile for libpng under FreeBSD
+# Copyright (C) 2020-2022 Cosmin Truta
# Copyright (C) 2014 Glenn Randers-Pehrson and Andrey A. Chernov
# Copyright (C) 2002, 2007, 2009 Glenn Randers-Pehrson and Andrey A. Chernov
#
@@ -37,15 +38,15 @@
DPADD+= ${LIBM} ${LIBZ}
CPPFLAGS+= -I. -I${ZLIBINC}
-CFLAGS+= -W -Wall
+CFLAGS+= -Wall -Wextra -Wundef
# Pre-built configuration
# See scripts/pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT= scripts/pnglibconf.h.prebuilt
-SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
- pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
- pngwtran.c pngmem.c pngerror.c pngpread.c
+SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \
+ pngread.c pngrio.c pngrtran.c pngrutil.c pngset.c \
+ pngtrans.c pngwio.c pngwrite.c pngwtran.c pngwutil.c
.c.o:
$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
@@ -62,8 +63,4 @@
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
cp $(PNGLIBCONF_H_PREBUILT) $@
-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO
-writelock:
- chmod a-w *.[ch35] $(DOCS) scripts/*
-
.include <bsd.lib.mk>
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.gcc
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.gcc 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.gcc 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,6 +1,6 @@
# makefile for libpng using gcc (generic, static library)
+# Copyright (C) 2000, 2014, 2019-2022 Cosmin Truta
# Copyright (C) 2008, 2014 Glenn Randers-Pehrson
-# Copyright (C) 2000, 2014, 2019 Cosmin Truta
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
#
# This code is released under the libpng license.
@@ -19,12 +19,16 @@
CP = cp
RM_F = rm -f
+# Compiler and linker flags
+NOHWOPT = -DPNG_ARM_NEON_OPT=0 -DPNG_MIPS_MSA_OPT=0 \
+ -DPNG_POWERPC_VSX_OPT=0 -DPNG_INTEL_SSE_OPT=0
WARNMORE = -Wwrite-strings -Wpointer-arith -Wshadow \
-Wmissing-declarations -Wtraditional -Wcast-align \
-Wstrict-prototypes -Wmissing-prototypes # -Wconversion
-CPPFLAGS = -I$(ZLIBINC) # -DPNG_DEBUG=5
-CFLAGS = -W -Wall -O2 # $(WARNMORE) -g
-LDFLAGS = -L$(ZLIBLIB)
+DEFS = $(NOHWOPT)
+CPPFLAGS = -I$(ZLIBINC) $(DEFS) # -DPNG_DEBUG=5
+CFLAGS = -O2 -Wall -Wextra -Wundef # $(WARNMORE) -g
+LDFLAGS = -L$(ZLIBLIB) # -g
LIBS = -lz -lm
# File extensions
@@ -34,10 +38,10 @@
# See scripts/pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
-# Variables
-OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \
- pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o \
- pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o
+# File lists
+OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \
+ pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o \
+ pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o
# Targets
all: static
Deleted: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.gcc-asan
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.gcc-asan 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.gcc-asan 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,87 +0,0 @@
-# makefile for libpng using gcc + address sanitizer (generic, static library)
-# Copyright (C) 2008, 2014 Glenn Randers-Pehrson
-# Copyright (C) 2000, 2014, 2019 Cosmin Truta
-# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
-#
-# This code is released under the libpng license.
-# For conditions of distribution and use, see the disclaimer
-# and license in png.h
-
-# Location of the zlib library and include files
-ZLIBINC = ../zlib
-ZLIBLIB = ../zlib
-
-# Compiler, linker, lib and other tools
-CC = gcc
-LD = $(CC)
-AR_RC = ar rcs
-RANLIB = ranlib
-CP = cp
-RM_F = rm -f
-
-WARNMORE = -Wwrite-strings -Wpointer-arith -Wshadow \
- -Wmissing-declarations -Wtraditional -Wcast-align \
- -Wstrict-prototypes -Wmissing-prototypes # -Wconversion
-CPPFLAGS = -I$(ZLIBINC) # -DPNG_DEBUG=5
-CFLAGS = -W -Wall -O0 -g -fsanitize=address
-LDFLAGS = -L$(ZLIBLIB) -g -fsanitize=address
-LIBS = -lz -lm
-
-# File extensions
-EXEEXT =
-
-# Pre-built configuration
-# See scripts/pnglibconf.mak for more options
-PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
-
-# Variables
-OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \
- pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o \
- pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o
-
-# Targets
-all: static
-
-pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
- $(CP) $(PNGLIBCONF_H_PREBUILT) $@
-
-.c.o:
- $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
-
-static: libpng.a pngtest$(EXEEXT)
-
-shared:
- @echo This is a generic makefile that cannot create shared libraries.
- @echo Please use a configuration that is specific to your platform.
- @false
-
-libpng.a: $(OBJS)
- $(AR_RC) $@ $(OBJS)
- $(RANLIB) $@
-
-test: pngtest$(EXEEXT)
- ./pngtest$(EXEEXT)
-
-pngtest$(EXEEXT): pngtest.o libpng.a
- $(LD) $(LDFLAGS) -o $@ pngtest.o libpng.a $(LIBS)
-
-clean:
- $(RM_F) *.o libpng.a pngtest$(EXEEXT) pngout.png pnglibconf.h
-
-png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngrtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngrutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngtrans.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngwrite.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngwtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngwutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-
-pngtest.o: png.h pngconf.h pnglibconf.h
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.hp64
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.hp64 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.hp64 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,4 +1,5 @@
# makefile for libpng, HPUX (10.20 and 11.00) using the ANSI/C product.
+# Copyright (C) 2020-2022 Cosmin Truta
# Copyright (C) 1999-2002, 2006, 2009, 2010-2014 Glenn Randers-Pehrson
# Copyright (C) 1995 Guy Eric Schalnat, Group 42
# Contributed by Jim Rice and updated by Chris Schleicher, Hewlett Packard
@@ -29,11 +30,11 @@
OLDSO=libpng.sl
# Utilities:
+CC=cc
AR_RC=ar rc
-CC=cc
+RANLIB=ranlib
MKDIR_P=mkdir -p
LN_SF=ln -sf
-RANLIB=ranlib
CP=cp
RM_F=/bin/rm -f
@@ -72,9 +73,9 @@
# See scripts/pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
- pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
- pngwtran.o pngmem.o pngerror.o pngpread.o
+OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \
+ pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o \
+ pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o
OBJSDLL = $(OBJS:.o=.pic.o)
@@ -206,26 +207,22 @@
libpng-config $(LIBSO) $(LIBSOMAJ)* \
libpng.pc pnglibconf.h
-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO
-writelock:
- chmod a-w *.[ch35] $(DOCS) scripts/*
-
# DO NOT DELETE THIS LINE -- make depend depends on it.
-png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngrtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngrutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngtrans.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwrite.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngtest.o: png.h pngconf.h pnglibconf.h
+pngtest.o: png.h pngconf.h pnglibconf.h
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.hpgcc
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.hpgcc 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.hpgcc 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,4 +1,5 @@
# makefile for libpng on HP-UX using GCC with the HP ANSI/C linker.
+# Copyright (C) 2020-2022 Cosmin Truta
# Copyright (C) 2002, 2006-2008, 2010-2014 Glenn Randers-Pehrson
# Copyright (C) 2001, Laurent faillie
# Copyright (C) 1998, 1999 Greg Roelofs
@@ -22,9 +23,9 @@
CC=gcc
LD=ld
AR_RC=ar rc
+RANLIB=ranlib
MKDIR_P=mkdir -p
LN_SF=ln -sf
-RANLIB=ranlib
CP=cp
RM_F=/bin/rm -f
@@ -44,20 +45,14 @@
# LDSHARED=ld -b
# SHAREDLIB=libz.sl
-ALIGN=
-# for i386:
-#ALIGN=-malign-loops=2 -malign-functions=2
-
WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
-Wmissing-declarations -Wtraditional -Wcast-align \
- -Wstrict-prototypes -Wmissing-prototypes #-Wconversion
+ -Wstrict-prototypes -Wmissing-prototypes # -Wconversion
-# for pgcc version 2.95.1, -O3 is buggy; don't use it.
-
CPPFLAGS=-I$(ZLIBINC) # -DPNG_DEBUG=5
-CFLAGS=-W -Wall -O3 -funroll-loops $(ALIGN) # $(WARNMORE) -g
-#LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng16 -lz -lm
-LDFLAGS=-L. -L$(ZLIBLIB) -lpng16 -lz -lm
+CFLAGS=-O3 -funroll-loops -Wall -Wextra -Wundef # $(WARNMORE) -g
+#LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng16 -lz -lm # -g
+LDFLAGS=-L. -L$(ZLIBLIB) -lpng16 -lz -lm # -g
INCPATH=$(prefix)/include
LIBPATH=$(exec_prefix)/lib
@@ -79,9 +74,9 @@
DL=$(DESTDIR)$(LIBPATH)
DM=$(DESTDIR)$(MANPATH)
-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
- pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
- pngwtran.o pngmem.o pngerror.o pngpread.o
+OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \
+ pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o \
+ pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o
OBJSDLL = $(OBJS:.o=.pic.o)
@@ -209,26 +204,22 @@
libpng-config $(LIBSO) $(LIBSOMAJ)* \
libpng.pc pnglibconf.h
-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO
-writelock:
- chmod a-w *.[ch35] $(DOCS) scripts/*
-
# DO NOT DELETE THIS LINE -- make depend depends on it.
-png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngerror.o pngerror.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngrtran.o pngrtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngrutil.o pngrutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngtrans.o pngtrans.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwrite.o pngwrite.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwtran.o pngwtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwutil.o pngwutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngtest.o: png.h pngconf.h pnglibconf.h
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.hpux
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.hpux 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.hpux 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,4 +1,5 @@
# makefile for libpng, HPUX (10.20 and 11.00) using the ANSI/C product.
+# Copyright (C) 2020-2022 Cosmin Truta
# Copyright (C) 1999-2002, 2006, 2010-2014 Glenn Randers-Pehrson
# Copyright (C) 1995 Guy Eric Schalnat, Group 42
# Contributed by Jim Rice and updated by Chris Schleicher, Hewlett Packard
@@ -30,11 +31,11 @@
OLDSO=libpng.sl
# Utilities:
+CC=cc
AR_RC=ar rc
-CC=cc
+RANLIB=ranlib
MKDIR_P=mkdir -p
LN_SF=ln -sf
-RANLIB=ranlib
RM_F=/bin/rm -f
# where make install puts libpng.a, libpng16.sl, and png.h
@@ -70,9 +71,9 @@
# See scripts/pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
- pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
- pngwtran.o pngmem.o pngerror.o pngpread.o
+OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \
+ pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o \
+ pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o
OBJSDLL = $(OBJS:.o=.pic.o)
@@ -204,26 +205,22 @@
libpng-config $(LIBSO) $(LIBSOMAJ)* \
libpng.pc pnglibconf.h
-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO
-writelock:
- chmod a-w *.[ch35] $(DOCS) scripts/*
-
# DO NOT DELETE THIS LINE -- make depend depends on it.
-png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngrtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngrutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngtrans.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwrite.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngtest.o: png.h pngconf.h pnglibconf.h
+pngtest.o: png.h pngconf.h pnglibconf.h
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.ibmc
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.ibmc 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.ibmc 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,7 +1,7 @@
# Makefile for libpng (static)
# IBM C version 3.x for Win32 and OS/2
# Copyright (C) 2006, 2014 Glenn Randers-Pehrson
-# Copyright (C) 2000 Cosmin Truta
+# Copyright (C) 2000, 2020 Cosmin Truta
#
# This code is released under the libpng license.
# For conditions of distribution and use, see the disclaimer
@@ -37,10 +37,10 @@
A=.lib
E=.exe
-# Variables
+# File lists
OBJS = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \
- pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) pngset$(O) \
- pngtrans$(O) pngwio$(O) pngwrite$(O) pngwtran$(O) pngwutil$(O)
+ pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) pngset$(O) \
+ pngtrans$(O) pngwio$(O) pngwrite$(O) pngwtran$(O) pngwutil$(O)
LIBS = libpng$(A) $(ZLIBLIB)/zlib$(A)
@@ -65,11 +65,11 @@
$(LD) $(LDFLAGS) pngtest$(O) $(LIBS)
clean:
- $(RM) *$(O)
- $(RM) libpng$(A)
- $(RM) pnglibconf.h
- $(RM) pngtest$(E)
- $(RM) pngout.png
+ -$(RM) *$(O)
+ -$(RM) libpng$(A)
+ -$(RM) pnglibconf.h
+ -$(RM) pngtest$(E)
+ -$(RM) pngout.png
png$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngerror$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.intel
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.intel 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.intel 2022-11-14 21:05:34 UTC (rev 884)
@@ -31,7 +31,7 @@
# --------------------------------------------------------------------------
-CC=icl -c
+CC=icl
CPPFLAGS=-I$(ZLIBINC)
CFLAGS=-O2 -G$(CPU)$(CALLING) -Qip -Qunroll4 -nologo
LD=link
@@ -42,12 +42,16 @@
# See scripts\pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT = scripts\pnglibconf.h.prebuilt
+# File extensions
O=.obj
-OBJS=png$(O) pngset$(O) pngget$(O) pngrutil$(O) pngtrans$(O) pngwutil$(O) \
-pngmem$(O) pngpread$(O) pngread$(O) pngerror$(O) pngwrite$(O) \
-pngrtran$(O) pngwtran$(O) pngrio$(O) pngwio$(O)
+# File lists
+OBJS1=png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O)
+OBJS2=pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) pngset$(O)
+OBJS3=pngtrans$(O) pngwio$(O) pngwrite$(O) pngwtran$(O) pngwutil$(O)
+OBJS=$(OBJS1) $(OBJS2) $(OBJS3)
+# Targets
all: test
pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
@@ -54,49 +58,49 @@
$(CP) $(PNGLIBCONF_H_PREBUILT) $@
png$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
- $(CC) $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
-pngset$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
- $(CC) $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
+pngerror$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
pngget$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
- $(CC) $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
-pngread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
- $(CC) $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
+pngmem$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
pngpread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
- $(CC) $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
+pngread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
+
+pngrio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
+
pngrtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
- $(CC) $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
pngrutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
- $(CC) $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
-pngerror$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
- $(CC) $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
+pngset$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
-pngmem$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
- $(CC) $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
+pngtrans$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
-pngrio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
- $(CC) $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
-
pngwio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
- $(CC) $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
-pngtrans$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
- $(CC) $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
-
pngwrite$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
- $(CC) $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
pngwtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
- $(CC) $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
pngwutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
- $(CC) $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
libpng.lib: $(OBJS)
if exist libpng.lib del libpng.lib
@@ -106,10 +110,9 @@
$(LD) $(LDFLAGS) /OUT:pngtest.exe pngtest.obj libpng.lib $(ZLIBLIB)\zlib.lib
pngtest$(O): png.h pngconf.h pnglibconf.h
- $(CC) $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
test: pngtest.exe
pngtest.exe
-
# End of makefile for libpng
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.linux
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.linux 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.linux 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,4 +1,5 @@
# makefile for libpng.a and libpng16.so on Linux ELF with gcc
+# Copyright (C) 2020-2022 Cosmin Truta
# Copyright (C) 1998, 1999, 2002, 2006, 2008, 2010-2014 Greg Roelofs and
# Glenn Randers-Pehrson
# Copyright (C) 1996, 1997 Andreas Dilger
@@ -10,7 +11,7 @@
# Library name:
LIBNAME = libpng16
PNGMAJ = 16
-RELEASE = 37
+RELEASE = 38
# Shared library names:
LIBSO=$(LIBNAME).so
@@ -19,13 +20,13 @@
OLDSO=libpng.so
# Utilities:
+CC=gcc
AR_RC=ar rc
-CC=gcc
+RANLIB=ranlib
MKDIR_P=mkdir -p
LN_SF=ln -sf
-RANLIB=ranlib
CP=cp
-RM_F=/bin/rm -f
+RM_F=rm -f
# where "make install" puts libpng16.a, libpng16.so*,
# libpng16/png.h, libpng16/pngconf.h, and libpng16/pnglibconf.h
@@ -39,22 +40,18 @@
ZLIBLIB=../zlib
ZLIBINC=../zlib
-ALIGN=
-# for i386:
-#ALIGN=-malign-loops=2 -malign-functions=2
-
+# Compiler and linker flags
+NOHWOPT=-DPNG_ARM_NEON_OPT=0 -DPNG_MIPS_MSA_OPT=0 \
+ -DPNG_POWERPC_VSX_OPT=0 -DPNG_INTEL_SSE_OPT=0
WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
-Wmissing-declarations -Wtraditional -Wcast-align \
- -Wstrict-prototypes -Wmissing-prototypes #-Wconversion
+ -Wstrict-prototypes -Wmissing-prototypes # -Wconversion
+DEFS=$(NOHWOPT)
+CPPFLAGS=-I$(ZLIBINC) $(DEFS) # -DPNG_DEBUG=5
+CFLAGS=-O3 -funroll-loops -Wall -Wextra -Wundef # $(WARNMORE) -g
+LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng16 -lz -lm # -g
+LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm # -g
-# for pgcc version 2.95.1, -O3 is buggy; don't use it.
-
-CPPFLAGS=-I$(ZLIBINC) # -DPNG_DEBUG=5
-CFLAGS=-W -Wall -O3 -funroll-loops $(ALIGN) # $(WARNMORE) -g
-
-LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng16 -lz -lm
-LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm
-
INCPATH=$(prefix)/include
LIBPATH=$(exec_prefix)/lib
MANPATH=$(prefix)/man
@@ -79,9 +76,10 @@
# See scripts/pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
- pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
- pngwtran.o pngmem.o pngerror.o pngpread.o
+# File lists
+OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \
+ pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o \
+ pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o
OBJSDLL = $(OBJS:.o=.pic.o)
@@ -167,7 +165,6 @@
(cd $(DL); \
$(LN_SF) $(LIBSOREL) $(LIBSO); \
$(LN_SF) $(LIBSO) $(OLDSO))
-
- at if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
-@$(RM_F) $(DL)/pkgconfig/libpng.pc
@@ -210,6 +207,8 @@
./pngtestd pngtest.png
test-installed:
+ echo
+ echo Testing installed dynamic shared library.
$(CC) $(CPPFLAGS) \
`$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
@@ -217,30 +216,27 @@
./pngtesti pngtest.png
clean:
- $(RM_F) *.o libpng.a pngtest pngout.png libpng-config \
- $(LIBSO) $(LIBSOMAJ)* pngtest-static pngtesti \
- libpng.pc pnglibconf.h
+ $(RM_F) $(OBJS) $(OBJSDLL) libpng.a
+ $(RM_F) pngtest*.o pngtest pngtesti pngtest-static pngout.png
+ $(RM_F) $(LIBSO) $(LIBSOMAJ)*
+ $(RM_F) libpng.pc pnglibconf.h libpng-config
-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO
-writelock:
- chmod a-w *.[ch35] $(DOCS) scripts/*
-
# DO NOT DELETE THIS LINE -- make depend depends on it.
-png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngerror.o pngerror.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngrtran.o pngrtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngrutil.o pngrutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngtrans.o pngtrans.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwrite.o pngwrite.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwtran.o pngwtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwutil.o pngwutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngtest.o: png.h pngconf.h pnglibconf.h
Deleted: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.linux-opt
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.linux-opt 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.linux-opt 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,265 +0,0 @@
-# makefile for libpng.a and libpng16.so on Linux ELF with gcc
-# Copyright (C) 1998,1999,2002,2006,2008,2010-2014,2017 Greg Roelofs and
-# Glenn Randers-Pehrson
-# Copyright (C) 1996,1997 Andreas Dilger
-#
-# This code is released under the libpng license.
-# For conditions of distribution and use, see the disclaimer
-# and license in png.h
-
-# Library name:
-LIBNAME = libpng16
-PNGMAJ = 16
-RELEASE = 37
-
-# Shared library names:
-LIBSO=$(LIBNAME).so
-LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
-LIBSOREL=$(LIBSOMAJ).$(RELEASE)
-OLDSO=libpng.so
-
-# Utilities:
-AR_RC=ar rc
-CC=gcc
-MKDIR_P=mkdir -p
-LN_SF=ln -sf
-RANLIB=ranlib
-CP=cp
-RM_F=/bin/rm -f
-
-# where "make install" puts libpng16.a, libpng16.so*,
-# libpng16/png.h, libpng16/pngconf.h, and libpng16/pnglibconf.h
-# Prefix must be a full pathname.
-prefix=/usr/local
-exec_prefix=$(prefix)
-
-# Where the zlib library and include files are located.
-#ZLIBLIB=/usr/local/lib
-#ZLIBINC=/usr/local/include
-ZLIBLIB=../zlib
-ZLIBINC=../zlib
-
-ALIGN=
-# for i386:
-#ALIGN=-malign-loops=2 -malign-functions=2
-
-#WARNMORE=-Wwrite-strings -Wpointer-arith \
-# -Wmissing-declarations -Wtraditional -Wcast-align \
-# -Wstrict-prototypes -Wmissing-prototypes
-
-# for pgcc version 2.95.1, -O3 is buggy; don't use it.
-
-CPPFLAGS=-I$(ZLIBINC)
-CPPFLAGS += -DPNG_ARM_NEON
-CPPFLAGS += -DPNG_MIPS_MSA
-CPPFLAGS += -DPNG_INTEL_SSE
-CPPFLAGS += -DPNG_POWERPC_VSX
-CPPFLAGS+=-ansi -pedantic -Wextra -Wall -Wshadow -Wno-sign-conversion
-CPPFLAGS+=-W -Wall -Wconversion $(ALIGN)
-# CPPFLAGS+=$(WARNMORE)
-CFLAGS= -O3 -funroll-loops
-
-LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng16 -lz -lm
-LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm
-
-INCPATH=$(prefix)/include
-LIBPATH=$(exec_prefix)/lib
-MANPATH=$(prefix)/man
-BINPATH=$(exec_prefix)/bin
-
-# override DESTDIR= on the make install command line to easily support
-# installing into a temporary location. Example:
-#
-# make install DESTDIR=/tmp/build/libpng
-#
-# If you're going to install into a temporary location
-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
-# you execute make install.
-DESTDIR=
-
-DB=$(DESTDIR)$(BINPATH)
-DI=$(DESTDIR)$(INCPATH)
-DL=$(DESTDIR)$(LIBPATH)
-DM=$(DESTDIR)$(MANPATH)
-
-# Pre-built configuration
-# See scripts/pnglibconf.mak for more options
-PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
-
-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
- pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
- pngwtran.o pngmem.o pngerror.o pngpread.o \
- arm/arm_init.o arm/filter_neon_intrinsics.o \
- mips/mips_init.o mips/filter_msa_intrinsics.o \
- intel/intel_init.o intel/filter_sse2_intrinsics.o\
- powerpc/powerpc_init.o powerpc/filter_vsx_intrinsics.o
-
-OBJSDLL = $(OBJS:.o=.pic.o)
-
-.SUFFIXES: .c .o .pic.o
-
-.c.o:
- $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
-
-.c.pic.o:
- $(CC) -c $(CPPFLAGS) $(CFLAGS) -fPIC -o $@ $*.c
-
-all: libpng.a $(LIBSO) pngtest pngtest-static libpng.pc libpng-config
-
-pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
- $(CP) $(PNGLIBCONF_H_PREBUILT) $@
-
-libpng.a: $(OBJS)
- $(AR_RC) $@ $(OBJS)
- $(RANLIB) $@
-
-libpng.pc:
- cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
- -e s!@exec_prefix@!$(exec_prefix)! \
- -e s!@libdir@!$(LIBPATH)! \
- -e s!@includedir@!$(INCPATH)! \
- -e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc
-
-libpng-config:
- ( cat scripts/libpng-config-head.in; \
- echo prefix=\"$(prefix)\"; \
- echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
- echo L_opts=\"-L$(LIBPATH)\"; \
- echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \
- echo libs=\"-lpng16 -lz -lm\"; \
- cat scripts/libpng-config-body.in ) > libpng-config
- chmod +x libpng-config
-
-$(LIBSO): $(LIBSOMAJ)
- $(LN_SF) $(LIBSOMAJ) $(LIBSO)
-
-$(LIBSOMAJ): $(OBJSDLL)
- $(CC) -shared -Wl,-soname,$(LIBSOMAJ) -o $(LIBSOMAJ) $(OBJSDLL)
-
-pngtest: pngtest.o $(LIBSO)
- $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
-
-pngtest-static: pngtest.o libpng.a
- $(CC) -o pngtest-static $(CFLAGS) pngtest.o $(LDFLAGS_A)
-
-test: pngtest pngtest-static
- @echo ""
- @echo " Running pngtest dynamically linked with $(LIBSO):"
- @echo ""
- ./pngtest
- @echo ""
- @echo " Running pngtest statically linked with libpng.a:"
- @echo ""
- ./pngtest-static
-
-install-headers: png.h pngconf.h pnglibconf.h
- - at if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
- - at if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
- cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME)
- chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h
- -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h
- -@$(RM_F) $(DI)/libpng
- (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
-
-install-static: install-headers libpng.a
- - at if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
- cp libpng.a $(DL)/$(LIBNAME).a
- chmod 644 $(DL)/$(LIBNAME).a
- -@$(RM_F) $(DL)/libpng.a
- (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
-
-install-shared: install-headers $(LIBSOMAJ) libpng.pc
- - at if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
- -@$(RM_F) $(DL)/$(LIBSO)
- -@$(RM_F) $(DL)/$(LIBSOREL)
- -@$(RM_F) $(DL)/$(OLDSO)
- cp $(LIBSOMAJ) $(DL)/$(LIBSOREL)
- chmod 755 $(DL)/$(LIBSOREL)
- (cd $(DL); \
- $(LN_SF) $(LIBSOREL) $(LIBSO); \
- $(LN_SF) $(LIBSO) $(OLDSO))
-
- - at if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
- -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
- -@$(RM_F) $(DL)/pkgconfig/libpng.pc
- cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
- chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
- (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)
-
-install-man: libpng.3 libpngpf.3 png.5
- - at if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
- - at if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
- -@$(RM_F) $(DM)/man3/libpng.3
- -@$(RM_F) $(DM)/man3/libpngpf.3
- cp libpng.3 $(DM)/man3
- cp libpngpf.3 $(DM)/man3
- - at if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
- -@$(RM_F) $(DM)/man5/png.5
- cp png.5 $(DM)/man5
-
-install-config: libpng-config
- - at if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
- -@$(RM_F) $(DB)/libpng-config
- -@$(RM_F) $(DB)/$(LIBNAME)-config
- cp libpng-config $(DB)/$(LIBNAME)-config
- chmod 755 $(DB)/$(LIBNAME)-config
- (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
-
-install: install-static install-shared install-man install-config
-
-# If you installed in $(DESTDIR), test-installed won't work until you
-# move the library to its final location. Use test-dd to test it
-# before then.
-
-test-dd:
- echo
- echo Testing installed dynamic shared library in $(DL).
- $(CC) -I$(DI) $(CPPFLAGS) \
- `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
- -L$(DL) -L$(ZLIBLIB) -Wl, -rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \
- -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`
- ./pngtestd pngtest.png
-
-test-installed:
- $(CC) $(CPPFLAGS) \
- `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
- -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
- -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`
- ./pngtesti pngtest.png
-
-clean:
- $(RM_F) *.o libpng.a pngtest pngout.png libpng-config \
- $(LIBSO) $(LIBSOMAJ)* pngtest-static pngtesti \
- libpng.pc pnglibconf.h
-
-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO
-writelock:
- chmod a-w *.[ch35] $(DOCS) scripts/*
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngerror.o pngerror.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngrtran.o pngrtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngrutil.o pngrutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngtrans.o pngtrans.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngwrite.o pngwrite.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngwtran.o pngwtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngwutil.o pngwutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-arm/arm_init.o arm/arm_init.o: pngpriv.h
-arm/filter_neon_intrinsics.o arm/filter_neon_intrinsics.pic.o: pngpriv.h
-mips/mips_init.o mips/mips_init.pic.o: pngpriv.h
-mips/filter_msa_intrinsics.o mips/filter_msa_intrinsics.pic.: pngpriv.h
-intel/intel_init.o intel/intel_init.pic.: pngpriv.h
-intel/filter_sse2_intrinsics.o intel/filter_sse2_intrinsics.pic.: pngpriv.h
-powerpc/powerpc_init.o powerpc/powerpc_init.pic.: pngpriv.h
-powerpc/filter_vsx_intrinsics.o powerpc/filter_vsx_intrinsics.pic.: pngpriv.h
-
-pngtest.o: png.h pngconf.h pnglibconf.h
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.mips
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.mips 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.mips 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,4 +1,5 @@
# makefile for libpng
+# Copyright (C) 2020-2022 Cosmin Truta
# Copyright (C) 1998-2014 Glenn Randers-Pehrson
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
#
@@ -36,9 +37,9 @@
# See scripts/pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
- pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
- pngwtran.o pngmem.o pngerror.o pngpread.o
+OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \
+ pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o \
+ pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o
.c.o:
$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
@@ -49,7 +50,7 @@
$(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng.a: $(OBJS)
- ar rc $@ $(OBJS)
+ ar rc $@ $(OBJS)
$(RANLIB) $@
pngtest: pngtest.o libpng.a
@@ -78,26 +79,22 @@
clean:
rm -f *.o libpng.a pngtest pngout.png pnglibconf.h
-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO
-writelock:
- chmod a-w *.[ch35] $(DOCS) scripts/*
-
# DO NOT DELETE THIS LINE -- make depend depends on it.
-png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngrtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngrutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngtrans.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwrite.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngtest.o: png.h pngconf.h pnglibconf.h
+pngtest.o: png.h pngconf.h pnglibconf.h
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.msys
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.msys 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.msys 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,5 +1,5 @@
# makefile for libpng using MSYS/gcc (shared, static library)
-# Copyright (C) 2019 Cosmin Truta
+# Copyright (C) 2019-2022 Cosmin Truta
# Copyright (C) 2012 Glenn Randers-Pehrson and Christopher M. Wheeler
#
# Portions taken from makefile.linux and makefile.gcc:
@@ -19,7 +19,7 @@
# Library name:
LIBNAME = libpng16
PNGMAJ = 16
-RELEASE = 37
+RELEASE = 38
# Shared library names:
LIBSO=$(LIBNAME).dll
@@ -43,12 +43,9 @@
MKDIR_P=mkdir -p
LN_SF=ln -sf
-#ARCH = -march=pentium3
-#ARCH = -march=i686
-ARCH =
CPPFLAGS = # -DPNG_DEBUG=5
-CFLAGS = -W -Wall -O2 $(ARCH) # -g
-LDFLAGS =
+CFLAGS = -O2 -Wall -Wextra -Wundef # -g
+LDFLAGS = # -g
LIBS = -lz -lm
# File extensions
@@ -67,7 +64,6 @@
# If you're going to install into a temporary location
# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
# you execute make install.
-
DESTDIR=
DB=$(DESTDIR)$(BINPATH)
@@ -79,10 +75,10 @@
# See scripts/pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
-# Variables
-OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \
- pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o \
- pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o
+# File lists
+OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \
+ pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o \
+ pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o
# Targets
all: static shared
@@ -146,7 +142,6 @@
(cd $(DL); \
$(LN_SF) $(LIBSOREL) $(LIBSO); \
$(LN_SF) $(LIBSO) $(OLDSO))
-
- at if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
-@$(RM_F) $(DL)/pkgconfig/libpng.pc
@@ -180,8 +175,10 @@
$(LD) $(LDFLAGS) -o $@ pngtest.o libpng.a $(LIBS)
clean:
- $(RM_F) *.o libpng.a pngtest$(EXEEXT) pngout.png pnglibconf.h $(LIBSO) \
- $(LIBSOMAJ) libpng-config
+ $(RM_F) $(OBJS) libpng.a
+ $(RM_F) pngtest*.o pngtest$(EXEEXT) pngout.png
+ $(RM_F) $(LIBSO) $(LIBSOMAJ)
+ $(RM_F) libpng.pc pnglibconf.h libpng-config
png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.netbsd
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.netbsd 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.netbsd 2022-11-14 21:05:34 UTC (rev 884)
@@ -14,12 +14,12 @@
INCSDIR=${LOCALBASE}/include
SHLIB_MAJOR= 16
-SHLIB_MINOR= 1.6.37
+SHLIB_MINOR= 1.6.38
LIB= png
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \
- pngread.c pngrio.c pngrtran.c pngrutil.c pngset.c pngtrans.c \
- pngwio.c pngwrite.c pngwtran.c pngwutil.c
+ pngread.c pngrio.c pngrtran.c pngrutil.c pngset.c \
+ pngtrans.c pngwio.c pngwrite.c pngwtran.c pngwutil.c
INCS= png.h pngconf.h pnglibconf.h
MAN= libpng.3 libpngpf.3 png.5
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.openbsd
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.openbsd 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.openbsd 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,4 +1,5 @@
# makefile for libpng
+# Copyright (C) 2020-2022 Cosmin Truta
# Copyright (C) 2007-2009, 2014 Glenn Randers-Pehrson
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
#
@@ -11,18 +12,18 @@
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 16
-SHLIB_MINOR= 1.6.37
+SHLIB_MINOR= 1.6.38
LIB= png
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \
- pngread.c pngrio.c pngrtran.c pngrutil.c pngset.c pngtrans.c \
- pngwio.c pngwrite.c pngwtran.c pngwutil.c
+ pngread.c pngrio.c pngrtran.c pngrutil.c pngset.c \
+ pngtrans.c pngwio.c pngwrite.c pngwtran.c pngwutil.c
HDRS= png.h pngconf.h pnglibconf.h
MAN= libpng.3 libpngpf.3 png.5
DOCS= ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO \
libpng-manual.txt
-CFLAGS+= -W -Wall
+CFLAGS+= -Wall -Wextra -Wundef
CPPFLAGS+= -I${.CURDIR}
NOPROFILE= Yes
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.sco
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.sco 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.sco 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,6 +1,7 @@
# makefile for SCO OSr5 ELF and Unixware 7 with Native cc
# Contributed by Mike Hopkirk (hops at sco.com) modified from Makefile.lnx
# force ELF build dynamic linking, SONAME setting in lib and RPATH in app
+# Copyright (C) 2020-2022 Cosmin Truta
# Copyright (C) 2002, 2006, 2010-2014 Glenn Randers-Pehrson
# Copyright (C) 1998 Greg Roelofs
# Copyright (C) 1996, 1997 Andreas Dilger
@@ -22,9 +23,9 @@
# Utilities:
CC=cc
AR_RC=ar rc
+RANLIB=echo
MKDIR_P=mkdir
LN_SF=ln -f -s
-RANLIB=echo
CP=cp
RM_F=/bin/rm -f
@@ -66,9 +67,9 @@
# See scripts/pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
- pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
- pngwtran.o pngmem.o pngerror.o pngpread.o
+OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \
+ pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o \
+ pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o
OBJSDLL = $(OBJS:.o=.pic.o)
@@ -201,26 +202,22 @@
$(LIBSO) $(LIBSOMAJ)* pngtest-static pngtesti \
pnglibconf.h libpng.pc
-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO
-writelock:
- chmod a-w *.[ch35] $(DOCS) scripts/*
-
# DO NOT DELETE THIS LINE -- make depend depends on it.
-png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngerror.o pngerror.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngrtran.o pngrtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngrutil.o pngrutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngtrans.o pngtrans.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwrite.o pngwrite.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwtran.o pngwtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwutil.o pngwutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngtest.o: png.h pngconf.h pnglibconf.h
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.sggcc
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.sggcc 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.sggcc 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,4 +1,5 @@
# makefile for libpng.a and libpng16.so, SGI IRIX with 'cc'
+# Copyright (C) 2020-2022 Cosmin Truta
# Copyright (C) 2001-2002, 2006, 2010-2014 Glenn Randers-Pehrson
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
#
@@ -17,11 +18,11 @@
OLDSO=libpng.so
# Utilities:
+CC=gcc
AR_RC=ar rc
-CC=gcc
+RANLIB=echo
MKDIR_P=mkdir -p
LN_SF=ln -sf
-RANLIB=echo
CP=cp
RM_F=/bin/rm -f
@@ -46,7 +47,7 @@
WARNMORE=
CPPFLAGS=-I$(ZLIBINC) # -DPNG_DEBUG=5
CFLAGS=$(ABI) -O $(WARNMORE) -fPIC -mabi=n32 # -g
-LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm
+LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm # -g
LDSHARED=cc $(ABI) -shared -soname $(LIBSOMAJ) \
-set_version sgi$(PNGMAJ).0
# See "man dso" for info about shared objects
@@ -76,9 +77,9 @@
# See scripts/pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
- pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
- pngwtran.o pngmem.o pngerror.o pngpread.o
+OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \
+ pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o \
+ pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o
.c.o:
$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
@@ -211,26 +212,22 @@
$(RM_F) libpng.a pngtest pngtesti pngout.png libpng.pc \
so_locations libpng-config $(LIBSO) $(LIBSOMAJ)* pnglibconf.h
-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO
-writelock:
- chmod a-w *.[ch35] $(DOCS) scripts/*
-
# DO NOT DELETE THIS LINE -- make depend depends on it.
-png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngrtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngrutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngtrans.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwrite.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngtest.o: png.h pngconf.h pnglibconf.h
+pngtest.o: png.h pngconf.h pnglibconf.h
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.sgi
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.sgi 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.sgi 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,4 +1,5 @@
# makefile for libpng.a and libpng16.so, SGI IRIX with 'cc'
+# Copyright (C) 2020-2022 Cosmin Truta
# Copyright (C) 2001-2002, 2006, 2007, 2010-2014 Glenn Randers-Pehrson
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
#
@@ -17,11 +18,11 @@
OLDSO=libpng.so
# Utilities:
+CC=cc
AR_RC=ar rc
-CC=cc
+RANLIB=echo
MKDIR_P=mkdir -p
LN_SF=ln -sf
-RANLIB=echo
CP=cp
RM_F=/bin/rm -f
@@ -47,9 +48,9 @@
# Note: -KPIC is the default anyhow
CPPFLAGS=-I$(ZLIBINC) # -DPNG_DEBUG=5
#CFLAGS= $(ABI) -O $(WARNMORE) -KPIC # -g
-CFLAGS=$(ABI) -O $(WARNMORE)
-LDFLAGS_A=$(ABI) -L. -L$(ZLIBLIB) -lpng16 -lz -lm
-LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm
+CFLAGS=$(ABI) -O $(WARNMORE) # -g
+LDFLAGS_A=$(ABI) -L. -L$(ZLIBLIB) -lpng16 -lz -lm # -g
+LDFLAGS=$(ABI) -L. -L$(ZLIBLIB) -lpng -lz -lm # -g
LDSHARED=cc $(ABI) -shared -soname $(LIBSOMAJ) \
-set_version sgi$(PNGMAJ).0
# See "man dso" for info about shared objects
@@ -79,9 +80,9 @@
# See scripts/pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
- pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
- pngwtran.o pngmem.o pngerror.o pngpread.o
+OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \
+ pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o \
+ pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o
.c.o:
$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
@@ -212,26 +213,22 @@
$(LIBSO) $(LIBSOMAJ)* \
so_locations pnglibconf.h
-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO
-writelock:
- chmod a-w *.[ch35] $(DOCS) scripts/*
-
# DO NOT DELETE THIS LINE -- make depend depends on it.
-png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngrtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngrutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngtrans.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwrite.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngtest.o: png.h pngconf.h pnglibconf.h
+pngtest.o: png.h pngconf.h pnglibconf.h
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.so9
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.so9 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.so9 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,6 +1,7 @@
# makefile for libpng on Solaris 9 (beta) with Forte cc
# Updated by Chad Schrock for Solaris 9
# Contributed by William L. Sebok, based on makefile.linux
+# Copyright (C) 2020-2022 Cosmin Truta
# Copyright (C) 2002, 2006, 2008, 2010-2014 Glenn Randers-Pehrson
# Copyright (C) 1998-2001 Greg Roelofs
# Copyright (C) 1996-1997 Andreas Dilger
@@ -23,9 +24,9 @@
# gcc 2.95 doesn't work.
CC=cc
AR_RC=ar rc
+RANLIB=echo
MKDIR_P=mkdir -p
LN_SF=ln -f -s
-RANLIB=echo
CP=cp
RM_F=/bin/rm -f
@@ -44,11 +45,7 @@
ZLIBLIB=/usr/lib
ZLIBINC=/usr/include
-#WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
- -Wmissing-declarations -Wtraditional -Wcast-align \
- -Wstrict-prototypes -Wmissing-prototypes #-Wconversion
CPPFLAGS=-I$(ZLIBINC) # -DPNG_DEBUG=5
-#CFLAGS=-W -Wall -O3 $(WARNMORE) -g
CFLAGS=-O3
LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng16 -lz -lm
@@ -76,9 +73,9 @@
# See scripts/pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
- pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
- pngwtran.o pngmem.o pngerror.o pngpread.o
+OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \
+ pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o \
+ pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o
OBJSDLL = $(OBJS:.o=.pic.o)
@@ -222,26 +219,22 @@
libpng-config $(LIBSO) $(LIBSOMAJ)* \
libpng.pc pnglibconf.h
-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO
-writelock:
- chmod a-w *.[ch35] $(DOCS) scripts/*
-
# DO NOT DELETE THIS LINE -- make depend depends on it.
-png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngerror.o pngerror.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngrtran.o pngrtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngrutil.o pngrutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngtrans.o pngtrans.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwrite.o pngwrite.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwtran.o pngwtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwutil.o pngwutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngtest.o: png.h pngconf.h pnglibconf.h
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.solaris
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.solaris 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.solaris 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,4 +1,5 @@
# makefile for libpng on Solaris 2.x with gcc
+# Copyright (C) 2020-2022 Cosmin Truta
# Copyright (C) 2004, 2006-2008, 2010-2014 Glenn Randers-Pehrson
# Contributed by William L. Sebok, based on makefile.linux
# Copyright (C) 1998 Greg Roelofs
@@ -19,11 +20,11 @@
OLDSO=libpng.so
# Utilities:
+CC=gcc
AR_RC=ar rc
-CC=gcc
+RANLIB=echo
MKDIR_P=mkdir -p
LN_SF=ln -f -s
-RANLIB=echo
CP=cp
RM_F=/bin/rm -f
@@ -42,10 +43,10 @@
WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
-Wmissing-declarations -Wtraditional -Wcast-align \
- -Wstrict-prototypes -Wmissing-prototypes #-Wconversion
+ -Wstrict-prototypes -Wmissing-prototypes # -Wconversion
CPPFLAGS=-I$(ZLIBINC) # -DPNG_DEBUG=5
-CFLAGS=-W -Wall -O # $(WARNMORE) -g
-LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng16 -lz -lm
+CFLAGS=-O -Wall -Wextra -Wundef # $(WARNMORE) -g
+LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng16 -lz -lm # -g
INCPATH=$(prefix)/include
LIBPATH=$(exec_prefix)/lib
@@ -71,9 +72,9 @@
# See scripts/pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
- pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
- pngwtran.o pngmem.o pngerror.o pngpread.o
+OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \
+ pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o \
+ pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o
OBJSDLL = $(OBJS:.o=.pic.o)
@@ -218,26 +219,22 @@
libpng-config $(LIBSO) $(LIBSOMAJ)* \
libpng.pc pnglibconf.h
-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO
-writelock:
- chmod a-w *.[ch35] $(DOCS) scripts/*
-
# DO NOT DELETE THIS LINE -- make depend depends on it.
-png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngerror.o pngerror.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngrtran.o pngrtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngrutil.o pngrutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngtrans.o pngtrans.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwrite.o pngwrite.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwtran.o pngwtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwutil.o pngwutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngtest.o: png.h pngconf.h pnglibconf.h
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.std
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.std 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.std 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,4 +1,5 @@
# makefile for libpng
+# Copyright (C) 2020-2022 Cosmin Truta
# Copyright (C) 2002, 2006, 2014 Glenn Randers-Pehrson
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
#
@@ -28,30 +29,33 @@
ZLIBINC=../zlib
CC = cc
+CPP = $(CC) -E
+LD = $(CC)
AR_RC = ar rc
+RANLIB = ranlib
MKDIR_P = mkdir
LN_SF = ln -sf
-RANLIB = ranlib
CP = cp
+MV_F = mv -f
RM_F = rm -f
AWK = awk
-SED = sed
-CPP = $(CC) -E
-ECHO = echo
+NOHWOPT = -DPNG_ARM_NEON_OPT=0 -DPNG_MIPS_MSA_OPT=0 \
+ -DPNG_POWERPC_VSX_OPT=0 -DPNG_INTEL_SSE_OPT=0
DFNFLAGS = # DFNFLAGS contains -D options to use in the libpng build
DFA_EXTRA = # extra files that can be used to control configuration
-CPPFLAGS = -I$(ZLIBINC) # -DPNG_DEBUG=5
+CPPFLAGS = -I$(ZLIBINC) $(NOHWOPT) # -DPNG_DEBUG=5
CFLAGS = -O # -g
-LDFLAGS = -L. -L$(ZLIBLIB) -lpng -lz -lm
+LDFLAGS = -L$(ZLIBLIB) # -g
+LIBS = -lz -lm
# Pre-built configuration
# See scripts/pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
- pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
- pngwtran.o pngmem.o pngerror.o pngpread.o
+OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \
+ pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o \
+ pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o
.c.o:
$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
@@ -62,28 +66,28 @@
# copy this if the following doesn't work.
pnglibconf.h: pnglibconf.dfn
$(RM_F) $@ pnglibconf.c pnglibconf.out pnglibconf.tmp
- $(ECHO) '#include "pnglibconf.dfn"' >pnglibconf.c
- $(ECHO) "If '$(CC) -E' crashes try /lib/cpp (e.g. CPP='/lib/cpp')" >&2
+ echo '#include "pnglibconf.dfn"' >pnglibconf.c
+ @echo "## If '$(CC) -E' fails, try /lib/cpp (e.g. CPP='/lib/cpp')" >&2
$(CPP) $(DFNFLAGS) pnglibconf.c >pnglibconf.out
- $(AWK) -f "scripts/dfn.awk" out="pnglibconf.tmp" pnglibconf.out 1>&2
- mv pnglibconf.tmp $@
+ $(AWK) -f scripts/dfn.awk out=pnglibconf.tmp pnglibconf.out >&2
+ $(MV_F) pnglibconf.tmp $@
pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk pngconf.h pngusr.dfa $(DFA_XTRA)
$(RM_F) $@ pnglibconf.pre pnglibconf.tmp
- $(ECHO) "Calling $(AWK) from scripts/pnglibconf.mak" >&2
- $(ECHO) "If 'awk' crashes try a better awk (e.g. AWK='nawk')" >&2
- $(AWK) -f scripts/options.awk out="pnglibconf.pre"\
+ @echo "## Calling $(AWK) from scripts/pnglibconf.mak" >&2
+ @echo "## If 'awk' fails, try a better awk (e.g. AWK='nawk')" >&2
+ $(AWK) -f scripts/options.awk out=pnglibconf.pre\
version=search pngconf.h scripts/pnglibconf.dfa\
- pngusr.dfa $(DFA_XTRA) 1>&2
- $(AWK) -f scripts/options.awk out="pnglibconf.tmp" pnglibconf.pre 1>&2
- mv pnglibconf.tmp $@
+ pngusr.dfa $(DFA_XTRA) >&2
+ $(AWK) -f scripts/options.awk out=pnglibconf.tmp pnglibconf.pre >&2
+ $(MV_F) pnglibconf.tmp $@
libpng.a: $(OBJS)
- $(AR_RC) $@ $(OBJS)
+ $(AR_RC) $@ $(OBJS)
$(RANLIB) $@
pngtest: pngtest.o libpng.a
- $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
+ $(LD) $(LDFLAGS) -o $@ pngtest.o libpng.a $(LIBS)
test: pngtest
./pngtest
@@ -106,29 +110,25 @@
chmod 644 $(DESTDIR)$(LIBPATH)/libpng.a
clean:
- $(RM_F) *.o libpng.a pngtest pngout.png pnglibconf.h pnglibconf.c \
- pnglibconf.out
+ $(RM_F) *.o libpng.a pngtest pngout.png pnglibconf.h
+ $(RM_F) pnglibconf.c pnglibconf.dfn pnglibconf.out pnglibconf.pre
-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO
-writelock:
- chmod a-w *.[ch35] $(DOCS) scripts/*
-
# DO NOT DELETE THIS LINE -- make depend depends on it.
-png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngrtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngrutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngtrans.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwrite.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngtest.o: png.h pngconf.h pnglibconf.h
+pngtest.o: png.h pngconf.h pnglibconf.h
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.sunos
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.sunos 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.sunos 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,4 +1,5 @@
# makefile for libpng
+# Copyright (C) 2020-2022 Cosmin Truta
# Copyright (C) 2002, 2006, 2014 Glenn Randers-Pehrson
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
#
@@ -27,21 +28,16 @@
ZLIBLIB=../zlib
ZLIBINC=../zlib
-
-WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow -Wconversion \
- -Wmissing-declarations -Wtraditional -Wcast-align \
- -Wstrict-prototypes -Wmissing-prototypes
-
CC=gcc
AR_RC=ar rc
+RANLIB=ranlib
MKDIR_P=mkdir -p
LN_SF=ln -f -s
-RANLIB=ranlib
CP=cp
RM_F=/bin/rm -f
CPPFLAGS=-I$(ZLIBINC) # -DPNG_DEBUG=5
-CFLAGS=-O # $(WARNMORE)
+CFLAGS=-O
LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
# Pre-built configuration
@@ -48,9 +44,9 @@
# See scripts/pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
- pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
- pngwtran.o pngmem.o pngerror.o pngpread.o
+OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \
+ pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o \
+ pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o
.c.o:
$(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
@@ -61,7 +57,7 @@
$(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng.a: $(OBJS)
- $(AR_RC) $@ $(OBJS)
+ $(AR_RC) $@ $(OBJS)
$(RANLIB) $@
pngtest: pngtest.o libpng.a
@@ -90,26 +86,22 @@
clean:
$(RM_F) *.o libpng.a pngtest pngout.png pnglibconf.h
-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO
-writelock:
- chmod a-w *.[ch35] $(DOCS) scripts/*
-
# DO NOT DELETE THIS LINE -- make depend depends on it.
-png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngrtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngrutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngtrans.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwrite.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
pngwutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
-pngtest.o: png.h pngconf.h pnglibconf.h
+pngtest.o: png.h pngconf.h pnglibconf.h
Added: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.vcwin-arm64
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.vcwin-arm64 (rev 0)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.vcwin-arm64 2022-11-14 21:05:34 UTC (rev 884)
@@ -0,0 +1,123 @@
+# makefile for libpng on win-arm64
+# Copyright (C) 2021 Gabor Kertesz
+# Copyright (C) 1998 Tim Wegner
+# Copyright (C) 2006,2009,2011,2014 Glenn Randers-Pehrson
+#
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
+#
+# Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib
+# To use, do "nmake /f scripts\makefile.vcwin-arm64"
+
+# -------- Microsoft Visual C++ 2.0 and later --------
+
+# Compiler, linker, librarian and other tools
+CC = cl
+LD = link
+AR = lib
+CPPFLAGS = -I..\zlib
+CFLAGS = -nologo -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -DPNG_ARM_NEON_OPT=1 -MD -O2 -W3
+LDFLAGS = -nologo
+ARFLAGS = -nologo
+CP = copy
+RM = del
+
+# Uncomment next to put error messages in a file
+#ERRFILE= >> pngerrs.log
+
+# Pre-built configuration
+# See scripts\pnglibconf.mak for more options
+PNGLIBCONF_H_PREBUILT = scripts\pnglibconf.h.prebuilt
+
+# File extensions
+O=.obj
+
+# File lists
+OBJS1 = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O)
+OBJS2 = pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) pngset$(O)
+OBJS3 = pngtrans$(O) pngwio$(O) pngwrite$(O) pngwtran$(O) pngwutil$(O)
+OBJS4 = arm_init$(O) filter_neon_intrinsics$(O) palette_neon_intrinsics$(O)
+OBJS = $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4)
+
+# Targets
+all: libpng.lib
+
+pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
+ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
+
+png$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
+
+pngerror$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
+
+pngget$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
+
+pngmem$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
+
+pngpread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
+
+pngread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
+
+pngrio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
+
+pngrtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
+
+pngrutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
+
+pngset$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
+
+pngtrans$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
+
+pngwio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
+
+pngwrite$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
+
+pngwtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
+
+pngwutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
+
+arm_init$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) arm\$*.c $(ERRFILE)
+
+filter_neon_intrinsics$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) arm\$*.c $(ERRFILE)
+
+palette_neon_intrinsics$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) arm\$*.c $(ERRFILE)
+
+libpng.lib: $(OBJS)
+ -$(RM) $@
+ $(AR) $(ARFLAGS) -out:$@ $(OBJS) $(ERRFILE)
+
+pngtest.exe: pngtest$(O) libpng.lib
+ $(LD) $(LDFLAGS) -out:$@ pngtest$(O) libpng.lib ..\zlib\zlib.lib $(ERRFILE)
+
+pngtest$(O): png.h pngconf.h pnglibconf.h
+ $(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
+
+test: pngtest.exe
+ pngtest.exe
+
+clean:
+ -$(RM) *$(O)
+ -$(RM) libpng.lib
+ -$(RM) pnglibconf.h
+ -$(RM) pngtest.exe
+ -$(RM) pngout.png
+
+# End of makefile for libpng
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.vcwin32
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.vcwin32 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/makefile.vcwin32 2022-11-14 21:05:34 UTC (rev 884)
@@ -22,6 +22,9 @@
CP = copy
RM = del
+# Uncomment next to put error messages in a file
+#ERRFILE= >> pngerrs.log
+
# Pre-built configuration
# See scripts\pnglibconf.mak for more options
PNGLIBCONF_H_PREBUILT = scripts\pnglibconf.h.prebuilt
@@ -29,10 +32,7 @@
# File extensions
O=.obj
-#uncomment next to put error messages in a file
-#ERRFILE= >> pngerrs.log
-
-# Variables
+# File lists
OBJS1 = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O)
OBJS2 = pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) pngset$(O)
OBJS3 = pngtrans$(O) pngwio$(O) pngwrite$(O) pngwtran$(O) pngwutil$(O)
@@ -47,37 +47,37 @@
png$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
-pngset$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngerror$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
pngget$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
-pngread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngmem$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
pngpread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
-pngrtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
-pngrutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngrio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
-pngerror$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngrtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
-pngmem$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngrutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
-pngrio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngset$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
-pngwio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngtrans$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
-pngtrans$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
+pngwio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
pngwrite$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h
@@ -93,14 +93,14 @@
-$(RM) $@
$(AR) $(ARFLAGS) -out:$@ $(OBJS) $(ERRFILE)
+pngtest.exe: pngtest$(O) libpng.lib
+ $(LD) $(LDFLAGS) -out:$@ pngtest$(O) libpng.lib ..\zlib\zlib.lib $(ERRFILE)
+
pngtest$(O): png.h pngconf.h pnglibconf.h
$(CC) -c $(CPPFLAGS) $(CFLAGS) $*.c $(ERRFILE)
-pngtest.exe: pngtest$(O) libpng.lib
- $(LD) $(LDFLAGS) -out:$@ pngtest$(O) libpng.lib ..\zlib\zlib.lib $(ERRFILE)
-
test: pngtest.exe
- pngtest
+ pngtest.exe
clean:
-$(RM) *$(O)
@@ -110,4 +110,3 @@
-$(RM) pngout.png
# End of makefile for libpng
-
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/pnglibconf.dfa
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/pnglibconf.dfa 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/pnglibconf.dfa 2022-11-14 21:05:34 UTC (rev 884)
@@ -8,7 +8,7 @@
com
version
com
-com Copyright (c) 2018-2019 Cosmin Truta
+com Copyright (c) 2018-2022 Cosmin Truta
com Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
com
com This code is released under the libpng license.
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/pnglibconf.h.prebuilt
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/pnglibconf.h.prebuilt 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/pnglibconf.h.prebuilt 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,8 +1,8 @@
/* pnglibconf.h - library build configuration */
-/* libpng version 1.6.37 */
+/* libpng version 1.6.38 */
-/* Copyright (c) 2018-2019 Cosmin Truta */
+/* Copyright (c) 2018-2022 Cosmin Truta */
/* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson */
/* This code is released under the libpng license. */
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/pnglibconf.mak
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/pnglibconf.mak 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/pnglibconf.mak 2022-11-14 21:05:34 UTC (rev 884)
@@ -11,12 +11,12 @@
AWK = mawk
AWK = nawk
AWK = one-true-awk
-AWK = awk # Crashes on SunOS 5.10 - use 'nawk'
-CPP = $(CC) -E # On SUN OS 5.10 if this causes problems use /lib/cpp
+AWK = awk # This fails on SunOS 5.10; use 'nawk'
+CPP = $(CC) -E # If this fails on SunOS 5.10, use '/lib/cpp'
-MOVE = mv
+MOVE = mv -f
DELETE = rm -f
-ECHO = echo
+
DFA_XTRA = # Put your configuration file here, see scripts/pnglibconf.dfa. Eg:
# DFA_XTRA = pngusr.dfa
@@ -25,7 +25,7 @@
# as appropriate
DFNFLAGS = $(DEFS) $(CPPFLAGS) $(CFLAGS)
-# srcdir is a defacto standard for the location of the source
+# srcdir is a de-facto standard for the location of the source
srcdir = .
# The standard pnglibconf.h exists as scripts/pnglibconf.h.prebuilt,
@@ -32,20 +32,20 @@
# copy this if the following doesn't work.
pnglibconf.h: pnglibconf.dfn
$(DELETE) $@ pnglibconf.c pnglibconf.out pnglibconf.tmp
- $(ECHO) '#include "pnglibconf.dfn"' >pnglibconf.c
- $(ECHO) "If '$(CC) -E' crashes try /lib/cpp (e.g. CPP='/lib/cpp')" >&2
+ echo '#include "pnglibconf.dfn"' >pnglibconf.c
+ @echo "## If '$(CC) -E' fails, try /lib/cpp (e.g. CPP='/lib/cpp')" >&2
$(CPP) $(DFNFLAGS) pnglibconf.c >pnglibconf.out
- $(AWK) -f "$(srcdir)/scripts/dfn.awk" out="pnglibconf.tmp" pnglibconf.out 1>&2
+ $(AWK) -f $(srcdir)/scripts/dfn.awk out=pnglibconf.tmp pnglibconf.out >&2
$(MOVE) pnglibconf.tmp $@
pnglibconf.dfn: $(srcdir)/scripts/pnglibconf.dfa $(srcdir)/scripts/options.awk $(srcdir)/pngconf.h $(srcdir)/pngusr.dfa $(DFA_XTRA)
$(DELETE) $@ pnglibconf.pre pnglibconf.tmp
- $(ECHO) "Calling $(AWK) from scripts/pnglibconf.mak" >&2
- $(ECHO) "If 'awk' crashes try a better awk (e.g. AWK='nawk')" >&2
- $(AWK) -f $(srcdir)/scripts/options.awk out="pnglibconf.pre"\
+ @echo "## Calling $(AWK) from scripts/pnglibconf.mak" >&2
+ @echo "## If 'awk' fails, try a better awk (e.g. AWK='nawk')" >&2
+ $(AWK) -f $(srcdir)/scripts/options.awk out=pnglibconf.pre\
version=search $(srcdir)/pngconf.h $(srcdir)/scripts/pnglibconf.dfa\
- $(srcdir)/pngusr.dfa $(DFA_XTRA) 1>&2
- $(AWK) -f $(srcdir)/scripts/options.awk out="pnglibconf.tmp" pnglibconf.pre 1>&2
+ $(srcdir)/pngusr.dfa $(DFA_XTRA) >&2
+ $(AWK) -f $(srcdir)/scripts/options.awk out=pnglibconf.tmp pnglibconf.pre >&2
$(MOVE) pnglibconf.tmp $@
clean-pnglibconf:
Modified: branches/stable/source/src/libs/libpng/libpng-src/scripts/smakefile.ppc
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/scripts/smakefile.ppc 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/scripts/smakefile.ppc 2022-11-14 21:05:34 UTC (rev 884)
@@ -19,9 +19,9 @@
RM = delete quiet
MKDIR = makedir
-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o pngread.o \
- pngerror.o pngpread.o pngwrite.o pngrtran.o pngwtran.o pngrio.o \
- pngwio.o pngmem.o
+OBJS = png.o pngerror.o pngget.o pngmem.o pngpread.o \
+ pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o \
+ pngtrans.o pngwio.o pngwrite.o pngwtran.o pngwutil.o
all: $(LIBNAME) pngtest
Deleted: branches/stable/source/src/libs/libpng/libpng-src/tests/pngstest
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/tests/pngstest 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/tests/pngstest 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,54 +0,0 @@
-#!/bin/sh
-#
-# Usage:
-#
-# tests/pngstest gamma alpha
-#
-# Run ./pngstest on the PNG files in $srcdir/contrib/testpngs which have the
-# given gamma and opacity:
-#
-# gamma: one of; linear, 1.8, sRGB, none.
-# alpha: one of; opaque, tRNS, alpha, none. 'none' is equivalent to !alpha
-#
-# NOTE: the temporary files pngstest generates have the base name gamma-alpha to
-# avoid issues with make -j
-#
-gamma="$1"
-shift
-alpha="$1"
-shift
-args=
-LC_ALL="C" # fix glob sort order to ASCII:
-for f in "${srcdir}/contrib/testpngs/"*.png
-do
- g=
- case "$f" in
- *-linear[.-]*)
- test "$gamma" = "linear" && g="$f";;
-
- *-sRGB[.-]*)
- test "$gamma" = "sRGB" && g="$f";;
-
- *-1.8[.-]*)
- test "$gamma" = "1.8" && g="$f";;
-
- *)
- test "$gamma" = "none" && g="$f";;
- esac
-
- case "$g" in
- "")
- :;;
-
- *-alpha[-.]*)
- test "$alpha" = "alpha" && args="$args $g";;
-
- *-tRNS[-.]*)
- test "$alpha" = "tRNS" -o "$alpha" = "none" && args="$args $g";;
-
- *)
- test "$alpha" = "opaque" -o "$alpha" = "none" && args="$args $g";;
- esac
-done
-# This only works if the arguments don't contain spaces; they don't.
-exec ./pngstest --tmpfile "${gamma}-${alpha}-" --log ${1+"$@"} $args
Added: branches/stable/source/src/libs/libpng/libpng-src/tests/pngtest-all
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/tests/pngtest-all (rev 0)
+++ branches/stable/source/src/libs/libpng/libpng-src/tests/pngtest-all 2022-11-14 21:05:34 UTC (rev 884)
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# normal execution
+
+./pngtest --strict ${srcdir}/pngtest.png
+
+# various crashers
+# using --relaxed because some come from fuzzers that don't maintain CRC's
+
+./pngtest --relaxed ${srcdir}/contrib/testpngs/crashers/badcrc.png
+./pngtest --relaxed ${srcdir}/contrib/testpngs/crashers/badadler.png
+./pngtest --xfail ${srcdir}/contrib/testpngs/crashers/bad_iCCP.png
+./pngtest --xfail ${srcdir}/contrib/testpngs/crashers/empty_ancillary_chunks.png
+./pngtest --xfail ${srcdir}/contrib/testpngs/crashers/huge_*_chunk.png \
+ ${srcdir}/contrib/testpngs/crashers/huge_*safe_to_copy.png
+./pngtest --xfail ${srcdir}/contrib/testpngs/crashers/huge_IDAT.png
Deleted: branches/stable/source/src/libs/libpng/libpng-src/tests/pngtest-badpngs
===================================================================
--- branches/stable/source/src/libs/libpng/libpng-src/tests/pngtest-badpngs 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/libpng-src/tests/pngtest-badpngs 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# various crashers
-# using --relaxed because some come from fuzzers that don't maintain CRC's
-
-./pngtest --relaxed ${srcdir}/contrib/testpngs/crashers/badcrc.png
-./pngtest --relaxed ${srcdir}/contrib/testpngs/crashers/badadler.png
-./pngtest --xfail ${srcdir}/contrib/testpngs/crashers/bad_iCCP.png
-./pngtest --xfail ${srcdir}/contrib/testpngs/crashers/empty_ancillary_chunks.png
-./pngtest --xfail ${srcdir}/contrib/testpngs/crashers/huge_*_chunk.png \
- ${srcdir}/contrib/testpngs/crashers/huge_*safe_to_copy.png
-
-exec ./pngtest --xfail ${srcdir}/contrib/testpngs/crashers/huge_IDAT.png
Modified: branches/stable/source/src/libs/libpng/version.ac
===================================================================
--- branches/stable/source/src/libs/libpng/version.ac 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/libpng/version.ac 2022-11-14 21:05:34 UTC (rev 884)
@@ -8,4 +8,4 @@
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current libpng version
-m4_define([libpng_version], [1.6.37])
+m4_define([libpng_version], [1.6.38])
Modified: branches/stable/source/src/libs/zlib/README
===================================================================
--- branches/stable/source/src/libs/zlib/README 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/README 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,4 +1,4 @@
- Building zlib-1.2.12 as part of the TL tree
+ Building zlib-1.2.13 as part of the TL tree
==========================================
This directory libs/zlib/ uses a proxy Makefile.am to build the zlib library
@@ -15,4 +15,4 @@
=============================
2009-01-28 Peter Breitenlohner <peb at mppmu.mpg.de>
-2022-04-05 Akira Kakuto <kakuto at jcom.zaq.ne.jp>
+2022-10-15 Akira Kakuto <kakuto at jcom.zaq.ne.jp>
Modified: branches/stable/source/src/libs/zlib/TLpatches/ChangeLog
===================================================================
--- branches/stable/source/src/libs/zlib/TLpatches/ChangeLog 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/TLpatches/ChangeLog 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,3 +1,7 @@
+2022-10-15 Akira Kakuto <kakuto at jcom.zaq.ne.jp>
+
+ Import zlib-1.2.13.
+
2022-04-05 Akira Kakuto <kakuto at jcom.zaq.ne.jp>
Import zlib-1.2.12.
Modified: branches/stable/source/src/libs/zlib/TLpatches/TL-Changes
===================================================================
--- branches/stable/source/src/libs/zlib/TLpatches/TL-Changes 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/TLpatches/TL-Changes 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,5 +1,5 @@
-Changes applied to the zlib-1.2.12/ tree as obtained from:
- http://zlib.net/zlib-1.2.12.tar.xz
+Changes applied to the zlib-1.2.13/ tree as obtained from:
+ http://zlib.net/zlib-1.2.13.tar.xz
Removed:
Makefile
Modified: branches/stable/source/src/libs/zlib/configure
===================================================================
--- branches/stable/source/src/libs/zlib/configure 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/configure 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for zlib (TeX Live) 1.2.12.
+# Generated by GNU Autoconf 2.71 for zlib (TeX Live) 1.2.13.
#
# Report bugs to <tex-k at tug.org>.
#
@@ -610,8 +610,8 @@
# Identity of this package.
PACKAGE_NAME='zlib (TeX Live)'
PACKAGE_TARNAME='zlib--tex-live-'
-PACKAGE_VERSION='1.2.12'
-PACKAGE_STRING='zlib (TeX Live) 1.2.12'
+PACKAGE_VERSION='1.2.13'
+PACKAGE_STRING='zlib (TeX Live) 1.2.13'
PACKAGE_BUGREPORT='tex-k at tug.org'
PACKAGE_URL=''
@@ -1314,7 +1314,7 @@
# 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 zlib (TeX Live) 1.2.12 to adapt to many kinds of systems.
+\`configure' configures zlib (TeX Live) 1.2.13 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1381,7 +1381,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of zlib (TeX Live) 1.2.12:";;
+ short | recursive ) echo "Configuration of zlib (TeX Live) 1.2.13:";;
esac
cat <<\_ACEOF
@@ -1479,7 +1479,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-zlib (TeX Live) configure 1.2.12
+zlib (TeX Live) configure 1.2.13
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1635,7 +1635,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by zlib (TeX Live) $as_me 1.2.12, which was
+It was created by zlib (TeX Live) $as_me 1.2.13, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -4178,7 +4178,7 @@
# Define the identity of the package.
PACKAGE='zlib--tex-live-'
- VERSION='1.2.12'
+ VERSION='1.2.13'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -6472,7 +6472,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by zlib (TeX Live) $as_me 1.2.12, which was
+This file was extended by zlib (TeX Live) $as_me 1.2.13, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6540,7 +6540,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-zlib (TeX Live) config.status 1.2.12
+zlib (TeX Live) config.status 1.2.13
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
Modified: branches/stable/source/src/libs/zlib/version.ac
===================================================================
--- branches/stable/source/src/libs/zlib/version.ac 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/version.ac 2022-11-14 21:05:34 UTC (rev 884)
@@ -8,4 +8,4 @@
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current zlib version
-m4_define([zlib_version], [1.2.12])
+m4_define([zlib_version], [1.2.13])
Modified: branches/stable/source/src/libs/zlib/zlib-src/CMakeLists.txt
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/CMakeLists.txt 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/CMakeLists.txt 2022-11-14 21:05:34 UTC (rev 884)
@@ -3,11 +3,8 @@
project(zlib C)
-set(VERSION "1.2.12")
+set(VERSION "1.2.13")
-option(ASM686 "Enable building i686 assembly implementation")
-option(AMD64 "Enable building amd64 assembly implementation")
-
set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers")
@@ -129,39 +126,6 @@
)
endif()
-if(CMAKE_COMPILER_IS_GNUCC)
- if(ASM686)
- set(ZLIB_ASMS contrib/asm686/match.S)
- elseif (AMD64)
- set(ZLIB_ASMS contrib/amd64/amd64-match.S)
- endif ()
-
- if(ZLIB_ASMS)
- add_definitions(-DASMV)
- set_source_files_properties(${ZLIB_ASMS} PROPERTIES LANGUAGE C COMPILE_FLAGS -DNO_UNDERLINE)
- endif()
-endif()
-
-if(MSVC)
- if(ASM686)
- ENABLE_LANGUAGE(ASM_MASM)
- set(ZLIB_ASMS
- contrib/masmx86/inffas32.asm
- contrib/masmx86/match686.asm
- )
- elseif (AMD64)
- ENABLE_LANGUAGE(ASM_MASM)
- set(ZLIB_ASMS
- contrib/masmx64/gvmat64.asm
- contrib/masmx64/inffasx64.asm
- )
- endif()
-
- if(ZLIB_ASMS)
- add_definitions(-DASMV -DASMINF)
- endif()
-endif()
-
# parse the full version number from zlib.h and include in ZLIB_FULL_VERSION
file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents)
string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*"
@@ -183,8 +147,8 @@
set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
endif(MINGW)
-add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
-add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
set_target_properties(zlib PROPERTIES SOVERSION 1)
Modified: branches/stable/source/src/libs/zlib/zlib-src/ChangeLog
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/ChangeLog 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/ChangeLog 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,6 +1,18 @@
ChangeLog file for zlib
+Changes in 1.2.13 (13 Oct 2022)
+- Fix configure issue that discarded provided CC definition
+- Correct incorrect inputs provided to the CRC functions
+- Repair prototypes and exporting of new CRC functions
+- Fix inflateBack to detect invalid input with distances too far
+- Have infback() deliver all of the available output up to any error
+- Fix a bug when getting a gzip header extra field with inflate()
+- Fix bug in block type selection when Z_FIXED used
+- Tighten deflateBound bounds
+- Remove deleted assembler code references
+- Various portability and appearance improvements
+
Changes in 1.2.12 (27 Mar 2022)
- Cygwin does not have _wopen(), so do not create gzopen_w() there
- Permit a deflateParams() parameter change as soon as possible
@@ -159,7 +171,7 @@
- Fix types in contrib/minizip to match result of get_crc_table()
- Simplify contrib/vstudio/vc10 with 'd' suffix
- Add TOP support to win32/Makefile.msc
-- Suport i686 and amd64 assembler builds in CMakeLists.txt
+- Support i686 and amd64 assembler builds in CMakeLists.txt
- Fix typos in the use of _LARGEFILE64_SOURCE in zconf.h
- Add vc11 and vc12 build files to contrib/vstudio
- Add gzvprintf() as an undocumented function in zlib
@@ -359,7 +371,7 @@
- Use u4 type for crc_table to avoid conversion warnings
- Apply casts in zlib.h to avoid conversion warnings
- Add OF to prototypes for adler32_combine_ and crc32_combine_ [Miller]
-- Improve inflateSync() documentation to note indeterminancy
+- Improve inflateSync() documentation to note indeterminacy
- Add deflatePending() function to return the amount of pending output
- Correct the spelling of "specification" in FAQ [Randers-Pehrson]
- Add a check in configure for stdarg.h, use for gzprintf()
@@ -366,7 +378,7 @@
- Check that pointers fit in ints when gzprint() compiled old style
- Add dummy name before $(SHAREDLIBV) in Makefile [Bar-Lev, Bowler]
- Delete line in configure that adds -L. libz.a to LDFLAGS [Weigelt]
-- Add debug records in assmebler code [Londer]
+- Add debug records in assembler code [Londer]
- Update RFC references to use http://tools.ietf.org/html/... [Li]
- Add --archs option, use of libtool to configure for Mac OS X [Borstel]
@@ -1033,7 +1045,7 @@
- Include additional header file on VMS for off_t typedef
- Try to use _vsnprintf where it supplants vsprintf [Vollant]
- Add some casts in inffast.c
-- Enchance comments in zlib.h on what happens if gzprintf() tries to
+- Enhance comments in zlib.h on what happens if gzprintf() tries to
write more than 4095 bytes before compression
- Remove unused state from inflateBackEnd()
- Remove exit(0) from minigzip.c, example.c
@@ -1211,7 +1223,7 @@
- Avoid gcc 2.8.0 comparison bug a little differently than zlib 1.0.8
- in inftrees.c, avoid cc -O bug on HP (Farshid Elahi)
- in zconf.h move the ZLIB_DLL stuff earlier to avoid problems with
- the declaration of FAR (Gilles VOllant)
+ the declaration of FAR (Gilles Vollant)
- install libz.so* with mode 755 (executable) instead of 644 (Marc Lehmann)
- read_buf buf parameter of type Bytef* instead of charf*
- zmemcpy parameters are of type Bytef*, not charf* (Joseph Strout)
@@ -1567,7 +1579,7 @@
- renamed deflateOptions as deflateInit2, call one or the other but not both
- added the method parameter for deflateInit2
- added inflateInit2
-- simplied considerably deflateInit and inflateInit by not supporting
+- simplified considerably deflateInit and inflateInit by not supporting
user-provided history buffer. This is supported only in deflateInit2
and inflateInit2
Added: branches/stable/source/src/libs/zlib/zlib-src/LICENSE
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/LICENSE (rev 0)
+++ branches/stable/source/src/libs/zlib/zlib-src/LICENSE 2022-11-14 21:05:34 UTC (rev 884)
@@ -0,0 +1,22 @@
+Copyright notice:
+
+ (C) 1995-2022 Jean-loup Gailly and Mark Adler
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Jean-loup Gailly Mark Adler
+ jloup at gzip.org madler at alumni.caltech.edu
Modified: branches/stable/source/src/libs/zlib/zlib-src/Makefile.in
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/Makefile.in 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/Makefile.in 2022-11-14 21:05:34 UTC (rev 884)
@@ -7,10 +7,6 @@
# Normally configure builds both a static and a shared library.
# If you want to build just a static library, use: ./configure --static
-# To use the asm code, type:
-# cp contrib/asm?86/match.S ./match.S
-# make LOC=-DASMV OBJA=match.o
-
# To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type:
# make install
# To install in $HOME instead of /usr/local, use:
@@ -26,13 +22,13 @@
SFLAGS=-O
LDFLAGS=
-TEST_LDFLAGS=-L. libz.a
+TEST_LDFLAGS=$(LDFLAGS) -L. libz.a
LDSHARED=$(CC)
CPP=$(CC) -E
STATICLIB=libz.a
SHAREDLIB=libz.so
-SHAREDLIBV=libz.so.1.2.12
+SHAREDLIBV=libz.so.1.2.13
SHAREDLIBM=libz.so.1
LIBS=$(STATICLIB) $(SHAREDLIBV)
@@ -87,7 +83,7 @@
teststatic: static
@TMPST=tmpst_$$; \
- if echo hello world | ./minigzip | ./minigzip -d && ./example $$TMPST ; then \
+ if echo hello world | ${QEMU_RUN} ./minigzip | ${QEMU_RUN} ./minigzip -d && ${QEMU_RUN} ./example $$TMPST ; then \
echo ' *** zlib test OK ***'; \
else \
echo ' *** zlib test FAILED ***'; false; \
@@ -100,7 +96,7 @@
DYLD_LIBRARY_PATH=`pwd`:$(DYLD_LIBRARY_PATH) ; export DYLD_LIBRARY_PATH; \
SHLIB_PATH=`pwd`:$(SHLIB_PATH) ; export SHLIB_PATH; \
TMPSH=tmpsh_$$; \
- if echo hello world | ./minigzipsh | ./minigzipsh -d && ./examplesh $$TMPSH; then \
+ if echo hello world | ${QEMU_RUN} ./minigzipsh | ${QEMU_RUN} ./minigzipsh -d && ${QEMU_RUN} ./examplesh $$TMPSH; then \
echo ' *** zlib shared test OK ***'; \
else \
echo ' *** zlib shared test FAILED ***'; false; \
@@ -109,7 +105,7 @@
test64: all64
@TMP64=tmp64_$$; \
- if echo hello world | ./minigzip64 | ./minigzip64 -d && ./example64 $$TMP64; then \
+ if echo hello world | ${QEMU_RUN} ./minigzip64 | ${QEMU_RUN} ./minigzip64 -d && ${QEMU_RUN} ./example64 $$TMP64; then \
echo ' *** zlib 64-bit test OK ***'; \
else \
echo ' *** zlib 64-bit test FAILED ***'; false; \
@@ -124,7 +120,7 @@
cover: infcover
rm -f *.gcda
- ./infcover
+ ${QEMU_RUN} ./infcover
gcov inf*.c
libz.a: $(OBJS)
@@ -292,10 +288,10 @@
$(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS)
examplesh$(EXE): example.o $(SHAREDLIBV)
- $(CC) $(CFLAGS) -o $@ example.o -L. $(SHAREDLIBV)
+ $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) -L. $(SHAREDLIBV)
minigzipsh$(EXE): minigzip.o $(SHAREDLIBV)
- $(CC) $(CFLAGS) -o $@ minigzip.o -L. $(SHAREDLIBV)
+ $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) -L. $(SHAREDLIBV)
example64$(EXE): example64.o $(STATICLIB)
$(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS)
Modified: branches/stable/source/src/libs/zlib/zlib-src/README
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/README 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/README 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,6 +1,6 @@
ZLIB DATA COMPRESSION LIBRARY
-zlib 1.2.12 is a general purpose data compression library. All the code is
+zlib 1.2.13 is a general purpose data compression library. All the code is
thread safe. The data format used by the zlib library is described by RFCs
(Request for Comments) 1950 to 1952 in the files
http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
@@ -31,7 +31,7 @@
issue of Dr. Dobb's Journal; a copy of the article is available at
http://marknelson.us/1997/01/01/zlib-engine/ .
-The changes made in version 1.2.12 are documented in the file ChangeLog.
+The changes made in version 1.2.13 are documented in the file ChangeLog.
Unsupported third party contributions are provided in directory contrib/ .
Modified: branches/stable/source/src/libs/zlib/zlib-src/compress.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/compress.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/compress.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -19,7 +19,7 @@
memory, Z_BUF_ERROR if there was not enough room in the output buffer,
Z_STREAM_ERROR if the level parameter is invalid.
*/
-int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
+int ZEXPORT compress2(dest, destLen, source, sourceLen, level)
Bytef *dest;
uLongf *destLen;
const Bytef *source;
@@ -65,7 +65,7 @@
/* ===========================================================================
*/
-int ZEXPORT compress (dest, destLen, source, sourceLen)
+int ZEXPORT compress(dest, destLen, source, sourceLen)
Bytef *dest;
uLongf *destLen;
const Bytef *source;
@@ -78,7 +78,7 @@
If the default memLevel or windowBits for deflateInit() is changed, then
this function needs to be updated.
*/
-uLong ZEXPORT compressBound (sourceLen)
+uLong ZEXPORT compressBound(sourceLen)
uLong sourceLen;
{
return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
Modified: branches/stable/source/src/libs/zlib/zlib-src/configure
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/configure 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/configure 2022-11-14 21:05:34 UTC (rev 884)
@@ -32,8 +32,11 @@
# set command prefix for cross-compilation
if [ -n "${CHOST}" ]; then
- uname="`echo "${CHOST}" | sed -e 's/^[^-]*-\([^-]*\)$/\1/' -e 's/^[^-]*-[^-]*-\([^-]*\)$/\1/' -e 's/^[^-]*-[^-]*-\([^-]*\)-.*$/\1/'`"
+ uname=${CHOST}
+ mname=${CHOST}
CROSS_PREFIX="${CHOST}-"
+else
+ mname=`(uname -a || echo unknown) 2>/dev/null`
fi
# destination name for static library
@@ -174,9 +177,10 @@
else
cc=${CROSS_PREFIX}cc
fi
+else
+ cc=${CC}
fi
-cflags=${CFLAGS-"-O3"}
-# to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
+
case "$cc" in
*gcc*) gcc=1 ;;
*clang*) gcc=1 ;;
@@ -202,13 +206,13 @@
fi
if test "$warn" -eq 1; then
if test "$zconst" -eq 1; then
- CFLAGS="${CFLAGS} -Wall -Wextra -Wcast-qual -pedantic -DZLIB_CONST"
+ CFLAGS="${CFLAGS} -Wall -Wextra -Wcast-qual -DZLIB_CONST"
else
- CFLAGS="${CFLAGS} -Wall -Wextra -pedantic"
+ CFLAGS="${CFLAGS} -Wall -Wextra"
fi
fi
if test $sanitize -eq 1; then
- CFLAGS="${CFLAGS} -fsanitize=address"
+ CFLAGS="${CFLAGS} -g -fsanitize=address"
fi
if test $debug -eq 1; then
CFLAGS="${CFLAGS} -DZLIB_DEBUG"
@@ -218,47 +222,52 @@
uname=`(uname -s || echo unknown) 2>/dev/null`
fi
case "$uname" in
- Linux* | linux* | GNU | GNU/* | solaris*)
+ Linux* | linux* | *-linux* | GNU | GNU/* | solaris*)
+ case "$mname" in
+ *sparc*)
+ LDFLAGS="${LDFLAGS} -Wl,--no-warn-rwx-segments" ;;
+ esac
LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"} ;;
*BSD | *bsd* | DragonFly)
LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"}
LDCONFIG="ldconfig -m" ;;
- CYGWIN* | Cygwin* | cygwin* | OS/2*)
+ CYGWIN* | Cygwin* | cygwin* | *-cygwin* | OS/2*)
EXE='.exe' ;;
- MINGW* | mingw*)
-# temporary bypass
+ MINGW* | mingw* | *-mingw*)
rm -f $test.[co] $test $test$shared_ext
- echo "Please use win32/Makefile.gcc instead." | tee -a configure.log
- leave 1
+ echo "If this doesn't work for you, try win32/Makefile.gcc." | tee -a configure.log
LDSHARED=${LDSHARED-"$cc -shared"}
LDSHAREDLIBC=""
EXE='.exe' ;;
- QNX*) # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4
- # (alain.bonnefoy at icbt.com)
- LDSHARED=${LDSHARED-"$cc -shared -Wl,-hlibz.so.1"} ;;
+ QNX*) # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4
+ # (alain.bonnefoy at icbt.com)
+ LDSHARED=${LDSHARED-"$cc -shared -Wl,-hlibz.so.1"} ;;
HP-UX*)
- LDSHARED=${LDSHARED-"$cc -shared $SFLAGS"}
- case `(uname -m || echo unknown) 2>/dev/null` in
- ia64)
- shared_ext='.so'
- SHAREDLIB='libz.so' ;;
- *)
- shared_ext='.sl'
- SHAREDLIB='libz.sl' ;;
- esac ;;
- Darwin* | darwin*)
- shared_ext='.dylib'
- SHAREDLIB=libz$shared_ext
- SHAREDLIBV=libz.$VER$shared_ext
- SHAREDLIBM=libz.$VER1$shared_ext
- LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"}
- if libtool -V 2>&1 | grep Apple > /dev/null; then
- AR="libtool"
- else
- AR="/usr/bin/libtool"
- fi
- ARFLAGS="-o" ;;
- *) LDSHARED=${LDSHARED-"$cc -shared"} ;;
+ LDSHARED=${LDSHARED-"$cc -shared $SFLAGS"}
+ case `(uname -m || echo unknown) 2>/dev/null` in
+ ia64)
+ shared_ext='.so'
+ SHAREDLIB='libz.so' ;;
+ *)
+ shared_ext='.sl'
+ SHAREDLIB='libz.sl' ;;
+ esac ;;
+ AIX*)
+ LDFLAGS="${LDFLAGS} -Wl,-brtl" ;;
+ Darwin* | darwin* | *-darwin*)
+ shared_ext='.dylib'
+ SHAREDLIB=libz$shared_ext
+ SHAREDLIBV=libz.$VER$shared_ext
+ SHAREDLIBM=libz.$VER1$shared_ext
+ LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"}
+ if libtool -V 2>&1 | grep Apple > /dev/null; then
+ AR="libtool"
+ else
+ AR="/usr/bin/libtool"
+ fi
+ ARFLAGS="-o" ;;
+ *)
+ LDSHARED=${LDSHARED-"$cc -shared"} ;;
esac
else
# find system name and corresponding cc options
@@ -450,20 +459,6 @@
TEST="all teststatic testshared"
fi
-# check for underscores in external names for use by assembler code
-CPP=${CPP-"$CC -E"}
-case $CFLAGS in
- *ASMV*)
- echo >> configure.log
- show "$NM $test.o | grep _hello"
- if test "`$NM $test.o | grep _hello | tee -a configure.log`" = ""; then
- CPP="$CPP -DNO_UNDERLINE"
- echo Checking for underline in external names... No. | tee -a configure.log
- else
- echo Checking for underline in external names... Yes. | tee -a configure.log
- fi ;;
-esac
-
echo >> configure.log
# check for size_t
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/README.contrib
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/README.contrib 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/README.contrib 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,4 +1,4 @@
-All files under this contrib directory are UNSUPPORTED. There were
+All files under this contrib directory are UNSUPPORTED. They were
provided by users of zlib and were not tested by the authors of zlib.
Use at your own risk. Please contact the authors of the contributions
for help about these, not the zlib authors. Thanks.
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/delphi/ZLib.pas
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/delphi/ZLib.pas 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/delphi/ZLib.pas 2022-11-14 21:05:34 UTC (rev 884)
@@ -152,7 +152,7 @@
const OutBuf: Pointer; BufSize: Integer);
const
- zlib_version = '1.2.12';
+ zlib_version = '1.2.13';
type
EZlibError = class(Exception);
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/dotzlib/DotZLib/DotZLib.csproj
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/dotzlib/DotZLib/DotZLib.csproj 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/dotzlib/DotZLib/DotZLib.csproj 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,141 +1,141 @@
-<VisualStudioProject>
- <CSHARP
- ProjectType = "Local"
- ProductVersion = "7.10.3077"
- SchemaVersion = "2.0"
- ProjectGuid = "{BB1EE0B1-1808-46CB-B786-949D91117FC5}"
- >
- <Build>
- <Settings
- ApplicationIcon = ""
- AssemblyKeyContainerName = ""
- AssemblyName = "DotZLib"
- AssemblyOriginatorKeyFile = ""
- DefaultClientScript = "JScript"
- DefaultHTMLPageLayout = "Grid"
- DefaultTargetSchema = "IE50"
- DelaySign = "false"
- OutputType = "Library"
- PreBuildEvent = ""
- PostBuildEvent = ""
- RootNamespace = "DotZLib"
- RunPostBuildEvent = "OnBuildSuccess"
- StartupObject = ""
- >
- <Config
- Name = "Debug"
- AllowUnsafeBlocks = "false"
- BaseAddress = "285212672"
- CheckForOverflowUnderflow = "false"
- ConfigurationOverrideFile = ""
- DefineConstants = "DEBUG;TRACE"
- DocumentationFile = "docs\DotZLib.xml"
- DebugSymbols = "true"
- FileAlignment = "4096"
- IncrementalBuild = "false"
- NoStdLib = "false"
- NoWarn = "1591"
- Optimize = "false"
- OutputPath = "bin\Debug\"
- RegisterForComInterop = "false"
- RemoveIntegerChecks = "false"
- TreatWarningsAsErrors = "false"
- WarningLevel = "4"
- />
- <Config
- Name = "Release"
- AllowUnsafeBlocks = "false"
- BaseAddress = "285212672"
- CheckForOverflowUnderflow = "false"
- ConfigurationOverrideFile = ""
- DefineConstants = "TRACE"
- DocumentationFile = "docs\DotZLib.xml"
- DebugSymbols = "false"
- FileAlignment = "4096"
- IncrementalBuild = "false"
- NoStdLib = "false"
- NoWarn = ""
- Optimize = "true"
- OutputPath = "bin\Release\"
- RegisterForComInterop = "false"
- RemoveIntegerChecks = "false"
- TreatWarningsAsErrors = "false"
- WarningLevel = "4"
- />
- </Settings>
- <References>
- <Reference
- Name = "System"
- AssemblyName = "System"
- HintPath = "C:\WINNT\Microsoft.NET\Framework\v1.1.4322\System.dll"
- />
- <Reference
- Name = "System.Data"
- AssemblyName = "System.Data"
- HintPath = "C:\WINNT\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
- />
- <Reference
- Name = "System.XML"
- AssemblyName = "System.Xml"
- HintPath = "C:\WINNT\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
- />
- <Reference
- Name = "nunit.framework"
- AssemblyName = "nunit.framework"
- HintPath = "E:\apps\NUnit V2.1\\bin\nunit.framework.dll"
- AssemblyFolderKey = "hklm\dn\nunit.framework"
- />
- </References>
- </Build>
- <Files>
- <Include>
- <File
- RelPath = "AssemblyInfo.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "ChecksumImpl.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "CircularBuffer.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "CodecBase.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "Deflater.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "DotZLib.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "GZipStream.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "Inflater.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "UnitTests.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- </Include>
- </Files>
- </CSHARP>
-</VisualStudioProject>
-
+<VisualStudioProject>
+ <CSHARP
+ ProjectType = "Local"
+ ProductVersion = "7.10.3077"
+ SchemaVersion = "2.0"
+ ProjectGuid = "{BB1EE0B1-1808-46CB-B786-949D91117FC5}"
+ >
+ <Build>
+ <Settings
+ ApplicationIcon = ""
+ AssemblyKeyContainerName = ""
+ AssemblyName = "DotZLib"
+ AssemblyOriginatorKeyFile = ""
+ DefaultClientScript = "JScript"
+ DefaultHTMLPageLayout = "Grid"
+ DefaultTargetSchema = "IE50"
+ DelaySign = "false"
+ OutputType = "Library"
+ PreBuildEvent = ""
+ PostBuildEvent = ""
+ RootNamespace = "DotZLib"
+ RunPostBuildEvent = "OnBuildSuccess"
+ StartupObject = ""
+ >
+ <Config
+ Name = "Debug"
+ AllowUnsafeBlocks = "false"
+ BaseAddress = "285212672"
+ CheckForOverflowUnderflow = "false"
+ ConfigurationOverrideFile = ""
+ DefineConstants = "DEBUG;TRACE"
+ DocumentationFile = "docs\DotZLib.xml"
+ DebugSymbols = "true"
+ FileAlignment = "4096"
+ IncrementalBuild = "false"
+ NoStdLib = "false"
+ NoWarn = "1591"
+ Optimize = "false"
+ OutputPath = "bin\Debug\"
+ RegisterForComInterop = "false"
+ RemoveIntegerChecks = "false"
+ TreatWarningsAsErrors = "false"
+ WarningLevel = "4"
+ />
+ <Config
+ Name = "Release"
+ AllowUnsafeBlocks = "false"
+ BaseAddress = "285212672"
+ CheckForOverflowUnderflow = "false"
+ ConfigurationOverrideFile = ""
+ DefineConstants = "TRACE"
+ DocumentationFile = "docs\DotZLib.xml"
+ DebugSymbols = "false"
+ FileAlignment = "4096"
+ IncrementalBuild = "false"
+ NoStdLib = "false"
+ NoWarn = ""
+ Optimize = "true"
+ OutputPath = "bin\Release\"
+ RegisterForComInterop = "false"
+ RemoveIntegerChecks = "false"
+ TreatWarningsAsErrors = "false"
+ WarningLevel = "4"
+ />
+ </Settings>
+ <References>
+ <Reference
+ Name = "System"
+ AssemblyName = "System"
+ HintPath = "C:\WINNT\Microsoft.NET\Framework\v1.1.4322\System.dll"
+ />
+ <Reference
+ Name = "System.Data"
+ AssemblyName = "System.Data"
+ HintPath = "C:\WINNT\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
+ />
+ <Reference
+ Name = "System.XML"
+ AssemblyName = "System.Xml"
+ HintPath = "C:\WINNT\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
+ />
+ <Reference
+ Name = "nunit.framework"
+ AssemblyName = "nunit.framework"
+ HintPath = "E:\apps\NUnit V2.1\\bin\nunit.framework.dll"
+ AssemblyFolderKey = "hklm\dn\nunit.framework"
+ />
+ </References>
+ </Build>
+ <Files>
+ <Include>
+ <File
+ RelPath = "AssemblyInfo.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "ChecksumImpl.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "CircularBuffer.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "CodecBase.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "Deflater.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "DotZLib.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "GZipStream.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "Inflater.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "UnitTests.cs"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ </Include>
+ </Files>
+ </CSHARP>
+</VisualStudioProject>
+
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/dotzlib/DotZLib/UnitTests.cs
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/dotzlib/DotZLib/UnitTests.cs 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/dotzlib/DotZLib/UnitTests.cs 2022-11-14 21:05:34 UTC (rev 884)
@@ -156,7 +156,7 @@
public void Info_Version()
{
Info info = new Info();
- Assert.AreEqual("1.2.12", Info.Version);
+ Assert.AreEqual("1.2.13", Info.Version);
Assert.AreEqual(32, info.SizeOfUInt);
Assert.AreEqual(32, info.SizeOfULong);
Assert.AreEqual(32, info.SizeOfPointer);
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/dotzlib/DotZLib.build
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/dotzlib/DotZLib.build 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/dotzlib/DotZLib.build 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<project name="DotZLib" default="build" basedir="./DotZLib">
- <description>A .Net wrapper library around ZLib1.dll</description>
-
- <property name="nunit.location" value="c:/program files/NUnit V2.1/bin" />
- <property name="build.root" value="bin" />
-
- <property name="debug" value="true" />
- <property name="nunit" value="true" />
-
- <property name="build.folder" value="${build.root}/debug/" if="${debug}" />
- <property name="build.folder" value="${build.root}/release/" unless="${debug}" />
-
- <target name="clean" description="Remove all generated files">
- <delete dir="${build.root}" failonerror="false" />
- </target>
-
- <target name="build" description="compiles the source code">
-
- <mkdir dir="${build.folder}" />
- <csc target="library" output="${build.folder}DotZLib.dll" debug="${debug}">
- <references basedir="${nunit.location}">
- <includes if="${nunit}" name="nunit.framework.dll" />
- </references>
- <sources>
- <includes name="*.cs" />
- <excludes name="UnitTests.cs" unless="${nunit}" />
- </sources>
- <arg value="/d:nunit" if="${nunit}" />
- </csc>
- </target>
-
+<?xml version="1.0" encoding="utf-8" ?>
+<project name="DotZLib" default="build" basedir="./DotZLib">
+ <description>A .Net wrapper library around ZLib1.dll</description>
+
+ <property name="nunit.location" value="c:/program files/NUnit V2.1/bin" />
+ <property name="build.root" value="bin" />
+
+ <property name="debug" value="true" />
+ <property name="nunit" value="true" />
+
+ <property name="build.folder" value="${build.root}/debug/" if="${debug}" />
+ <property name="build.folder" value="${build.root}/release/" unless="${debug}" />
+
+ <target name="clean" description="Remove all generated files">
+ <delete dir="${build.root}" failonerror="false" />
+ </target>
+
+ <target name="build" description="compiles the source code">
+
+ <mkdir dir="${build.folder}" />
+ <csc target="library" output="${build.folder}DotZLib.dll" debug="${debug}">
+ <references basedir="${nunit.location}">
+ <includes if="${nunit}" name="nunit.framework.dll" />
+ </references>
+ <sources>
+ <includes name="*.cs" />
+ <excludes name="UnitTests.cs" unless="${nunit}" />
+ </sources>
+ <arg value="/d:nunit" if="${nunit}" />
+ </csc>
+ </target>
+
</project>
\ No newline at end of file
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/dotzlib/DotZLib.sln
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/dotzlib/DotZLib.sln 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/dotzlib/DotZLib.sln 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,21 +1,21 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotZLib", "DotZLib\DotZLib.csproj", "{BB1EE0B1-1808-46CB-B786-949D91117FC5}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Global
- GlobalSection(SolutionConfiguration) = preSolution
- Debug = Debug
- Release = Release
- EndGlobalSection
- GlobalSection(ProjectConfiguration) = postSolution
- {BB1EE0B1-1808-46CB-B786-949D91117FC5}.Debug.ActiveCfg = Debug|.NET
- {BB1EE0B1-1808-46CB-B786-949D91117FC5}.Debug.Build.0 = Debug|.NET
- {BB1EE0B1-1808-46CB-B786-949D91117FC5}.Release.ActiveCfg = Release|.NET
- {BB1EE0B1-1808-46CB-B786-949D91117FC5}.Release.Build.0 = Release|.NET
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- EndGlobalSection
- GlobalSection(ExtensibilityAddIns) = postSolution
- EndGlobalSection
-EndGlobal
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotZLib", "DotZLib\DotZLib.csproj", "{BB1EE0B1-1808-46CB-B786-949D91117FC5}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Global
+ GlobalSection(SolutionConfiguration) = preSolution
+ Debug = Debug
+ Release = Release
+ EndGlobalSection
+ GlobalSection(ProjectConfiguration) = postSolution
+ {BB1EE0B1-1808-46CB-B786-949D91117FC5}.Debug.ActiveCfg = Debug|.NET
+ {BB1EE0B1-1808-46CB-B786-949D91117FC5}.Debug.Build.0 = Debug|.NET
+ {BB1EE0B1-1808-46CB-B786-949D91117FC5}.Release.ActiveCfg = Release|.NET
+ {BB1EE0B1-1808-46CB-B786-949D91117FC5}.Release.Build.0 = Release|.NET
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ EndGlobalSection
+ GlobalSection(ExtensibilityAddIns) = postSolution
+ EndGlobalSection
+EndGlobal
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/infback9/inftree9.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/infback9/inftree9.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/infback9/inftree9.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -9,7 +9,7 @@
#define MAXBITS 15
const char inflate9_copyright[] =
- " inflate9 1.2.12 Copyright 1995-2022 Mark Adler ";
+ " inflate9 1.2.13 Copyright 1995-2022 Mark Adler ";
/*
If you use the zlib library in a product, an acknowledgment is welcome
in the documentation of your product. If for some reason you cannot
@@ -64,7 +64,7 @@
static const unsigned short lext[31] = { /* Length codes 257..285 extra */
128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,
- 133, 133, 133, 133, 144, 199, 202};
+ 133, 133, 133, 133, 144, 194, 65};
static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,
65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073,
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/infback9/inftree9.h
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/infback9/inftree9.h 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/infback9/inftree9.h 2022-11-14 21:05:34 UTC (rev 884)
@@ -38,7 +38,7 @@
/* Maximum size of the dynamic table. The maximum number of code structures is
1446, which is the sum of 852 for literal/length codes and 594 for distance
codes. These values were found by exhaustive searches using the program
- examples/enough.c found in the zlib distribtution. The arguments to that
+ examples/enough.c found in the zlib distribution. The arguments to that
program are the number of symbols, the initial root table size, and the
maximum bit length of a code. "enough 286 9 15" for literal/length codes
returns returns 852, and "enough 32 6 15" for distance codes returns 594.
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/configure.ac
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/configure.ac 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/configure.ac 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,7 +1,7 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-AC_INIT([minizip], [1.2.12], [bugzilla.redhat.com])
+AC_INIT([minizip], [1.2.13], [bugzilla.redhat.com])
AC_CONFIG_SRCDIR([minizip.c])
AM_INIT_AUTOMAKE([foreign])
LT_INIT
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/crypt.h
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/crypt.h 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/crypt.h 2022-11-14 21:05:34 UTC (rev 884)
@@ -85,7 +85,7 @@
#define RAND_HEAD_LEN 12
/* "last resort" source for second part of crypt seed pattern */
# ifndef ZCR_SEED2
-# define ZCR_SEED2 3141592654L /* use PI as default pattern */
+# define ZCR_SEED2 3141592654UL /* use PI as default pattern */
# endif
static unsigned crypthead(const char* passwd, /* password string */
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/ioapi.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/ioapi.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/ioapi.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -94,9 +94,9 @@
static voidpf ZCALLBACK fopen_file_func (voidpf opaque, const char* filename, int mode)
{
- (void)opaque;
FILE* file = NULL;
const char* mode_fopen = NULL;
+ (void)opaque;
if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
mode_fopen = "rb";
else
@@ -113,9 +113,9 @@
static voidpf ZCALLBACK fopen64_file_func (voidpf opaque, const void* filename, int mode)
{
- (void)opaque;
FILE* file = NULL;
const char* mode_fopen = NULL;
+ (void)opaque;
if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
mode_fopen = "rb";
else
@@ -133,8 +133,8 @@
static uLong ZCALLBACK fread_file_func (voidpf opaque, voidpf stream, void* buf, uLong size)
{
+ uLong ret;
(void)opaque;
- uLong ret;
ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
return ret;
}
@@ -141,8 +141,8 @@
static uLong ZCALLBACK fwrite_file_func (voidpf opaque, voidpf stream, const void* buf, uLong size)
{
+ uLong ret;
(void)opaque;
- uLong ret;
ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
return ret;
}
@@ -149,8 +149,8 @@
static long ZCALLBACK ftell_file_func (voidpf opaque, voidpf stream)
{
+ long ret;
(void)opaque;
- long ret;
ret = ftell((FILE *)stream);
return ret;
}
@@ -158,8 +158,8 @@
static ZPOS64_T ZCALLBACK ftell64_file_func (voidpf opaque, voidpf stream)
{
+ ZPOS64_T ret;
(void)opaque;
- ZPOS64_T ret;
ret = (ZPOS64_T)FTELLO_FUNC((FILE *)stream);
return ret;
}
@@ -166,9 +166,9 @@
static long ZCALLBACK fseek_file_func (voidpf opaque, voidpf stream, uLong offset, int origin)
{
- (void)opaque;
int fseek_origin=0;
long ret;
+ (void)opaque;
switch (origin)
{
case ZLIB_FILEFUNC_SEEK_CUR :
@@ -190,9 +190,9 @@
static long ZCALLBACK fseek64_file_func (voidpf opaque, voidpf stream, ZPOS64_T offset, int origin)
{
- (void)opaque;
int fseek_origin=0;
long ret;
+ (void)opaque;
switch (origin)
{
case ZLIB_FILEFUNC_SEEK_CUR :
@@ -208,7 +208,7 @@
}
ret = 0;
- if(FSEEKO_FUNC((FILE *)stream, (long)offset, fseek_origin) != 0)
+ if(FSEEKO_FUNC((FILE *)stream, (z_off_t)offset, fseek_origin) != 0)
ret = -1;
return ret;
@@ -217,8 +217,8 @@
static int ZCALLBACK fclose_file_func (voidpf opaque, voidpf stream)
{
+ int ret;
(void)opaque;
- int ret;
ret = fclose((FILE *)stream);
return ret;
}
@@ -225,8 +225,8 @@
static int ZCALLBACK ferror_file_func (voidpf opaque, voidpf stream)
{
+ int ret;
(void)opaque;
- int ret;
ret = ferror((FILE *)stream);
return ret;
}
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/ioapi.h
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/ioapi.h 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/ioapi.h 2022-11-14 21:05:34 UTC (rev 884)
@@ -50,7 +50,7 @@
#define ftello64 ftell
#define fseeko64 fseek
#else
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
#define fopen64 fopen
#define ftello64 ftello
#define fseeko64 fseeko
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/iowin32.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/iowin32.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/iowin32.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -28,6 +28,11 @@
// see Include/shared/winapifamily.h in the Windows Kit
#if defined(WINAPI_FAMILY_PARTITION) && (!(defined(IOWIN32_USING_WINRT_API)))
+
+#if !defined(WINAPI_FAMILY_ONE_PARTITION)
+#define WINAPI_FAMILY_ONE_PARTITION(PartitionSet, Partition) ((WINAPI_FAMILY & PartitionSet) == Partition)
+#endif
+
#if WINAPI_FAMILY_ONE_PARTITION(WINAPI_FAMILY, WINAPI_PARTITION_APP)
#define IOWIN32_USING_WINRT_API 1
#endif
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/miniunz.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/miniunz.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/miniunz.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -564,7 +564,7 @@
while ((*p)!='\0')
{
- char c=*(p++);;
+ char c=*(p++);
if ((c=='l') || (c=='L'))
opt_do_list = 1;
if ((c=='v') || (c=='V'))
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/minizip.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/minizip.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/minizip.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -190,7 +190,7 @@
FILE * fin = FOPEN_FUNC(filenameinzip,"rb");
unsigned long size_read = 0;
- unsigned long total_read = 0;
+ /* unsigned long total_read = 0; */
if (fin==NULL)
{
err = ZIP_ERRNO;
@@ -210,7 +210,7 @@
if (size_read>0)
calculate_crc = crc32_z(calculate_crc,buf,size_read);
- total_read += size_read;
+ /* total_read += size_read; */
} while ((err == ZIP_OK) && (size_read>0));
@@ -277,7 +277,7 @@
while ((*p)!='\0')
{
- char c=*(p++);;
+ char c=*(p++);
if ((c=='o') || (c=='O'))
opt_overwrite = 1;
if ((c=='a') || (c=='A'))
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/unzip.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/unzip.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/unzip.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -112,7 +112,7 @@
# define ALLOC(size) (malloc(size))
#endif
#ifndef TRYFREE
-# define TRYFREE(p) {if (p) free(p);}
+# define TRYFREE(p) { free(p);}
#endif
#define SIZECENTRALDIRITEM (0x2e)
@@ -1566,6 +1566,7 @@
pfile_in_zip_read_info->stream_initialised=Z_BZIP2ED;
else
{
+ TRYFREE(pfile_in_zip_read_info->read_buffer);
TRYFREE(pfile_in_zip_read_info);
return err;
}
@@ -1586,6 +1587,7 @@
pfile_in_zip_read_info->stream_initialised=Z_DEFLATED;
else
{
+ TRYFREE(pfile_in_zip_read_info->read_buffer);
TRYFREE(pfile_in_zip_read_info);
return err;
}
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/zip.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/zip.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/minizip/zip.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -1471,11 +1471,6 @@
{
uLong uTotalOutBefore = zi->ci.stream.total_out;
err=deflate(&zi->ci.stream, Z_NO_FLUSH);
- if(uTotalOutBefore > zi->ci.stream.total_out)
- {
- int bBreak = 0;
- bBreak++;
- }
zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
}
@@ -1959,7 +1954,7 @@
int retVal = ZIP_OK;
- if(pData == NULL || *dataLen < 4)
+ if(pData == NULL || dataLen == NULL || *dataLen < 4)
return ZIP_PARAMERROR;
pNewHeader = (char*)ALLOC((unsigned)*dataLen);
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/pascal/zlibpas.pas
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/pascal/zlibpas.pas 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/pascal/zlibpas.pas 2022-11-14 21:05:34 UTC (rev 884)
@@ -10,7 +10,7 @@
interface
const
- ZLIB_VERSION = '1.2.12';
+ ZLIB_VERSION = '1.2.13';
ZLIB_VERNUM = $12a0;
type
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/puff/README
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/puff/README 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/puff/README 2022-11-14 21:05:34 UTC (rev 884)
@@ -38,7 +38,7 @@
its entirety at source, to a sufficiently sized block of memory for the
decompressed data at dest. puff() is the only external symbol in puff.c The
only C library functions that puff.c needs are setjmp() and longjmp(), which
-are used to simplify error checking in the code to improve readabilty. puff.c
+are used to simplify error checking in the code to improve readability. puff.c
does no memory allocation, and uses less than 2K bytes off of the stack.
If destlen is not enough space for the uncompressed data, then inflate will
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/puff/puff.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/puff/puff.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/puff/puff.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -43,7 +43,7 @@
* - Use pointers instead of long to specify source and
* destination sizes to avoid arbitrary 4 GB limits
* 1.2 17 Mar 2002 - Add faster version of decode(), doubles speed (!),
- * but leave simple version for readabilty
+ * but leave simple version for readability
* - Make sure invalid distances detected if pointers
* are 16 bits
* - Fix fixed codes table error
@@ -624,7 +624,7 @@
* are themselves compressed using Huffman codes and run-length encoding. In
* the list of code lengths, a 0 symbol means no code, a 1..15 symbol means
* that length, and the symbols 16, 17, and 18 are run-length instructions.
- * Each of 16, 17, and 18 are follwed by extra bits to define the length of
+ * Each of 16, 17, and 18 are followed by extra bits to define the length of
* the run. 16 copies the last length 3 to 6 times. 17 represents 3 to 10
* zero lengths, and 18 represents 11 to 138 zero lengths. Unused symbols
* are common, hence the special coding for zero lengths.
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/puff/pufftest.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/puff/pufftest.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/puff/pufftest.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -143,7 +143,7 @@
len - sourcelen);
}
- /* if requested, inflate again and write decompressd data to stdout */
+ /* if requested, inflate again and write decompressed data to stdout */
if (put && ret == 0) {
if (fail)
destlen >>= 1;
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/readme.txt
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/readme.txt 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/readme.txt 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,4 +1,4 @@
-Building instructions for the DLL versions of Zlib 1.2.12
+Building instructions for the DLL versions of Zlib 1.2.13
========================================================
This directory contains projects that build zlib and minizip using
@@ -17,9 +17,6 @@
Build instructions for Visual Studio 2008 (32 bits or 64 bits)
--------------------------------------------------------------
- Decompress current zlib, including all contrib/* files
-- Compile assembly code (with Visual Studio Command Prompt) by running:
- bld_ml64.bat (in contrib\masmx64)
- bld_ml32.bat (in contrib\masmx86)
- Open contrib\vstudio\vc9\zlibvc.sln with Microsoft Visual C++ 2008
- Or run: vcbuild /rebuild contrib\vstudio\vc9\zlibvc.sln "Release|Win32"
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/miniunz.vcxproj.filters
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/miniunz.vcxproj.filters 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/miniunz.vcxproj.filters 2022-11-14 21:05:34 UTC (rev 884)
@@ -3,7 +3,7 @@
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{048af943-022b-4db6-beeb-a54c34774ee2}</UniqueIdentifier>
- <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>
+ <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{c1d600d2-888f-4aea-b73e-8b0dd9befa0c}</UniqueIdentifier>
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/minizip.vcxproj.filters
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/minizip.vcxproj.filters 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/minizip.vcxproj.filters 2022-11-14 21:05:34 UTC (rev 884)
@@ -3,7 +3,7 @@
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{c0419b40-bf50-40da-b153-ff74215b79de}</UniqueIdentifier>
- <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>
+ <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{bb87b070-735b-478e-92ce-7383abb2f36c}</UniqueIdentifier>
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/testzlib.vcxproj
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/testzlib.vcxproj 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/testzlib.vcxproj 2022-11-14 21:05:34 UTC (rev 884)
@@ -181,7 +181,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -194,7 +194,7 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)testzlib.exe</OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
@@ -241,7 +241,7 @@
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<OmitFramePointers>true</OmitFramePointers>
<AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -254,7 +254,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)testzlib.exe</OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -269,7 +269,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
@@ -276,7 +276,7 @@
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
</ClCompile>
<Link>
- <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
@@ -352,7 +352,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
@@ -359,7 +359,7 @@
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
</ClCompile>
<Link>
- <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
@@ -398,14 +398,6 @@
<ClCompile Include="..\..\..\crc32.c" />
<ClCompile Include="..\..\..\deflate.c" />
<ClCompile Include="..\..\..\infback.c" />
- <ClCompile Include="..\..\masmx64\inffas8664.c">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- </ClCompile>
<ClCompile Include="..\..\..\inffast.c" />
<ClCompile Include="..\..\..\inflate.c" />
<ClCompile Include="..\..\..\inftrees.c" />
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/testzlib.vcxproj.filters
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/testzlib.vcxproj.filters 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/testzlib.vcxproj.filters 2022-11-14 21:05:34 UTC (rev 884)
@@ -3,7 +3,7 @@
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{c1f6a2e3-5da5-4955-8653-310d3efe05a9}</UniqueIdentifier>
- <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>
+ <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{c2aaffdc-2c95-4d6f-8466-4bec5890af2c}</UniqueIdentifier>
@@ -30,9 +30,6 @@
<ClCompile Include="..\..\..\infback.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\masmx64\inffas8664.c">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\inffast.c">
<Filter>Source Files</Filter>
</ClCompile>
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/testzlibdll.vcxproj.filters
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/testzlibdll.vcxproj.filters 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/testzlibdll.vcxproj.filters 2022-11-14 21:05:34 UTC (rev 884)
@@ -3,7 +3,7 @@
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{fa61a89f-93fc-4c89-b29e-36224b7592f4}</UniqueIdentifier>
- <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>
+ <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{d4b85da0-2ba2-4934-b57f-e2584e3848ee}</UniqueIdentifier>
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/zlib.rc
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/zlib.rc 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/zlib.rc 2022-11-14 21:05:34 UTC (rev 884)
@@ -2,8 +2,8 @@
#define IDR_VERSION1 1
IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
- FILEVERSION 1, 2, 12, 0
- PRODUCTVERSION 1, 2, 12, 0
+ FILEVERSION 1, 2, 13, 0
+ PRODUCTVERSION 1, 2, 13, 0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS 0
FILEOS VOS_DOS_WINDOWS32
@@ -17,7 +17,7 @@
BEGIN
VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
- VALUE "FileVersion", "1.2.12\0"
+ VALUE "FileVersion", "1.2.13\0"
VALUE "InternalName", "zlib\0"
VALUE "OriginalFilename", "zlibwapi.dll\0"
VALUE "ProductName", "ZLib.DLL\0"
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/zlibstat.vcxproj
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/zlibstat.vcxproj 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/zlibstat.vcxproj 2022-11-14 21:05:34 UTC (rev 884)
@@ -160,7 +160,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
@@ -182,16 +182,12 @@
<OutputFile>$(OutDir)zlibstat.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
- <PreBuildEvent>
- <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
- </PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
</ExceptionHandling>
@@ -210,19 +206,15 @@
</ResourceCompile>
<Lib>
<AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)zlibstat.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
- <PreBuildEvent>
- <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
- </PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
<ClCompile>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
@@ -252,7 +244,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
@@ -274,10 +266,6 @@
<OutputFile>$(OutDir)zlibstat.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
- <PreBuildEvent>
- <Command>cd ..\..\masmx64
-bld_ml64.bat</Command>
- </PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
<Midl>
@@ -285,7 +273,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
@@ -314,8 +302,8 @@
</Midl>
<ClCompile>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
</ExceptionHandling>
@@ -334,14 +322,10 @@
</ResourceCompile>
<Lib>
<AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)zlibstat.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
- <PreBuildEvent>
- <Command>cd ..\..\masmx64
-bld_ml64.bat</Command>
- </PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
<Midl>
@@ -349,7 +333,7 @@
</Midl>
<ClCompile>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
@@ -379,7 +363,7 @@
</Midl>
<ClCompile>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
@@ -409,7 +393,7 @@
</Midl>
<ClCompile>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
@@ -443,14 +427,6 @@
<ClCompile Include="..\..\..\gzread.c" />
<ClCompile Include="..\..\..\gzwrite.c" />
<ClCompile Include="..\..\..\infback.c" />
- <ClCompile Include="..\..\masmx64\inffas8664.c">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- </ClCompile>
<ClCompile Include="..\..\..\inffast.c" />
<ClCompile Include="..\..\..\inflate.c" />
<ClCompile Include="..\..\..\inftrees.c" />
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/zlibstat.vcxproj.filters
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/zlibstat.vcxproj.filters 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/zlibstat.vcxproj.filters 2022-11-14 21:05:34 UTC (rev 884)
@@ -33,9 +33,6 @@
<ClCompile Include="..\..\..\infback.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\masmx64\inffas8664.c">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\inffast.c">
<Filter>Source Files</Filter>
</ClCompile>
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/zlibvc.vcxproj
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/zlibvc.vcxproj 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/zlibvc.vcxproj 2022-11-14 21:05:34 UTC (rev 884)
@@ -197,8 +197,8 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -219,7 +219,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -229,10 +229,6 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
</Link>
- <PreBuildEvent>
- <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
- </PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
<Midl>
@@ -244,7 +240,7 @@
</Midl>
<ClCompile>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
@@ -288,8 +284,8 @@
</Midl>
<ClCompile>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
</ExceptionHandling>
@@ -312,7 +308,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
@@ -322,10 +318,6 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
</Link>
- <PreBuildEvent>
- <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
- </PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Midl>
@@ -337,8 +329,8 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -358,7 +350,7 @@
<Culture>0x040c</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -366,10 +358,6 @@
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX64</TargetMachine>
</Link>
- <PreBuildEvent>
- <Command>cd ..\..\masmx64
-bld_ml64.bat</Command>
- </PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
<Midl>
@@ -381,7 +369,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
@@ -424,7 +412,7 @@
</Midl>
<ClCompile>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
@@ -465,7 +453,7 @@
</Midl>
<ClCompile>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
@@ -510,8 +498,8 @@
</Midl>
<ClCompile>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
</ExceptionHandling>
@@ -533,7 +521,7 @@
<Culture>0x040c</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
@@ -541,10 +529,6 @@
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX64</TargetMachine>
</Link>
- <PreBuildEvent>
- <Command>cd ..\..\masmx64
-bld_ml64.bat</Command>
- </PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
<Midl>
@@ -556,7 +540,7 @@
</Midl>
<ClCompile>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
@@ -601,14 +585,6 @@
<ClCompile Include="..\..\..\gzread.c" />
<ClCompile Include="..\..\..\gzwrite.c" />
<ClCompile Include="..\..\..\infback.c" />
- <ClCompile Include="..\..\masmx64\inffas8664.c">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- </ClCompile>
<ClCompile Include="..\..\..\inffast.c" />
<ClCompile Include="..\..\..\inflate.c" />
<ClCompile Include="..\..\..\inftrees.c" />
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/zlibvc.vcxproj.filters
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/zlibvc.vcxproj.filters 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc10/zlibvc.vcxproj.filters 2022-11-14 21:05:34 UTC (rev 884)
@@ -42,9 +42,6 @@
<ClCompile Include="..\..\..\infback.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\masmx64\inffas8664.c">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\inffast.c">
<Filter>Source Files</Filter>
</ClCompile>
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc11/testzlib.vcxproj
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc11/testzlib.vcxproj 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc11/testzlib.vcxproj 2022-11-14 21:05:34 UTC (rev 884)
@@ -187,7 +187,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -200,7 +200,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)testzlib.exe</OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
@@ -247,7 +247,7 @@
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<OmitFramePointers>true</OmitFramePointers>
<AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -260,7 +260,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)testzlib.exe</OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -275,7 +275,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
@@ -282,7 +282,7 @@
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
</ClCompile>
<Link>
- <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
@@ -358,7 +358,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
@@ -365,7 +365,7 @@
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
</ClCompile>
<Link>
- <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
@@ -404,14 +404,6 @@
<ClCompile Include="..\..\..\crc32.c" />
<ClCompile Include="..\..\..\deflate.c" />
<ClCompile Include="..\..\..\infback.c" />
- <ClCompile Include="..\..\masmx64\inffas8664.c">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- </ClCompile>
<ClCompile Include="..\..\..\inffast.c" />
<ClCompile Include="..\..\..\inflate.c" />
<ClCompile Include="..\..\..\inftrees.c" />
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc11/zlib.rc
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc11/zlib.rc 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc11/zlib.rc 2022-11-14 21:05:34 UTC (rev 884)
@@ -2,8 +2,8 @@
#define IDR_VERSION1 1
IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
- FILEVERSION 1, 2, 12, 0
- PRODUCTVERSION 1, 2, 12, 0
+ FILEVERSION 1, 2, 13, 0
+ PRODUCTVERSION 1, 2, 13, 0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS 0
FILEOS VOS_DOS_WINDOWS32
@@ -17,7 +17,7 @@
BEGIN
VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
- VALUE "FileVersion", "1.2.12\0"
+ VALUE "FileVersion", "1.2.13\0"
VALUE "InternalName", "zlib\0"
VALUE "OriginalFilename", "zlibwapi.dll\0"
VALUE "ProductName", "ZLib.DLL\0"
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc11/zlibstat.vcxproj
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc11/zlibstat.vcxproj 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc11/zlibstat.vcxproj 2022-11-14 21:05:34 UTC (rev 884)
@@ -167,7 +167,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
@@ -193,8 +193,8 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
</ExceptionHandling>
@@ -213,7 +213,7 @@
</ResourceCompile>
<Lib>
<AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)zlibstat.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
@@ -221,7 +221,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
<ClCompile>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
@@ -251,7 +251,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
@@ -280,7 +280,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
@@ -309,8 +309,8 @@
</Midl>
<ClCompile>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
</ExceptionHandling>
@@ -329,7 +329,7 @@
</ResourceCompile>
<Lib>
<AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)zlibstat.lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
@@ -340,7 +340,7 @@
</Midl>
<ClCompile>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
@@ -370,7 +370,7 @@
</Midl>
<ClCompile>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
@@ -400,7 +400,7 @@
</Midl>
<ClCompile>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
@@ -434,14 +434,6 @@
<ClCompile Include="..\..\..\gzread.c" />
<ClCompile Include="..\..\..\gzwrite.c" />
<ClCompile Include="..\..\..\infback.c" />
- <ClCompile Include="..\..\masmx64\inffas8664.c">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- </ClCompile>
<ClCompile Include="..\..\..\inffast.c" />
<ClCompile Include="..\..\..\inflate.c" />
<ClCompile Include="..\..\..\inftrees.c" />
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc11/zlibvc.vcxproj
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc11/zlibvc.vcxproj 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc11/zlibvc.vcxproj 2022-11-14 21:05:34 UTC (rev 884)
@@ -204,8 +204,8 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -226,7 +226,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
@@ -240,10 +240,6 @@
</DataExecutionPrevention>
<ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
</Link>
- <PreBuildEvent>
- <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
- </PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
<Midl>
@@ -255,7 +251,7 @@
</Midl>
<ClCompile>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
@@ -303,8 +299,8 @@
</Midl>
<ClCompile>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
</ExceptionHandling>
@@ -327,7 +323,7 @@
</ResourceCompile>
<Link>
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
@@ -341,10 +337,6 @@
</DataExecutionPrevention>
<ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
</Link>
- <PreBuildEvent>
- <Command>cd ..\..\masmx86
-bld_ml32.bat</Command>
- </PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Midl>
@@ -356,8 +348,8 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -377,7 +369,7 @@
<Culture>0x040c</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
@@ -389,10 +381,6 @@
<ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
</Link>
- <PreBuildEvent>
- <Command>cd ..\..\contrib\masmx64
-bld_ml64.bat</Command>
- </PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
<Midl>
@@ -404,7 +392,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
@@ -447,7 +435,7 @@
</Midl>
<ClCompile>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
@@ -492,7 +480,7 @@
</Midl>
<ClCompile>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
@@ -537,8 +525,8 @@
</Midl>
<ClCompile>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
</ExceptionHandling>
@@ -560,7 +548,7 @@
<Culture>0x040c</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
@@ -572,10 +560,6 @@
<ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
</Link>
- <PreBuildEvent>
- <Command>cd ..\..\masmx64
-bld_ml64.bat</Command>
- </PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
<Midl>
@@ -587,7 +571,7 @@
</Midl>
<ClCompile>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>
@@ -632,14 +616,6 @@
<ClCompile Include="..\..\..\gzread.c" />
<ClCompile Include="..\..\..\gzwrite.c" />
<ClCompile Include="..\..\..\infback.c" />
- <ClCompile Include="..\..\masmx64\inffas8664.c">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- </ClCompile>
<ClCompile Include="..\..\..\inffast.c" />
<ClCompile Include="..\..\..\inflate.c" />
<ClCompile Include="..\..\..\inftrees.c" />
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/testzlib.vcxproj
===================================================================
(Binary files differ)
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/zlib.rc
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/zlib.rc 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/zlib.rc 2022-11-14 21:05:34 UTC (rev 884)
@@ -2,8 +2,8 @@
#define IDR_VERSION1 1
IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
- FILEVERSION 1, 2, 12, 0
- PRODUCTVERSION 1, 2, 12, 0
+ FILEVERSION 1, 2, 13, 0
+ PRODUCTVERSION 1, 2, 13, 0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS 0
FILEOS VOS_DOS_WINDOWS32
@@ -17,7 +17,7 @@
BEGIN
VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
- VALUE "FileVersion", "1.2.12\0"
+ VALUE "FileVersion", "1.2.13\0"
VALUE "InternalName", "zlib\0"
VALUE "OriginalFilename", "zlibwapi.dll\0"
VALUE "ProductName", "ZLib.DLL\0"
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/zlibstat.vcxproj
===================================================================
(Binary files differ)
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc12/zlibvc.vcxproj
===================================================================
(Binary files differ)
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/testzlib.vcxproj
===================================================================
(Binary files differ)
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/zlib.rc
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/zlib.rc 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/zlib.rc 2022-11-14 21:05:34 UTC (rev 884)
@@ -2,8 +2,8 @@
#define IDR_VERSION1 1
IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
- FILEVERSION 1, 2, 12, 0
- PRODUCTVERSION 1, 2, 12, 0
+ FILEVERSION 1, 2, 13, 0
+ PRODUCTVERSION 1, 2, 13, 0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS 0
FILEOS VOS_DOS_WINDOWS32
@@ -17,7 +17,7 @@
BEGIN
VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
- VALUE "FileVersion", "1.2.12\0"
+ VALUE "FileVersion", "1.2.13\0"
VALUE "InternalName", "zlib\0"
VALUE "OriginalFilename", "zlibwapi.dll\0"
VALUE "ProductName", "ZLib.DLL\0"
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/zlibstat.vcxproj
===================================================================
(Binary files differ)
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc14/zlibvc.vcxproj
===================================================================
(Binary files differ)
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc9/miniunz.vcproj
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc9/miniunz.vcproj 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc9/miniunz.vcproj 2022-11-14 21:05:34 UTC (rev 884)
@@ -542,7 +542,7 @@
<Files>
<Filter
Name="Source Files"
- Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat"
>
<File
RelativePath="..\..\minizip\miniunz.c"
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc9/minizip.vcproj
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc9/minizip.vcproj 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc9/minizip.vcproj 2022-11-14 21:05:34 UTC (rev 884)
@@ -539,7 +539,7 @@
<Files>
<Filter
Name="Source Files"
- Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat"
>
<File
RelativePath="..\..\minizip\minizip.c"
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc9/testzlib.vcproj
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc9/testzlib.vcproj 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc9/testzlib.vcproj 2022-11-14 21:05:34 UTC (rev 884)
@@ -48,7 +48,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\.."
- PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="0"
RuntimeLibrary="1"
@@ -71,7 +71,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj"
OutputFile="$(OutDir)/testzlib.exe"
LinkIncremental="2"
GenerateManifest="false"
@@ -128,7 +127,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\.."
- PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
BasicRuntimeChecks="0"
RuntimeLibrary="3"
BufferSecurityCheck="false"
@@ -145,7 +144,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj"
GenerateManifest="false"
/>
<Tool
@@ -517,7 +515,7 @@
InlineFunctionExpansion="1"
OmitFramePointers="true"
AdditionalIncludeDirectories="..\..\.."
- PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
StringPooling="true"
BasicRuntimeChecks="0"
RuntimeLibrary="0"
@@ -540,7 +538,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj"
OutputFile="$(OutDir)/testzlib.exe"
LinkIncremental="1"
GenerateManifest="false"
@@ -600,7 +597,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\.."
- PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
+ PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
BasicRuntimeChecks="0"
RuntimeLibrary="0"
BufferSecurityCheck="false"
@@ -617,7 +614,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj"
GenerateManifest="false"
/>
<Tool
@@ -733,7 +729,7 @@
<Files>
<Filter
Name="Source Files"
- Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat"
>
<File
RelativePath="..\..\..\adler32.c"
@@ -756,58 +752,6 @@
>
</File>
<File
- RelativePath="..\..\masmx64\inffas8664.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Itanium"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="ReleaseWithoutAsm|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="ReleaseWithoutAsm|Itanium"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Itanium"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath="..\..\..\inffast.c"
>
</File>
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc9/testzlibdll.vcproj
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc9/testzlibdll.vcproj 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc9/testzlibdll.vcproj 2022-11-14 21:05:34 UTC (rev 884)
@@ -542,7 +542,7 @@
<Files>
<Filter
Name="Source Files"
- Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat"
>
<File
RelativePath="..\..\testzlib\testzlib.c"
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc9/zlib.rc
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc9/zlib.rc 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc9/zlib.rc 2022-11-14 21:05:34 UTC (rev 884)
@@ -2,8 +2,8 @@
#define IDR_VERSION1 1
IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
- FILEVERSION 1, 2, 12, 0
- PRODUCTVERSION 1, 2, 12, 0
+ FILEVERSION 1, 2, 13, 0
+ PRODUCTVERSION 1, 2, 13, 0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS 0
FILEOS VOS_DOS_WINDOWS32
@@ -17,7 +17,7 @@
BEGIN
VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
- VALUE "FileVersion", "1.2.12\0"
+ VALUE "FileVersion", "1.2.13\0"
VALUE "InternalName", "zlib\0"
VALUE "OriginalFilename", "zlibwapi.dll\0"
VALUE "ProductName", "ZLib.DLL\0"
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc9/zlibstat.vcproj
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc9/zlibstat.vcproj 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc9/zlibstat.vcproj 2022-11-14 21:05:34 UTC (rev 884)
@@ -47,7 +47,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+ AdditionalIncludeDirectories="..\..\.."
PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
ExceptionHandling="0"
RuntimeLibrary="1"
@@ -121,7 +121,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+ AdditionalIncludeDirectories="..\..\.."
PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
ExceptionHandling="0"
RuntimeLibrary="3"
@@ -195,7 +195,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+ AdditionalIncludeDirectories="..\..\.."
PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
ExceptionHandling="0"
RuntimeLibrary="3"
@@ -268,8 +268,8 @@
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
- PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF"
+ AdditionalIncludeDirectories="..\..\.."
+ PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
StringPooling="true"
ExceptionHandling="0"
RuntimeLibrary="0"
@@ -295,7 +295,6 @@
<Tool
Name="VCLibrarianTool"
AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB"
- AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj "
OutputFile="$(OutDir)\zlibstat.lib"
SuppressStartupBanner="true"
/>
@@ -343,8 +342,8 @@
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
- PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64"
+ AdditionalIncludeDirectories="..\..\.."
+ PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
StringPooling="true"
ExceptionHandling="0"
RuntimeLibrary="2"
@@ -370,7 +369,6 @@
<Tool
Name="VCLibrarianTool"
AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB"
- AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj "
OutputFile="$(OutDir)\zlibstat.lib"
SuppressStartupBanner="true"
/>
@@ -418,7 +416,7 @@
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+ AdditionalIncludeDirectories="..\..\.."
PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
StringPooling="true"
ExceptionHandling="0"
@@ -491,7 +489,7 @@
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+ AdditionalIncludeDirectories="..\..\.."
PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS"
StringPooling="true"
ExceptionHandling="0"
@@ -565,7 +563,7 @@
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+ AdditionalIncludeDirectories="..\..\.."
PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
StringPooling="true"
ExceptionHandling="0"
@@ -639,7 +637,7 @@
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+ AdditionalIncludeDirectories="..\..\.."
PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64"
StringPooling="true"
ExceptionHandling="0"
@@ -733,58 +731,6 @@
>
</File>
<File
- RelativePath="..\..\masmx64\inffas8664.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Itanium"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Itanium"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="ReleaseWithoutAsm|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="ReleaseWithoutAsm|Itanium"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath="..\..\..\inffast.c"
>
</File>
Modified: branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc9/zlibvc.vcproj
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc9/zlibvc.vcproj 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/contrib/vstudio/vc9/zlibvc.vcproj 2022-11-14 21:05:34 UTC (rev 884)
@@ -53,8 +53,8 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
- PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF"
+ AdditionalIncludeDirectories="..\..\.."
+ PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI"
ExceptionHandling="0"
RuntimeLibrary="1"
BufferSecurityCheck="false"
@@ -81,7 +81,6 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj"
OutputFile="$(OutDir)\zlibwapi.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
@@ -150,8 +149,8 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
- PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64"
+ AdditionalIncludeDirectories="..\..\.."
+ PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"
ExceptionHandling="0"
RuntimeLibrary="3"
BufferSecurityCheck="false"
@@ -177,7 +176,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj "
OutputFile="$(OutDir)\zlibwapi.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
@@ -245,7 +243,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+ AdditionalIncludeDirectories="..\..\.."
PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"
ExceptionHandling="0"
RuntimeLibrary="3"
@@ -340,7 +338,7 @@
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+ AdditionalIncludeDirectories="..\..\.."
PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI"
StringPooling="true"
ExceptionHandling="0"
@@ -440,7 +438,7 @@
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+ AdditionalIncludeDirectories="..\..\.."
PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"
StringPooling="true"
ExceptionHandling="0"
@@ -538,7 +536,7 @@
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+ AdditionalIncludeDirectories="..\..\.."
PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"
StringPooling="true"
ExceptionHandling="0"
@@ -636,8 +634,8 @@
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
- PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF"
+ AdditionalIncludeDirectories="..\..\.."
+ PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI"
StringPooling="true"
ExceptionHandling="0"
RuntimeLibrary="0"
@@ -666,7 +664,6 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="..\..\masmx86\match686.obj ..\..\masmx86\inffas32.obj "
OutputFile="$(OutDir)\zlibwapi.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -737,8 +734,8 @@
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
- PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64"
+ AdditionalIncludeDirectories="..\..\.."
+ PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"
StringPooling="true"
ExceptionHandling="0"
RuntimeLibrary="2"
@@ -766,7 +763,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj "
OutputFile="$(OutDir)\zlibwapi.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -836,7 +832,7 @@
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
+ AdditionalIncludeDirectories="..\..\.."
PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64"
StringPooling="true"
ExceptionHandling="0"
@@ -950,58 +946,6 @@
>
</File>
<File
- RelativePath="..\..\masmx64\inffas8664.c"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Itanium"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="ReleaseWithoutAsm|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="ReleaseWithoutAsm|Itanium"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Itanium"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath="..\..\..\inffast.c"
>
</File>
Modified: branches/stable/source/src/libs/zlib/zlib-src/crc32.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/crc32.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/crc32.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -98,15 +98,24 @@
# endif
#endif
+/* If available, use the ARM processor CRC32 instruction. */
+#if defined(__aarch64__) && defined(__ARM_FEATURE_CRC32) && W == 8
+# define ARMCRC32
+#endif
+
/* Local functions. */
local z_crc_t multmodp OF((z_crc_t a, z_crc_t b));
local z_crc_t x2nmodp OF((z_off64_t n, unsigned k));
-/* If available, use the ARM processor CRC32 instruction. */
-#if defined(__aarch64__) && defined(__ARM_FEATURE_CRC32) && W == 8
-# define ARMCRC32
+#if defined(W) && (!defined(ARMCRC32) || defined(DYNAMIC_CRC_TABLE))
+ local z_word_t byte_swap OF((z_word_t word));
#endif
+#if defined(W) && !defined(ARMCRC32)
+ local z_crc_t crc_word OF((z_word_t data));
+ local z_word_t crc_word_big OF((z_word_t data));
+#endif
+
#if defined(W) && (!defined(ARMCRC32) || defined(DYNAMIC_CRC_TABLE))
/*
Swap the bytes in a z_word_t to convert between little and big endian. Any
@@ -630,7 +639,7 @@
#endif /* DYNAMIC_CRC_TABLE */
/* Pre-condition the CRC */
- crc ^= 0xffffffff;
+ crc = (~crc) & 0xffffffff;
/* Compute the CRC up to a word boundary. */
while (len && ((z_size_t)buf & 7) != 0) {
@@ -645,8 +654,8 @@
len &= 7;
/* Do three interleaved CRCs to realize the throughput of one crc32x
- instruction per cycle. Each CRC is calcuated on Z_BATCH words. The three
- CRCs are combined into a single CRC after each set of batches. */
+ instruction per cycle. Each CRC is calculated on Z_BATCH words. The
+ three CRCs are combined into a single CRC after each set of batches. */
while (num >= 3 * Z_BATCH) {
crc1 = 0;
crc2 = 0;
@@ -749,7 +758,7 @@
#endif /* DYNAMIC_CRC_TABLE */
/* Pre-condition the CRC */
- crc ^= 0xffffffff;
+ crc = (~crc) & 0xffffffff;
#ifdef W
@@ -1077,7 +1086,7 @@
#ifdef DYNAMIC_CRC_TABLE
once(&made, make_crc_table);
#endif /* DYNAMIC_CRC_TABLE */
- return multmodp(x2nmodp(len2, 3), crc1) ^ crc2;
+ return multmodp(x2nmodp(len2, 3), crc1) ^ (crc2 & 0xffffffff);
}
/* ========================================================================= */
@@ -1086,7 +1095,7 @@
uLong crc2;
z_off_t len2;
{
- return crc32_combine64(crc1, crc2, len2);
+ return crc32_combine64(crc1, crc2, (z_off64_t)len2);
}
/* ========================================================================= */
@@ -1103,14 +1112,14 @@
uLong ZEXPORT crc32_combine_gen(len2)
z_off_t len2;
{
- return crc32_combine_gen64(len2);
+ return crc32_combine_gen64((z_off64_t)len2);
}
/* ========================================================================= */
-uLong crc32_combine_op(crc1, crc2, op)
+uLong ZEXPORT crc32_combine_op(crc1, crc2, op)
uLong crc1;
uLong crc2;
uLong op;
{
- return multmodp(op, crc1) ^ crc2;
+ return multmodp(op, crc1) ^ (crc2 & 0xffffffff);
}
Modified: branches/stable/source/src/libs/zlib/zlib-src/deflate.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/deflate.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/deflate.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -52,7 +52,7 @@
#include "deflate.h"
const char deflate_copyright[] =
- " deflate 1.2.12 Copyright 1995-2022 Jean-loup Gailly and Mark Adler ";
+ " deflate 1.2.13 Copyright 1995-2022 Jean-loup Gailly and Mark Adler ";
/*
If you use the zlib library in a product, an acknowledgment is welcome
in the documentation of your product. If for some reason you cannot
@@ -87,13 +87,7 @@
local void putShortMSB OF((deflate_state *s, uInt b));
local void flush_pending OF((z_streamp strm));
local unsigned read_buf OF((z_streamp strm, Bytef *buf, unsigned size));
-#ifdef ASMV
-# pragma message("Assembler code may have bugs -- use at your own risk")
- void match_init OF((void)); /* asm code initialization */
- uInt longest_match OF((deflate_state *s, IPos cur_match));
-#else
local uInt longest_match OF((deflate_state *s, IPos cur_match));
-#endif
#ifdef ZLIB_DEBUG
local void check_match OF((deflate_state *s, IPos start, IPos match,
@@ -160,7 +154,7 @@
* characters, so that a running hash key can be computed from the previous
* key instead of complete recalculation each time.
*/
-#define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)
+#define UPDATE_HASH(s,h,c) (h = (((h) << s->hash_shift) ^ (c)) & s->hash_mask)
/* ===========================================================================
@@ -191,9 +185,9 @@
*/
#define CLEAR_HASH(s) \
do { \
- s->head[s->hash_size-1] = NIL; \
+ s->head[s->hash_size - 1] = NIL; \
zmemzero((Bytef *)s->head, \
- (unsigned)(s->hash_size-1)*sizeof(*s->head)); \
+ (unsigned)(s->hash_size - 1)*sizeof(*s->head)); \
} while (0)
/* ===========================================================================
@@ -285,6 +279,8 @@
if (windowBits < 0) { /* suppress zlib wrapper */
wrap = 0;
+ if (windowBits < -15)
+ return Z_STREAM_ERROR;
windowBits = -windowBits;
}
#ifdef GZIP
@@ -314,7 +310,7 @@
s->hash_bits = (uInt)memLevel + 7;
s->hash_size = 1 << s->hash_bits;
s->hash_mask = s->hash_size - 1;
- s->hash_shift = ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);
+ s->hash_shift = ((s->hash_bits + MIN_MATCH-1) / MIN_MATCH);
s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
s->prev = (Posf *) ZALLOC(strm, s->w_size, sizeof(Pos));
@@ -340,11 +336,11 @@
* sym_buf value to read moves forward three bytes. From that symbol, up to
* 31 bits are written to pending_buf. The closest the written pending_buf
* bits gets to the next sym_buf symbol to read is just before the last
- * code is written. At that time, 31*(n-2) bits have been written, just
- * after 24*(n-2) bits have been consumed from sym_buf. sym_buf starts at
- * 8*n bits into pending_buf. (Note that the symbol buffer fills when n-1
+ * code is written. At that time, 31*(n - 2) bits have been written, just
+ * after 24*(n - 2) bits have been consumed from sym_buf. sym_buf starts at
+ * 8*n bits into pending_buf. (Note that the symbol buffer fills when n - 1
* symbols are written.) The closest the writing gets to what is unread is
- * then n+14 bits. Here n is lit_bufsize, which is 16384 by default, and
+ * then n + 14 bits. Here n is lit_bufsize, which is 16384 by default, and
* can range from 128 to 32768.
*
* Therefore, at a minimum, there are 142 bits of space between what is
@@ -390,7 +386,7 @@
/* =========================================================================
* Check for a valid deflate stream state. Return 0 if ok, 1 if not.
*/
-local int deflateStateCheck (strm)
+local int deflateStateCheck(strm)
z_streamp strm;
{
deflate_state *s;
@@ -413,7 +409,7 @@
}
/* ========================================================================= */
-int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
+int ZEXPORT deflateSetDictionary(strm, dictionary, dictLength)
z_streamp strm;
const Bytef *dictionary;
uInt dictLength;
@@ -482,7 +478,7 @@
}
/* ========================================================================= */
-int ZEXPORT deflateGetDictionary (strm, dictionary, dictLength)
+int ZEXPORT deflateGetDictionary(strm, dictionary, dictLength)
z_streamp strm;
Bytef *dictionary;
uInt *dictLength;
@@ -504,7 +500,7 @@
}
/* ========================================================================= */
-int ZEXPORT deflateResetKeep (strm)
+int ZEXPORT deflateResetKeep(strm)
z_streamp strm;
{
deflate_state *s;
@@ -542,7 +538,7 @@
}
/* ========================================================================= */
-int ZEXPORT deflateReset (strm)
+int ZEXPORT deflateReset(strm)
z_streamp strm;
{
int ret;
@@ -554,7 +550,7 @@
}
/* ========================================================================= */
-int ZEXPORT deflateSetHeader (strm, head)
+int ZEXPORT deflateSetHeader(strm, head)
z_streamp strm;
gz_headerp head;
{
@@ -565,7 +561,7 @@
}
/* ========================================================================= */
-int ZEXPORT deflatePending (strm, pending, bits)
+int ZEXPORT deflatePending(strm, pending, bits)
unsigned *pending;
int *bits;
z_streamp strm;
@@ -579,7 +575,7 @@
}
/* ========================================================================= */
-int ZEXPORT deflatePrime (strm, bits, value)
+int ZEXPORT deflatePrime(strm, bits, value)
z_streamp strm;
int bits;
int value;
@@ -674,21 +670,28 @@
}
/* =========================================================================
- * For the default windowBits of 15 and memLevel of 8, this function returns
- * a close to exact, as well as small, upper bound on the compressed size.
- * They are coded as constants here for a reason--if the #define's are
- * changed, then this function needs to be changed as well. The return
- * value for 15 and 8 only works for those exact settings.
+ * For the default windowBits of 15 and memLevel of 8, this function returns a
+ * close to exact, as well as small, upper bound on the compressed size. This
+ * is an expansion of ~0.03%, plus a small constant.
*
- * For any setting other than those defaults for windowBits and memLevel,
- * the value returned is a conservative worst case for the maximum expansion
- * resulting from using fixed blocks instead of stored blocks, which deflate
- * can emit on compressed data for some combinations of the parameters.
+ * For any setting other than those defaults for windowBits and memLevel, one
+ * of two worst case bounds is returned. This is at most an expansion of ~4% or
+ * ~13%, plus a small constant.
*
- * This function could be more sophisticated to provide closer upper bounds for
- * every combination of windowBits and memLevel. But even the conservative
- * upper bound of about 14% expansion does not seem onerous for output buffer
- * allocation.
+ * Both the 0.03% and 4% derive from the overhead of stored blocks. The first
+ * one is for stored blocks of 16383 bytes (memLevel == 8), whereas the second
+ * is for stored blocks of 127 bytes (the worst case memLevel == 1). The
+ * expansion results from five bytes of header for each stored block.
+ *
+ * The larger expansion of 13% results from a window size less than or equal to
+ * the symbols buffer size (windowBits <= memLevel + 7). In that case some of
+ * the data being compressed may have slid out of the sliding window, impeding
+ * a stored block from being emitted. Then the only choice is a fixed or
+ * dynamic block, where a fixed block limits the maximum expansion to 9 bits
+ * per 8-bit byte, plus 10 bits for every block. The smallest block size for
+ * which this can occur is 255 (memLevel == 2).
+ *
+ * Shifts are used to approximate divisions, for speed.
*/
uLong ZEXPORT deflateBound(strm, sourceLen)
z_streamp strm;
@@ -695,15 +698,22 @@
uLong sourceLen;
{
deflate_state *s;
- uLong complen, wraplen;
+ uLong fixedlen, storelen, wraplen;
- /* conservative upper bound for compressed data */
- complen = sourceLen +
- ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 5;
+ /* upper bound for fixed blocks with 9-bit literals and length 255
+ (memLevel == 2, which is the lowest that may not use stored blocks) --
+ ~13% overhead plus a small constant */
+ fixedlen = sourceLen + (sourceLen >> 3) + (sourceLen >> 8) +
+ (sourceLen >> 9) + 4;
- /* if can't get parameters, return conservative bound plus zlib wrapper */
+ /* upper bound for stored blocks with length 127 (memLevel == 1) --
+ ~4% overhead plus a small constant */
+ storelen = sourceLen + (sourceLen >> 5) + (sourceLen >> 7) +
+ (sourceLen >> 11) + 7;
+
+ /* if can't get parameters, return larger bound plus a zlib wrapper */
if (deflateStateCheck(strm))
- return complen + 6;
+ return (fixedlen > storelen ? fixedlen : storelen) + 6;
/* compute wrapper length */
s = strm->state;
@@ -740,11 +750,12 @@
wraplen = 6;
}
- /* if not default parameters, return conservative bound */
+ /* if not default parameters, return one of the conservative bounds */
if (s->w_bits != 15 || s->hash_bits != 8 + 7)
- return complen + wraplen;
+ return (s->w_bits <= s->hash_bits ? fixedlen : storelen) + wraplen;
- /* default settings: return tight bound for that case */
+ /* default settings: return tight bound for that case -- ~0.03% overhead
+ plus a small constant */
return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
(sourceLen >> 25) + 13 - 6 + wraplen;
}
@@ -754,7 +765,7 @@
* IN assertion: the stream state is correct and there is enough room in
* pending_buf.
*/
-local void putShortMSB (s, b)
+local void putShortMSB(s, b)
deflate_state *s;
uInt b;
{
@@ -801,7 +812,7 @@
} while (0)
/* ========================================================================= */
-int ZEXPORT deflate (strm, flush)
+int ZEXPORT deflate(strm, flush)
z_streamp strm;
int flush;
{
@@ -856,7 +867,7 @@
s->status = BUSY_STATE;
if (s->status == INIT_STATE) {
/* zlib header */
- uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;
+ uInt header = (Z_DEFLATED + ((s->w_bits - 8) << 4)) << 8;
uInt level_flags;
if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2)
@@ -1116,7 +1127,7 @@
}
/* ========================================================================= */
-int ZEXPORT deflateEnd (strm)
+int ZEXPORT deflateEnd(strm)
z_streamp strm;
{
int status;
@@ -1142,7 +1153,7 @@
* To simplify the source, this is not supported for 16-bit MSDOS (which
* doesn't have enough memory anyway to duplicate compression states).
*/
-int ZEXPORT deflateCopy (dest, source)
+int ZEXPORT deflateCopy(dest, source)
z_streamp dest;
z_streamp source;
{
@@ -1231,7 +1242,7 @@
/* ===========================================================================
* Initialize the "longest match" routines for a new zlib stream
*/
-local void lm_init (s)
+local void lm_init(s)
deflate_state *s;
{
s->window_size = (ulg)2L*s->w_size;
@@ -1252,11 +1263,6 @@
s->match_length = s->prev_length = MIN_MATCH-1;
s->match_available = 0;
s->ins_h = 0;
-#ifndef FASTEST
-#ifdef ASMV
- match_init(); /* initialize the asm code */
-#endif
-#endif
}
#ifndef FASTEST
@@ -1269,10 +1275,6 @@
* string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
* OUT assertion: the match length is not greater than s->lookahead.
*/
-#ifndef ASMV
-/* For 80x86 and 680x0, an optimized version will be provided in match.asm or
- * match.S. The code will be functionally equivalent.
- */
local uInt longest_match(s, cur_match)
deflate_state *s;
IPos cur_match; /* current match */
@@ -1297,10 +1299,10 @@
*/
register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
register ush scan_start = *(ushf*)scan;
- register ush scan_end = *(ushf*)(scan+best_len-1);
+ register ush scan_end = *(ushf*)(scan + best_len - 1);
#else
register Bytef *strend = s->window + s->strstart + MAX_MATCH;
- register Byte scan_end1 = scan[best_len-1];
+ register Byte scan_end1 = scan[best_len - 1];
register Byte scan_end = scan[best_len];
#endif
@@ -1318,7 +1320,8 @@
*/
if ((uInt)nice_match > s->lookahead) nice_match = (int)s->lookahead;
- Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
+ Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
+ "need lookahead");
do {
Assert(cur_match < s->strstart, "no future");
@@ -1336,15 +1339,15 @@
/* This code assumes sizeof(unsigned short) == 2. Do not use
* UNALIGNED_OK if your compiler uses a different size.
*/
- if (*(ushf*)(match+best_len-1) != scan_end ||
+ if (*(ushf*)(match + best_len - 1) != scan_end ||
*(ushf*)match != scan_start) continue;
/* It is not necessary to compare scan[2] and match[2] since they are
* always equal when the other bytes match, given that the hash keys
* are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at
- * strstart+3, +5, ... up to strstart+257. We check for insufficient
+ * strstart + 3, + 5, up to strstart + 257. We check for insufficient
* lookahead only every 4th comparison; the 128th check will be made
- * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is
+ * at strstart + 257. If MAX_MATCH-2 is not a multiple of 8, it is
* necessary to put more guard bytes at the end of the window, or
* to check more often for insufficient lookahead.
*/
@@ -1351,28 +1354,29 @@
Assert(scan[2] == match[2], "scan[2]?");
scan++, match++;
do {
- } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
- *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
- *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
- *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+ } while (*(ushf*)(scan += 2) == *(ushf*)(match += 2) &&
+ *(ushf*)(scan += 2) == *(ushf*)(match += 2) &&
+ *(ushf*)(scan += 2) == *(ushf*)(match += 2) &&
+ *(ushf*)(scan += 2) == *(ushf*)(match += 2) &&
scan < strend);
/* The funny "do {}" generates better code on most compilers */
- /* Here, scan <= window+strstart+257 */
- Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+ /* Here, scan <= window + strstart + 257 */
+ Assert(scan <= s->window + (unsigned)(s->window_size - 1),
+ "wild scan");
if (*scan == *match) scan++;
- len = (MAX_MATCH - 1) - (int)(strend-scan);
+ len = (MAX_MATCH - 1) - (int)(strend - scan);
scan = strend - (MAX_MATCH-1);
#else /* UNALIGNED_OK */
- if (match[best_len] != scan_end ||
- match[best_len-1] != scan_end1 ||
- *match != *scan ||
- *++match != scan[1]) continue;
+ if (match[best_len] != scan_end ||
+ match[best_len - 1] != scan_end1 ||
+ *match != *scan ||
+ *++match != scan[1]) continue;
- /* The check at best_len-1 can be removed because it will be made
+ /* The check at best_len - 1 can be removed because it will be made
* again later. (This heuristic is not always a win.)
* It is not necessary to compare scan[2] and match[2] since they
* are always equal when the other bytes match, given that
@@ -1382,7 +1386,7 @@
Assert(*scan == *match, "match[2]?");
/* We check for insufficient lookahead only every 8th comparison;
- * the 256th check will be made at strstart+258.
+ * the 256th check will be made at strstart + 258.
*/
do {
} while (*++scan == *++match && *++scan == *++match &&
@@ -1391,7 +1395,8 @@
*++scan == *++match && *++scan == *++match &&
scan < strend);
- Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+ Assert(scan <= s->window + (unsigned)(s->window_size - 1),
+ "wild scan");
len = MAX_MATCH - (int)(strend - scan);
scan = strend - MAX_MATCH;
@@ -1403,9 +1408,9 @@
best_len = len;
if (len >= nice_match) break;
#ifdef UNALIGNED_OK
- scan_end = *(ushf*)(scan+best_len-1);
+ scan_end = *(ushf*)(scan + best_len - 1);
#else
- scan_end1 = scan[best_len-1];
+ scan_end1 = scan[best_len - 1];
scan_end = scan[best_len];
#endif
}
@@ -1415,7 +1420,6 @@
if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
return s->lookahead;
}
-#endif /* ASMV */
#else /* FASTEST */
@@ -1436,7 +1440,8 @@
*/
Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
- Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
+ Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
+ "need lookahead");
Assert(cur_match < s->strstart, "no future");
@@ -1446,7 +1451,7 @@
*/
if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1;
- /* The check at best_len-1 can be removed because it will be made
+ /* The check at best_len - 1 can be removed because it will be made
* again later. (This heuristic is not always a win.)
* It is not necessary to compare scan[2] and match[2] since they
* are always equal when the other bytes match, given that
@@ -1456,7 +1461,7 @@
Assert(*scan == *match, "match[2]?");
/* We check for insufficient lookahead only every 8th comparison;
- * the 256th check will be made at strstart+258.
+ * the 256th check will be made at strstart + 258.
*/
do {
} while (*++scan == *++match && *++scan == *++match &&
@@ -1465,7 +1470,7 @@
*++scan == *++match && *++scan == *++match &&
scan < strend);
- Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+ Assert(scan <= s->window + (unsigned)(s->window_size - 1), "wild scan");
len = MAX_MATCH - (int)(strend - scan);
@@ -1501,7 +1506,7 @@
z_error("invalid match");
}
if (z_verbose > 1) {
- fprintf(stderr,"\\[%d,%d]", start-match, length);
+ fprintf(stderr,"\\[%d,%d]", start - match, length);
do { putc(s->window[start++], stderr); } while (--length != 0);
}
}
@@ -1547,9 +1552,9 @@
/* If the window is almost full and there is insufficient lookahead,
* move the upper half to the lower one to make room in the upper half.
*/
- if (s->strstart >= wsize+MAX_DIST(s)) {
+ if (s->strstart >= wsize + MAX_DIST(s)) {
- zmemcpy(s->window, s->window+wsize, (unsigned)wsize - more);
+ zmemcpy(s->window, s->window + wsize, (unsigned)wsize - more);
s->match_start -= wsize;
s->strstart -= wsize; /* we now have strstart >= MAX_DIST */
s->block_start -= (long) wsize;
@@ -1680,7 +1685,7 @@
*
* deflate_stored() is written to minimize the number of times an input byte is
* copied. It is most efficient with large input and output buffers, which
- * maximizes the opportunites to have a single copy from next_in to next_out.
+ * maximizes the opportunities to have a single copy from next_in to next_out.
*/
local block_state deflate_stored(s, flush)
deflate_state *s;
@@ -1890,7 +1895,7 @@
if (s->lookahead == 0) break; /* flush the current block */
}
- /* Insert the string window[strstart .. strstart+2] in the
+ /* Insert the string window[strstart .. strstart + 2] in the
* dictionary, and set hash_head to the head of the hash chain:
*/
hash_head = NIL;
@@ -1938,7 +1943,7 @@
s->strstart += s->match_length;
s->match_length = 0;
s->ins_h = s->window[s->strstart];
- UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
+ UPDATE_HASH(s, s->ins_h, s->window[s->strstart + 1]);
#if MIN_MATCH != 3
Call UPDATE_HASH() MIN_MATCH-3 more times
#endif
@@ -1949,7 +1954,7 @@
} else {
/* No match, output a literal byte */
Tracevv((stderr,"%c", s->window[s->strstart]));
- _tr_tally_lit (s, s->window[s->strstart], bflush);
+ _tr_tally_lit(s, s->window[s->strstart], bflush);
s->lookahead--;
s->strstart++;
}
@@ -1993,7 +1998,7 @@
if (s->lookahead == 0) break; /* flush the current block */
}
- /* Insert the string window[strstart .. strstart+2] in the
+ /* Insert the string window[strstart .. strstart + 2] in the
* dictionary, and set hash_head to the head of the hash chain:
*/
hash_head = NIL;
@@ -2035,17 +2040,17 @@
uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;
/* Do not insert strings in hash table beyond this. */
- check_match(s, s->strstart-1, s->prev_match, s->prev_length);
+ check_match(s, s->strstart - 1, s->prev_match, s->prev_length);
- _tr_tally_dist(s, s->strstart -1 - s->prev_match,
+ _tr_tally_dist(s, s->strstart - 1 - s->prev_match,
s->prev_length - MIN_MATCH, bflush);
/* Insert in hash table all strings up to the end of the match.
- * strstart-1 and strstart are already inserted. If there is not
+ * strstart - 1 and strstart are already inserted. If there is not
* enough lookahead, the last two strings are not inserted in
* the hash table.
*/
- s->lookahead -= s->prev_length-1;
+ s->lookahead -= s->prev_length - 1;
s->prev_length -= 2;
do {
if (++s->strstart <= max_insert) {
@@ -2063,8 +2068,8 @@
* single literal. If there was a match but the current match
* is longer, truncate the previous match to a single literal.
*/
- Tracevv((stderr,"%c", s->window[s->strstart-1]));
- _tr_tally_lit(s, s->window[s->strstart-1], bflush);
+ Tracevv((stderr,"%c", s->window[s->strstart - 1]));
+ _tr_tally_lit(s, s->window[s->strstart - 1], bflush);
if (bflush) {
FLUSH_BLOCK_ONLY(s, 0);
}
@@ -2082,8 +2087,8 @@
}
Assert (flush != Z_NO_FLUSH, "no flush?");
if (s->match_available) {
- Tracevv((stderr,"%c", s->window[s->strstart-1]));
- _tr_tally_lit(s, s->window[s->strstart-1], bflush);
+ Tracevv((stderr,"%c", s->window[s->strstart - 1]));
+ _tr_tally_lit(s, s->window[s->strstart - 1], bflush);
s->match_available = 0;
}
s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
@@ -2140,7 +2145,8 @@
if (s->match_length > s->lookahead)
s->match_length = s->lookahead;
}
- Assert(scan <= s->window+(uInt)(s->window_size-1), "wild scan");
+ Assert(scan <= s->window + (uInt)(s->window_size - 1),
+ "wild scan");
}
/* Emit match if have run of MIN_MATCH or longer, else emit literal */
@@ -2155,7 +2161,7 @@
} else {
/* No match, output a literal byte */
Tracevv((stderr,"%c", s->window[s->strstart]));
- _tr_tally_lit (s, s->window[s->strstart], bflush);
+ _tr_tally_lit(s, s->window[s->strstart], bflush);
s->lookahead--;
s->strstart++;
}
@@ -2195,7 +2201,7 @@
/* Output a literal byte */
s->match_length = 0;
Tracevv((stderr,"%c", s->window[s->strstart]));
- _tr_tally_lit (s, s->window[s->strstart], bflush);
+ _tr_tally_lit(s, s->window[s->strstart], bflush);
s->lookahead--;
s->strstart++;
if (bflush) FLUSH_BLOCK(s, 0);
Modified: branches/stable/source/src/libs/zlib/zlib-src/deflate.h
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/deflate.h 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/deflate.h 2022-11-14 21:05:34 UTC (rev 884)
@@ -329,8 +329,8 @@
# define _tr_tally_dist(s, distance, length, flush) \
{ uch len = (uch)(length); \
ush dist = (ush)(distance); \
- s->sym_buf[s->sym_next++] = dist; \
- s->sym_buf[s->sym_next++] = dist >> 8; \
+ s->sym_buf[s->sym_next++] = (uch)dist; \
+ s->sym_buf[s->sym_next++] = (uch)(dist >> 8); \
s->sym_buf[s->sym_next++] = len; \
dist--; \
s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
Modified: branches/stable/source/src/libs/zlib/zlib-src/examples/enough.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/examples/enough.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/examples/enough.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -486,7 +486,7 @@
// are 286, 9, and 15 respectively, for the deflate literal/length code. The
// possible codes are counted for each number of coded symbols from two to the
// maximum. The counts for each of those and the total number of codes are
-// shown. The maximum number of inflate table entires is then calculated across
+// shown. The maximum number of inflate table entries is then calculated across
// all possible codes. Each new maximum number of table entries and the
// associated sub-code (starting at root + 1 == 10 bits) is shown.
//
Modified: branches/stable/source/src/libs/zlib/zlib-src/examples/fitblk.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/examples/fitblk.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/examples/fitblk.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -17,7 +17,7 @@
data in order to determine how much of that input will compress to
nearly the requested output block size. The first pass generates
enough deflate blocks to produce output to fill the requested
- output size plus a specfied excess amount (see the EXCESS define
+ output size plus a specified excess amount (see the EXCESS define
below). The last deflate block may go quite a bit past that, but
is discarded. The second pass decompresses and recompresses just
the compressed data that fit in the requested plus excess sized
@@ -109,7 +109,7 @@
if (ret == Z_MEM_ERROR)
return ret;
- /* compress what was decompresed until done or no room */
+ /* compress what was decompressed until done or no room */
def->avail_in = RAWLEN - inf->avail_out;
def->next_in = raw;
if (inf->avail_out != 0)
Modified: branches/stable/source/src/libs/zlib/zlib-src/examples/gun.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/examples/gun.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/examples/gun.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -43,7 +43,7 @@
gun will also decompress files made by Unix compress, which uses LZW
compression. These files are automatically detected by virtue of their
magic header bytes. Since the end of Unix compress stream is marked by the
- end-of-file, they cannot be concantenated. If a Unix compress stream is
+ end-of-file, they cannot be concatenated. If a Unix compress stream is
encountered in an input file, it is the last stream in that file.
Like gunzip and uncompress, the file attributes of the original compressed
Modified: branches/stable/source/src/libs/zlib/zlib-src/examples/gzappend.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/examples/gzappend.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/examples/gzappend.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -33,7 +33,7 @@
* - Add L to constants in lseek() calls
* - Remove some debugging information in error messages
* - Use new data_type definition for zlib 1.2.1
- * - Simplfy and unify file operations
+ * - Simplify and unify file operations
* - Finish off gzip file in gztack()
* - Use deflatePrime() instead of adding empty blocks
* - Keep gzip file clean on appended file read errors
@@ -54,7 +54,7 @@
block boundary to facilitate locating and modifying the last block bit at
the start of the final deflate block. Also whether using Z_BLOCK or not,
another required feature of zlib 1.2.x is that inflate() now provides the
- number of unusued bits in the last input byte used. gzappend will not work
+ number of unused bits in the last input byte used. gzappend will not work
with versions of zlib earlier than 1.2.1.
gzappend first decompresses the gzip file internally, discarding all but
Modified: branches/stable/source/src/libs/zlib/zlib-src/examples/gzlog.h
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/examples/gzlog.h 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/examples/gzlog.h 2022-11-14 21:05:34 UTC (rev 884)
@@ -40,7 +40,7 @@
its new size at that time. After each write operation, the log file is a
valid gzip file that can decompressed to recover what was written.
- The gzlog operations can be interupted at any point due to an application or
+ The gzlog operations can be interrupted at any point due to an application or
system crash, and the log file will be recovered the next time the log is
opened with gzlog_open().
*/
Modified: branches/stable/source/src/libs/zlib/zlib-src/examples/zran.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/examples/zran.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/examples/zran.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -21,7 +21,7 @@
An access point can be created at the start of any deflate block, by saving
the starting file offset and bit of that block, and the 32K bytes of
uncompressed data that precede that block. Also the uncompressed offset of
- that block is saved to provide a referece for locating a desired starting
+ that block is saved to provide a reference for locating a desired starting
point in the uncompressed stream. deflate_index_build() works by
decompressing the input zlib or gzip stream a block at a time, and at the
end of each block deciding if enough uncompressed data has gone by to
Modified: branches/stable/source/src/libs/zlib/zlib-src/gzlib.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/gzlib.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/gzlib.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -30,7 +30,7 @@
The gz_strwinerror function does not change the current setting of
GetLastError. */
-char ZLIB_INTERNAL *gz_strwinerror (error)
+char ZLIB_INTERNAL *gz_strwinerror(error)
DWORD error;
{
static char buf[1024];
Modified: branches/stable/source/src/libs/zlib/zlib-src/gzread.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/gzread.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/gzread.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -157,11 +157,9 @@
the output buffer is larger than the input buffer, which also assures
space for gzungetc() */
state->x.next = state->out;
- if (strm->avail_in) {
- memcpy(state->x.next, strm->next_in, strm->avail_in);
- state->x.have = strm->avail_in;
- strm->avail_in = 0;
- }
+ memcpy(state->x.next, strm->next_in, strm->avail_in);
+ state->x.have = strm->avail_in;
+ strm->avail_in = 0;
state->how = COPY;
state->direct = 1;
return 0;
Modified: branches/stable/source/src/libs/zlib/zlib-src/gzwrite.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/gzwrite.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/gzwrite.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -474,7 +474,7 @@
#else /* !STDC && !Z_HAVE_STDARG_H */
/* -- see zlib.h -- */
-int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
+int ZEXPORTVA gzprintf(file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
gzFile file;
const char *format;
Modified: branches/stable/source/src/libs/zlib/zlib-src/infback.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/infback.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/infback.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -66,6 +66,7 @@
state->window = window;
state->wnext = 0;
state->whave = 0;
+ state->sane = 1;
return Z_OK;
}
@@ -605,12 +606,8 @@
break;
case DONE:
- /* inflate stream terminated properly -- write leftover output */
+ /* inflate stream terminated properly */
ret = Z_STREAM_END;
- if (left < state->wsize) {
- if (out(out_desc, state->window, state->wsize - left))
- ret = Z_BUF_ERROR;
- }
goto inf_leave;
case BAD:
@@ -617,13 +614,19 @@
ret = Z_DATA_ERROR;
goto inf_leave;
- default: /* can't happen, but makes compilers happy */
+ default:
+ /* can't happen, but makes compilers happy */
ret = Z_STREAM_ERROR;
goto inf_leave;
}
- /* Return unused input */
+ /* Write leftover output and return unused input */
inf_leave:
+ if (left < state->wsize) {
+ if (out(out_desc, state->window, state->wsize - left) &&
+ ret == Z_STREAM_END)
+ ret = Z_BUF_ERROR;
+ }
strm->next_in = next;
strm->avail_in = have;
return ret;
Modified: branches/stable/source/src/libs/zlib/zlib-src/inflate.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/inflate.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/inflate.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -168,6 +168,8 @@
/* extract wrap request from windowBits parameter */
if (windowBits < 0) {
+ if (windowBits < -15)
+ return Z_STREAM_ERROR;
wrap = 0;
windowBits = -windowBits;
}
@@ -764,8 +766,9 @@
if (copy > have) copy = have;
if (copy) {
if (state->head != Z_NULL &&
- state->head->extra != Z_NULL) {
- len = state->head->extra_len - state->length;
+ state->head->extra != Z_NULL &&
+ (len = state->head->extra_len - state->length) <
+ state->head->extra_max) {
zmemcpy(state->head->extra + len, next,
len + copy > state->head->extra_max ?
state->head->extra_max - len : copy);
Modified: branches/stable/source/src/libs/zlib/zlib-src/inftrees.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/inftrees.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/inftrees.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -9,7 +9,7 @@
#define MAXBITS 15
const char inflate_copyright[] =
- " inflate 1.2.12 Copyright 1995-2022 Mark Adler ";
+ " inflate 1.2.13 Copyright 1995-2022 Mark Adler ";
/*
If you use the zlib library in a product, an acknowledgment is welcome
in the documentation of your product. If for some reason you cannot
@@ -62,7 +62,7 @@
35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
static const unsigned short lext[31] = { /* Length codes 257..285 extra */
16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
- 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 199, 202};
+ 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 194, 65};
static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
Modified: branches/stable/source/src/libs/zlib/zlib-src/inftrees.h
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/inftrees.h 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/inftrees.h 2022-11-14 21:05:34 UTC (rev 884)
@@ -38,7 +38,7 @@
/* Maximum size of the dynamic table. The maximum number of code structures is
1444, which is the sum of 852 for literal/length codes and 592 for distance
codes. These values were found by exhaustive searches using the program
- examples/enough.c found in the zlib distribtution. The arguments to that
+ examples/enough.c found in the zlib distribution. The arguments to that
program are the number of symbols, the initial root table size, and the
maximum bit length of a code. "enough 286 9 15" for literal/length codes
returns returns 852, and "enough 30 6 15" for distance codes returns 592.
Modified: branches/stable/source/src/libs/zlib/zlib-src/make_vms.com
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/make_vms.com 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/make_vms.com 2022-11-14 21:05:34 UTC (rev 884)
@@ -14,9 +14,9 @@
$! 0.03 20091224 Add support for large file check
$! 0.04 20100110 Add new gzclose, gzlib, gzread, gzwrite
$! 0.05 20100221 Exchange zlibdefs.h by zconf.h.in
-$! 0.06 20120111 Fix missing amiss_err, update zconf_h.in, fix new exmples
+$! 0.06 20120111 Fix missing amiss_err, update zconf_h.in, fix new examples
$! subdir path, update module search in makefile.in
-$! 0.07 20120115 Triggered by work done by Alexey Chupahin completly redesigned
+$! 0.07 20120115 Triggered by work done by Alexey Chupahin completely redesigned
$! shared image creation
$! 0.08 20120219 Make it work on VAX again, pre-load missing symbols to shared
$! image
Modified: branches/stable/source/src/libs/zlib/zlib-src/os400/README400
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/os400/README400 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/os400/README400 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,9 +1,9 @@
- ZLIB version 1.2.12 for OS/400 installation instructions
+ ZLIB version 1.2.13 for OS/400 installation instructions
1) Download and unpack the zlib tarball to some IFS directory.
(i.e.: /path/to/the/zlib/ifs/source/directory)
- If the installed IFS command suppors gzip format, this is straightforward,
+ If the installed IFS command supports gzip format, this is straightforward,
else you have to unpack first to some directory on a system supporting it,
then move the whole directory to the IFS via the network (via SMB or FTP).
@@ -43,6 +43,6 @@
Remember that most foreign textual data are ASCII coded: this
implementation does not handle conversion from/to ASCII, so
- text data code conversions must be done explicitely.
+ text data code conversions must be done explicitly.
Mainly for the reason above, always open zipped files in binary mode.
Modified: branches/stable/source/src/libs/zlib/zlib-src/os400/bndsrc
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/os400/bndsrc 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/os400/bndsrc 2022-11-14 21:05:34 UTC (rev 884)
@@ -116,4 +116,12 @@
EXPORT SYMBOL("inflateValidate")
EXPORT SYMBOL("uncompress2")
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+/* Version 1.2.12 additional entry points. */
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+
+ EXPORT SYMBOL("crc32_combine_gen64")
+ EXPORT SYMBOL("crc32_combine_gen")
+ EXPORT SYMBOL("crc32_combine_op")
+
ENDPGMEXP
Modified: branches/stable/source/src/libs/zlib/zlib-src/os400/zlib.inc
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/os400/zlib.inc 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/os400/zlib.inc 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,7 +1,7 @@
* ZLIB.INC - Interface to the general purpose compression library
*
* ILE RPG400 version by Patrick Monnerat, DATASPHERE.
- * Version 1.2.12
+ * Version 1.2.13
*
*
* WARNING:
@@ -22,12 +22,12 @@
*
* Versioning information.
*
- D ZLIB_VERSION C '1.2.12'
+ D ZLIB_VERSION C '1.2.13'
D ZLIB_VERNUM C X'12a0'
D ZLIB_VER_MAJOR C 1
D ZLIB_VER_MINOR C 2
D ZLIB_VER_REVISION...
- D C 12
+ D C 13
D ZLIB_VER_SUBREVISION...
D C 0
*
Modified: branches/stable/source/src/libs/zlib/zlib-src/qnx/package.qpg
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/qnx/package.qpg 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/qnx/package.qpg 2022-11-14 21:05:34 UTC (rev 884)
@@ -25,10 +25,10 @@
<QPG:Files>
<QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/>
<QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/>
- <QPG:Add file="../libz.so.1.2.12" install="/opt/lib/" user="root:bin" permission="644"/>
- <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.12"/>
- <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.12"/>
- <QPG:Add file="../libz.so.1.2.12" install="/opt/lib/" component="slib"/>
+ <QPG:Add file="../libz.so.1.2.13" install="/opt/lib/" user="root:bin" permission="644"/>
+ <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.13"/>
+ <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.13"/>
+ <QPG:Add file="../libz.so.1.2.13" install="/opt/lib/" component="slib"/>
</QPG:Files>
<QPG:PackageFilter>
@@ -63,7 +63,7 @@
</QPM:ProductDescription>
<QPM:ReleaseDescription>
- <QPM:ReleaseVersion>1.2.12</QPM:ReleaseVersion>
+ <QPM:ReleaseVersion>1.2.13</QPM:ReleaseVersion>
<QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency>
<QPM:ReleaseStability>Stable</QPM:ReleaseStability>
<QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor>
Modified: branches/stable/source/src/libs/zlib/zlib-src/test/example.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/test/example.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/test/example.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -555,7 +555,8 @@
exit(1);
} else if (strcmp(zlibVersion(), ZLIB_VERSION) != 0) {
- fprintf(stderr, "warning: different zlib version\n");
+ fprintf(stderr, "warning: different zlib version linked: %s\n",
+ zlibVersion());
}
printf("zlib version %s = 0x%04x, compile flags = 0x%lx\n",
Modified: branches/stable/source/src/libs/zlib/zlib-src/test/minigzip.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/test/minigzip.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/test/minigzip.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -500,7 +500,7 @@
char *infile, *outfile;
FILE *out;
gzFile in;
- unsigned len = strlen(file);
+ z_size_t len = strlen(file);
if (len + strlen(GZ_SUFFIX) >= sizeof(buf)) {
fprintf(stderr, "%s: filename too long\n", prog);
Modified: branches/stable/source/src/libs/zlib/zlib-src/treebuild.xml
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/treebuild.xml 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/treebuild.xml 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
-<package name="zlib" version="1.2.12">
- <library name="zlib" dlversion="1.2.12" dlname="z">
+<package name="zlib" version="1.2.13">
+ <library name="zlib" dlversion="1.2.13" dlname="z">
<property name="description"> zip compression library </property>
<property name="include-target-dir" value="$(@PACKAGE/install-includedir)" />
Modified: branches/stable/source/src/libs/zlib/zlib-src/trees.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/trees.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/trees.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -193,7 +193,7 @@
s->bits_sent += (ulg)length;
/* If not enough room in bi_buf, use (valid) bits from bi_buf and
- * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))
+ * (16 - bi_valid) bits from value, leaving (width - (16 - bi_valid))
* unused bits in value.
*/
if (s->bi_valid > (int)Buf_size - length) {
@@ -256,7 +256,7 @@
length = 0;
for (code = 0; code < LENGTH_CODES-1; code++) {
base_length[code] = length;
- for (n = 0; n < (1<<extra_lbits[code]); n++) {
+ for (n = 0; n < (1 << extra_lbits[code]); n++) {
_length_code[length++] = (uch)code;
}
}
@@ -265,13 +265,13 @@
* in two different ways: code 284 + 5 bits or code 285, so we
* overwrite length_code[255] to use the best encoding:
*/
- _length_code[length-1] = (uch)code;
+ _length_code[length - 1] = (uch)code;
/* Initialize the mapping dist (0..32K) -> dist code (0..29) */
dist = 0;
for (code = 0 ; code < 16; code++) {
base_dist[code] = dist;
- for (n = 0; n < (1<<extra_dbits[code]); n++) {
+ for (n = 0; n < (1 << extra_dbits[code]); n++) {
_dist_code[dist++] = (uch)code;
}
}
@@ -279,11 +279,11 @@
dist >>= 7; /* from now on, all distances are divided by 128 */
for ( ; code < D_CODES; code++) {
base_dist[code] = dist << 7;
- for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) {
+ for (n = 0; n < (1 << (extra_dbits[code] - 7)); n++) {
_dist_code[256 + dist++] = (uch)code;
}
}
- Assert (dist == 256, "tr_static_init: 256+dist != 512");
+ Assert (dist == 256, "tr_static_init: 256 + dist != 512");
/* Construct the codes of the static literal tree */
for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0;
@@ -312,7 +312,7 @@
}
/* ===========================================================================
- * Genererate the file trees.h describing the static trees.
+ * Generate the file trees.h describing the static trees.
*/
#ifdef GEN_TREES_H
# ifndef ZLIB_DEBUG
@@ -321,7 +321,7 @@
# define SEPARATOR(i, last, width) \
((i) == (last)? "\n};\n\n" : \
- ((i) % (width) == (width)-1 ? ",\n" : ", "))
+ ((i) % (width) == (width) - 1 ? ",\n" : ", "))
void gen_trees_header()
{
@@ -458,7 +458,7 @@
while (j <= s->heap_len) {
/* Set j to the smallest of the two sons: */
if (j < s->heap_len &&
- smaller(tree, s->heap[j+1], s->heap[j], s->depth)) {
+ smaller(tree, s->heap[j + 1], s->heap[j], s->depth)) {
j++;
}
/* Exit if v is smaller than both sons */
@@ -507,7 +507,7 @@
*/
tree[s->heap[s->heap_max]].Len = 0; /* root of the heap */
- for (h = s->heap_max+1; h < HEAP_SIZE; h++) {
+ for (h = s->heap_max + 1; h < HEAP_SIZE; h++) {
n = s->heap[h];
bits = tree[tree[n].Dad].Len + 1;
if (bits > max_length) bits = max_length, overflow++;
@@ -518,7 +518,7 @@
s->bl_count[bits]++;
xbits = 0;
- if (n >= base) xbits = extra[n-base];
+ if (n >= base) xbits = extra[n - base];
f = tree[n].Freq;
s->opt_len += (ulg)f * (unsigned)(bits + xbits);
if (stree) s->static_len += (ulg)f * (unsigned)(stree[n].Len + xbits);
@@ -530,10 +530,10 @@
/* Find the first bit length which could increase: */
do {
- bits = max_length-1;
+ bits = max_length - 1;
while (s->bl_count[bits] == 0) bits--;
- s->bl_count[bits]--; /* move one leaf down the tree */
- s->bl_count[bits+1] += 2; /* move one overflow item as its brother */
+ s->bl_count[bits]--; /* move one leaf down the tree */
+ s->bl_count[bits + 1] += 2; /* move one overflow item as its brother */
s->bl_count[max_length]--;
/* The brother of the overflow item also moves one step up,
* but this does not affect bl_count[max_length]
@@ -569,7 +569,7 @@
* OUT assertion: the field code is set for all tree elements of non
* zero code length.
*/
-local void gen_codes (tree, max_code, bl_count)
+local void gen_codes(tree, max_code, bl_count)
ct_data *tree; /* the tree to decorate */
int max_code; /* largest code with non zero frequency */
ushf *bl_count; /* number of codes at each bit length */
@@ -583,13 +583,13 @@
* without bit reversal.
*/
for (bits = 1; bits <= MAX_BITS; bits++) {
- code = (code + bl_count[bits-1]) << 1;
+ code = (code + bl_count[bits - 1]) << 1;
next_code[bits] = (ush)code;
}
/* Check that the bit counts in bl_count are consistent. The last code
* must be all ones.
*/
- Assert (code + bl_count[MAX_BITS]-1 == (1<<MAX_BITS)-1,
+ Assert (code + bl_count[MAX_BITS] - 1 == (1 << MAX_BITS) - 1,
"inconsistent bit counts");
Tracev((stderr,"\ngen_codes: max_code %d ", max_code));
@@ -600,7 +600,7 @@
tree[n].Code = (ush)bi_reverse(next_code[len]++, len);
Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
- n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1));
+ n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len] - 1));
}
}
@@ -624,7 +624,7 @@
int node; /* new node being created */
/* Construct the initial heap, with least frequent element in
- * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1].
+ * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n + 1].
* heap[0] is not used.
*/
s->heap_len = 0, s->heap_max = HEAP_SIZE;
@@ -652,7 +652,7 @@
}
desc->max_code = max_code;
- /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,
+ /* The elements heap[heap_len/2 + 1 .. heap_len] are leaves of the tree,
* establish sub-heaps of increasing lengths:
*/
for (n = s->heap_len/2; n >= 1; n--) pqdownheap(s, tree, n);
@@ -700,7 +700,7 @@
* Scan a literal or distance tree to determine the frequencies of the codes
* in the bit length tree.
*/
-local void scan_tree (s, tree, max_code)
+local void scan_tree(s, tree, max_code)
deflate_state *s;
ct_data *tree; /* the tree to be scanned */
int max_code; /* and its largest code of non zero frequency */
@@ -714,10 +714,10 @@
int min_count = 4; /* min repeat count */
if (nextlen == 0) max_count = 138, min_count = 3;
- tree[max_code+1].Len = (ush)0xffff; /* guard */
+ tree[max_code + 1].Len = (ush)0xffff; /* guard */
for (n = 0; n <= max_code; n++) {
- curlen = nextlen; nextlen = tree[n+1].Len;
+ curlen = nextlen; nextlen = tree[n + 1].Len;
if (++count < max_count && curlen == nextlen) {
continue;
} else if (count < min_count) {
@@ -745,7 +745,7 @@
* Send a literal or distance tree in compressed form, using the codes in
* bl_tree.
*/
-local void send_tree (s, tree, max_code)
+local void send_tree(s, tree, max_code)
deflate_state *s;
ct_data *tree; /* the tree to be scanned */
int max_code; /* and its largest code of non zero frequency */
@@ -758,11 +758,11 @@
int max_count = 7; /* max repeat count */
int min_count = 4; /* min repeat count */
- /* tree[max_code+1].Len = -1; */ /* guard already set */
+ /* tree[max_code + 1].Len = -1; */ /* guard already set */
if (nextlen == 0) max_count = 138, min_count = 3;
for (n = 0; n <= max_code; n++) {
- curlen = nextlen; nextlen = tree[n+1].Len;
+ curlen = nextlen; nextlen = tree[n + 1].Len;
if (++count < max_count && curlen == nextlen) {
continue;
} else if (count < min_count) {
@@ -773,13 +773,13 @@
send_code(s, curlen, s->bl_tree); count--;
}
Assert(count >= 3 && count <= 6, " 3_6?");
- send_code(s, REP_3_6, s->bl_tree); send_bits(s, count-3, 2);
+ send_code(s, REP_3_6, s->bl_tree); send_bits(s, count - 3, 2);
} else if (count <= 10) {
- send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count-3, 3);
+ send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count - 3, 3);
} else {
- send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count-11, 7);
+ send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count - 11, 7);
}
count = 0; prevlen = curlen;
if (nextlen == 0) {
@@ -807,8 +807,8 @@
/* Build the bit length tree: */
build_tree(s, (tree_desc *)(&(s->bl_desc)));
- /* opt_len now includes the length of the tree representations, except
- * the lengths of the bit lengths codes and the 5+5+4 bits for the counts.
+ /* opt_len now includes the length of the tree representations, except the
+ * lengths of the bit lengths codes and the 5 + 5 + 4 bits for the counts.
*/
/* Determine the number of bit length codes to send. The pkzip format
@@ -819,7 +819,7 @@
if (s->bl_tree[bl_order[max_blindex]].Len != 0) break;
}
/* Update opt_len to include the bit length tree and counts */
- s->opt_len += 3*((ulg)max_blindex+1) + 5+5+4;
+ s->opt_len += 3*((ulg)max_blindex + 1) + 5 + 5 + 4;
Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",
s->opt_len, s->static_len));
@@ -841,9 +841,9 @@
Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES,
"too many codes");
Tracev((stderr, "\nbl counts: "));
- send_bits(s, lcodes-257, 5); /* not +255 as stated in appnote.txt */
- send_bits(s, dcodes-1, 5);
- send_bits(s, blcodes-4, 4); /* not -3 as stated in appnote.txt */
+ send_bits(s, lcodes - 257, 5); /* not +255 as stated in appnote.txt */
+ send_bits(s, dcodes - 1, 5);
+ send_bits(s, blcodes - 4, 4); /* not -3 as stated in appnote.txt */
for (rank = 0; rank < blcodes; rank++) {
Tracev((stderr, "\nbl code %2d ", bl_order[rank]));
send_bits(s, s->bl_tree[bl_order[rank]].Len, 3);
@@ -850,10 +850,10 @@
}
Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent));
- send_tree(s, (ct_data *)s->dyn_ltree, lcodes-1); /* literal tree */
+ send_tree(s, (ct_data *)s->dyn_ltree, lcodes - 1); /* literal tree */
Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent));
- send_tree(s, (ct_data *)s->dyn_dtree, dcodes-1); /* distance tree */
+ send_tree(s, (ct_data *)s->dyn_dtree, dcodes - 1); /* distance tree */
Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent));
}
@@ -866,7 +866,7 @@
ulg stored_len; /* length of input block */
int last; /* one if this is the last block for a file */
{
- send_bits(s, (STORED_BLOCK<<1)+last, 3); /* send block type */
+ send_bits(s, (STORED_BLOCK<<1) + last, 3); /* send block type */
bi_windup(s); /* align on byte boundary */
put_short(s, (ush)stored_len);
put_short(s, (ush)~stored_len);
@@ -877,7 +877,7 @@
s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L;
s->compressed_len += (stored_len + 4) << 3;
s->bits_sent += 2*16;
- s->bits_sent += stored_len<<3;
+ s->bits_sent += stored_len << 3;
#endif
}
@@ -943,14 +943,17 @@
max_blindex = build_bl_tree(s);
/* Determine the best encoding. Compute the block lengths in bytes. */
- opt_lenb = (s->opt_len+3+7)>>3;
- static_lenb = (s->static_len+3+7)>>3;
+ opt_lenb = (s->opt_len + 3 + 7) >> 3;
+ static_lenb = (s->static_len + 3 + 7) >> 3;
Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",
opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
s->sym_next / 3));
- if (static_lenb <= opt_lenb) opt_lenb = static_lenb;
+#ifndef FORCE_STATIC
+ if (static_lenb <= opt_lenb || s->strategy == Z_FIXED)
+#endif
+ opt_lenb = static_lenb;
} else {
Assert(buf != (char*)0, "lost buf");
@@ -960,7 +963,7 @@
#ifdef FORCE_STORED
if (buf != (char*)0) { /* force stored block */
#else
- if (stored_len+4 <= opt_lenb && buf != (char*)0) {
+ if (stored_len + 4 <= opt_lenb && buf != (char*)0) {
/* 4: two words for the lengths */
#endif
/* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.
@@ -971,12 +974,8 @@
*/
_tr_stored_block(s, buf, stored_len, last);
-#ifdef FORCE_STATIC
- } else if (static_lenb >= 0) { /* force static trees */
-#else
- } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) {
-#endif
- send_bits(s, (STATIC_TREES<<1)+last, 3);
+ } else if (static_lenb == opt_lenb) {
+ send_bits(s, (STATIC_TREES<<1) + last, 3);
compress_block(s, (const ct_data *)static_ltree,
(const ct_data *)static_dtree);
#ifdef ZLIB_DEBUG
@@ -983,9 +982,9 @@
s->compressed_len += 3 + s->static_len;
#endif
} else {
- send_bits(s, (DYN_TREES<<1)+last, 3);
- send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1,
- max_blindex+1);
+ send_bits(s, (DYN_TREES<<1) + last, 3);
+ send_all_trees(s, s->l_desc.max_code + 1, s->d_desc.max_code + 1,
+ max_blindex + 1);
compress_block(s, (const ct_data *)s->dyn_ltree,
(const ct_data *)s->dyn_dtree);
#ifdef ZLIB_DEBUG
@@ -1004,8 +1003,8 @@
s->compressed_len += 7; /* align on byte boundary */
#endif
}
- Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3,
- s->compressed_len-7*last));
+ Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len >> 3,
+ s->compressed_len - 7*last));
}
/* ===========================================================================
@@ -1012,14 +1011,14 @@
* Save the match info and tally the frequency counts. Return true if
* the current block must be flushed.
*/
-int ZLIB_INTERNAL _tr_tally (s, dist, lc)
+int ZLIB_INTERNAL _tr_tally(s, dist, lc)
deflate_state *s;
unsigned dist; /* distance of matched string */
- unsigned lc; /* match length-MIN_MATCH or unmatched char (if dist==0) */
+ unsigned lc; /* match length - MIN_MATCH or unmatched char (dist==0) */
{
- s->sym_buf[s->sym_next++] = dist;
- s->sym_buf[s->sym_next++] = dist >> 8;
- s->sym_buf[s->sym_next++] = lc;
+ s->sym_buf[s->sym_next++] = (uch)dist;
+ s->sym_buf[s->sym_next++] = (uch)(dist >> 8);
+ s->sym_buf[s->sym_next++] = (uch)lc;
if (dist == 0) {
/* lc is the unmatched char */
s->dyn_ltree[lc].Freq++;
@@ -1031,7 +1030,7 @@
(ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) &&
(ush)d_code(dist) < (ush)D_CODES, "_tr_tally: bad match");
- s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++;
+ s->dyn_ltree[_length_code[lc] + LITERALS + 1].Freq++;
s->dyn_dtree[d_code(dist)].Freq++;
}
return (s->sym_next == s->sym_end);
@@ -1061,7 +1060,7 @@
} else {
/* Here, lc is the match length - MIN_MATCH */
code = _length_code[lc];
- send_code(s, code+LITERALS+1, ltree); /* send the length code */
+ send_code(s, code + LITERALS + 1, ltree); /* send length code */
extra = extra_lbits[code];
if (extra != 0) {
lc -= base_length[code];
@@ -1177,6 +1176,6 @@
s->bi_buf = 0;
s->bi_valid = 0;
#ifdef ZLIB_DEBUG
- s->bits_sent = (s->bits_sent+7) & ~7;
+ s->bits_sent = (s->bits_sent + 7) & ~7;
#endif
}
Modified: branches/stable/source/src/libs/zlib/zlib-src/uncompr.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/uncompr.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/uncompr.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -24,7 +24,7 @@
Z_DATA_ERROR if the input data was corrupted, including if the input data is
an incomplete zlib stream.
*/
-int ZEXPORT uncompress2 (dest, destLen, source, sourceLen)
+int ZEXPORT uncompress2(dest, destLen, source, sourceLen)
Bytef *dest;
uLongf *destLen;
const Bytef *source;
@@ -83,7 +83,7 @@
err;
}
-int ZEXPORT uncompress (dest, destLen, source, sourceLen)
+int ZEXPORT uncompress(dest, destLen, source, sourceLen)
Bytef *dest;
uLongf *destLen;
const Bytef *source;
Modified: branches/stable/source/src/libs/zlib/zlib-src/win32/README-WIN32.txt
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/win32/README-WIN32.txt 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/win32/README-WIN32.txt 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,6 +1,6 @@
ZLIB DATA COMPRESSION LIBRARY
-zlib 1.2.12 is a general purpose data compression library. All the code is
+zlib 1.2.13 is a general purpose data compression library. All the code is
thread safe. The data format used by the zlib library is described by RFCs
(Request for Comments) 1950 to 1952 in the files
http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
@@ -22,7 +22,7 @@
Manifest:
-The package zlib-1.2.12-win32-x86.zip will contain the following files:
+The package zlib-1.2.13-win32-x86.zip will contain the following files:
README-WIN32.txt This document
ChangeLog Changes since previous zlib packages
Modified: branches/stable/source/src/libs/zlib/zlib-src/win32/zlib1.rc
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/win32/zlib1.rc 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/win32/zlib1.rc 2022-11-14 21:05:34 UTC (rev 884)
@@ -26,7 +26,7 @@
VALUE "FileDescription", "zlib data compression library\0"
VALUE "FileVersion", ZLIB_VERSION "\0"
VALUE "InternalName", "zlib1.dll\0"
- VALUE "LegalCopyright", "(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
+ VALUE "LegalCopyright", "(C) 1995-2022 Jean-loup Gailly & Mark Adler\0"
VALUE "OriginalFilename", "zlib1.dll\0"
VALUE "ProductName", "zlib\0"
VALUE "ProductVersion", ZLIB_VERSION "\0"
Modified: branches/stable/source/src/libs/zlib/zlib-src/zconf.h.cmakein
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/zconf.h.cmakein 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/zconf.h.cmakein 2022-11-14 21:05:34 UTC (rev 884)
@@ -40,6 +40,9 @@
# define crc32 z_crc32
# define crc32_combine z_crc32_combine
# define crc32_combine64 z_crc32_combine64
+# define crc32_combine_gen z_crc32_combine_gen
+# define crc32_combine_gen64 z_crc32_combine_gen64
+# define crc32_combine_op z_crc32_combine_op
# define crc32_z z_crc32_z
# define deflate z_deflate
# define deflateBound z_deflateBound
@@ -351,6 +354,9 @@
# ifdef FAR
# undef FAR
# endif
+# ifndef WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+# endif
# include <windows.h>
/* No need for _export, use ZLIB.DEF instead. */
/* For complete Windows compatibility, use WINAPI, not __stdcall. */
@@ -469,11 +475,18 @@
# undef _LARGEFILE64_SOURCE
#endif
-#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
-# define Z_HAVE_UNISTD_H
+#ifndef Z_HAVE_UNISTD_H
+# ifdef __WATCOMC__
+# define Z_HAVE_UNISTD_H
+# endif
#endif
+#ifndef Z_HAVE_UNISTD_H
+# if defined(_LARGEFILE64_SOURCE) && !defined(_WIN32)
+# define Z_HAVE_UNISTD_H
+# endif
+#endif
#ifndef Z_SOLO
-# if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
+# if defined(Z_HAVE_UNISTD_H)
# include <unistd.h> /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
# ifdef VMS
# include <unixio.h> /* for off_t */
Modified: branches/stable/source/src/libs/zlib/zlib-src/zconf.h.in
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/zconf.h.in 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/zconf.h.in 2022-11-14 21:05:34 UTC (rev 884)
@@ -38,6 +38,9 @@
# define crc32 z_crc32
# define crc32_combine z_crc32_combine
# define crc32_combine64 z_crc32_combine64
+# define crc32_combine_gen z_crc32_combine_gen
+# define crc32_combine_gen64 z_crc32_combine_gen64
+# define crc32_combine_op z_crc32_combine_op
# define crc32_z z_crc32_z
# define deflate z_deflate
# define deflateBound z_deflateBound
@@ -349,6 +352,9 @@
# ifdef FAR
# undef FAR
# endif
+# ifndef WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+# endif
# include <windows.h>
/* No need for _export, use ZLIB.DEF instead. */
/* For complete Windows compatibility, use WINAPI, not __stdcall. */
@@ -467,11 +473,18 @@
# undef _LARGEFILE64_SOURCE
#endif
-#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
-# define Z_HAVE_UNISTD_H
+#ifndef Z_HAVE_UNISTD_H
+# ifdef __WATCOMC__
+# define Z_HAVE_UNISTD_H
+# endif
#endif
+#ifndef Z_HAVE_UNISTD_H
+# if defined(_LARGEFILE64_SOURCE) && !defined(_WIN32)
+# define Z_HAVE_UNISTD_H
+# endif
+#endif
#ifndef Z_SOLO
-# if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
+# if defined(Z_HAVE_UNISTD_H)
# include <unistd.h> /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
# ifdef VMS
# include <unixio.h> /* for off_t */
Modified: branches/stable/source/src/libs/zlib/zlib-src/zlib.3
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/zlib.3 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/zlib.3 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,4 +1,4 @@
-.TH ZLIB 3 "27 Mar 2022"
+.TH ZLIB 3 "13 Oct 2022"
.SH NAME
zlib \- compression/decompression library
.SH SYNOPSIS
@@ -105,7 +105,7 @@
Send questions and/or comments to zlib at gzip.org,
or (for the Windows DLL version) to Gilles Vollant (info at winimage.com).
.SH AUTHORS AND LICENSE
-Version 1.2.12
+Version 1.2.13
.LP
Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
.LP
Modified: branches/stable/source/src/libs/zlib/zlib-src/zlib.3.pdf
===================================================================
(Binary files differ)
Modified: branches/stable/source/src/libs/zlib/zlib-src/zlib.h
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/zlib.h 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/zlib.h 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,5 +1,5 @@
/* zlib.h -- interface of the 'zlib' general purpose compression library
- version 1.2.12, March 11th, 2022
+ version 1.2.13, October 13th, 2022
Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
@@ -37,11 +37,11 @@
extern "C" {
#endif
-#define ZLIB_VERSION "1.2.12"
-#define ZLIB_VERNUM 0x12c0
+#define ZLIB_VERSION "1.2.13"
+#define ZLIB_VERNUM 0x12d0
#define ZLIB_VER_MAJOR 1
#define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 12
+#define ZLIB_VER_REVISION 13
#define ZLIB_VER_SUBREVISION 0
/*
@@ -276,7 +276,7 @@
== 0), or after each call of deflate(). If deflate returns Z_OK and with
zero avail_out, it must be called again after making room in the output
buffer because there might be more output pending. See deflatePending(),
- which can be used if desired to determine whether or not there is more ouput
+ which can be used if desired to determine whether or not there is more output
in that case.
Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
@@ -660,7 +660,7 @@
to dictionary. dictionary must have enough space, where 32768 bytes is
always enough. If deflateGetDictionary() is called with dictionary equal to
Z_NULL, then only the dictionary length is returned, and nothing is copied.
- Similary, if dictLength is Z_NULL, then it is not set.
+ Similarly, if dictLength is Z_NULL, then it is not set.
deflateGetDictionary() may return a length less than the window size, even
when more than the window size in input has been provided. It may return up
@@ -915,7 +915,7 @@
to dictionary. dictionary must have enough space, where 32768 bytes is
always enough. If inflateGetDictionary() is called with dictionary equal to
Z_NULL, then only the dictionary length is returned, and nothing is copied.
- Similary, if dictLength is Z_NULL, then it is not set.
+ Similarly, if dictLength is Z_NULL, then it is not set.
inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
stream state is inconsistent.
@@ -1437,12 +1437,12 @@
In the event that the end of file is reached and only a partial item is
available at the end, i.e. the remaining uncompressed data length is not a
- multiple of size, then the final partial item is nevetheless read into buf
+ multiple of size, then the final partial item is nevertheless read into buf
and the end-of-file flag is set. The length of the partial item read is not
provided, but could be inferred from the result of gztell(). This behavior
is the same as the behavior of fread() implementations in common libraries,
but it prevents the direct use of gzfread() to read a concurrently written
- file, reseting and retrying on end-of-file, when size is not 1.
+ file, resetting and retrying on end-of-file, when size is not 1.
*/
ZEXTERN int ZEXPORT gzwrite OF((gzFile file, voidpc buf, unsigned len));
@@ -1913,7 +1913,7 @@
ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table OF((void));
ZEXTERN int ZEXPORT inflateUndermine OF((z_streamp, int));
ZEXTERN int ZEXPORT inflateValidate OF((z_streamp, int));
-ZEXTERN unsigned long ZEXPORT inflateCodesUsed OF ((z_streamp));
+ZEXTERN unsigned long ZEXPORT inflateCodesUsed OF((z_streamp));
ZEXTERN int ZEXPORT inflateResetKeep OF((z_streamp));
ZEXTERN int ZEXPORT deflateResetKeep OF((z_streamp));
#if defined(_WIN32) && !defined(Z_SOLO)
Modified: branches/stable/source/src/libs/zlib/zlib-src/zlib2ansi
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/zlib2ansi 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/zlib2ansi 2022-11-14 21:05:34 UTC (rev 884)
@@ -8,7 +8,7 @@
# TODO
#
-# Asumes no function pointer parameters. unless they are typedefed.
+# Assumes no function pointer parameters. unless they are typedefed.
# Assumes no literal strings that look like function definitions
# Assumes functions start at the beginning of a line
@@ -104,7 +104,7 @@
no warnings;
- # Strip C & C++ coments
+ # Strip C & C++ comments
# From the perlfaq
$_[0] =~
Modified: branches/stable/source/src/libs/zlib/zlib-src/zutil.c
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/zutil.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/zutil.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -61,9 +61,11 @@
#ifdef ZLIB_DEBUG
flags += 1 << 8;
#endif
+ /*
#if defined(ASMV) || defined(ASMINF)
flags += 1 << 9;
#endif
+ */
#ifdef ZLIB_WINAPI
flags += 1 << 10;
#endif
@@ -119,7 +121,7 @@
# endif
int ZLIB_INTERNAL z_verbose = verbose;
-void ZLIB_INTERNAL z_error (m)
+void ZLIB_INTERNAL z_error(m)
char *m;
{
fprintf(stderr, "%s\n", m);
@@ -214,7 +216,7 @@
* a protected system like OS/2. Use Microsoft C instead.
*/
-voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
+voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, unsigned items, unsigned size)
{
voidpf buf;
ulg bsize = (ulg)items*size;
@@ -240,7 +242,7 @@
return buf;
}
-void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
+void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr)
{
int n;
@@ -277,13 +279,13 @@
# define _hfree hfree
#endif
-voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size)
+voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, uInt items, uInt size)
{
(void)opaque;
return _halloc((long)items, size);
}
-void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
+void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr)
{
(void)opaque;
_hfree(ptr);
@@ -302,7 +304,7 @@
extern void free OF((voidpf ptr));
#endif
-voidpf ZLIB_INTERNAL zcalloc (opaque, items, size)
+voidpf ZLIB_INTERNAL zcalloc(opaque, items, size)
voidpf opaque;
unsigned items;
unsigned size;
@@ -312,7 +314,7 @@
(voidpf)calloc(items, size);
}
-void ZLIB_INTERNAL zcfree (opaque, ptr)
+void ZLIB_INTERNAL zcfree(opaque, ptr)
voidpf opaque;
voidpf ptr;
{
Modified: branches/stable/source/src/libs/zlib/zlib-src/zutil.h
===================================================================
--- branches/stable/source/src/libs/zlib/zlib-src/zutil.h 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/libs/zlib/zlib-src/zutil.h 2022-11-14 21:05:34 UTC (rev 884)
@@ -193,6 +193,7 @@
(!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
+ ZEXTERN uLong ZEXPORT crc32_combine_gen64 OF((z_off_t));
#endif
/* common defaults */
Modified: branches/stable/source/src/m4/ChangeLog
===================================================================
--- branches/stable/source/src/m4/ChangeLog 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/m4/ChangeLog 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,3 +1,8 @@
+2022-08-22 Luigi Scarso <luigi.scarso at gmail.com>
+
+ * kpse-pkgs.m4 (KPSE_LIBS_PKGS): add potrace.
+ * Add kpse-potrace-flags.m4.
+
2021-06-28 Karl Berry <karl at freefriends.org>
* README: list the macros obsoleted by autoconf 2.70 which we use.
Modified: branches/stable/source/src/m4/kpse-pkgs.m4
===================================================================
--- branches/stable/source/src/m4/kpse-pkgs.m4 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/m4/kpse-pkgs.m4 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,4 +1,4 @@
-# $Id: kpse-pkgs.m4 57680 2021-02-08 15:49:16Z karl $
+# $Id: kpse-pkgs.m4 64168 2022-08-22 21:33:05Z lscarso $
# Private Autoconf macros for the TeX Live (TL) tree.
# Copyright 2016-2020 Karl Berry <tex-live at tug.org>
# Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
@@ -37,6 +37,7 @@
cairo
pixman
gd
+potrace
freetype2
libpng
libpaper
@@ -59,6 +60,7 @@
AC_REQUIRE([KPSE_PTEXENC_SYSTEM_FLAGS])[]dnl
AC_REQUIRE([KPSE_ZLIB_SYSTEM_FLAGS])[]dnl
AC_REQUIRE([KPSE_PPLIB_SYSTEM_FLAGS])[]dnl
+AC_REQUIRE([KPSE_POTRACE_SYSTEM_FLAGS])[]dnl
AC_REQUIRE([KPSE_LIBPAPER_SYSTEM_FLAGS])[]dnl
AC_REQUIRE([KPSE_LIBPNG_SYSTEM_FLAGS])[]dnl
AC_REQUIRE([KPSE_FREETYPE2_SYSTEM_FLAGS])[]dnl
Added: branches/stable/source/src/m4/kpse-potrace-flags.m4
===================================================================
--- branches/stable/source/src/m4/kpse-potrace-flags.m4 (rev 0)
+++ branches/stable/source/src/m4/kpse-potrace-flags.m4 2022-11-14 21:05:34 UTC (rev 884)
@@ -0,0 +1,31 @@
+# Public macros for the TeX Live (TL) tree.
+# Copyright (C) 2022 Luigi Scarso <tex-live at tug.org>
+#
+# This file is free software; the copyright holder
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 0
+
+# KPSE_POTRACE_FLAGS
+# ------------------
+# Provide the configure options '--with-system-potrace' (if in the TL tree),
+# '--with-potrace-includes', and '--with-potrace-libdir'.
+#
+# Set the make variables POTRACE_INCLUDES and POTRACE_LIBS to the CPPFLAGS and
+# LIBS required for the `-lpotrace' library in libs/potrace/ of the TL tree.
+AC_DEFUN([KPSE_POTRACE_FLAGS], [dnl
+AC_REQUIRE([KPSE_SAVE_FLAGS])[]dnl
+_KPSE_LIB_FLAGS([potrace], [potrace], [],
+ [-IBLD/libs/potrace/include], [BLD/libs/potrace/libpotrace.a], [],
+ [], [${top_builddir}/../../libs/potrace/include/potrace.h])[]dnl
+]) # KPSE_POTRACE_FLAGS
+
+# KPSE_POTRACE_OPTIONS([WITH-SYSTEM])
+# ----------------------------------
+AC_DEFUN([KPSE_POTRACE_OPTIONS], [_KPSE_LIB_OPTIONS([potrace], [$1])])
+
+# KPSE_POTRACE_SYSTEM_FLAGS
+# ------------------------
+AC_DEFUN([KPSE_POTRACE_SYSTEM_FLAGS], [dnl
+_KPSE_PKG_CONFIG_FLAGS([POTRACE], [POTRACE])])
Property changes on: branches/stable/source/src/m4/kpse-potrace-flags.m4
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Modified: branches/stable/source/src/texk/Makefile.in
===================================================================
--- branches/stable/source/src/texk/Makefile.in 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/Makefile.in 2022-11-14 21:05:34 UTC (rev 884)
@@ -107,6 +107,7 @@
$(top_srcdir)/../m4/kpse-options.m4 \
$(top_srcdir)/../m4/kpse-pixman-flags.m4 \
$(top_srcdir)/../m4/kpse-pkgs.m4 \
+ $(top_srcdir)/../m4/kpse-potrace-flags.m4 \
$(top_srcdir)/../m4/kpse-ptexenc-flags.m4 \
$(top_srcdir)/../m4/kpse-setup.m4 \
$(top_srcdir)/../m4/kpse-teckit-flags.m4 \
@@ -183,6 +184,7 @@
$(top_srcdir)/../libs/cairo/ac/withenable.ac \
$(top_srcdir)/../libs/pixman/ac/withenable.ac \
$(top_srcdir)/../libs/gd/ac/withenable.ac \
+ $(top_srcdir)/../libs/potrace/ac/withenable.ac \
$(top_srcdir)/../libs/freetype2/ac/withenable.ac \
$(top_srcdir)/../libs/libpng/ac/withenable.ac \
$(top_srcdir)/../libs/libpaper/ac/withenable.ac \
Modified: branches/stable/source/src/texk/README
===================================================================
--- branches/stable/source/src/texk/README 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/README 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,4 +1,4 @@
-$Id: README 62463 2022-03-06 01:07:46Z hironobu $
+$Id: README 64953 2022-11-06 22:15:26Z karl $
Copyright 2006-2022 TeX Users Group.
You may freely use, modify and/or distribute this file.
@@ -23,9 +23,7 @@
old info: http://tex.aanhet.net/afm2pl/
bibtex-x - maintained here, contains
- bibtex8
- bibtexu
- old info: http://omega.enstb.org/yannis/bibtexu/
+ bibtex8, bibtexu
chktex 1.7.6 - checked 15mar20
http://mirror.ctan.org/support/chktex/
@@ -35,13 +33,15 @@
http://git.savannah.gnu.org/gitweb/?p=cjk.git;a=summary
http://www.nongnu.org/cjk/
-detex 2.8.9 - checked 4mar21
- https://github.com/pkubowicz/opendetex/releases
- old info: http://www.cs.purdue.edu/homes/trinkle/detex/
+detex 2.8.9 - maintained here
+ maintained for a time (untouched since 2020, checked 14sep22):
+ https://github.com/pkubowicz/opendetex/releases
+ (would be useful to look at open issues there for bugs)
+ original author: http://www.cs.purdue.edu/homes/trinkle/detex/
dtl - maintained here, by Takuji
-dvi2tty 6.0.0 - checked 15mar20
+dvi2tty 6.0.2 - checked 1may22
https://github.com/t-tk/dvi2tty/releases
dvidvi - maintained here
@@ -53,31 +53,30 @@
but also: https://github.com/aminophen/dviout-util
dvipdfm-x - maintained here, by us, contains
- dvipdfmx
- xdvipdfmx
+ dvipdfmx and xdvipdfmx.
old info: http://project.ktug.org/dvipdfmx/
-dvipng 1.17 - checked 06jan20
- http://mirror.ctan.org/dviware/dvipng/
+dvipng 1.17 - checked 31may22
+ https://mirror.ctan.org/dviware/dvipng/
dvipos - maintained here, by us
dvipsk - maintained here, by us
-dvisvgm 2.13.3 - checked 28feb22
+dvisvgm 2.14 - checked 29aug22
https://dvisvgm.de/Downloads/
https://github.com/mgieseki/dvisvgm
https://ctan.org/pkg/dvisvgm
gregorio 6.0.0 - checked 14mar21
- CTAN/support/gregoriotex/gregorio-6.0.0.zip
+ https://mirror.ctan.org/support/gregoriotex/gregorio-6.0.0.zip
gsftopk - from Paul Vojta's xdvi.
kpathsea - maintained here, by us
-lcdf-typetools 2.108 - checked 15mar20
- http://www.lcdf.org/type/
+lcdf-typetools 2.108 - checked 31may22
+ https://www.lcdf.org/type/
makeindexk - maintained here, by us
@@ -109,8 +108,8 @@
ttfdump - maintained here, by us, since Taiwan upstream apparently gone.
-upmendex 1.00 - by Takuji Tanaka
- http://www.ctan.org/pkg/upmendex
+upmendex 1.05 - by Takuji Tanaka
+ https://ctan.org/pkg/upmendex
https://github.com/t-tk/upmendex-package
web2c - maintained here, by us - core web2c, plain tex, etc.
@@ -139,8 +138,8 @@
uptex - http://www.t-lab.opal.ne.jp/tex/uptex_en.html
xetex - http://tug.org/xetex/
-xdvik 22.87.06 - checked 18feb22
- http://sourceforge.net/projects/xdvi/files/xdvik/
+xdvik 22.87.06 - checked 31may22
+ https://sourceforge.net/projects/xdvi/files/xdvik/
Procedure for updating xdvik from sourceforge release:
tar xf ...
diff -crN2 \
Modified: branches/stable/source/src/texk/aclocal.m4
===================================================================
--- branches/stable/source/src/texk/aclocal.m4 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/aclocal.m4 2022-11-14 21:05:34 UTC (rev 884)
@@ -1202,6 +1202,7 @@
m4_include([../m4/kpse-options.m4])
m4_include([../m4/kpse-pixman-flags.m4])
m4_include([../m4/kpse-pkgs.m4])
+m4_include([../m4/kpse-potrace-flags.m4])
m4_include([../m4/kpse-ptexenc-flags.m4])
m4_include([../m4/kpse-setup.m4])
m4_include([../m4/kpse-teckit-flags.m4])
Modified: branches/stable/source/src/texk/configure
===================================================================
--- branches/stable/source/src/texk/configure 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/configure 2022-11-14 21:05:34 UTC (rev 884)
@@ -860,6 +860,9 @@
with_system_gd
with_gd_includes
with_gd_libdir
+with_system_potrace
+with_potrace_includes
+with_potrace_libdir
with_system_freetype2
with_system_libpng
with_system_libpaper
@@ -1702,6 +1705,11 @@
--with-system-gd use installed gd headers and library
--with-gd-includes=DIR gd headers installed in DIR
--with-gd-libdir=DIR gd library installed in DIR
+ --with-system-potrace use installed potrace headers and library
+ --with-potrace-includes=DIR
+ potrace headers installed in DIR
+ --with-potrace-libdir=DIR
+ potrace library installed in DIR
--with-system-freetype2 use installed freetype2 headers and library
(requires freetype-config)
--with-system-libpng use installed libpng headers and library (requires
@@ -4802,6 +4810,7 @@
test "x$enable_web2c:$enable_mflua" = xyes:yes && {
need_lua53=yes
+ need_potrace=yes
}
# Check whether --enable-mfluajit was given.
if test ${enable_mfluajit+y}
@@ -4829,6 +4838,7 @@
test "x$enable_web2c:$enable_mfluajit" = xyes:yes && {
need_luajit=yes
+ need_potrace=yes
}
# Check whether --with-mf-x-toolkit was given.
@@ -6140,6 +6150,39 @@
need_freetype2=yes
}
+## libs/potrace/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/potrace/
+## configure options and TL libraries required for potrace
+
+# Check whether --with-system-potrace was given.
+if test ${with_system_potrace+y}
+then :
+ withval=$with_system_potrace;
+fi
+
+# Check whether --with-potrace-includes was given.
+if test ${with_potrace_includes+y}
+then :
+ withval=$with_potrace_includes;
+fi
+
+# Check whether --with-potrace-libdir was given.
+if test ${with_potrace_libdir+y}
+then :
+ withval=$with_potrace_libdir;
+fi
+if test "x$with_system_potrace" = x; then
+ if test -f $srcdir/../libs/potrace/configure; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`potrace' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`potrace' headers and library from TL tree" >&6;}
+ with_system_potrace=no
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`potrace' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`potrace' headers and library" >&6;}
+ with_system_potrace=yes
+ fi
+ ac_configure_args="$ac_configure_args '--with-system-potrace=$with_system_potrace'"
+fi
+
## libs/freetype2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype2/
## configure options and TL libraries required for freetype2
Modified: branches/stable/source/src/texk/kpathsea/ChangeLog
===================================================================
--- branches/stable/source/src/texk/kpathsea/ChangeLog 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/kpathsea/ChangeLog 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,3 +1,23 @@
+2022-11-05 Sam James <sam at gentoo.org>
+
+ * configure.ac (Ghostscript version): #include <stdlib.h>
+ to declare exit and placate clang16.
+ https://tug.org/pipermail/tlbuild/2022q4/005269.html
+
+2022-06-12 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
+
+ * texmf.cnf (guess_input_kanji_encoding):
+ Support guessing input file encodings for unix-like platforms.
+ (It has already been supported on Windows.)
+ Now we set default on for (e)p(la)tex, pbibtex & mendex.
+ https://github.com/texjporg/tex-jp-build/issues/142
+
+2022-05-06 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
+
+ * texmf.cnf (max_print_line):
+ Now it applies to BibTeX family:
+ bibtex, pbibtex, upbibtex, bibtex8 and bibtexu.
+
2022-03-21 Karl Berry <karl at tug.org>
* TL'22 release.
Modified: branches/stable/source/src/texk/kpathsea/configure
===================================================================
--- branches/stable/source/src/texk/kpathsea/configure 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/kpathsea/configure 2022-11-14 21:05:34 UTC (rev 884)
@@ -14633,7 +14633,8 @@
else $as_nop
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-int fork() { exit(1); }
+#include <stdlib.h>
+ int fork() { exit(1); }
int vfork() { exit(1); }
extern char *getcwd();
char path[100];
Modified: branches/stable/source/src/texk/kpathsea/configure.ac
===================================================================
--- branches/stable/source/src/texk/kpathsea/configure.ac 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/kpathsea/configure.ac 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,4 +1,4 @@
-dnl $Id: configure.ac 57738 2021-02-14 18:51:30Z karl $
+dnl $Id: configure.ac 64941 2022-11-05 15:43:53Z karl $
dnl Process this file with autoconf to produce a configure script.
dnl
dnl Copyright 2015-2021 Karl Berry <tex-live at tug.org>
@@ -45,7 +45,8 @@
# We only need to run this if we have getcwd.
AC_CACHE_CHECK([whether getcwd uses fork or vfork],
[kb_cv_func_getcwd_forks],
- [AC_RUN_IFELSE([AC_LANG_PROGRAM([[int fork() { exit(1); }
+ [AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
+ int fork() { exit(1); }
int vfork() { exit(1); }
extern char *getcwd();
char path[100];]],
Modified: branches/stable/source/src/texk/kpathsea/texmf.cnf
===================================================================
--- branches/stable/source/src/texk/kpathsea/texmf.cnf 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/kpathsea/texmf.cnf 2022-11-14 21:05:34 UTC (rev 884)
@@ -864,6 +864,7 @@
% 30 < half_error_line < error_line - 15;
% 60 <= max_print_line;
% These apply to TeX, Metafont, and MetaPost.
+% "max_print_line" applies to BibTeX family.
error_line = 79
half_error_line = 50
max_print_line = 79
@@ -887,8 +888,14 @@
max_cols.gftype = 8191
% Guess input encoding (SJIS vs. Unicode, etc.) in pTeX and friends?
-% Default is 1, to guess. Used on Windows only.
-guess_input_kanji_encoding = 1
+% Default is 1 for (e)p(la)tex, pbibtex & mendex, to guess.
+guess_input_kanji_encoding = 0
+guess_input_kanji_encoding.ptex = 1
+guess_input_kanji_encoding.eptex = 1
+guess_input_kanji_encoding.platex = 1
+guess_input_kanji_encoding.platex-dev = 1
+guess_input_kanji_encoding.pbibtex = 1
+guess_input_kanji_encoding.mendex = 1
% command_line_encoding
%
@@ -901,6 +908,7 @@
% ignored. If file names in sources and DVI or XDV files are ASCII
% only, the value of command_line_encoding is irrelevant.
% If command_line_encoding = utf8 or command_line_encoding = utf-8,
+% characters on a command line in cmd.exe are assumed to be Unicode and
% file names in sources and DVI or XDV files are assumed to be UTF-8.
% Default is utf-8, from 2019-07-24, to assume UTF-8 file names.
% In order to switch off the function, define an environment variable:
Modified: branches/stable/source/src/texk/tests/TeXLive/TLConfig.pm
===================================================================
--- branches/stable/source/src/texk/tests/TeXLive/TLConfig.pm 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/tests/TeXLive/TLConfig.pm 2022-11-14 21:05:34 UTC (rev 884)
@@ -6,7 +6,7 @@
use strict; use warnings;
package TeXLive::TLConfig;
-my $svnrev = '$Revision: 62232 $';
+my $svnrev = '$Revision: 63068 $';
my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
sub module_revision { return $_modulerevision; }
Modified: branches/stable/source/src/texk/tests/TeXLive/TLUtils.pm
===================================================================
--- branches/stable/source/src/texk/tests/TeXLive/TLUtils.pm 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/tests/TeXLive/TLUtils.pm 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,4 +1,3 @@
-# $Id: TLUtils.pm 62822 2022-03-20 08:34:54Z siepo $
# TeXLive::TLUtils.pm - the inevitable utilities for TeX Live.
# Copyright 2007-2022 Norbert Preining, Reinhard Kotucha
# This file is licensed under the GNU General Public License version 2
@@ -8,7 +7,7 @@
package TeXLive::TLUtils;
-my $svnrev = '$Revision: 62822 $';
+my $svnrev = '$Revision: 63645 $';
my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
sub module_revision { return $_modulerevision; }
@@ -43,6 +42,8 @@
TeXLive::TLUtils::run_cmd($cmd [, @envvars ]);
TeXLive::TLUtils::system_pipe($prog, $infile, $outfile, $removeIn, @args);
TeXLive::TLUtils::diskfree($path);
+ TeXLive::TLUtils::get_user_home();
+ TeXLive::TLUtils::expand_tilde($str);
=head2 File utilities
@@ -234,6 +235,8 @@
&run_cmd
&system_pipe
&diskfree
+ &get_user_home
+ &expand_tilde
&announce_execute_actions
&add_symlinks
&remove_symlinks
@@ -540,6 +543,7 @@
return "$platform_name{$platform}";
} else {
my ($CPU,$OS) = split ('-', $platform);
+ $OS = "" if ! defined $OS; # e.g., -force-platform foo
return "$CPU with " . ucfirst "$OS";
}
}
@@ -815,6 +819,43 @@
sub diskfree {
my $td = shift;
+ my ($output, $retval);
+ if (win32()) {
+ # the powershell one-liner only works from win8 on.
+ my @winver = Win32::GetOSVersion();
+ if ($winver[1]<=6 && $winver[2]<=1) {
+ return -1;
+ }
+ my $avl;
+ if ($td =~ /^[a-zA-Z]:/) {
+ my $drv = substr($td,0,1);
+ # ea ignore: error action ignore: no output at all
+ my $cmd = "powershell -nologo -noninteractive -noprofile -command " .
+ "\"get-psdrive -name $drv -ea ignore |select-object free |format-wide\"";
+ ($output, $retval) = run_cmd($cmd);
+ # ignore exit code, just parse the output, which should
+ # consist of empty lines and a number surrounded by spaces
+ my @lines = split(/\r*\n/, $output);
+ foreach (@lines) {
+ chomp $_;
+ if ($_ !~ /^\s*$/) {
+ $_ =~ s/^\s*//;
+ $_ =~ s/\s*$//;
+ $avl = $_;
+ last;
+ }
+ }
+ if ($avl !~ /^[0-9]+$/) {
+ return (-1);
+ } else {
+ return (int($avl/(1024*1024)));
+ }
+ } else {
+ # maybe UNC drive; do not try to handle this
+ return -1;
+ }
+ }
+ # now windows case has been taken care of
return (-1) if (! $::progs{"df"});
# drop final /
$td =~ s!/$!!;
@@ -831,8 +872,8 @@
}
$td .= "/" if ($td !~ m!/$!);
return (-1) if (! -e $td);
- debug("Checking for free diskspace in $td\n");
- my ($output, $retval) = run_cmd("df -P \"$td\"", POSIXLY_CORRECT => 1);
+ debug("checking diskfree() in $td\n");
+ ($output, $retval) = run_cmd("df -P \"$td\"", POSIXLY_CORRECT => 1);
if ($retval == 0) {
# Output format should be this:
# Filesystem 512-blocks Used Available Capacity Mounted on
@@ -839,16 +880,47 @@
# /dev/sdb3 6099908248 3590818104 2406881416 60% /home
my ($h,$l) = split(/\n/, $output);
my ($fs, $nrb, $used, $avail, @rest) = split(' ', $l);
- debug("disk space: used=$used (512-block), avail=$avail (512-block)\n");
+ debug("diskfree: used=$used (512-block), avail=$avail (512-block)\n");
# $avail is in 512-byte blocks, so we need to divide by 2*1024 to
# obtain Mb. Require that at least 100M remain free.
return (int($avail / 2048));
} else {
- # error in running df -P out of whatever reason
+ # error in running df -P for whatever reason
return (-1);
}
}
+=item C<get_user_home()>
+
+Returns the current user's home directory (C<$HOME> on Unix,
+C<$USERPROFILE> on Windows, and C<~> if none of the two are
+set. Save in package variable C<$user_home_dir> after computing.
+
+=cut
+
+# only search for home directory once, and save expansion here
+my $user_home_dir;
+
+sub get_user_home {
+ return $user_home_dir if ($user_home_dir);
+ $user_home_dir = getenv (win32() ? 'USERPROFILE' : 'HOME') || '~';
+ return $user_home_dir;
+}
+
+=item C<expand_tilde($str)>
+
+Expands initial C<~> with the user's home directory in C<$str> if
+available, else leave C<~> in place.
+
+=cut
+
+sub expand_tilde {
+ my $str = shift;
+ my $h = get_user_home();
+ $str =~ s/^~/$h/;
+ return $str;
+}
+
=back
=head2 File utilities
Modified: branches/stable/source/src/texk/web2c/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/ChangeLog 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/ChangeLog 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,3 +1,76 @@
+2022-09-28 Karl Berry <karl at freefriends.org>
+
+ * tex.ch (halting_on_error_p): new variable, set when we start to
+ halt_on_error, and exit immediately if seen again.
+ * mf.ch: likewise.
+ (The cause is that close_files_and_terminate tries to close out
+ the dvi file nicely, which includes figuring out the
+ magnification, so if the magnification is already set, there's a
+ "recursive" error, which caused an infloop.)
+ Report from Bachir Bendrissou, tlsecurity 28 Sep 2022 12:28:10.
+
+2022-09-03 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
+
+ * bibtex.ch:
+ Check options before initialization of kpathsearch parameters.
+ This change prevents unwanted looking for texmf.cnf.
+ https://github.com/texjporg/tex-jp-build/issues/145
+ * bibtex.test, tests/enc-u.aux, tests/enc-u{p,u}.bbl:
+ Update tests for ((u)p)BibTeX.
+
+2022-08-22 Luigi Scarso <luigi.scarso at gmail.com>
+
+ * ac/web2c.ac: add potrace as dependency of mflua/mfluajit
+ * Makefile.am: add @POTRACE_RULE@
+ * configure.ac: add KPSE_POTRACE_FLAGS
+
+2022-08-21 Andreas Scherer <https://ascherer.github.io>
+
+ * ctangleboot.cin,
+ * help.h: New option '+u' for CTANGLE.
+
+2022-08-06 Andreas Scherer <https://ascherer.github.io>
+
+ * weave.ch: Rewrite 'squash' to match description in section 148.
+
+2022-07-16 Karl Berry <karl at freefriends.org>
+
+ * tex.ch (25.369, <Suppress expansion ...>): disallow
+ \noexpand\endwrite, else we get a seg fault because of fetching
+ mem[null]. Fix from drf.
+ Original report: https://tex.stackexchange.com/questions/609423
+ TeX bug entry: https://tug.org/texmfbug/newbug.html#B155endwrite
+
+2022-06-12 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
+
+ * texmfmp-help.h ((e)(u)pTeX), help.h ((u)pBibTeX):
+ Support guessing input file encodings.
+ https://github.com/texjporg/tex-jp-build/issues/142
+ * tests/enc-{asc,jis,sjis,euc,utf8{,a,b},amb[012]}.bib,
+ tests/enc{,-[es]}.aux, tests/testfield.bst,
+ tests/enc-{,[es]}[pu].bbl:
+ Add tests for guess encodings & (u)pBibTeX.
+
+2022-06-05 Andreas Scherer <https://ascherer.github.io>
+
+ * ctangleboot.cin: CWEB 4.8 release.
+
+2022-05-06 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
+
+ * bibtex.ch:
+ Apply max_print_line variable in kpathsea to ((u)p)BibTeX.
+ * bibtex.test, tests/exampl.bbl, am/web.am:
+ Update tests for ((u)p)BibTeX.
+
+2022-04-30 Andreas Scherer <https://ascherer.github.io>
+
+ * weav-twill.ch,
+ * weave.ch: Reshuffle '\title' changes..
+
+2022-04-27 Andreas Scherer <https://ascherer.github.io>
+
+ * weav-twill.ch: Avoid non-POSIX conflict with Solaris 11.4.
+
2022-04-06 Andreas Scherer <https://ascherer.github.io>
* weav-twill.ch: My name is 'twill'.
Modified: branches/stable/source/src/texk/web2c/Makefile.am
===================================================================
--- branches/stable/source/src/texk/web2c/Makefile.am 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/Makefile.am 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,4 +1,4 @@
-## $Id: Makefile.am 61986 2022-02-12 18:02:57Z lscarso $
+## $Id: Makefile.am 64168 2022-08-22 21:33:05Z lscarso $
## Makefile.am for the TeX Live subdirectory texk/web2c/.
##
## Copyright 2017-2022 Karl Berry <tex-live at tug.org>
@@ -125,6 +125,8 @@
@PIXMAN_RULE@
## Rebuild libcairo
@CAIRO_RULE@
+## Rebuild libpotrace
+ at POTRACE_RULE@
## Rebuild libgmp
@GMP_RULE@
## Rebuild libmpfr
Modified: branches/stable/source/src/texk/web2c/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/Makefile.in 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/Makefile.in 2022-11-14 21:05:34 UTC (rev 884)
@@ -388,6 +388,7 @@
$(top_srcdir)/../../m4/kpse-macos-framework.m4 \
$(top_srcdir)/../../m4/kpse-mpfr-flags.m4 \
$(top_srcdir)/../../m4/kpse-pixman-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-potrace-flags.m4 \
$(top_srcdir)/../../m4/kpse-pplib-flags.m4 \
$(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \
$(top_srcdir)/../../m4/kpse-socket-libs.m4 \
@@ -1117,11 +1118,7 @@
libmfluapotrace_a_AR = $(AR) $(ARFLAGS)
libmfluapotrace_a_LIBADD =
am_libmfluapotrace_a_OBJECTS = \
- mfluadir/potrace/libmfluapotrace_a-curve.$(OBJEXT) \
- mfluadir/potrace/libmfluapotrace_a-decompose.$(OBJEXT) \
- mfluadir/potrace/libmfluapotrace_a-luafunc.$(OBJEXT) \
- mfluadir/potrace/libmfluapotrace_a-potracelib.$(OBJEXT) \
- mfluadir/potrace/libmfluapotrace_a-trace.$(OBJEXT)
+ mfluadir/potrace/libmfluapotrace_a-luafunc.$(OBJEXT)
libmfluapotrace_a_OBJECTS = $(am_libmfluapotrace_a_OBJECTS)
libmplibbackends_a_AR = $(AR) $(ARFLAGS)
libmplibbackends_a_LIBADD =
@@ -1466,7 +1463,8 @@
mflua_OBJECTS = $(dist_mflua_OBJECTS)
mflua_DEPENDENCIES = libmflua.a libmfluaotfcc.a libmfluapotrace.a \
libmflualpeg.a $(am__DEPENDENCIES_2) $(windowlib) \
- $(am__DEPENDENCIES_9) $(am__DEPENDENCIES_6)
+ $(am__DEPENDENCIES_9) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_1)
mflua_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(mflua_LDFLAGS) $(LDFLAGS) -o $@
@@ -1475,7 +1473,7 @@
mflua_nowin_OBJECTS = $(nodist_mflua_nowin_OBJECTS)
mflua_nowin_DEPENDENCIES = libmflua.a libmfluaotfcc.a \
libmfluapotrace.a libmflualpeg.a $(am__DEPENDENCIES_2) \
- $(windowlib) $(am__DEPENDENCIES_6)
+ $(windowlib) $(am__DEPENDENCIES_6) $(am__DEPENDENCIES_1)
mflua_nowin_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(mflua_nowin_LDFLAGS) $(LDFLAGS) -o $@
@@ -1483,7 +1481,8 @@
mfluajit_OBJECTS = $(dist_mfluajit_OBJECTS)
mfluajit_DEPENDENCIES = libmfluajit.a libmfluaotfcc.a \
libmfluapotrace.a libmfluajitlpeg.a $(am__DEPENDENCIES_2) \
- $(windowlib) $(am__DEPENDENCIES_9) $(am__DEPENDENCIES_1)
+ $(windowlib) $(am__DEPENDENCIES_9) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
mfluajit_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(mfluajit_LDFLAGS) $(LDFLAGS) -o $@
@@ -1492,7 +1491,7 @@
mfluajit_nowin_OBJECTS = $(nodist_mfluajit_nowin_OBJECTS)
mfluajit_nowin_DEPENDENCIES = libmfluajit.a libmfluaotfcc.a \
libmfluapotrace.a libmfluajitlpeg.a $(am__DEPENDENCIES_2) \
- $(windowlib) $(am__DEPENDENCIES_1)
+ $(windowlib) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
mfluajit_nowin_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(AM_CFLAGS) $(CFLAGS) $(mfluajit_nowin_LDFLAGS) $(LDFLAGS) -o \
@@ -2364,11 +2363,7 @@
mfluadir/otfcc/lib/vf/$(DEPDIR)/libmfluaotfcc_a-vq.Po \
mfluadir/otfcc/src/$(DEPDIR)/libmfluaotfcc_a-luafunc.Po \
mfluadir/otfcc/src/$(DEPDIR)/libmfluaotfcc_a-otfccdll.Po \
- mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-curve.Po \
- mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-decompose.Po \
mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-luafunc.Po \
- mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-potracelib.Po \
- mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-trace.Po \
mfluajitdir/$(DEPDIR)/mfluajit-mfluajitextra.Po \
mfluajitdir/$(DEPDIR)/mfluajit_nowin-mfluajitextra.Po \
mplibdir/$(DEPDIR)/libmputil_a-avl.Po \
@@ -3061,6 +3056,9 @@
PIXMAN_INCLUDES = @PIXMAN_INCLUDES@
PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
+POTRACE_DEPEND = @POTRACE_DEPEND@
+POTRACE_INCLUDES = @POTRACE_INCLUDES@
+POTRACE_LIBS = @POTRACE_LIBS@
PPLIB_DEPEND = @PPLIB_DEPEND@
PPLIB_INCLUDES = @PPLIB_INCLUDES@
PPLIB_LIBS = @PPLIB_LIBS@
@@ -3200,19 +3198,19 @@
EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
triptrap-sh tangle.web tangle.ch tangleboot.pin cwebdir \
ctangleboot.cin cwebboot.cin tangle.test $(web_programs:=.web) \
- $(web_programs:=.ch) $(web_tests) tests/memdata1.bst \
- tests/memdata2.bst tests/memdata3.bst tests/bibtex-bigauth.aux \
- tests/bibtex-bigauth.bib tests/bibtex-bigauth.tex \
- tests/auxinclude.aux tests/auxinclude.bbl tests/auxinclude.bib \
- tests/auxinclude.tex tests/auxinclude2.aux \
- tests/auxinclude2.tex tests/allbib.aux tests/allbib.tex \
- tests/apalike.bst tests/badpl.pl tests/badtfm.tfm \
- tests/badvf.tfm tests/badvf.vf tests/badvpl.vpl \
- tests/batch.tex tests/check.log tests/cmr10.600gf \
- tests/cmr10.pk tests/cmr10.pl tests/cmr10.tfm tests/cmr7.tfm \
- tests/cmr8.tfm tests/cmti10.tfm tests/cmtt10.tfm \
- tests/cmtt8.tfm tests/dict tests/eight.tex tests/end.tex \
- tests/exampl.aux tests/exampl.tex tests/gray.tfm \
+ $(web_programs:=.ch) $(web_tests) tests/exampl.bbl \
+ tests/memdata1.bst tests/memdata2.bst tests/memdata3.bst \
+ tests/bibtex-bigauth.aux tests/bibtex-bigauth.bib \
+ tests/bibtex-bigauth.tex tests/auxinclude.aux \
+ tests/auxinclude.bbl tests/auxinclude.bib tests/auxinclude.tex \
+ tests/auxinclude2.aux tests/auxinclude2.tex tests/allbib.aux \
+ tests/allbib.tex tests/apalike.bst tests/badpl.pl \
+ tests/badtfm.tfm tests/badvf.tfm tests/badvf.vf \
+ tests/badvpl.vpl tests/batch.tex tests/check.log \
+ tests/cmr10.600gf tests/cmr10.pk tests/cmr10.pl \
+ tests/cmr10.tfm tests/cmr7.tfm tests/cmr8.tfm tests/cmti10.tfm \
+ tests/cmtt10.tfm tests/cmtt8.tfm tests/dict tests/eight.tex \
+ tests/end.tex tests/exampl.aux tests/exampl.tex tests/gray.tfm \
tests/hello.tex tests/io.mf tests/just.texi tests/label.mp \
tests/label.mpx tests/logo8.tfm tests/longline.aux \
tests/longline.bib tests/longline.tex tests/longtfm.tex \
@@ -3277,18 +3275,24 @@
ptexdir/Changes.txt ptexdir/INSTALL.txt ptexdir/README.txt \
$(ptex_tests) $(pweb_tests) ptexdir/tests/nissya_bib.aux \
ptexdir/tests/nissya.bst ptexdir/tests/sample.bib \
- tests/memdata1.bst tests/memdata2.bst tests/memdata3.bst \
- ptexdir/tests/goth10.tfm ptexdir/tests/sample.dvi \
- ptexdir/tests/samplea.typ ptexdir/tests/min10.pl \
- ptexdir/tests/min10.tfm ptexdir/tests/tmin10.pl \
- ptexdir/tests/tmin10.tfm ptexdir/tests/skipjfmp.pl \
- ptexdir/tests/skipjfmp.tfm ptexdir/ptrip/ptrip.diffs \
- ptexdir/ptrip/texmf.cnf $(eptex_web_srcs) $(eptex_ch_srcs) \
- eptexdir/eptex.defines eptexdir/ChangeLog eptexdir/Changes.txt \
- eptexdir/README.txt $(eptex_tests) \
- eptexdir/eptrip/eptrip.diffs eptexdir/eptrip/eptrip.log \
- eptexdir/eptrip/eptrip.tex eptexdir/eptrip/texmf.cnf \
- eptexdir/pdfprimitive.test \
+ tests/testfield.bst tests/enc-asc.bib tests/enc-jis.bib \
+ tests/enc-sjis.bib tests/enc-euc.bib tests/enc-utf8.bib \
+ tests/enc-utf8a.bib tests/enc-utf8b.bib tests/enc-amb0.bib \
+ tests/enc-amb1.bib tests/enc-amb2.bib tests/enc.aux \
+ tests/enc-e.aux tests/enc-s.aux tests/enc-u.aux \
+ tests/enc-p.bbl tests/enc-ep.bbl tests/enc-sp.bbl \
+ tests/enc-up.bbl tests/memdata1.bst tests/memdata2.bst \
+ tests/memdata3.bst ptexdir/tests/goth10.tfm \
+ ptexdir/tests/sample.dvi ptexdir/tests/samplea.typ \
+ ptexdir/tests/min10.pl ptexdir/tests/min10.tfm \
+ ptexdir/tests/tmin10.pl ptexdir/tests/tmin10.tfm \
+ ptexdir/tests/skipjfmp.pl ptexdir/tests/skipjfmp.tfm \
+ ptexdir/ptrip/ptrip.diffs ptexdir/ptrip/texmf.cnf \
+ $(eptex_web_srcs) $(eptex_ch_srcs) eptexdir/eptex.defines \
+ eptexdir/ChangeLog eptexdir/Changes.txt eptexdir/README.txt \
+ $(eptex_tests) eptexdir/eptrip/eptrip.diffs \
+ eptexdir/eptrip/eptrip.log eptexdir/eptrip/eptrip.tex \
+ eptexdir/eptrip/texmf.cnf eptexdir/pdfprimitive.test \
eptexdir/tests/pdfprimitive-test.tex \
eptexdir/tests/pdfprimitive-eptex.log $(uptex_web_srcs) \
$(uptex_ch_srcs) uptexdir/uptex.defines ptexdir/pbibtex.ch \
@@ -3296,16 +3300,17 @@
ptexdir/ppltotf.ch uptexdir/uppltotf.ch ptexdir/ptftopl.ch \
uptexdir/uptftopl.ch uptexdir/COPYRIGHT uptexdir/COPYRIGHT.jis \
uptexdir/ChangeLog $(uptex_tests) $(upweb_tests) \
- uptexdir/tests/umin10.pl uptexdir/tests/umin10.tfm \
- uptexdir/tests/utmin10.pl uptexdir/tests/utmin10.tfm \
- uptexdir/tests/testnewu.pl uptexdir/tests/testnewu.tfm \
- uptexdir/tests/uparse.pl uptexdir/tests/uparse.tfm \
- uptexdir/tests/gkhugeok.tfm uptexdir/tests/gkhugeng.tfm \
- uptexdir/tests/gkhugeng.err uptexdir/uptrip/uptrip.diffs \
- uptexdir/uptrip/texmf.cnf $(euptex_web_srcs) $(euptex_ch_srcs) \
- euptexdir/euptex.defines euptexdir/COPYRIGHT \
- euptexdir/COPYRIGHT.jis euptexdir/ChangeLog \
- euptexdir/EUPTEX.txt $(euptex_tests) \
+ tests/enc-u.bbl tests/enc-eu.bbl tests/enc-su.bbl \
+ tests/enc-uu.bbl uptexdir/tests/umin10.pl \
+ uptexdir/tests/umin10.tfm uptexdir/tests/utmin10.pl \
+ uptexdir/tests/utmin10.tfm uptexdir/tests/testnewu.pl \
+ uptexdir/tests/testnewu.tfm uptexdir/tests/uparse.pl \
+ uptexdir/tests/uparse.tfm uptexdir/tests/gkhugeok.tfm \
+ uptexdir/tests/gkhugeng.tfm uptexdir/tests/gkhugeng.err \
+ uptexdir/uptrip/uptrip.diffs uptexdir/uptrip/texmf.cnf \
+ $(euptex_web_srcs) $(euptex_ch_srcs) euptexdir/euptex.defines \
+ euptexdir/COPYRIGHT euptexdir/COPYRIGHT.jis \
+ euptexdir/ChangeLog euptexdir/EUPTEX.txt $(euptex_tests) \
eptexdir/eptrip/eptrip.log eptexdir/eptrip/eptrip.tex \
euptexdir/euptrip/euptrip.diffs euptexdir/euptrip/texmf.cnf \
euptexdir/pdfprimitive.test \
@@ -3618,30 +3623,30 @@
$(pweb_programs:=.h) $(pweb_programs:=.p) \
$(pweb_programs:=-web2c) $(pweb_programs:=.web) \
ptests/nissya_bib.* ptests/xexampl.aux ptests/xexampl.bbl \
- ptests/xexampl.blg ptests/memtest.bib ptests/memtest?.* \
- ptests/xstory.dvityp ptests/xpagenum.typ ptests/xcmr10.tfm \
- ptests/xcmr10.pl ptests/xsample.typ ptests/x*min10.* \
- ptests/xskipjfmp.* ptrip.diffs $(nodist_eptex_SOURCES) \
- eptex.web eptex.ch eptex-web2c eptex.p eptex.pool eptex-tangle \
- eptrip.diffs pdfprimitive-eptex.* $(nodist_uptex_SOURCES) \
- uptex.web uptex.ch uptex-web2c uptex.p uptex.pool uptex-tangle \
- $(upweb_programs:=.c) $(upweb_programs:=.h) \
- $(upweb_programs:=.p) $(upweb_programs:=-web2c) \
- $(upweb_programs:=.web) uptests/xexampl.aux \
- uptests/xexampl.bbl uptests/xexampl.blg uptests/xstory.dvityp \
- uptests/xpagenum.typ uptests/xcmr10.tfm uptests/xcmr10.pl \
- uptests/x*min10.* uptests/xtestnewu.* uptests/xuparse.* \
- uptests/yuparse.* uptests/ygkhuge*.* uptrip.diffs \
- $(nodist_euptex_SOURCES) euptex.web euptex.ch euptex-web2c \
- euptex.p euptex.pool euptex-tangle euptrip.diffs \
- pdfprimitive-euptex.* $(nodist_hitex_SOURCES) \
- $(nodist_hishrink_SOURCES) $(nodist_histretch_SOURCES) \
- hiformat-tangle hitex-tangle hello.log rule.log \
- $(nodist_pdftex_SOURCES) pdftex-final.ch pdftex-web2c pdftex.p \
- pdftex.pool pdftex-tangle pwprob.log pwprob.tex pdfimage.fmt \
- pdfimage.log pdfimage.pdf expanded.log cnfline.log \
- partoken-ok.log partoken-xfail.log postV3.afm postV7.afm \
- test-13.pdf test-13.xref test-15.pdf test-15.xref \
+ ptests/xexampl.blg ptests/xenc*.* ptests/memtest.bib \
+ ptests/memtest?.* ptests/xstory.dvityp ptests/xpagenum.typ \
+ ptests/xcmr10.tfm ptests/xcmr10.pl ptests/xsample.typ \
+ ptests/x*min10.* ptests/xskipjfmp.* ptrip.diffs \
+ $(nodist_eptex_SOURCES) eptex.web eptex.ch eptex-web2c eptex.p \
+ eptex.pool eptex-tangle eptrip.diffs pdfprimitive-eptex.* \
+ $(nodist_uptex_SOURCES) uptex.web uptex.ch uptex-web2c uptex.p \
+ uptex.pool uptex-tangle $(upweb_programs:=.c) \
+ $(upweb_programs:=.h) $(upweb_programs:=.p) \
+ $(upweb_programs:=-web2c) $(upweb_programs:=.web) \
+ uptests/xexampl.aux uptests/xexampl.bbl uptests/xexampl.blg \
+ uptests/xenc*.* uptests/xstory.dvityp uptests/xpagenum.typ \
+ uptests/xcmr10.tfm uptests/xcmr10.pl uptests/x*min10.* \
+ uptests/xtestnewu.* uptests/xuparse.* uptests/yuparse.* \
+ uptests/ygkhuge*.* uptrip.diffs $(nodist_euptex_SOURCES) \
+ euptex.web euptex.ch euptex-web2c euptex.p euptex.pool \
+ euptex-tangle euptrip.diffs pdfprimitive-euptex.* \
+ $(nodist_hitex_SOURCES) $(nodist_hishrink_SOURCES) \
+ $(nodist_histretch_SOURCES) hiformat-tangle hitex-tangle \
+ hello.log rule.log $(nodist_pdftex_SOURCES) pdftex-final.ch \
+ pdftex-web2c pdftex.p pdftex.pool pdftex-tangle pwprob.log \
+ pwprob.tex pdfimage.fmt pdfimage.log pdfimage.pdf expanded.log \
+ cnfline.log partoken-ok.log partoken-xfail.log postV3.afm \
+ postV7.afm test-13.pdf test-13.xref test-15.pdf test-15.xref \
$(nodist_libluatex_sources) luaimage.* luajitimage.* \
$(nodist_xetex_SOURCES) xetex.web xetex-final.ch xetex-web2c \
xetex.p xetex.pool xetex-tangle bug73.fmt bug73.log bug73.out \
@@ -3922,12 +3927,12 @@
nodist_call_mflua_SOURCES = callexe.c
call_mflua_LDADD =
dist_mflua_SOURCES = mfluadir/mfluaextra.c mfluadir/mfluaextra.h mfluadir/mflua_version.h
-mflua_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(LUA_INCLUDES)
-mflua_LDADD = libmflua.a libmfluaotfcc.a libmfluapotrace.a libmflualpeg.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUA_LIBS)
+mflua_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(LUA_INCLUDES) $(POTRACE_INCLUDES)
+mflua_LDADD = libmflua.a libmfluaotfcc.a libmfluapotrace.a libmflualpeg.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUA_LIBS) $(POTRACE_LIBS)
mflua_LDFLAGS = -export-dynamic
nodist_mflua_nowin_SOURCES = $(dist_mflua_SOURCES)
-mflua_nowin_CPPFLAGS = $(mflua_CPPFLAGS) -DMFNOWIN $(LUA_INCLUDES)
-mflua_nowin_LDADD = libmflua.a libmfluaotfcc.a libmfluapotrace.a libmflualpeg.a $(LDADD) $(windowlib) $(LUA_LIBS)
+mflua_nowin_CPPFLAGS = $(mflua_CPPFLAGS) -DMFNOWIN $(LUA_INCLUDES) $(POTRACE_INCLUDES)
+mflua_nowin_LDADD = libmflua.a libmfluaotfcc.a libmfluapotrace.a libmflualpeg.a $(LDADD) $(windowlib) $(LUA_LIBS) $(POTRACE_LIBS)
mflua_nowin_LDFLAGS = -export-dynamic
# MFLua C sources
@@ -3934,7 +3939,7 @@
mflua_c_h = mfluaini.c mflua0.c mfluacoerce.h mfluad.h
dist_libmflua_a_SOURCES = luatexdir/lua/lkpselib.c mfluadir/mfluac.c mfluadir/mfluac.h
nodist_libmflua_a_SOURCES = $(mflua_c_h) mflua-pool.c
-libmflua_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUA_INCLUDES) -DMF_LUA
+libmflua_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUA_INCLUDES) $(POTRACE_INCLUDES) -DMF_LUA
mflua_web_srcs = \
mf.web \
mfluadir/mf-lua.ch
@@ -4217,27 +4222,15 @@
mfluadir/otfcc/lib/table/TSI5.c
libmfluapotrace_a_CPPFLAGS = \
- -I$(top_srcdir)/mfluadir/potrace
+ -I$(top_srcdir)/mfluadir/potrace \
+ $(POTRACE_INCLUDES)
libmfluapotrace_a_CFLAGS = # $(WARNING_CFLAGS)
#nodist_libmfluapotrace_a_SOURCES = $(libmfluapotrace_sources)
libmfluapotrace_a_SOURCES = \
- mfluadir/potrace/auxiliary.h \
- mfluadir/potrace/bitmap.h \
- mfluadir/potrace/config.h \
- mfluadir/potrace/curve.c \
- mfluadir/potrace/curve.h \
- mfluadir/potrace/decompose.c \
- mfluadir/potrace/decompose.h \
- mfluadir/potrace/lists.h \
mfluadir/potrace/luafunc.c \
- mfluadir/potrace/luafunc.h \
- mfluadir/potrace/potracelib.c \
- mfluadir/potrace/potracelib.h \
- mfluadir/potrace/progress.h \
- mfluadir/potrace/trace.c \
- mfluadir/potrace/trace.h
+ mfluadir/potrace/luafunc.h
libmflualpeg_a_CPPFLAGS = \
-I$(top_srcdir)/mfluadir/luapeg \
@@ -4252,12 +4245,12 @@
nodist_call_mfluajit_SOURCES = callexe.c
call_mfluajit_LDADD =
dist_mfluajit_SOURCES = mfluajitdir/mfluajitextra.c mfluajitdir/mfluajitextra.h mfluadir/mflua_version.h
-mfluajit_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(LUAJIT_INCLUDES) $(LUAJIT_DEFINES)
-mfluajit_LDADD = libmfluajit.a libmfluaotfcc.a libmfluapotrace.a libmfluajitlpeg.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUAJIT_LIBS)
+mfluajit_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(LUAJIT_INCLUDES) $(POTRACE_INCLUDES) $(LUAJIT_DEFINES)
+mfluajit_LDADD = libmfluajit.a libmfluaotfcc.a libmfluapotrace.a libmfluajitlpeg.a $(LDADD) $(windowlib) $(mf_x_libs) $(LUAJIT_LIBS) $(POTRACE_LIBS)
mfluajit_LDFLAGS = -export-dynamic $(LUAJIT_LDEXTRA)
nodist_mfluajit_nowin_SOURCES = $(dist_mfluajit_SOURCES)
-mfluajit_nowin_CPPFLAGS = $(mfluajit_CPPFLAGS) -DMFNOWIN $(LUAJIT_INCLUDES) $(LUAJIT_DEFINES)
-mfluajit_nowin_LDADD = libmfluajit.a libmfluaotfcc.a libmfluapotrace.a libmfluajitlpeg.a $(LDADD) $(windowlib) $(LUAJIT_LIBS)
+mfluajit_nowin_CPPFLAGS = $(mfluajit_CPPFLAGS) -DMFNOWIN $(LUAJIT_INCLUDES) $(POTRACE_INCLUDES) $(LUAJIT_DEFINES)
+mfluajit_nowin_LDADD = libmfluajit.a libmfluaotfcc.a libmfluapotrace.a libmfluajitlpeg.a $(LDADD) $(windowlib) $(LUAJIT_LIBS) $(POTRACE_LIBS)
mfluajit_nowin_LDFLAGS = -export-dynamic $(LUAJIT_LDEXTRA)
# MFLuaJIT C sources
@@ -4264,7 +4257,7 @@
mfluajit_c_h = mfluajitini.c mfluajit0.c mfluajitcoerce.h mfluajitd.h
dist_libmfluajit_a_SOURCES = luatexdir/lua/lkpselib.c mfluadir/mfluac.c mfluadir/mfluac.h
nodist_libmfluajit_a_SOURCES = $(mfluajit_c_h) mfluajit-pool.c
-libmfluajit_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUAJIT_INCLUDES) -DMF_LUA -DJIT
+libmfluajit_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUAJIT_INCLUDES) $(POTRACE_INCLUDES) -DMF_LUA -DJIT
mfluajit_web_srcs = \
mf.web \
mfluadir/mf-lua.ch \
@@ -7772,21 +7765,9 @@
mfluadir/potrace/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) mfluadir/potrace/$(DEPDIR)
@: > mfluadir/potrace/$(DEPDIR)/$(am__dirstamp)
-mfluadir/potrace/libmfluapotrace_a-curve.$(OBJEXT): \
- mfluadir/potrace/$(am__dirstamp) \
- mfluadir/potrace/$(DEPDIR)/$(am__dirstamp)
-mfluadir/potrace/libmfluapotrace_a-decompose.$(OBJEXT): \
- mfluadir/potrace/$(am__dirstamp) \
- mfluadir/potrace/$(DEPDIR)/$(am__dirstamp)
mfluadir/potrace/libmfluapotrace_a-luafunc.$(OBJEXT): \
mfluadir/potrace/$(am__dirstamp) \
mfluadir/potrace/$(DEPDIR)/$(am__dirstamp)
-mfluadir/potrace/libmfluapotrace_a-potracelib.$(OBJEXT): \
- mfluadir/potrace/$(am__dirstamp) \
- mfluadir/potrace/$(DEPDIR)/$(am__dirstamp)
-mfluadir/potrace/libmfluapotrace_a-trace.$(OBJEXT): \
- mfluadir/potrace/$(am__dirstamp) \
- mfluadir/potrace/$(DEPDIR)/$(am__dirstamp)
libmfluapotrace.a: $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_DEPENDENCIES) $(EXTRA_libmfluapotrace_a_DEPENDENCIES)
$(AM_V_at)-rm -f libmfluapotrace.a
@@ -9211,11 +9192,7 @@
@AMDEP_TRUE@@am__include@ @am__quote at mfluadir/otfcc/lib/vf/$(DEPDIR)/libmfluaotfcc_a-vq.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at mfluadir/otfcc/src/$(DEPDIR)/libmfluaotfcc_a-luafunc.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at mfluadir/otfcc/src/$(DEPDIR)/libmfluaotfcc_a-otfccdll.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-curve.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-decompose.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-luafunc.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-potracelib.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-trace.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at mfluajitdir/$(DEPDIR)/mfluajit-mfluajitextra.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at mfluajitdir/$(DEPDIR)/mfluajit_nowin-mfluajitextra.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at mplibdir/$(DEPDIR)/libmputil_a-avl.Po at am__quote@ # am--include-marker
@@ -16283,34 +16260,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluaotfcc_a_CPPFLAGS) $(CPPFLAGS) $(libmfluaotfcc_a_CFLAGS) $(CFLAGS) -c -o mfluadir/otfcc/lib/table/libmfluaotfcc_a-TSI5.obj `if test -f 'mfluadir/otfcc/lib/table/TSI5.c'; then $(CYGPATH_W) 'mfluadir/otfcc/lib/table/TSI5.c'; else $(CYGPATH_W) '$(srcdir)/mfluadir/otfcc/lib/table/TSI5.c'; fi`
-mfluadir/potrace/libmfluapotrace_a-curve.o: mfluadir/potrace/curve.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluapotrace_a_CPPFLAGS) $(CPPFLAGS) $(libmfluapotrace_a_CFLAGS) $(CFLAGS) -MT mfluadir/potrace/libmfluapotrace_a-curve.o -MD -MP -MF mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-curve.Tpo -c -o mfluadir/potrace/libmfluapotrace_a-curve.o `test -f 'mfluadir/potrace/curve.c' || echo '$(srcdir)/'`mfluadir/potrace/curve.c
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-curve.Tpo mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-curve.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mfluadir/potrace/curve.c' object='mfluadir/potrace/libmfluapotrace_a-curve.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluapotrace_a_CPPFLAGS) $(CPPFLAGS) $(libmfluapotrace_a_CFLAGS) $(CFLAGS) -c -o mfluadir/potrace/libmfluapotrace_a-curve.o `test -f 'mfluadir/potrace/curve.c' || echo '$(srcdir)/'`mfluadir/potrace/curve.c
-
-mfluadir/potrace/libmfluapotrace_a-curve.obj: mfluadir/potrace/curve.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluapotrace_a_CPPFLAGS) $(CPPFLAGS) $(libmfluapotrace_a_CFLAGS) $(CFLAGS) -MT mfluadir/potrace/libmfluapotrace_a-curve.obj -MD -MP -MF mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-curve.Tpo -c -o mfluadir/potrace/libmfluapotrace_a-curve.obj `if test -f 'mfluadir/potrace/curve.c'; then $(CYGPATH_W) 'mfluadir/potrace/curve.c'; else $(CYGPATH_W) '$(srcdir)/mfluadir/potrace/curve.c'; fi`
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-curve.Tpo mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-curve.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mfluadir/potrace/curve.c' object='mfluadir/potrace/libmfluapotrace_a-curve.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluapotrace_a_CPPFLAGS) $(CPPFLAGS) $(libmfluapotrace_a_CFLAGS) $(CFLAGS) -c -o mfluadir/potrace/libmfluapotrace_a-curve.obj `if test -f 'mfluadir/potrace/curve.c'; then $(CYGPATH_W) 'mfluadir/potrace/curve.c'; else $(CYGPATH_W) '$(srcdir)/mfluadir/potrace/curve.c'; fi`
-
-mfluadir/potrace/libmfluapotrace_a-decompose.o: mfluadir/potrace/decompose.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluapotrace_a_CPPFLAGS) $(CPPFLAGS) $(libmfluapotrace_a_CFLAGS) $(CFLAGS) -MT mfluadir/potrace/libmfluapotrace_a-decompose.o -MD -MP -MF mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-decompose.Tpo -c -o mfluadir/potrace/libmfluapotrace_a-decompose.o `test -f 'mfluadir/potrace/decompose.c' || echo '$(srcdir)/'`mfluadir/potrace/decompose.c
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-decompose.Tpo mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-decompose.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mfluadir/potrace/decompose.c' object='mfluadir/potrace/libmfluapotrace_a-decompose.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluapotrace_a_CPPFLAGS) $(CPPFLAGS) $(libmfluapotrace_a_CFLAGS) $(CFLAGS) -c -o mfluadir/potrace/libmfluapotrace_a-decompose.o `test -f 'mfluadir/potrace/decompose.c' || echo '$(srcdir)/'`mfluadir/potrace/decompose.c
-
-mfluadir/potrace/libmfluapotrace_a-decompose.obj: mfluadir/potrace/decompose.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluapotrace_a_CPPFLAGS) $(CPPFLAGS) $(libmfluapotrace_a_CFLAGS) $(CFLAGS) -MT mfluadir/potrace/libmfluapotrace_a-decompose.obj -MD -MP -MF mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-decompose.Tpo -c -o mfluadir/potrace/libmfluapotrace_a-decompose.obj `if test -f 'mfluadir/potrace/decompose.c'; then $(CYGPATH_W) 'mfluadir/potrace/decompose.c'; else $(CYGPATH_W) '$(srcdir)/mfluadir/potrace/decompose.c'; fi`
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-decompose.Tpo mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-decompose.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mfluadir/potrace/decompose.c' object='mfluadir/potrace/libmfluapotrace_a-decompose.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluapotrace_a_CPPFLAGS) $(CPPFLAGS) $(libmfluapotrace_a_CFLAGS) $(CFLAGS) -c -o mfluadir/potrace/libmfluapotrace_a-decompose.obj `if test -f 'mfluadir/potrace/decompose.c'; then $(CYGPATH_W) 'mfluadir/potrace/decompose.c'; else $(CYGPATH_W) '$(srcdir)/mfluadir/potrace/decompose.c'; fi`
-
mfluadir/potrace/libmfluapotrace_a-luafunc.o: mfluadir/potrace/luafunc.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluapotrace_a_CPPFLAGS) $(CPPFLAGS) $(libmfluapotrace_a_CFLAGS) $(CFLAGS) -MT mfluadir/potrace/libmfluapotrace_a-luafunc.o -MD -MP -MF mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-luafunc.Tpo -c -o mfluadir/potrace/libmfluapotrace_a-luafunc.o `test -f 'mfluadir/potrace/luafunc.c' || echo '$(srcdir)/'`mfluadir/potrace/luafunc.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-luafunc.Tpo mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-luafunc.Po
@@ -16325,34 +16274,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluapotrace_a_CPPFLAGS) $(CPPFLAGS) $(libmfluapotrace_a_CFLAGS) $(CFLAGS) -c -o mfluadir/potrace/libmfluapotrace_a-luafunc.obj `if test -f 'mfluadir/potrace/luafunc.c'; then $(CYGPATH_W) 'mfluadir/potrace/luafunc.c'; else $(CYGPATH_W) '$(srcdir)/mfluadir/potrace/luafunc.c'; fi`
-mfluadir/potrace/libmfluapotrace_a-potracelib.o: mfluadir/potrace/potracelib.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluapotrace_a_CPPFLAGS) $(CPPFLAGS) $(libmfluapotrace_a_CFLAGS) $(CFLAGS) -MT mfluadir/potrace/libmfluapotrace_a-potracelib.o -MD -MP -MF mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-potracelib.Tpo -c -o mfluadir/potrace/libmfluapotrace_a-potracelib.o `test -f 'mfluadir/potrace/potracelib.c' || echo '$(srcdir)/'`mfluadir/potrace/potracelib.c
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-potracelib.Tpo mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-potracelib.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mfluadir/potrace/potracelib.c' object='mfluadir/potrace/libmfluapotrace_a-potracelib.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluapotrace_a_CPPFLAGS) $(CPPFLAGS) $(libmfluapotrace_a_CFLAGS) $(CFLAGS) -c -o mfluadir/potrace/libmfluapotrace_a-potracelib.o `test -f 'mfluadir/potrace/potracelib.c' || echo '$(srcdir)/'`mfluadir/potrace/potracelib.c
-
-mfluadir/potrace/libmfluapotrace_a-potracelib.obj: mfluadir/potrace/potracelib.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluapotrace_a_CPPFLAGS) $(CPPFLAGS) $(libmfluapotrace_a_CFLAGS) $(CFLAGS) -MT mfluadir/potrace/libmfluapotrace_a-potracelib.obj -MD -MP -MF mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-potracelib.Tpo -c -o mfluadir/potrace/libmfluapotrace_a-potracelib.obj `if test -f 'mfluadir/potrace/potracelib.c'; then $(CYGPATH_W) 'mfluadir/potrace/potracelib.c'; else $(CYGPATH_W) '$(srcdir)/mfluadir/potrace/potracelib.c'; fi`
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-potracelib.Tpo mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-potracelib.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mfluadir/potrace/potracelib.c' object='mfluadir/potrace/libmfluapotrace_a-potracelib.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluapotrace_a_CPPFLAGS) $(CPPFLAGS) $(libmfluapotrace_a_CFLAGS) $(CFLAGS) -c -o mfluadir/potrace/libmfluapotrace_a-potracelib.obj `if test -f 'mfluadir/potrace/potracelib.c'; then $(CYGPATH_W) 'mfluadir/potrace/potracelib.c'; else $(CYGPATH_W) '$(srcdir)/mfluadir/potrace/potracelib.c'; fi`
-
-mfluadir/potrace/libmfluapotrace_a-trace.o: mfluadir/potrace/trace.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluapotrace_a_CPPFLAGS) $(CPPFLAGS) $(libmfluapotrace_a_CFLAGS) $(CFLAGS) -MT mfluadir/potrace/libmfluapotrace_a-trace.o -MD -MP -MF mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-trace.Tpo -c -o mfluadir/potrace/libmfluapotrace_a-trace.o `test -f 'mfluadir/potrace/trace.c' || echo '$(srcdir)/'`mfluadir/potrace/trace.c
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-trace.Tpo mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-trace.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mfluadir/potrace/trace.c' object='mfluadir/potrace/libmfluapotrace_a-trace.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluapotrace_a_CPPFLAGS) $(CPPFLAGS) $(libmfluapotrace_a_CFLAGS) $(CFLAGS) -c -o mfluadir/potrace/libmfluapotrace_a-trace.o `test -f 'mfluadir/potrace/trace.c' || echo '$(srcdir)/'`mfluadir/potrace/trace.c
-
-mfluadir/potrace/libmfluapotrace_a-trace.obj: mfluadir/potrace/trace.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluapotrace_a_CPPFLAGS) $(CPPFLAGS) $(libmfluapotrace_a_CFLAGS) $(CFLAGS) -MT mfluadir/potrace/libmfluapotrace_a-trace.obj -MD -MP -MF mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-trace.Tpo -c -o mfluadir/potrace/libmfluapotrace_a-trace.obj `if test -f 'mfluadir/potrace/trace.c'; then $(CYGPATH_W) 'mfluadir/potrace/trace.c'; else $(CYGPATH_W) '$(srcdir)/mfluadir/potrace/trace.c'; fi`
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-trace.Tpo mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-trace.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mfluadir/potrace/trace.c' object='mfluadir/potrace/libmfluapotrace_a-trace.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluapotrace_a_CPPFLAGS) $(CPPFLAGS) $(libmfluapotrace_a_CFLAGS) $(CFLAGS) -c -o mfluadir/potrace/libmfluapotrace_a-trace.obj `if test -f 'mfluadir/potrace/trace.c'; then $(CYGPATH_W) 'mfluadir/potrace/trace.c'; else $(CYGPATH_W) '$(srcdir)/mfluadir/potrace/trace.c'; fi`
-
libmplibbackends_a-pngout.o: pngout.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplibbackends_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmplibbackends_a-pngout.o -MD -MP -MF $(DEPDIR)/libmplibbackends_a-pngout.Tpo -c -o libmplibbackends_a-pngout.o `test -f 'pngout.c' || echo '$(srcdir)/'`pngout.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmplibbackends_a-pngout.Tpo $(DEPDIR)/libmplibbackends_a-pngout.Po
@@ -20658,11 +20579,7 @@
-rm -f mfluadir/otfcc/lib/vf/$(DEPDIR)/libmfluaotfcc_a-vq.Po
-rm -f mfluadir/otfcc/src/$(DEPDIR)/libmfluaotfcc_a-luafunc.Po
-rm -f mfluadir/otfcc/src/$(DEPDIR)/libmfluaotfcc_a-otfccdll.Po
- -rm -f mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-curve.Po
- -rm -f mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-decompose.Po
-rm -f mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-luafunc.Po
- -rm -f mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-potracelib.Po
- -rm -f mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-trace.Po
-rm -f mfluajitdir/$(DEPDIR)/mfluajit-mfluajitextra.Po
-rm -f mfluajitdir/$(DEPDIR)/mfluajit_nowin-mfluajitextra.Po
-rm -f mplibdir/$(DEPDIR)/libmputil_a-avl.Po
@@ -21446,11 +21363,7 @@
-rm -f mfluadir/otfcc/lib/vf/$(DEPDIR)/libmfluaotfcc_a-vq.Po
-rm -f mfluadir/otfcc/src/$(DEPDIR)/libmfluaotfcc_a-luafunc.Po
-rm -f mfluadir/otfcc/src/$(DEPDIR)/libmfluaotfcc_a-otfccdll.Po
- -rm -f mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-curve.Po
- -rm -f mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-decompose.Po
-rm -f mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-luafunc.Po
- -rm -f mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-potracelib.Po
- -rm -f mfluadir/potrace/$(DEPDIR)/libmfluapotrace_a-trace.Po
-rm -f mfluajitdir/$(DEPDIR)/mfluajit-mfluajitextra.Po
-rm -f mfluajitdir/$(DEPDIR)/mfluajit_nowin-mfluajitextra.Po
-rm -f mplibdir/$(DEPDIR)/libmputil_a-avl.Po
@@ -21611,6 +21524,7 @@
@FREETYPE2_RULE@
@PIXMAN_RULE@
@CAIRO_RULE@
+ at POTRACE_RULE@
@GMP_RULE@
@MPFR_RULE@
@XPDF_RULE@
@@ -21939,7 +21853,7 @@
#EXTRA_DIST +=
-$(libmfluapotrace_a_OBJECTS): $(LUA_DEPEND)
+$(libmfluapotrace_a_OBJECTS): $(LUA_DEPEND) $(POTRACE_DEPEND)
$(libmflualpeg_a_OBJECTS): $(LUA_DEPEND)
@@ -22436,7 +22350,7 @@
# Generating hitables.c using himktables.
hitables.c: himktables$(EXEEXT)
- ./himktables > $@ || { rm -f hitables.c; exit 1; }
+ ./himktables$(EXEEXT) > $@ || { rm -f hitables.c; exit 1; }
# hitex, histretch, and hishrink all need (at least) some
# of the sources generated from hiformat.w.
Modified: branches/stable/source/src/texk/web2c/README
===================================================================
--- branches/stable/source/src/texk/web2c/README 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/README 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,4 +1,4 @@
-$Id: README 59252 2021-05-18 16:58:12Z karl $
+$Id: README 63453 2022-05-31 15:40:57Z karl $
(This file is public domain.)
This directory contains Web2c, a system which converts TeX, Metafont,
@@ -9,10 +9,20 @@
Web2c no longer exists as a separate distribution. It is maintained as
part of TeX Live (http://tug.org/texlive).
-See `NEWS' for changes by release,
-`ChangeLog` for all changes.
+Mailing list for bug reports and all general discussion:
+https://lists.tug.org/tex-k; anyone can join the list, but it is not
+necessary to join to post. Archives are public.
+
+See `NEWS' for changes by release, `ChangeLog` for all changes,
`PROJECTS' for some old rainy-day ideas.
-
If present, see *dir/README for more details on each package.
+Info on building only one of the engines here:
+ https://tug.org/texinfohtml/tlbuild.html#Build-one-engine
+TeX Live general build info:
+ https://tug.org/texlive/build.html
+Mailing list for build issues (same setup as tex-k, above):
+ https://lists.tug.org/tlbuild
+
+The original TeX and Metafont programs by Donald Knuth are public domain.
Web2c is free software.
Modified: branches/stable/source/src/texk/web2c/ac/web2c.ac
===================================================================
--- branches/stable/source/src/texk/web2c/ac/web2c.ac 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/ac/web2c.ac 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,4 +1,4 @@
-dnl $Id: web2c.ac 61680 2022-01-21 17:38:44Z karl $
+dnl $Id: web2c.ac 64168 2022-08-22 21:33:05Z lscarso $
# texk/web2c/ac/web2c.ac: configure.ac fragment for TL subdir
dnl
dnl Copyright 2015-2021 Karl Berry <tex-live at tug.org>
@@ -54,8 +54,8 @@
dnl [PROG, BUILD-OR-NO, NOWIN-OR-NO, TEXT, REQUIRED-LIBS]
m4_define([kpse_mf_progs], [dnl
[[mf], [yes], [yes], [METAFONT], []],
-[[mflua], [yes], [no], [MFLua], [lua53]],
-[[mfluajit], [yes], [no], [MFLuaJIT], [luajit]],
+[[mflua], [yes], [no], [MFLua], [lua53 potrace]],
+[[mfluajit], [yes], [no], [MFLuaJIT], [luajit potrace]],
])[]dnl
m4_foreach([Kpse_Prog], [kpse_mf_progs],
[m4_ifset([Kpse_Prog],
Modified: branches/stable/source/src/texk/web2c/aclocal.m4
===================================================================
--- branches/stable/source/src/texk/web2c/aclocal.m4 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/aclocal.m4 2022-11-14 21:05:34 UTC (rev 884)
@@ -1245,6 +1245,7 @@
m4_include([../../m4/kpse-macos-framework.m4])
m4_include([../../m4/kpse-mpfr-flags.m4])
m4_include([../../m4/kpse-pixman-flags.m4])
+m4_include([../../m4/kpse-potrace-flags.m4])
m4_include([../../m4/kpse-pplib-flags.m4])
m4_include([../../m4/kpse-ptexenc-flags.m4])
m4_include([../../m4/kpse-socket-libs.m4])
Modified: branches/stable/source/src/texk/web2c/am/web.am
===================================================================
--- branches/stable/source/src/texk/web2c/am/web.am 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/am/web.am 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,4 +1,4 @@
-## $Id: web.am 61575 2022-01-11 22:47:10Z karl $
+## $Id: web.am 63239 2022-05-06 08:08:17Z takuji $
## texk/web2c/am/web.am: Makefile fragment for the standard web programs --
## except tangle.
##
@@ -194,6 +194,7 @@
EXTRA_DIST += $(web_tests)
## bibtex.test
+EXTRA_DIST += tests/exampl.bbl
DISTCLEANFILES += tests/xexampl.aux tests/xexampl.bbl tests/xexampl.blg
## tests/bibtex-longline-test.pl
DISTCLEANFILES += longline.aux longline.bbl longline.bib longline.blg
Modified: branches/stable/source/src/texk/web2c/configure
===================================================================
--- branches/stable/source/src/texk/web2c/configure 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/configure 2022-11-14 21:05:34 UTC (rev 884)
@@ -719,6 +719,10 @@
GMP_DEPEND
GMP_LIBS
GMP_INCLUDES
+POTRACE_RULE
+POTRACE_DEPEND
+POTRACE_LIBS
+POTRACE_INCLUDES
CAIRO_RULE
CAIRO_DEPEND
CAIRO_LIBS
@@ -1089,6 +1093,9 @@
with_system_freetype2
with_system_pixman
with_system_cairo
+with_system_potrace
+with_potrace_includes
+with_potrace_libdir
with_system_gmp
with_gmp_includes
with_gmp_libdir
@@ -1855,6 +1862,11 @@
pkg-config)
--with-system-cairo use installed cairo headers and library (requires
pkg-config)
+ --with-system-potrace use installed potrace headers and library
+ --with-potrace-includes=DIR
+ potrace headers installed in DIR
+ --with-potrace-libdir=DIR
+ potrace library installed in DIR
--with-system-gmp use installed gmp headers and library
--with-gmp-includes=DIR gmp headers installed in DIR
--with-gmp-libdir=DIR gmp library installed in DIR
@@ -20055,6 +20067,7 @@
test "x$enable_web2c:$enable_mflua" = xyes:yes && {
need_lua53=yes
+ need_potrace=yes
}
# Check whether --enable-mfluajit was given.
if test ${enable_mfluajit+y}
@@ -20082,6 +20095,7 @@
test "x$enable_web2c:$enable_mfluajit" = xyes:yes && {
need_luajit=yes
+ need_potrace=yes
}
# Check whether --with-mf-x-toolkit was given.
@@ -27143,6 +27157,45 @@
cd ${top_builddir}/../../libs/cairo && $(MAKE) $(AM_MAKEFLAGS) rebuild'
fi
+##tldbg _KPSE_LIB_FLAGS: Setup potrace (-lpotrace) flags.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=potrace, libname=potrace, options=, tlincl=-IBLD/libs/potrace/include, tllib=BLD/libs/potrace/libpotrace.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/potrace/include/potrace.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: potrace (potrace) .
+
+# Check whether --with-system-potrace was given.
+if test ${with_system_potrace+y}
+then :
+ withval=$with_system_potrace;
+fi
+
+# Check whether --with-potrace-includes was given.
+if test ${with_potrace_includes+y}
+then :
+ withval=$with_potrace_includes;
+fi
+
+# Check whether --with-potrace-libdir was given.
+if test ${with_potrace_libdir+y}
+then :
+ withval=$with_potrace_libdir;
+fi
+if test "x$with_system_potrace" = xyes; then
+ if $PKG_CONFIG POTRACE; then
+ POTRACE_INCLUDES=`$PKG_CONFIG POTRACE --cflags`
+ POTRACE_LIBS=`$PKG_CONFIG POTRACE --libs`
+elif test "x$need_POTRACE:$with_system_POTRACE" = xyes:yes; then
+ as_fn_error $? "did not find POTRACE" "$LINENO" 5
+fi
+else
+ POTRACE_INCLUDES="-I$kpse_BLD/libs/potrace/include"
+ POTRACE_LIBS="$kpse_BLD/libs/potrace/libpotrace.a"
+ POTRACE_DEPEND='${top_builddir}/../../libs/potrace/libpotrace.a'
+ POTRACE_RULE='# Rebuild libpotrace
+$(POTRACE_DEPEND): ${top_builddir}/../../libs/potrace/include/potrace.h
+ cd ${top_builddir}/../../libs/potrace && $(MAKE) $(AM_MAKEFLAGS) rebuild
+${top_builddir}/../../libs/potrace/include/potrace.h:
+ cd ${top_builddir}/../../libs/potrace && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+fi
+
##tldbg _KPSE_LIB_FLAGS: Setup gmp (-lgmp) flags.
echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=gmp, libname=gmp, options=, tlincl=-IBLD/libs/gmp/include, tllib=BLD/libs/gmp/libgmp.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/gmp/include/gmp.h.' >&5
##tldbg _KPSE_LIB_FLAGS_TL: gmp (gmp) .
Modified: branches/stable/source/src/texk/web2c/configure.ac
===================================================================
--- branches/stable/source/src/texk/web2c/configure.ac 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/configure.ac 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,4 +1,4 @@
-dnl $Id: configure.ac 60569 2021-09-21 16:46:46Z karl $
+dnl $Id: configure.ac 64168 2022-08-22 21:33:05Z lscarso $
dnl Process this file with Autoconf to produce a configure script for Web2c.
dnl
dnl Copyright 2018-2019 Karl Berry <tex-live at tug.org>
@@ -257,6 +257,7 @@
KPSE_FREETYPE2_FLAGS
KPSE_PIXMAN_FLAGS
KPSE_CAIRO_FLAGS
+KPSE_POTRACE_FLAGS
KPSE_GMP_FLAGS
KPSE_MPFR_FLAGS
KPSE_XPDF_FLAGS
Modified: branches/stable/source/src/texk/web2c/ctangleboot.cin
===================================================================
--- branches/stable/source/src/texk/web2c/ctangleboot.cin 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/ctangleboot.cin 2022-11-14 21:05:34 UTC (rev 884)
@@ -28,7 +28,7 @@
/*:4*/
#line 67 "cwebdir/ctangle.w"
-#define banner "This is CTANGLE, Version 4.7" \
+#define banner "This is CTANGLE, Version 4.8" \
\
#define _(s) gettext(s) \
@@ -142,6 +142,8 @@
#define translit_length 10 \
+#define transliterate_utf_eight flags['u'] \
+
#define ignore 00
#define ord 0302
#define control_text 0303
@@ -274,7 +276,7 @@
extern FILE*check_file;
/*:15*//*116:*/
-#line 506 "cwebdir/ctang-w2c.ch"
+#line 555 "cwebdir/ctang-w2c.ch"
extern char cb_banner[];
@@ -357,7 +359,7 @@
/*:52*//*57:*/
#line 703 "cwebdir/ctangle.w"
-static char translit[128][translit_length];
+static char translit[0200][translit_length];
/*:57*//*62:*/
#line 779 "cwebdir/ctangle.w"
@@ -512,9 +514,10 @@
{
int i;
-for(i= 0;i<128;i++)sprintf(translit[i],"X%02X",(unsigned int)(128+i));
+for(i= 0;i<0200;i++)sprintf(translit[i],"X%02X",(unsigned int)(0200+i));
}
+#line 180 "cwebdir/ctang-w2c.ch"
/*:58*//*63:*/
#line 782 "cwebdir/ctangle.w"
{
@@ -540,7 +543,7 @@
section_text[0]= ' ';
/*:78*//*117:*/
-#line 509 "cwebdir/ctang-w2c.ch"
+#line 558 "cwebdir/ctang-w2c.ch"
strncpy(cb_banner,banner,max_banner-1);
@@ -754,11 +757,11 @@
if(check_for_change){
fclose(C_file);C_file= NULL;
/*106:*/
-#line 389 "cwebdir/ctang-w2c.ch"
+#line 438 "cwebdir/ctang-w2c.ch"
if((C_file= fopen(C_file_name,"r"))!=NULL){
/*107:*/
-#line 396 "cwebdir/ctang-w2c.ch"
+#line 445 "cwebdir/ctang-w2c.ch"
boolean comparison= false;
@@ -767,7 +770,7 @@
/*108:*/
-#line 410 "cwebdir/ctang-w2c.ch"
+#line 459 "cwebdir/ctang-w2c.ch"
do{
char x[BUFSIZ],y[BUFSIZ];
@@ -777,7 +780,7 @@
}while(comparison&&!feof(C_file)&&!feof(check_file));
/*:108*/
-#line 403 "cwebdir/ctang-w2c.ch"
+#line 452 "cwebdir/ctang-w2c.ch"
fclose(C_file);C_file= NULL;
@@ -784,10 +787,10 @@
fclose(check_file);check_file= NULL;
/*:107*/
-#line 391 "cwebdir/ctang-w2c.ch"
+#line 440 "cwebdir/ctang-w2c.ch"
/*109:*/
-#line 421 "cwebdir/ctang-w2c.ch"
+#line 470 "cwebdir/ctang-w2c.ch"
if(comparison)
remove(check_file_name);
@@ -797,7 +800,7 @@
}
/*:109*/
-#line 392 "cwebdir/ctang-w2c.ch"
+#line 441 "cwebdir/ctang-w2c.ch"
}else
rename(check_file_name,C_file_name);
@@ -810,7 +813,7 @@
an_output_file--;
sprint_section_name(output_file_name,*an_output_file);
if(check_for_change)/*105:*/
-#line 380 "cwebdir/ctang-w2c.ch"
+#line 429 "cwebdir/ctang-w2c.ch"
{
if((C_file= fopen(output_file_name,"a"))==NULL)
fatal(_("! Cannot open output file "),output_file_name);
@@ -841,14 +844,14 @@
if(check_for_change){
fclose(C_file);C_file= NULL;
/*110:*/
-#line 434 "cwebdir/ctang-w2c.ch"
+#line 483 "cwebdir/ctang-w2c.ch"
if(0==strcmp("/dev/stdout",output_file_name))
/*112:*/
-#line 461 "cwebdir/ctang-w2c.ch"
+#line 510 "cwebdir/ctang-w2c.ch"
{
/*115:*/
-#line 492 "cwebdir/ctang-w2c.ch"
+#line 541 "cwebdir/ctang-w2c.ch"
char in_buf[BUFSIZ+1];
int in_size;
@@ -858,7 +861,7 @@
/*:115*/
-#line 462 "cwebdir/ctang-w2c.ch"
+#line 511 "cwebdir/ctang-w2c.ch"
do{
in_size= fread(in_buf,sizeof(char),BUFSIZ,check_file);
@@ -867,7 +870,7 @@
}while(!feof(check_file));
fclose(check_file);check_file= NULL;
/*111:*/
-#line 451 "cwebdir/ctang-w2c.ch"
+#line 500 "cwebdir/ctang-w2c.ch"
if(comparison)
remove(check_file_name);
@@ -877,19 +880,19 @@
}
/*:111*/
-#line 469 "cwebdir/ctang-w2c.ch"
+#line 518 "cwebdir/ctang-w2c.ch"
}
/*:112*/
-#line 436 "cwebdir/ctang-w2c.ch"
+#line 485 "cwebdir/ctang-w2c.ch"
else if(0==strcmp("/dev/stderr",output_file_name))
/*113:*/
-#line 474 "cwebdir/ctang-w2c.ch"
+#line 523 "cwebdir/ctang-w2c.ch"
{
/*115:*/
-#line 492 "cwebdir/ctang-w2c.ch"
+#line 541 "cwebdir/ctang-w2c.ch"
char in_buf[BUFSIZ+1];
int in_size;
@@ -899,7 +902,7 @@
/*:115*/
-#line 475 "cwebdir/ctang-w2c.ch"
+#line 524 "cwebdir/ctang-w2c.ch"
do{
in_size= fread(in_buf,sizeof(char),BUFSIZ,check_file);
@@ -908,7 +911,7 @@
}while(!feof(check_file));
fclose(check_file);check_file= NULL;
/*111:*/
-#line 451 "cwebdir/ctang-w2c.ch"
+#line 500 "cwebdir/ctang-w2c.ch"
if(comparison)
remove(check_file_name);
@@ -918,20 +921,20 @@
}
/*:111*/
-#line 482 "cwebdir/ctang-w2c.ch"
+#line 531 "cwebdir/ctang-w2c.ch"
}
/*:113*/
-#line 438 "cwebdir/ctang-w2c.ch"
+#line 487 "cwebdir/ctang-w2c.ch"
else if(0==strcmp("/dev/null",output_file_name))
/*114:*/
-#line 487 "cwebdir/ctang-w2c.ch"
+#line 536 "cwebdir/ctang-w2c.ch"
{
boolean comparison= true;
/*111:*/
-#line 451 "cwebdir/ctang-w2c.ch"
+#line 500 "cwebdir/ctang-w2c.ch"
if(comparison)
remove(check_file_name);
@@ -941,17 +944,17 @@
}
/*:111*/
-#line 489 "cwebdir/ctang-w2c.ch"
+#line 538 "cwebdir/ctang-w2c.ch"
}
/*:114*/
-#line 440 "cwebdir/ctang-w2c.ch"
+#line 489 "cwebdir/ctang-w2c.ch"
else{
if((C_file= fopen(output_file_name,"r"))!=NULL){
/*107:*/
-#line 396 "cwebdir/ctang-w2c.ch"
+#line 445 "cwebdir/ctang-w2c.ch"
boolean comparison= false;
@@ -960,7 +963,7 @@
/*108:*/
-#line 410 "cwebdir/ctang-w2c.ch"
+#line 459 "cwebdir/ctang-w2c.ch"
do{
char x[BUFSIZ],y[BUFSIZ];
@@ -970,7 +973,7 @@
}while(comparison&&!feof(C_file)&&!feof(check_file));
/*:108*/
-#line 403 "cwebdir/ctang-w2c.ch"
+#line 452 "cwebdir/ctang-w2c.ch"
fclose(C_file);C_file= NULL;
@@ -977,10 +980,10 @@
fclose(check_file);check_file= NULL;
/*:107*/
-#line 443 "cwebdir/ctang-w2c.ch"
+#line 492 "cwebdir/ctang-w2c.ch"
/*111:*/
-#line 451 "cwebdir/ctang-w2c.ch"
+#line 500 "cwebdir/ctang-w2c.ch"
if(comparison)
remove(check_file_name);
@@ -990,7 +993,7 @@
}
/*:111*/
-#line 444 "cwebdir/ctang-w2c.ch"
+#line 493 "cwebdir/ctang-w2c.ch"
}else
rename(check_file_name,output_file_name);
@@ -1074,15 +1077,25 @@
if(protect||out_state==verbatim)C_putc('\\');
flush_buffer();if(out_state!=verbatim)out_state= normal;break;
/*59:*/
-#line 712 "cwebdir/ctangle.w"
+#line 206 "cwebdir/ctang-w2c.ch"
+#line 713 "cwebdir/ctangle.w"
case identifier:
if(out_state==num_or_id)C_putc(' ');
for(j= (cur_val+name_dir)->byte_start,k= (cur_val+name_dir+1)->byte_start;
j<k;j++)
-if((eight_bits)(*j)<0200)C_putc(*j);
+#line 214 "cwebdir/ctang-w2c.ch"
+if(ishigh(*j)){
-else C_printf("%s",translit[(eight_bits)(*j)-0200]);
+if(transliterate_utf_eight){
+if((eight_bits)(*j)>=0360)j+= 3;
+else if((eight_bits)(*j)>=0340)j+= 2;
+else if((eight_bits)(*j)>=0300)j+= 1;
+}
+C_printf("%s",translit[(eight_bits)(*j)-0200]);
+}
+else C_putc(*j);
+#line 720 "cwebdir/ctangle.w"
out_state= num_or_id;break;
/*:59*/
@@ -1188,7 +1201,7 @@
if(is_long_comment){
if(get_line())return comment_continues= true;
else{
-#line 180 "cwebdir/ctang-w2c.ch"
+#line 229 "cwebdir/ctang-w2c.ch"
err_print(_("! Input ended in mid-comment"));
#line 853 "cwebdir/ctangle.w"
@@ -1203,7 +1216,7 @@
}
if(c=='@'){
if(ccode[(eight_bits)*loc]==new_section){
-#line 186 "cwebdir/ctang-w2c.ch"
+#line 235 "cwebdir/ctang-w2c.ch"
err_print(_("! Section name ended in mid-comment"));loc--;
#line 866 "cwebdir/ctangle.w"
@@ -1311,13 +1324,13 @@
while(true){
if(loc>=limit){
if(*(limit-1)!='\\'){
-#line 192 "cwebdir/ctang-w2c.ch"
+#line 241 "cwebdir/ctang-w2c.ch"
err_print(_("! String didn't end"));loc= limit;break;
#line 1016 "cwebdir/ctangle.w"
}
if(get_line()==false){
-#line 198 "cwebdir/ctang-w2c.ch"
+#line 247 "cwebdir/ctang-w2c.ch"
err_print(_("! Input ended in middle of string"));loc= buffer;break;
#line 1020 "cwebdir/ctangle.w"
@@ -1337,7 +1350,7 @@
if(++id_loc<=section_text_end)*id_loc= (char)c;
}
if(id_loc>=section_text_end){
-#line 204 "cwebdir/ctang-w2c.ch"
+#line 253 "cwebdir/ctang-w2c.ch"
fputs(_("\n! String too long: "),stdout);
#line 1038 "cwebdir/ctangle.w"
@@ -1371,7 +1384,7 @@
switch(c= ccode[(eight_bits)*loc++]){
case ignore:continue;
-#line 210 "cwebdir/ctang-w2c.ch"
+#line 259 "cwebdir/ctang-w2c.ch"
case translit_code:err_print(_("! Use @l in limbo only"));continue;
#line 1053 "cwebdir/ctangle.w"
@@ -1378,7 +1391,7 @@
case control_text:while((c= skip_ahead())=='@');
if(*(loc-1)!='>')
-#line 216 "cwebdir/ctang-w2c.ch"
+#line 265 "cwebdir/ctang-w2c.ch"
err_print(_("! Double @ should be used in control text"));
#line 1058 "cwebdir/ctangle.w"
@@ -1394,7 +1407,7 @@
while(true){
if(loc> limit&&get_line()==false){
-#line 234 "cwebdir/ctang-w2c.ch"
+#line 283 "cwebdir/ctang-w2c.ch"
err_print(_("! Input ended in section name"));
#line 1120 "cwebdir/ctangle.w"
@@ -1410,13 +1423,13 @@
loc+= 2;break;
}
if(ccode[(eight_bits)c]==new_section){
-#line 246 "cwebdir/ctang-w2c.ch"
+#line 295 "cwebdir/ctang-w2c.ch"
err_print(_("! Section name didn't end"));break;
#line 1147 "cwebdir/ctangle.w"
}
if(ccode[(eight_bits)c]==section_name){
-#line 252 "cwebdir/ctang-w2c.ch"
+#line 301 "cwebdir/ctang-w2c.ch"
err_print(_("! Nesting of section names not allowed"));break;
#line 1151 "cwebdir/ctangle.w"
@@ -1434,7 +1447,7 @@
*k= (char)c;
}
if(k>=section_text_end){
-#line 240 "cwebdir/ctang-w2c.ch"
+#line 289 "cwebdir/ctang-w2c.ch"
fputs(_("\n! Section name too long: "),stdout);
#line 1133 "cwebdir/ctangle.w"
@@ -1482,7 +1495,7 @@
id_first= loc++;*(limit+1)= '@';*(limit+2)= '>';
while(*loc!='@'||*(loc+1)!='>')loc++;
-#line 258 "cwebdir/ctang-w2c.ch"
+#line 307 "cwebdir/ctang-w2c.ch"
if(loc>=limit)err_print(_("! Verbatim string didn't end"));
#line 1165 "cwebdir/ctangle.w"
@@ -1501,7 +1514,7 @@
while(*loc!='\''){
if(*loc=='@'){
if(*(loc+1)!='@')
-#line 222 "cwebdir/ctang-w2c.ch"
+#line 271 "cwebdir/ctang-w2c.ch"
err_print(_("! Double @ should be used in ASCII constant"));
#line 1082 "cwebdir/ctangle.w"
@@ -1509,7 +1522,7 @@
}
loc++;
if(loc> limit){
-#line 228 "cwebdir/ctang-w2c.ch"
+#line 277 "cwebdir/ctang-w2c.ch"
err_print(_("! String didn't end"));loc= limit-1;break;
#line 1088 "cwebdir/ctangle.w"
@@ -1615,7 +1628,7 @@
while(*try_loc==' '&&try_loc<limit)try_loc++;
if(*try_loc=='+'&&try_loc<limit)try_loc++;
while(*try_loc==' '&&try_loc<limit)try_loc++;
-#line 294 "cwebdir/ctang-w2c.ch"
+#line 343 "cwebdir/ctang-w2c.ch"
if(*try_loc=='=')err_print(_("! Missing `@ ' before a named section"));
#line 1291 "cwebdir/ctangle.w"
@@ -1651,7 +1664,7 @@
}
break;
-#line 282 "cwebdir/ctang-w2c.ch"
+#line 331 "cwebdir/ctang-w2c.ch"
case output_defs_code:if(t!=section_name)err_print(_("! Misplaced @h"));
#line 1263 "cwebdir/ctangle.w"
@@ -1690,7 +1703,7 @@
while(id_first<id_loc){
if(*id_first=='@'){
if(*(id_first+1)=='@')id_first++;
-#line 300 "cwebdir/ctang-w2c.ch"
+#line 349 "cwebdir/ctang-w2c.ch"
else err_print(_("! Double @ should be used in string"));
#line 1308 "cwebdir/ctangle.w"
@@ -1744,7 +1757,7 @@
case'\\':c= '\\';break;
case'\'':c= '\'';break;
case'\"':c= '\"';break;
-#line 306 "cwebdir/ctang-w2c.ch"
+#line 355 "cwebdir/ctang-w2c.ch"
default:err_print(_("! Unrecognized escape sequence"));
#line 1357 "cwebdir/ctangle.w"
@@ -1764,7 +1777,7 @@
break;
case definition:case format_code:case begin_C:if(t!=section_name)goto done;
else{
-#line 288 "cwebdir/ctang-w2c.ch"
+#line 337 "cwebdir/ctang-w2c.ch"
err_print(_("! @d, @f and @c are ignored in C text"));continue;
#line 1281 "cwebdir/ctangle.w"
@@ -1780,7 +1793,7 @@
default:app_repl(a);
}
done:next_control= (eight_bits)a;
-#line 276 "cwebdir/ctang-w2c.ch"
+#line 325 "cwebdir/ctang-w2c.ch"
if(text_ptr> text_info_end)overflow(_("text"));
#line 1216 "cwebdir/ctangle.w"
cur_text= text_ptr;(++text_ptr)->tok_start= tok_ptr;
@@ -1819,7 +1832,7 @@
while((next_control= get_next())=='\n');
if(next_control!=identifier){
-#line 312 "cwebdir/ctang-w2c.ch"
+#line 361 "cwebdir/ctang-w2c.ch"
err_print(_("! Definition flushed, must start with identifier"));
#line 1430 "cwebdir/ctangle.w"
@@ -1930,7 +1943,7 @@
loc+= 3;
if(loc> limit||!xisxdigit(*(loc-3))||!xisxdigit(*(loc-2))
||(*(loc-3)>='0'&&*(loc-3)<='7')||!xisspace(*(loc-1)))
-#line 332 "cwebdir/ctang-w2c.ch"
+#line 381 "cwebdir/ctang-w2c.ch"
err_print(_("! Improper hex number following @l"));
#line 1529 "cwebdir/ctangle.w"
@@ -1940,9 +1953,9 @@
sscanf(loc-3,"%x",&i);
while(xisspace(*loc)&&loc<limit)loc++;
beg= loc;
-while(loc<limit&&(xisalpha(*loc)||xisdigit(*loc)||*loc=='_'))loc++;
+while(loc<limit&&(xisalpha(*loc)||xisdigit(*loc)||isxalpha(*loc)))loc++;
if(loc-beg>=translit_length)
-#line 338 "cwebdir/ctang-w2c.ch"
+#line 387 "cwebdir/ctang-w2c.ch"
err_print(_("! Replacement string in @l too long"));
#line 1539 "cwebdir/ctangle.w"
@@ -1959,12 +1972,12 @@
case control_text:if(c=='q'||c=='Q'){
while((c= (char)skip_ahead())=='@');
if(*(loc-1)!='>')
-#line 318 "cwebdir/ctang-w2c.ch"
+#line 367 "cwebdir/ctang-w2c.ch"
err_print(_("! Double @ should be used in control text"));
#line 1511 "cwebdir/ctangle.w"
break;
-#line 325 "cwebdir/ctang-w2c.ch"
+#line 374 "cwebdir/ctang-w2c.ch"
}/* otherwise fall through */
default:err_print(_("! Double @ should be used in limbo"));
#line 1515 "cwebdir/ctangle.w"
@@ -1979,7 +1992,7 @@
void
print_stats(void){
-#line 351 "cwebdir/ctang-w2c.ch"
+#line 400 "cwebdir/ctang-w2c.ch"
puts(_("\nMemory usage statistics:"));
printf(_("%td names (out of %ld)\n"),
(ptrdiff_t)(name_ptr-name_dir),(long)max_names);
@@ -1992,5 +2005,5 @@
(ptrdiff_t)(tok_ptr-tok_mem),(long)max_toks);
}
-#line 364 "cwebdir/ctang-w2c.ch"
+#line 413 "cwebdir/ctang-w2c.ch"
/*:103*/
Modified: branches/stable/source/src/texk/web2c/cwebdir/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ChangeLog 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/ChangeLog 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,3 +1,138 @@
+2022-08-21 Andreas Scherer <https://ascherer.github.io>
+
+ * ctang-w2c.ch,
+ * ctangle.c,
+ * ctangle.w,
+ * cwebman-w2c.ch: New option '+u' for CTANGLE.
+
+2022-07-02 Andreas Scherer <https://ascherer.github.io>
+
+ * cwebmac.tex,
+ * texinputs/pdfctwimac.tex: Fix \ifpdf logic.
+
+2022-06-20 Andreas Scherer <https://ascherer.github.io>
+
+ * texinputs/dcwebmac.tex,
+ * texinputs/dcwebstrings.tex,
+ * texinputs/fcwebman.tex,
+ * texinputs/icwebmac.tex: Update translated macros.
+
+2022-06-19 Andreas Scherer <https://ascherer.github.io>
+
+ * comm-w2c.ch,
+ * ctwill-mini.ch,
+ * cwebmac.tex,
+ * cwebman-w2c.ch,
+ * cwebman.tex,
+ * texinputs/dctproofmac.tex,
+ * texinputs/dctwimac.tex,
+ * texinputs/pdfctwimac.tex: Use 'iftex.sty' for TeX engine tests.
+
+2022-06-18 Andreas Scherer <https://ascherer.github.io>
+
+ * cwebmac.tex: Fix \pdfURL for 'valid' output.
+
+2022-06-17 Andreas Scherer <https://ascherer.github.io>
+
+ * Makefile: New target for CTAN packaging.
+ * cwebmac.tex: Fix two bugs from 2002 and 2000.
+
+2022-06-05 Andreas Scherer <https://ascherer.github.io>
+
+ * Makefile,
+ * comm-mac.ch,
+ * comm-mini.ch,
+ * comm-ql.ch,
+ * comm-w2c.ch,
+ * comm-w2c.h,
+ * common.h,
+ * common.w,
+ * ctang-bs.ch,
+ * ctang-pc.ch,
+ * ctang-ql.ch,
+ * ctang-vms.ch,
+ * ctang-w2c.ch,
+ * ctang-w32.ch,
+ * ctangle.c,
+ * ctangle.w,
+ * ctwill-w2c.ch,
+ * cweav-bs.ch,
+ * cweav-pc.ch,
+ * cweav-ql.ch,
+ * cweav-vms.ch,
+ * cweav-w2c.ch,
+ * cweav-w32.ch,
+ * cweave.w,
+ * cwebmac.tex,
+ * cwebman-w2c.ch,
+ * cwebman.tex,
+ * po/cweb-tl.pot,
+ * po/cweb.pot,
+ * po/de/cweb-tl.po,
+ * po/de/cweb.po,
+ * po/it/cweb.po,
+ * prod-cweave.w,
+ * prod-twill.w,
+ * prod.w: CWEB 4.8 release.
+
+2022-06-05 Andreas Scherer <https://ascherer.github.io>
+
+ * cweave.w,
+ * cwebman-w2c.ch,
+ * cwebman.tex: Update borderline cases.
+
+2022-06-04 Andreas Scherer <https://ascherer.github.io>
+
+ * cwebman.tex: Update codes in Appendices.
+
+2022-05-31 Andreas Scherer <https://ascherer.github.io>
+
+ * common.w: Amend reference to COMMON interface.
+
+2022-05-29 Andreas Scherer <https://ascherer.github.io>
+
+ * cweave.w: DRY up section 120.
+
+2022-05-28 Andreas Scherer <https://ascherer.github.io>
+
+ * ctwill-w2c.ch,
+ * cweav-w2c.ch,
+ * cweave.w,
+ * prod-cweave.w,
+ * prod-twill.w,
+ * prod.w: Improve productions 33, 118, and 153.
+
+2022-05-27 Andreas Scherer <https://ascherer.github.io>
+
+ * ctwill-mini.ch,
+ * ctwill-w2c.ch,
+ * cweav-w2c.ch,
+ * cweave.w,
+ * prod-cweave.w,
+ * prod-twill.w,
+ * prod.w: Unambiguous prductions 83 and 121.
+
+2022-05-23 Andreas Scherer <https://ascherer.github.io>
+
+ * Makefile,
+ * ctwill-w2c.ch,
+ * cweave.w,
+ * prod-cweave.w,
+ * prod.w: Fix production rule 117 similar to rule 35.
+
+2022-05-03 Andreas Scherer <https://ascherer.github.io>
+
+ * cweave.w,
+ * prod-cweave.w,
+ * prod-twill.w,
+ * prod.w: Use non-breaking thin space for simple cast.
+
+2022-04-30 Andreas Scherer <https://ascherer.github.io>
+
+ * ctwill-w2c.ch,
+ * cweav-w2c.ch,
+ * cweave.w: Fix a preprocessor issue (gb_io.w).
+
2022-03-10 Andreas Scherer <https://ascherer.github.io>
* Makefile,
Modified: branches/stable/source/src/texk/web2c/cwebdir/Makefile
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/Makefile 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/Makefile 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,6 +1,6 @@
# This file is part of CWEB.
# It is distributed WITHOUT ANY WARRANTY, express or implied.
-# Version 4.7 --- February 2022
+# Version 4.8 --- June 2022
# Copyright (C) 1987,1990,1993,2000 Silvio Levy and Donald E. Knuth
@@ -13,7 +13,7 @@
# entire resulting derived work is given a different name and distributed
# under the terms of a permission notice identical to this one.
-#
+#
# Read the README file, then edit this file to reflect local conditions
#
@@ -138,7 +138,7 @@
$(CC) $(CFLAGS) -DCWEBINPUTS=\"$(CWEBINPUTS)\" -c common.c
ctangle: ctangle.o common.o
- $(CC) $(LINKFLAGS) -o ctangle ctangle.o common.o
+ $(CC) $(LINKFLAGS) -o ctangle ctangle.o common.o
ctangle.c: ctangle.w $(TCHANGES) common.h
$(CTANGLE) ctangle $(TCHANGES)
@@ -203,3 +203,8 @@
tarball:
tar zcvhf /tmp/cweb.tgz $(ALL) examples
+
+ctan:
+ git archive -o ~/cweb-4.8.zip --prefix=cweb/ cweb-4.8
+ make PDF=pdf usermanual
+ cd ..; zip -r ~/cweb-4.8.zip cweb/cwebman.pdf
Modified: branches/stable/source/src/texk/web2c/cwebdir/comm-mac.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/comm-mac.ch 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/comm-mac.ch 2022-11-14 21:05:34 UTC (rev 884)
@@ -4,9 +4,9 @@
(Contributed 13 Oct 2000 by AndPio at aol.com; slightly edited by Don Knuth)
@x in limbo, change the title page document to specify Mac version
- \centerline{(Version 4.7)}
+ \centerline{(Version 4.8)}
@y
- \centerline{(Version 4.7 for MacOS)}
+ \centerline{(Version 4.8 for MacOS)}
@z
@x section 23: Make input_ln accept \n, \r, \n\r, or \r\n as line endings
Modified: branches/stable/source/src/texk/web2c/cwebdir/comm-mini.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/comm-mini.ch 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/comm-mini.ch 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,9 +1,9 @@
Limbo.
@x
-\def\title{Common code for CTANGLE and CWEAVE (Version 4.7 [CWEBbin 2022])}
+\def\title{Common code for CTANGLE and CWEAVE (Version 4.8 [CWEBbin 2022])}
@y
-\def\title{COMMON (Version 4.7 [CWEBbin 2022])}
+\def\title{COMMON (Version 4.8 [CWEBbin 2022])}
\def\contentspagenumber{0}
@z
Modified: branches/stable/source/src/texk/web2c/cwebdir/comm-ql.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/comm-ql.ch 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/comm-ql.ch 2022-11-14 21:05:34 UTC (rev 884)
@@ -10,12 +10,12 @@
@x
\def\v{\char'174} % vertical (|) in typewriter font
-\def\title{Common code for CTANGLE and CWEAVE (Version 4.7)}
+\def\title{Common code for CTANGLE and CWEAVE (Version 4.8)}
\def\topofcontents{\null\vfill
\centerline{\titlefont Common code for {\ttitlefont CTANGLE} and
{\ttitlefont CWEAVE}}
\vskip 15pt
- \centerline{(Version 4.7)}
+ \centerline{(Version 4.8)}
\vfill}
\def\botofcontents{\vfill
\noindent
@@ -22,12 +22,12 @@
@y
\def\v{\char'174} % vertical (|) in typewriter font
-\def\title{Common code for CTANGLE and CWEAVE (QL Version 4.7)}
+\def\title{Common code for CTANGLE and CWEAVE (QL Version 4.8)}
\def\topofcontents{\null\vfill
\centerline{\titlefont Common code for {\ttitlefont CTANGLE} and
{\ttitlefont CWEAVE}}
\vskip 15pt
- \centerline{(Version 4.7)}
+ \centerline{(Version 4.8)}
\vfill}
\def\botofcontents{\vfill
\noindent
Modified: branches/stable/source/src/texk/web2c/cwebdir/comm-w2c.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/comm-w2c.ch 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/comm-w2c.ch 2022-11-14 21:05:34 UTC (rev 884)
@@ -17,16 +17,16 @@
@q Please send comments, suggestions, etc. to tex-k@@tug.org. @>
@x
-\def\title{Common code for CTANGLE and CWEAVE (Version 4.7)}
+\def\title{Common code for CTANGLE and CWEAVE (Version 4.8)}
@y
-\def\Kpathsea/{{\mc KPATHSEA\spacefactor1000}} \ifacro\sanitizecommand\Kpathsea{KPATHSEA}\fi
-\def\title{Common code for CTANGLE and CWEAVE (4.7 [\TeX~Live])}
+\def\Kpathsea/{{\mc KPATHSEA\spacefactor1000}} \ifpdf\sanitizecommand\Kpathsea{KPATHSEA}\fi
+\def\title{Common code for CTANGLE and CWEAVE (4.8 [\TeX~Live])}
@z
@x
- \centerline{(Version 4.7)}
+ \centerline{(Version 4.8)}
@y
- \centerline{(Version 4.7 [\TeX~Live])}
+ \centerline{(Version 4.8 [\TeX~Live])}
@z
@x
Modified: branches/stable/source/src/texk/web2c/cwebdir/comm-w2c.h
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/comm-w2c.h 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/comm-w2c.h 2022-11-14 21:05:34 UTC (rev 884)
@@ -2,7 +2,7 @@
% This program by Silvio Levy and Donald E. Knuth
% is based on a program by Knuth.
% It is distributed WITHOUT ANY WARRANTY, express or implied.
-% Version 4.7 --- February 2022 (works also with later versions)
+% Version 4.8 --- June 2022 (works also with later versions)
% Copyright (C) 1987,1990,1993 Silvio Levy and Donald E. Knuth
Modified: branches/stable/source/src/texk/web2c/cwebdir/common.h
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/common.h 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/common.h 2022-11-14 21:05:34 UTC (rev 884)
@@ -2,7 +2,7 @@
% This program by Silvio Levy and Donald E. Knuth
% is based on a program by Knuth.
% It is distributed WITHOUT ANY WARRANTY, express or implied.
-% Version 4.7 --- February 2022 (works also with later versions)
+% Version 4.8 --- June 2022 (works also with later versions)
% Copyright (C) 1987,1990,1993 Silvio Levy and Donald E. Knuth
Modified: branches/stable/source/src/texk/web2c/cwebdir/common.w
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/common.w 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/common.w 2022-11-14 21:05:34 UTC (rev 884)
@@ -2,7 +2,7 @@
% This program by Silvio Levy and Donald E. Knuth
% is based on a program by Knuth.
% It is distributed WITHOUT ANY WARRANTY, express or implied.
-% Version 4.7 --- February 2022
+% Version 4.8 --- June 2022
% Copyright (C) 1987,1990,1993,2000 Silvio Levy and Donald E. Knuth
@@ -22,12 +22,12 @@
\def\v{\char'174} % vertical (|) in typewriter font
-\def\title{Common code for CTANGLE and CWEAVE (Version 4.7)}
+\def\title{Common code for CTANGLE and CWEAVE (Version 4.8)}
\def\topofcontents{\null\vfill
\centerline{\titlefont Common code for {\ttitlefont CTANGLE} and
{\ttitlefont CWEAVE}}
\vskip 15pt
- \centerline{(Version 4.7)}
+ \centerline{(Version 4.8)}
\vfill}
\def\botofcontents{\vfill
\noindent
@@ -66,8 +66,8 @@
@<Global variables@>@/
@<Predeclaration of procedures@>
-@ The details will be filled in due course. The interface of this module
-is included first. It is also used by the main programs.
+@ The details will be filled in due course. The interface |"common.h"| of this
+\.{COMMON} module is included first. It is also used by the main programs.
@i common.h
Modified: branches/stable/source/src/texk/web2c/cwebdir/ctang-bs.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ctang-bs.ch 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/ctang-bs.ch 2022-11-14 21:05:34 UTC (rev 884)
@@ -17,12 +17,12 @@
The ``banner line'' defined here should be changed whenever \.{CTANGLE}
is modified.
- at d banner "This is CTANGLE (Version 4.7)"
+ at d banner "This is CTANGLE (Version 4.8)"
@y
The ``banner line'' defined here should be changed whenever \.{CTANGLE}
is modified.
- at d banner "This is CTANGLE (Version 4.7pc/big)"
+ at d banner "This is CTANGLE (Version 4.8pc/big)"
@z
Modified: branches/stable/source/src/texk/web2c/cwebdir/ctang-pc.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ctang-pc.ch 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/ctang-pc.ch 2022-11-14 21:05:34 UTC (rev 884)
@@ -9,9 +9,9 @@
alternate change files with -bs suffix instead of -pc.
@x section 1
- at d banner "This is CTANGLE (Version 4.7)"
+ at d banner "This is CTANGLE (Version 4.8)"
@y
- at d banner "This is CTANGLE (Version 4.7pc)"
+ at d banner "This is CTANGLE (Version 4.8pc)"
@z
@x section 17
@d max_bytes 100000 /* the number of bytes in identifiers,
Modified: branches/stable/source/src/texk/web2c/cwebdir/ctang-ql.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ctang-ql.ch 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/ctang-ql.ch 2022-11-14 21:05:34 UTC (rev 884)
@@ -7,15 +7,15 @@
@x
-\def\title{CTANGLE (Version 4.7)}
+\def\title{CTANGLE (Version 4.8)}
@y
-\def\title{CTANGLE (QL Version 4.7)}
+\def\title{CTANGLE (QL Version 4.8)}
@z
@x section 1
- at d banner "This is CTANGLE (Version 4.7)"
+ at d banner "This is CTANGLE (Version 4.8)"
@y
- at d banner "This is CTANGLE (QL Version 4.7)"
+ at d banner "This is CTANGLE (QL Version 4.8)"
@z
@x
Modified: branches/stable/source/src/texk/web2c/cwebdir/ctang-vms.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ctang-vms.ch 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/ctang-vms.ch 2022-11-14 21:05:34 UTC (rev 884)
@@ -10,9 +10,9 @@
(these changes not necessary for initial bootstrapping)
@x section 1 (01-FEB-1992 ST)
- at d banner "This is CTANGLE (Version 4.7)"
+ at d banner "This is CTANGLE (Version 4.8)"
@y
- at d banner "This is CTANGLE (VAX/VMS Version 4.7)"
+ at d banner "This is CTANGLE (VAX/VMS Version 4.8)"
@z
@x section 4 (01-FEB-1992 ST)
Modified: branches/stable/source/src/texk/web2c/cwebdir/ctang-w2c.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ctang-w2c.ch 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/ctang-w2c.ch 2022-11-14 21:05:34 UTC (rev 884)
@@ -17,15 +17,15 @@
@q Please send comments, suggestions, etc. to tex-k@@tug.org. @>
@x
-\def\title{CTANGLE (Version 4.7)}
+\def\title{CTANGLE (Version 4.8)}
@y
-\def\title{CTANGLE (Version 4.7 [\TeX~Live])}
+\def\title{CTANGLE (Version 4.8 [\TeX~Live])}
@z
@x
- \centerline{(Version 4.7)}
+ \centerline{(Version 4.8)}
@y
- \centerline{(Version 4.7 [\TeX~Live])}
+ \centerline{(Version 4.8 [\TeX~Live])}
@z
@x
@@ -41,9 +41,9 @@
@z
@x
- at d banner "This is CTANGLE (Version 4.7)"
+ at d banner "This is CTANGLE (Version 4.8)"
@y
- at d banner "This is CTANGLE, Version 4.7"
+ at d banner "This is CTANGLE, Version 4.8"
/* will be extended by the \TeX~Live |versionstring| */
@z
@@ -175,6 +175,55 @@
@z
@x
+@ @<Case of an identifier@>=@t\1\quad@>
+ at y
+@ Nowadays, most computer files are encoded in some form of ``Unicode''. A very
+convenient special case is ``UTF-8'', a variable-length multi-byte encoding. In
+order to avoid major surgery for the transliteration feature---as tempting as
+the extended notation \.{@@l c3bc ue} might be---, \.{CTANGLE}
+accepts the \.{+u} option to activate a ``poor man's UTF-8'' mechanism. The
+first in a sequence of up to four high-bit bytes (amounting to more than
+$2^{20}$~possible character representations) determines the number of bytes
+used to represent the next character. Instead of extending the |translit| table
+to this multi-byte scenario, we simply strip all but the last byte and use this
+as the transliteration index.
+
+% Exercise 11.6 from the TeXbook:
+\def\frac#1/#2{\leavevmode\kern.1em\raise.5ex\hbox{\the\scriptfont0 #1}
+ \kern-.1em/\kern-.15em\lower.25ex\hbox{\the\scriptfont0 #2}}
+
+\&{Example:} While in ``classic ASCII'' the German word {\it gr\"un\/} could be
+treated with transliteration \.{@@l fc ue} (from codepage ISO/IEC~8859-1) to
+get \.{gruen} as suggested above, in UTF-8 you'd be advised to use \.{@@l bc
+ue} instead, because character {\it \"u\/} (latin small letter u with
+diaeresis) is encoded as the two-byte sequence \.{c3 bc}, indicated by the
+initial three bits of byte \.{c3} (\.{1100 0011}). Note that this simple
+approach leads to the collision with character $\frac1/4$ (vulgar fraction one
+quarter) with its two-byte encoding \.{c2 bc}.
+
+ at d transliterate_utf_eight flags['u']
+
+@<Case of an identifier@>=@t\1\quad@>
+ at z
+
+ at x
+ if ((eight_bits)(*j)<0200) C_putc(*j);
+@^high-bit character handling@>
+ else C_printf("%s",translit[(eight_bits)(*j)-0200]);
+ at y
+ if (ishigh(*j)) {
+@^high-bit character handling@>
+ if (transliterate_utf_eight) {
+ if ((eight_bits)(*j)>=0360) j+=3;
+ else if ((eight_bits)(*j)>=0340) j+=2;
+ else if ((eight_bits)(*j)>=0300) j+=1;
+ }
+ C_printf("%s",translit[(eight_bits)(*j)-0200]);
+ }
+ else C_putc(*j);
+ at z
+
+ at x
err_print("! Input ended in mid-comment");
@y
err_print(_("! Input ended in mid-comment"));
Modified: branches/stable/source/src/texk/web2c/cwebdir/ctang-w32.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ctang-w32.ch 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/ctang-w32.ch 2022-11-14 21:05:34 UTC (rev 884)
@@ -4,9 +4,9 @@
Changes necessary for compiling with Borland C/C++
@x section 1
- at d banner "This is CTANGLE (Version 4.7)"
+ at d banner "This is CTANGLE (Version 4.8)"
@y
- at d banner "This is CTANGLE (Version 4.7win32)"
+ at d banner "This is CTANGLE (Version 4.8win32)"
@z
@x
Modified: branches/stable/source/src/texk/web2c/cwebdir/ctangle.c
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ctangle.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/ctangle.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -15,7 +15,7 @@
/*:4*/
#line 67 "ctangle.w"
-#define banner "This is CTANGLE (Version 4.7)" \
+#define banner "This is CTANGLE (Version 4.8)" \
#define ctangle false
#define cweave true \
@@ -330,7 +330,7 @@
/*:52*//*57:*/
#line 703 "ctangle.w"
-static char translit[128][translit_length];
+static char translit[0200][translit_length];
/*:57*//*62:*/
#line 779 "ctangle.w"
@@ -484,7 +484,7 @@
{
int i;
-for(i= 0;i<128;i++)sprintf(translit[i],"X%02X",(unsigned int)(128+i));
+for(i= 0;i<0200;i++)sprintf(translit[i],"X%02X",(unsigned int)(0200+i));
}
/*:58*//*63:*/
@@ -1607,7 +1607,7 @@
sscanf(loc-3,"%x",&i);
while(xisspace(*loc)&&loc<limit)loc++;
beg= loc;
-while(loc<limit&&(xisalpha(*loc)||xisdigit(*loc)||*loc=='_'))loc++;
+while(loc<limit&&(xisalpha(*loc)||xisdigit(*loc)||isxalpha(*loc)))loc++;
if(loc-beg>=translit_length)
err_print("! Replacement string in @l too long");
Modified: branches/stable/source/src/texk/web2c/cwebdir/ctangle.w
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ctangle.w 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/ctangle.w 2022-11-14 21:05:34 UTC (rev 884)
@@ -2,7 +2,7 @@
% This program by Silvio Levy and Donald E. Knuth
% is based on a program by Knuth.
% It is distributed WITHOUT ANY WARRANTY, express or implied.
-% Version 4.7 --- February 2022
+% Version 4.8 --- June 2022
% Copyright (C) 1987,1990,1993,2000 Silvio Levy and Donald E. Knuth
@@ -27,11 +27,11 @@
\mathchardef\RA="3221 % right arrow
\mathchardef\BA="3224 % double arrow
-\def\title{CTANGLE (Version 4.7)}
+\def\title{CTANGLE (Version 4.8)}
\def\topofcontents{\null\vfill
\centerline{\titlefont The {\ttitlefont CTANGLE} processor}
\vskip 15pt
- \centerline{(Version 4.7)}
+ \centerline{(Version 4.8)}
\vfill}
\def\botofcontents{\vfill
\noindent
@@ -61,7 +61,7 @@
The ``banner line'' defined here should be changed whenever \.{CTANGLE}
is modified.
- at d banner "This is CTANGLE (Version 4.7)"
+ at d banner "This is CTANGLE (Version 4.8)"
@c
@<Include files@>@/
@@ -690,8 +690,8 @@
case minus_gt_ast: C_putc('-');@+C_putc('>');@+C_putc('*'); out_state=normal;
break;
-@ When an identifier is output to the \CEE/ file, characters in the
-range 128--255 must be changed into something else, so the \CEE/
+@ When an identifier is output to the \CEE/ file, characters in the range
+128--255 (|0200|--|0377|) must be changed into something else, so the \CEE/
compiler won't complain. By default, \.{CTANGLE} converts the
character with code $16 x+y$ to the three characters `\.X$xy$', but
a different transliteration table can be specified. Thus a German
@@ -701,12 +701,12 @@
@d translit_length 10
@<Private...@>=
-static char translit[128][translit_length];
+static char translit[0200][translit_length];
@ @<Set init...@>=
{
int i;
- for (i=0;i<128;i++) sprintf(translit[i],"X%02X",(unsigned int)(128+i));
+ for (i=0;i<0200;i++) sprintf(translit[i],"X%02X",(unsigned int)(0200+i));
}
@ @<Case of an identifier@>=@t\1\quad@>
@@ -1533,7 +1533,7 @@
sscanf(loc-3,"%x",&i);
while(xisspace(*loc)&&loc<limit) loc++;
beg=loc;
- while(loc<limit&&(xisalpha(*loc)||xisdigit(*loc)||*loc=='_')) loc++;
+ while(loc<limit&&(xisalpha(*loc)||xisdigit(*loc)||isxalpha(*loc))) loc++;
if (loc-beg>=translit_length)
err_print("! Replacement string in @@l too long");
@.Replacement string in @@l...@>
Modified: branches/stable/source/src/texk/web2c/cwebdir/ctwill-mini.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ctwill-mini.ch 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/ctwill-mini.ch 2022-11-14 21:05:34 UTC (rev 884)
@@ -3,7 +3,7 @@
@x
@** Introduction.
@y
-\ifacro \ifx\undefined\pdfpagewidth\else
+\ifpdf \ifx\undefined\pdfpagewidth\else
\pdfpagewidth=\pagewd \advance\pdfpagewidth by 2cm
\pdfpageheight=\pageht \advance\pdfpageheight by 5cm
\ifpdftex \pdfhorigin=1cm \pdfvorigin=1cm
@@ -878,9 +878,9 @@
Section 124.
@x l.291
-\+& |exp| |attr| & |attr| \hfill $E\.\ A$ & \&{enum} $\{x\ [[\ldots]]\}$ \cr
+\+& |exp| |attr| & |exp| \hfill $E\.\ A$ & \&{enum} $\{x\ [[\ldots]]\}$ \cr
@y
-\+& |exp| |attr| & |attr| \hfill $E\.\ A$ & \&{enum} $\{x\ [[\ldots]]\}$ \cr
+\+& |exp| |attr| & |exp| \hfill $E\.\ A$ & \&{enum} $\{x\ [[\ldots]]\}$ \cr
\endgroup
@ Cont.
@@ -1287,9 +1287,9 @@
Section 173.
@x
-if (cat1==else_like || cat1==if_like || cat1==define_like)
+if (cat1==if_like || cat1==else_like || cat1==define_like)
@y
-if (cat1==else_like || cat1==if_like || cat1==define_like) @/
+if (cat1==if_like || cat1==else_like || cat1==define_like) @/
@z
@x
@@ -1298,6 +1298,30 @@
} else @/ if (cat1==exp || cat1==function) {
@z
+Section 178.
+
+ at x l.3017
+ app(opt); app('9'); reduce(pp,4,langle,0,153);
+ }
+ else reduce(pp,4,cast,-1,154);
+ at y
+ app(opt); app('9'); reduce(pp,4,langle,0,153);
+ } @+
+ else reduce(pp,4,cast,-1,154);
+ at z
+
+Section 179.
+
+ at x l.3028
+ big_app1_insert(pp,' '); reduce(pp,2,struct_like,0,155);
+}
+else reduce(pp,0,raw_int,0,91);
+ at y
+ big_app1_insert(pp,' '); reduce(pp,2,struct_like,0,155);
+} @+
+else reduce(pp,0,raw_int,0,91);
+ at z
+
Section 181.
@x
@@ -1566,9 +1590,9 @@
if ((a<indent && !(b==big_cancel&&a==' ')) @|
|| (a>big_force && a!=dindent)) break;
switch (a) {
+ case dindent: c++; @=/* fall through */@>@;
case indent: c++; break;
case outdent: c--; break;
- case dindent: c+=2; break;
case opt: a=get_output();
}
}
@@ -1608,9 +1632,9 @@
if ((a<indent && !(b==big_cancel&&a==' ')) @|
|| (a>big_force && a!=dindent)) break;
switch (a) {
+ case dindent: c++; @=/* fall through */@>@;
case indent: c++; break;
case outdent: c--; break;
- case dindent: c+=2; break;
case opt: a=get_output();
}
}
Modified: branches/stable/source/src/texk/web2c/cwebdir/ctwill-w2c.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ctwill-w2c.ch 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/ctwill-w2c.ch 2022-11-14 21:05:34 UTC (rev 884)
@@ -35,9 +35,9 @@
@z
@x
-\def\title{CWEAVE (Version 4.7)}
+\def\title{CWEAVE (Version 4.8)}
@y
-\def\title{CTWILL (Version 4.7 [\TeX~Live])}
+\def\title{CTWILL (Version 4.8 [\TeX~Live])}
@z
@x
@@ -47,9 +47,9 @@
@z
@x
- \centerline{(Version 4.7)}
+ \centerline{(Version 4.8)}
@y
- \centerline{(Version 4.7 [\TeX~Live])}
+ \centerline{(Version 4.8 [\TeX~Live])}
@z
@x
@@ -76,7 +76,7 @@
The ``banner line'' defined here should be changed whenever \.{CWEAVE}
is modified.
- at d banner "This is CWEAVE (Version 4.7)"
+ at d banner "This is CWEAVE (Version 4.8)"
@y
This is the \.{CTWILL} program by D. E. Knuth, based
on \.{CWEAVE} by Silvio Levy and D.~E. Knuth. It is also based on
@@ -100,7 +100,7 @@
The ``banner line'' defined here should be changed whenever \.{CTWILL} is
modified. The version number parallels the corresponding version of \.{CWEAVE}.
- at d banner "This is CTWILL, Version 4.7"
+ at d banner "This is CTWILL, Version 4.8"
/* will be extended by the \TeX~Live |versionstring| */
@z
@@ -618,7 +618,7 @@
@ @c
#if 0
- at t\4\4@>static void
+static void
print_text( /* prints a token list for debugging; not used in |main| */
@z
@@ -671,14 +671,14 @@
@x
@<Cases for |exp|@>=
if (cat1==lbrace || cat1==int_like || cat1==decl) {
- make_underlined(pp); big_app1(pp); big_app(dindent);
+ make_underlined(pp); big_app(dindent); big_app1(pp);
reduce(pp,1,fn_decl,0,1);
}
@y
@<Cases for |exp|@>=
if(cat1==lbrace || cat1==int_like || cat1==decl) {
- make_underlined(pp); make_ministring(pp); big_app1(pp);
- if (indent_param_decl) big_app(dindent);
+ make_underlined(pp); make_ministring(pp);
+ if (indent_param_decl) big_app(dindent); big_app1(pp);
reduce(pp,1,fn_decl,0,1);
}
@z
@@ -697,7 +697,7 @@
@x
@ @<Cases for |decl_head|@>=
if (cat1==comma) {
- big_app2(pp); big_app(' '); reduce(pp,2,decl_head,-1,33);
+ big_app2(pp); app(opt); app('9'); reduce(pp,2,decl_head,-1,33);
}
else if (cat1==ubinop) {
big_app1_insert(pp,'{'); big_app('}'); reduce(pp,2,decl_head,-1,34);
@@ -709,7 +709,7 @@
cat3==semi || cat3==rpar))
squash(pp,3,decl_head,-1,36);
else if (cat1==cast) squash(pp,2,decl_head,-1,37);
-else if (cat1==lbrace || cat1==int_like || cat1==decl) {
+else if (cat1==int_like || cat1==lbrace || cat1==decl) {
big_app(dindent); squash(pp,1,fn_decl,0,38);
}
else if (cat1==semi) squash(pp,2,decl,-1,39);
@@ -716,7 +716,7 @@
@y
@ @<Cases for |decl_head|@>=
if (cat1==comma) {
- big_app2(pp); big_app(' '); reduce(pp,2,decl_head,-1,33);
+ big_app2(pp); app(opt); app('9'); reduce(pp,2,decl_head,-1,33);
}
else if (cat1==ubinop) {
big_app1_insert(pp,'{'); big_app('}');
@@ -730,7 +730,7 @@
cat3==semi || cat3==rpar))
squash(pp,3,decl_head,-1,36);
else if (cat1==cast) squash(pp,2,decl_head,-1,37);
-else if (cat1==lbrace || cat1==int_like || cat1==decl) {
+else if (cat1==int_like || cat1==lbrace || cat1==decl) {
if (indent_param_decl) big_app(dindent);
squash(pp,1,fn_decl,0,38);
}
@@ -793,10 +793,10 @@
@z
@x
- big_app1_insert(pp, (cat1==function || cat1==decl) ? big_force :
+ big_app1_insert(pp, (cat1==decl || cat1==function) ? big_force :
force_lines ? force : break_space); reduce(pp,2,cat1,-1,76);
@y
- big_app1_insert(pp, (cat1==function || cat1==decl) ? @|
+ big_app1_insert(pp, (cat1==decl || cat1==function) ? @|
( order_decl_stmt ? big_force : force ) : @|
( force_lines ? force : break_space ) ); reduce(pp,2,cat1,-1,76);
@z
@@ -834,13 +834,11 @@
else if (cat1==int_like) {
big_app1_insert(pp,' '); reduce(pp,2,typedef_like,0,116);
}
-else if (cat1==exp && cat2!=lpar && cat2!=exp && cat2!=cast) {
+else if (cat1==exp && cat2!=lpar && cat2!=lbrack && cat2!=exp && cat2!=cast) {
make_underlined(pp+1); make_reserved(pp+1);
big_app1_insert(pp,' '); reduce(pp,2,typedef_like,0,117);
}
-else if (cat1==comma) {
- big_app2(pp); big_app(' '); reduce(pp,2,typedef_like,0,118);
-}
+else if (cat1==comma) squash(pp,2,typedef_like,0,118);
else if (cat1==semi) squash(pp,2,decl,-1,119);
else if (cat1==ubinop && (cat2==ubinop || cat2==cast)) {
big_app('{'); big_app1_insert(pp+1,'}'); reduce(pp+1,2,cat2,0,120);
Modified: branches/stable/source/src/texk/web2c/cwebdir/cweav-bs.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/cweav-bs.ch 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/cweav-bs.ch 2022-11-14 21:05:34 UTC (rev 884)
@@ -20,12 +20,12 @@
The ``banner line'' defined here should be changed whenever \.{CWEAVE}
is modified.
- at d banner "This is CWEAVE (Version 4.7)"
+ at d banner "This is CWEAVE (Version 4.8)"
@y
The ``banner line'' defined here should be changed whenever \.{CWEAVE}
is modified.
- at d banner "This is CWEAVE (Version 4.7pc/big)"
+ at d banner "This is CWEAVE (Version 4.8pc/big)"
@z
Modified: branches/stable/source/src/texk/web2c/cwebdir/cweav-pc.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/cweav-pc.ch 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/cweav-pc.ch 2022-11-14 21:05:34 UTC (rev 884)
@@ -11,9 +11,9 @@
change files that have -bs in their name instead of -pc.)
@x section 1
- at d banner "This is CWEAVE (Version 4.7)"
+ at d banner "This is CWEAVE (Version 4.8)"
@y
- at d banner "This is CWEAVE (Version 4.7pc)"
+ at d banner "This is CWEAVE (Version 4.8pc)"
@z
@x section 17
Modified: branches/stable/source/src/texk/web2c/cwebdir/cweav-ql.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/cweav-ql.ch 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/cweav-ql.ch 2022-11-14 21:05:34 UTC (rev 884)
@@ -7,15 +7,15 @@
@x
-\def\title{CWEAVE (Version 4.7)}
+\def\title{CWEAVE (Version 4.8)}
@y
-\def\title{CWEAVE (QL Version 4.7)}
+\def\title{CWEAVE (QL Version 4.8)}
@z
@x section 1
- at d banner "This is CWEAVE (Version 4.7)"
+ at d banner "This is CWEAVE (Version 4.8)"
@y
- at d banner "This is CWEAVE (QL Version 4.7)"
+ at d banner "This is CWEAVE (QL Version 4.8)"
@z
@x
Modified: branches/stable/source/src/texk/web2c/cwebdir/cweav-vms.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/cweav-vms.ch 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/cweav-vms.ch 2022-11-14 21:05:34 UTC (rev 884)
@@ -13,9 +13,9 @@
(also modified by Don Knuth to keep version numbers uptodate)
@x section 1 (01-FEB-1992 ST)
- at d banner "This is CWEAVE (Version 4.7)"
+ at d banner "This is CWEAVE (Version 4.8)"
@y
- at d banner "This is CWEAVE (VAX/VMS Version 4.7)"
+ at d banner "This is CWEAVE (VAX/VMS Version 4.8)"
@z
@x section 4 (01-FEB-1992 ST)
Modified: branches/stable/source/src/texk/web2c/cwebdir/cweav-w2c.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/cweav-w2c.ch 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/cweav-w2c.ch 2022-11-14 21:05:34 UTC (rev 884)
@@ -17,15 +17,15 @@
@q Please send comments, suggestions, etc. to tex-k@@tug.org. @>
@x
-\def\title{CWEAVE (Version 4.7)}
+\def\title{CWEAVE (Version 4.8)}
@y
-\def\title{CWEAVE (Version 4.7 [\TeX~Live])}
+\def\title{CWEAVE (Version 4.8 [\TeX~Live])}
@z
@x
- \centerline{(Version 4.7)}
+ \centerline{(Version 4.8)}
@y
- \centerline{(Version 4.7 [\TeX~Live])}
+ \centerline{(Version 4.8 [\TeX~Live])}
@z
@x
@@ -41,9 +41,9 @@
@z
@x
- at d banner "This is CWEAVE (Version 4.7)"
+ at d banner "This is CWEAVE (Version 4.8)"
@y
- at d banner "This is CWEAVE, Version 4.7"
+ at d banner "This is CWEAVE, Version 4.8"
/* will be extended by the \TeX~Live |versionstring| */
@z
@@ -290,7 +290,7 @@
@ @c
#if 0
- at t\4\4@>static void
+static void
print_text( /* prints a token list for debugging; not used in |main| */
@z
@@ -309,13 +309,13 @@
@x
@<Cases for |exp|@>=
if (cat1==lbrace || cat1==int_like || cat1==decl) {
- make_underlined(pp); big_app1(pp); big_app(dindent);
+ make_underlined(pp); big_app(dindent); big_app1(pp);
reduce(pp,1,fn_decl,0,1);
}
@y
@<Cases for |exp|@>=
if(cat1==lbrace || cat1==int_like || cat1==decl) {
- make_underlined(pp); big_app1(pp); if (indent_param_decl) big_app(dindent);
+ make_underlined(pp); if (indent_param_decl) big_app(dindent); big_app1(pp);
reduce(pp,1,fn_decl,0,1);
}
@z
@@ -323,7 +323,7 @@
@x
@ @<Cases for |decl_head|@>=
if (cat1==comma) {
- big_app2(pp); big_app(' '); reduce(pp,2,decl_head,-1,33);
+ big_app2(pp); app(opt); app('9'); reduce(pp,2,decl_head,-1,33);
}
else if (cat1==ubinop) {
big_app1_insert(pp,'{'); big_app('}'); reduce(pp,2,decl_head,-1,34);
@@ -335,7 +335,7 @@
cat3==semi || cat3==rpar))
squash(pp,3,decl_head,-1,36);
else if (cat1==cast) squash(pp,2,decl_head,-1,37);
-else if (cat1==lbrace || cat1==int_like || cat1==decl) {
+else if (cat1==int_like || cat1==lbrace || cat1==decl) {
big_app(dindent); squash(pp,1,fn_decl,0,38);
}
else if (cat1==semi) squash(pp,2,decl,-1,39);
@@ -342,7 +342,7 @@
@y
@ @<Cases for |decl_head|@>=
if (cat1==comma) {
- big_app2(pp); big_app(' '); reduce(pp,2,decl_head,-1,33);
+ big_app2(pp); app(opt); app('9'); reduce(pp,2,decl_head,-1,33);
}
else if (cat1==ubinop) {
big_app1_insert(pp,'{'); big_app('}');
@@ -355,7 +355,7 @@
cat3==semi || cat3==rpar))
squash(pp,3,decl_head,-1,36);
else if (cat1==cast) squash(pp,2,decl_head,-1,37);
-else if (cat1==lbrace || cat1==int_like || cat1==decl) {
+else if (cat1==int_like || cat1==lbrace || cat1==decl) {
if (indent_param_decl) big_app(dindent);
squash(pp,1,fn_decl,0,38);
}
@@ -412,10 +412,10 @@
@z
@x
- big_app1_insert(pp, (cat1==function || cat1==decl) ? big_force :
+ big_app1_insert(pp, (cat1==decl || cat1==function) ? big_force :
force_lines ? force : break_space); reduce(pp,2,cat1,-1,76);
@y
- big_app1_insert(pp, (cat1==function || cat1==decl) ? @|
+ big_app1_insert(pp, (cat1==decl || cat1==function) ? @|
( order_decl_stmt ? big_force : force ) : @|
( force_lines ? force : break_space ) ); reduce(pp,2,cat1,-1,76);
@z
Modified: branches/stable/source/src/texk/web2c/cwebdir/cweav-w32.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/cweav-w32.ch 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/cweav-w32.ch 2022-11-14 21:05:34 UTC (rev 884)
@@ -2,9 +2,9 @@
(Contributed by Fabrice Popineau, February 2002)
@x section 1
- at d banner "This is CWEAVE (Version 4.7)"
+ at d banner "This is CWEAVE (Version 4.8)"
@y
- at d banner "This is CWEAVE (Version 4.7win32)"
+ at d banner "This is CWEAVE (Version 4.8win32)"
@z
@x
Modified: branches/stable/source/src/texk/web2c/cwebdir/cweave.w
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/cweave.w 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/cweave.w 2022-11-14 21:05:34 UTC (rev 884)
@@ -2,7 +2,7 @@
% This program by Silvio Levy and Donald E. Knuth
% is based on a program by Knuth.
% It is distributed WITHOUT ANY WARRANTY, express or implied.
-% Version 4.7 --- February 2022
+% Version 4.8 --- June 2022
% Copyright (C) 1987,1990,1993,2000 Silvio Levy and Donald E. Knuth
@@ -32,11 +32,11 @@
\def\skipxTeX{\\{skip\_\TEX/}}
\def\copyxTeX{\\{copy\_\TEX/}}
-\def\title{CWEAVE (Version 4.7)}
+\def\title{CWEAVE (Version 4.8)}
\def\topofcontents{\null\vfill
\centerline{\titlefont The {\ttitlefont CWEAVE} processor}
\vskip 15pt
- \centerline{(Version 4.7)}
+ \centerline{(Version 4.8)}
\vfill}
\def\botofcontents{\vfill
\noindent
@@ -67,7 +67,7 @@
The ``banner line'' defined here should be changed whenever \.{CWEAVE}
is modified.
- at d banner "This is CWEAVE (Version 4.7)"
+ at d banner "This is CWEAVE (Version 4.8)"
@c
@<Include files@>@/
@@ -2317,10 +2317,14 @@
doubt what to use, use |big_app|.
@d app(a) *(tok_ptr++)=(token)(a)
+@#
@d big_app2(a) big_app1(a);@+big_app1(a+1)
@d big_app3(a) big_app2(a);@+big_app1(a+2)
@d big_app4(a) big_app3(a);@+big_app1(a+3)
+@#
@d big_app1_insert(p,c) big_app1(p);@+big_app(c);@+big_app1(p+1)
+ at d big_app1_insert_str(p,s) big_app1(p);@+app_str(s);@+big_app1(p+1)
+ at d big_app2_insert(p,c) big_app2(p);@+big_app(c);@+big_app2(p+2)
@<Predecl...@>=
static void app_str(const char *);@/
@@ -2356,6 +2360,11 @@
understanding the format by comparing the code with the symbolic
productions as they were listed earlier.
+ at d begin_math if (cur_mathness==maybe_math) init_mathness=yes_math;
+ else if (cur_mathness==no_math) app_str("${}")
+ at d end_math if (cur_mathness==maybe_math) init_mathness=no_math;
+ else if (cur_mathness==yes_math) app_str("{}$")
+
@c
static void
app_str(
@@ -2370,12 +2379,10 @@
{
if (a==' ' || (a>=big_cancel && a<=big_force) || a==dindent)
/* non-math token */ {
- if (cur_mathness==maybe_math) init_mathness=no_math;
- else if (cur_mathness==yes_math) app_str("{}$");
+ end_math;
cur_mathness=no_math;
} else {
- if (cur_mathness==maybe_math) init_mathness=yes_math;
- else if (cur_mathness==no_math) app_str("${}");
+ begin_math;
cur_mathness=yes_math;
}
app(a);
@@ -2387,13 +2394,11 @@
{
switch (a->mathness % 4) { /* left boundary */
case (no_math):
- if (cur_mathness==maybe_math) init_mathness=no_math;
- else if (cur_mathness==yes_math) app_str("{}$");
+ end_math;
cur_mathness=a->mathness / 4; /* right boundary */
break;
case (yes_math):
- if (cur_mathness==maybe_math) init_mathness=yes_math;
- else if (cur_mathness==no_math) app_str("${}");
+ begin_math;
cur_mathness=a->mathness / 4; /* right boundary */
break;
case (maybe_math): /* no changes */ break;
@@ -2644,7 +2649,7 @@
@<Cases for |exp|@>=
if (cat1==lbrace || cat1==int_like || cat1==decl) {
- make_underlined(pp); big_app1(pp); big_app(dindent);
+ make_underlined(pp); big_app(dindent); big_app1(pp);
reduce(pp,1,fn_decl,0,1);
}
else if (cat1==unop) squash(pp,2,exp,-2,2);
@@ -2651,8 +2656,7 @@
else if ((cat1==binop || cat1==ubinop) && cat2==exp)
squash(pp,3,exp,-2,3);
else if (cat1==comma && cat2==exp) {
- big_app2(pp);
- app(opt); app('9'); big_app1(pp+2); reduce(pp,3,exp,-2,4);
+ big_app2(pp); app(opt); app('9'); big_app1(pp+2); reduce(pp,3,exp,-2,4);
}
else if (cat1==lpar && cat2==rpar && cat3==colon) reduce(pp+3,0,base,0,5);
else if (cat1==cast && cat2==colon) reduce(pp+2,0,base,0,5);
@@ -2676,7 +2680,7 @@
@ @<Cases for |lpar|@>=
if ((cat1==exp||cat1==ubinop) && cat2==rpar) squash(pp,3,exp,-2,11);
else if (cat1==rpar) {
- big_app1(pp); app_str("\\,"); big_app1(pp+1);
+ big_app1_insert_str(pp,"\\,");
@.\\,@>
reduce(pp,2,exp,-2,12);
}
@@ -2714,7 +2718,9 @@
@ @<Cases for |cast|@>=
if (cat1==lpar) squash(pp,2,lpar,-1,21);
else if (cat1==exp) {
- big_app1_insert(pp,' '); reduce(pp,2,exp,-2,21);
+ big_app1_insert_str(pp,"\\,");
+ at .\\,@>
+ reduce(pp,2,exp,-2,21);
}
else if (cat1==semi) reduce(pp,0,exp,-2,22);
@@ -2747,7 +2753,7 @@
@ @<Cases for |decl_head|@>=
if (cat1==comma) {
- big_app2(pp); big_app(' '); reduce(pp,2,decl_head,-1,33);
+ big_app2(pp); app(opt); app('9'); reduce(pp,2,decl_head,-1,33);
}
else if (cat1==ubinop) {
big_app1_insert(pp,'{'); big_app('}'); reduce(pp,2,decl_head,-1,34);
@@ -2759,7 +2765,7 @@
cat3==semi || cat3==rpar))
squash(pp,3,decl_head,-1,36);
else if (cat1==cast) squash(pp,2,decl_head,-1,37);
-else if (cat1==lbrace || cat1==int_like || cat1==decl) {
+else if (cat1==int_like || cat1==lbrace || cat1==decl) {
big_app(dindent); squash(pp,1,fn_decl,0,38);
}
else if (cat1==semi) squash(pp,2,decl,-1,39);
@@ -2778,7 +2784,7 @@
@ @<Cases for |base|@>=
if (cat1==int_like || cat1==exp) {
if (cat2==comma) {
- big_app1(pp); big_app(' '); big_app2(pp+1);
+ big_app1_insert(pp,' '); big_app1(pp+2);
app(opt); app('9'); reduce(pp,3,base,0,42);
}
else if (cat2==lbrace) {
@@ -2797,7 +2803,7 @@
big_app1_insert(pp,' ');
if (cat2==semi) reduce(pp,2,decl_head,0,45);
else {
- big_app(' '); big_app1(pp+2);reduce(pp,3,struct_head,0,46);
+ big_app(' '); big_app1(pp+2); reduce(pp,3,struct_head,0,46);
}
}
else if (cat2==colon) reduce(pp+2,0,base,2,47);
@@ -2819,7 +2825,7 @@
reduce(pp,3,int_like,-2,49);
}
else if (cat1==rbrace) {
- big_app1(pp); app_str("\\,"); big_app1(pp+1);
+ big_app1_insert_str(pp,"\\,");
@.\\,@>
reduce(pp,2,int_like,-2,50);
}
@@ -2837,13 +2843,13 @@
}
@ @<Cases for |function|@>=
-if (cat1==function || cat1==decl || cat1==stmt) {
+if (cat1==stmt || cat1==decl || cat1==function) {
big_app1_insert(pp,big_force); reduce(pp,2,cat1,-1,53);
}
@ @<Cases for |lbrace|@>=
if (cat1==rbrace) {
- big_app1(pp); app_str("\\,"); big_app1(pp+1);
+ big_app1_insert_str(pp,"\\,");
@.\\,@>
reduce(pp,2,stmt,-1,54);
}
@@ -2946,8 +2952,8 @@
force_lines=true;
@ @<Cases for |stmt|@>=
-if (cat1==stmt||cat1==decl||cat1==function) {
- big_app1_insert(pp, (cat1==function || cat1==decl) ? big_force :
+if (cat1==stmt || cat1==decl || cat1==function) {
+ big_app1_insert(pp, (cat1==decl || cat1==function) ? big_force :
force_lines ? force : break_space); reduce(pp,2,cat1,-1,76);
}
@@ -2956,13 +2962,13 @@
@ @<Cases for |lproc|@>=
if (cat1==define_like) make_underlined(pp+2);
-if (cat1==else_like || cat1==if_like || cat1==define_like)
+if (cat1==if_like || cat1==else_like || cat1==define_like)
squash(pp,2,lproc,0,78);
else if (cat1==rproc) {
app(inserted); squash(pp,2,insert,-1,79);
} else if (cat1==exp || cat1==function) {
if (cat2==rproc) {
- app(inserted); big_app1(pp); big_app(' '); big_app2(pp+1);
+ app(inserted); big_app1_insert(pp,' '); big_app1(pp+2);
reduce(pp,3,insert,-1,80);
}
else if (cat1==exp && cat2==exp && cat3==rproc) {
@@ -2979,8 +2985,8 @@
else reduce(pp,0,exp,-2,82);
@ @<Cases for |insert|@>=
-if (cat1)
- squash(pp,2,cat1,0,83);
+if (cat1==function)
+ squash(pp,2,function,0,83);
@ @<Cases for |prelangle|@>=
init_mathness=cur_mathness=yes_math;
@@ -2995,7 +3001,7 @@
@<Cases for |langle|@>=
if (cat1==prerangle) {
- big_app1(pp); app_str("\\,"); big_app1(pp+1);
+ big_app1_insert_str(pp,"\\,");
@.\\,@>
reduce(pp,2,cast,-1,86);
}
@@ -3009,8 +3015,10 @@
&& (cat2==exp || cat2==int_like) @|
&& (cat3==comma || cat3==prerangle)) {
make_underlined(pp+2); if (reserve_typenames) make_reserved(pp+2);
- big_app2(pp); big_app(' '); big_app2(pp+2);
- if (cat3==comma) reduce(pp,4,langle,0,153);
+ big_app2_insert(pp,' ');
+ if (cat3==comma) {
+ app(opt); app('9'); reduce(pp,4,langle,0,153);
+ }
else reduce(pp,4,cast,-1,154);
}
@@ -3093,13 +3101,11 @@
else if (cat1==int_like) {
big_app1_insert(pp,' '); reduce(pp,2,typedef_like,0,116);
}
-else if (cat1==exp && cat2!=lpar && cat2!=exp && cat2!=cast) {
+else if (cat1==exp && cat2!=lpar && cat2!=lbrack && cat2!=exp && cat2!=cast) {
make_underlined(pp+1); make_reserved(pp+1);
big_app1_insert(pp,' '); reduce(pp,2,typedef_like,0,117);
}
-else if (cat1==comma) {
- big_app2(pp); big_app(' '); reduce(pp,2,typedef_like,0,118);
-}
+else if (cat1==comma) squash(pp,2,typedef_like,0,118);
else if (cat1==semi) squash(pp,2,decl,-1,119);
else if (cat1==ubinop && (cat2==ubinop || cat2==cast)) {
big_app('{'); big_app1_insert(pp+1,'}'); reduce(pp+1,2,cat2,0,120);
@@ -3106,8 +3112,8 @@
}
@ @<Cases for |delete_like|@>=
-if (cat1==lpar && cat2==rpar) {
- big_app2(pp); app_str("\\,"); big_app1(pp+2);
+if (cat1==lbrack && cat2==rbrack) {
+ big_app1(pp); big_app1_insert_str(pp+1,"\\,");
@.\\,@>
reduce(pp,3,delete_like,0,121);
}
@@ -3136,7 +3142,7 @@
if (cat1==rbrack && cat2==rbrack) squash(pp,3,attr,-1,131);
else if (cat1==exp) squash(pp,2,attr_head,0,132);
else if (cat1==using_like && cat2==exp && cat3==colon) {
- big_app2(pp); big_app(' '); big_app2(pp+2); big_app(' ');
+ big_app2_insert(pp,' '); big_app(' ');
reduce(pp,4,attr_head,0,133);
}
else if (cat1==comma) squash(pp,2,attr_head,0,145);
@@ -3596,7 +3602,7 @@
There's a known bug here, in cases where an adjacent scrap is
|prelangle| or |prerangle|. Then the \TEX/ string can disappear
when the \.{\\langle} or \.{\\rangle} becomes \.{<} or \.{>}.
-For example, if the user writes \.{\v x<@@ty@@>\v}, the \TEX/ string
+For example, if the user writes \.{\v x<@@ty@@><42\v}, the \TEX/ string
\.{\\hbox\{y\}} eventually becomes part of an |insert| scrap, which is combined
with a |prelangle| scrap and eventually lost. The best way to work around
this bug is probably to enclose the \.{@@t...@@>} in \.{@@[...@@]} so that
@@ -3931,9 +3937,9 @@
if ((a<indent && !(b==big_cancel&&a==' ')) @|
|| (a>big_force && a!=dindent)) break;
switch (a) {
+ case dindent: c++; @=/* fall through */@>@;
case indent: c++; break;
case outdent: c--; break;
- case dindent: c+=2; break;
case opt: a=get_output();
}
}
Modified: branches/stable/source/src/texk/web2c/cwebdir/cwebmac.tex
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/cwebmac.tex 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/cwebmac.tex 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,25 +1,19 @@
% standard macros for CWEB listings (in addition to plain.tex)
-% Version 4.7--- January 2022
+% Version 4.9 --- June 2022
\ifx\renewenvironment\undefined\else\endinput\fi % LaTeX will use other macros
-\xdef\fmtversion{\fmtversion+CWEB4.7}
-\chardef\cwebversion=4 \chardef\cwebrevision=7
-\newif\ifpdf
-\ifx\pdf+\pdftrue\fi
+\xdef\fmtversion{\fmtversion+CWEB4.9}
+\chardef\cwebversion=4 \chardef\cwebrevision=9
+\input iftex.sty % TeX engine tests
+\ifx\pdf+\pdftrue\fi % for plain TeX in combination with dvipdfm
% Uncomment the following line if you want PDF goodies to be the default
%\ifx\pdf-\else\pdftrue\fi
\def\pdflinkcolor{0 0 1} % the RGB values for hyperlink color
-\ifx\undefined\XeTeXrevision\else\pdftrue\fi % XeTeX produces PDF output
-\newif\ifpdftex
-\ifx\pdfoutput\undefined \pdftexfalse \else\ifnum\pdfoutput=0 \pdftexfalse
-%\else \pdftextrue \pdfoutput=1 \input pdfcolor \let\setcolor\pdfsetcolor \fi\fi
-\else \pdftextrue \pdfoutput=1 % changed in 3.69
+\ifxetex\pdftrue\fi % XeTeX produces PDF output
+\ifpdftex % pdfTeX produces PDF output if \pdfoutput>0
\def\Black{\pdfliteral{0 g 0 G}} % use rgb colors for direct PDF output too
\def\Blue{\pdfliteral{\pdflinkcolor\space rg \pdflinkcolor\space RG}}
-\fi\fi
-\newif\ifhint
-\ifx\HINTversion\undefined \hintfalse \else \hinttrue \fi
-\newif\ifacro \ifpdf\acrotrue\fi \ifpdftex\acrotrue\fi
-\newif\ifacrohint \ifacro\acrohinttrue\fi \ifhint\acrohinttrue\fi
+\fi
+\newif\ifacrohint \ifpdf\acrohinttrue\fi \ifhint\acrohinttrue\fi
\let\:=\. % preserve a way to get the dot accent
% (all other accents will still work as usual)
@@ -135,17 +129,17 @@
\newtoks\toksA \newtoks\toksB \newtoks\toksC \newtoks\toksD
\newtoks\toksE \newtoks\toksF \newtoks\usersanitizer
\newcount\countA \countA=0 \newcount\countB \countB=0
-\newcount\countC \countC=0
+\newcount\countC \countC=0 \newcount\countD \countD=0
\newif\iftokprocessed \newif\ifTnum \newif\ifinstr
{\def\\{\global\let\spacechar= }\\ }
-\ifacro % The following are pdf macros
+\ifpdf % The following are pdf macros
\def\thewidth{\the\wd0 \space}
\def\theheight{\the\ht\strutbox\space}
\def\thedepth{\the\dp\strutbox\space}
\ifpdftex
\ifx\pdfannotlink\undefined\let\pdfannotlink\pdfstartlink\fi% for pdfTeX 0.14
- \def\pdflink#1#2{\hbox{\pdfannotlink height\ht\strutbox depth\dp\strutbox
+ \def\pdflink#1#2{\hbox{\pdfannotlink height \theheight depth \thedepth
attr{/Border [0 0 0]} goto num #1 \Blue #1\Black\pdfendlink}} % changed 3.69
\else\def\pdflink#1#2{\setbox0=\hbox{\special{pdf: bc [ \pdflinkcolor ]}{#1}%
\special{pdf: ec}}\special{pdf: ann width \thewidth height \theheight
@@ -267,7 +261,7 @@
\let\pdflink=\HINTlink
\fi % End of HINT macros
-% Common macros for \ifacro and \ifhint
+% Common macros for \ifpdf and \ifhint
\ifacrohint
\def\pdfnote#1.{\setbox0=\hbox{\toksA={#1.}\toksB={}\maketoks}\the\toksA}
\def\firstsecno#1.{\setbox0=\hbox{\toksA={#1.}\toksB={}%
@@ -294,14 +288,14 @@
\def\maketoksdone{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
\fi % End of common macros
-\def\pdfURL#1#2{\ifpdftex\pdfannotlink height\ht\strutbox depth\dp\strutbox
- attr {/Border [0 0 0]} user { /Type /Action /Subtype /Link /A
+\def\pdfURL#1#2{\ifpdf \ifpdftex\pdfannotlink height \theheight depth \thedepth
+ attr {/Border [0 0 0]} user { /Type /Annot /Subtype /Link /A
<< /S /URI /URI (#2) >>}\Blue #1\Black \pdfendlink % changed in 3.69
- \else \ifpdf{\setbox0=\hbox{\special{pdf: bc [ \pdflinkcolor ]}{#1}%
- \special{pdf: ec}}\special{pdf: ann width \thewidth\space height \theheight
- \space depth \thedepth\space << /Border [0 0 0]
- /Type /Action /Subtype /Link /A << /S /URI /URI (#2) >> >>}\box0\relax}%
- \else #1 ({\tt#2})\fi\fi}
+ \else {\setbox0=\hbox{\special{pdf: bc [ \pdflinkcolor ]}{#1}%
+ \special{pdf: ec}}\special{pdf: ann width \thewidth height \theheight
+ depth \thedepth << /Border [0 0 0] /Type /Annot /Subtype /Link /A
+ << /S /URI /URI (#2) >> >>}\box0\relax}\fi
+ \else #1 ({\tt#2})\fi}
{\catcode`\~=12 \gdef\TILDE/{~}} % ~ in a URL
{\catcode`\_=12 \gdef\UNDER/{_}} % _ in a URL
@@ -310,7 +304,7 @@
\sfcode`;=1500 \pretolerance 200 \hyphenpenalty 50 \exhyphenpenalty 50
\ifhint\HINTlabel\fi% Start page before section
\noindent{\let\*=\lapstar\bf\secstar.\quad}%
- \ifacro \smash{\raise\baselineskip\hbox to0pt{\let\*=\empty
+ \ifpdf \smash{\raise\baselineskip\hbox to0pt{\let\*=\empty
\ifpdftex \pdfdest num \secstar fith%
\else \special{pdf: dest (\romannumeral\secstar)
[ @thispage /FitH @ypos ]}\fi}}\fi}
@@ -343,7 +337,7 @@
\outer\def\M#1{\MN{#1}\ifon\vfil\penalty-100\vfilneg % beginning of section
\vskip\intersecskip\startsection\ignorespaces}
\outer\def\N#1#2#3.{% beginning of starred section
- \ifacro{\toksF={}\makeoutlinetoks#3\outlinedone\outlinedone}\fi
+ \ifpdf{\toksF={}\makeoutlinetoks#3\outlinedone\outlinedone}\fi
\gdepth=#1\gtitle={#3}\MN{#2}%
\ifon\ifnum#1<\secpagedepth \vfil\eject % force page break if depth is small
\else\vfil\penalty-100\vfilneg\vskip\intersecskip\fi\fi
@@ -352,11 +346,11 @@
\edef\gtitletoks{\expandafter\stripprefix\meaning\gtitletoks}%
\edef\next{\write\cont{\ZZ{\gtitletoks}{#1}{\secno}% write to contents file
{\noexpand\the\pageno}{\the\toksE}}}\next % \ZZ{title}{depth}{sec}{page}{ss}
- \ifpdftex\expandafter\xdef\csname curr#1\endcsname{\secno}
+ \ifpdf \ifpdftex\expandafter\xdef\csname curr#1\endcsname{\secno}
\ifnum#1>0\countB=#1 \advance\countB by-1
- \advancenumber{chunk\the\countB.\expnumber{curr\the\countB}}\fi\fi
- \ifpdf\special{pdf: outline #1 << /Title (\the\toksE) /Dest
- [ @thispage /FitH @ypos ] >>}\fi
+ \advancenumber{chunk\the\countB.\expnumber{curr\the\countB}}\fi
+ \else \special{pdf: outline #1 << /Title (\the\toksE) /Dest
+ [ @thispage /FitH @ypos ] >>}\fi \fi
\ifon\startsection{\bf#3.\quad}\ignorespaces}
\def\MN#1{\par % common code for \M, \N
{\xdef\secstar{#1}\let\*=\empty\xdef\secno{#1}}% remove \* from section name
@@ -433,8 +427,8 @@
\def\title{\expandafter\uppercase\expandafter{\jobname}}
\def\topofcontents{\centerline{\titlefont\title}\vskip.7in
\vfill} % this material will start the table of contents page
-\def\startpdf{\ifpdftex\pdfcatalog{/PageMode /UseOutlines}\else
- \ifpdf{\special{pdf: docview << /PageMode /UseOutlines >>}}\fi\fi}
+\def\startpdf{\ifpdf \ifpdftex\pdfcatalog{/PageMode /UseOutlines}
+ \else {\special{pdf: docview << /PageMode /UseOutlines >>}}\fi\fi}
\def\botofcontents{\vfill
\centerline{\covernote}} % this material will end the table of contents page
\def\covernote{}
@@ -495,7 +489,8 @@
\def\fin{\par\vfill\eject % this is done when we are ending the index
\ifpagesaved\null\vfill\eject\fi % output a null index column
\if L\lr\else\null\vfill\eject\fi % finish the current page
- \ifpdftex \makebookmarks \fi % added in Version 3.68
+ \ifpdf \ifpdftex \makebookmarks % added in Version 3.68
+ \countsections \fi\fi % and in Version 4.9
\parfillskip 0pt plus 1fil
\def\grouptitle{NAMES OF THE SECTIONS}
\let\topsecno=\nullsec
@@ -508,10 +503,10 @@
\def\U{\note{Used in section}} % crossref for use of a section
\def\Us{\note{Used in sections}} % crossref for uses of a section
\def\I{\par\hangindent 2em}\let\*=*
- \ifacro \def\outsecname{Names of the sections} \let\Xpdf\X
+ \ifpdf \def\outsecname{Names of the sections} \let\Xpdf\X
% \ifpdftex \makebookmarks \pdfdest name {NOS} fitb % in versions < 3.68
\ifpdftex \pdfdest name {NOS} fith % changed in version 3.69
- \pdfoutline goto name {NOS} count -\secno {\outsecname}
+ \pdfoutline goto name {NOS} count -\the\countD {\outsecname}
\def\X##1:##2\X{\Xpdf##1:##2\X \firstsecno##1.%
{\toksF={}\makeoutlinetoks##2\outlinedone\outlinedone}%
\pdfoutline goto num \the\toksA \expandafter{\the\toksE}}
@@ -524,6 +519,10 @@
\fi\fi
\readsections}
\def\makebookmarks{\let\ZZ=\writebookmarkline \readcontents\relax}
+\def\countsections{\message{Number of named sections:}
+ {\def\I{\global\advance\countD by 1}\def\X##1\X{\relax}
+ \def\Q##1.{\relax}\def\Qs##1.{\relax}\def\U##1.{\relax}\def\Us##1.{\relax}
+ \readsections\relax}\message{\the\countD}}
\def\expnumber#1{\expandafter\ifx\csname#1\endcsname\relax 0%
\else \csname#1\endcsname \fi} % Petr Olsak's macros from texinfo.tex
\def\advancenumber#1{\countA=\expnumber{#1}\relax \advance\countA by1
@@ -551,7 +550,7 @@
\ \ifhint
\HINTlink{#3}{\romannumeral#3}% No page numbers in HINT
\HINTcontents{#1}{#2}{#3}%
- \else\ifacro\pdflink{#3}{\romannumeral#3}\else#3\fi
+ \else\ifpdf\pdflink{#3}{\romannumeral#3}\else#3\fi
\hbox to3em{\hss#4}\fi}}
\def\consetup#1{\ifcase#1 \bf % depth -1 (@**)
\or % depth 0 (@*)
Modified: branches/stable/source/src/texk/web2c/cwebdir/cwebman-w2c.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/cwebman-w2c.ch 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/cwebman-w2c.ch 2022-11-14 21:05:34 UTC (rev 884)
@@ -18,7 +18,7 @@
@x
\input cwebmac
-\acrofalse\pdffalse\pdftexfalse\hintfalse\acrohintfalse
+\pdffalse\acrohintfalse
@y
\input cwebmac
@z
@@ -37,7 +37,7 @@
\centerline{\sectionfont\def\.##1{{\twelvett##1}} #1}\nobreak\vskip 6pt
\everypar{\hskip-\parindent\everypar{}}}
@y
-\ifacro
+\ifpdf
\pdfpagewidth=\pagewidth \advance\pdfpagewidth by 2cm
\pdfpageheight=\pageheight \advance\pdfpageheight by 3cm
\ifpdftex \pdfhorigin=1cm \pdfvorigin=1cm
@@ -50,7 +50,7 @@
\def\subsections{0}
\outer\def\section #1.{\penalty-500\bigskip
\centerline{\sectionfont\def\.##1{{\twelvett##1}}
- \ifacro\vbox to 0pt{\kern-2.5ex\relax
+ \ifpdf\vbox to 0pt{\kern-2.5ex\relax
\ifpdftex\pdfdest num \destcount fitbh\relax
\else\special{pdf: dest (\the\destcount) [ @thispage /FitBH @ypos ]}\fi
\def\.##1{##1}\def\TeX{TeX}%
@@ -69,7 +69,7 @@
\def\appC{17}
\def\Appendix#1{\leavevmode
- \ifacro\ifpdftex
+ \ifpdf\ifpdftex
\pdfstartlink attr{/Border[0 0 0]} goto num\csname app#1\endcsname\relax
\Blue\hbox{Appendix}~#1\Black
\pdfendlink
@@ -82,7 +82,7 @@
\newcount\subdestcount \subdestcount=151\relax
-\outer\def\subsection #1.{\ifacro
+\outer\def\subsection #1.{\ifpdf
\ifpdftex\pdfdest num \subdestcount fitbh\relax
\pdfoutline goto num \subdestcount {#1}\relax
\else\special{pdf: dest (\the\subdestcount) [ @thispage /FitBH @ypos ]}%
@@ -93,17 +93,17 @@
@z
@x
-\def\runninghead{{\tentt CWEB} USER MANUAL (VERSION 4.7)}
+\def\runninghead{{\tentt CWEB} USER MANUAL (VERSION 4.8)}
@y
\def\Kpathsea/{{\mc KPATHSEA\spacefactor1000}}
-\def\runninghead{{\tentt CWEB} USER MANUAL (Version 4.7 [\TeX~Live])}
+\def\runninghead{{\tentt CWEB} USER MANUAL (Version 4.8 [\TeX~Live])}
@z
@x
-\vskip 18pt\centerline{(Version 4.7 --- February 2022)}
+\vskip 18pt\centerline{(Version 4.8 --- June 2022)}
@y
-\vskip 18pt\centerline{(Version 4.7 --- February 2022)%
-\footnote*{This document describes the extended \.{CWEB} (Version 4.7 [\TeX~Live]).}}
+\vskip 18pt\centerline{(Version 4.8 --- June 2022)%
+\footnote*{This document describes the extended \.{CWEB} (Version 4.8 [\TeX~Live]).}}
@z
@x
@@ -142,10 +142,11 @@
it cannot find them in the current directory.
@y
it cannot find them in the current directory.%
-\cwebfootnote{\acrofalse In this extended implementation, if an \.{@i}nclude
-file can not be found in the current directory, \.{CWEB} will use the
-conventions of the \Kpathsea/ library as outlined in section~\X93:File lookup
-with \Kpathsea/\X~of \pdfURL{appendix~D}{common-changes.pdf} to look for it.
+\cwebfootnote{In this extended implementation, if an \.{@i}nclude file can not
+be found in the current directory, \.{CWEB} will use the conventions of the
+\Kpathsea/ library as outlined in {\pdffalse\acrohintfalse section~\X93:File
+lookup with \Kpathsea/\X~of} \pdfURL{appendix~D}{common-changes.pdf} to look
+for it.
% FIXME
(This is true for any other input or change file lookup.)}
@z
@@ -181,13 +182,13 @@
\hfil\vskip\normallineskip
\option l This option takes the string of characters to its right as its
argument to switch between different user languages and macro packages.
-For example, if you call \.{CWEAVE} with the `\.{+ld}' (or `\.{-ld}') option,
-the German \.{CWEB} macros \.{dcwebmac.tex} will be loaded in the first line
-of output instead of the English ones. (Off by default.) (Has no effect on
-\.{CTANGLE}.)
+(Off by default.) (Has no effect on \.{CTANGLE}.)
\hfil\vskip\normallineskip
\option o Separate declarations and the first statement in a function block.
-(On by default.) (Has no effect on\break\hbox{}\qquad\.{CTANGLE}.)}
+(On by default.) (Has no effect on \.{CTANGLE}.)
+\hfil\vskip\normallineskip
+\option u Transliteration of UTF-8 multi-byte characters.
+(Off by default.) (Has no effect on \.{CWEAVE}.)}
\yskip
@z
@@ -195,7 +196,7 @@
@x
Sometimes things don't work as smoothly, and you get a bunch of
@y
-\acrofalse\pdftexfalse\pdffalse
+\pdffalse\acrohintfalse
Sometimes things don't work as smoothly, and you get a bunch of
@z
@@ -203,13 +204,20 @@
`$\\{main}(\\{argc},\39\\{argv}{}$)'.
@y
`$\\{main}(\\{argc},\39\\{argv}{}$)'.
-\ifx\pdf+\pdftrue\fi
-\ifx\pdfoutput\undefined \pdftexfalse \else\ifnum\pdfoutput=0 \pdftexfalse
-\else \pdftextrue \pdfoutput=1\fi\fi
-\ifpdf\acrotrue\fi \ifpdftex\acrotrue\fi
+\ifx\pdf+\pdftrue\fi \ifxetex\pdftrue\fi
+\ifpdftex\ifnum\pdfoutput>0\pdftrue\fi\fi
+\ifpdf\acrohinttrue\fi \ifhint\acrohinttrue\fi
@z
@x
+the `\.{@\#}' will put extra space after `$\langle\,$Other locals$\,\rangle$'.
+ at y
+the `\.{@\#}' will put extra space after `$\langle\,$Other locals$\,\rangle$'.%
+\cwebfootnote{This extended version of \.{CWEB} acknowledges the \.{-o} option
+to suppress the extra space globally.}
+ at z
+
+ at x
\section Hypertext and hyperdocumentation.
@y
\vfill\eject
@@ -295,7 +303,7 @@
\def\runninghead{APPENDIX A --- FINAL DOCUMENT}
\subsection Final document.
-\acrofalse\pdftexfalse\pdffalse
+\pdffalse\acrohintfalse
And here's what the same excerpt looks like when typeset.
(Can you spot the typographical niceties used in the \.{CWEB} code?)
\let\K=\leftarrow
@@ -306,16 +314,15 @@
\vfil\eject\titletrue
@y
\vfil\eject\titletrue
-\ifx\pdf+\pdftrue\fi
-\ifx\pdfoutput\undefined \pdftexfalse \else\ifnum\pdfoutput=0 \pdftexfalse
-\else \pdftextrue \pdfoutput=1\fi\fi
-\ifpdf\acrotrue\fi \ifpdftex\acrotrue\fi
+\ifx\pdf+\pdftrue\fi \ifxetex\pdftrue\fi
+\ifpdftex\ifnum\pdfoutput>0 \pdftrue\fi\fi
+\ifpdf\acrohinttrue\fi \ifhint\acrohinttrue\fi
@z
@x
- \.{ { }\\vskip 15pt \\centerline\{(Version 4.7)\}{ }\\vfill\}}\cr}$$
+ \.{ { }\\vskip 15pt \\centerline\{(Version 4.8)\}{ }\\vfill\}}\cr}$$
@y
- \.{ { }\\vskip 15pt \\centerline\{(Version 4.7)\}{ }\\vfill\}}\cr}$$
+ \.{ { }\\vskip 15pt \\centerline\{(Version 4.8)\}{ }\\vfill\}}\cr}$$
@z
@x
Modified: branches/stable/source/src/texk/web2c/cwebdir/cwebman.tex
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/cwebman.tex 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/cwebman.tex 2022-11-14 21:05:34 UTC (rev 884)
@@ -2,7 +2,7 @@
\def\tangref{3} % where the main explanation of CTANGLing is given
\input cwebmac
-\acrofalse\pdffalse\pdftexfalse\hintfalse\acrohintfalse
+\pdffalse\acrohintfalse
\def\page{\box255 } \normalbottom
\parskip 0pt plus 1pt
\def\RA{\char'31 } % right arrow
@@ -35,7 +35,7 @@
\def\lheader{\mainfont\the\pageno\hfill\sc\runninghead\hfill}
\def\rheader{\hfill\sc\runninghead\hfill\mainfont\the\pageno}
-\def\runninghead{{\tentt CWEB} USER MANUAL (VERSION 4.7)}
+\def\runninghead{{\tentt CWEB} USER MANUAL (VERSION 4.8)}
% This verbatim mode assumes that ! marks are !! in the text being copied.
\def\verbatim{\begingroup
@@ -49,7 +49,7 @@
\null\vfill
\centerline{\titlefont The {\ttitlefont CWEB} System of
Structured Documentation}
-\vskip 18pt\centerline{(Version 4.7 --- February 2022)}
+\vskip 18pt\centerline{(Version 4.8 --- June 2022)}
\vskip 24pt
\centerline{\authorfont Donald E. Knuth and Silvio Levy}
\vfill
@@ -1133,7 +1133,7 @@
`\X2:Argument declarations\X' on the same line as
`$\\{main}(\\{argc},\39\\{argv}{}$)'.
In this case you should help \.{CWEAVE} by putting `\.{@/}' after
-`\.{main(argc,argv)}'.
+`\.{main(argc,argv)}' (plus `\.{@t\\qquad@>}' for consistent indentation).
\.{CWEAVE} automatically inserts a bit of extra space between declarations
and the first apparent statement of a block. One way to defeat this
@@ -1337,6 +1337,7 @@
}
/*:27*//*32:*/
+#line 296 "common.w"
!endgroup
\endgroup
\vfill\eject
@@ -1344,7 +1345,7 @@
\def\runninghead{APPENDIX A --- TRANSLATION BY {\tentt CWEAVE}}
Here is the corresponding excerpt from \.{common.tex}.
-(Code for section 31 is omitted for space reasons.)
+\ifhint\relax\else(Code for section 31 is omitted for space reasons.)\fi
\vskip6pt
\begingroup \def\tt{\eighttt} \baselineskip9pt
@@ -1390,7 +1391,7 @@
\&{if} ${}(\\{buffer}[\T{0}]\I\.{'@'}){}$\1\5
\&{continue};\2\6
\&{if} (\\{xisupper}(\\{buffer}[\T{1}]))\1\5
-${}\\{buffer}[\T{1}]\K\\{tolower}{}$((\&{int}) \\{buffer}[\T{1}]);\2\6
+${}\\{buffer}[\T{1}]\K\\{tolower}((\&{int})\,\\{buffer}[\T{1}]);{}$\2\6
\&{if} ${}(\\{buffer}[\T{1}]\E\.{'x'}){}$\1\5
\&{break};\2\6
\&{if} ${}(\\{buffer}[\T{1}]\E\.{'y'}\V\\{buffer}[\T{1}]\E\.{'z'}\V\\{buffer}[%
@@ -1417,6 +1418,15 @@
\4${}\}{}$\2\5
\&{while} ${}(\\{limit}\E\\{buffer}){}$;\par
\U27.\fi
+!ifhint
+\M{31}\B\X31:Move \PB{\\{buffer}} and \PB{\\{limit}} to \PB{\\{change\_buffer}}
+and \PB{\\{change\_limit}}\X${}\E{}$\6
+$\\{change\_limit}\K\\{change\_buffer}+(\&{ptrdiff\_t})(\\{limit}-%
+\\{buffer});{}$\6
+${}\\{strncpy}(\\{change\_buffer},\39\\{buffer},\39(\&{size\_t})(\\{limit}-%
+\\{buffer}+\T{1})){}$;\par
+\Us27\ET32.\fi
+!fi
!endgroup
\endgroup
\vfil\eject
@@ -1468,7 +1478,7 @@
\&{if} ${}(\\{buffer}[\T{0}]\I\.{'@'}){}$\1\5
\&{continue};\2\6
\&{if} (\\{xisupper}(\\{buffer}[\T{1}]))\1\5
-${}\\{buffer}[\T{1}]\K\\{tolower}{}$((\&{eight\_bits}) \\{buffer}[\T{1}]);\2\6
+${}\\{buffer}[\T{1}]\K\\{tolower}((\&{int})\,\\{buffer}[\T{1}]);{}$\2\6
\&{if} ${}(\\{buffer}[\T{1}]\E\.{'x'}){}$\1\5
\&{break};\2\6
\&{if} ${}(\\{buffer}[\T{1}]\E\.{'y'}\V\\{buffer}[\T{1}]\E\.{'z'}\V\\{buffer}[%
@@ -1597,7 +1607,7 @@
\.{ { }\\titlefalse \% include headline on the contents page}\cr
\.{ { }\\def\\rheader\{\\mainfont The \{\\tt CWEAVE\}{ }processor\\hfil\}}\cr
\.{ { }\\centerline\{\\titlefont The \{\\ttitlefont CWEAVE\}{ }processor\}}\cr
- \.{ { }\\vskip 15pt \\centerline\{(Version 4.7)\}{ }\\vfill\}}\cr}$$
+ \.{ { }\\vskip 15pt \\centerline\{(Version 4.8)\}{ }\\vfill\}}\cr}$$
Redefining \.{\\rheader}, which is the headline for right-hand pages,
suffices in this case to put the desired information at the top of the
contents page.
Modified: branches/stable/source/src/texk/web2c/cwebdir/po/cweb-tl.pot
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/po/cweb-tl.pot 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/po/cweb-tl.pot 2022-11-14 21:05:34 UTC (rev 884)
@@ -30,15 +30,15 @@
msgstr ""
#: ctang-texlive.ch:39
-msgid "This is CTANGLE, Version 4.7"
+msgid "This is CTANGLE, Version 4.8"
msgstr ""
#: ctwill-texlive.ch:39
-msgid "This is CTWILL, Version 4.7"
+msgid "This is CTWILL, Version 4.8"
msgstr ""
#: cweav-texlive.ch:39
-msgid "This is CWEAVE, Version 4.7"
+msgid "This is CWEAVE, Version 4.8"
msgstr ""
#: comm-texlive.ch:512
Modified: branches/stable/source/src/texk/web2c/cwebdir/po/cweb.pot
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/po/cweb.pot 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/po/cweb.pot 2022-11-14 21:05:34 UTC (rev 884)
@@ -523,15 +523,15 @@
msgstr ""
#: ctang-i18n.ch:17
-msgid "This is CTANGLE (Version 4.7 [CWEBbin 2022.1])"
+msgid "This is CTANGLE (Version 4.8 [CWEBbin 2022.2])"
msgstr ""
#: cweav-twill.ch:61
-msgid "This is CTWILL (Version 4.7 [CWEBbin 2022.1])"
+msgid "This is CTWILL (Version 4.8 [CWEBbin 2022.2])"
msgstr ""
#: cweav-i18n.ch:17 cweav-twill.ch:42
-msgid "This is CWEAVE (Version 4.7 [CWEBbin 2022.1])"
+msgid "This is CWEAVE (Version 4.8 [CWEBbin 2022.2])"
msgstr ""
#: cweav-i18n.ch:301 cweav-i18n.ch:309
Modified: branches/stable/source/src/texk/web2c/cwebdir/po/de/cweb-tl.po
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/po/de/cweb-tl.po 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/po/de/cweb-tl.po 2022-11-14 21:05:34 UTC (rev 884)
@@ -33,16 +33,16 @@
msgstr "%s: Benötige ein bis drei Dateiargumente.\n"
#: ctang-texlive.ch:39
-msgid "This is CTANGLE, Version 4.7"
-msgstr "Dies ist CTANGLE, Version 4.7"
+msgid "This is CTANGLE, Version 4.8"
+msgstr "Dies ist CTANGLE, Version 4.8"
#: ctwill-texlive.ch:39
-msgid "This is CTWILL, Version 4.7"
-msgstr "Dies ist CTWILL, Version 4.7"
+msgid "This is CTWILL, Version 4.8"
+msgstr "Dies ist CTWILL, Version 4.8"
#: cweav-texlive.ch:39
-msgid "This is CWEAVE, Version 4.7"
-msgstr "Dies ist CWEAVE, Version 4.7"
+msgid "This is CWEAVE, Version 4.8"
+msgstr "Dies ist CWEAVE, Version 4.8"
#: comm-texlive.ch:512
#, c-format
Modified: branches/stable/source/src/texk/web2c/cwebdir/po/de/cweb.po
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/po/de/cweb.po 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/po/de/cweb.po 2022-11-14 21:05:34 UTC (rev 884)
@@ -603,16 +603,16 @@
msgstr "Sortieren:"
#: ctang-i18n.ch:17
-msgid "This is CTANGLE (Version 4.7 [CWEBbin 2022.1])"
-msgstr "Dies ist CTANGLE (Version 4.7 [CWEBbin 2022.1])"
+msgid "This is CTANGLE (Version 4.8 [CWEBbin 2022.2])"
+msgstr "Dies ist CTANGLE (Version 4.8 [CWEBbin 2022.2])"
#: cweav-twill.ch:61
-msgid "This is CTWILL (Version 4.7 [CWEBbin 2022.1])"
-msgstr "Dies ist CTWILL (Version 4.7 [CWEBbin 2022.1])"
+msgid "This is CTWILL (Version 4.8 [CWEBbin 2022.2])"
+msgstr "Dies ist CTWILL (Version 4.8 [CWEBbin 2022.2])"
#: cweav-i18n.ch:17 cweav-twill.ch:42
-msgid "This is CWEAVE (Version 4.7 [CWEBbin 2022.1])"
-msgstr "Dies ist CWEAVE (Version 4.7 [CWEBbin 2022.1])"
+msgid "This is CWEAVE (Version 4.8 [CWEBbin 2022.2])"
+msgstr "Dies ist CWEAVE (Version 4.8 [CWEBbin 2022.2])"
#: cweav-i18n.ch:301 cweav-i18n.ch:309
msgid "buffer"
Modified: branches/stable/source/src/texk/web2c/cwebdir/po/it/cweb.po
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/po/it/cweb.po 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/po/it/cweb.po 2022-11-14 21:05:34 UTC (rev 884)
@@ -598,16 +598,16 @@
msgstr "Ordinamento:"
#: ctang-i18n.ch:17
-msgid "This is CTANGLE (Version 4.7 [CWEBbin 2022.1])"
-msgstr "Questo è CTANGLE (Versione 4.7 [CWEBbin 2022.1])"
+msgid "This is CTANGLE (Version 4.8 [CWEBbin 2022.2])"
+msgstr "Questo è CTANGLE (Versione 4.8 [CWEBbin 2022.2])"
#: cweav-i18n.ch:17
-msgid "This is CWEAVE (Version 4.7 [CWEBbin 2022.1])"
-msgstr "Questo è CWEAVE (Versione 4.7 [CWEBbin 2022.1])"
+msgid "This is CWEAVE (Version 4.8 [CWEBbin 2022.2])"
+msgstr "Questo è CWEAVE (Versione 4.8 [CWEBbin 2022.2])"
#: cweav-twill.ch:68
-msgid "This is CTWILL (Version 4.7 [CWEBbin 2022.1])"
-msgstr "Questo è CTWILL (Versione 4.7 [CWEBbin 2022.1])"
+msgid "This is CTWILL (Version 4.8 [CWEBbin 2022.2])"
+msgstr "Questo è CTWILL (Versione 4.8 [CWEBbin 2022.2])"
#: cweav-i18n.ch:301 cweav-i18n.ch:309
msgid "buffer"
Modified: branches/stable/source/src/texk/web2c/cwebdir/prod-cweave.w
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/prod-cweave.w 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/prod-cweave.w 2022-11-14 21:05:34 UTC (rev 884)
@@ -2,7 +2,7 @@
% This program by Silvio Levy and Donald E. Knuth
% is based on a program by Knuth.
% It is distributed WITHOUT ANY WARRANTY, express or implied.
-% Version 4.7 --- February 2022
+% Version 4.8 --- June 2022
%
@ Here is a table of all the productions. Each production that
combines two or more consecutive scraps implicitly inserts a {\tt \$}
@@ -56,7 +56,7 @@
|insert| & \altt\\{any} {\\{any} \\{any}} {\\{any} \\{any} \\{any}}
& stmt; \4\4 \C{comment}\cr
\+\dagit& |exp| \altt|lbrace| |int_like| |decl|
- & |fn_decl| \altt|lbrace| |int_like| |decl| \hfill $F=E^*\,\\{din}$
+ & |fn_decl| \altt|lbrace| |int_like| |decl| \hfill $F=\\{din}\,E^*$
& \malt {\\{main}(\,) $\{$}
{$\\{main}(\\{ac},\\{av}){}$ \&{int} \\{ac};} \cr
\+& |exp| |unop| & |exp| & $x\PP$ \cr
@@ -90,7 +90,7 @@
\+& |binop| |binop| & |binop| \hfill
$|math_rel|\,\.\{B_1\.\}\.\{B_2\.\}\.\}$ & |>>=|\cr
\+& |cast| \alt |lpar| |exp| & \alt |lpar| |exp| \hfill
- \alt $CL$ $C\.\ E$ & \malt {$(\&{double})(x+2)$} {(\&{double}) $x$} \cr
+ \alt $CL$ $C\.{\\,}E$ & \malt {$(\&{double})(x+2)$} {(\&{double})\,$x$} \cr
\+& |cast| |semi| & |exp| |semi| & |(int);|\cr
\+& |sizeof_like| |cast| & |exp| & |sizeof (double)|\cr
\+& |sizeof_like| |exp| & |exp| \hfill $S\.\ E$ & \&{sizeof} $x$\cr
@@ -109,7 +109,7 @@
\+& |colcol| \alt|exp| |int_like| & \alt|exp| |int_like| \hfill
|qualifier| $C$\alt$E$ $I$ & \&C\DC$x$\cr
\+& |colcol| |colcol| & |colcol| & \&C\DC\&B\DC\cr
-\+& |decl_head| |comma| & |decl_head| \hfill $DC\.\ $ & \&{int} $x,{}$ \cr
+\+& |decl_head| |comma| & |decl_head| \hfill $DC$\,|opt|9 & \&{int} $x,{}$ \cr
\+& |decl_head| |ubinop| & |decl_head| \hfill $D\.\{U\.\}$ & |int *|\cr
\+\dagit& |decl_head| |exp| & |decl_head| \hfill $DE^*$ & \&{int} $x$ \cr
\+& |decl_head| \alt|binop| |colon| |exp| \altt|comma| |semi| |rpar| &
@@ -118,7 +118,7 @@
& \malt {\&{int} $f(\&{int}\ x=2)$} {\&{int} $b$ : 1} \cr
\+& |decl_head| |cast| & |decl_head| & \&{int} $f$(\&{int})\cr
\+\dagit& |decl_head| \altt|int_like| |lbrace| |decl| & |fn_decl|
- \altt|int_like| |lbrace| |decl| \hfill $F=D\,\\{din}$
+ \altt|int_like| |lbrace| |decl| \hfill $F=\\{din}\,D$
& \&{long} \\{time}(\,) $\{$\cr
\+& |decl_head| |semi| & |decl| & \&{int} $n$;\cr
\+& |decl| |decl| & |decl| \hfill $D_1\,|force|\,D_2$
@@ -166,7 +166,7 @@
$|force|\,E\,\\{in}\,\\{bsp}\,S\,\\{out}\,|force|$
& \&{else} $x=0;$\cr
\+& |else_head| \alt|stmt| |exp| & |stmt| \hfill
- $|force|\,E\,\\{bsp}\,|noop|\,|cancel|\,S\,\\{bsp}$
+ $|force|\,E\,\\{bsp}\,|noop|\,|cancel|\,S\,\\{force}$
& $\!\!$ \&{else} $\{x=0;\}$\cr
\+& |if_clause| |lbrace| & |if_head| |lbrace| & \&{if} ($x$) $\{$\cr
\+& |if_clause| |stmt| |else_like| |if_like| & |if_like| \hfill
@@ -193,7 +193,7 @@
\+& |case_like| |colon| & |tag| & |default:|\cr
\+& |case_like| |exp| & |exp| \hfill $C\.\ E$ & |return 0|\cr
\+\dagit& |catch_like| \alt|cast| |exp| & |fn_decl| \hfill
- $C$\alt $C$ $E$ \unskip \\{din} & |catch (...)|\cr
+ $C$\,\\{din}\,\alt $C$ $E$ & |catch (...)|\cr
\+& |tag| |tag| & |tag| \hfill $T_1\,\\{bsp}\,T_2$ & |case 0: case 1:|\cr
\+& |tag| \altt|stmt| |decl| |function| & \altt|stmt| |decl| |function|
\hfill $|force|\,\\{back}\,T\,\\{bsp}\,S$
@@ -212,7 +212,7 @@
\+& |section_scrap| |semi| & |stmt|\hfill $MS$ |force|
&$\langle\,$section name$\,\rangle$;\cr
\+& |section_scrap| & |exp| &$\langle\,$section name$\,\rangle$\cr
-\+& |insert| \\{any} & \\{any} & \.{\v\#include\v}\cr
+\+& |insert| |function| & |function| & \#\&{include} before \\{main}\cr
\+& |prelangle| & |binop| \hfill \.< & $<$ not in template\cr
\+& |prerangle| & |binop| \hfill \.> & $>$ not in template\cr
\+& |langle| |prerangle| & |cast| \hfill $L\.{\\,}P$ & $\langle\,\rangle$\cr
@@ -262,14 +262,14 @@
\&{typedef} \&{char}\cr
\+\dagit& |typedef_like| |exp| & |typedef_like| \hfill $T\.\ E^{**}$ &
\&{typedef} \&I \.{@@[@@]} (|*|\&P)\cr
-\+& |typedef_like| |comma| & |typedef_like| \hfill $TC\.\ $ &
+\+& |typedef_like| |comma| & |typedef_like| \hfill $TC$ &
\&{typedef} \&{int} \&x,\cr
-\+& |typedef_like| |semi| & |decl| & \&{typedef} \&{int} $\&x,\&y$;\cr
+\+& |typedef_like| |semi| & |decl| & \&{typedef} \&{int} $\&x,{}$ $\&y$;\cr
\+& |typedef_like| |ubinop| \alt |cast| |ubinop| &
|typedef_like| \alt |cast| |ubinop| \hfill
\alt $C=\.\{U\.\}C$ $U_2=\.\{U_1\.\}U_2$ \unskip &
\&{typedef} |*|{}|*|(\&{CPtr})\cr
-\+& |delete_like| |lpar| |rpar| & |delete_like|\hfill $DL\.{\\,}R$
+\+& |delete_like| |lbrack| |rbrack| & |delete_like|\hfill $DL\.{\\,}R$
& \&{delete}[\,] \cr
\+& |delete_like| |exp| & |exp| \hfill $D\.\ E$ & \&{delete} $p$ \cr
\+\dagit& |question| |exp| \alt |colon| |base| & |binop|
@@ -296,7 +296,7 @@
\+& |using_like| & |int_like| & \&{using} not in attributes \cr
\+& |struct_like| |attr| & |struct_like| \hfill $S\.\ A$
& \&{struct} [[\\{deprecated}]]\cr
-\+& |exp| |attr| & |attr| \hfill $E\.\ A$ & \&{enum} $\{x\ [[\ldots]]\}$ \cr
+\+& |exp| |attr| & |exp| \hfill $E\.\ A$ & \&{enum} $\{x\ [[\ldots]]\}$ \cr
\+& |attr| |typedef_like| & |typedef_like| \hfill $A\.\ T$
& |[[deprecated]] typedef| \cr
\+& |raw_int| |lbrack| & |exp| & |int[3]| \cr
@@ -313,10 +313,10 @@
\+& |exp| |colcol| |int_like| & |int_like| & $\\{std}\DC\&{atomic}$ \cr
\advance\midcol-30pt
\+\dagit& |langle| |struct_like| \alt |exp| |int_like| |comma| &
- |langle| \hfill $LS$\alt $E^{**}$ $I^{**}$ \unskip $C$
+ |langle| \hfill $LS$\.\ \alt $E^{**}$ $I^{**}$ \unskip $C$\,\\{opt}9
& $\langle$\&{typename} $t,$\cr
\+\dagit& |langle| |struct_like| \alt |exp| |int_like| |prerangle| &
- |cast| \hfill $LS$\alt $E^{**}$ $I^{**}$ \unskip $P$
+ |cast| \hfill $LS$\.\ \alt $E^{**}$ $I^{**}$ \unskip $P$
& $\langle$\&{typename} $t\rangle$ \cr
\advance\midcol30pt
\+& |template_like| |cast| |struct_like| & |struct_like| \hfill $T\.\ CS$ &
@@ -333,7 +333,7 @@
Rules 1, 38, 52, and 73: The \\{din}s and \\{out}s are suppressed if
\.{CWEAVE} has been invoked with the \.{-i} option.
-Rule 35: The |exp| must not be immediately followed by |lpar|, |lbrack|,
+Rules 35, 117: The |exp| must not be immediately followed by |lpar|, |lbrack|,
|exp|, or~|cast|.
Rule 41: The |big_force| becomes |force| if \.{CWEAVE} has been invoked with the
@@ -361,9 +361,6 @@
Rule 114: The |operator_like| must not be immediately followed by
|raw_ubin|.
-Rule 117: The |exp| must not be immediately followed by |lpar|, |exp|,
-or |cast|.
-
Rule 123: The mathness of the |colon| or |base| changes to `yes'.
Rules 153, 154: |make_reserved| is called only if \.{CWEAVE} has been invoked
Modified: branches/stable/source/src/texk/web2c/cwebdir/prod-twill.w
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/prod-twill.w 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/prod-twill.w 2022-11-14 21:05:34 UTC (rev 884)
@@ -2,7 +2,7 @@
% This program by Silvio Levy and Donald E. Knuth
% is based on a program by Knuth.
% It is distributed WITHOUT ANY WARRANTY, express or implied.
-% Version 4.7 --- February 2022
+% Version 4.8 --- June 2022
%
@ Here is a table of all the productions. Each production that
combines two or more consecutive scraps implicitly inserts a {\tt \$}
@@ -56,7 +56,7 @@
|insert| & \altt\\{any} {\\{any} \\{any}} {\\{any} \\{any} \\{any}}
& stmt; \4\4 \C{comment}\cr
\+\dagit& |exp| \altt|lbrace| |int_like| |decl|
- & |fn_decl| \altt|lbrace| |int_like| |decl| \hfill $F=E^*\,\\{din}$
+ & |fn_decl| \altt|lbrace| |int_like| |decl| \hfill $F=\\{din}\,E^*$
& \malt {\\{main}(\,) $\{$}
{$\\{main}(\\{ac},\\{av}){}$ \&{int} \\{ac};} \cr
\+& |exp| |unop| & |exp| & $x\PP$ \cr
@@ -90,7 +90,7 @@
\+& |binop| |binop| & |binop| \hfill
$|math_rel|\,\.\{B_1\.\}\.\{B_2\.\}\.\}$ & |>>=|\cr
\+& |cast| \alt |lpar| |exp| & \alt |lpar| |exp| \hfill
- \alt $CL$ $C\.\ E$ & \malt {$(\&{double})(x+2)$} {(\&{double}) $x$} \cr
+ \alt $CL$ $C\.{\\,}E$ & \malt {$(\&{double})(x+2)$} {(\&{double})\,$x$} \cr
\+& |cast| |semi| & |exp| |semi| & |(int);|\cr
\+& |sizeof_like| |cast| & |exp| & |sizeof (double)|\cr
\+& |sizeof_like| |exp| & |exp| \hfill $S\.\ E$ & \&{sizeof} $x$\cr
@@ -109,7 +109,7 @@
\+& |colcol| \alt|exp| |int_like| & \alt|exp| |int_like| \hfill
|qualifier| $C$\alt$E$ $I$ & \&C\DC$x$\cr
\+& |colcol| |colcol| & |colcol| & \&C\DC\&B\DC\cr
-\+& |decl_head| |comma| & |decl_head| \hfill $DC\.\ $ & \&{int} $x,{}$ \cr
+\+& |decl_head| |comma| & |decl_head| \hfill $DC$\,|opt|9 & \&{int} $x,{}$ \cr
\+& |decl_head| |ubinop| & |decl_head| \hfill $D\.\{U\.\}$ & |int *|\cr
\+\dagit& |decl_head| |exp| & |decl_head| \hfill $DE^*$ & \&{int} $x$ \cr
\+& |decl_head| \alt|binop| |colon| |exp| \altt|comma| |semi| |rpar| &
@@ -118,7 +118,7 @@
& \malt {\&{int} $f(\&{int}\ x=2)$} {\&{int} $b$ : 1} \cr
\+& |decl_head| |cast| & |decl_head| & \&{int} $f$(\&{int})\cr
\+\dagit& |decl_head| \altt|int_like| |lbrace| |decl| & |fn_decl|
- \altt|int_like| |lbrace| |decl| \hfill $F=D\,\\{din}$
+ \altt|int_like| |lbrace| |decl| \hfill $F=\\{din}\,D$
& \&{long} \\{time}(\,) $\{$\cr
\+& |decl_head| |semi| & |decl| & \&{int} $n$;\cr
\+& |decl| |decl| & |decl| \hfill $D_1\,|force|\,D_2$
@@ -166,7 +166,7 @@
$|force|\,E\,\\{in}\,\\{bsp}\,S\,\\{out}\,|force|$
& \&{else} $x=0;$\cr
\+& |else_head| \alt|stmt| |exp| & |stmt| \hfill
- $|force|\,E\,\\{bsp}\,|noop|\,|cancel|\,S\,\\{bsp}$
+ $|force|\,E\,\\{bsp}\,|noop|\,|cancel|\,S\,\\{force}$
& $\!\!$ \&{else} $\{x=0;\}$\cr
\+& |if_clause| |lbrace| & |if_head| |lbrace| & \&{if} ($x$) $\{$\cr
\+& |if_clause| |stmt| |else_like| |if_like| & |if_like| \hfill
@@ -193,7 +193,7 @@
\+& |case_like| |colon| & |tag| & |default:|\cr
\+& |case_like| |exp| & |exp| \hfill $C\.\ E$ & |return 0|\cr
\+\dagit& |catch_like| \alt|cast| |exp| & |fn_decl| \hfill
- $C$\alt $C$ $E$ \unskip \\{din} & |catch (...)|\cr
+ $C$\,\\{din}\,\alt $C$ $E$ & |catch (...)|\cr
\+& |tag| |tag| & |tag| \hfill $T_1\,\\{bsp}\,T_2$ & |case 0: case 1:|\cr
\+& |tag| \altt|stmt| |decl| |function| & \altt|stmt| |decl| |function|
\hfill $|force|\,\\{back}\,T\,\\{bsp}\,S$
@@ -212,7 +212,7 @@
\+& |section_scrap| |semi| & |stmt|\hfill $MS$ |force|
&$\langle\,$section name$\,\rangle$;\cr
\+& |section_scrap| & |exp| &$\langle\,$section name$\,\rangle$\cr
-\+& |insert| \\{any} & \\{any} & \.{\v\#include\v}\cr
+\+& |insert| |function| & |function| & \#\&{include} before \\{main}\cr
\+& |prelangle| & |binop| \hfill \.< & $<$ not in template\cr
\+& |prerangle| & |binop| \hfill \.> & $>$ not in template\cr
\+& |langle| |prerangle| & |cast| \hfill $L\.{\\,}P$ & $\langle\,\rangle$\cr
@@ -264,7 +264,7 @@
\+\dag202\enspace& |typedef_like| |int_like| |raw_int| & |typedef_like| |int_like| |exp| &
\&{typedef} \&{int} \&{foo}\cr
\global\prodno=121
-\+& |delete_like| |lpar| |rpar| & |delete_like|\hfill $DL\.{\\,}R$
+\+& |delete_like| |lbrack| |rbrack| & |delete_like|\hfill $DL\.{\\,}R$
& \&{delete}[\,] \cr
\+& |delete_like| |exp| & |exp| \hfill $D\.\ E$ & \&{delete} $p$ \cr
\+\dagit& |question| |exp| \alt |colon| |base| & |binop|
@@ -291,7 +291,7 @@
\+& |using_like| & |int_like| & \&{using} not in attributes \cr
\+& |struct_like| |attr| & |struct_like| \hfill $S\.\ A$
& \&{struct} [[\\{deprecated}]]\cr
-\+& |exp| |attr| & |attr| \hfill $E\.\ A$ & \&{enum} $\{x\ [[\ldots]]\}$ \cr
+\+& |exp| |attr| & |exp| \hfill $E\.\ A$ & \&{enum} $\{x\ [[\ldots]]\}$ \cr
\+& |attr| |typedef_like| & |typedef_like| \hfill $A\.\ T$
& |[[deprecated]] typedef| \cr
\+& |raw_int| |lbrack| & |exp| & |int[3]| \cr
@@ -308,10 +308,10 @@
\+& |exp| |colcol| |int_like| & |int_like| & $\\{std}\DC\&{atomic}$ \cr
\advance\midcol-30pt
\+\dagit& |langle| |struct_like| \alt |exp| |int_like| |comma| &
- |langle| \hfill $LS$\alt $E^{**}$ $I^{**}$ \unskip $C$
+ |langle| \hfill $LS$\.\ \alt $E^{**}$ $I^{**}$ \unskip $C$\,\\{opt}9
& $\langle$\&{typename} $t,$\cr
\+\dagit& |langle| |struct_like| \alt |exp| |int_like| |prerangle| &
- |cast| \hfill $LS$\alt $E^{**}$ $I^{**}$ \unskip $P$
+ |cast| \hfill $LS$\.\ \alt $E^{**}$ $I^{**}$ \unskip $P$
& $\langle$\&{typename} $t\rangle$ \cr
\advance\midcol30pt
\+& |template_like| |cast| |struct_like| & |struct_like| \hfill $T\.\ CS$ &
Modified: branches/stable/source/src/texk/web2c/cwebdir/prod.w
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/prod.w 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/prod.w 2022-11-14 21:05:34 UTC (rev 884)
@@ -2,7 +2,7 @@
% This program by Silvio Levy and Donald E. Knuth
% is based on a program by Knuth.
% It is distributed WITHOUT ANY WARRANTY, express or implied.
-% Version 4.7 --- February 2022
+% Version 4.8 --- June 2022
%
@ Here is a table of all the productions. Each production that
combines two or more consecutive scraps implicitly inserts a {\tt \$}
@@ -56,7 +56,7 @@
|insert| & \altt\\{any} {\\{any} \\{any}} {\\{any} \\{any} \\{any}}
& stmt; \4\4 \C{comment}\cr
\+& |exp| \altt|lbrace| |int_like| |decl|
- & |fn_decl| \altt|lbrace| |int_like| |decl| \hfill $F=E^*\,\\{din}$
+ & |fn_decl| \altt|lbrace| |int_like| |decl| \hfill $F=\\{din}\,E^*$
& \malt {\\{main}(\,) $\{$}
{$\\{main}(\\{ac},\\{av}){}$ \&{int} \\{ac};} \cr
\+& |exp| |unop| & |exp| & $x\PP$ \cr
@@ -90,7 +90,7 @@
\+& |binop| |binop| & |binop| \hfill
$|math_rel|\,\.\{B_1\.\}\.\{B_2\.\}\.\}$ & |>>=|\cr
\+& |cast| \alt |lpar| |exp| & \alt |lpar| |exp| \hfill
- \alt $CL$ $C\.\ E$ & \malt {$(\&{double})(x+2)$} {(\&{double}) $x$} \cr
+ \alt $CL$ $C\.{\\,}E$ & \malt {$(\&{double})(x+2)$} {(\&{double})\,$x$} \cr
\+& |cast| |semi| & |exp| |semi| & |(int);|\cr
\+& |sizeof_like| |cast| & |exp| & |sizeof (double)|\cr
\+& |sizeof_like| |exp| & |exp| \hfill $S\.\ E$ & \&{sizeof} $x$\cr
@@ -109,7 +109,7 @@
\+& |colcol| \alt|exp| |int_like| & \alt|exp| |int_like| \hfill
|qualifier| $C$\alt$E$ $I$ & \&C\DC$x$\cr
\+& |colcol| |colcol| & |colcol| & \&C\DC\&B\DC\cr
-\+& |decl_head| |comma| & |decl_head| \hfill $DC\.\ $ & \&{int} $x,{}$ \cr
+\+& |decl_head| |comma| & |decl_head| \hfill $DC$\,|opt|9 & \&{int} $x,{}$ \cr
\+& |decl_head| |ubinop| & |decl_head| \hfill $D\.\{U\.\}$ & |int *|\cr
\+\dagit& |decl_head| |exp| & |decl_head| \hfill $DE^*$ & \&{int} $x$ \cr
\+& |decl_head| \alt|binop| |colon| |exp| \altt|comma| |semi| |rpar| &
@@ -118,7 +118,7 @@
& \malt {\&{int} $f(\&{int}\ x=2)$} {\&{int} $b$ : 1} \cr
\+& |decl_head| |cast| & |decl_head| & \&{int} $f$(\&{int})\cr
\+& |decl_head| \altt|int_like| |lbrace| |decl| & |fn_decl|
- \altt|int_like| |lbrace| |decl| \hfill $F=D\,\\{din}$
+ \altt|int_like| |lbrace| |decl| \hfill $F=\\{din}\,D$
& \&{long} \\{time}(\,) $\{$\cr
\+& |decl_head| |semi| & |decl| & \&{int} $n$;\cr
\+& |decl| |decl| & |decl| \hfill $D_1\,|force|\,D_2$
@@ -166,7 +166,7 @@
$|force|\,E\,\\{in}\,\\{bsp}\,S\,\\{out}\,|force|$
& \&{else} $x=0;$\cr
\+& |else_head| \alt|stmt| |exp| & |stmt| \hfill
- $|force|\,E\,\\{bsp}\,|noop|\,|cancel|\,S\,\\{bsp}$
+ $|force|\,E\,\\{bsp}\,|noop|\,|cancel|\,S\,\\{force}$
& $\!\!$ \&{else} $\{x=0;\}$\cr
\+& |if_clause| |lbrace| & |if_head| |lbrace| & \&{if} ($x$) $\{$\cr
\+& |if_clause| |stmt| |else_like| |if_like| & |if_like| \hfill
@@ -193,7 +193,7 @@
\+& |case_like| |colon| & |tag| & |default:|\cr
\+& |case_like| |exp| & |exp| \hfill $C\.\ E$ & |return 0|\cr
\+& |catch_like| \alt|cast| |exp| & |fn_decl| \hfill
- $C$\alt $C$ $E$ \unskip \\{din} & |catch (...)|\cr
+ $C$\,\\{din}\,\alt $C$ $E$ & |catch (...)|\cr
\+& |tag| |tag| & |tag| \hfill $T_1\,\\{bsp}\,T_2$ & |case 0: case 1:|\cr
\+& |tag| \altt|stmt| |decl| |function| & \altt|stmt| |decl| |function|
\hfill $|force|\,\\{back}\,T\,\\{bsp}\,S$
@@ -212,7 +212,7 @@
\+& |section_scrap| |semi| & |stmt|\hfill $MS$ |force|
&$\langle\,$section name$\,\rangle$;\cr
\+& |section_scrap| & |exp| &$\langle\,$section name$\,\rangle$\cr
-\+& |insert| \\{any} & \\{any} & \.{\v\#include\v}\cr
+\+& |insert| |function| & |function| & \#\&{include} before \\{main}\cr
\+& |prelangle| & |binop| \hfill \.< & $<$ not in template\cr
\+& |prerangle| & |binop| \hfill \.> & $>$ not in template\cr
\+& |langle| |prerangle| & |cast| \hfill $L\.{\\,}P$ & $\langle\,\rangle$\cr
@@ -262,14 +262,14 @@
\&{typedef} \&{char}\cr
\+\dagit& |typedef_like| |exp| & |typedef_like| \hfill $T\.\ E^{**}$ &
\&{typedef} \&I \.{@@[@@]} (|*|\&P)\cr
-\+& |typedef_like| |comma| & |typedef_like| \hfill $TC\.\ $ &
+\+& |typedef_like| |comma| & |typedef_like| \hfill $TC$ &
\&{typedef} \&{int} \&x,\cr
-\+& |typedef_like| |semi| & |decl| & \&{typedef} \&{int} $\&x,\&y$;\cr
-\+& |typedef_like| |ubinop| \alt |cast| |ubinop| &
+\+& |typedef_like| |semi| & |decl| & \&{typedef} \&{int} $\&x,{}$ $\&y$;\cr
+\+& |typedef_like| |ubinop| \alt |cast| |ubinop| &
|typedef_like| \alt |cast| |ubinop| \hfill
\alt $C=\.\{U\.\}C$ $U_2=\.\{U_1\.\}U_2$ \unskip &
\&{typedef} |*|{}|*|(\&{CPtr})\cr
-\+& |delete_like| |lpar| |rpar| & |delete_like|\hfill $DL\.{\\,}R$
+\+& |delete_like| |lbrack| |rbrack| & |delete_like|\hfill $DL\.{\\,}R$
& \&{delete}[\,] \cr
\+& |delete_like| |exp| & |exp| \hfill $D\.\ E$ & \&{delete} $p$ \cr
\+\dagit& |question| |exp| \alt |colon| |base| & |binop|
@@ -296,7 +296,7 @@
\+& |using_like| & |int_like| & \&{using} not in attributes \cr
\+& |struct_like| |attr| & |struct_like| \hfill $S\.\ A$
& \&{struct} [[\\{deprecated}]]\cr
-\+& |exp| |attr| & |attr| \hfill $E\.\ A$ & \&{enum} $\{x\ [[\ldots]]\}$ \cr
+\+& |exp| |attr| & |exp| \hfill $E\.\ A$ & \&{enum} $\{x\ [[\ldots]]\}$ \cr
\+& |attr| |typedef_like| & |typedef_like| \hfill $A\.\ T$
& |[[deprecated]] typedef| \cr
\+& |raw_int| |lbrack| & |exp| & |int[3]| \cr
@@ -313,10 +313,10 @@
\+& |exp| |colcol| |int_like| & |int_like| & $\\{std}\DC\&{atomic}$ \cr
\advance\midcol-30pt
\+\dagit& |langle| |struct_like| \alt |exp| |int_like| |comma| &
- |langle| \hfill $LS$\alt $E^{**}$ $I^{**}$ \unskip $C$
+ |langle| \hfill $LS$\.\ \alt $E^{**}$ $I^{**}$ \unskip $C$\,\\{opt}9
& $\langle$\&{typename} $t,$\cr
\+\dagit& |langle| |struct_like| \alt |exp| |int_like| |prerangle| &
- |cast| \hfill $LS$\alt $E^{**}$ $I^{**}$ \unskip $P$
+ |cast| \hfill $LS$\.\ \alt $E^{**}$ $I^{**}$ \unskip $P$
& $\langle$\&{typename} $t\rangle$ \cr
\advance\midcol30pt
\+& |template_like| |cast| |struct_like| & |struct_like| \hfill $T\.\ CS$ &
@@ -329,7 +329,7 @@
\parindent=0pt
\dag{\bf Notes}
\yskip
-Rule 35: The |exp| must not be immediately followed by |lpar|, |lbrack|,
+Rules 35, 117: The |exp| must not be immediately followed by |lpar|, |lbrack|,
|exp|, or~|cast|.
Rule 48: The |exp| or |int_like| must not be immediately followed by |base|.
@@ -352,9 +352,6 @@
Rule 114: The |operator_like| must not be immediately followed by
|raw_ubin|.
-Rule 117: The |exp| must not be immediately followed by |lpar|, |exp|,
-or |cast|.
-
Rule 123: The mathness of the |colon| or |base| changes to `yes'.
Rules 153, 154: |make_reserved| is called only if \.{CWEAVE} has been invoked
Modified: branches/stable/source/src/texk/web2c/cwebdir/texinputs/dctproofmac.tex
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/texinputs/dctproofmac.tex 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/texinputs/dctproofmac.tex 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,7 +1,7 @@
\ifx\undefined\documentclass\input ctproofmac.tex
\else\endinput\fi % LaTeX will use other macros
-\let\acrofalse=\relax
+\let\pdffalse=\relax
\input dcwebstrings.tex
\def\fin{\par\vfill\eject % this is done when we are ending the index
Modified: branches/stable/source/src/texk/web2c/cwebdir/texinputs/dctwimac.tex
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/texinputs/dctwimac.tex 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/texinputs/dctwimac.tex 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,7 +1,7 @@
\ifx\undefined\documentclass\input ctwimac.tex
\else\endinput\fi % LaTeX will use other macros
-\let\acrofalse=\relax
+\let\pdffalse=\relax
\input dcwebstrings.tex
\def\fin{\parfillskip 0pt plus 1fil
Modified: branches/stable/source/src/texk/web2c/cwebdir/texinputs/dcwebmac.tex
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/texinputs/dcwebmac.tex 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/texinputs/dcwebmac.tex 2022-11-14 21:05:34 UTC (rev 884)
@@ -27,6 +27,7 @@
% Version 3.64 [p20] --- Andreas Scherer, March 2002
% Version 3.64 [p21] --- Andreas Scherer, Octobre 2005
% Version 3.64 [p22] --- Andreas Scherer, March 2016
+% Version 4.9 --- Andreas Scherer, June 2022
\ifx\undefined\botofcontents\input cwebmac.tex\fi
@@ -53,28 +54,28 @@
\def\fin{\par\vfill\eject % this is done when we are ending the index
\ifpagesaved\null\vfill\eject\fi % output a null index column
\if L\lr\else\null\vfill\eject\fi % finish the current page
- \ifpdftex \makebookmarks \fi % added in Version 3.68
+ \ifpdf \ifpdftex \makebookmarks % added in Version 3.68
+ \countsections \fi\fi % and in Version 4.9
\parfillskip 0pt plus 1fil
\let\topsecno=\nullsec
\redeffin
\output={\normaloutput\page\lheader\rheader}
\setpage
- \def\note##1##2.{\quad{\eightrm##1~\ifacro{\pdfnote##2.}\else{##2}\fi.}}
+ \def\note##1##2.{\quad{\eightrm##1~\ifacrohint{\pdfnote##2.}\else{##2}\fi.}}
\def\I{\par\hangindent 2em}\let\*=*
- \ifacro \let\Xpdf\X
+ \ifpdf \let\Xpdf\X
\ifpdftex \pdfdest name {NOS} fith
- \pdfoutline goto name {NOS} count -\secno {\outsecname}
+ \pdfoutline goto name {NOS} count -\the\countD {\outsecname}
\def\X##1:##2\X{\Xpdf##1:##2\X \firstsecno##1.%
{\toksF={}\makeoutlinetoks##2\outlinedone\outlinedone}%
\pdfoutline goto num \the\toksA \expandafter{\the\toksE}}
- \else\ifpdf
- \special{pdf: outline -1 << /Title (\outsecname)
+ \else \special{pdf: outline -1 << /Title (\outsecname)
/Dest [ @thispage /FitH @ypos ] >>}
\def\X##1:##2\X{\Xpdf##1:##2\X \firstsecno##1.%
{\toksF={}\makeoutlinetoks##2\outlinedone\outlinedone}%
\special{pdf: outline 0 << /Title (\the\toksE)
/A << /S /GoTo /D (\romannumeral\the\toksA) >> >>}}
- \fi\fi\fi
+ \fi\fi
\readsections}
\def\con{\par\vfill\eject % finish the section names
% \ifodd\pageno\else\titletrue\null\vfill\eject\fi % for duplex printers
@@ -83,6 +84,7 @@
\titletrue % prepare to output the table of contents
\pageno=\contentspagenumber
\redefcon
+ \ifhint\HINThome\fi% Mark the Table of contents as home page
\topofcontents \startpdf
\line{\headerline}
\let\ZZ=\contentsline
Modified: branches/stable/source/src/texk/web2c/cwebdir/texinputs/dcwebstrings.tex
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/texinputs/dcwebstrings.tex 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/texinputs/dcwebstrings.tex 2022-11-14 21:05:34 UTC (rev 884)
@@ -36,5 +36,6 @@
\def\redefcon{\message{Inhaltsverzeichnis:}
\def\grouptitle{INHALTSVERZEICHNIS:}
- \def\headerline{\hfil Abschnitt\hbox to3em{\hss Seite}}
+ \def\headerline{\hfil Abschnitt\ifhint\else\hbox to3em{\hss Seite}\fi}
+ % No Page in HINT
}
Modified: branches/stable/source/src/texk/web2c/cwebdir/texinputs/fcwebmac.tex
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/texinputs/fcwebmac.tex 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/texinputs/fcwebmac.tex 2022-11-14 21:05:34 UTC (rev 884)
@@ -25,8 +25,9 @@
% Version 3.61 [p18] --- Andreas Scherer, July 2000
% Version 3.63 [p19] --- Andreas Scherer, January 2001
% Version 3.64 [p20] --- Andreas Scherer, March 2002
-% Version 3.64 [p21] --- Andreas Scherer, Octobre 2005
+% Version 3.64 [p21] --- Andreas Scherer, October 2005
% Version 3.64 [p22] --- Andreas Scherer, March 2016
+% Version 4.9 --- Andreas Scherer, June 2022
% french translations --- Denis Roegel, 18 September 1994
@@ -73,7 +74,8 @@
\def\fin{\par\vfill\eject % this is done when we are ending the index
\ifpagesaved\null\vfill\eject\fi % output a null index column
\if L\lr\else\null\vfill\eject\fi % finish the current page
- \ifpdftex \makebookmarks \fi % added in Version 3.68
+ \ifpdf \ifpdftex \makebookmarks % added in Version 3.68
+ \countsections \fi\fi % and in Version 4.9
\parfillskip 0pt plus 1fil
\def\grouptitle{NOMS DES SECTIONS}
\let\topsecno=\nullsec
@@ -80,27 +82,26 @@
\message{Noms des sections:}
\output={\normaloutput\page\lheader\rheader}
\setpage
- \def\note##1##2.{\quad{\eightrm##1~\ifacro{\pdfnote##2.}\else{##2}\fi.}}
+ \def\note##1##2.{\quad{\eightrm##1~\ifacrohint{\pdfnote##2.}\else{##2}\fi.}}
\def\Q{\note{Cit\'e dans la section}} % crossref for mention of a section
\def\Qs{\note{Cit\'e dans les sections}} % crossref for mentions of a section
\def\U{\note{Utilis\'e dans la section}} % crossref for use of a section
\def\Us{\note{Utilis\'e dans les sections}} % crossref for uses of a section
\def\I{\par\hangindent 2em}\let\*=*
- \ifacro \def\outsecname{Noms des sections} \let\Xpdf\X
+ \ifpdf \def\outsecname{Noms des sections} \let\Xpdf\X
% \ifpdftex \makebookmarks \pdfdest name {NOS} fitb % in versions < 3.68
\ifpdftex \pdfdest name {NOS} fith % changed in version 3.69
- \pdfoutline goto name {NOS} count -\secno {\outsecname}
+ \pdfoutline goto name {NOS} count -\the\countD {\outsecname}
\def\X##1:##2\X{\Xpdf##1:##2\X \firstsecno##1.%
{\toksF={}\makeoutlinetoks##2\outlinedone\outlinedone}%
\pdfoutline goto num \the\toksA \expandafter{\the\toksE}}
- \else\ifpdf
- \special{pdf: outline -1 << /Title (\outsecname)
+ \else \special{pdf: outline -1 << /Title (\outsecname)
/Dest [ @thispage /FitH @ypos ] >>}
\def\X##1:##2\X{\Xpdf##1:##2\X \firstsecno##1.%
{\toksF={}\makeoutlinetoks##2\outlinedone\outlinedone}%
\special{pdf: outline 0 << /Title (\the\toksE)
/A << /S /GoTo /D (\romannumeral\the\toksA) >> >>}}
- \fi\fi\fi
+ \fi\fi
\readsections}
\def\con{\par\vfill\eject % finish the section names
% \ifodd\pageno\else\titletrue\null\vfill\eject\fi % for duplex printers
@@ -110,8 +111,9 @@
\pageno=\contentspagenumber
\def\grouptitle{SOMMAIRE:}
\message{Sommaire:}
+ \ifhint\HINThome\fi% Mark the Table of contents as home page
\topofcontents \startpdf
- \line{\hfil Section\hbox to3em{\hss Page}}
+ \line{\hfil Section\ifhint\else\hbox to3em{\hss Page}\fi}% No Page in HINT
\let\ZZ=\contentsline
\readcontents\relax % read the contents info
\botofcontents \end} % print the contents page(s) and terminate
Modified: branches/stable/source/src/texk/web2c/cwebdir/texinputs/icwebmac.tex
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/texinputs/icwebmac.tex 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/texinputs/icwebmac.tex 2022-11-14 21:05:34 UTC (rev 884)
@@ -25,8 +25,9 @@
% Version 3.61 [p18] --- Andreas Scherer, July 2000
% Version 3.63 [p19] --- Andreas Scherer, January 2001
% Version 3.64 [p20] --- Andreas Scherer, March 2002
-% Version 3.64 [p21] --- Andreas Scherer, Octobre 2005
+% Version 3.64 [p21] --- Andreas Scherer, October 2005
% Version 3.64 [p22] --- Andreas Scherer, March 2016
+% Version 4.9 --- Andreas Scherer, June 2022
\ifx\undefined\botofcontents\input cwebmac.tex\fi
@@ -74,13 +75,15 @@
\write\cont{\catcode `\noexpand\@=12\relax} % \makeatother
\closeout\cont % the contents information has been fully gathered
\output{\ifpagesaved\normaloutput{\box\sbox}\lheader\rheader\fi
- \global\setbox\sbox=\page \global\pagesavedtrue}
+ \global\setbox\sbox=\page \global\pagesavedtrue \mark{\topmark}}
\pagesavedfalse \eject % eject the page-so-far and predecessors
\setbox\sbox\vbox{\unvbox\sbox} % take it out of its box
\vsize=\pageheight \advance\vsize by -\ht\sbox % the remaining height
\hsize=.5\pagewidth \advance\hsize by -10pt
% column width for the index (20pt between cols)
+ \ifhint\else
\parfillskip 0pt plus .6\hsize % try to avoid almost empty lines
+ \fi
\def\lr{L} % this tells whether the left or right column is next
\output{\if L\lr\global\setbox\lbox=\page \gdef\lr{R}
\else\normaloutput{\vbox to\pageheight{\box\sbox\vss
@@ -89,7 +92,7 @@
\message{Indice Analitico:}
\parskip 0pt plus .5pt
\outer\def\I##1, ##2.{\par\hangindent2em\noindent##1:\kern1em
- \ifacro\pdfnote##2.\else##2\fi.} % index entry
+ \ifacrohint\pdfnote##2.\else##2\fi.} % index entry
\def\[##1]{$\underline{##1}$} % underlined index item
\rm \rightskip0pt plus 2.5em \tolerance 10000 \let\*=\lapstar
\hyphenpenalty 10000 \parindent0pt
@@ -97,7 +100,8 @@
\def\fin{\par\vfill\eject % this is done when we are ending the index
\ifpagesaved\null\vfill\eject\fi % output a null index column
\if L\lr\else\null\vfill\eject\fi % finish the current page
- \ifpdftex \makebookmarks \fi % added in Version 3.68
+ \ifpdf \ifpdftex \makebookmarks % added in Version 3.68
+ \countsections \fi\fi % and in Version 4.9
\parfillskip 0pt plus 1fil
\def\grouptitle{NOMI DELLE SEZIONI}
\let\topsecno=\nullsec
@@ -104,27 +108,26 @@
\message{Nomi delle sezioni:}
\output={\normaloutput\page\lheader\rheader}
\setpage
- \def\note##1##2.{\quad{\eightrm##1~\ifacro{\pdfnote##2.}\else{##2}\fi.}}
+ \def\note##1##2.{\quad{\eightrm##1~\ifacrohint{\pdfnote##2.}\else{##2}\fi.}}
\def\Q{\note{Citato nella sezione}} % crossref for mention of a section
\def\Qs{\note{Citato nelle sezioni}} % crossref for mentions of a section
\def\U{\note{Usato nella sezione}} % crossref for use of a section
\def\Us{\note{Usato nelle sezioni}} % crossref for uses of a section
\def\I{\par\hangindent 2em}\let\*=*
- \ifacro \def\outsecname{Nomi delle sezioni} \let\Xpdf\X
+ \ifpdf \def\outsecname{Nomi delle sezioni} \let\Xpdf\X
% \ifpdftex \makebookmarks \pdfdest name {NOS} fitb % in versions < 3.68
\ifpdftex \pdfdest name {NOS} fith % changed in version 3.69
- \pdfoutline goto name {NOS} count -\secno {\outsecname}
+ \pdfoutline goto name {NOS} count -\the\countD {\outsecname}
\def\X##1:##2\X{\Xpdf##1:##2\X \firstsecno##1.%
{\toksF={}\makeoutlinetoks##2\outlinedone\outlinedone}%
\pdfoutline goto num \the\toksA \expandafter{\the\toksE}}
- \else\ifpdf
- \special{pdf: outline -1 << /Title (\outsecname)
+ \else \special{pdf: outline -1 << /Title (\outsecname)
/Dest [ @thispage /FitH @ypos ] >>}
\def\X##1:##2\X{\Xpdf##1:##2\X \firstsecno##1.%
{\toksF={}\makeoutlinetoks##2\outlinedone\outlinedone}%
\special{pdf: outline 0 << /Title (\the\toksE)
/A << /S /GoTo /D (\romannumeral\the\toksA) >> >>}}
- \fi\fi\fi
+ \fi\fi
\readsections}
\def\con{\par\vfill\eject % finish the section names
% \ifodd\pageno\else\titletrue\null\vfill\eject\fi % for duplex printers
@@ -134,8 +137,9 @@
\pageno=\contentspagenumber
\def\grouptitle{INDICE}
\message{Indice:}
+ \ifhint\HINThome\fi% Mark the Table of contents as home page
\topofcontents \startpdf
- \line{\hfil Sezione\hbox to3em{\hss Pag.}}
+ \line{\hfil Sezione\ifhint\else\hbox to3em{\hss Pag.}\fi}% No Page in HINT
\let\ZZ=\contentsline
\readcontents\relax % read the contents info
\botofcontents \end} % print the contents page(s) and terminate
Modified: branches/stable/source/src/texk/web2c/cwebdir/texinputs/pdfctwimac.tex
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/texinputs/pdfctwimac.tex 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/cwebdir/texinputs/pdfctwimac.tex 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,25 +1,21 @@
% standard macros for CWEB listings (in addition to plain.tex)
-% Version 4.5 --- October 2021
+% Version 4.9 --- June 2022
% modified for pages produced by CTWILL
% further modified for page size of the MMIXware book
% modified for PDF output with 'tex "\let\pdf+', 'pdftex', and 'xetex'
% This file is not copyrighted and can be used freely.
\ifx\renewenvironment\undefined\else\endinput\fi % LaTeX will use other macros
-\xdef\fmtversion{\fmtversion+CTWILL4.5+LNCS+PDF}
-
-\newif\ifpdf
-\ifx\pdf+\pdftrue\fi
+\xdef\fmtversion{\fmtversion+CTWILL4.9+LNCS+PDF}
+\input iftex.sty % TeX engine tests
+\ifx\pdf+\pdftrue\fi % for plain TeX in combination with dvipdfm
% Uncomment the following line if you want PDF goodies to be the default
%\ifx\pdf-\else\pdftrue\fi
\def\pdflinkcolor{0 0 1} % the RGB values for hyperlink color
-\ifx\undefined\XeTeXrevision\else\pdftrue\fi % XeTeX produces PDF output
-\newif\ifpdftex
-\ifx\pdfoutput\undefined \pdftexfalse \else\ifnum\pdfoutput=0 \pdftexfalse
-\else \pdftextrue \pdfoutput=1
+\ifxetex\pdftrue\fi % XeTeX produces PDF output
+\ifpdftex % pdfTeX produces PDF output if \pdfoutput>0
\def\Black{\pdfliteral{0 g 0 G}} % use rgb colors for direct PDF output too
\def\PDFlinkcolor{\pdfliteral{\pdflinkcolor\space rg \pdflinkcolor\space RG}}
-\fi\fi
-\newif\ifacro \ifpdf\acrotrue\fi \ifpdftex\acrotrue\fi
+\fi
\let\:=\. % preserve a way to get the dot accent
% (all other accents will still work as usual)
@@ -180,7 +176,7 @@
tangles as \tentex "#2"\egroup\par}
\def\noATL#1 #2 {}
\def\noatl{\let\ATL=\noATL} % suppress output from @l
-\def\ATH{{\acrofalse\X\kern-.5em:Preprocessor definitions\X}}
+\def\ATH{{\pdffalse\X\kern-.5em:Preprocessor definitions\X}}
\let\PB=\relax % hook for program brackets |...| in TeX part or section name
\chardef\AM=`\& % ampersand character in a string
@@ -238,16 +234,16 @@
\def\,{\relax\ifmmode\mskip\thinmuskip\else\thinspace\fi}
\def\note#1#2.{\par\penalty5000
\Y\noindent{\hangindent2\em\baselineskip10pt%
- \eightrm#1~\ifacro{\pdfnote#2.}\else#2\fi.\par}}
+ \eightrm#1~\ifpdf{\pdfnote#2.}\else#2\fi.\par}}
\newtoks\toksA \newtoks\toksB \newtoks\toksC \newtoks\toksD
\newtoks\toksE \newtoks\toksF \newtoks\usersanitizer
\newcount\countA \countA=0 \newcount\countB \countB=0
-\newcount\countC \countC=0
+\newcount\countC \countC=0 \newcount\countD \countD=0
\newif\iftokprocessed \newif\ifTnum \newif\ifinstr
{\def\\{\global\let\spacechar= }\\ }
-\ifacro % The following are pdf macros
+\ifpdf % The following are pdf macros
\def\thewidth{\the\wd0 \space}
\def\theheight{\the\ht\strutbox\space}
\def\thedepth{\the\dp\strutbox\space}
@@ -282,14 +278,14 @@
\def\makenote{\addtokens\toksB
{\noexpand\pdflink{\the\toksC}{\romannumeral\the\toksC}}\toksC={}\global\countC=0}
\def\maketoksdone{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
-\def\pdfURL#1#2{\ifpdftex\pdfannotlink height\ht\strutbox depth\dp\strutbox
- attr {/Border [0 0 0]} user {/Type /Action /Subtype /Link /A
- << /S /URI /URI (#2) >>}\PDFlinkcolor #1\Black \pdfendlink
- \else\ifpdf{\setbox0=\hbox{\special{pdf: bc [ \pdflinkcolor ]}{#1}%
- \special{pdf: ec}}\special{pdf: ann width \thewidth\space height \theheight
- \space depth \thedepth\space << /Border [0 0 0]
- /Type /Action /Subtype /Link /A << /S /URI /URI (#2) >> >>}\box0\relax}%
- \else #1 ({\tt#2})\fi\fi}
+\def\pdfURL#1#2{\ifpdf \ifpdftex\pdfannotlink height \theheight depth \thedepth
+ attr {/Border [0 0 0]} user { /Type /Annot /Subtype /Link /A
+ << /S /URI /URI (#2) >>}\Blue #1\Black \pdfendlink % changed in 3.69
+ \else {\setbox0=\hbox{\special{pdf: bc [ \pdflinkcolor ]}{#1}%
+ \special{pdf: ec}}\special{pdf: ann width \thewidth height \theheight
+ depth \thedepth << /Border [0 0 0] /Type /Annot /Subtype /Link /A
+ << /S /URI /URI (#2) >> >>}\box0\relax}\fi
+ \else #1 ({\tt#2})\fi}
{\catcode`\~=12 \gdef\TILDE/{~}} % ~ in a URL
{\catcode`\_=12 \gdef\UNDER/{_}} % _ in a URL
\def\sanitizecommand#1#2{\addtokens\usersanitizer
@@ -396,7 +392,7 @@
\def\stsec{\tenpoint\rightskip=0pt % get out of C mode (cf. \B)
\sfcode`;=1500 \pretolerance 200 \hyphenpenalty 50 \exhyphenpenalty 50
\noindent\strut{\let\*=\lapstar\bf\secno.\quad}%
- \ifacro \smash{\raise\baselineskip\hbox to0pt{\let\*=\empty
+ \ifpdf \smash{\raise\baselineskip\hbox to0pt{\let\*=\empty
\ifpdftex \pdfdest num \secstar fith%
\else \special{pdf: dest (\romannumeral\secstar)
[ @thispage /FitH @ypos ]}\fi}}\fi}
@@ -438,7 +434,7 @@
\outer\def\NN{\ifvoid\partialpage\leftfalse
\else\ifdim\ht\partialpage<\pageht \lefttrue\else\leftfalse\fi\fi\NNN}
\outer\def\NNN#1#2#3.{% beginning of starred section
- \ifacro{\toksF={}\makeoutlinetoks#3\outlinedone\outlinedone}\fi
+ \ifpdf{\toksF={}\makeoutlinetoks#3\outlinedone\outlinedone}\fi
\gdepth=#1\gtitle={#3}\def\secno{#2}\xdef\secstar{#2}
\ifleft \flushout
\gdef\rlhead{\let\i=I\uppercase{\ignorespaces#3}} % running left headline
@@ -448,7 +444,7 @@
\gdef\rrhead{\let\i=I\uppercase{\ignorespaces#3}}
\fi
\message{*\secno} % progress report
- \ifpdftex\def\stripprefix##1>{}\def\gtitletoks{#3}%
+ \ifpdf \ifpdftex\def\stripprefix##1>{}\def\gtitletoks{#3}%
\edef\gtitletoks{\expandafter\stripprefix\meaning\gtitletoks}%
{\immediate\write\cont{\ZZ{\gtitletoks}{#1}{\secno}% write to contents file
{\noexpand\the\pageno}{\the\toksE}}} % \ZZ{title}{depth}{sec}{page}{ss}
@@ -455,7 +451,7 @@
\expandafter\xdef\csname curr#1\endcsname{\secno}
\ifnum#1>0\countB=#1 \advance\countB by-1
\advancenumber{chunk\the\countB.\expnumber{curr\the\countB}}\fi
- \else\ifpdf\special{pdf: outline #1 << /Title (\the\toksE) /Dest
+ \else \special{pdf: outline #1 << /Title (\the\toksE) /Dest
[ @thispage /FitH @ypos ] >>}\fi\fi
\startsection{\bf\ignorespaces#3.\quad}\ignorespaces}
\def\expnumber#1{\expandafter\ifx\csname#1\endcsname\relax 0%
@@ -480,7 +476,7 @@
\let\W=\land % logical and
\def\X#1:#2\X{\ifmmode\gdef\XX{\null$\null}\else\gdef\XX{}\fi %$% section name
\XX$\langle\,${\let\I=\ne#2\sevenrm\kern.5em
- \ifacro{\pdfnote#1.}\else#1\fi}$\,\rangle$\XX}
+ \ifpdf{\pdfnote#1.}\else#1\fi}$\,\rangle$\XX}
\def\Y{\par\yskip}
\let\Z=\le
\let\ZZ=\let % now you can \write the control sequence \ZZ
@@ -612,7 +608,7 @@
{\obeylines\gdef\makeinref#1 #2 #3
{\ifsorted\else\ttoks={\[#1 #2 #3}\immediate\write\reffile{+ \the\ttoks}\fi %
\hangindent=1em \noindent #2\miniform#3, %<== space!
- \S\ifacro{\pdfnote#1.}\else{#1}\fi.\par}}
+ \S\ifpdf{\pdfnote#1.}\else{#1}\fi.\par}}
{\obeylines\gdef\makeoutref#1 #2 #3
{\ifsorted\else\ttoks={\]#1 #2 #3}\immediate\write\reffile{+ \the\ttoks}\fi %
\hangindent=1em \noindent #2\miniform#3, \extref#1.\par}}
@@ -652,8 +648,8 @@
%\global\advance\pageno by1}
%\def\topofcontents{\centerline{\titlefont\title}\vskip.7in
%\vfill} % this material will start the table of contents page
-%\def\startpdf{\ifpdftex\pdfcatalog{/PageMode /UseOutlines}\else
- %\ifpdf{\special{pdf: docview << /PageMode /UseOutlines >>}}\fi\fi}
+%\def\startpdf{\ifpdf \ifpdftex\pdfcatalog{/PageMode /UseOutlines}
+ %\else {\special{pdf: docview << /PageMode /UseOutlines >>}}\fi\fi}
%\def\botofcontents{\vfill
%\centerline{\covernote}} % this material will end the table of contents page
%\def\covernote{}
@@ -676,11 +672,12 @@
\immediate\write\cont{\catcode `\noexpand\@=12\relax} % \makeatother
\immediate\closeout\cont % the contents information has been fully gathered
\fi}
-\def\fin{\ifacro \message{Section names:}
+\def\fin{\ifpdf \message{Section names:}
\def\U##1.{} \def\Us##1.{} \let\I=\relax \let\*=*
\def\outsecname{Names of the sections}
- \ifpdftex \makebookmarks
- \pdfoutline goto num 1 count -\secno {\outsecname}
+ \ifpdftex \makebookmarks \countsections
+ \pdfdest name {NOS} fith
+ \pdfoutline goto name {NOS} count -\the\countD {\outsecname}
\def\X##1:##2\X{\firstsecno##1.%
{\toksF={}\makeoutlinetoks##2\outlinedone\outlinedone}%
\pdfoutline goto num \the\toksA \expandafter{\the\toksE}}
@@ -692,6 +689,10 @@
/A << /S /GoTo /D (\romannumeral\the\toksA) >> >>}}
\fi \readsections \fi}
\def\makebookmarks{\let\ZZ=\writebookmarkline \readcontents\relax}
+\def\countsections{\message{Number of named sections:}
+ {\def\I{\global\advance\countD by 1}\def\X##1\X{\relax}
+ \def\Q##1.{\relax}\def\Qs##1.{\relax}\def\U##1.{\relax}\def\Us##1.{\relax}
+ \readsections\relax}\message{\the\countD}}
\def\writebookmarkline#1#2#3#4#5{{%
\let\(=\let \let\)=\let \let\[=\let \let\]=\let \let\/=\let
\pdfoutline goto num #3 count -\expnumber{chunk#2.#3} {#5}}}
@@ -712,7 +713,7 @@
%\def\contentsline#1#2#3#4#5{\ifnum#2=0 \smallbreak\fi
%\line{\consetup{#2}#1
%\rm\leaders\hbox to .5em{.\hfil}\hfil
- %\ \ifacro\pdflink{#3}{\romannumeral#3}\else#3\fi\hbox to3em{\hss#4}}}
+ %\ \ifpdf\pdflink{#3}{\romannumeral#3}\else#3\fi\hbox to3em{\hss#4}}}
%\def\consetup#1{\ifcase#1 \bf % depth -1 (@**)
%\or % depth 0 (@*)
%\or \hskip2em % depth 1 (@*1)
Modified: branches/stable/source/src/texk/web2c/doc/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/doc/Makefile.in 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/doc/Makefile.in 2022-11-14 21:05:34 UTC (rev 884)
@@ -113,6 +113,7 @@
$(top_srcdir)/../../m4/kpse-macos-framework.m4 \
$(top_srcdir)/../../m4/kpse-mpfr-flags.m4 \
$(top_srcdir)/../../m4/kpse-pixman-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-potrace-flags.m4 \
$(top_srcdir)/../../m4/kpse-pplib-flags.m4 \
$(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \
$(top_srcdir)/../../m4/kpse-socket-libs.m4 \
@@ -362,6 +363,9 @@
PIXMAN_INCLUDES = @PIXMAN_INCLUDES@
PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
+POTRACE_DEPEND = @POTRACE_DEPEND@
+POTRACE_INCLUDES = @POTRACE_INCLUDES@
+POTRACE_LIBS = @POTRACE_LIBS@
PPLIB_DEPEND = @PPLIB_DEPEND@
PPLIB_INCLUDES = @PPLIB_INCLUDES@
PPLIB_LIBS = @PPLIB_LIBS@
Modified: branches/stable/source/src/texk/web2c/help.h
===================================================================
--- branches/stable/source/src/texk/web2c/help.h 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/help.h 2022-11-14 21:05:34 UTC (rev 884)
@@ -65,6 +65,7 @@
"-dN set 'kpathsea_debug' to N (0..127)",
"+k keep separators in numeric literals in the output",
"+s print usage statistics",
+ "+u transliterate UTF-8 characters in C code",
"--help display this help and exit",
"--version output version information and exit",
NULL
@@ -373,6 +374,7 @@
" Write bibliography for entries in AUXFILE to AUXFILE.bbl,",
" along with a log file AUXFILE.blg."
"",
+ "[-no]-guess-input-enc disable/enable to guess input file encoding",
"-kanji=STRING set Japanese encoding (STRING=euc|jis|sjis|utf8)",
"-min-crossrefs=NUMBER include item after NUMBER cross-refs; default 2",
"-terse do not print progress reports",
@@ -533,6 +535,7 @@
" Write bibliography for entries in AUXFILE to AUXFILE.bbl,",
" along with a log file AUXFILE.blg."
"",
+ "[-no]-guess-input-enc disable/enable to guess input file encoding",
"-kanji=STRING set Japanese encoding (STRING=euc|jis|sjis|utf8|uptex)",
"-kanji-internal=STRING set Japanese internal encoding (STRING=euc|uptex)",
"-min-crossrefs=NUMBER include item after NUMBER cross-refs; default 2",
Modified: branches/stable/source/src/texk/web2c/lib/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/lib/ChangeLog 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/lib/ChangeLog 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,3 +1,9 @@
+2022-06-12 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
+
+ * texmfmp.c:
+ Support guessing input file encodings for pTeX family.
+ https://github.com/texjporg/tex-jp-build/issues/142
+
2022-04-25 Karl Berry <karl at freefriends.org>
* texmfmp.c (find_input_file): doc fix.
Modified: branches/stable/source/src/texk/web2c/lib/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/lib/Makefile.in 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/lib/Makefile.in 2022-11-14 21:05:34 UTC (rev 884)
@@ -115,6 +115,7 @@
$(top_srcdir)/../../m4/kpse-macos-framework.m4 \
$(top_srcdir)/../../m4/kpse-mpfr-flags.m4 \
$(top_srcdir)/../../m4/kpse-pixman-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-potrace-flags.m4 \
$(top_srcdir)/../../m4/kpse-pplib-flags.m4 \
$(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \
$(top_srcdir)/../../m4/kpse-socket-libs.m4 \
@@ -366,6 +367,9 @@
PIXMAN_INCLUDES = @PIXMAN_INCLUDES@
PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
+POTRACE_DEPEND = @POTRACE_DEPEND@
+POTRACE_INCLUDES = @POTRACE_INCLUDES@
+POTRACE_LIBS = @POTRACE_LIBS@
PPLIB_DEPEND = @PPLIB_DEPEND@
PPLIB_INCLUDES = @PPLIB_INCLUDES@
PPLIB_LIBS = @PPLIB_LIBS@
Modified: branches/stable/source/src/texk/web2c/lib/texmfmp.c
===================================================================
--- branches/stable/source/src/texk/web2c/lib/texmfmp.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/lib/texmfmp.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -1836,10 +1836,8 @@
{ "no-mktex", 1, 0, 0 },
#endif /* TeX or MF */
#if IS_pTeX
-#ifdef WIN32
{ "guess-input-enc", 0, &infile_enc_auto, 1 },
{ "no-guess-input-enc", 0, &infile_enc_auto, 0 },
-#endif
{ "kanji", 1, 0, 0 },
{ "kanji-internal", 1, 0, 0 },
#endif /* IS_pTeX */
Modified: branches/stable/source/src/texk/web2c/man/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/man/Makefile.in 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/man/Makefile.in 2022-11-14 21:05:34 UTC (rev 884)
@@ -136,6 +136,7 @@
$(top_srcdir)/../../m4/kpse-macos-framework.m4 \
$(top_srcdir)/../../m4/kpse-mpfr-flags.m4 \
$(top_srcdir)/../../m4/kpse-pixman-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-potrace-flags.m4 \
$(top_srcdir)/../../m4/kpse-pplib-flags.m4 \
$(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \
$(top_srcdir)/../../m4/kpse-socket-libs.m4 \
@@ -346,6 +347,9 @@
PIXMAN_INCLUDES = @PIXMAN_INCLUDES@
PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
+POTRACE_DEPEND = @POTRACE_DEPEND@
+POTRACE_INCLUDES = @POTRACE_INCLUDES@
+POTRACE_LIBS = @POTRACE_LIBS@
PPLIB_DEPEND = @PPLIB_DEPEND@
PPLIB_INCLUDES = @PPLIB_INCLUDES@
PPLIB_LIBS = @PPLIB_LIBS@
Modified: branches/stable/source/src/texk/web2c/omegafonts/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/omegafonts/Makefile.in 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/omegafonts/Makefile.in 2022-11-14 21:05:34 UTC (rev 884)
@@ -118,6 +118,7 @@
$(top_srcdir)/../../m4/kpse-macos-framework.m4 \
$(top_srcdir)/../../m4/kpse-mpfr-flags.m4 \
$(top_srcdir)/../../m4/kpse-pixman-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-potrace-flags.m4 \
$(top_srcdir)/../../m4/kpse-pplib-flags.m4 \
$(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \
$(top_srcdir)/../../m4/kpse-socket-libs.m4 \
@@ -592,6 +593,9 @@
PIXMAN_INCLUDES = @PIXMAN_INCLUDES@
PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
+POTRACE_DEPEND = @POTRACE_DEPEND@
+POTRACE_INCLUDES = @POTRACE_INCLUDES@
+POTRACE_LIBS = @POTRACE_LIBS@
PPLIB_DEPEND = @PPLIB_DEPEND@
PPLIB_INCLUDES = @PPLIB_INCLUDES@
PPLIB_LIBS = @PPLIB_LIBS@
Modified: branches/stable/source/src/texk/web2c/otps/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/otps/Makefile.in 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/otps/Makefile.in 2022-11-14 21:05:34 UTC (rev 884)
@@ -118,6 +118,7 @@
$(top_srcdir)/../../m4/kpse-macos-framework.m4 \
$(top_srcdir)/../../m4/kpse-mpfr-flags.m4 \
$(top_srcdir)/../../m4/kpse-pixman-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-potrace-flags.m4 \
$(top_srcdir)/../../m4/kpse-pplib-flags.m4 \
$(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \
$(top_srcdir)/../../m4/kpse-socket-libs.m4 \
@@ -626,6 +627,9 @@
PIXMAN_INCLUDES = @PIXMAN_INCLUDES@
PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
+POTRACE_DEPEND = @POTRACE_DEPEND@
+POTRACE_INCLUDES = @POTRACE_INCLUDES@
+POTRACE_LIBS = @POTRACE_LIBS@
PPLIB_DEPEND = @PPLIB_DEPEND@
PPLIB_INCLUDES = @PPLIB_INCLUDES@
PPLIB_LIBS = @PPLIB_LIBS@
Modified: branches/stable/source/src/texk/web2c/otps/win32/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/otps/win32/Makefile.in 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/otps/win32/Makefile.in 2022-11-14 21:05:34 UTC (rev 884)
@@ -115,6 +115,7 @@
$(top_srcdir)/../../m4/kpse-macos-framework.m4 \
$(top_srcdir)/../../m4/kpse-mpfr-flags.m4 \
$(top_srcdir)/../../m4/kpse-pixman-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-potrace-flags.m4 \
$(top_srcdir)/../../m4/kpse-pplib-flags.m4 \
$(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \
$(top_srcdir)/../../m4/kpse-socket-libs.m4 \
@@ -345,6 +346,9 @@
PIXMAN_INCLUDES = @PIXMAN_INCLUDES@
PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
+POTRACE_DEPEND = @POTRACE_DEPEND@
+POTRACE_INCLUDES = @POTRACE_INCLUDES@
+POTRACE_LIBS = @POTRACE_LIBS@
PPLIB_DEPEND = @PPLIB_DEPEND@
PPLIB_INCLUDES = @PPLIB_INCLUDES@
PPLIB_LIBS = @PPLIB_LIBS@
Modified: branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,3 +1,10 @@
+2022-05-23 Thanh Han The <hanthethanh at gmail.com>
+
+ * writettf.c (ttf_write_OS2): don't complain about v4 of OS/2
+ table, present in GentiumPlus-Regular.ttf, v6.101,
+ released recently. Also, make the complaint about future versions
+ a warning instead of a failure.
+
2022-04-17 Thanh Han The <hanthethanh at gmail.com>
* pdftex.web (pdf_omit_info_dict_code),
Modified: branches/stable/source/src/texk/web2c/pdftexdir/writettf.c
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/writettf.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/pdftexdir/writettf.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,5 +1,5 @@
/*
-Copyright 1996-2014 Han The Thanh, <thanh at pdftex.org>
+Copyright 1996-2022 Han The Thanh, <thanh at pdftex.org>
This file is part of pdfTeX.
Modified: branches/stable/source/src/texk/web2c/synctexdir/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/synctexdir/ChangeLog 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/synctexdir/ChangeLog 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,3 +1,15 @@
+2022-08-30 Karl Berry <karl at freefriends.org>
+
+ * man1/synctex.1,
+ * man5/synctex.5: typo fixes from Hilmar Preu\ss{}e,
+ https://tug.org/pipermail/tex-live/2022-June/048227.html
+
+2022-05-31 Karl Berry <karl at freefriends.org>
+
+ * synctex.c (synctexterminate): insert missing \n
+ before ``SyncTeX written on "..." ...'' (quoted case).
+ Report from jerome.lelong, tex-k 31 May 2022 16:34:44.
+
2022-03-21 Karl Berry <karl at tug.org>
* TL'22 release.
Modified: branches/stable/source/src/texk/web2c/synctexdir/man1/synctex.1
===================================================================
--- branches/stable/source/src/texk/web2c/synctexdir/man1/synctex.1 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/synctexdir/man1/synctex.1 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,4 +1,4 @@
-.Dd 06/13/2018 \" DATE
+.Dd 08/30/2022 \" DATE
.Dt synctex 1 \" Program name and manual section number
.Sh NAME
.Nm synctex
@@ -8,7 +8,7 @@
\fIcommand\fP [\fIoptions\fP] [\fIargs\fP]
.Sh OVERVIEW
The Synchronization TeXnology is a feature of recent TeX engines.
-It allows to synchronize between input and output,
+It allows one to synchronize between input and output,
which means to navigate from the source document to the typeset material
and vice versa.
.Pp
@@ -41,6 +41,7 @@
The Synchronize TeXnology is essentially due to Jerome Laurens,
with useful suggestions by some well known actors of the TeX world.
.\" .Sh BUGS \" Document known, unremedied bugs
+SyncTeX is maintained as part of TeX Live.
.Sh HISTORY \" Document history if command behaves in a unique manner
Revised on Sun Apr 23 09:54:20 UTC 2017.
.\" nroff -man synctex.1 | less
Modified: branches/stable/source/src/texk/web2c/synctexdir/man5/synctex.5
===================================================================
--- branches/stable/source/src/texk/web2c/synctexdir/man5/synctex.5 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/synctexdir/man5/synctex.5 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,4 +1,4 @@
-.Dd Jan 17, 2018
+.Dd Aug 30, 2022
.Dt SYNCTEX 5
.Os "Independent"
.\"
@@ -312,7 +312,7 @@
.El
.Sh The post scriptum
The post scriptum contains material possibly added by 3rd parties.
-It allows to append some transformation (shift and magnify).
+It allows one to append some transformation (shift and magnify).
Typically, one applies a dvi to pdf filter with offset options and magnification,
then he appends the same options to the synctex file, for example
.Bd -literal -offset indent
@@ -362,6 +362,7 @@
The Synchronize TeXnology is essentially due to Jerome Laurens,
with useful suggestions by some well known actors of the TeX world.
.\" .Sh BUGS \" Document known, unremedied bugs
+SyncTeX is maintained as part of TeX Live.
.Sh HISTORY \" Document history if command behaves in a unique manner
This document has been updated on Sat Apr 22 09:57:20 UTC 2017 to include \\pdfxform support.
.\" nroff -man synctex.5 | less
Modified: branches/stable/source/src/texk/web2c/synctexdir/synctex.c
===================================================================
--- branches/stable/source/src/texk/web2c/synctexdir/synctex.c 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/synctexdir/synctex.c 2022-11-14 21:05:34 UTC (rev 884)
@@ -969,7 +969,7 @@
#ifdef W32UPTEXSYNCTEX
{
char *stmp = chgto_oem(tmp);
- printf((synctex_ctxt.flags.quoted ? "SyncTeX written on \"%s\"\n" : "\nSyncTeX written on %s.\n"),
+ printf((synctex_ctxt.flags.quoted ? "\nSyncTeX written on \"%s\"\n" : "\nSyncTeX written on %s.\n"),
stmp);
free(stmp);
}
Added: branches/stable/source/src/texk/web2c/tests/enc-amb0.bib
===================================================================
--- branches/stable/source/src/texk/web2c/tests/enc-amb0.bib (rev 0)
+++ branches/stable/source/src/texk/web2c/tests/enc-amb0.bib 2022-11-14 21:05:34 UTC (rev 884)
@@ -0,0 +1,13 @@
+% ambiguous: UTF-8 or EUC-JP
+ at Type{ambiguos-a001, field = {C2Ax: ¢£¥§¨¬}, }
+ at Type{ambiguos-a002, field = {C2Bx: °±¶÷}, }
+ at Type{ambiguos-a005, field = {CEAx: ΡΣΤΥΦΧΨΩ}, }
+ at Type{ambiguos-a006, field = {CEBx: αβγδεζηθικλμνξο}, }
+ at Type{ambiguos-a007, field = {D0Ax: СТУФХЦЧШЩЪЫЬЭЮЯ}, }
+ at Type{ambiguos-a008, field = {D0Bx: абвгдежзийклмноп}, }
+ at Type{ambiguos-a009, field = {佳人 大声 亡失 対価 幼女 帰任 信仰 伴侶 山岳 年俸 平常 延伸 鷲鷹}, }
+ at Type{ambiguos-a011, field = {F0A3B3BE: 𣳾}, }
+ at Type{ambiguos-a012, field = {F0A5B6A1: 𥶡}, }
+ at Type{ambiguos-a013, field = {F0A1B6B7: 𡶷}, }
+ at Type{ambiguos-a020, field = {ξΩ ΥΦ ®ã ŷЧ Сб άå º°}, }
+
Property changes on: branches/stable/source/src/texk/web2c/tests/enc-amb0.bib
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/stable/source/src/texk/web2c/tests/enc-amb1.bib
===================================================================
--- branches/stable/source/src/texk/web2c/tests/enc-amb1.bib (rev 0)
+++ branches/stable/source/src/texk/web2c/tests/enc-amb1.bib 2022-11-14 21:05:34 UTC (rev 884)
@@ -0,0 +1,5 @@
+% ambiguous: UTF-8 or Shift_JIS
+ at Type{ambiguos-a050, field = {係q体y}, }
+ at Type{ambiguos-a051, field = {語①誚②}, }
+ at Type{ambiguos-a052, field = {思想 打球 明文 垂直 怜悧}, }
+
Property changes on: branches/stable/source/src/texk/web2c/tests/enc-amb1.bib
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/stable/source/src/texk/web2c/tests/enc-amb2.bib
===================================================================
--- branches/stable/source/src/texk/web2c/tests/enc-amb2.bib (rev 0)
+++ branches/stable/source/src/texk/web2c/tests/enc-amb2.bib 2022-11-14 21:05:34 UTC (rev 884)
@@ -0,0 +1,13 @@
+% ambiguous: EUC-JP or Shift_JIS
+ at Type{ambiguos-a100, field = {E0Ax: \xE0\xA1\xE0\xA2\xE0\xA3\xE0\xA4\xE0\xA5\xE0\xA6\xE0\xA7\xE0\xA8\xE0\xA9\xE0\xAA\xE0\xAB\xE0\xAC\xE0\xAD\xE0\xAE\xE0\xAF}, }
+ at Type{ambiguos-a101, field = {E2Ax: \xE2\xA1\xE2\xA2\xE2\xA3\xE2\xA4\xE2\xA5\xE2\xA6\xE2\xA7\xE2\xA8\xE2\xA9\xE2\xAA\xE2\xAB\xE2\xAC\xE2\xAD\xE2\xAE\xE2\xAF}, }
+ at Type{ambiguos-a102, field = {E4Ax: \xE4\xA1\xE4\xA2\xE4\xA3\xE4\xA4\xE4\xA5\xE4\xA6\xE4\xA7\xE4\xA8\xE4\xA9\xE4\xAA\xE4\xAB\xE4\xAC\xE4\xAD\xE4\xAE\xE4\xAF}, }
+ at Type{ambiguos-a103, field = {E6Ax: \xE6\xA1\xE6\xA2\xE6\xA3\xE6\xA4\xE6\xA5\xE6\xA6\xE6\xA7\xE6\xA8\xE6\xA9\xE6\xAA\xE6\xAB\xE6\xAC\xE6\xAD\xE6\xAE\xE6\xAF}, }
+ at Type{ambiguos-a104, field = {E8Ax: \xE8\xA1\xE8\xA2\xE8\xA3\xE8\xA4\xE8\xA5\xE8\xA6\xE8\xA7\xE8\xA8\xE8\xA9\xE8\xAA\xE8\xAB\xE8\xAC\xE8\xAD\xE8\xAE\xE8\xAF}, }
+ at Type{ambiguos-a105, field = {EAAx: \xEA\xA1\xEA\xA2\xEA\xA3\xEA\xA4}, }
+ at Type{ambiguos-a106, field = {coffee: \xE0\xDD\xE0\xEA \xE0\xDB\xE0\xE8}, }
+ at Type{ambiguos-a107, field = {amber: \xE0\xE8\xE0\xE1 \xE0\xE6\xE0\xDF}, }
+ at Type{ambiguos-a108, field = {dotage: \xE6\xCE\xE2\xF1 \xE3\xCC\xE1\xEF}, }
+ at Type{ambiguos-a109, field = {konjak: \xE8\xE7\xE8\xEA \xE4\xE5\xE4\xE8}, }
+ at Type{ambiguos-a110, field = {rampant: \xE0\xCB\xE0\xD5 \xE0\xC9\xE0\xD3}, }
+
Property changes on: branches/stable/source/src/texk/web2c/tests/enc-amb2.bib
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/stable/source/src/texk/web2c/tests/enc-asc.bib
===================================================================
--- branches/stable/source/src/texk/web2c/tests/enc-asc.bib (rev 0)
+++ branches/stable/source/src/texk/web2c/tests/enc-asc.bib 2022-11-14 21:05:34 UTC (rev 884)
@@ -0,0 +1 @@
+ at Type{ascii-a001, field = {ABC xyz}, }
Property changes on: branches/stable/source/src/texk/web2c/tests/enc-asc.bib
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/stable/source/src/texk/web2c/tests/enc-ep.bbl
===================================================================
--- branches/stable/source/src/texk/web2c/tests/enc-ep.bbl (rev 0)
+++ branches/stable/source/src/texk/web2c/tests/enc-ep.bbl 2022-11-14 21:05:34 UTC (rev 884)
@@ -0,0 +1,53 @@
+\section*{Test result}
+\begin{itemize}
+\item ABC xyz
+\item ABC xyz
+\item ABC xyz
+\item ABC xyz
+\item ABC xyz
+\item ABC xyz
+\item C2Ax: \xA1\xF1\xA1\xF2\xA1\xEF\xA1\xF8\xA1\xAF\xA2\xCC
+\item C2Ax: ¢£¥§¨¬
+\item C2Bx: °±¶÷
+\item CEAx: ΡΣΤΥΦΧΨΩ
+\item CEBx: \xA6\xC1\xA6¦æĦŦƦǦȦɦʦ˦̦ͦΦ\xCF
+\item CEBx: αβγδεζηθικλμνξο
+\item D0Ax: СТУФХЦЧШЩЪЫЬЭЮЯ
+\item D0Bx: \xA7ѧҧӧԧէ֧ا٧ڧۧܧݧާߧ\xE0\xA7\xE1
+\item D0Bx: абвгдежзийклмноп
+\item E0Ax: \xE0\xA1\xE0\xA2\xE0\xA3\xE0\xA4\xE0\xA5\xE0\xA6\xE0\xA7\xE0\xA8\xE0\xA9\xE0\xAA\xE0\xAB\xE0\xAC\xE0\xAD\xE0\xAE\xE0\xAF
+\item E2Ax: \xE2\xA1\xE2\xA2\xE2\xA3\xE2\xA4\xE2\xA5\xE2\xA6\xE2\xA7\xE2\xA8\xE2\xA9\xE2\xAA\xE2\xAB\xE2\xAC\xE2\xAD\xE2\xAE\xE2\xAF
+\item E4Ax: \xE4\xA1\xE4\xA2\xE4\xA3\xE4\xA4\xE4\xA5\xE4\xA6\xE4\xA7\xE4\xA8\xE4\xA9\xE4\xAA\xE4\xAB\xE4\xAC\xE4\xAD\xE4\xAE\xE4\xAF
+\item E6Ax: \xE6\xA1\xE6\xA2\xE6\xA3\xE6\xA4\xE6\xA5\xE6\xA6\xE6\xA7\xE6\xA8\xE6\xA9\xE6\xAA\xE6\xAB\xE6\xAC\xE6\xAD\xE6\xAE\xE6\xAF
+\item E8Ax: \xE8\xA1\xE8\xA2\xE8\xA3\xE8\xA4\xE8\xA5\xE8\xA6\xE8\xA7\xE8\xA8\xE8\xA9\xE8\xAA\xE8\xAB\xE8\xAC\xE8\xAD\xE8\xAE\xE8\xAF
+\item EAAx: \xEA\xA1\xEA\xA2\xEA\xA3\xEA\xA4
+\item F0A1B6B7: 𡶷
+\item F0A3B3BE: 𣳾
+\item F0A5B6A1: 𥶡
+\item amber: \xE0\xE8\xE0\xE1 \xE0\xE6\xE0\xDF
+\item coffee: \xE0\xDD\xE0\xEA \xE0\xDB\xE0\xE8
+\item dotage: \xE6\xCE\xE2\xF1 \xE3\xCC\xE1\xEF
+\item konjak: \xE8\xE7\xE8\xEA \xE4\xE5\xE4\xE8
+\item rampant: \xE0\xCB\xE0\xD5 \xE0\xC9\xE0\xD3
+\item \xA4\xA2\xA4\xA4\xA4\xA6\xA4\xA8\xA4\xAA
+\item \xA4\xA2\xA4\xA4\xA4\xA6\xA4\xA8\xA4\xAA
+\item \xA4\xA2\xA4\xA4\xA4\xA6\xA4\xA8\xA4\xAA
+\item \xA4\xA2\xA4\xA4\xA4\xA6\xA4\xA8\xA4\xAA
+\item \xA6\xA1\xA6\xA2\xA6\xA3 \xA6֦צ\xD8
+\item \xA6\xA1\xA6\xA2\xA6\xA3 \xA6֦צ\xD8
+\item \xA6\xA1\xA6\xA2\xA6\xA3 \xA6֦צ\xD8
+\item \xA6\xA1\xA6\xA2\xA6\xA3 \xA6֦צ\xD8
+\item \xA7\xA1\xA7\xA2\xA7\xA3 \xA7\xEF\xA7\xF0\xA7\xF1
+\item \xA7\xA1\xA7\xA2\xA7\xA3 \xA7\xEF\xA7\xF0\xA7\xF1
+\item \xA7\xA1\xA7\xA2\xA7\xA3 \xA7\xEF\xA7\xF0\xA7\xF1
+\item \xA7\xA1\xA7\xA2\xA7\xA3 \xA7\xEF\xA7\xF0\xA7\xF1
+\item \xB0\xEC\xC6\xDE
+\item \xB0\xEC\xC6\xDE
+\item \xB0\xEC\xC6\xDE
+\item \xB0\xEC\xC6\xDE
+\item \xB2¿\xCD \xC2\xE7\xC0\xBC ˴\xBC\xBA \xC2в\xC1 \xCDĽ\xF7 \xB5\xA2Ǥ \xBF\xAE\xB6\xC4 ȼη \xBB\xB3\xB3\xD9 ǯ\xCA\xF0 ʿ\xBE\xEF \xB1俭 \xCF\xC9\xC2\xEB
+\item ξΩ ΥΦ ®ã ŷЧ Сб άå º°
+\item
+ 佳人 大声 亡失 対価 幼女 帰任 信仰 伴侶 山岳 年俸 平常 延伸 鷲鷹
+\end{itemize}
+\endinput
Property changes on: branches/stable/source/src/texk/web2c/tests/enc-ep.bbl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/stable/source/src/texk/web2c/tests/enc-eu.bbl
===================================================================
--- branches/stable/source/src/texk/web2c/tests/enc-eu.bbl (rev 0)
+++ branches/stable/source/src/texk/web2c/tests/enc-eu.bbl 2022-11-14 21:05:34 UTC (rev 884)
@@ -0,0 +1,54 @@
+\section*{Test result}
+\begin{itemize}
+\item ABC xyz
+\item ABC xyz
+\item ABC xyz
+\item ABC xyz
+\item ABC xyz
+\item ABC xyz
+\item C2Ax: \xA1\xF1\xA1\xF2\xA1\xEF\xA1\xF8\xA1\xAF\xA2\xCC
+\item C2Ax: ¢£¥§¨¬
+\item C2Bx: °±¶÷
+\item CEAx: ΡΣΤΥΦΧΨΩ
+\item CEBx: \xA6\xC1\xA6¦æĦŦƦǦȦɦʦ˦̦ͦΦ\xCF
+\item CEBx: αβγδεζηθικλμνξο
+\item D0Ax: СТУФХЦЧШЩЪЫЬЭЮЯ
+\item D0Bx: \xA7ѧҧӧԧէ֧ا٧ڧۧܧݧާߧ\xE0\xA7\xE1
+\item D0Bx: абвгдежзийклмноп
+\item E0Ax: \xE0\xA1\xE0\xA2\xE0\xA3\xE0\xA4\xE0\xA5\xE0\xA6\xE0\xA7\xE0\xA8\xE0\xA9\xE0\xAA\xE0\xAB\xE0\xAC\xE0\xAD\xE0\xAE\xE0\xAF
+\item E2Ax: \xE2\xA1\xE2\xA2\xE2\xA3\xE2\xA4\xE2\xA5\xE2\xA6\xE2\xA7\xE2\xA8\xE2\xA9\xE2\xAA\xE2\xAB\xE2\xAC\xE2\xAD\xE2\xAE\xE2\xAF
+\item E4Ax: \xE4\xA1\xE4\xA2\xE4\xA3\xE4\xA4\xE4\xA5\xE4\xA6\xE4\xA7\xE4\xA8\xE4\xA9\xE4\xAA\xE4\xAB\xE4\xAC\xE4\xAD\xE4\xAE\xE4\xAF
+\item E6Ax: \xE6\xA1\xE6\xA2\xE6\xA3\xE6\xA4\xE6\xA5\xE6\xA6\xE6\xA7\xE6\xA8\xE6\xA9\xE6\xAA\xE6\xAB\xE6\xAC\xE6\xAD\xE6\xAE\xE6\xAF
+\item E8Ax: \xE8\xA1\xE8\xA2\xE8\xA3\xE8\xA4\xE8\xA5\xE8\xA6\xE8\xA7\xE8\xA8\xE8\xA9\xE8\xAA\xE8\xAB\xE8\xAC\xE8\xAD\xE8\xAE\xE8\xAF
+\item EAAx: \xEA\xA1\xEA\xA2\xEA\xA3\xEA\xA4
+\item F0A1B6B7: 𡶷
+\item F0A3B3BE: 𣳾
+\item F0A5B6A1: 𥶡
+\item amber: \xE0\xE8\xE0\xE1 \xE0\xE6\xE0\xDF
+\item coffee: \xE0\xDD\xE0\xEA \xE0\xDB\xE0\xE8
+\item dotage: \xE6\xCE\xE2\xF1 \xE3\xCC\xE1\xEF
+\item konjak: \xE8\xE7\xE8\xEA \xE4\xE5\xE4\xE8
+\item rampant: \xE0\xCB\xE0\xD5 \xE0\xC9\xE0\xD3
+\item \xA6\xA1\xA6\xA2\xA6\xA3 \xA6֦צ\xD8
+\item \xA6\xA1\xA6\xA2\xA6\xA3 \xA6֦צ\xD8
+\item \xA6\xA1\xA6\xA2\xA6\xA3 \xA6֦צ\xD8
+\item \xA6\xA1\xA6\xA2\xA6\xA3 \xA6֦צ\xD8
+\item \xA7\xA1\xA7\xA2\xA7\xA3 \xA7\xEF\xA7\xF0\xA7\xF1
+\item \xA7\xA1\xA7\xA2\xA7\xA3 \xA7\xEF\xA7\xF0\xA7\xF1
+\item \xA7\xA1\xA7\xA2\xA7\xA3 \xA7\xEF\xA7\xF0\xA7\xF1
+\item \xA7\xA1\xA7\xA2\xA7\xA3 \xA7\xEF\xA7\xF0\xA7\xF1
+\item \xA4\xA2\xA4\xA4\xA4\xA6\xA4\xA8\xA4\xAA
+\item \xA4\xA2\xA4\xA4\xA4\xA6\xA4\xA8\xA4\xAA
+\item \xA4\xA2\xA4\xA4\xA4\xA6\xA4\xA8\xA4\xAA
+\item \xA4\xA2\xA4\xA4\xA4\xA6\xA4\xA8\xA4\xAA
+\item \xB0\xEC\xC6\xDE
+\item \xB0\xEC\xC6\xDE
+\item \xB0\xEC\xC6\xDE
+\item \xB0\xEC\xC6\xDE
+\item ξΩ ΥΦ ®ã ŷЧ Сб άå º°
+\item
+ \xB2¿\xCD \xC2\xE7\xC0\xBC ˴\xBC\xBA \xC2в\xC1 \xCDĽ\xF7 \xB5\xA2Ǥ \xBF\xAE\xB6\xC4 ȼη \xBB\xB3\xB3\xD9 ǯ\xCA\xF0 ʿ\xBE\xEF \xB1俭 \xCF\xC9\xC2\xEB
+\item
+ 佳人 大声 亡失 対価 幼女 帰任 信仰 伴侶 山岳 年俸 平常 延伸 鷲鷹
+\end{itemize}
+\endinput
Property changes on: branches/stable/source/src/texk/web2c/tests/enc-eu.bbl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/stable/source/src/texk/web2c/tests/enc-euc.bib
===================================================================
--- branches/stable/source/src/texk/web2c/tests/enc-euc.bib (rev 0)
+++ branches/stable/source/src/texk/web2c/tests/enc-euc.bib 2022-11-14 21:05:34 UTC (rev 884)
@@ -0,0 +1,5 @@
+ at Type{ascii-e001, field = {ABC xyz}, }
+ at Type{greek-e001, field = {\xA6\xA1\xA6\xA2\xA6\xA3 \xA6֦צ\xD8}, }
+ at Type{cyrillic-e001, field = {\xA7\xA1\xA7\xA2\xA7\xA3 \xA7\xEF\xA7\xF0\xA7\xF1}, }
+ at Type{kana-e001, field = {\xA4\xA2\xA4\xA4\xA4\xA6\xA4\xA8\xA4\xAA}, }
+ at Type{hanzi-e001, field = {\xB0\xEC\xC6\xDE}, }
Property changes on: branches/stable/source/src/texk/web2c/tests/enc-euc.bib
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/stable/source/src/texk/web2c/tests/enc-jis.bib
===================================================================
--- branches/stable/source/src/texk/web2c/tests/enc-jis.bib (rev 0)
+++ branches/stable/source/src/texk/web2c/tests/enc-jis.bib 2022-11-14 21:05:34 UTC (rev 884)
@@ -0,0 +1,5 @@
+ at Type{ascii-j001, field = {ABC xyz}, }
+ at Type{greek-j001, field = {$B&!&"&#(B $B&V&W&X(B}, }
+ at Type{cyrillic-j001, field = {$B'!'"'#(B $B'o'p'q(B}, }
+ at Type{kana-j001, field = {$B$"$$$&$($*(B}, }
+ at Type{hanzi-j001, field = {$B0lFs;0;M8^(B}, }
Property changes on: branches/stable/source/src/texk/web2c/tests/enc-jis.bib
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/stable/source/src/texk/web2c/tests/enc-p.bbl
===================================================================
--- branches/stable/source/src/texk/web2c/tests/enc-p.bbl (rev 0)
+++ branches/stable/source/src/texk/web2c/tests/enc-p.bbl 2022-11-14 21:05:34 UTC (rev 884)
@@ -0,0 +1,64 @@
+\section*{Test result}
+\begin{itemize}
+\item ABC xyz
+\item ABC xyz
+\item ABC xyz
+\item ABC xyz
+\item ABC xyz
+\item ABC xyz
+\item ABC xyz
+\item C2Ax: ￠￡￥§¨￢
+\item C2Ax: ￠￡￥§¨￢
+\item C2Bx: °±¶÷
+\item CEAx: ΡΣΤΥΦΧΨΩ
+\item CEBx: αβγδεζηθικλμνξο
+\item CEBx: αβγδεζηθικλμνξο
+\item D0Ax: СТУФХЦЧШЩЪЫЬЭЮЯ
+\item D0Bx: абвгдежзийклмноп
+\item D0Bx: абвгдежзийклмноп
+\item E0Ax:
+ ^^e0^^a1^^e0^^a2^^e0^^a3^^e0^^a4^^e0^^a5^^e0^^a6^^e0^^a7^^e0^^a8^^e0^^a9^^e0^^aa^^e0^^ab^^e0^^ac^^e0^^ad^^e0^^ae^^e0^^af
+\item E2Ax:
+ ^^e2^^a1^^e2^^a2^^e2^^a3^^e2^^a4^^e2^^a5^^e2^^a6^^e2^^a7^^e2^^a8^^e2^^a9^^e2^^aa^^e2^^ab^^e2^^ac^^e2^^ad^^e2^^ae^^e2^^af
+\item E4Ax:
+ ^^e4^^a1^^e4^^a2^^e4^^a3^^e4^^a4^^e4^^a5^^e4^^a6^^e4^^a7^^e4^^a8^^e4^^a9^^e4^^aa^^e4^^ab^^e4^^ac^^e4^^ad^^e4^^ae^^e4^^af
+\item E6Ax:
+ ^^e6^^a1^^e6^^a2^^e6^^a3^^e6^^a4^^e6^^a5^^e6^^a6^^e6^^a7^^e6^^a8^^e6^^a9^^e6^^aa^^e6^^ab^^e6^^ac^^e6^^ad^^e6^^ae^^e6^^af
+\item E8Ax:
+ ^^e8^^a1^^e8^^a2^^e8^^a3^^e8^^a4^^e8^^a5^^e8^^a6^^e8^^a7^^e8^^a8^^e8^^a9^^e8^^aa^^e8^^ab^^e8^^ac^^e8^^ad^^e8^^ae^^e8^^af
+\item EAAx: ^^ea^^a1^^ea^^a2^^ea^^a3^^ea^^a4
+\item F0A1B6B7: ^^f0^^a1^^b6^^b7
+\item F0A3B3BE: ^^f0^^a3^^b3^^be
+\item F0A5B6A1: ^^f0^^a5^^b6^^a1
+\item amber: ^^e0^^e8^^e0^^e1 ^^e0^^e6^^e0^^df
+\item coffee: ^^e0^^dd^^e0^^ea ^^e0^^db^^e0^^e8
+\item dotage: ^^e6^^ce^^e2^^f1 ^^e3^^cc^^e1^^ef
+\item konjak: ^^e8^^e7^^e8^^ea ^^e4^^e5^^e4^^e8
+\item rampant: ^^e0^^cb^^e0^^d5 ^^e0^^c9^^e0^^d3
+\item あいうえお
+\item あいうえお
+\item あいうえお
+\item あいうえお
+\item ΑΒΓ χψω
+\item ΑΒΓ χψω
+\item ΑΒΓ χψω
+\item ΑΒΓ χψω
+\item ξΩ ΥΦ ^^c2^^ae^^c3^^a3 ^^c5^^b7Ч Сб ^^ce^^ac^^c3^^a5 ^^c2^^ba°
+\item АБВ эюя
+\item АБВ эюя
+\item АБВ эюя
+\item АБВ эюя
+\item 一二三四五
+\item 一二三四五
+\item 一二三四五
+\item 一二三四五
+\item 佳人 大声 亡失 対価 幼女 帰任 信仰 伴侶 山岳 年俸 平常 延伸 鷲鷹
+\item 佳人 大声 亡失 対価 幼女 帰任 信仰 伴侶 山岳 年俸 平常 延伸 鷲鷹
+\item 係q体y
+\item 係q体y
+\item 語^^e2^^91^^a0誚^^e2^^91^^a1
+\item 語^^e2^^91^^a0誚^^e2^^91^^a1
+\item 思想 打球 明文 垂直 怜悧
+\item 思想 打球 明文 垂直 怜悧
+\end{itemize}
+\endinput
Property changes on: branches/stable/source/src/texk/web2c/tests/enc-p.bbl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/stable/source/src/texk/web2c/tests/enc-sjis.bib
===================================================================
--- branches/stable/source/src/texk/web2c/tests/enc-sjis.bib (rev 0)
+++ branches/stable/source/src/texk/web2c/tests/enc-sjis.bib 2022-11-14 21:05:34 UTC (rev 884)
@@ -0,0 +1,5 @@
+ at Type{ascii-s001, field = {ABC xyz}, }
+ at Type{greek-s001, field = {\x83\x9F\x83\xA0\x83\xA1 \x83ԃՃ\xD6}, }
+ at Type{cyrillic-s001, field = {\x84@\x84A\x84B \x84\x8F\x84\x90\x84\x91}, }
+ at Type{kana-s001, field = {\x82\xA0\x82\xA2\x82\xA4\x82\xA6\x82\xA8}, }
+ at Type{hanzi-s001, field = {\x88\xEA\x93\xF1\x8EO\x8El\x8C\xDC}, }
Property changes on: branches/stable/source/src/texk/web2c/tests/enc-sjis.bib
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/stable/source/src/texk/web2c/tests/enc-sp.bbl
===================================================================
--- branches/stable/source/src/texk/web2c/tests/enc-sp.bbl (rev 0)
+++ branches/stable/source/src/texk/web2c/tests/enc-sp.bbl 2022-11-14 21:05:34 UTC (rev 884)
@@ -0,0 +1,43 @@
+\section*{Test result}
+\begin{itemize}
+\item ABC xyz
+\item ABC xyz
+\item ABC xyz
+\item ABC xyz
+\item ABC xyz
+\item ABC xyz
+\item E0Ax: \xE0\xA1\xE0\xA2\xE0\xA3\xE0\xA4\xE0\xA5\xE0\xA6\xE0\xA7\xE0\xA8\xE0\xA9\xE0\xAA\xE0\xAB\xE0\xAC\xE0\xAD\xE0\xAE\xE0\xAF
+\item E2Ax: \xE2\xA1\xE2\xA2\xE2\xA3\xE2\xA4\xE2\xA5\xE2\xA6\xE2\xA7\xE2\xA8\xE2\xA9\xE2\xAA\xE2\xAB\xE2\xAC\xE2\xAD\xE2\xAE\xE2\xAF
+\item E4Ax: \xE4\xA1\xE4\xA2\xE4\xA3\xE4\xA4\xE4\xA5\xE4\xA6\xE4\xA7\xE4\xA8\xE4\xA9\xE4\xAA\xE4\xAB\xE4\xAC\xE4\xAD\xE4\xAE\xE4\xAF
+\item E6Ax: \xE6\xA1\xE6\xA2\xE6\xA3\xE6\xA4\xE6\xA5\xE6\xA6\xE6\xA7\xE6\xA8\xE6\xA9\xE6\xAA\xE6\xAB\xE6\xAC\xE6\xAD\xE6\xAE\xE6\xAF
+\item E8Ax: \xE8\xA1\xE8\xA2\xE8\xA3\xE8\xA4\xE8\xA5\xE8\xA6\xE8\xA7\xE8\xA8\xE8\xA9\xE8\xAA\xE8\xAB\xE8\xAC\xE8\xAD\xE8\xAE\xE8\xAF
+\item EAAx: \xEA\xA1\xEA\xA2\xEA\xA3\xEA\xA4
+\item amber: \xE0\xE8\xE0\xE1 \xE0\xE6\xE0\xDF
+\item coffee: \xE0\xDD\xE0\xEA \xE0\xDB\xE0\xE8
+\item dotage: \xE6\xCE\xE2\xF1 \xE3\xCC\xE1\xEF
+\item konjak: \xE8\xE7\xE8\xEA \xE4\xE5\xE4\xE8
+\item rampant: \xE0\xCB\xE0\xD5 \xE0\xC9\xE0\xD3
+\item \x82\xA0\x82\xA2\x82\xA4\x82\xA6\x82\xA8
+\item \x82\xA0\x82\xA2\x82\xA4\x82\xA6\x82\xA8
+\item \x82\xA0\x82\xA2\x82\xA4\x82\xA6\x82\xA8
+\item \x82\xA0\x82\xA2\x82\xA4\x82\xA6\x82\xA8
+\item \x83\x9F\x83\xA0\x83\xA1 \x83ԃՃ\xD6
+\item \x83\x9F\x83\xA0\x83\xA1 \x83ԃՃ\xD6
+\item \x83\x9F\x83\xA0\x83\xA1 \x83ԃՃ\xD6
+\item \x83\x9F\x83\xA0\x83\xA1 \x83ԃՃ\xD6
+\item \x84@\x84A\x84B \x84\x8F\x84\x90\x84\x91
+\item \x84@\x84A\x84B \x84\x8F\x84\x90\x84\x91
+\item \x84@\x84A\x84B \x84\x8F\x84\x90\x84\x91
+\item \x84@\x84A\x84B \x84\x8F\x84\x90\x84\x91
+\item \x88\xEA\x93\xF1\x8EO\x8El\x8C\xDC
+\item \x88\xEA\x93\xF1\x8EO\x8El\x8C\xDC
+\item \x88\xEA\x93\xF1\x8EO\x8El\x8C\xDC
+\item \x88\xEA\x93\xF1\x8EO\x8El\x8C\xDC
+\item \x8CWq\x91\xCCy
+\item \x8C\xEA^^e2^^91^^a0\xE6v^^e2^^91^^a1
+\item \x8Ev\x91z \x91ŋ\x85 \x96\xBE\x95\xB6 \x90\x82\x92\xBC \x97圤
+\item 係q体y
+\item 思想 打球 明文 垂直 怜悧
+\item 語①誚②
+\end{itemize}
+\endinput
Property changes on: branches/stable/source/src/texk/web2c/tests/enc-sp.bbl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/stable/source/src/texk/web2c/tests/enc-su.bbl
===================================================================
--- branches/stable/source/src/texk/web2c/tests/enc-su.bbl (rev 0)
+++ branches/stable/source/src/texk/web2c/tests/enc-su.bbl 2022-11-14 21:05:34 UTC (rev 884)
@@ -0,0 +1,43 @@
+\section*{Test result}
+\begin{itemize}
+\item ABC xyz
+\item ABC xyz
+\item ABC xyz
+\item ABC xyz
+\item ABC xyz
+\item ABC xyz
+\item E0Ax: \xE0\xA1\xE0\xA2\xE0\xA3\xE0\xA4\xE0\xA5\xE0\xA6\xE0\xA7\xE0\xA8\xE0\xA9\xE0\xAA\xE0\xAB\xE0\xAC\xE0\xAD\xE0\xAE\xE0\xAF
+\item E2Ax: \xE2\xA1\xE2\xA2\xE2\xA3\xE2\xA4\xE2\xA5\xE2\xA6\xE2\xA7\xE2\xA8\xE2\xA9\xE2\xAA\xE2\xAB\xE2\xAC\xE2\xAD\xE2\xAE\xE2\xAF
+\item E4Ax: \xE4\xA1\xE4\xA2\xE4\xA3\xE4\xA4\xE4\xA5\xE4\xA6\xE4\xA7\xE4\xA8\xE4\xA9\xE4\xAA\xE4\xAB\xE4\xAC\xE4\xAD\xE4\xAE\xE4\xAF
+\item E6Ax: \xE6\xA1\xE6\xA2\xE6\xA3\xE6\xA4\xE6\xA5\xE6\xA6\xE6\xA7\xE6\xA8\xE6\xA9\xE6\xAA\xE6\xAB\xE6\xAC\xE6\xAD\xE6\xAE\xE6\xAF
+\item E8Ax: \xE8\xA1\xE8\xA2\xE8\xA3\xE8\xA4\xE8\xA5\xE8\xA6\xE8\xA7\xE8\xA8\xE8\xA9\xE8\xAA\xE8\xAB\xE8\xAC\xE8\xAD\xE8\xAE\xE8\xAF
+\item EAAx: \xEA\xA1\xEA\xA2\xEA\xA3\xEA\xA4
+\item amber: \xE0\xE8\xE0\xE1 \xE0\xE6\xE0\xDF
+\item coffee: \xE0\xDD\xE0\xEA \xE0\xDB\xE0\xE8
+\item dotage: \xE6\xCE\xE2\xF1 \xE3\xCC\xE1\xEF
+\item konjak: \xE8\xE7\xE8\xEA \xE4\xE5\xE4\xE8
+\item rampant: \xE0\xCB\xE0\xD5 \xE0\xC9\xE0\xD3
+\item \x83\x9F\x83\xA0\x83\xA1 \x83ԃՃ\xD6
+\item \x83\x9F\x83\xA0\x83\xA1 \x83ԃՃ\xD6
+\item \x83\x9F\x83\xA0\x83\xA1 \x83ԃՃ\xD6
+\item \x83\x9F\x83\xA0\x83\xA1 \x83ԃՃ\xD6
+\item \x84@\x84A\x84B \x84\x8F\x84\x90\x84\x91
+\item \x84@\x84A\x84B \x84\x8F\x84\x90\x84\x91
+\item \x84@\x84A\x84B \x84\x8F\x84\x90\x84\x91
+\item \x84@\x84A\x84B \x84\x8F\x84\x90\x84\x91
+\item \x82\xA0\x82\xA2\x82\xA4\x82\xA6\x82\xA8
+\item \x82\xA0\x82\xA2\x82\xA4\x82\xA6\x82\xA8
+\item \x82\xA0\x82\xA2\x82\xA4\x82\xA6\x82\xA8
+\item \x82\xA0\x82\xA2\x82\xA4\x82\xA6\x82\xA8
+\item \x88\xEA\x93\xF1\x8EO\x8El\x8C\xDC
+\item \x88\xEA\x93\xF1\x8EO\x8El\x8C\xDC
+\item \x88\xEA\x93\xF1\x8EO\x8El\x8C\xDC
+\item \x88\xEA\x93\xF1\x8EO\x8El\x8C\xDC
+\item \x8CWq\x91\xCCy
+\item \x8Ev\x91z \x91ŋ\x85 \x96\xBE\x95\xB6 \x90\x82\x92\xBC \x97圤
+\item 係q体y
+\item \x8C\xEA \xE6v
+\item 思想 打球 明文 垂直 怜悧
+\item 語①誚②
+\end{itemize}
+\endinput
Property changes on: branches/stable/source/src/texk/web2c/tests/enc-su.bbl
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: branches/stable/source/src/texk/web2c/tests/enc-u.bbl
===================================================================
--- branches/stable/source/src/texk/web2c/tests/enc-u.bbl (rev 0)
+++ branches/stable/source/src/texk/web2c/tests/enc-u.bbl 2022-11-14 21:05:34 UTC (rev 884)
@@ -0,0 +1,66 @@
+\section*{Test result}
+\begin{itemize}
+\item ABC xyz
+\item ABC xyz
+\item ABC xyz
+\item ABC xyz
+\item ABC xyz
+\item ABC xyz
+\item ABC xyz
+\item C2Ax: ¢£¥§¨¬
+\item C2Ax: ¢£¥§¨¬
+\item C2Bx: °±¶÷
+\item CEAx: ΡΣΤΥΦΧΨΩ
+\item CEBx: αβγδεζηθικλμνξο
+\item CEBx: αβγδεζηθικλμνξο
+\item D0Ax: СТУФХЦЧШЩЪЫЬЭЮЯ
+\item D0Bx: абвгдежзийклмноп
+\item D0Bx: абвгдежзийклмноп
+\item E0Ax:
+ ^^e0^^a1^^e0^^a2^^e0^^a3^^e0^^a4^^e0^^a5^^e0^^a6^^e0^^a7^^e0^^a8^^e0^^a9^^e0^^aa^^e0^^ab^^e0^^ac^^e0^^ad^^e0^^ae^^e0^^af
+\item E2Ax:
+ ^^e2^^a1^^e2^^a2^^e2^^a3^^e2^^a4^^e2^^a5^^e2^^a6^^e2^^a7^^e2^^a8^^e2^^a9^^e2^^aa^^e2^^ab^^e2^^ac^^e2^^ad^^e2^^ae^^e2^^af
+\item E4Ax:
+ ^^e4^^a1^^e4^^a2^^e4^^a3^^e4^^a4^^e4^^a5^^e4^^a6^^e4^^a7^^e4^^a8^^e4^^a9^^e4^^aa^^e4^^ab^^e4^^ac^^e4^^ad^^e4^^ae^^e4^^af
+\item E6Ax:
+ ^^e6^^a1^^e6^^a2^^e6^^a3^^e6^^a4^^e6^^a5^^e6^^a6^^e6^^a7^^e6^^a8^^e6^^a9^^e6^^aa^^e6^^ab^^e6^^ac^^e6^^ad^^e6^^ae^^e6^^af
+\item E8Ax:
+ ^^e8^^a1^^e8^^a2^^e8^^a3^^e8^^a4^^e8^^a5^^e8^^a6^^e8^^a7^^e8^^a8^^e8^^a9^^e8^^aa^^e8^^ab^^e8^^ac^^e8^^ad^^e8^^ae^^e8^^af
+\item EAAx: ^^ea^^a1^^ea^^a2^^ea^^a3^^ea^^a4
+\item F0A1B6B7: 𡶷
+\item F0A3B3BE: 𣳾
+\item F0A5B6A1: 𥶡
+\item amber: ^^e0^^e8^^e0^^e1 ^^e0^^e6^^e0^^df
+\item coffee: ^^e0^^dd^^e0^^ea ^^e0^^db^^e0^^e8
+\item dotage: ^^e6^^ce^^e2^^f1 ^^e3^^cc^^e1^^ef
+\item konjak: ^^e8^^e7^^e8^^ea ^^e4^^e5^^e4^^e8
+\item rampant: ^^e0^^cb^^e0^^d5 ^^e0^^c9^^e0^^d3
+\item ΑΒΓ χψω
+\item ΑΒΓ χψω
+\item ΑΒΓ χψω
+\item ΑΒΓ χψω
+\item ξΩ ΥΦ ®ã ŷЧ Сб άå º°
+\item АБВ эюя
+\item АБВ эюя
+\item АБВ эюя
+\item АБВ эюя
+\item あいうえお
+\item あいうえお
+\item あいうえお
+\item あいうえお
+\item 一二三四五
+\item 一二三四五
+\item 一二三四五
+\item 一二三四五
+\item
+ 佳人 大声 亡失 対価 幼女 帰任 信仰 伴侶 山岳 年俸 平常 延伸 鷲鷹
+\item
+ 佳人 大声 亡失 対価 幼女 帰任 信仰 伴侶 山岳 年俸 平常 延伸 鷲鷹
+\item 係q体y
+\item 係q体y
+\item 思想 打球 明文 垂直 怜悧
+\item 思想 打球 明文 垂直 怜悧
+\item 語①誚②
+\item 語①誚②
+\end{itemize}
+\endinput
Property changes on: branches/stable/source/src/texk/web2c/tests/enc-u.bbl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/stable/source/src/texk/web2c/tests/enc-up.bbl
===================================================================
--- branches/stable/source/src/texk/web2c/tests/enc-up.bbl (rev 0)
+++ branches/stable/source/src/texk/web2c/tests/enc-up.bbl 2022-11-14 21:05:34 UTC (rev 884)
@@ -0,0 +1,38 @@
+\section*{Test result}
+\begin{itemize}
+\item ABC xyz
+\item ABC xyz
+\item ABC xyz
+\item ABC xyz
+\item ABC xyz
+\item C2Ax: ￠￡￥§¨￢
+\item C2Ax: ￠￡￥§¨￢
+\item C2Bx: °±¶÷
+\item CEAx: ΡΣΤΥΦΧΨΩ
+\item CEBx: αβγδεζηθικλμνξο
+\item CEBx: αβγδεζηθικλμνξο
+\item D0Ax: СТУФХЦЧШЩЪЫЬЭЮЯ
+\item D0Bx: абвгдежзийклмноп
+\item D0Bx: абвгдежзийклмноп
+\item F0A1B6B7: ^^f0^^a1^^b6^^b7
+\item F0A3B3BE: ^^f0^^a3^^b3^^be
+\item F0A5B6A1: ^^f0^^a5^^b6^^a1
+\item あいうえお
+\item あいうえお
+\item ΑΒΓ χψω
+\item ΑΒΓ χψω
+\item ξΩ ΥΦ ^^c2^^ae^^c3^^a3 ^^c5^^b7Ч Сб ^^ce^^ac^^c3^^a5 ^^c2^^ba°
+\item АБВ эюя
+\item АБВ эюя
+\item 一二三四五
+\item 一二三四五
+\item 佳人 大声 亡失 対価 幼女 帰任 信仰 伴侶 山岳 年俸 平常 延伸 鷲鷹
+\item 佳人 大声 亡失 対価 幼女 帰任 信仰 伴侶 山岳 年俸 平常 延伸 鷲鷹
+\item 係q体y
+\item 係q体y
+\item 語^^e2^^91^^a0誚^^e2^^91^^a1
+\item 語^^e2^^91^^a0誚^^e2^^91^^a1
+\item 思想 打球 明文 垂直 怜悧
+\item 思想 打球 明文 垂直 怜悧
+\end{itemize}
+\endinput
Property changes on: branches/stable/source/src/texk/web2c/tests/enc-up.bbl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/stable/source/src/texk/web2c/tests/enc-utf8.bib
===================================================================
--- branches/stable/source/src/texk/web2c/tests/enc-utf8.bib (rev 0)
+++ branches/stable/source/src/texk/web2c/tests/enc-utf8.bib 2022-11-14 21:05:34 UTC (rev 884)
@@ -0,0 +1,5 @@
+ at Type{ascii-u001, field = {ABC xyz}, }
+ at Type{greek-u001, field = {ΑΒΓ χψω}, }
+ at Type{cyrillic-u001, field = {АБВ эюя}, }
+ at Type{kana-u001, field = {あいうえお}, }
+ at Type{hanzi-u001, field = {一二三四五}, }
Property changes on: branches/stable/source/src/texk/web2c/tests/enc-utf8.bib
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/stable/source/src/texk/web2c/tests/enc-utf8a.bib
===================================================================
--- branches/stable/source/src/texk/web2c/tests/enc-utf8a.bib (rev 0)
+++ branches/stable/source/src/texk/web2c/tests/enc-utf8a.bib 2022-11-14 21:05:34 UTC (rev 884)
@@ -0,0 +1,6 @@
+% UTF-8 with BOM
+ at Type{ascii-v001, field = {ABC xyz}, }
+ at Type{ambiguos-v050, field = {係q体y}, }
+ at Type{ambiguos-v051, field = {語①誚②}, }
+ at Type{ambiguos-v052, field = {思想 打球 明文 垂直 怜悧}, }
+
Property changes on: branches/stable/source/src/texk/web2c/tests/enc-utf8a.bib
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/stable/source/src/texk/web2c/tests/enc-utf8b.bib
===================================================================
--- branches/stable/source/src/texk/web2c/tests/enc-utf8b.bib (rev 0)
+++ branches/stable/source/src/texk/web2c/tests/enc-utf8b.bib 2022-11-14 21:05:34 UTC (rev 884)
@@ -0,0 +1,7 @@
+% UTF-8 with BOM
+ at Type{ascii-v002, field = {ABC xyz}, }
+ at Type{ambiguos-v003, field = {C2Ax: ¢£¥§¨¬}, }
+ at Type{ambiguos-v006, field = {CEBx: αβγδεζηθικλμνξο}, }
+ at Type{ambiguos-v008, field = {D0Bx: абвгдежзийклмноп}, }
+ at Type{ambiguos-v009, field = {佳人 大声 亡失 対価 幼女 帰任 信仰 伴侶 山岳 年俸 平常 延伸 鷲鷹}, }
+
Property changes on: branches/stable/source/src/texk/web2c/tests/enc-utf8b.bib
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/stable/source/src/texk/web2c/tests/enc-uu.bbl
===================================================================
--- branches/stable/source/src/texk/web2c/tests/enc-uu.bbl (rev 0)
+++ branches/stable/source/src/texk/web2c/tests/enc-uu.bbl 2022-11-14 21:05:34 UTC (rev 884)
@@ -0,0 +1,40 @@
+\section*{Test result}
+\begin{itemize}
+\item ABC xyz
+\item ABC xyz
+\item ABC xyz
+\item ABC xyz
+\item ABC xyz
+\item C2Ax: ¢£¥§¨¬
+\item C2Ax: ¢£¥§¨¬
+\item C2Bx: °±¶÷
+\item CEAx: ΡΣΤΥΦΧΨΩ
+\item CEBx: αβγδεζηθικλμνξο
+\item CEBx: αβγδεζηθικλμνξο
+\item D0Ax: СТУФХЦЧШЩЪЫЬЭЮЯ
+\item D0Bx: абвгдежзийклмноп
+\item D0Bx: абвгдежзийклмноп
+\item F0A1B6B7: 𡶷
+\item F0A3B3BE: 𣳾
+\item F0A5B6A1: 𥶡
+\item ΑΒΓ χψω
+\item ΑΒΓ χψω
+\item ξΩ ΥΦ ®ã ŷЧ Сб άå º°
+\item АБВ эюя
+\item АБВ эюя
+\item あいうえお
+\item あいうえお
+\item 一二三四五
+\item 一二三四五
+\item
+ 佳人 大声 亡失 対価 幼女 帰任 信仰 伴侶 山岳 年俸 平常 延伸 鷲鷹
+\item
+ 佳人 大声 亡失 対価 幼女 帰任 信仰 伴侶 山岳 年俸 平常 延伸 鷲鷹
+\item 係q体y
+\item 係q体y
+\item 思想 打球 明文 垂直 怜悧
+\item 思想 打球 明文 垂直 怜悧
+\item 語①誚②
+\item 語①誚②
+\end{itemize}
+\endinput
Property changes on: branches/stable/source/src/texk/web2c/tests/enc-uu.bbl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/stable/source/src/texk/web2c/tests/exampl.bbl
===================================================================
--- branches/stable/source/src/texk/web2c/tests/exampl.bbl (rev 0)
+++ branches/stable/source/src/texk/web2c/tests/exampl.bbl 2022-11-14 21:05:34 UTC (rev 884)
@@ -0,0 +1,212 @@
+\newcommand{\noopsort}[1]{} \newcommand{\printfirst}[2]{#1}
+ \newcommand{\singleletter}[1]{#1} \newcommand{\switchargs}[2]{#2#1}
+\begin{thebibliography}{}
+
+\bibitem[Aamport, 1986a]{article-minimal}
+Aamport, L.~A. (1986a).
+\newblock The gnats and gnus document preparation system.
+\newblock {\em \mbox{G-Animal's} Journal}.
+
+\bibitem[Aamport, 1986b]{article-full}
+Aamport, L.~A. (1986b).
+\newblock The gnats and gnus document preparation system.
+\newblock {\em \mbox{G-Animal's} Journal}, 41(7):73+.
+\newblock This is a full ARTICLE entry.
+
+\bibitem[Aamport, 1986c]{article-crossref}
+Aamport, L.~A. (1986c).
+\newblock The gnats and gnus document preparation system.
+\newblock In \cite{whole-journal}, pages 73+.
+\newblock This is a cross-referencing ARTICLE entry.
+
+\bibitem[GAJ, 1986]{whole-journal}
+GAJ (1986).
+\newblock {\em \mbox{G-Animal's} Journal}, 41(7).
+\newblock The entire issue is devoted to gnats and gnus (this entry is a
+ cross-referenced ARTICLE (journal)).
+
+\bibitem[Knuth, 1968]{whole-set}
+Knuth, D.~E. ({\noopsort{1973a}}{\switchargs{--90}{1968}}).
+\newblock {\em The Art of Computer Programming}.
+\newblock Four volumes. Addison-Wesley.
+\newblock Seven volumes planned (this is a cross-referenced set of BOOKs).
+
+\bibitem[Knuth, 1973a]{inbook-minimal}
+Knuth, D.~E. ({\noopsort{1973b}}1973a).
+\newblock {\em Fundamental Algorithms}, chapter 1.2.
+\newblock Addison-Wesley.
+
+\bibitem[Knuth, 1973b]{inbook-full}
+Knuth, D.~E. ({\noopsort{1973b}}1973b).
+\newblock {\em Fundamental Algorithms}, volume~1 of {\em The Art of Computer
+ Programming}, section 1.2, pages 10--119.
+\newblock Addison-Wesley, Reading, Massachusetts, second edition.
+\newblock This is a full INBOOK entry.
+
+\bibitem[Knuth, 1973c]{inbook-crossref}
+Knuth, D.~E. ({\noopsort{1973b}}1973c).
+\newblock {\em Fundamental Algorithms}, section 1.2.
+\newblock Volume~1 of \cite{whole-set}, second edition.
+\newblock This is a cross-referencing INBOOK entry.
+
+\bibitem[Knuth, 1981a]{book-full}
+Knuth, D.~E. ({\noopsort{1973c}}1981a).
+\newblock {\em Seminumerical Algorithms}, volume~2 of {\em The Art of Computer
+ Programming}.
+\newblock Addison-Wesley, Reading, Massachusetts, second edition.
+\newblock This is a full BOOK entry.
+
+\bibitem[Knuth, 1981b]{book-minimal}
+Knuth, D.~E. ({\noopsort{1973c}}1981b).
+\newblock {\em Seminumerical Algorithms}.
+\newblock Addison-Wesley.
+
+\bibitem[Knuth, 1981c]{book-crossref}
+Knuth, D.~E. ({\noopsort{1973c}}1981c).
+\newblock {\em Seminumerical Algorithms}.
+\newblock Volume~2 of \cite{whole-set}, second edition.
+\newblock This is a cross-referencing BOOK entry.
+
+\bibitem[Kn{\printfirst{v}{1987}}, ]{booklet-minimal}
+Kn{\printfirst{v}{1987}}.
+\newblock The programming of computer art.
+
+\bibitem[Knvth, 1988]{booklet-full}
+Knvth, J.~C. (1988).
+\newblock The programming of computer art.
+\newblock Vernier Art Center, Stanford, California.
+\newblock This is a full BOOKLET entry.
+
+\bibitem[Lincoll, 1977a]{incollection-minimal}
+Lincoll, D.~D. (1977a).
+\newblock Semigroups of recurrences.
+\newblock In {\em High Speed Computer and Algorithm Organization}. Academic
+ Press.
+
+\bibitem[Lincoll, 1977b]{incollection-full}
+Lincoll, D.~D. (1977b).
+\newblock Semigroups of recurrences.
+\newblock In Lipcoll, D.~J., Lawrie, D.~H., and Sameh, A.~H., editors, {\em
+ High Speed Computer and Algorithm Organization}, number~23 in Fast Computers,
+ part~3, pages 179--183. Academic Press, New York, third edition.
+\newblock This is a full INCOLLECTION entry.
+
+\bibitem[Lincoll, 1977c]{incollection-crossref}
+Lincoll, D.~D. (1977c).
+\newblock Semigroups of recurrences.
+\newblock In \cite{whole-collection}, pages 179--183.
+\newblock This is a cross-referencing INCOLLECTION entry.
+
+\bibitem[Lipcoll et~al., 1977]{whole-collection}
+Lipcoll, D.~J., Lawrie, D.~H., and Sameh, A.~H., editors (1977).
+\newblock {\em High Speed Computer and Algorithm Organization}.
+\newblock Number~23 in Fast Computers. Academic Press, New York, third edition.
+\newblock This is a cross-referenced BOOK (collection) entry.
+
+\bibitem[Manmaker, ]{manual-minimal}
+Manmaker.
+\newblock {\em The Definitive Computer Manual}.
+
+\bibitem[Manmaker, 1986]{manual-full}
+Manmaker, L. (1986).
+\newblock {\em The Definitive Computer Manual}.
+\newblock Chips-R-Us, Silicon Valley, silver edition.
+\newblock This is a full MANUAL entry.
+
+\bibitem[Masterly, 1988a]{mastersthesis-minimal}
+Masterly, {\'{E}}. (1988a).
+\newblock Mastering thesis writing.
+\newblock Master's thesis, Stanford University.
+
+\bibitem[Masterly, 1988b]{mastersthesis-full}
+Masterly, {\'{E}}. (1988b).
+\newblock Mastering thesis writing.
+\newblock Master's project, Stanford University, English Department.
+\newblock This is a full MASTERSTHESIS entry.
+
+\bibitem[Missilany, ]{misc-minimal}
+Missilany.
+\newblock This is a minimal MISC entry.
+
+\bibitem[Missilany, 1984]{misc-full}
+Missilany, J.-B. (1984).
+\newblock Handing out random pamphlets in airports.
+\newblock Handed out at O'Hare.
+\newblock This is a full MISC entry.
+
+\bibitem[Oaho et~al., 1983a]{inproceedings-minimal}
+Oaho, A.~V., Ullman, J.~D., and Yannakakis, M. (1983a).
+\newblock On notions of information transfer in {VLSI} circuits.
+\newblock In {\em Proc. Fifteenth Annual ACM Symposium on the Theory of
+ Computing}.
+
+\bibitem[Oaho et~al., 1983b]{inproceedings-full}
+Oaho, A.~V., Ullman, J.~D., and Yannakakis, M. (1983b).
+\newblock On notions of information transfer in {VLSI} circuits.
+\newblock In Oz, W.~V. and Yannakakis, M., editors, {\em Proc. Fifteenth Annual
+ ACM Symposium on the Theory of Computing}, number~17 in All ACM Conferences,
+ pages 133--139, Boston. The OX Association for Computing Machinery, Academic
+ Press.
+\newblock This is a full INPROCEDINGS entry.
+
+\bibitem[Oaho et~al., 1983c]{inproceedings-crossref}
+Oaho, A.~V., Ullman, J.~D., and Yannakakis, M. (1983c).
+\newblock On notions of information transfer in {VLSI} circuits.
+\newblock In \cite{whole-proceedings}, pages 133--139.
+\newblock This is a cross-referencing INPROCEEDINGS entry.
+
+\bibitem[OX{\singleletter{stoc}}, 1983a]{whole-proceedings}
+OX{\singleletter{stoc}} (1983a).
+\newblock {\em Proc. Fifteenth Annual Symposium on the Theory of Computing},
+ Boston. The OX Association for Computing Machinery.
+\newblock This is a cross-referenced PROCEEDINGS.
+
+\bibitem[OX{\singleletter{stoc}}, 1983b]{proceedings-minimal}
+OX{\singleletter{stoc}} (1983b).
+\newblock {\em Proc. Fifteenth Annual Symposium on the Theory of Computing}.
+
+\bibitem[Oz and Yannakakis, 1983]{proceedings-full}
+Oz, W.~V. and Yannakakis, M., editors (1983).
+\newblock {\em Proc. Fifteenth Annual Symposium on the Theory of Computing},
+ number~17 in All ACM Conferences, Boston. The OX Association for Computing
+ Machinery, Academic Press.
+\newblock This is a full PROCEEDINGS entry.
+
+\bibitem[Phony-Baloney, 1988a]{phdthesis-minimal}
+Phony-Baloney, F.~P. (1988a).
+\newblock {\em Fighting Fire with Fire: Festooning {F}rench Phrases}.
+\newblock PhD thesis, Fanstord University.
+
+\bibitem[Phony-Baloney, 1988b]{phdthesis-full}
+Phony-Baloney, F.~P. (1988b).
+\newblock {\em Fighting Fire with Fire: Festooning {F}rench Phrases}.
+\newblock {PhD} dissertation, Fanstord University, Department of French.
+\newblock This is a full PHDTHESIS entry.
+
+\bibitem[Terrific, 1988]{techreport-minimal}
+Terrific, T. (1988).
+\newblock An {$O(n \log n / \! \log\log n)$} sorting algorithm.
+\newblock Technical report, Fanstord University.
+
+\bibitem[T{\'{e}}rrific, 1988]{techreport-full}
+T{\'{e}}rrific, T. (1988).
+\newblock An {$O(n \log n / \! \log\log n)$} sorting algorithm.
+\newblock Wishful Research Result~7, Fanstord University, Computer Science
+ Department, Fanstord, California.
+\newblock This is a full TECHREPORT entry.
+
+\bibitem[{\"{U}}nderwood et~al., ]{unpublished-minimal}
+{\"{U}}nderwood, U., {\~N}et, N., and {\={P}}ot, P.
+\newblock Lower bounds for wishful research results.
+\newblock Talk at Fanstord University (this is a minimal UNPUBLISHED entry).
+
+\bibitem[{\"{U}}nderwood et~al., 1988]{unpublished-full}
+{\"{U}}nderwood, U., {\~N}et, N., and {\={P}}ot, P. (1988).
+\newblock Lower bounds for wishful research results.
+\newblock Talk at Fanstord University (this is a full UNPUBLISHED entry).
+
+\bibitem[Volume-2, ]{random-note-crossref}
+Volume-2.
+\newblock Volume~2 is listed under Knuth \cite{book-full}.
+
+\end{thebibliography}
Property changes on: branches/stable/source/src/texk/web2c/tests/exampl.bbl
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/stable/source/src/texk/web2c/tests/testfield.bst
===================================================================
--- branches/stable/source/src/texk/web2c/tests/testfield.bst (rev 0)
+++ branches/stable/source/src/texk/web2c/tests/testfield.bst 2022-11-14 21:05:34 UTC (rev 884)
@@ -0,0 +1,38 @@
+% BibTeX test style file
+% Copyright 2022 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
+% You may freely use, modify and/or distribute this file.
+
+ENTRY {field}{}{}
+
+FUNCTION {output_entry} {
+ "\item " field * write$
+ newline$
+}
+
+FUNCTION {type} {output_entry}
+
+READ
+
+FUNCTION {set_sort_key} {
+ field 'sort.key$ :=
+}
+
+ITERATE {set_sort_key}
+
+SORT
+
+FUNCTION {output_bgn} {
+ "\section*{Test result}" write$ newline$
+ "\begin{itemize}" write$ newline$
+}
+
+FUNCTION {output_end} {
+ "\end{itemize}" write$ newline$
+ "\endinput" write$ newline$
+}
+
+EXECUTE {output_bgn}
+
+ITERATE {call.type$}
+
+EXECUTE {output_end}
Property changes on: branches/stable/source/src/texk/web2c/tests/testfield.bst
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: branches/stable/source/src/texk/web2c/tex.ch
===================================================================
--- branches/stable/source/src/texk/web2c/tex.ch 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/tex.ch 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,4 +1,4 @@
-% $Id: tex.ch 60074 2021-07-26 10:29:11Z hironobu $
+% $Id: tex.ch 64547 2022-09-29 01:20:56Z karl $
% tex.ch for C compilation with web2c, derived from various other change files.
% By Tim Morgan, UC Irvine ICS Department, and many others.
%
@@ -575,6 +575,7 @@
@!file_line_error_style_p:cinttype; {format messages as file:line:error}
@!eight_bit_p:cinttype; {make all characters printable by default}
@!halt_on_error_p:cinttype; {stop at first error}
+@!halting_on_error_p:boolean; {already trying to halt?}
@!quoted_filename:boolean; {current filename is quoted}
{Variables for source specials}
@!src_specials_p : boolean;{Whether |src_specials| are enabled at all}
@@ -875,7 +876,12 @@
@y
print_char("."); show_context;
if (halt_on_error_p) then begin
- history:=fatal_error_stop; jump_out;
+ {If |close_files_and_terminate| generates an error, we'll end up back
+ here; just give up in that case. If files are truncated, too bad.}
+ if (halting_on_error_p) then do_final_end; {quit immediately}
+ halting_on_error_p:=true;
+ history:=fatal_error_stop;
+ jump_out;
end;
@z
@@ -1522,7 +1528,7 @@
absorbing:begin print(" while scanning text"); info(p):=right_brace_token+"}";
@z
- at x [25.366]
+ at x [25.366] l.7672 - expansion depth overflow
begin cv_backup:=cur_val; cvl_backup:=cur_val_level; radix_backup:=radix;
@y
begin
@@ -1531,7 +1537,7 @@
cv_backup:=cur_val; cvl_backup:=cur_val_level; radix_backup:=radix;
@z
- at x [25.366]
+ at x [25.366] l.7678 - expansion depth overflow
cur_order:=co_backup; link(backup_head):=backup_backup;
@y
cur_order:=co_backup; link(backup_head):=backup_backup;
@@ -1538,7 +1544,15 @@
decr(expand_depth_count);
@z
- at x [27.484] set limit when fatal_error
+% Original report: https://tex.stackexchange.com/questions/609423
+% TeX bug entry: https://tug.org/texmfbug/newbug.html#B155endwrite
+ at x [25.369] l.7717 - disallow \noexpand\endwrite
+if t>=cs_token_flag then
+ at y
+if (t>=cs_token_flag)and(t<>end_write_token) then
+ at z
+
+ at x [27.484] l.9495 - set limit when fatal_error
else fatal_error("*** (cannot \read from terminal in nonstop modes)")
@y
else begin
@@ -4486,9 +4500,15 @@
@ The |edit_name_start| will be set to point into |str_pool| somewhere after
its beginning if \TeX\ is supposed to switch to an editor on exit.
+Initialize the |stop_at_space| variable for filename parsing.
+
+Initialize the |halting_on_error_p| variable to avoid infloop with
+\.{--halt-on-error}.
+
@<Set init...@>=
edit_name_start:=0;
stop_at_space:=true;
+halting_on_error_p:=false;
@ These are used when we regenerate the representation of the first 256
strings.
Modified: branches/stable/source/src/texk/web2c/texmfmem.h
===================================================================
--- branches/stable/source/src/texk/web2c/texmfmem.h 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/texmfmem.h 2022-11-14 21:05:34 UTC (rev 884)
@@ -63,6 +63,8 @@
*/
/* Aleph is sufficiently different to separate the definition. */
+/* pTeX, upTeX, e-pTeX and e-upTeX define max_quarterword=@"FFFF,
+ so a similar memory structure is applicable. */
#if !defined(Aleph) && !defined(pTeX) && !defined(epTeX) && !defined(eupTeX) && !defined(upTeX)
typedef union
Modified: branches/stable/source/src/texk/web2c/texmfmp-help.h
===================================================================
--- branches/stable/source/src/texk/web2c/texmfmp-help.h 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/texmfmp-help.h 2022-11-14 21:05:34 UTC (rev 884)
@@ -99,9 +99,7 @@
"-cnf-line=STRING parse STRING as a configuration file line",
"-etex enable e-TeX extensions",
"-fmt=NAME use NAME instead of program name or %&format.",
-#if defined(WIN32)
"[-no]-guess-input-enc disable/enable to guess input file encoding",
-#endif
"-halt-on-error stop processing at the first error",
"[-no]-file-line-error disable/enable file:line:error style messages",
"-ini be iniptex.",
@@ -228,9 +226,7 @@
"-cnf-line=STRING parse STRING as a configuration file line",
"-etex enable e-TeX extensions",
"-fmt=NAME use NAME instead of program name or %&format.",
-#if defined(WIN32)
"[-no]-guess-input-enc disable/enable to guess input file encoding",
-#endif
"-halt-on-error stop processing at the first error",
"[-no]-file-line-error disable/enable file:line:error style messages",
"-ini be iniptex.",
@@ -497,9 +493,7 @@
"",
"-cnf-line=STRING parse STRING as a configuration file line",
"-fmt=NAME use NAME instead of program name or %&format.",
-#if defined(WIN32)
"[-no]-guess-input-enc disable/enable to guess input file encoding",
-#endif
"-halt-on-error stop processing at the first error",
"[-no]-file-line-error disable/enable file:line:error style messages",
"-ini be iniptex.",
@@ -624,9 +618,7 @@
"",
"-cnf-line=STRING parse STRING as a configuration file line",
"-fmt=NAME use NAME instead of program name or %&format.",
-#if defined(WIN32)
"[-no]-guess-input-enc disable/enable to guess input file encoding",
-#endif
"-halt-on-error stop processing at the first error",
"[-no]-file-line-error disable/enable file:line:error style messages",
"-ini be iniptex.",
Modified: branches/stable/source/src/texk/web2c/window/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/window/Makefile.in 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/texk/web2c/window/Makefile.in 2022-11-14 21:05:34 UTC (rev 884)
@@ -115,6 +115,7 @@
$(top_srcdir)/../../m4/kpse-macos-framework.m4 \
$(top_srcdir)/../../m4/kpse-mpfr-flags.m4 \
$(top_srcdir)/../../m4/kpse-pixman-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-potrace-flags.m4 \
$(top_srcdir)/../../m4/kpse-pplib-flags.m4 \
$(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \
$(top_srcdir)/../../m4/kpse-socket-libs.m4 \
@@ -360,6 +361,9 @@
PIXMAN_INCLUDES = @PIXMAN_INCLUDES@
PIXMAN_LIBS = @PIXMAN_LIBS@
PKG_CONFIG = @PKG_CONFIG@
+POTRACE_DEPEND = @POTRACE_DEPEND@
+POTRACE_INCLUDES = @POTRACE_INCLUDES@
+POTRACE_LIBS = @POTRACE_LIBS@
PPLIB_DEPEND = @PPLIB_DEPEND@
PPLIB_INCLUDES = @PPLIB_INCLUDES@
PPLIB_LIBS = @PPLIB_LIBS@
Modified: branches/stable/source/src/utils/Makefile.in
===================================================================
--- branches/stable/source/src/utils/Makefile.in 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/utils/Makefile.in 2022-11-14 21:05:34 UTC (rev 884)
@@ -107,6 +107,7 @@
$(top_srcdir)/../m4/kpse-options.m4 \
$(top_srcdir)/../m4/kpse-pixman-flags.m4 \
$(top_srcdir)/../m4/kpse-pkgs.m4 \
+ $(top_srcdir)/../m4/kpse-potrace-flags.m4 \
$(top_srcdir)/../m4/kpse-ptexenc-flags.m4 \
$(top_srcdir)/../m4/kpse-setup.m4 \
$(top_srcdir)/../m4/kpse-teckit-flags.m4 \
@@ -183,6 +184,7 @@
$(top_srcdir)/../libs/cairo/ac/withenable.ac \
$(top_srcdir)/../libs/pixman/ac/withenable.ac \
$(top_srcdir)/../libs/gd/ac/withenable.ac \
+ $(top_srcdir)/../libs/potrace/ac/withenable.ac \
$(top_srcdir)/../libs/freetype2/ac/withenable.ac \
$(top_srcdir)/../libs/libpng/ac/withenable.ac \
$(top_srcdir)/../libs/libpaper/ac/withenable.ac \
Modified: branches/stable/source/src/utils/README
===================================================================
--- branches/stable/source/src/utils/README 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/utils/README 2022-11-14 21:05:34 UTC (rev 884)
@@ -1,4 +1,4 @@
-$Id: README 62528 2022-03-08 22:40:22Z karl $
+$Id: README 64381 2022-09-14 13:18:47Z hironobu $
Public domain. Originally written 2005 by Karl Berry.
Extra utilities we (optionally) compile for TeX Live.
@@ -20,7 +20,7 @@
lacheck - maintained here, by us
-m-tx 0.63a - checked 29apr18
+m-tx 0.63d - checked 14sep22
https://ctan.org/pkg/m-tx/
pmx 2.9.8a - checked 08mar22
Modified: branches/stable/source/src/utils/aclocal.m4
===================================================================
--- branches/stable/source/src/utils/aclocal.m4 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/utils/aclocal.m4 2022-11-14 21:05:34 UTC (rev 884)
@@ -1202,6 +1202,7 @@
m4_include([../m4/kpse-options.m4])
m4_include([../m4/kpse-pixman-flags.m4])
m4_include([../m4/kpse-pkgs.m4])
+m4_include([../m4/kpse-potrace-flags.m4])
m4_include([../m4/kpse-ptexenc-flags.m4])
m4_include([../m4/kpse-setup.m4])
m4_include([../m4/kpse-teckit-flags.m4])
Modified: branches/stable/source/src/utils/configure
===================================================================
--- branches/stable/source/src/utils/configure 2022-06-08 17:30:43 UTC (rev 883)
+++ branches/stable/source/src/utils/configure 2022-11-14 21:05:34 UTC (rev 884)
@@ -860,6 +860,9 @@
with_system_gd
with_gd_includes
with_gd_libdir
+with_system_potrace
+with_potrace_includes
+with_potrace_libdir
with_system_freetype2
with_system_libpng
with_system_libpaper
@@ -1702,6 +1705,11 @@
--with-system-gd use installed gd headers and library
--with-gd-includes=DIR gd headers installed in DIR
--with-gd-libdir=DIR gd library installed in DIR
+ --with-system-potrace use installed potrace headers and library
+ --with-potrace-includes=DIR
+ potrace headers installed in DIR
+ --with-potrace-libdir=DIR
+ potrace library installed in DIR
--with-system-freetype2 use installed freetype2 headers and library
(requires freetype-config)
--with-system-libpng use installed libpng headers and library (requires
@@ -4802,6 +4810,7 @@
test "x$enable_web2c:$enable_mflua" = xyes:yes && {
need_lua53=yes
+ need_potrace=yes
}
# Check whether --enable-mfluajit was given.
if test ${enable_mfluajit+y}
@@ -4829,6 +4838,7 @@
test "x$enable_web2c:$enable_mfluajit" = xyes:yes && {
need_luajit=yes
+ need_potrace=yes
}
# Check whether --with-mf-x-toolkit was given.
@@ -6140,6 +6150,39 @@
need_freetype2=yes
}
+## libs/potrace/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/potrace/
+## configure options and TL libraries required for potrace
+
+# Check whether --with-system-potrace was given.
+if test ${with_system_potrace+y}
+then :
+ withval=$with_system_potrace;
+fi
+
+# Check whether --with-potrace-includes was given.
+if test ${with_potrace_includes+y}
+then :
+ withval=$with_potrace_includes;
+fi
+
+# Check whether --with-potrace-libdir was given.
+if test ${with_potrace_libdir+y}
+then :
+ withval=$with_potrace_libdir;
+fi
+if test "x$with_system_potrace" = x; then
+ if test -f $srcdir/../libs/potrace/configure; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`potrace' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`potrace' headers and library from TL tree" >&6;}
+ with_system_potrace=no
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`potrace' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`potrace' headers and library" >&6;}
+ with_system_potrace=yes
+ fi
+ ac_configure_args="$ac_configure_args '--with-system-potrace=$with_system_potrace'"
+fi
+
## libs/freetype2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype2/
## configure options and TL libraries required for freetype2
More information about the pdftex-commits
mailing list.