From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Aug 14 13:00:25 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 22DB3106567A for ; Tue, 14 Aug 2012 13:00:25 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id E13438FC17 for ; Tue, 14 Aug 2012 13:00:24 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q7ED0ONC037375 for ; Tue, 14 Aug 2012 13:00:24 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q7ED0Omf037374; Tue, 14 Aug 2012 13:00:24 GMT (envelope-from gnats) Resent-Date: Tue, 14 Aug 2012 13:00:24 GMT Resent-Message-Id: <201208141300.q7ED0Omf037374@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Thomas Koermer Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D2F6D1065676; Tue, 14 Aug 2012 12:51:41 +0000 (UTC) (envelope-from tkoerme@gwdu111.gwdg.de) Received: from gwdu111.gwdg.de (gwdu111.gwdg.de [134.76.10.111]) by mx1.freebsd.org (Postfix) with ESMTP id 744B98FC24; Tue, 14 Aug 2012 12:51:40 +0000 (UTC) Received: from gwdu111.gwdg.de (localhost [127.0.0.1]) by gwdu111.gwdg.de (8.14.5/8.14.4) with ESMTP id q7ECeC4R074130; Tue, 14 Aug 2012 14:40:12 +0200 (CEST) (envelope-from tkoerme@gwdu111.gwdg.de) Received: (from tkoerme@localhost) by gwdu111.gwdg.de (8.14.5/8.14.4/Submit) id q7ECeCFn074128; Tue, 14 Aug 2012 14:40:12 +0200 (CEST) (envelope-from tkoerme) Message-Id: <201208141240.q7ECeCFn074128@gwdu111.gwdg.de> Date: Tue, 14 Aug 2012 14:40:12 +0200 (CEST) From: Thomas Koermer To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: acm@FreeBSD.org Subject: ports/170634: Update port php5-ffmpeg for use with PHP5.4 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Thomas Koermer List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Aug 2012 13:00:25 -0000 >Number: 170634 >Category: ports >Synopsis: Update port php5-ffmpeg for use with PHP5.4 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Aug 14 13:00:24 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Thomas Koermer >Release: FreeBSD 8.3-RELEASE-p3 amd64 >Organization: GWDG >Environment: System: FreeBSD gwdu146.gwdg.de 8.3-RELEASE-p3 FreeBSD 8.3-RELEASE-p3 #7: Tue Jun 12 20:21:42 CEST 2012 root@gwdu135.gwdg.de:/usr/obj/usr/src/sys/GWDU146 amd64 >Description: Currently, module php5-ffmpeg does only build with PHP5.3; update for use with PHP5.4 required >How-To-Repeat: cd /usr/ports/graphics/php5-ffmpeg make ===> php5-ffmpeg-0.6.0_6 cannot install: doesn't work with PHP version : 5 (Doesn't support PHP 5). *** Error code 1 pkg_info | grep php php5-5.4.4 PHP Scripting Language >Fix: ? cvs.diff 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; + } >Release-Note: >Audit-Trail: >Unformatted: