- Allow building with ming-0.4rc1 (the latest available ming)

# Necessary to get gcov.php.net working again

diff --git a/ext/ming/config.m4 b/ext/ming/config.m4
index fd6fc9cacb025ed70e3b6a4e62d153d46b4afa49..9c0c2ed36d03c47f031d32a09fbf38b1ad7ea5a4 100644 (file)
--- a/ext/ming/config.m4
+++ b/ext/ming/config.m4
@@ -40,9 +40,12 @@ if test "$PHP_MING" != "no"; then
   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

diff --git a/ext/ming/ming.c b/ext/ming/ming.c
index 4159e0a1487dafd0f0a7194adeb9d6e9f2dc800a..b1e966253e829633a0e55315c6bfb59140d4b360 100644 (file)
--- a/ext/ming/ming.c
+++ b/ext/ming/ming.c
@@ -3521,6 +3521,7 @@ PHP_METHOD(swfvideostream, hasaudio)
 }
 /* }}} */
 
+#if HAVE_SWFVIDEOSTREAM_NEXTFRAME
 /* {{{ proto swfvideostream::nextFrame */
 PHP_METHOD(swfvideostream, nextFrame) 
 {
@@ -3531,7 +3532,9 @@ PHP_METHOD(swfvideostream, nextFrame)
        RETURN_LONG(SWFVideoStream_nextFrame(getVideoStream(getThis() TSRMLS_CC)));
 }
 /* }}} */
-       
+#endif
+
+#if HAVE_SWFVIDEOSTREAM_SETFRAMEMODE
 /* {{{ proto swfvideostream::setFrameMode */   
 PHP_METHOD(swfvideostream, setFrameMode)
 {
@@ -3547,7 +3550,9 @@ PHP_METHOD(swfvideostream, setFrameMode)
        RETURN_LONG(SWFVideoStream_setFrameMode(stream, mode));
 }
 /* }}} */
+#endif
 
+#if HAVE_SWFVIDEOSTREAM_SEEK
 /* {{{ proto swfvideostream::seek(frame, whence) */    
 PHP_METHOD(swfvideostream, seek)
 {
@@ -3563,16 +3568,22 @@ PHP_METHOD(swfvideostream, seek)
        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 }
 };