ports/169370: fix ffmpeg-php compilation against php 5.4

[Alexander Moskalenko]

>Number:         169370
>Category:       ports
>Synopsis:       fix ffmpeg-php compilation against php 5.4
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jun 24 11:50:05 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Charlie &
>Release:        FreeBSD 9.0-STABLE amd64
>Organization:
>Environment:
System: FreeBSD dvdev.dvdev.org.ua 9.0-STABLE FreeBSD 9.0-STABLE #0:
Thu May 17 01:08:15 EEST 2012
root at dvdev.dvdev.org.ua:/usr/obj/usr/src/sys/GENERIC amd64



>Description:
         graphics/php5-ffmpeg does not compile against PHP 5.4 brach.
This prevents from upgrading 5.3 -> 5.4
>How-To-Repeat:
         Try to install php5-ffmpeg with PHP 5.4
>Fix:

        Apply patch

--- patch-ffmpeg_movie.c begins here ---
--- ffmpeg_movie.c.orig 2008-10-14 01:46:53.000000000 +0300
+++ ffmpeg_movie.c      2012-06-24 14:26:39.095299987 +0300
@@ -308,7 +308,7 @@
     }

     if (persistent) {
-        list_entry *le;
+        zend_rsrc_list_entry *le;
         /* resolve the fully-qualified path name to use as the hash key */
         fullpath = expand_filepath(filename, NULL TSRMLS_CC);

@@ -343,7 +343,7 @@
             }

         } else { /* no existing persistant movie, create one */
-            list_entry new_le;
+            zend_rsrc_list_entry new_le;
             ffmovie_ctx = _php_alloc_ffmovie_ctx(1);

             if (_php_open_movie_file(ffmovie_ctx, filename)) {
@@ -357,7 +357,7 @@
             new_le.ptr = ffmovie_ctx;

             if (FAILURE == zend_hash_update(&EG(persistent_list), hashkey,
-                        hashkey_length+1, (void *)&new_le, sizeof(list_entry),
+                        hashkey_length+1, (void *)&new_le,
sizeof(zend_rsrc_list_entry),
                         NULL)) {
                 php_error_docref(NULL TSRMLS_CC, E_WARNING,
                         "Failed to register persistent resource");
--- patch-ffmpeg_movie.c ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: