Merge branch 'PHP-8.2' into PHP-8.3

* PHP-8.2:
Fix GH-12019: ext/gd/config.m4: don't forget GDLIB_CFLAGS in feature tests

Fix GH-12019: ext/gd/config.m4: don't forget GDLIB_CFLAGS in feature tests

In commit 85e5635a, a feature test for the various libgd image formats
was added. That test however erroneously

Fix GH-12019: ext/gd/config.m4: don't forget GDLIB_CFLAGS in feature tests

In commit 85e5635a, a feature test for the various libgd image formats
was added. That test however erroneously omits the GDLIB_CFLAGS (from
pkg-config) during compilation. This can lead to build failures and
therefore false negatives from the test.

Here, we add $GDLIB_CFLAGS to $CFLAGS for the duration of the test.

Closes GH-12019

show more ...

Fix GH-13727: macro generating invalid call test prototypes fixes.

autoconf/libtool generating code to test features missed `void` for
C calls prototypes w/o arguments.
Note that spe

Fix GH-13727: macro generating invalid call test prototypes fixes.

autoconf/libtool generating code to test features missed `void` for
C calls prototypes w/o arguments.
Note that specific changes related to libtool have to be upstreamed.

Co-authored-by: Peter Kokot <petk@php.net>

close GH-13732

show more ...

Merge branch 'PHP-8.2' into PHP-8.3

* PHP-8.2:
Fix detection of image formats in system gd library

Fix detection of image formats in system gd library

- Use gdFontCacheShutdown() to detect freetype
Currently we look for gdImageStringFT() to determine whether or not gd
has free

Fix detection of image formats in system gd library

- Use gdFontCacheShutdown() to detect freetype
Currently we look for gdImageStringFT() to determine whether or not gd
has freetype support... but that function always exists. This leads
PHP to believe that gd has freetype support when it does not, and can
lead to build failures.

The gdFontCacheShutdown() function, on the other hand, is only present
when gd was built with freetype support. Let's use that instead.

- Fix GD image format detection
We currently check for, say, AVIF support by attempting to link a
program that calls libgd's gdImageCreateFromAvif() function. But
perversely, that function always exists in libgd; moreover when AVIF
support is missing it emits a warning and returns normally. Thus
our straightforward link test becomes not so straightforward.

This commit adds a new macro PHP_GD_CHECK_FORMAT that compiles, links,
and runs a test program instead. The test program overrides that "emit
a warning" handler so that the program actually fails if the format
we're looking for is not supported. This fixes detection of AVIF and
the other formats we check for in an external libgd.

- ext/gd/tests/bug77391.phpt: skip if gd lacks BMP support
I don't actually know how to remove BMP support from libgd, but PHP
has a ./configure test for it, so we should probably treat it as
optional.

Closes GH-12019

show more ...

fix -Wreturn-type and -Wstrict-prototypes in gd configure (#12328)

Suppress -Wstrict-prototypes in GD extension (#10803)

GD uses variadict functions where the signature depends on the library and types of images.
Until we can use void f(...) that was in

Suppress -Wstrict-prototypes in GD extension (#10803)

GD uses variadict functions where the signature depends on the library and types of images.
Until we can use void f(...) that was introduced in C23 suppress this warning.

show more ...

fix [-Wstrict-prototypes] build warnings in ext/gd

Require libavif version >= 0.8.2

Closes GH-7554.

Lossless conversion for webp

Propagating lossless conversion from libgd to our bundled gd.
Changing "quantization" to "quality" as in libgd.
Adding test.

IMG_WEBP_LOSSLESS i

Lossless conversion for webp

Propagating lossless conversion from libgd to our bundled gd.
Changing "quantization" to "quality" as in libgd.
Adding test.

IMG_WEBP_LOSSLESS is only defined, if lossless WebP encoding is
supported by the libgd used.

Closes GH-7348.

show more ...

Add avif support to ext/gd

This backports avif support from upstream libgd into bundled libgd
and exposes the functionality through new imagecreatefromavif()
and imageavif() function

Add avif support to ext/gd

This backports avif support from upstream libgd into bundled libgd
and exposes the functionality through new imagecreatefromavif()
and imageavif() functions.

Closes GH-7026.

Co-authored-by: Christoph M. Becker <cmbecker69@gmx.de>

show more ...

Add -Wstrict-prototypes compiler warning

Disable it for the following extensions:
- GD
- pspell
- readline

Closes GH-5888

Add imagegetinterpolation()

While `imagesetinterpolation()` is available as of PHP 5.5.0,
there is no according getter function, so users would have to track the
current interpolatio

Add imagegetinterpolation()

While `imagesetinterpolation()` is available as of PHP 5.5.0,
there is no according getter function, so users would have to track the
current interpolation method manually.

To remedy this, we introduce `imagegetinterpolation()` as thin wrapper
for `gdImageGetInterpolationMethod()` (which has been introduced with
libgd 2.1.1), and use `im->interpolation_id` as fallback for older
libgd. Since our bundled libgd does not yet have this function, we add
it.

We also simplify the recently introduced bug79068.phpt, where it is
sufficient to check that the interpolation method has not been changed.

show more ...

cleanup gd build with system libgd - drop need to use libpng with system libgd - drop need to use libjpeg with system libgd - drop need to use libXpm with system libgd - drop need to use libfreetype

cleanup gd build with system libgd - drop need to use libpng with system libgd - drop need to use libjpeg with system libgd - drop need to use libXpm with system libgd - drop need to use libfreetype with system libgd - improve configure comments

show more ...

Drop superfluous ENABLE_GD_TTF

If we `HAVE_LIBFREETYPE`, we define `ENABLE_GD_TTF` if it is not
defined. Therefore we can check for `HAVE_LIBFREETYPE` in the first
place.

improve temporary fix for system libgd

- PHP_GD_PNG needed to set include path for png.h
- PHP_GD_JPEG needed to set include path for jpeglib.h

Fixed bug #78314 (missing freetype support/functions with external gd)

Support TGA reading

We add PHP bindings for libgd's features to read TGA files, which are
available as of libgd 2.1.0.

As PHP's bundled libgd doesn't yet include the respective

Support TGA reading

We add PHP bindings for libgd's features to read TGA files, which are
available as of libgd 2.1.0.

As PHP's bundled libgd doesn't yet include the respective features of the
external libgd, we add these.

Since TGA has no easily recognizable file signature, we don't add TGA
support for imagecreatefromstring() or getimagesize() and friends.

show more ...

Normalize comments in *nix build system m4 files

Normalization include:
- Use dnl for everything that can be ommitted when configure is built in
favor of the shell comment characte

Normalize comments in *nix build system m4 files

Normalization include:
- Use dnl for everything that can be ommitted when configure is built in
favor of the shell comment character # which is visible in the output.
- Line length normalized to 80 columns
- Dots for most of the one line sentences
- Macro definitions include similar pattern header comments now

show more ...

Add AS_HELP_STRING to *nix build configure options

The Autoconf's default AS_HELP_STRING macro can properly format help
strings [1] so watching out if columns are aligned manually is not

Add AS_HELP_STRING to *nix build configure options

The Autoconf's default AS_HELP_STRING macro can properly format help
strings [1] so watching out if columns are aligned manually is not
anymore.

[1] https://www.gnu.org/software/autoconf/manual/autoconf.html#Pretty-Help-Strings

show more ...

Use pkg-config to detect and configure for system libgd

Formerly, a single option `--with-gd` was sufficient to enable the
extension, and to determine whether to use the system or the bu

Use pkg-config to detect and configure for system libgd

Formerly, a single option `--with-gd` was sufficient to enable the
extension, and to determine whether to use the system or the bundled
libgd depending on whether a directory was passed. Since pkg-config
determines the path automatically, we now offer `--enable-gd` (whether
the extension should be build) and `--with-external-gd` (whether to use
the system libgd).

show more ...

Migrate ext/gd to pkg-config

* --with-webp-dir becomes --with-webp
* --with-jpeg-dir becomes --with-jpeg
* --with-png-dir is removed. libpng is required.
* --with-zlib-dir is rem

Migrate ext/gd to pkg-config

* --with-webp-dir becomes --with-webp
* --with-jpeg-dir becomes --with-jpeg
* --with-png-dir is removed. libpng is required.
* --with-zlib-dir is removed. zlib is required.
* --with-xpm-dir becomes --with-xpm.

We also enable --with-webp on Travis.

show more ...

ext/gd: use --with instead of --enable

By convention it probably makes sense to stick with this even when
dropping the *-dir=DIR part.

See:
https://github.com/php/php-src/pu

ext/gd: use --with instead of --enable

By convention it probably makes sense to stick with this even when
dropping the *-dir=DIR part.

See:
https://github.com/php/php-src/pull/3632#discussion_r229474568
https://autotools.io/autoconf/arguments.html

show more ...

ext/gd: Use pkg-config to detect the availability of freetype2

The latest version of freetype2 does not install freetype-config by
default, but pkg-config support has been there for appr

ext/gd: Use pkg-config to detect the availability of freetype2

The latest version of freetype2 does not install freetype-config by
default, but pkg-config support has been there for approximately 15
years. In order to reliably detect freetype2, pkg-config *must* be used.

See:
https://savannah.nongnu.org/bugs/?53093
https://bugs.php.net/bug.php?id=76324

show more ...

Trim trailing whitespaces in build files

Some editors utilizing .editorconfig automatically trim whitespaces. For
convenience this patch removes whitespaces in certain build files:
-

Trim trailing whitespaces in build files

Some editors utilizing .editorconfig automatically trim whitespaces. For
convenience this patch removes whitespaces in certain build files:
- ext/*/config*.m4
- configure.ac
- acinclude.m4

show more ...