pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/multimedia/ming multimedia/php-ming: fix build problem...
details: https://anonhg.NetBSD.org/pkgsrc/rev/242f2b4de8dd
branches: trunk
changeset: 448292:242f2b4de8dd
user: taca <taca%pkgsrc.org@localhost>
date: Sun Mar 07 09:38:58 2021 +0000
description:
multimedia/php-ming: fix build problem with maintainer-zts
Fix build problem with php56 maintainer-zts PKG_OPTION is enabled.
diffstat:
multimedia/ming/distinfo | 3 +-
multimedia/ming/patches/patch-php__ext_ming.c | 483 ++++++++++++++++++++++++++
2 files changed, 485 insertions(+), 1 deletions(-)
diffs (truncated from 501 to 300 lines):
diff -r 66ad3c57b87a -r 242f2b4de8dd multimedia/ming/distinfo
--- a/multimedia/ming/distinfo Sun Mar 07 09:18:42 2021 +0000
+++ b/multimedia/ming/distinfo Sun Mar 07 09:38:58 2021 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.19 2018/11/23 12:13:19 jperkin Exp $
+$NetBSD: distinfo,v 1.20 2021/03/07 09:38:58 taca Exp $
SHA1 (ming-0_4_8.tar.gz) = ef94923ea4f71fca0950c4a9ff1eb33e1712c17b
RMD160 (ming-0_4_8.tar.gz) = 4110608567c768bb67338c4bd3967322e63c32d4
SHA512 (ming-0_4_8.tar.gz) = e395acde9119ad32f4cedd500bcceee70bdd563222a41dda899cc318d5e34eb580abc38ac39c6dec7821913a0a70d2f953fc81f52255b623e34f7c3aaafbc9c0
Size (ming-0_4_8.tar.gz) = 14908459 bytes
SHA1 (patch-configure.in) = 9c231dc2e06d12e05b8e82d48f1df2aed33de697
+SHA1 (patch-php__ext_ming.c) = d84ed8b586b2e357481bb98b403fc40270432de4
SHA1 (patch-util_parser.c) = f41454623af76bc893d3040513dcd900f5b76a32
diff -r 66ad3c57b87a -r 242f2b4de8dd multimedia/ming/patches/patch-php__ext_ming.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/ming/patches/patch-php__ext_ming.c Sun Mar 07 09:38:58 2021 +0000
@@ -0,0 +1,483 @@
+$NetBSD: patch-php__ext_ming.c,v 1.5 2021/03/07 09:38:58 taca Exp $
+
+Fix build problem if php56 is built with maintainer-zts PKG_OPTION.
+
+--- php_ext/ming.c.orig 2017-04-07 08:12:56.000000000 +0000
++++ php_ext/ming.c
+@@ -415,7 +415,7 @@ static SWFInput getInput_fromFileResourc
+ zend_register_resource(input, le_swfinputp);
+ #else
+ zend_list_addref(Z_LVAL_P(zfile));
+- zend_list_addref(zend_list_insert(input, le_swfinputp));
++ zend_list_addref(zend_list_insert(input, le_swfinputp TSRMLS_CC));
+ #endif
+ return input;
+ }
+@@ -465,7 +465,7 @@ PHP_METHOD(swfinput, __construct)
+ add_property_resource(getThis(), "input", ret);
+ #else
+ object_init_ex(getThis(), input_class_entry_ptr);
+- ret = zend_list_insert(input, le_swfinputp);
++ ret = zend_list_insert(input, le_swfinputp TSRMLS_CC);
+ add_property_resource(getThis(), "input", ret);
+ zend_list_addref(ret);
+ #endif
+@@ -513,7 +513,7 @@ PHP_METHOD(swffontcollection, __construc
+ add_property_resource(getThis(), "fontcollection", ret);
+ #else
+ object_init_ex(getThis(), fontcollection_class_entry_ptr);
+- ret = zend_list_insert(fc, le_swffontcollectionp);
++ ret = zend_list_insert(fc, le_swffontcollectionp TSRMLS_CC);
+ add_property_resource(getThis(), "fontcollection", ret);
+ zend_list_addref(ret);
+ #endif
+@@ -553,7 +553,7 @@ PHP_METHOD(swffontcollection, getFont)
+ add_property_resource(return_value, "font", ret);
+ ret->gc.refcount++;
+ #else
+- ret = zend_list_insert(font, le_swffontp);
++ ret = zend_list_insert(font, le_swffontp TSRMLS_CC);
+ add_property_resource(return_value, "font", ret);
+ zend_list_addref(ret);
+ #endif
+@@ -614,7 +614,7 @@ PHP_METHOD(swfbrowserfont, __construct)
+ add_property_resource(getThis(), "browserfont", ret);
+ #else
+ object_init_ex(getThis(), browserfont_class_entry_ptr);
+- ret = zend_list_insert(font, le_swfbrowserfontp);
++ ret = zend_list_insert(font, le_swfbrowserfontp TSRMLS_CC);
+ add_property_resource(getThis(), "browserfont", ret);
+ zend_list_addref(ret);
+ #endif
+@@ -673,7 +673,7 @@ PHP_METHOD(swfcxform, __construct)
+ add_property_resource(getThis(), "cx", ret);
+ #else
+ object_init_ex(getThis(), cxform_class_entry_ptr);
+- ret = zend_list_insert(cx, le_swfcxformp);
++ ret = zend_list_insert(cx, le_swfcxformp TSRMLS_CC);
+ add_property_resource(getThis(), "cx", ret);
+ zend_list_addref(ret);
+ #endif
+@@ -856,7 +856,7 @@ PHP_METHOD(swfinitaction, __construct)
+ init = newSWFInitAction_withId(getAction(zaction TSRMLS_CC), id);
+ }
+
+- ret = zend_list_insert(init, le_swfinitactionp);
++ ret = zend_list_insert(init, le_swfinitactionp TSRMLS_CC);
+ object_init_ex(getThis(), initaction_class_entry_ptr);
+ add_property_resource(getThis(), "initaction", ret);
+ zend_list_addref(ret);
+@@ -914,7 +914,7 @@ PHP_METHOD(swfaction, __construct)
+ ret = zend_register_resource(action, le_swfactionp);
+ add_property_resource(getThis(), "action", ret);
+ #else
+- ret = zend_list_insert(action, le_swfactionp);
++ ret = zend_list_insert(action, le_swfactionp TSRMLS_CC);
+
+ object_init_ex(getThis(), action_class_entry_ptr);
+ add_property_resource(getThis(), "action", ret);
+@@ -1000,7 +1000,7 @@ PHP_METHOD(swfbitmap, __construct)
+ #if PHP_VERSION_ID >= 70000
+ zend_register_resource(input, le_swfinputp);
+ #else
+- zend_list_addref(zend_list_insert(input, le_swfinputp));
++ zend_list_addref(zend_list_insert(input, le_swfinputp TSRMLS_CC));
+ #endif
+ break;
+
+@@ -1025,7 +1025,7 @@ PHP_METHOD(swfbitmap, __construct)
+ #if PHP_VERSION_ID >= 70000
+ zend_register_resource(maskinput, le_swfinputp);
+ #else
+- zend_list_addref(zend_list_insert(maskinput, le_swfinputp));
++ zend_list_addref(zend_list_insert(maskinput, le_swfinputp TSRMLS_CC));
+ #endif
+ break;
+
+@@ -1042,7 +1042,7 @@ PHP_METHOD(swfbitmap, __construct)
+ add_property_resource(getThis(), "bitmap", ret);
+ #else
+ object_init_ex(getThis(), bitmap_class_entry_ptr);
+- ret = zend_list_insert(bitmap_alpha, le_swfbitmapp);
++ ret = zend_list_insert(bitmap_alpha, le_swfbitmapp TSRMLS_CC);
+ add_property_resource(getThis(), "bitmap", ret);
+ zend_list_addref(ret);
+ #endif
+@@ -1055,7 +1055,7 @@ PHP_METHOD(swfbitmap, __construct)
+ add_property_resource(getThis(), "bitmap", ret);
+ #else
+ object_init_ex(getThis(), bitmap_class_entry_ptr);
+- ret = zend_list_insert(bitmap, le_swfbitmapp);
++ ret = zend_list_insert(bitmap, le_swfbitmapp TSRMLS_CC);
+ add_property_resource(getThis(), "bitmap", ret);
+ zend_list_addref(ret);
+ #endif
+@@ -1325,7 +1325,7 @@ PHP_METHOD(swfbutton, __construct)
+ ret = zend_register_resource(button, le_swfbuttonp);
+ add_property_resource(getThis(), "button", ret);
+ #else
+- int ret = zend_list_insert(button, le_swfbuttonp);
++ int ret = zend_list_insert(button, le_swfbuttonp TSRMLS_CC);
+ object_init_ex(getThis(), button_class_entry_ptr);
+ add_property_resource(getThis(), "button", ret);
+ zend_list_addref(ret);
+@@ -1472,7 +1472,7 @@ PHP_METHOD(swfbutton, addCharacter)
+ add_property_resource(return_value, "buttonrecord", ret);
+ ret->gc.refcount++;
+ #else
+- ret = zend_list_insert(record, le_swfbuttonrecordp);
++ ret = zend_list_insert(record, le_swfbuttonrecordp TSRMLS_CC);
+ add_property_resource(return_value, "buttonrecord", ret);
+ zend_list_addref(ret);
+ #endif
+@@ -1569,7 +1569,7 @@ PHP_METHOD(swfbutton, addSound)
+ add_property_resource(return_value, "soundinstance", ret);
+ ret->gc.refcount++;
+ #else
+- ret = zend_list_insert(item, le_swfsoundinstancep);
++ ret = zend_list_insert(item, le_swfsoundinstancep TSRMLS_CC);
+ add_property_resource(return_value, "soundinstance", ret);
+ zend_list_addref(ret);
+ #endif
+@@ -2167,7 +2167,7 @@ PHP_METHOD(swfdisplayitem, getMatrix)
+ add_property_resource(return_value, "matrix", ret);
+ ret->gc.refcount++;
+ #else
+- ret = zend_list_insert(m, le_swfmatrixp);
++ ret = zend_list_insert(m, le_swfmatrixp TSRMLS_CC);
+ add_property_resource(return_value, "matrix", ret);
+ zend_list_addref(ret);
+ #endif
+@@ -2198,7 +2198,7 @@ PHP_METHOD(swfdisplayitem, getCharacter)
+ add_property_resource(return_value, "character", ret);
+ ret->gc.refcount++;
+ #else
+- ret = zend_list_insert(c, le_swfcharacterp);
++ ret = zend_list_insert(c, le_swfcharacterp TSRMLS_CC);
+ add_property_resource(return_value, "character", ret);
+ zend_list_addref(ret);
+ #endif
+@@ -2585,7 +2585,7 @@ PHP_METHOD(swffont, __construct)
+ add_property_resource(getThis(), "font", ret);
+ #else
+ object_init_ex(getThis(), font_class_entry_ptr);
+- ret = zend_list_insert(font, le_swffontp);
++ ret = zend_list_insert(font, le_swffontp TSRMLS_CC);
+ add_property_resource(getThis(), "font", ret);
+ zend_list_addref(ret);
+ #endif
+@@ -2795,7 +2795,7 @@ PHP_METHOD(swffiltermatrix, __construct)
+ add_property_resource(getThis(), "filtermatrix", ret);
+ #else
+ object_init_ex(getThis(), filtermatrix_class_entry_ptr);
+- ret = zend_list_insert(matrix, le_swffiltermatrixp);
++ ret = zend_list_insert(matrix, le_swffiltermatrixp TSRMLS_CC);
+ add_property_resource(getThis(), "filtermatrix", ret);
+ zend_list_addref(ret);
+ #endif
+@@ -2853,7 +2853,7 @@ PHP_METHOD(swfshadow, __construct)
+ add_property_resource(getThis(), "shadow", ret);
+ #else
+ object_init_ex(getThis(), shadow_class_entry_ptr);
+- ret = zend_list_insert(shadow, le_swfshadowp);
++ ret = zend_list_insert(shadow, le_swfshadowp TSRMLS_CC);
+ add_property_resource(getThis(), "shadow", ret);
+ zend_list_addref(ret);
+ #endif
+@@ -2912,7 +2912,7 @@ PHP_METHOD(swfblur, __construct)
+ add_property_resource(getThis(), "blur", ret);
+ #else
+ object_init_ex(getThis(), blur_class_entry_ptr);
+- ret = zend_list_insert(blur, le_swfblurp);
++ ret = zend_list_insert(blur, le_swfblurp TSRMLS_CC);
+ add_property_resource(getThis(), "blur", ret);
+ zend_list_addref(ret);
+ #endif
+@@ -2957,7 +2957,7 @@ PHP_METHOD(swfgradient, __construct)
+ zend_resource *ret = zend_register_resource(gradient, le_swfgradientp);
+ add_property_resource(getThis(), "gradient", ret);
+ #else
+- int ret = zend_list_insert(gradient, le_swfgradientp);
++ int ret = zend_list_insert(gradient, le_swfgradientp TSRMLS_CC);
+ object_init_ex(getThis(), gradient_class_entry_ptr);
+ add_property_resource(getThis(), "gradient", ret);
+ zend_list_addref(ret);
+@@ -3544,7 +3544,7 @@ PHP_METHOD(swffilter, __construct)
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "new SWFFilter: unknown type");
+ }
+ object_init_ex(getThis(), filter_class_entry_ptr);
+- ret = zend_list_insert(filter, le_swffilterp);
++ ret = zend_list_insert(filter, le_swffilterp TSRMLS_CC);
+ add_property_resource(getThis(), "filter", ret);
+ zend_list_addref(ret);
+ #endif
+@@ -3591,7 +3591,7 @@ PHP_METHOD(swfmorph, __construct)
+ zend_resource *ret = zend_register_resource(morph, le_swfmorphp);
+ add_property_resource(getThis(), "morph", ret);
+ #else
+- int ret = zend_list_insert(morph, le_swfmorphp);
++ int ret = zend_list_insert(morph, le_swfmorphp TSRMLS_CC);
+ object_init_ex(getThis(), morph_class_entry_ptr);
+ add_property_resource(getThis(), "morph", ret);
+ zend_list_addref(ret);
+@@ -3635,7 +3635,7 @@ PHP_METHOD(swfmorph, getShape1)
+ #else
+ SWFMorph morph = getMorph(getThis() TSRMLS_CC);
+ SWFShape shape = SWFMorph_getShape1(morph);
+- int ret = zend_list_insert(shape, le_swfshapep);
++ int ret = zend_list_insert(shape, le_swfshapep TSRMLS_CC);
+ object_init_ex(return_value, shape_class_entry_ptr);
+ add_property_resource(return_value, "shape", ret);
+ zend_list_addref(ret);
+@@ -3657,7 +3657,7 @@ PHP_METHOD(swfmorph, getShape2)
+ #else
+ SWFMorph morph = getMorph(getThis() TSRMLS_CC);
+ SWFShape shape = SWFMorph_getShape2(morph);
+- int ret = zend_list_insert(shape, le_swfshapep);
++ int ret = zend_list_insert(shape, le_swfshapep TSRMLS_CC);
+ object_init_ex(return_value, shape_class_entry_ptr);
+ add_property_resource(return_value, "shape", ret);
+ zend_list_addref(ret);
+@@ -3708,7 +3708,7 @@ PHP_METHOD(swfsoundstream, __construct)
+ #if PHP_VERSION_ID >= 70000
+ zend_register_resource(input, le_swfinputp);
+ #else
+- zend_list_addref(zend_list_insert(input, le_swfinputp));
++ zend_list_addref(zend_list_insert(input, le_swfinputp TSRMLS_CC));
+ #endif
+ break;
+
+@@ -3725,7 +3725,7 @@ PHP_METHOD(swfsoundstream, __construct)
+ add_property_resource(getThis(), "soundstream", ret);
+ #else
+ object_init_ex(getThis(), soundstream_class_entry_ptr);
+- ret = zend_list_insert(sound, le_swfsoundstreamp);
++ ret = zend_list_insert(sound, le_swfsoundstreamp TSRMLS_CC);
+ add_property_resource(getThis(), "soundstream", ret);
+ zend_list_addref(ret);
+ #endif
+@@ -3851,7 +3851,7 @@ PHP_METHOD(swfsound, __construct)
+ #if PHP_VERSION_ID >= 70000
+ zend_register_resource(input, le_swfinputp);
+ #else
+- zend_list_addref(zend_list_insert(input, le_swfinputp));
++ zend_list_addref(zend_list_insert(input, le_swfinputp TSRMLS_CC));
+ #endif
+ break;
+
+@@ -3869,7 +3869,7 @@ PHP_METHOD(swfsound, __construct)
+ add_property_resource(getThis(), "sound", ret);
+ #else
+ object_init_ex(getThis(), sound_class_entry_ptr);
+- ret = zend_list_insert(sound, le_swfsoundp);
++ ret = zend_list_insert(sound, le_swfsoundp TSRMLS_CC);
+ add_property_resource(getThis(), "sound", ret);
+ zend_list_addref(ret);
+ #endif
+@@ -4016,7 +4016,7 @@ PHP_METHOD(swfvideostream, __construct)
+ #if PHP_VERSION_ID >= 70000
+ zend_register_resource(input, le_swfinputp);
+ #else
+- zend_list_addref(zend_list_insert(input, le_swfinputp));
++ zend_list_addref(zend_list_insert(input, le_swfinputp TSRMLS_CC));
Home |
Main Index |
Thread Index |
Old Index