From 37e731f0bd81249f8b43bada12adaa611b7a595b Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Tue, 5 Apr 2022 21:27:03 +0000 Subject: freetype2 : revert git-svn-id: svn://tug.org/texlive/trunk@62919 c570f23f-e606-0410-a88d-b1316a301751 --- .../freetype2/freetype-src/builds/unix/config.sub | 6 +- .../freetype2/freetype-src/builds/unix/configure | 206 +++++---------------- .../freetype-src/builds/unix/configure.ac | 109 ++++------- .../freetype-src/builds/unix/configure.raw | 107 ++++------- .../freetype2/freetype-src/builds/unix/detect.mk | 2 +- .../freetype-src/builds/unix/freetype-config.in | 2 +- .../freetype-src/builds/unix/freetype2.in | 8 +- .../freetype-src/builds/unix/freetype2.m4 | 2 +- .../freetype-src/builds/unix/ft-munmap.m4 | 2 +- .../freetype-src/builds/unix/ftconfig.h.in | 2 +- .../freetype2/freetype-src/builds/unix/ftsystem.c | 2 +- .../freetype2/freetype-src/builds/unix/install.mk | 2 +- .../freetype2/freetype-src/builds/unix/unix-cc.in | 12 +- .../freetype2/freetype-src/builds/unix/unix-def.in | 36 ++-- .../freetype2/freetype-src/builds/unix/unix-dev.mk | 2 +- .../freetype2/freetype-src/builds/unix/unix-lcc.mk | 2 +- .../freetype2/freetype-src/builds/unix/unix.mk | 2 +- .../freetype2/freetype-src/builds/unix/unixddef.mk | 2 +- 18 files changed, 148 insertions(+), 358 deletions(-) (limited to 'Build/source/libs/freetype2/freetype-src/builds/unix') diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/config.sub b/Build/source/libs/freetype2/freetype-src/builds/unix/config.sub index dba16e84c77..9b62e37c43c 100755 --- a/Build/source/libs/freetype2/freetype-src/builds/unix/config.sub +++ b/Build/source/libs/freetype2/freetype-src/builds/unix/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2022 Free Software Foundation, Inc. +# Copyright 1992-2021 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2022-01-03' +timestamp='2021-12-25' # 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 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright 1992-2022 Free Software Foundation, Inc. +Copyright 1992-2021 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." diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/configure b/Build/source/libs/freetype2/freetype-src/builds/unix/configure index 28bad74ab73..bf1b1cb23b7 100755 --- a/Build/source/libs/freetype2/freetype-src/builds/unix/configure +++ b/Build/source/libs/freetype2/freetype-src/builds/unix/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for FreeType 2.12. +# Generated by GNU Autoconf 2.71 for FreeType 2.11.1. # # Report bugs to . # @@ -621,8 +621,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='FreeType' PACKAGE_TARNAME='freetype' -PACKAGE_VERSION='2.12' -PACKAGE_STRING='FreeType 2.12' +PACKAGE_VERSION='2.11.1' +PACKAGE_STRING='FreeType 2.11.1' PACKAGE_BUGREPORT='freetype@nongnu.org' PACKAGE_URL='' @@ -666,10 +666,8 @@ build_libtool_libs wl hardcode_libdir_flag_spec LIBSSTATIC_CONFIG -PKGCONFIG_LIBS_PRIVATE -PKGCONFIG_REQUIRES_PRIVATE -PKGCONFIG_LIBS -PKGCONFIG_REQUIRES +LIBS_PRIVATE +REQUIRES_PRIVATE ftmac_c PYTHON_VERSION PYTHON @@ -682,10 +680,7 @@ target_os target_vendor target_cpu target -FT_DEMO_LDFLAGS -FT_DEMO_CFLAGS -LIBRSVG_LIBS -LIBRSVG_CFLAGS +LIB_CLOCK_GETTIME BROTLI_LIBS BROTLI_CFLAGS HARFBUZZ_LIBS @@ -694,7 +689,6 @@ LIBPNG_LIBS LIBPNG_CFLAGS BZIP2_LIBS BZIP2_CFLAGS -SYSTEM_ZLIB ZLIB_LIBS ZLIB_CFLAGS XX_ANSIFLAGS @@ -841,9 +835,7 @@ LIBPNG_LIBS HARFBUZZ_CFLAGS HARFBUZZ_LIBS BROTLI_CFLAGS -BROTLI_LIBS -LIBRSVG_CFLAGS -LIBRSVG_LIBS' +BROTLI_LIBS' # Initialize some variables set by options. @@ -1392,7 +1384,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures FreeType 2.12 to adapt to many kinds of systems. +\`configure' configures FreeType 2.11.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1459,7 +1451,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of FreeType 2.12:";; + short | recursive ) echo "Configuration of FreeType 2.11.1:";; esac cat <<\_ACEOF @@ -1545,10 +1537,6 @@ Some influential environment variables: BROTLI_CFLAGS C compiler flags for BROTLI, overriding pkg-config BROTLI_LIBS linker flags for BROTLI, overriding pkg-config - LIBRSVG_CFLAGS - C compiler flags for LIBRSVG, overriding pkg-config - LIBRSVG_LIBS - linker flags for LIBRSVG, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1617,7 +1605,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -FreeType configure 2.12 +FreeType configure 2.11.1 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1968,7 +1956,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by FreeType $as_me 2.12, which was +It was created by FreeType $as_me 2.11.1, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -2730,7 +2718,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # Don't forget to update `docs/VERSIONS.TXT'! -version_info='24:2:18' +version_info='24:1:18' ft_version=`echo $version_info | tr : .` @@ -13949,12 +13937,6 @@ if test x"$with_zlib" = xyes -a "$have_zlib" = no; then as_fn_error $? "external zlib support requested but library not found" "$LINENO" 5 fi -SYSTEM_ZLIB= -if test "$have_zlib" != no; then - SYSTEM_ZLIB=yes -fi - - # check for system libbz2 @@ -14514,16 +14496,13 @@ if test x"$with_brotli" = xyes -a "$have_brotli" = no; then fi -# Checks for the demo programs. +# check for librt # -# FreeType doesn't need this. However, since the demo program repository -# doesn't come with a `configure` script of its own, we integrate the tests -# here for simplicity. - -# We need `clock_gettime` from 'librt' for the `ftbench` demo program. +# We need `clock_gettime' for the `ftbench' demo program. # -# The code is modeled after gnulib's file `clock_time.m4`, ignoring +# The code is modeled after gnulib's file `clock_time.m4', ignoring # very old Solaris systems. + LIB_CLOCK_GETTIME= { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5 printf %s "checking for library containing clock_gettime... " >&6; } @@ -14586,89 +14565,6 @@ then : fi -# 'librsvg' is needed to demonstrate SVG support. - -pkg_failed=no -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBRSVG" >&5 -printf %s "checking for LIBRSVG... " >&6; } - -if test -n "$LIBRSVG_CFLAGS"; then - pkg_cv_LIBRSVG_CFLAGS="$LIBRSVG_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"librsvg-2.0 >= 2.46.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "librsvg-2.0 >= 2.46.0") 2>&5 - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_LIBRSVG_CFLAGS=`$PKG_CONFIG --cflags "librsvg-2.0 >= 2.46.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$LIBRSVG_LIBS"; then - pkg_cv_LIBRSVG_LIBS="$LIBRSVG_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"librsvg-2.0 >= 2.46.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "librsvg-2.0 >= 2.46.0") 2>&5 - ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_LIBRSVG_LIBS=`$PKG_CONFIG --libs "librsvg-2.0 >= 2.46.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - LIBRSVG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "librsvg-2.0 >= 2.46.0" 2>&1` - else - LIBRSVG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "librsvg-2.0 >= 2.46.0" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$LIBRSVG_PKG_ERRORS" >&5 - - have_librsvg=no -elif test $pkg_failed = untried; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - have_librsvg=no -else - LIBRSVG_CFLAGS=$pkg_cv_LIBRSVG_CFLAGS - LIBRSVG_LIBS=$pkg_cv_LIBRSVG_LIBS - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - have_librsvg="yes (pkg-config)" -fi - -FT_DEMO_CFLAGS="" -FT_DEMO_LDFLAGS="$LIB_CLOCK_GETTIME" - -if test "$have_librsvg" != no; then - FT_DEMO_CFLAGS="$FT_DEMO_CFLAGS $LIBRSVG_CFLAGS -DHAVE_LIBRSVG" - FT_DEMO_LDFLAGS="$FT_DEMO_LDFLAGS $LIBRSVG_LIBS" -fi - - - # Some options handling SDKs/archs in CFLAGS should be copied @@ -16212,32 +16108,32 @@ fi # entries in Requires.private are separated by commas -PKGCONFIG_REQUIRES_PRIVATE="$zlib_reqpriv, \ - $bzip2_reqpriv, \ - $libpng_reqpriv, \ - $harfbuzz_reqpriv, \ - $brotli_reqpriv" +REQUIRES_PRIVATE="$zlib_reqpriv, \ + $bzip2_reqpriv, \ + $libpng_reqpriv, \ + $harfbuzz_reqpriv, \ + $brotli_reqpriv" # beautify -PKGCONFIG_REQUIRES_PRIVATE=`echo "$PKGCONFIG_REQUIRES_PRIVATE" \ - | sed -e 's/^ *//' \ - -e 's/ *$//' \ - -e 's/, */,/g' \ - -e 's/,,*/,/g' \ - -e 's/^,*//' \ - -e 's/,*$//' \ - -e 's/,/, /g'` - -PKGCONFIG_LIBS_PRIVATE="$zlib_libspriv \ - $bzip2_libspriv \ - $libpng_libspriv \ - $harfbuzz_libspriv \ - $brotli_libspriv \ - $ft2_extra_libs" +REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVATE" \ + | sed -e 's/^ *//' \ + -e 's/ *$//' \ + -e 's/, */,/g' \ + -e 's/,,*/,/g' \ + -e 's/^,*//' \ + -e 's/,*$//' \ + -e 's/,/, /g'` + +LIBS_PRIVATE="$zlib_libspriv \ + $bzip2_libspriv \ + $libpng_libspriv \ + $harfbuzz_libspriv \ + $brotli_libspriv \ + $ft2_extra_libs" # beautify -PKGCONFIG_LIBS_PRIVATE=`echo "$PKGCONFIG_LIBS_PRIVATE" \ - | sed -e 's/^ *//' \ - -e 's/ *$//' \ - -e 's/ */ /g'` +LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \ + | sed -e 's/^ *//' \ + -e 's/ *$//' \ + -e 's/ */ /g'` LIBSSTATIC_CONFIG="-lfreetype \ $zlib_libsstaticconf \ @@ -16255,24 +16151,6 @@ LIBSSTATIC_CONFIG=`echo "$LIBSSTATIC_CONFIG" \ -e 's/ *$//' \ -e 's/ */ /g'` -# If FreeType gets installed with `--disable-shared', don't use -# 'private' fields. `pkg-config' only looks into `.pc' files and is -# completely agnostic to whether shared libraries are actually present -# or not. As a consequence, the user had to specify `--static' while -# calling `pkg-config', which configure scripts are normally not -# prepared for. - -PKGCONFIG_REQUIRES= -PKGCONFIG_LIBS='-L${libdir} -lfreetype' - -if test $enable_shared = "no"; then - PKGCONFIG_REQUIRES="$PKGCONFIG_REQUIRES $PKGCONFIG_REQUIRES_PRIVATE" - PKGCONFIG_REQUIRES_PRIVATE= - PKGCONFIG_LIBS="$PKGCONFIG_LIBS $PKGCONFIG_LIBS_PRIVATE" - PKGCONFIG_LIBS_PRIVATE= -fi - - @@ -16861,7 +16739,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by FreeType $as_me 2.12, which was +This file was extended by FreeType $as_me 2.11.1, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16929,7 +16807,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -FreeType config.status 2.12 +FreeType config.status 2.11.1 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/configure.ac b/Build/source/libs/freetype2/freetype-src/builds/unix/configure.ac index 28f65b9a482..d1b7f1a78c5 100644 --- a/Build/source/libs/freetype2/freetype-src/builds/unix/configure.ac +++ b/Build/source/libs/freetype2/freetype-src/builds/unix/configure.ac @@ -2,7 +2,7 @@ # # Process this file with autoconf to produce a configure script. # -# Copyright (C) 2001-2022 by +# Copyright (C) 2001-2021 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -11,13 +11,13 @@ # indicate that you have read the license and understand and accept it # fully. -AC_INIT([FreeType], [2.12], [freetype@nongnu.org], [freetype]) +AC_INIT([FreeType], [2.11.1], [freetype@nongnu.org], [freetype]) AC_CONFIG_SRCDIR([ftconfig.h.in]) # Don't forget to update `docs/VERSIONS.TXT'! -version_info='24:2:18' +version_info='24:1:18' AC_SUBST([version_info]) ft_version=`echo $version_info | tr : .` AC_SUBST([ft_version]) @@ -317,12 +317,6 @@ if test x"$with_zlib" = xyes -a "$have_zlib" = no; then AC_MSG_ERROR([external zlib support requested but library not found]) fi -SYSTEM_ZLIB= -if test "$have_zlib" != no; then - SYSTEM_ZLIB=yes -fi -AC_SUBST([SYSTEM_ZLIB]) - # check for system libbz2 @@ -514,36 +508,19 @@ if test x"$with_brotli" = xyes -a "$have_brotli" = no; then fi -# Checks for the demo programs. +# check for librt # -# FreeType doesn't need this. However, since the demo program repository -# doesn't come with a `configure` script of its own, we integrate the tests -# here for simplicity. - -# We need `clock_gettime` from 'librt' for the `ftbench` demo program. +# We need `clock_gettime' for the `ftbench' demo program. # -# The code is modeled after gnulib's file `clock_time.m4`, ignoring +# The code is modeled after gnulib's file `clock_time.m4', ignoring # very old Solaris systems. + LIB_CLOCK_GETTIME= AC_SEARCH_LIBS([clock_gettime], [rt], [test "$ac_cv_search_clock_gettime" = "none required" \ || LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime]) - -# 'librsvg' is needed to demonstrate SVG support. -PKG_CHECK_MODULES([LIBRSVG], [librsvg-2.0 >= 2.46.0], - [have_librsvg="yes (pkg-config)"], [have_librsvg=no]) - -FT_DEMO_CFLAGS="" -FT_DEMO_LDFLAGS="$LIB_CLOCK_GETTIME" - -if test "$have_librsvg" != no; then - FT_DEMO_CFLAGS="$FT_DEMO_CFLAGS $LIBRSVG_CFLAGS -DHAVE_LIBRSVG" - FT_DEMO_LDFLAGS="$FT_DEMO_LDFLAGS $LIBRSVG_LIBS" -fi - -AC_SUBST([FT_DEMO_CFLAGS]) -AC_SUBST([FT_DEMO_LDFLAGS]) +AC_SUBST([LIB_CLOCK_GETTIME]) # Some options handling SDKs/archs in CFLAGS should be copied @@ -985,32 +962,32 @@ fi # entries in Requires.private are separated by commas -PKGCONFIG_REQUIRES_PRIVATE="$zlib_reqpriv, \ - $bzip2_reqpriv, \ - $libpng_reqpriv, \ - $harfbuzz_reqpriv, \ - $brotli_reqpriv" +REQUIRES_PRIVATE="$zlib_reqpriv, \ + $bzip2_reqpriv, \ + $libpng_reqpriv, \ + $harfbuzz_reqpriv, \ + $brotli_reqpriv" # beautify -PKGCONFIG_REQUIRES_PRIVATE=`echo "$PKGCONFIG_REQUIRES_PRIVATE" \ - | sed -e 's/^ *//' \ - -e 's/ *$//' \ - -e 's/, */,/g' \ - -e 's/,,*/,/g' \ - -e 's/^,*//' \ - -e 's/,*$//' \ - -e 's/,/, /g'` - -PKGCONFIG_LIBS_PRIVATE="$zlib_libspriv \ - $bzip2_libspriv \ - $libpng_libspriv \ - $harfbuzz_libspriv \ - $brotli_libspriv \ - $ft2_extra_libs" +REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVATE" \ + | sed -e 's/^ *//' \ + -e 's/ *$//' \ + -e 's/, */,/g' \ + -e 's/,,*/,/g' \ + -e 's/^,*//' \ + -e 's/,*$//' \ + -e 's/,/, /g'` + +LIBS_PRIVATE="$zlib_libspriv \ + $bzip2_libspriv \ + $libpng_libspriv \ + $harfbuzz_libspriv \ + $brotli_libspriv \ + $ft2_extra_libs" # beautify -PKGCONFIG_LIBS_PRIVATE=`echo "$PKGCONFIG_LIBS_PRIVATE" \ - | sed -e 's/^ *//' \ - -e 's/ *$//' \ - -e 's/ */ /g'` +LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \ + | sed -e 's/^ *//' \ + -e 's/ *$//' \ + -e 's/ */ /g'` LIBSSTATIC_CONFIG="-lfreetype \ $zlib_libsstaticconf \ @@ -1028,28 +1005,10 @@ LIBSSTATIC_CONFIG=`echo "$LIBSSTATIC_CONFIG" \ -e 's/ *$//' \ -e 's/ */ /g'` -# If FreeType gets installed with `--disable-shared', don't use -# 'private' fields. `pkg-config' only looks into `.pc' files and is -# completely agnostic to whether shared libraries are actually present -# or not. As a consequence, the user had to specify `--static' while -# calling `pkg-config', which configure scripts are normally not -# prepared for. - -PKGCONFIG_REQUIRES= -PKGCONFIG_LIBS='-L${libdir} -lfreetype' - -if test $enable_shared = "no"; then - PKGCONFIG_REQUIRES="$PKGCONFIG_REQUIRES $PKGCONFIG_REQUIRES_PRIVATE" - PKGCONFIG_REQUIRES_PRIVATE= - PKGCONFIG_LIBS="$PKGCONFIG_LIBS $PKGCONFIG_LIBS_PRIVATE" - PKGCONFIG_LIBS_PRIVATE= -fi AC_SUBST([ftmac_c]) -AC_SUBST([PKGCONFIG_REQUIRES]) -AC_SUBST([PKGCONFIG_LIBS]) -AC_SUBST([PKGCONFIG_REQUIRES_PRIVATE]) -AC_SUBST([PKGCONFIG_LIBS_PRIVATE]) +AC_SUBST([REQUIRES_PRIVATE]) +AC_SUBST([LIBS_PRIVATE]) AC_SUBST([LIBSSTATIC_CONFIG]) AC_SUBST([hardcode_libdir_flag_spec]) diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/configure.raw b/Build/source/libs/freetype2/freetype-src/builds/unix/configure.raw index cfb073efab9..f326872cbd7 100644 --- a/Build/source/libs/freetype2/freetype-src/builds/unix/configure.raw +++ b/Build/source/libs/freetype2/freetype-src/builds/unix/configure.raw @@ -2,7 +2,7 @@ # # Process this file with autoconf to produce a configure script. # -# Copyright (C) 2001-2022 by +# Copyright (C) 2001-2021 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -17,7 +17,7 @@ AC_CONFIG_SRCDIR([ftconfig.h.in]) # Don't forget to update `docs/VERSIONS.TXT'! -version_info='24:2:18' +version_info='24:1:18' AC_SUBST([version_info]) ft_version=`echo $version_info | tr : .` AC_SUBST([ft_version]) @@ -317,12 +317,6 @@ if test x"$with_zlib" = xyes -a "$have_zlib" = no; then AC_MSG_ERROR([external zlib support requested but library not found]) fi -SYSTEM_ZLIB= -if test "$have_zlib" != no; then - SYSTEM_ZLIB=yes -fi -AC_SUBST([SYSTEM_ZLIB]) - # check for system libbz2 @@ -514,36 +508,19 @@ if test x"$with_brotli" = xyes -a "$have_brotli" = no; then fi -# Checks for the demo programs. +# check for librt # -# FreeType doesn't need this. However, since the demo program repository -# doesn't come with a `configure` script of its own, we integrate the tests -# here for simplicity. - -# We need `clock_gettime` from 'librt' for the `ftbench` demo program. +# We need `clock_gettime' for the `ftbench' demo program. # -# The code is modeled after gnulib's file `clock_time.m4`, ignoring +# The code is modeled after gnulib's file `clock_time.m4', ignoring # very old Solaris systems. + LIB_CLOCK_GETTIME= AC_SEARCH_LIBS([clock_gettime], [rt], [test "$ac_cv_search_clock_gettime" = "none required" \ || LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime]) - -# 'librsvg' is needed to demonstrate SVG support. -PKG_CHECK_MODULES([LIBRSVG], [librsvg-2.0 >= 2.46.0], - [have_librsvg="yes (pkg-config)"], [have_librsvg=no]) - -FT_DEMO_CFLAGS="" -FT_DEMO_LDFLAGS="$LIB_CLOCK_GETTIME" - -if test "$have_librsvg" != no; then - FT_DEMO_CFLAGS="$FT_DEMO_CFLAGS $LIBRSVG_CFLAGS -DHAVE_LIBRSVG" - FT_DEMO_LDFLAGS="$FT_DEMO_LDFLAGS $LIBRSVG_LIBS" -fi - -AC_SUBST([FT_DEMO_CFLAGS]) -AC_SUBST([FT_DEMO_LDFLAGS]) +AC_SUBST([LIB_CLOCK_GETTIME]) # Some options handling SDKs/archs in CFLAGS should be copied @@ -985,32 +962,32 @@ fi # entries in Requires.private are separated by commas -PKGCONFIG_REQUIRES_PRIVATE="$zlib_reqpriv, \ - $bzip2_reqpriv, \ - $libpng_reqpriv, \ - $harfbuzz_reqpriv, \ - $brotli_reqpriv" +REQUIRES_PRIVATE="$zlib_reqpriv, \ + $bzip2_reqpriv, \ + $libpng_reqpriv, \ + $harfbuzz_reqpriv, \ + $brotli_reqpriv" # beautify -PKGCONFIG_REQUIRES_PRIVATE=`echo "$PKGCONFIG_REQUIRES_PRIVATE" \ - | sed -e 's/^ *//' \ - -e 's/ *$//' \ - -e 's/, */,/g' \ - -e 's/,,*/,/g' \ - -e 's/^,*//' \ - -e 's/,*$//' \ - -e 's/,/, /g'` - -PKGCONFIG_LIBS_PRIVATE="$zlib_libspriv \ - $bzip2_libspriv \ - $libpng_libspriv \ - $harfbuzz_libspriv \ - $brotli_libspriv \ - $ft2_extra_libs" +REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVATE" \ + | sed -e 's/^ *//' \ + -e 's/ *$//' \ + -e 's/, */,/g' \ + -e 's/,,*/,/g' \ + -e 's/^,*//' \ + -e 's/,*$//' \ + -e 's/,/, /g'` + +LIBS_PRIVATE="$zlib_libspriv \ + $bzip2_libspriv \ + $libpng_libspriv \ + $harfbuzz_libspriv \ + $brotli_libspriv \ + $ft2_extra_libs" # beautify -PKGCONFIG_LIBS_PRIVATE=`echo "$PKGCONFIG_LIBS_PRIVATE" \ - | sed -e 's/^ *//' \ - -e 's/ *$//' \ - -e 's/ */ /g'` +LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \ + | sed -e 's/^ *//' \ + -e 's/ *$//' \ + -e 's/ */ /g'` LIBSSTATIC_CONFIG="-lfreetype \ $zlib_libsstaticconf \ @@ -1028,28 +1005,10 @@ LIBSSTATIC_CONFIG=`echo "$LIBSSTATIC_CONFIG" \ -e 's/ *$//' \ -e 's/ */ /g'` -# If FreeType gets installed with `--disable-shared', don't use -# 'private' fields. `pkg-config' only looks into `.pc' files and is -# completely agnostic to whether shared libraries are actually present -# or not. As a consequence, the user had to specify `--static' while -# calling `pkg-config', which configure scripts are normally not -# prepared for. - -PKGCONFIG_REQUIRES= -PKGCONFIG_LIBS='-L${libdir} -lfreetype' - -if test $enable_shared = "no"; then - PKGCONFIG_REQUIRES="$PKGCONFIG_REQUIRES $PKGCONFIG_REQUIRES_PRIVATE" - PKGCONFIG_REQUIRES_PRIVATE= - PKGCONFIG_LIBS="$PKGCONFIG_LIBS $PKGCONFIG_LIBS_PRIVATE" - PKGCONFIG_LIBS_PRIVATE= -fi AC_SUBST([ftmac_c]) -AC_SUBST([PKGCONFIG_REQUIRES]) -AC_SUBST([PKGCONFIG_LIBS]) -AC_SUBST([PKGCONFIG_REQUIRES_PRIVATE]) -AC_SUBST([PKGCONFIG_LIBS_PRIVATE]) +AC_SUBST([REQUIRES_PRIVATE]) +AC_SUBST([LIBS_PRIVATE]) AC_SUBST([LIBSSTATIC_CONFIG]) AC_SUBST([hardcode_libdir_flag_spec]) diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/detect.mk b/Build/source/libs/freetype2/freetype-src/builds/unix/detect.mk index 7ed58ff745c..862b43219c8 100644 --- a/Build/source/libs/freetype2/freetype-src/builds/unix/detect.mk +++ b/Build/source/libs/freetype2/freetype-src/builds/unix/detect.mk @@ -3,7 +3,7 @@ # -# Copyright (C) 1996-2022 by +# Copyright (C) 1996-2021 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/freetype-config.in b/Build/source/libs/freetype2/freetype-src/builds/unix/freetype-config.in index c076bc1f822..4edb092d09c 100644 --- a/Build/source/libs/freetype2/freetype-src/builds/unix/freetype-config.in +++ b/Build/source/libs/freetype2/freetype-src/builds/unix/freetype-config.in @@ -1,6 +1,6 @@ #! /bin/sh # -# Copyright (C) 2000-2022 by +# Copyright (C) 2000-2021 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/freetype2.in b/Build/source/libs/freetype2/freetype-src/builds/unix/freetype2.in index fe389f4b6fe..2d759ecf8bf 100644 --- a/Build/source/libs/freetype2/freetype-src/builds/unix/freetype2.in +++ b/Build/source/libs/freetype2/freetype-src/builds/unix/freetype2.in @@ -7,8 +7,8 @@ Name: FreeType 2 URL: https://freetype.org Description: A free, high-quality, and portable font engine. Version: %ft_version% -Requires: %PKGCONFIG_REQUIRES% -Requires.private: %PKGCONFIG_REQUIRES_PRIVATE% -Libs: %PKGCONFIG_LIBS% -Libs.private: %PKGCONFIG_LIBS_PRIVATE% +Requires: +Requires.private: %REQUIRES_PRIVATE% +Libs: -L${libdir} -lfreetype +Libs.private: %LIBS_PRIVATE% Cflags: -I${includedir}/freetype2 diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/freetype2.m4 b/Build/source/libs/freetype2/freetype-src/builds/unix/freetype2.m4 index 0cafc8e8cd2..478a422105f 100644 --- a/Build/source/libs/freetype2/freetype-src/builds/unix/freetype2.m4 +++ b/Build/source/libs/freetype2/freetype-src/builds/unix/freetype2.m4 @@ -1,7 +1,7 @@ # Configure paths for FreeType2 # Marcelo Magallon 2001-10-26, based on `gtk.m4` by Owen Taylor # -# Copyright (C) 2001-2022 by +# Copyright (C) 2001-2021 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/ft-munmap.m4 b/Build/source/libs/freetype2/freetype-src/builds/unix/ft-munmap.m4 index c536febb232..275481ba113 100644 --- a/Build/source/libs/freetype2/freetype-src/builds/unix/ft-munmap.m4 +++ b/Build/source/libs/freetype2/freetype-src/builds/unix/ft-munmap.m4 @@ -1,6 +1,6 @@ ## FreeType specific autoconf tests # -# Copyright (C) 2002-2022 by +# Copyright (C) 2002-2021 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/ftconfig.h.in b/Build/source/libs/freetype2/freetype-src/builds/unix/ftconfig.h.in index 67474dcef1a..b42fe42f9bf 100644 --- a/Build/source/libs/freetype2/freetype-src/builds/unix/ftconfig.h.in +++ b/Build/source/libs/freetype2/freetype-src/builds/unix/ftconfig.h.in @@ -4,7 +4,7 @@ * * UNIX-specific configuration file (specification only). * - * Copyright (C) 1996-2022 by + * Copyright (C) 1996-2021 by * David Turner, Robert Wilhelm, and Werner Lemberg. * * This file is part of the FreeType project, and may only be used, diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/ftsystem.c b/Build/source/libs/freetype2/freetype-src/builds/unix/ftsystem.c index 4d2870b596f..81ed928584b 100644 --- a/Build/source/libs/freetype2/freetype-src/builds/unix/ftsystem.c +++ b/Build/source/libs/freetype2/freetype-src/builds/unix/ftsystem.c @@ -4,7 +4,7 @@ * * Unix-specific FreeType low-level system interface (body). * - * Copyright (C) 1996-2022 by + * Copyright (C) 1996-2021 by * David Turner, Robert Wilhelm, and Werner Lemberg. * * This file is part of the FreeType project, and may only be used, diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/install.mk b/Build/source/libs/freetype2/freetype-src/builds/unix/install.mk index 0758d6e1a5e..45b761d5358 100644 --- a/Build/source/libs/freetype2/freetype-src/builds/unix/install.mk +++ b/Build/source/libs/freetype2/freetype-src/builds/unix/install.mk @@ -3,7 +3,7 @@ # -# Copyright (C) 1996-2022 by +# Copyright (C) 1996-2021 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/unix-cc.in b/Build/source/libs/freetype2/freetype-src/builds/unix/unix-cc.in index d5ae4674525..89be450167a 100644 --- a/Build/source/libs/freetype2/freetype-src/builds/unix/unix-cc.in +++ b/Build/source/libs/freetype2/freetype-src/builds/unix/unix-cc.in @@ -2,7 +2,7 @@ # FreeType 2 template for Unix-specific compiler definitions # -# Copyright (C) 1996-2022 by +# Copyright (C) 1996-2021 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -106,7 +106,9 @@ endif # Linker flags. # -LDFLAGS := @LDFLAGS@ +LDFLAGS := @LDFLAGS@ +LIB_CLOCK_GETTIME := @LIB_CLOCK_GETTIME@ # for ftbench + # export symbols # @@ -116,15 +118,11 @@ EXPORTS_LIST := $(OBJ_DIR)/ftexport.sym CCexe := $(CCraw_build) # used to compile `apinames' only -# Library linking. +# Library linking # LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \ -rpath $(libdir) -version-info $(version_info) \ $(LDFLAGS) -no-undefined \ -export-symbols $(EXPORTS_LIST) -# For the demo programs. -FT_DEMO_CFLAGS := @FT_DEMO_CFLAGS@ -FT_DEMO_LDFLAGS := @FT_DEMO_LDFLAGS@ - # EOF diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/unix-def.in b/Build/source/libs/freetype2/freetype-src/builds/unix/unix-def.in index 8e298ac5910..d0c758d03fb 100644 --- a/Build/source/libs/freetype2/freetype-src/builds/unix/unix-def.in +++ b/Build/source/libs/freetype2/freetype-src/builds/unix/unix-def.in @@ -3,7 +3,7 @@ # -# Copyright (C) 1996-2022 by +# Copyright (C) 1996-2021 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -68,14 +68,12 @@ version_info := @version_info@ # Variables needed for `freetype-config' and `freetype.pc'. # -PKG_CONFIG := @PKG_CONFIG@ -PKGCONFIG_REQUIRES := @PKGCONFIG_REQUIRES@ -PKGCONFIG_REQUIRES_PRIVATE := @PKGCONFIG_REQUIRES_PRIVATE@ -PKGCONFIG_LIBS := @PKGCONFIG_LIBS@ -PKGCONFIG_LIBS_PRIVATE := @PKGCONFIG_LIBS_PRIVATE@ -LIBSSTATIC_CONFIG := @LIBSSTATIC_CONFIG@ -build_libtool_libs := @build_libtool_libs@ -ft_version := @ft_version@ +PKG_CONFIG := @PKG_CONFIG@ +REQUIRES_PRIVATE := @REQUIRES_PRIVATE@ +LIBS_PRIVATE := @LIBS_PRIVATE@ +LIBSSTATIC_CONFIG := @LIBSSTATIC_CONFIG@ +build_libtool_libs := @build_libtool_libs@ +ft_version := @ft_version@ # The directory where all library files are placed. # @@ -139,17 +137,15 @@ prefix_x := $(subst $(space),\\$(space),$(prefix)) $(OBJ_BUILD)/freetype2.pc: $(TOP_DIR)/builds/unix/freetype2.in rm -f $@ $@.tmp - sed -e 's|%PKGCONFIG_REQUIRES%|$(PKGCONFIG_REQUIRES)|' \ - -e 's|%PKGCONFIG_REQUIRES_PRIVATE%|$(PKGCONFIG_REQUIRES_PRIVATE)|' \ - -e 's|%PKGCONFIG_LIBS%|$(PKGCONFIG_LIBS)|' \ - -e 's|%PKGCONFIG_LIBS_PRIVATE%|$(PKGCONFIG_LIBS_PRIVATE)|' \ - -e 's|%build_libtool_libs%|$(build_libtool_libs)|' \ - -e 's|%exec_prefix%|$(exec_prefix_x)|' \ - -e 's|%ft_version%|$(ft_version)|' \ - -e 's|%includedir%|$(includedir_x)|' \ - -e 's|%libdir%|$(libdir_x)|' \ - -e 's|%prefix%|$(prefix_x)|' \ - $< \ + sed -e 's|%REQUIRES_PRIVATE%|$(REQUIRES_PRIVATE)|' \ + -e 's|%LIBS_PRIVATE%|$(LIBS_PRIVATE)|' \ + -e 's|%build_libtool_libs%|$(build_libtool_libs)|' \ + -e 's|%exec_prefix%|$(exec_prefix_x)|' \ + -e 's|%ft_version%|$(ft_version)|' \ + -e 's|%includedir%|$(includedir_x)|' \ + -e 's|%libdir%|$(libdir_x)|' \ + -e 's|%prefix%|$(prefix_x)|' \ + $< \ > $@.tmp chmod a-w $@.tmp mv $@.tmp $@ diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/unix-dev.mk b/Build/source/libs/freetype2/freetype-src/builds/unix/unix-dev.mk index 37543895b2a..0b572a034bb 100644 --- a/Build/source/libs/freetype2/freetype-src/builds/unix/unix-dev.mk +++ b/Build/source/libs/freetype2/freetype-src/builds/unix/unix-dev.mk @@ -6,7 +6,7 @@ # -# Copyright (C) 1996-2022 by +# Copyright (C) 1996-2021 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/unix-lcc.mk b/Build/source/libs/freetype2/freetype-src/builds/unix/unix-lcc.mk index 0198adfd87a..db57835a0c1 100644 --- a/Build/source/libs/freetype2/freetype-src/builds/unix/unix-lcc.mk +++ b/Build/source/libs/freetype2/freetype-src/builds/unix/unix-lcc.mk @@ -6,7 +6,7 @@ # -# Copyright (C) 1996-2022 by +# Copyright (C) 1996-2021 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/unix.mk b/Build/source/libs/freetype2/freetype-src/builds/unix/unix.mk index e660fafa9d3..262fafb7486 100644 --- a/Build/source/libs/freetype2/freetype-src/builds/unix/unix.mk +++ b/Build/source/libs/freetype2/freetype-src/builds/unix/unix.mk @@ -3,7 +3,7 @@ # -# Copyright (C) 1996-2022 by +# Copyright (C) 1996-2021 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/unixddef.mk b/Build/source/libs/freetype2/freetype-src/builds/unix/unixddef.mk index 923773e0919..77c2a0df5c8 100644 --- a/Build/source/libs/freetype2/freetype-src/builds/unix/unixddef.mk +++ b/Build/source/libs/freetype2/freetype-src/builds/unix/unixddef.mk @@ -4,7 +4,7 @@ # -# Copyright (C) 1996-2022 by +# Copyright (C) 1996-2021 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, -- cgit v1.2.3