Attachment 126857 Details for Bug 170634 – file.diff

[patch] file.diff

file.diff (text/plain), 2.31 KB, created by Thomas Koermer on 2012-08-14 14:00:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Koermer

Created: 2012-08-14 14:00:24 UTC

Size: 2.31 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/graphics/php5-ffmpeg/Makefile,v
>retrieving revision 1.11
>diff -u -r1.11 Makefile
>--- Makefile	20 May 2012 06:42:48 -0000	1.11
>+++ Makefile	14 Aug 2012 08:33:28 -0000
>@@ -25,8 +25,7 @@
> USE_PHP=	yes
> USE_PHPIZE=	yes
> USE_PHPEXT=	yes
>-DEFAULT_PHP_VER=53
>-IGNORE_WITH_PHP=5
>+DEFAULT_PHP_VER=54
> 
> CONFIGURE_ARGS+=	--with-ffmpeg=${LOCALBASE}/include
> 
>Index: files/patch-ffmpeg_movie.c
>===================================================================
>RCS file: files/patch-ffmpeg_movie.c
>diff -N files/patch-ffmpeg_movie.c
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-ffmpeg_movie.c	14 Aug 2012 08:33:28 -0000
>@@ -0,0 +1,40 @@
>+--- ffmpeg_movie.c.orig	2008-10-14 00:46:53.000000000 +0200
>++++ ffmpeg_movie.c	2012-07-23 11:17:46.000000000 +0200
>+@@ -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)) {
>+@@ -356,8 +356,8 @@
>+             Z_TYPE(new_le) = le_ffmpeg_pmovie;
>+             new_le.ptr = ffmovie_ctx;
>+ 
>+-            if (FAILURE == zend_hash_update(&EG(persistent_list), hashkey, 
>+-                        hashkey_length+1, (void *)&new_le, sizeof(list_entry),
>++            if (FAILURE == zend_hash_update(&EG(persistent_list), hashkey,
>++                        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");
>+@@ -501,7 +501,7 @@
>+                     codec_id));
>+  
>+         if (!decoder) {
>+-            zend_error(E_ERROR, "Could not find decoder for %s", 
>++            zend_error(E_WARNING, "Could not find decoder for %s", 
>+                     _php_get_filename(ffmovie_ctx));
>+             return NULL;
>+         }

Actions: View | Diff

Attachments on bug 170634: 126857