diff --git a/devel/pecl-swoole/Makefile b/devel/pecl-swoole/Makefile index 539baec7ec56..d7355b311bcd 100644 --- a/devel/pecl-swoole/Makefile +++ b/devel/pecl-swoole/Makefile @@ -1,35 +1,35 @@ PORTNAME= swoole -PORTVERSION= 5.0.3 +PORTVERSION= 5.1.0 CATEGORIES= devel net MAINTAINER= vanilla@FreeBSD.org COMMENT= Asynchronous, concurrent, and distributed networking framework WWW= https://pecl.php.net/package/swoole LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE USES= compiler:c11 localbase:ldflags php:build,pecl ssl -IGNORE_WITH_PHP= 83 CONFIGURE_ARGS+= --enable-mysqlnd OPTIONS_DEFINE= BROTLI CARES CURL HTTP2 JSON PGSQL SOCKETS CARES_LIB_DEPENDS= libcares.so:dns/c-ares CARES_CONFIGURE_ON= --enable-cares HTTP2_CONFIGURE_ON= --enable-http2 \ --enable-openssl SOCKETS_USE= PHP=sockets:build SOCKETS_DESC= Use native php sockets extension SOCKETS_CONFIGURE_ON= --enable-sockets CURL_LIB_DEPENDS= libcurl.so:ftp/curl CURL_CONFIGURE_ON= --enable-swoole-curl CURL_USE= PHP=curl JSON_CONFIGURE_ON= --enable-swoole-json JSON_USES= php:build PGSQL_CONFIGURE_ON= --enable-swoole-pgsql PGSQL_USES= pgsql +PGSQL_USE= PHP=pdo:build BROTLI_CONFIGURE_ON= --enable-brotli BROTLI_LIB_DEPENDS= libbrotlicommon.so:archivers/brotli .include diff --git a/devel/pecl-swoole/distinfo b/devel/pecl-swoole/distinfo index 13ecf9dde989..6d0c0fc6b72e 100644 --- a/devel/pecl-swoole/distinfo +++ b/devel/pecl-swoole/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1684622878 -SHA256 (PECL/swoole-5.0.3.tgz) = 6c51e11199214921e07ab1b9f0e67781c96f7b8e06afb4225f05d1dc79832ead -SIZE (PECL/swoole-5.0.3.tgz) = 2066852 +TIMESTAMP = 1696125285 +SHA256 (PECL/swoole-5.1.0.tgz) = a95effad6f5c7acf24ce0635cec646caccbb56f19e42a2643ccbfb46d82a92ee +SIZE (PECL/swoole-5.1.0.tgz) = 2199005 diff --git a/devel/pecl-swoole/files/patch-config.m4 b/devel/pecl-swoole/files/patch-config.m4 index dfdcd4f5c616..aede679ba8a8 100644 --- a/devel/pecl-swoole/files/patch-config.m4 +++ b/devel/pecl-swoole/files/patch-config.m4 @@ -1,11 +1,11 @@ ---- config.m4.orig 2021-07-16 07:18:11 UTC +--- config.m4.orig 2023-09-29 09:24:26 UTC +++ config.m4 -@@ -340,7 +340,7 @@ if test "$PHP_SWOOLE" != "no"; then +@@ -369,7 +369,7 @@ if test "$PHP_SWOOLE" != "no"; then AC_CHECK_LIB(c, poll, AC_DEFINE(HAVE_POLL, 1, [have poll])) AC_CHECK_LIB(c, sendfile, AC_DEFINE(HAVE_SENDFILE, 1, [have sendfile])) AC_CHECK_LIB(c, kqueue, AC_DEFINE(HAVE_KQUEUE, 1, [have kqueue])) - AC_CHECK_LIB(c, backtrace, AC_DEFINE(HAVE_EXECINFO, 1, [have execinfo])) + AC_CHECK_LIB(execinfo, backtrace, AC_DEFINE(HAVE_EXECINFO, 1, [have execinfo])) AC_CHECK_LIB(c, daemon, AC_DEFINE(HAVE_DAEMON, 1, [have daemon])) AC_CHECK_LIB(c, mkostemp, AC_DEFINE(HAVE_MKOSTEMP, 1, [have mkostemp])) AC_CHECK_LIB(c, inotify_init, AC_DEFINE(HAVE_INOTIFY, 1, [have inotify])) diff --git a/devel/pecl-swoole/files/patch-include_swoole__async.h b/devel/pecl-swoole/files/patch-include_swoole__async.h new file mode 100644 index 000000000000..641b5f3381fd --- /dev/null +++ b/devel/pecl-swoole/files/patch-include_swoole__async.h @@ -0,0 +1,13 @@ +--- include/swoole_async.h.orig 2023-10-01 04:44:15 UTC ++++ include/swoole_async.h +@@ -23,6 +23,10 @@ + #include + #include + ++#ifdef __FreeBSD__ ++#include ++#endif ++ + #ifndef O_DIRECT + #define O_DIRECT 040000 + #endif diff --git a/devel/pecl-swoole/files/patch-src_coroutine_system.cc b/devel/pecl-swoole/files/patch-src_coroutine_system.cc new file mode 100644 index 000000000000..95b124ebe059 --- /dev/null +++ b/devel/pecl-swoole/files/patch-src_coroutine_system.cc @@ -0,0 +1,12 @@ +--- src/coroutine/system.cc.orig 2023-10-01 03:15:13 UTC ++++ src/coroutine/system.cc +@@ -711,7 +711,8 @@ std::shared_ptr async_lock(void *resource) + "resource(%p) has already been bound to another coroutine#%ld, " + "%s of the same resource in coroutine#%ld at the same time is not allowed", + resource, +- *iter, ++ iter->second, ++ iter->first, + Coroutine::get_current_cid()); + return nullptr; + }