Gentoo Archives: gentoo-commits

From: "Ole Markus With (olemarkus)" <olemarkus@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-php/ffmpeg-php/files: ffmpeg-php-0.6.0-php5-4.patch
Date: Mon, 04 Mar 2013 09:17:11
Message-Id: 20130304091705.D26A52171D@flycatcher.gentoo.org
1 olemarkus 13/03/04 09:17:05
2
3 Added: ffmpeg-php-0.6.0-php5-4.patch
4 Log:
5 Adds 5.4 support to ffmpeg-php. Thanks to Sergey Smirnov. Fixes bug 459006
6
7 (Portage version: 2.1.11.50/cvs/Linux x86_64, signed Manifest commit with key C4A92BF5)
8
9 Revision Changes Path
10 1.1 dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-php5-4.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-php5-4.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-php5-4.patch?rev=1.1&content-type=text/plain
14
15 Index: ffmpeg-php-0.6.0-php5-4.patch
16 ===================================================================
17 --- ffmpeg-php-0.6.0.orig/ffmpeg_movie.c.bak 2013-02-24 16:44:31.162791000 +0200
18 +++ ffmpeg-php-0.6.0/ffmpeg_movie.c 2013-02-24 16:45:20.632791000 +0200
19 @@ -308,7 +308,7 @@
20 }
21
22 if (persistent) {
23 - list_entry *le;
24 + zend_rsrc_list_entry *le;
25 /* resolve the fully-qualified path name to use as the hash key */
26 fullpath = expand_filepath(filename, NULL TSRMLS_CC);
27
28 @@ -343,7 +343,7 @@
29 }
30
31 } else { /* no existing persistant movie, create one */
32 - list_entry new_le;
33 + zend_rsrc_list_entry new_le;
34 ffmovie_ctx = _php_alloc_ffmovie_ctx(1);
35
36 if (_php_open_movie_file(ffmovie_ctx, filename)) {
37 @@ -357,7 +357,7 @@
38 new_le.ptr = ffmovie_ctx;
39
40 if (FAILURE == zend_hash_update(&EG(persistent_list), hashkey,
41 - hashkey_length+1, (void *)&new_le, sizeof(list_entry),
42 + hashkey_length+1, (void *)&new_le, sizeof(zend_rsrc_list_entry),
43 NULL)) {
44 php_error_docref(NULL TSRMLS_CC, E_WARNING,
45 "Failed to register persistent resource");