summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOle Markus With <olemarkus@gentoo.org>2013-03-04 09:17:05 +0000
committerOle Markus With <olemarkus@gentoo.org>2013-03-04 09:17:05 +0000
commit7815fb251fed73862fa4997249321116ebe4b890 (patch)
tree5df617a54405fd898e365b09d8a2a4e3cc34c271 /dev-php/ffmpeg-php/files
parentStable for amd64, wrt bug #460156 (diff)
downloadgentoo-2-7815fb251fed73862fa4997249321116ebe4b890.tar.gz
gentoo-2-7815fb251fed73862fa4997249321116ebe4b890.tar.bz2
gentoo-2-7815fb251fed73862fa4997249321116ebe4b890.zip
Adds 5.4 support to ffmpeg-php. Thanks to Sergey Smirnov. Fixes bug 459006
(Portage version: 2.1.11.50/cvs/Linux x86_64, signed Manifest commit with key C4A92BF5)
Diffstat (limited to 'dev-php/ffmpeg-php/files')
-rw-r--r--dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-php5-4.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-php5-4.patch b/dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-php5-4.patch
new file mode 100644
index 000000000000..cc33682cac1e
--- /dev/null
+++ b/dev-php/ffmpeg-php/files/ffmpeg-php-0.6.0-php5-4.patch
@@ -0,0 +1,29 @@
+--- ffmpeg-php-0.6.0.orig/ffmpeg_movie.c.bak 2013-02-24 16:44:31.162791000 +0200
++++ ffmpeg-php-0.6.0/ffmpeg_movie.c 2013-02-24 16:45:20.632791000 +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)) {
+@@ -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");