diff --git a/examples/ServerManager/UI/ServerListTab.php b/examples/ServerManager/UI/ServerListTab.php index 910a5c3..6d32a23 100644 --- a/examples/ServerManager/UI/ServerListTab.php +++ b/examples/ServerManager/UI/ServerListTab.php @@ -278,6 +278,7 @@ class ServerListTab $sshCommand = "ssh -i {$keyPath} root@{$host}"; $terminals = [ + 'alacritty -e ' . $sshCommand, 'gnome-terminal -- ' . $sshCommand, 'konsole -e ' . $sshCommand, 'xterm -e ' . $sshCommand, diff --git a/php-sdl3/.libs/helper.o b/php-sdl3/.libs/helper.o index ac75053..0670757 100644 Binary files a/php-sdl3/.libs/helper.o and b/php-sdl3/.libs/helper.o differ diff --git a/php-sdl3/.libs/sdl3.lai b/php-sdl3/.libs/sdl3.lai index d870c9c..7cd7b52 100644 --- a/php-sdl3/.libs/sdl3.lai +++ b/php-sdl3/.libs/sdl3.lai @@ -14,7 +14,7 @@ library_names='sdl3.so sdl3.so sdl3.so' old_library='' # Libraries that this one depends upon. -dependency_libs=' -L/usr/local/lib -lSDL3_image -lSDL3_ttf -lSDL3 -lharfbuzz -latomic -lsysprof-capture-4 -lpcre2-8 -lgraphite2 -lfreetype -lbz2 -lpng16 -lm -lz -lbrotlidec -lbrotlicommon -lnotify -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0' +dependency_libs=' -L/usr/local/lib -lSDL3_image -lSDL3_ttf -lSDL3 -lharfbuzz -latomic -lsysprof-capture-4 -lpcre2-8 -lpthread -lgraphite2 -lfreetype -ldl -lbz2 -lpng16 -lm -lz -lbrotlidec -lbrotlicommon -lnotify -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0' # Version information for sdl3. current=0 @@ -32,4 +32,4 @@ dlopen='' dlpreopen='' # Directory that this library needs to be installed in: -libdir='/home/thomas/projekte/phpnative/framework/php-sdl3/modules' +libdir='/home/thomas/projekte/sdl3/php-sdl3/modules' diff --git a/php-sdl3/.libs/sdl3.o b/php-sdl3/.libs/sdl3.o index bee9ad7..2b11517 100644 Binary files a/php-sdl3/.libs/sdl3.o and b/php-sdl3/.libs/sdl3.o differ diff --git a/php-sdl3/.libs/sdl3.so b/php-sdl3/.libs/sdl3.so index 9794134..405408d 100755 Binary files a/php-sdl3/.libs/sdl3.so and b/php-sdl3/.libs/sdl3.so differ diff --git a/php-sdl3/.libs/sdl3_events.o b/php-sdl3/.libs/sdl3_events.o index 0a2b99c..dc436fd 100644 Binary files a/php-sdl3/.libs/sdl3_events.o and b/php-sdl3/.libs/sdl3_events.o differ diff --git a/php-sdl3/.libs/sdl3_image.o b/php-sdl3/.libs/sdl3_image.o index 9ab5840..b2111f5 100644 Binary files a/php-sdl3/.libs/sdl3_image.o and b/php-sdl3/.libs/sdl3_image.o differ diff --git a/php-sdl3/.libs/sdl3_ttf.o b/php-sdl3/.libs/sdl3_ttf.o index 5241d98..ba715b3 100644 Binary files a/php-sdl3/.libs/sdl3_ttf.o and b/php-sdl3/.libs/sdl3_ttf.o differ diff --git a/php-sdl3/Makefile b/php-sdl3/Makefile index 625eab1..e50e064 100644 --- a/php-sdl3/Makefile +++ b/php-sdl3/Makefile @@ -1,10 +1,10 @@ -srcdir = /home/thomas/projekte/phpnative/framework/php-sdl3 -builddir = /home/thomas/projekte/phpnative/framework/php-sdl3 -top_srcdir = /home/thomas/projekte/phpnative/framework/php-sdl3 -top_builddir = /home/thomas/projekte/phpnative/framework/php-sdl3 +srcdir = /home/thomas/projekte/sdl3/php-sdl3 +builddir = /home/thomas/projekte/sdl3/php-sdl3 +top_srcdir = /home/thomas/projekte/sdl3/php-sdl3 +top_builddir = /home/thomas/projekte/sdl3/php-sdl3 EGREP = /usr/bin/grep -E SED = /usr/bin/sed -AWK = nawk +AWK = gawk SHLIB_SUFFIX_NAME = so SHLIB_DL_SUFFIX_NAME = so shared_objects_sdl3 = sdl3.lo helper.lo sdl3_image.lo sdl3_ttf.lo sdl3_events.lo @@ -18,7 +18,7 @@ exec_prefix = $(prefix) libdir = ${exec_prefix}/lib phpincludedir = /usr/local/include/php CC = cc -CFLAGS = -g -O2 -I/usr/local/include -I/usr/local/include -I/usr/local/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/sysprof-6 -pthread -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/sysprof-6 -I/usr/include/libpng16 -I/usr/include/x86_64-linux-gnu -I/usr/include/webp -I/usr/include/libmount -I/usr/include/blkid -pthread +CFLAGS = -g -O2 -I/usr/local/include -I/usr/local/include -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/sysprof-6 -pthread -I/usr/include/freetype2 -I/usr/include/libpng16 -DWITH_GZFILEOP -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/glycin-2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/gio-unix-2.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -DWITH_GZFILEOP -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/sysprof-6 -pthread CFLAGS_CLEAN = $(CFLAGS) -D_GNU_SOURCE CPP = cc -E CPPFLAGS = -DHAVE_CONFIG_H @@ -30,12 +30,12 @@ PHP_EXECUTABLE = /usr/local/bin/php EXTRA_LDFLAGS = EXTRA_LIBS = INCLUDES = -I/usr/local/include/php -I/usr/local/include/php/main -I/usr/local/include/php/TSRM -I/usr/local/include/php/Zend -I/usr/local/include/php/ext -I/usr/local/include/php/ext/date/lib -LDFLAGS = -L/usr/local/lib -Wl,-rpath,/usr/local/lib -Wl,--enable-new-dtags -lSDL3 -pthread -lm -L/usr/local/lib -lSDL3_image -Wl,-rpath,/usr/local/lib -Wl,--enable-new-dtags -lSDL3 -pthread -lm -L/usr/local/lib -lSDL3_ttf -Wl,-rpath,/usr/local/lib -Wl,--enable-new-dtags -lSDL3 -pthread -lm -lharfbuzz -pthread -lm -lz -lz -lm -lz -lbrotlicommon -lglib-2.0 -latomic -lm -pthread -lsysprof-capture-4 -pthread -lpcre2-8 -lgraphite2 -lfreetype -lz -lbz2 -lpng16 -lz -lm -lz -lbrotlidec -lbrotlicommon -lnotify -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 +LDFLAGS = -L/usr/local/lib -Wl,-rpath,/usr/local/lib -Wl,--enable-new-dtags -lSDL3 -pthread -lm -L/usr/local/lib -lSDL3_image -Wl,-rpath,/usr/local/lib -Wl,--enable-new-dtags -lSDL3 -pthread -lm -L/usr/local/lib -lSDL3_ttf -Wl,-rpath,/usr/local/lib -Wl,--enable-new-dtags -lSDL3 -pthread -lm -lharfbuzz -pthread -lm -lglib-2.0 -latomic -lm -lsysprof-capture-4 -Wl,-z,nodelete -pthread -lpcre2-8 -pthread -lpthread -lgraphite2 -lfreetype -ldl -lbz2 -lpng16 -lm -lm -lz -lbrotlidec -lbrotlicommon -lnotify -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 LIBTOOL = $(SHELL) $(top_builddir)/libtool -SHELL = /bin/bash +SHELL = /bin/sh INSTALL_HEADERS = BUILD_CC = cc -phplibdir = /home/thomas/projekte/phpnative/framework/php-sdl3/modules +phplibdir = /home/thomas/projekte/sdl3/php-sdl3/modules mkinstalldirs = $(top_srcdir)/build/shtool mkdir -p INSTALL = $(top_srcdir)/build/shtool install -c INSTALL_DATA = $(INSTALL) -m 644 @@ -203,20 +203,20 @@ prof-use: .PHONY: all clean install distclean test prof-gen prof-clean prof-use -include sdl3.dep -sdl3.lo: /home/thomas/projekte/phpnative/framework/php-sdl3/sdl3.c - $(LIBTOOL) --tag=CC --mode=compile $(CC) -I. -I/home/thomas/projekte/phpnative/framework/php-sdl3 $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -DZEND_COMPILE_DL_EXT=1 -c /home/thomas/projekte/phpnative/framework/php-sdl3/sdl3.c -o sdl3.lo -MMD -MF sdl3.dep -MT sdl3.lo +sdl3.lo: /home/thomas/projekte/sdl3/php-sdl3/sdl3.c + $(LIBTOOL) --tag=CC --mode=compile $(CC) -I. -I/home/thomas/projekte/sdl3/php-sdl3 $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -DZEND_COMPILE_DL_EXT=1 -c /home/thomas/projekte/sdl3/php-sdl3/sdl3.c -o sdl3.lo -MMD -MF sdl3.dep -MT sdl3.lo -include helper.dep -helper.lo: /home/thomas/projekte/phpnative/framework/php-sdl3/helper.c - $(LIBTOOL) --tag=CC --mode=compile $(CC) -I. -I/home/thomas/projekte/phpnative/framework/php-sdl3 $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -DZEND_COMPILE_DL_EXT=1 -c /home/thomas/projekte/phpnative/framework/php-sdl3/helper.c -o helper.lo -MMD -MF helper.dep -MT helper.lo +helper.lo: /home/thomas/projekte/sdl3/php-sdl3/helper.c + $(LIBTOOL) --tag=CC --mode=compile $(CC) -I. -I/home/thomas/projekte/sdl3/php-sdl3 $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -DZEND_COMPILE_DL_EXT=1 -c /home/thomas/projekte/sdl3/php-sdl3/helper.c -o helper.lo -MMD -MF helper.dep -MT helper.lo -include sdl3_image.dep -sdl3_image.lo: /home/thomas/projekte/phpnative/framework/php-sdl3/sdl3_image.c - $(LIBTOOL) --tag=CC --mode=compile $(CC) -I. -I/home/thomas/projekte/phpnative/framework/php-sdl3 $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -DZEND_COMPILE_DL_EXT=1 -c /home/thomas/projekte/phpnative/framework/php-sdl3/sdl3_image.c -o sdl3_image.lo -MMD -MF sdl3_image.dep -MT sdl3_image.lo +sdl3_image.lo: /home/thomas/projekte/sdl3/php-sdl3/sdl3_image.c + $(LIBTOOL) --tag=CC --mode=compile $(CC) -I. -I/home/thomas/projekte/sdl3/php-sdl3 $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -DZEND_COMPILE_DL_EXT=1 -c /home/thomas/projekte/sdl3/php-sdl3/sdl3_image.c -o sdl3_image.lo -MMD -MF sdl3_image.dep -MT sdl3_image.lo -include sdl3_ttf.dep -sdl3_ttf.lo: /home/thomas/projekte/phpnative/framework/php-sdl3/sdl3_ttf.c - $(LIBTOOL) --tag=CC --mode=compile $(CC) -I. -I/home/thomas/projekte/phpnative/framework/php-sdl3 $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -DZEND_COMPILE_DL_EXT=1 -c /home/thomas/projekte/phpnative/framework/php-sdl3/sdl3_ttf.c -o sdl3_ttf.lo -MMD -MF sdl3_ttf.dep -MT sdl3_ttf.lo +sdl3_ttf.lo: /home/thomas/projekte/sdl3/php-sdl3/sdl3_ttf.c + $(LIBTOOL) --tag=CC --mode=compile $(CC) -I. -I/home/thomas/projekte/sdl3/php-sdl3 $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -DZEND_COMPILE_DL_EXT=1 -c /home/thomas/projekte/sdl3/php-sdl3/sdl3_ttf.c -o sdl3_ttf.lo -MMD -MF sdl3_ttf.dep -MT sdl3_ttf.lo -include sdl3_events.dep -sdl3_events.lo: /home/thomas/projekte/phpnative/framework/php-sdl3/sdl3_events.c - $(LIBTOOL) --tag=CC --mode=compile $(CC) -I. -I/home/thomas/projekte/phpnative/framework/php-sdl3 $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -DZEND_COMPILE_DL_EXT=1 -c /home/thomas/projekte/phpnative/framework/php-sdl3/sdl3_events.c -o sdl3_events.lo -MMD -MF sdl3_events.dep -MT sdl3_events.lo +sdl3_events.lo: /home/thomas/projekte/sdl3/php-sdl3/sdl3_events.c + $(LIBTOOL) --tag=CC --mode=compile $(CC) -I. -I/home/thomas/projekte/sdl3/php-sdl3 $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -DZEND_COMPILE_DL_EXT=1 -c /home/thomas/projekte/sdl3/php-sdl3/sdl3_events.c -o sdl3_events.lo -MMD -MF sdl3_events.dep -MT sdl3_events.lo $(phplibdir)/sdl3.la: ./sdl3.la $(LIBTOOL) --tag=CC --mode=install cp ./sdl3.la $(phplibdir) diff --git a/php-sdl3/Makefile.objects b/php-sdl3/Makefile.objects index 6f30c55..5e861c4 100644 --- a/php-sdl3/Makefile.objects +++ b/php-sdl3/Makefile.objects @@ -1,18 +1,18 @@ -include sdl3.dep -sdl3.lo: /home/thomas/projekte/phpnative/framework/php-sdl3/sdl3.c - $(LIBTOOL) --tag=CC --mode=compile $(CC) -I. -I/home/thomas/projekte/phpnative/framework/php-sdl3 $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -DZEND_COMPILE_DL_EXT=1 -c /home/thomas/projekte/phpnative/framework/php-sdl3/sdl3.c -o sdl3.lo -MMD -MF sdl3.dep -MT sdl3.lo +sdl3.lo: /home/thomas/projekte/sdl3/php-sdl3/sdl3.c + $(LIBTOOL) --tag=CC --mode=compile $(CC) -I. -I/home/thomas/projekte/sdl3/php-sdl3 $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -DZEND_COMPILE_DL_EXT=1 -c /home/thomas/projekte/sdl3/php-sdl3/sdl3.c -o sdl3.lo -MMD -MF sdl3.dep -MT sdl3.lo -include helper.dep -helper.lo: /home/thomas/projekte/phpnative/framework/php-sdl3/helper.c - $(LIBTOOL) --tag=CC --mode=compile $(CC) -I. -I/home/thomas/projekte/phpnative/framework/php-sdl3 $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -DZEND_COMPILE_DL_EXT=1 -c /home/thomas/projekte/phpnative/framework/php-sdl3/helper.c -o helper.lo -MMD -MF helper.dep -MT helper.lo +helper.lo: /home/thomas/projekte/sdl3/php-sdl3/helper.c + $(LIBTOOL) --tag=CC --mode=compile $(CC) -I. -I/home/thomas/projekte/sdl3/php-sdl3 $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -DZEND_COMPILE_DL_EXT=1 -c /home/thomas/projekte/sdl3/php-sdl3/helper.c -o helper.lo -MMD -MF helper.dep -MT helper.lo -include sdl3_image.dep -sdl3_image.lo: /home/thomas/projekte/phpnative/framework/php-sdl3/sdl3_image.c - $(LIBTOOL) --tag=CC --mode=compile $(CC) -I. -I/home/thomas/projekte/phpnative/framework/php-sdl3 $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -DZEND_COMPILE_DL_EXT=1 -c /home/thomas/projekte/phpnative/framework/php-sdl3/sdl3_image.c -o sdl3_image.lo -MMD -MF sdl3_image.dep -MT sdl3_image.lo +sdl3_image.lo: /home/thomas/projekte/sdl3/php-sdl3/sdl3_image.c + $(LIBTOOL) --tag=CC --mode=compile $(CC) -I. -I/home/thomas/projekte/sdl3/php-sdl3 $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -DZEND_COMPILE_DL_EXT=1 -c /home/thomas/projekte/sdl3/php-sdl3/sdl3_image.c -o sdl3_image.lo -MMD -MF sdl3_image.dep -MT sdl3_image.lo -include sdl3_ttf.dep -sdl3_ttf.lo: /home/thomas/projekte/phpnative/framework/php-sdl3/sdl3_ttf.c - $(LIBTOOL) --tag=CC --mode=compile $(CC) -I. -I/home/thomas/projekte/phpnative/framework/php-sdl3 $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -DZEND_COMPILE_DL_EXT=1 -c /home/thomas/projekte/phpnative/framework/php-sdl3/sdl3_ttf.c -o sdl3_ttf.lo -MMD -MF sdl3_ttf.dep -MT sdl3_ttf.lo +sdl3_ttf.lo: /home/thomas/projekte/sdl3/php-sdl3/sdl3_ttf.c + $(LIBTOOL) --tag=CC --mode=compile $(CC) -I. -I/home/thomas/projekte/sdl3/php-sdl3 $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -DZEND_COMPILE_DL_EXT=1 -c /home/thomas/projekte/sdl3/php-sdl3/sdl3_ttf.c -o sdl3_ttf.lo -MMD -MF sdl3_ttf.dep -MT sdl3_ttf.lo -include sdl3_events.dep -sdl3_events.lo: /home/thomas/projekte/phpnative/framework/php-sdl3/sdl3_events.c - $(LIBTOOL) --tag=CC --mode=compile $(CC) -I. -I/home/thomas/projekte/phpnative/framework/php-sdl3 $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -DZEND_COMPILE_DL_EXT=1 -c /home/thomas/projekte/phpnative/framework/php-sdl3/sdl3_events.c -o sdl3_events.lo -MMD -MF sdl3_events.dep -MT sdl3_events.lo +sdl3_events.lo: /home/thomas/projekte/sdl3/php-sdl3/sdl3_events.c + $(LIBTOOL) --tag=CC --mode=compile $(CC) -I. -I/home/thomas/projekte/sdl3/php-sdl3 $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -DZEND_COMPILE_DL_EXT=1 -c /home/thomas/projekte/sdl3/php-sdl3/sdl3_events.c -o sdl3_events.lo -MMD -MF sdl3_events.dep -MT sdl3_events.lo $(phplibdir)/sdl3.la: ./sdl3.la $(LIBTOOL) --tag=CC --mode=install cp ./sdl3.la $(phplibdir) diff --git a/php-sdl3/config.m4 b/php-sdl3/config.m4 index 82ef4f1..21db1a1 100644 --- a/php-sdl3/config.m4 +++ b/php-sdl3/config.m4 @@ -37,7 +37,7 @@ if test "$PHP_SDL3" != "no"; then PKG_CONFIG_PATH="$PHP_SDL3_IMAGE/lib/pkgconfig:$PHP_SDL3_IMAGE/share/pkgconfig:$PKG_CONFIG_PATH" fi - PKG_CHECK_MODULES([SDL3_IMAGE], [sdl3-image >= 3.0.0], [ + PKG_CHECK_MODULES([SDL3_image], [sdl3-image >= 3.0.0], [ CFLAGS="$CFLAGS $SDL3_IMAGE_CFLAGS" ],[ AC_MSG_ERROR([SDL3_image not found. Please check your installation or use --with-sdl3-image=/path/to/sdl3_image]) diff --git a/php-sdl3/config.nice b/php-sdl3/config.nice index 52d739d..ae74fa4 100755 --- a/php-sdl3/config.nice +++ b/php-sdl3/config.nice @@ -3,4 +3,5 @@ # Created by configure './configure' \ +'PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:' \ "$@" diff --git a/php-sdl3/config.status b/php-sdl3/config.status index 2e07011..2c6674c 100755 --- a/php-sdl3/config.status +++ b/php-sdl3/config.status @@ -1,4 +1,4 @@ -#! /bin/bash +#! /bin/sh # Generated by configure. # Run this file to recreate the current configuration. # Compiler output produced by configure, useful for debugging @@ -8,7 +8,7 @@ debug=false ac_cs_recheck=false ac_cs_silent=false -SHELL=${CONFIG_SHELL-/bin/bash} +SHELL=${CONFIG_SHELL-/bin/sh} export SHELL ## -------------------- ## ## M4sh Initialization. ## @@ -413,7 +413,7 @@ $config_headers Report bugs to the package provider." -ac_cs_config='' +ac_cs_config='PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:' ac_cs_version="\ config.status configured by ./configure, generated by GNU Autoconf 2.72, @@ -423,7 +423,7 @@ Copyright (C) 2023 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." -ac_pwd='/home/thomas/projekte/phpnative/framework/php-sdl3' +ac_pwd='/home/thomas/projekte/sdl3/php-sdl3' srcdir='.' test -n "$AWK" || AWK=awk # The default lists apply if the user does not specify any file. @@ -494,10 +494,10 @@ if $ac_cs_silent; then fi if $ac_cs_recheck; then - set X /bin/bash './configure' $ac_configure_extra_args --no-create --no-recursion + set X /bin/sh './configure' 'PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:' $ac_configure_extra_args --no-create --no-recursion shift - \printf "%s\n" "running CONFIG_SHELL=/bin/bash $*" >&6 - CONFIG_SHELL='/bin/bash' + \printf "%s\n" "running CONFIG_SHELL=/bin/sh $*" >&6 + CONFIG_SHELL='/bin/sh' export CONFIG_SHELL exec "$@" fi diff --git a/php-sdl3/configure b/php-sdl3/configure index f0d50e7..dacf6ad 100755 --- a/php-sdl3/configure +++ b/php-sdl3/configure @@ -806,8 +806,8 @@ LIBNOTIFY_LIBS LIBNOTIFY_CFLAGS SDL3_TTF_LIBS SDL3_TTF_CFLAGS -SDL3_IMAGE_LIBS -SDL3_IMAGE_CFLAGS +SDL3_image_LIBS +SDL3_image_CFLAGS SDL3_LIBS SDL3_CFLAGS SHLIB_DL_SUFFIX_NAME @@ -911,8 +911,8 @@ CPPFLAGS CPP SDL3_CFLAGS SDL3_LIBS -SDL3_IMAGE_CFLAGS -SDL3_IMAGE_LIBS +SDL3_image_CFLAGS +SDL3_image_LIBS SDL3_TTF_CFLAGS SDL3_TTF_LIBS LIBNOTIFY_CFLAGS @@ -1584,10 +1584,10 @@ Some influential environment variables: CPP C preprocessor SDL3_CFLAGS C compiler flags for SDL3, overriding pkg-config SDL3_LIBS linker flags for SDL3, overriding pkg-config - SDL3_IMAGE_CFLAGS - C compiler flags for SDL3_IMAGE, overriding pkg-config - SDL3_IMAGE_LIBS - linker flags for SDL3_IMAGE, overriding pkg-config + SDL3_image_CFLAGS + C compiler flags for SDL3_image, overriding pkg-config + SDL3_image_LIBS + linker flags for SDL3_image, overriding pkg-config SDL3_TTF_CFLAGS C compiler flags for SDL3_TTF, overriding pkg-config SDL3_TTF_LIBS @@ -4979,8 +4979,8 @@ pkg_failed=no { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sdl3-image >= 3.0.0" >&5 printf %s "checking for sdl3-image >= 3.0.0... " >&6; } -if test -n "$SDL3_IMAGE_CFLAGS"; then - pkg_cv_SDL3_IMAGE_CFLAGS="$SDL3_IMAGE_CFLAGS" +if test -n "$SDL3_image_CFLAGS"; then + pkg_cv_SDL3_image_CFLAGS="$SDL3_image_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 \"sdl3-image >= 3.0.0\""; } >&5 @@ -4988,7 +4988,7 @@ if test -n "$SDL3_IMAGE_CFLAGS"; then ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_SDL3_IMAGE_CFLAGS=`$PKG_CONFIG --cflags "sdl3-image >= 3.0.0" 2>/dev/null` + pkg_cv_SDL3_image_CFLAGS=`$PKG_CONFIG --cflags "sdl3-image >= 3.0.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -4996,8 +4996,8 @@ fi else pkg_failed=untried fi -if test -n "$SDL3_IMAGE_LIBS"; then - pkg_cv_SDL3_IMAGE_LIBS="$SDL3_IMAGE_LIBS" +if test -n "$SDL3_image_LIBS"; then + pkg_cv_SDL3_image_LIBS="$SDL3_image_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 \"sdl3-image >= 3.0.0\""; } >&5 @@ -5005,7 +5005,7 @@ if test -n "$SDL3_IMAGE_LIBS"; then ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_SDL3_IMAGE_LIBS=`$PKG_CONFIG --libs "sdl3-image >= 3.0.0" 2>/dev/null` + pkg_cv_SDL3_image_LIBS=`$PKG_CONFIG --libs "sdl3-image >= 3.0.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -5026,12 +5026,12 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SDL3_IMAGE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sdl3-image >= 3.0.0" 2>&1` + SDL3_image_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sdl3-image >= 3.0.0" 2>&1` else - SDL3_IMAGE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sdl3-image >= 3.0.0" 2>&1` + SDL3_image_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sdl3-image >= 3.0.0" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$SDL3_IMAGE_PKG_ERRORS" >&5 + echo "$SDL3_image_PKG_ERRORS" >&5 as_fn_error $? "SDL3_image not found. Please check your installation or use --with-sdl3-image=/path/to/sdl3_image" "$LINENO" 5 @@ -5043,8 +5043,8 @@ printf "%s\n" "no" >&6; } as_fn_error $? "SDL3_image not found. Please check your installation or use --with-sdl3-image=/path/to/sdl3_image" "$LINENO" 5 else - SDL3_IMAGE_CFLAGS=$pkg_cv_SDL3_IMAGE_CFLAGS - SDL3_IMAGE_LIBS=$pkg_cv_SDL3_IMAGE_LIBS + SDL3_image_CFLAGS=$pkg_cv_SDL3_image_CFLAGS + SDL3_image_LIBS=$pkg_cv_SDL3_image_LIBS { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } diff --git a/php-sdl3/helper.dep b/php-sdl3/helper.dep index 7f54a81..93617b9 100644 --- a/php-sdl3/helper.dep +++ b/php-sdl3/helper.dep @@ -1,2 +1,2 @@ -helper.lo: /home/thomas/projekte/phpnative/framework/php-sdl3/helper.c \ - /home/thomas/projekte/phpnative/framework/php-sdl3/helper.h +helper.lo: /home/thomas/projekte/sdl3/php-sdl3/helper.c \ + /home/thomas/projekte/sdl3/php-sdl3/helper.h diff --git a/php-sdl3/libtool b/php-sdl3/libtool index cac7d49..9a15f52 100755 --- a/php-sdl3/libtool +++ b/php-sdl3/libtool @@ -1,4 +1,4 @@ -#! /bin/bash +#! /bin/sh # libtoolT - Provide generalized library-building support services. # Generated automatically by (GNU ) @@ -44,10 +44,10 @@ available_tags="" # ### BEGIN LIBTOOL CONFIG -# Libtool was configured on host thomas-XPS-15-7590: +# Libtool was configured on host cachyos-x8664: # Shell to use when invoking shell scripts. -SHELL="/bin/bash" +SHELL="/bin/sh" # Whether or not to build shared libraries. build_libtool_libs=yes @@ -85,7 +85,7 @@ AR_FLAGS="cru" LTCC="cc" # LTCC compiler flags. -LTCFLAGS="-g -O2 -I/usr/local/include -I/usr/local/include -I/usr/local/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/sysprof-6 -pthread -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/sysprof-6 -I/usr/include/libpng16 -I/usr/include/x86_64-linux-gnu -I/usr/include/webp -I/usr/include/libmount -I/usr/include/blkid -pthread " +LTCFLAGS="-g -O2 -I/usr/local/include -I/usr/local/include -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/sysprof-6 -pthread -I/usr/include/freetype2 -I/usr/include/libpng16 -DWITH_GZFILEOP -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/glycin-2 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/gio-unix-2.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -DWITH_GZFILEOP -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/sysprof-6 -pthread" # A language-specific compiler. CC="cc" @@ -329,10 +329,10 @@ variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COM link_all_deplibs=unknown # Compile-time system search path for libraries -sys_lib_search_path_spec="/usr/lib/gcc/x86_64-linux-gnu/14 /usr/lib/x86_64-linux-gnu /usr/lib /lib/x86_64-linux-gnu /lib" +sys_lib_search_path_spec="/usr/lib/gcc/x86_64-pc-linux-gnu/15.2.1 /usr/lib /lib" # Run-time system search path for libraries -sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib/x86_64-linux-gnu/libfakeroot /usr/local/lib/i386-linux-gnu /lib/i386-linux-gnu /usr/lib/i386-linux-gnu /usr/local/lib/i686-linux-gnu /lib/i686-linux-gnu /usr/lib/i686-linux-gnu /usr/local/lib /usr/local/lib/x86_64-linux-gnu /lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu /lib32 /usr/lib32 " +sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib32 /usr/lib/libfakeroot " # Fix the shell variable $srcfile for the compiler. fix_srcfile_path="" diff --git a/php-sdl3/modules/sdl3.la b/php-sdl3/modules/sdl3.la deleted file mode 100644 index d870c9c..0000000 --- a/php-sdl3/modules/sdl3.la +++ /dev/null @@ -1,35 +0,0 @@ -# sdl3.la - a libtool library file -# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.492 2008/01/30 06:40:56) -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='sdl3.so' - -# Names of this library. -library_names='sdl3.so sdl3.so sdl3.so' - -# The name of the static archive. -old_library='' - -# Libraries that this one depends upon. -dependency_libs=' -L/usr/local/lib -lSDL3_image -lSDL3_ttf -lSDL3 -lharfbuzz -latomic -lsysprof-capture-4 -lpcre2-8 -lgraphite2 -lfreetype -lbz2 -lpng16 -lm -lz -lbrotlidec -lbrotlicommon -lnotify -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0' - -# Version information for sdl3. -current=0 -age=0 -revision=0 - -# Is this an already installed library? -installed=yes - -# Should we warn about portability when linking against -modules? -shouldnotlink=yes - -# Files to dlopen/dlpreopen -dlopen='' -dlpreopen='' - -# Directory that this library needs to be installed in: -libdir='/home/thomas/projekte/phpnative/framework/php-sdl3/modules' diff --git a/php-sdl3/modules/sdl3.so b/php-sdl3/modules/sdl3.so index 9794134..405408d 100755 Binary files a/php-sdl3/modules/sdl3.so and b/php-sdl3/modules/sdl3.so differ diff --git a/php-sdl3/run-tests.php b/php-sdl3/run-tests.php index 166c6ff..34e8b36 100644 --- a/php-sdl3/run-tests.php +++ b/php-sdl3/run-tests.php @@ -601,7 +601,7 @@ function main(): void $show_progress = false; break; case '--version': - echo '$Id: 4654ead998f9aabe1bb9a10badec4b09caeeef2c $' . "\n"; + echo '$Id: e437487f4d17740345ab3e770b4b7e2212fbcd1b $' . "\n"; exit(1); default: @@ -648,6 +648,12 @@ function main(): void $environment['SKIP_ONLINE_TESTS'] = $online ? '0' : '1'; } + if (!defined('STDIN') || !stream_isatty(STDIN) + || !defined('STDOUT') || !stream_isatty(STDOUT) + || !defined('STDERR') || !stream_isatty(STDERR)) { + $environment['SKIP_IO_CAPTURE_TESTS'] = '1'; + } + if ($selected_tests && count($test_files) === 0) { echo "No tests found.\n"; return; @@ -2799,6 +2805,11 @@ function is_flaky(TestFile $test): bool if ($test->hasSection('FLAKY')) { return true; } + if ($test->hasSection('SKIPIF')) { + if (strpos($test->getSection('SKIPIF'), 'SKIP_PERF_SENSITIVE') !== false) { + return true; + } + } if (!$test->hasSection('FILE')) { return false; } diff --git a/php-sdl3/sdl3.dep b/php-sdl3/sdl3.dep index febfc8e..8751b9d 100644 --- a/php-sdl3/sdl3.dep +++ b/php-sdl3/sdl3.dep @@ -1,5 +1,5 @@ -sdl3.lo: /home/thomas/projekte/phpnative/framework/php-sdl3/sdl3.c \ - /home/thomas/projekte/phpnative/framework/php-sdl3/config.h \ +sdl3.lo: /home/thomas/projekte/sdl3/php-sdl3/sdl3.c \ + /home/thomas/projekte/sdl3/php-sdl3/config.h \ /usr/local/include/php/main/php.h \ /usr/local/include/php/main/php_version.h \ /usr/local/include/php/Zend/zend.h \ @@ -90,8 +90,8 @@ sdl3.lo: /home/thomas/projekte/phpnative/framework/php-sdl3/sdl3.c \ /usr/local/include/php/TSRM/TSRM.h \ /usr/local/include/php/Zend/zend_constants.h \ /usr/local/include/php/main/php_reentrancy.h \ - /home/thomas/projekte/phpnative/framework/php-sdl3/php_sdl3.h \ - /home/thomas/projekte/phpnative/framework/php-sdl3/helper.h \ - /home/thomas/projekte/phpnative/framework/php-sdl3/sdl3_image.h \ - /home/thomas/projekte/phpnative/framework/php-sdl3/sdl3_ttf.h \ - /home/thomas/projekte/phpnative/framework/php-sdl3/sdl3_events.h + /home/thomas/projekte/sdl3/php-sdl3/php_sdl3.h \ + /home/thomas/projekte/sdl3/php-sdl3/helper.h \ + /home/thomas/projekte/sdl3/php-sdl3/sdl3_image.h \ + /home/thomas/projekte/sdl3/php-sdl3/sdl3_ttf.h \ + /home/thomas/projekte/sdl3/php-sdl3/sdl3_events.h diff --git a/php-sdl3/sdl3.la b/php-sdl3/sdl3.la index 36d3c49..8be13a8 100644 --- a/php-sdl3/sdl3.la +++ b/php-sdl3/sdl3.la @@ -14,7 +14,7 @@ library_names='sdl3.so sdl3.so sdl3.so' old_library='' # Libraries that this one depends upon. -dependency_libs=' -L/usr/local/lib -lSDL3_image -lSDL3_ttf -lSDL3 -lharfbuzz -latomic -lsysprof-capture-4 -lpcre2-8 -lgraphite2 -lfreetype -lbz2 -lpng16 -lm -lz -lbrotlidec -lbrotlicommon -lnotify -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0' +dependency_libs=' -L/usr/local/lib -lSDL3_image -lSDL3_ttf -lSDL3 -lharfbuzz -latomic -lsysprof-capture-4 -lpcre2-8 -lpthread -lgraphite2 -lfreetype -ldl -lbz2 -lpng16 -lm -lz -lbrotlidec -lbrotlicommon -lnotify -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0' # Version information for sdl3. current=0 @@ -32,4 +32,4 @@ dlopen='' dlpreopen='' # Directory that this library needs to be installed in: -libdir='/home/thomas/projekte/phpnative/framework/php-sdl3/modules' +libdir='/home/thomas/projekte/sdl3/php-sdl3/modules' diff --git a/php-sdl3/sdl3_events.dep b/php-sdl3/sdl3_events.dep index 18a2b1c..6f6dbe4 100644 --- a/php-sdl3/sdl3_events.dep +++ b/php-sdl3/sdl3_events.dep @@ -1,6 +1,5 @@ -sdl3_events.lo: \ - /home/thomas/projekte/phpnative/framework/php-sdl3/sdl3_events.c \ - /home/thomas/projekte/phpnative/framework/php-sdl3/config.h \ +sdl3_events.lo: /home/thomas/projekte/sdl3/php-sdl3/sdl3_events.c \ + /home/thomas/projekte/sdl3/php-sdl3/config.h \ /usr/local/include/php/main/php.h \ /usr/local/include/php/main/php_version.h \ /usr/local/include/php/Zend/zend.h \ @@ -91,5 +90,5 @@ sdl3_events.lo: \ /usr/local/include/php/TSRM/TSRM.h \ /usr/local/include/php/Zend/zend_constants.h \ /usr/local/include/php/main/php_reentrancy.h \ - /home/thomas/projekte/phpnative/framework/php-sdl3/php_sdl3.h \ - /home/thomas/projekte/phpnative/framework/php-sdl3/sdl3_events.h + /home/thomas/projekte/sdl3/php-sdl3/php_sdl3.h \ + /home/thomas/projekte/sdl3/php-sdl3/sdl3_events.h diff --git a/php-sdl3/sdl3_image.dep b/php-sdl3/sdl3_image.dep index 4f51eca..489db59 100644 --- a/php-sdl3/sdl3_image.dep +++ b/php-sdl3/sdl3_image.dep @@ -1,6 +1,5 @@ -sdl3_image.lo: \ - /home/thomas/projekte/phpnative/framework/php-sdl3/sdl3_image.c \ - /home/thomas/projekte/phpnative/framework/php-sdl3/config.h \ +sdl3_image.lo: /home/thomas/projekte/sdl3/php-sdl3/sdl3_image.c \ + /home/thomas/projekte/sdl3/php-sdl3/config.h \ /usr/local/include/php/main/php.h \ /usr/local/include/php/main/php_version.h \ /usr/local/include/php/Zend/zend.h \ @@ -91,5 +90,5 @@ sdl3_image.lo: \ /usr/local/include/php/TSRM/TSRM.h \ /usr/local/include/php/Zend/zend_constants.h \ /usr/local/include/php/main/php_reentrancy.h \ - /home/thomas/projekte/phpnative/framework/php-sdl3/php_sdl3.h \ - /home/thomas/projekte/phpnative/framework/php-sdl3/sdl3_image.h + /home/thomas/projekte/sdl3/php-sdl3/php_sdl3.h \ + /home/thomas/projekte/sdl3/php-sdl3/sdl3_image.h diff --git a/php-sdl3/sdl3_ttf.dep b/php-sdl3/sdl3_ttf.dep index fdc3627..a6a364e 100644 --- a/php-sdl3/sdl3_ttf.dep +++ b/php-sdl3/sdl3_ttf.dep @@ -1,6 +1,5 @@ -sdl3_ttf.lo: \ - /home/thomas/projekte/phpnative/framework/php-sdl3/sdl3_ttf.c \ - /home/thomas/projekte/phpnative/framework/php-sdl3/config.h \ +sdl3_ttf.lo: /home/thomas/projekte/sdl3/php-sdl3/sdl3_ttf.c \ + /home/thomas/projekte/sdl3/php-sdl3/config.h \ /usr/local/include/php/main/php.h \ /usr/local/include/php/main/php_version.h \ /usr/local/include/php/Zend/zend.h \ @@ -91,6 +90,6 @@ sdl3_ttf.lo: \ /usr/local/include/php/TSRM/TSRM.h \ /usr/local/include/php/Zend/zend_constants.h \ /usr/local/include/php/main/php_reentrancy.h \ - /home/thomas/projekte/phpnative/framework/php-sdl3/php_sdl3.h \ - /home/thomas/projekte/phpnative/framework/php-sdl3/sdl3_ttf.h \ - /home/thomas/projekte/phpnative/framework/php-sdl3/sdl3_image.h + /home/thomas/projekte/sdl3/php-sdl3/php_sdl3.h \ + /home/thomas/projekte/sdl3/php-sdl3/sdl3_ttf.h \ + /home/thomas/projekte/sdl3/php-sdl3/sdl3_image.h