Re: [PHP-CVS] cvs: php-src /ext/ming config.m4 ming.c
Hi Frank On 11/3/06, Frank M. Kromann <[EMAIL PROTECTED]> wrote: Helle All, What problem are you trying to solve here. This fix will break the windows buld and can be solved by adding the missing headers to ming.h in the nxt release (where they should be in the first place). Marcus was, I think, fixing my "missing includes" fix which caused endless amount of compile warnings. -Hannes - Frank > helly Fri Nov 3 18:57:36 2006 UTC > > Modified files: > /php-src/ext/ming config.m4 ming.c > Log: > - Include new headers only if present > > http://cvs.php.net/viewvc.cgi/php-src/ext/ming/config.m4?r1=1.26&r2=1.27&diff_format=u > Index: php-src/ext/ming/config.m4 > diff -u php-src/ext/ming/config.m4:1.26 php-src/ext/ming/config.m4:1.27 > --- php-src/ext/ming/config.m4:1.26 Wed Dec 21 21:43:25 2005 > +++ php-src/ext/ming/config.m4Fri Nov 3 18:57:36 2006 > @@ -1,5 +1,5 @@ > dnl > -dnl $Id: config.m4,v 1.26 2005/12/21 21:43:25 sniper Exp $ > +dnl $Id: config.m4,v 1.27 2006/11/03 18:57:36 helly Exp $ > dnl > > PHP_ARG_WITH(ming, for MING support, > @@ -84,6 +84,9 @@ >], []) >CPPFLAGS=$old_CPPFLAGS > > + AC_CHECK_HEADERS([ming/displaylist.h]) > + AC_CHECK_HEADERS([ming/movie.h]) > + >PHP_NEW_EXTENSION(ming, ming.c, $ext_shared) >PHP_SUBST(MING_SHARED_LIBADD) > fi > http://cvs.php.net/viewvc.cgi/php-src/ext/ming/ming.c?r1=1.87&r2=1.88&diff_format=u > Index: php-src/ext/ming/ming.c > diff -u php-src/ext/ming/ming.c:1.87 php-src/ext/ming/ming.c:1.88 > --- php-src/ext/ming/ming.c:1.87 Fri Nov 3 14:06:33 2006 > +++ php-src/ext/ming/ming.c Fri Nov 3 18:57:36 2006 > @@ -17,7 +17,7 @@ > +--+ > */ > > -/* $Id: ming.c,v 1.87 2006/11/03 14:06:33 bjori Exp $ */ > +/* $Id: ming.c,v 1.88 2006/11/03 18:57:36 helly Exp $ */ > > #ifdef HAVE_CONFIG_H > #include "config.h" > @@ -36,8 +36,12 @@ > #include > #include > #include > -#include > -#include > +#ifdef HAVE_MING_DISPLAYLIST_H > +# include > +#endif > +#ifdef HAVE_MING_MOVIE_H > +# include > +#endif > > #define FLOAT_Z_DVAL_PP(x) ((float)Z_DVAL_PP(x)) > #define BYTE_Z_LVAL_PP(x) ((byte)Z_LVAL_PP(x)) > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/ming config.m4 ming.c
Hello Frank, if the fix is that easy then just go ahead :-) best regards marcus Friday, November 3, 2006, 8:53:21 PM, you wrote: > Helle All, > What problem are you trying to solve here. This fix will break the windows > buld and can be solved by adding the missing headers to ming.h in the nxt > release (where they should be in the first place). > - Frank >> helly Fri Nov 3 18:57:36 2006 UTC >> >> Modified files: >> /php-src/ext/mingconfig.m4 ming.c >> Log: >> - Include new headers only if present >> >> > http://cvs.php.net/viewvc.cgi/php-src/ext/ming/config.m4?r1=1.26&r2=1.27&diff_format=u >> Index: php-src/ext/ming/config.m4 >> diff -u php-src/ext/ming/config.m4:1.26 php-src/ext/ming/config.m4:1.27 >> --- php-src/ext/ming/config.m4:1.26 Wed Dec 21 21:43:25 2005 >> +++ php-src/ext/ming/config.m4Fri Nov 3 18:57:36 2006 >> @@ -1,5 +1,5 @@ >> dnl >> -dnl $Id: config.m4,v 1.26 2005/12/21 21:43:25 sniper Exp $ >> +dnl $Id: config.m4,v 1.27 2006/11/03 18:57:36 helly Exp $ >> dnl >> >> PHP_ARG_WITH(ming, for MING support, >> @@ -84,6 +84,9 @@ >>], []) >>CPPFLAGS=$old_CPPFLAGS >> >> + AC_CHECK_HEADERS([ming/displaylist.h]) >> + AC_CHECK_HEADERS([ming/movie.h]) >> + >>PHP_NEW_EXTENSION(ming, ming.c, $ext_shared) >>PHP_SUBST(MING_SHARED_LIBADD) >> fi >> > http://cvs.php.net/viewvc.cgi/php-src/ext/ming/ming.c?r1=1.87&r2=1.88&diff_format=u >> Index: php-src/ext/ming/ming.c >> diff -u php-src/ext/ming/ming.c:1.87 php-src/ext/ming/ming.c:1.88 >> --- php-src/ext/ming/ming.c:1.87 Fri Nov 3 14:06:33 2006 >> +++ php-src/ext/ming/ming.c Fri Nov 3 18:57:36 2006 >> @@ -17,7 +17,7 @@ >> > +--+ >> */ >> >> -/* $Id: ming.c,v 1.87 2006/11/03 14:06:33 bjori Exp $ */ >> +/* $Id: ming.c,v 1.88 2006/11/03 18:57:36 helly Exp $ */ >> >> #ifdef HAVE_CONFIG_H >> #include "config.h" >> @@ -36,8 +36,12 @@ >> #include >> #include >> #include >> -#include >> -#include >> +#ifdef HAVE_MING_DISPLAYLIST_H >> +# include >> +#endif >> +#ifdef HAVE_MING_MOVIE_H >> +# include >> +#endif >> >> #define FLOAT_Z_DVAL_PP(x) ((float)Z_DVAL_PP(x)) >> #define BYTE_Z_LVAL_PP(x) ((byte)Z_LVAL_PP(x)) >> >> -- >> PHP CVS Mailing List (http://www.php.net/) >> To unsubscribe, visit: http://www.php.net/unsub.php >> Best regards, Marcus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/ming config.m4 ming.c
Helle All, What problem are you trying to solve here. This fix will break the windows buld and can be solved by adding the missing headers to ming.h in the nxt release (where they should be in the first place). - Frank > helly Fri Nov 3 18:57:36 2006 UTC > > Modified files: > /php-src/ext/ming config.m4 ming.c > Log: > - Include new headers only if present > > http://cvs.php.net/viewvc.cgi/php-src/ext/ming/config.m4?r1=1.26&r2=1.27&diff_format=u > Index: php-src/ext/ming/config.m4 > diff -u php-src/ext/ming/config.m4:1.26 php-src/ext/ming/config.m4:1.27 > --- php-src/ext/ming/config.m4:1.26 Wed Dec 21 21:43:25 2005 > +++ php-src/ext/ming/config.m4Fri Nov 3 18:57:36 2006 > @@ -1,5 +1,5 @@ > dnl > -dnl $Id: config.m4,v 1.26 2005/12/21 21:43:25 sniper Exp $ > +dnl $Id: config.m4,v 1.27 2006/11/03 18:57:36 helly Exp $ > dnl > > PHP_ARG_WITH(ming, for MING support, > @@ -84,6 +84,9 @@ >], []) >CPPFLAGS=$old_CPPFLAGS > > + AC_CHECK_HEADERS([ming/displaylist.h]) > + AC_CHECK_HEADERS([ming/movie.h]) > + >PHP_NEW_EXTENSION(ming, ming.c, $ext_shared) >PHP_SUBST(MING_SHARED_LIBADD) > fi > http://cvs.php.net/viewvc.cgi/php-src/ext/ming/ming.c?r1=1.87&r2=1.88&diff_format=u > Index: php-src/ext/ming/ming.c > diff -u php-src/ext/ming/ming.c:1.87 php-src/ext/ming/ming.c:1.88 > --- php-src/ext/ming/ming.c:1.87 Fri Nov 3 14:06:33 2006 > +++ php-src/ext/ming/ming.c Fri Nov 3 18:57:36 2006 > @@ -17,7 +17,7 @@ > +--+ > */ > > -/* $Id: ming.c,v 1.87 2006/11/03 14:06:33 bjori Exp $ */ > +/* $Id: ming.c,v 1.88 2006/11/03 18:57:36 helly Exp $ */ > > #ifdef HAVE_CONFIG_H > #include "config.h" > @@ -36,8 +36,12 @@ > #include > #include > #include > -#include > -#include > +#ifdef HAVE_MING_DISPLAYLIST_H > +# include > +#endif > +#ifdef HAVE_MING_MOVIE_H > +# include > +#endif > > #define FLOAT_Z_DVAL_PP(x) ((float)Z_DVAL_PP(x)) > #define BYTE_Z_LVAL_PP(x) ((byte)Z_LVAL_PP(x)) > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/ming config.m4
Yes, I think it can be safely MFH'ed. Thanks. At 01:52 PM 8/25/2005, Marcus Boerger wrote: Hello RMs, should this be MFHed to 5.0.5 and 5.1.0 ? marcus Thursday, August 25, 2005, 10:49:49 PM, you wrote: > helly Thu Aug 25 16:49:49 2005 EDT > Modified files: > /php-src/ext/ming config.m4 > Log: > - Bugfix #34257 lib64 not handled correctly in ming extension > http://cvs.php.net/diff.php/php-src/ext/ming/config.m4?r1=1.22&r2=1.23&ty=u > Index: php-src/ext/ming/config.m4 > diff -u php-src/ext/ming/config.m4:1.22 php-src/ext/ming/config.m4:1.23 > --- php-src/ext/ming/config.m4:1.22 Sun Jul 17 19:58:39 2005 > +++ php-src/ext/ming/config.m4 Thu Aug 25 16:49:48 2005 > @@ -1,5 +1,5 @@ > dnl > -dnl $Id: config.m4,v 1.22 2005/07/17 23:58:39 helly Exp $ > +dnl $Id: config.m4,v 1.23 2005/08/25 20:49:48 helly Exp $ > dnl > PHP_ARG_WITH(ming, for MING support, > @@ -9,7 +9,7 @@ >AC_CHECK_LIB(m, sin) >for i in $PHP_MING /usr/local /usr; do > -if test -f $i/lib/libming.$SHLIB_SUFFIX_NAME -o -f $i/lib/libming.a; then > +if test -f $i/$PHP_LIBDIR/libming.$SHLIB_SUFFIX_NAME -o -f $i/lib/libming.a; then >MING_DIR=$i >break > fi > @@ -34,11 +34,11 @@ >],[ > AC_MSG_ERROR([Ming library 0.2a or greater required.]) >],[ > --L$MING_DIR/lib > +-L$MING_DIR/$PHP_LIBDIR >]) >PHP_ADD_INCLUDE($MING_INC_DIR) > - PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/lib, MING_SHARED_LIBADD) > + PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/$PHP_LIBDIR, MING_SHARED_LIBADD) >AC_MSG_CHECKING([for destroySWFBlock]) >AC_TRY_RUN([ Best regards, Marcus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/ming config.m4
Hello RMs, should this be MFHed to 5.0.5 and 5.1.0 ? marcus Thursday, August 25, 2005, 10:49:49 PM, you wrote: > helly Thu Aug 25 16:49:49 2005 EDT > Modified files: > /php-src/ext/ming config.m4 > Log: > - Bugfix #34257 lib64 not handled correctly in ming extension > http://cvs.php.net/diff.php/php-src/ext/ming/config.m4?r1=1.22&r2=1.23&ty=u > Index: php-src/ext/ming/config.m4 > diff -u php-src/ext/ming/config.m4:1.22 php-src/ext/ming/config.m4:1.23 > --- php-src/ext/ming/config.m4:1.22 Sun Jul 17 19:58:39 2005 > +++ php-src/ext/ming/config.m4 Thu Aug 25 16:49:48 2005 > @@ -1,5 +1,5 @@ > dnl > -dnl $Id: config.m4,v 1.22 2005/07/17 23:58:39 helly Exp $ > +dnl $Id: config.m4,v 1.23 2005/08/25 20:49:48 helly Exp $ > dnl > PHP_ARG_WITH(ming, for MING support, > @@ -9,7 +9,7 @@ >AC_CHECK_LIB(m, sin) >for i in $PHP_MING /usr/local /usr; do > -if test -f $i/lib/libming.$SHLIB_SUFFIX_NAME -o -f $i/lib/libming.a; then > +if test -f $i/$PHP_LIBDIR/libming.$SHLIB_SUFFIX_NAME -o -f > $i/lib/libming.a; then >MING_DIR=$i >break > fi > @@ -34,11 +34,11 @@ >],[ > AC_MSG_ERROR([Ming library 0.2a or greater required.]) >],[ > --L$MING_DIR/lib > +-L$MING_DIR/$PHP_LIBDIR >]) >PHP_ADD_INCLUDE($MING_INC_DIR) > - PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/lib, MING_SHARED_LIBADD) > + PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/$PHP_LIBDIR, MING_SHARED_LIBADD) >AC_MSG_CHECKING([for destroySWFBlock]) >AC_TRY_RUN([ Best regards, Marcus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/ming config.m4 ming.c
Hi Marcus, Ok. I'm unsing the CVS version. The official release is way outdated! This will require a change to the config.w32 file as well. - Frank > Hello Frank, > > at least not for me with a fresh 0.3 :-/ > > [EMAIL PROTECTED] /usr/src/php-cvs $ rpm -qa|grep ming > ming-utils-0.3-0.beta1.8mdk > libming0-0.3-0.beta1.8mdk > php5-ming-5.1.0.dev-16 > libming0-devel-0.3-0.beta1.8mdk > > > best regards > marcus > > Monday, July 18, 2005, 2:24:08 AM, you wrote: > > > Hi Marcus, > > > HAVE_SWFPREBUILTCLIP and HAVE_NEW_MING seams to be doing the same thing > > now. > > > SWFFontCharacter, SWFSoundInstance, SWFVideoStream, SWFPrebuiltClip are > > all new in ming 0.3 compared to 0.2. > > > - Frank > > > >> helly Sun Jul 17 19:58:40 2005 EDT > >> > >> Modified files: > >> /php-src/ext/ming config.m4 ming.c > >> Log: > >> - Compatibility with ming 0.2a and 0.3a > >> > >> > > > > > -- > Best regards, > Marcusmailto:[EMAIL PROTECTED] > > -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/ming config.m4 ming.c
Hello Frank, at least not for me with a fresh 0.3 :-/ [EMAIL PROTECTED] /usr/src/php-cvs $ rpm -qa|grep ming ming-utils-0.3-0.beta1.8mdk libming0-0.3-0.beta1.8mdk php5-ming-5.1.0.dev-16 libming0-devel-0.3-0.beta1.8mdk best regards marcus Monday, July 18, 2005, 2:24:08 AM, you wrote: > Hi Marcus, > HAVE_SWFPREBUILTCLIP and HAVE_NEW_MING seams to be doing the same thing > now. > SWFFontCharacter, SWFSoundInstance, SWFVideoStream, SWFPrebuiltClip are > all new in ming 0.3 compared to 0.2. > - Frank >> helly Sun Jul 17 19:58:40 2005 EDT >> >> Modified files: >> /php-src/ext/ming config.m4 ming.c >> Log: >> - Compatibility with ming 0.2a and 0.3a >> >> -- Best regards, Marcusmailto:[EMAIL PROTECTED] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/ming config.m4 ming.c
Hi Marcus, HAVE_SWFPREBUILTCLIP and HAVE_NEW_MING seams to be doing the same thing now. SWFFontCharacter, SWFSoundInstance, SWFVideoStream, SWFPrebuiltClip are all new in ming 0.3 compared to 0.2. - Frank > helly Sun Jul 17 19:58:40 2005 EDT > > Modified files: > /php-src/ext/ming config.m4 ming.c > Log: > - Compatibility with ming 0.2a and 0.3a > > -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
