mirror of
https://github.com/openwrt/packages.git
synced 2025-07-05 20:33:08 +00:00
9ebb457377
This is a major upgrade to latest stable PHP version. - IMAP extension was unbundled from PHP - align patch filenames with latest ones from Debian - removed obsolete patches - adapted/refreshed patches - added patch to remove call to httpd during configure Note: this assumes that 'prefork' mpm is used Upstream changelog for this specific release: https://www.php.net/ChangeLog-8.php#8.4.5 Signed-off-by: Michael Heimpold <mhei@heimpold.de>
42 lines
1.8 KiB
Diff
42 lines
1.8 KiB
Diff
--- a/ext/gd/config.m4
|
|
+++ b/ext/gd/config.m4
|
|
@@ -154,7 +154,7 @@ LIBS="${LIBS} ${GD_SHARED_LIBADD}"
|
|
old_CFLAGS="${CFLAGS}"
|
|
CFLAGS="${CFLAGS} ${GDLIB_CFLAGS}"
|
|
AC_LANG_PUSH([C])
|
|
-AC_CACHE_CHECK([for working gdImageCreateFrom$1 in libgd], [php_var],
|
|
+AC_CACHE_CHECK([for working gdImageCreateFrom$1 in libgd (OpenWrt build config based)], [php_var],
|
|
[AC_RUN_IFELSE([AC_LANG_SOURCE([
|
|
#include <stdio.h>
|
|
#include <unistd.h>
|
|
@@ -177,7 +177,7 @@ int main(int argc, char** argv) {
|
|
}])],
|
|
[AS_VAR_SET([php_var], [yes])],
|
|
[AS_VAR_SET([php_var], [no])],
|
|
- [AS_VAR_SET([php_var], [no])])])
|
|
+ [AS_VAR_SET([php_var], [$3])])])
|
|
AS_VAR_IF([php_var], [yes], [$2])
|
|
AC_LANG_POP([C])
|
|
CFLAGS="${old_CFLAGS}"
|
|
@@ -186,13 +186,13 @@ AS_VAR_POPDEF([php_var])
|
|
])
|
|
|
|
AC_DEFUN([PHP_GD_CHECK_VERSION],[
|
|
- PHP_GD_CHECK_FORMAT([Png], [AC_DEFINE([HAVE_GD_PNG], [1])])
|
|
- PHP_GD_CHECK_FORMAT([Avif], [AC_DEFINE([HAVE_GD_AVIF], [1])])
|
|
- PHP_GD_CHECK_FORMAT([Webp], [AC_DEFINE([HAVE_GD_WEBP], [1])])
|
|
- PHP_GD_CHECK_FORMAT([Jpeg], [AC_DEFINE([HAVE_GD_JPG], [1])])
|
|
- PHP_GD_CHECK_FORMAT([Xpm], [AC_DEFINE([HAVE_GD_XPM], [1])])
|
|
- PHP_GD_CHECK_FORMAT([Bmp], [AC_DEFINE([HAVE_GD_BMP], [1])])
|
|
- PHP_GD_CHECK_FORMAT([Tga], [AC_DEFINE([HAVE_GD_TGA], [1])])
|
|
+ PHP_GD_CHECK_FORMAT([Png], [AC_DEFINE([HAVE_GD_PNG], [1])], [yes])
|
|
+ PHP_GD_CHECK_FORMAT([Avif], [AC_DEFINE([HAVE_GD_AVIF], [1])], [no])
|
|
+ PHP_GD_CHECK_FORMAT([Webp], [AC_DEFINE([HAVE_GD_WEBP], [1])], [yes])
|
|
+ PHP_GD_CHECK_FORMAT([Jpeg], [AC_DEFINE([HAVE_GD_JPG], [1])], [yes])
|
|
+ PHP_GD_CHECK_FORMAT([Xpm], [AC_DEFINE([HAVE_GD_XPM], [1])], [no])
|
|
+ PHP_GD_CHECK_FORMAT([Bmp], [AC_DEFINE([HAVE_GD_BMP], [1])], [no])
|
|
+ PHP_GD_CHECK_FORMAT([Tga], [AC_DEFINE([HAVE_GD_TGA], [1])], [no])
|
|
PHP_CHECK_LIBRARY([gd], [gdFontCacheShutdown],
|
|
[AC_DEFINE([HAVE_GD_FREETYPE], [1])],
|
|
[],
|