jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-28 05:36:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/php-amqp: bump to version 1.9.4

Browse Source 
Remove patch (already in version)

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine 2019-01-11 16:02:55 +01:00 committed by Thomas Petazzoni
parent 7533ad8797
commit 011f73185e
3 changed files with 2 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
package/php-amqp/0001-fix-for-7.3-323.patch
View File

@ -1,43 +0,0 @@
From 1205d3287df0a9ec762a6594b4fa018ed9637d21 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@famillecollet.com>
Date: Thu, 21 Jun 2018 11:16:32 +0200
Subject: [PATCH] fix for 7.3 (#323)
[Frank: backport from upstream commit 1205d3287df0a9ec762a6594b4fa018ed9637d21]
Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com>
---
amqp_channel.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/amqp_channel.c b/amqp_channel.c
index f3dba5d..032526e 100644
--- a/amqp_channel.c
+++ b/amqp_channel.c
@@ -101,7 +101,11 @@ static void php_amqp_destroy_fci(zend_fcall_info *fci) {
if (fci->size > 0) {
zval_ptr_dtor(&fci->function_name);
if (fci->object != NULL) {
+#if PHP_VERSION_ID >= 70300
+ GC_DELREF(fci->object);
+#else
GC_REFCOUNT(fci->object)--;
+#endif
}
fci->size = 0;
}
@@ -112,7 +116,11 @@ static void php_amqp_duplicate_fci(zend_fcall_info *source) {
zval_add_ref(&source->function_name);
if (source->object != NULL) {
+#if PHP_VERSION_ID >= 70300
+ GC_ADDREF(source->object);
+#else
GC_REFCOUNT(source->object)++;
+#endif
}
}
}
--
2.17.1

2
package/php-amqp/php-amqp.hash
View File

@ -1,3 +1,3 @@
# Locally calculated # Locally calculated
sha256 c79e52db33bf907dad7da8f350dbdf2937b0679a3dc44fb2a941efb6d4808da9 amqp-1.9.3.tgz sha256 b66b8b8264749cb7a69ae4d09665dad1559b6c4f01430206c8e4187bcd8c782d amqp-1.9.4.tgz
sha256 ecd004e9ae3fcf54896b562d5e8008e36041f2620076effd58e5f4187299cee8 LICENSE sha256 ecd004e9ae3fcf54896b562d5e8008e36041f2620076effd58e5f4187299cee8 LICENSE

2
package/php-amqp/php-amqp.mk
View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
PHP_AMQP_VERSION = 1.9.3 PHP_AMQP_VERSION = 1.9.4
PHP_AMQP_SOURCE = amqp-$(PHP_AMQP_VERSION).tgz PHP_AMQP_SOURCE = amqp-$(PHP_AMQP_VERSION).tgz
PHP_AMQP_SITE = https://pecl.php.net/get PHP_AMQP_SITE = https://pecl.php.net/get
PHP_AMQP_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ PHP_AMQP_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \