helly Sun Jul 27 21:32:48 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/ming config.m4 ming.c Log: - Allow building with ming-0.4rc1 (the latest available ming) # Necessary to get gcov.php.net working again http://cvs.php.net/viewvc.cgi/php-src/ext/ming/config.m4?r1=1.22.2.6.2.4&r2=1.22.2.6.2.4.2.1&diff_format=u Index: php-src/ext/ming/config.m4 diff -u php-src/ext/ming/config.m4:1.22.2.6.2.4 php-src/ext/ming/config.m4:1.22.2.6.2.4.2.1 --- php-src/ext/ming/config.m4:1.22.2.6.2.4 Tue Mar 6 10:13:40 2007 +++ php-src/ext/ming/config.m4 Sun Jul 27 21:32:48 2008 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.22.2.6.2.4 2007/03/06 10:13:40 tony2001 Exp $ +dnl $Id: config.m4,v 1.22.2.6.2.4.2.1 2008/07/27 21:32:48 helly Exp $ dnl PHP_ARG_WITH(ming, for MING support, @@ -40,9 +40,12 @@ PHP_ADD_INCLUDE($MING_INC_DIR) PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/$PHP_LIBDIR, MING_SHARED_LIBADD) - PHP_CHECK_LIBRARY(ming, SWFPrebuiltClip, [ AC_DEFINE(HAVE_SWFPREBUILTCLIP, 1, [ ]) ], [], []) - PHP_CHECK_LIBRARY(ming, SWFMovie_namedAnchor, [ AC_DEFINE(HAVE_SWFMOVIE_NAMEDANCHOR, 1, [ ]) ], [], []) - PHP_CHECK_LIBRARY(ming, Ming_setSWFCompression, [ AC_DEFINE(HAVE_MING_SETSWFCOMPRESSION, 1, [ ]) ], [], []) + PHP_CHECK_LIBRARY(ming, SWFPrebuiltClip, [ AC_DEFINE(HAVE_SWFPREBUILTCLIP, 1, [ ]) ], [], []) + PHP_CHECK_LIBRARY(ming, SWFMovie_namedAnchor, [ AC_DEFINE(HAVE_SWFMOVIE_NAMEDANCHOR, 1, [ ]) ], [], []) + PHP_CHECK_LIBRARY(ming, Ming_setSWFCompression, [ AC_DEFINE(HAVE_MING_SETSWFCOMPRESSION, 1, [ ]) ], [], []) + PHP_CHECK_LIBRARY(ming, SWFVideoStream_seek, [ AC_DEFINE(HAVE_SWFVIDEOSTREAM_SEEK, 1, [ ]) ], [], []) + PHP_CHECK_LIBRARY(ming, SWFVideoStream_setFrameMode, [ AC_DEFINE(HAVE_SWFVIDEOSTREAM_SETFRAMEMODE, 1, [ ]) ], [], []) + PHP_CHECK_LIBRARY(ming, SWFVideoStream_nextFrame, [ AC_DEFINE(HAVE_SWFVIDEOSTREAM_NEXTFRAME, 1, [ ]) ], [], []) old_CPPFLAGS=$CPPFLAGS CPPFLAGS=-I$MING_INC_DIR http://cvs.php.net/viewvc.cgi/php-src/ext/ming/ming.c?r1=1.79.2.4.2.8.2.8&r2=1.79.2.4.2.8.2.9&diff_format=u Index: php-src/ext/ming/ming.c diff -u php-src/ext/ming/ming.c:1.79.2.4.2.8.2.8 php-src/ext/ming/ming.c:1.79.2.4.2.8.2.9 --- php-src/ext/ming/ming.c:1.79.2.4.2.8.2.8 Thu Jul 24 18:39:41 2008 +++ php-src/ext/ming/ming.c Sun Jul 27 21:32:48 2008 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ming.c,v 1.79.2.4.2.8.2.8 2008/07/24 18:39:41 fmk Exp $ */ +/* $Id: ming.c,v 1.79.2.4.2.8.2.9 2008/07/27 21:32:48 helly Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -3521,6 +3521,7 @@ } /* }}} */ +#if HAVE_SWFVIDEOSTREAM_NEXTFRAME /* {{{ proto swfvideostream::nextFrame */ PHP_METHOD(swfvideostream, nextFrame) { @@ -3531,7 +3532,9 @@ RETURN_LONG(SWFVideoStream_nextFrame(getVideoStream(getThis() TSRMLS_CC))); } /* }}} */ - +#endif + +#if HAVE_SWFVIDEOSTREAM_SETFRAMEMODE /* {{{ proto swfvideostream::setFrameMode */ PHP_METHOD(swfvideostream, setFrameMode) { @@ -3547,7 +3550,9 @@ RETURN_LONG(SWFVideoStream_setFrameMode(stream, mode)); } /* }}} */ +#endif +#if HAVE_SWFVIDEOSTREAM_SEEK /* {{{ proto swfvideostream::seek(frame, whence) */ PHP_METHOD(swfvideostream, seek) { @@ -3563,16 +3568,22 @@ RETURN_LONG(SWFVideoStream_seek(stream, frame, whence)); } /* }}} */ - - +#endif + static zend_function_entry swfvideostream_functions[] = { PHP_ME(swfvideostream, __construct, NULL, 0) PHP_ME(swfvideostream, setdimension, NULL, 0) PHP_ME(swfvideostream, getnumframes, NULL, 0) PHP_ME(swfvideostream, hasaudio, NULL, 0) +#if HAVE_SWFVIDEOSTREAM_SETFRAMEMODE PHP_ME(swfvideostream, setFrameMode, NULL, 0) +#endif +#if HAVE_SWFVIDEOSTREAM_NEXTFRAME PHP_ME(swfvideostream, nextFrame, NULL, 0) +#endif +#if HAVE_SWFVIDEOSTREAM_SEEK PHP_ME(swfvideostream, seek, NULL, 0) +#endif { NULL, NULL, NULL } };
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php