pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

zoneminder: Adapt to php 8x and adjust acceptable versions



Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Wed Jan 17 09:46:45 2024 -0500
Changeset:	1a0663a07fc212c249e7c4b8ccddff09f631e93a

Modified Files:
	zoneminder/Makefile

Log Message:
zoneminder: Adapt to php 8x and adjust acceptable versions

  - Conditionalize php-json (builtin for >=8)
  - Note that 83 fails
  - Flip to PHP_VERSIONS_INCOMPATIBLE.  Ban 56 because apcu doesn't
    build, and 83 because zoneminder with 83 throws exceptions.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1a0663a07fc212c249e7c4b8ccddff09f631e93a

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 zoneminder/Makefile | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diffs:
diff --git a/zoneminder/Makefile b/zoneminder/Makefile
index 1f5dec8edd..0cde1bae70 100644
--- a/zoneminder/Makefile
+++ b/zoneminder/Makefile
@@ -205,18 +205,24 @@ ZM_PERL_PATH+=	scripts/zmx10.pl.in
 
 ## PHP
 
-# 1.36 runs ok with 74 on NetBSD.  Someone said it works with 82 on GNU/Linux.
-# Be expansive until proven wrong.
-PHP_VERSIONS_ACCEPTED=	74 80 81 82 83
+# 1.36 (NetBSD/amd64) works with 74 81 82
+# 83: PHP Fatal error:  Uncaught TypeError: flock(): Argument #1 ($stream) must be of type resource, false given in /usr/pkg/share/zoneminder/htdocs/includes/functions.php:2244
+# In 2022, upstream warned against 82.
+# php-apcu fails with 56, but upstream might support it.
+PHP_VERSIONS_INCOMPATIBLE= 56 83
 
 .include "../../lang/php/phpversion.mk"
 DEPENDS+=	${PHP_PKG_PREFIX}-pdo_mysql-[0-9]*:../../databases/php-pdo_mysql
 DEPENDS+=	${PHP_PKG_PREFIX}-gd-[0-9]*:../../graphics/php-gd
 DEPENDS+=	${PHP_PKG_PREFIX}-sockets-[0-9]*:../../net/php-sockets
 DEPENDS+=	${PHP_PKG_PREFIX}-intl-[0-9]*:../../textproc/php-intl
-DEPENDS+=	${PHP_PKG_PREFIX}-json-[0-9]*:../../textproc/php-json
 DEPENDS+=	${PHP_PKG_PREFIX}-apcu-[0-9]*:../../www/php-apcu
 
+# json is core >= 8 (and we reject 56)
+.if !empty(PKG_PHP_VERSION:M74)
+DEPENDS+=	${PHP_PKG_PREFIX}-json-[0-9]*:../../textproc/php-json
+.endif
+
 ## WEB
 
 # \todo We need to choose user/group, and somehow make this play well


Home | Main Index | Thread Index | Old Index