From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jul 28 08:10:01 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BE4261065670 for ; Mon, 28 Jul 2008 08:10:01 +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 A04BB8FC21 for ; Mon, 28 Jul 2008 08:10:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m6S8A1Nu060110 for ; Mon, 28 Jul 2008 08:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m6S8A1Jp060109; Mon, 28 Jul 2008 08:10:01 GMT (envelope-from gnats) Resent-Date: Mon, 28 Jul 2008 08:10:01 GMT Resent-Message-Id: <200807280810.m6S8A1Jp060109@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, Sunpoet Po-Chuan Hsieh Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0C2F11065678 for ; Mon, 28 Jul 2008 08:01:34 +0000 (UTC) (envelope-from sunpoet@sunpoet.net) Received: from sunpoet.net (sunpoet.net [203.204.205.212]) by mx1.freebsd.org (Postfix) with ESMTP id CEF8F8FC18 for ; Mon, 28 Jul 2008 08:01:33 +0000 (UTC) (envelope-from sunpoet@sunpoet.net) Received: by sunpoet.net (Postfix, from userid 1000) id CDC2C1C71; Mon, 28 Jul 2008 16:01:22 +0800 (CST) Message-Id: <20080728080122.CDC2C1C71@sunpoet.net> Date: Mon, 28 Jul 2008 16:01:22 +0800 (CST) From: Sunpoet Po-Chuan Hsieh To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: acm@FreeBSD.org Subject: ports/126026: [PATCH] graphics/php4-ffmpeg: Fix build for ffmpeg 20080727 snapshot [SUMMARIZE CHANGES] X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jul 2008 08:10:01 -0000 >Number: 126026 >Category: ports >Synopsis: [PATCH] graphics/php4-ffmpeg: Fix build for ffmpeg 20080727 snapshot [SUMMARIZE CHANGES] >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Jul 28 08:10:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Sunpoet Po-Chuan Hsieh >Release: FreeBSD 7.0-STABLE amd64 >Organization: >Environment: System: FreeBSD bonjour.sunpoet.net 7.0-STABLE FreeBSD 7.0-STABLE #9: Mon Jul 14 22:39:26 CST 2008 >Description: [DESCRIBE CHANGES] Since file hieirachy of ffmpeg (20080727 snapshot) has changed from include/ffmpeg to include/{libavcodec,libavformat,libavutil}. ( http://www.freebsd.org/cgi/cvsweb.cgi/ports/multimedia/ffmpeg/pkg-plist.diff?r1=1.20;r2=1.21;f=h ) This patch fix the include file detection in configure. Added file(s): - files/patch-config.m4 Port maintainer (acm@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- php4-ffmpeg-0.5.0_2.patch begins here --- diff -ruN --exclude=CVS /usr/ports/graphics/php4-ffmpeg/files/patch-config.m4 /usr/ports/sunpoet/php4-ffmpeg/files/patch-config.m4 --- /usr/ports/graphics/php4-ffmpeg/files/patch-config.m4 1970-01-01 08:00:00.000000000 +0800 +++ /usr/ports/sunpoet/php4-ffmpeg/files/patch-config.m4 2008-07-28 15:53:23.005305754 +0800 @@ -0,0 +1,27 @@ +--- config.m4.orig 2006-09-30 02:14:15.000000000 +0800 ++++ config.m4 2008-07-28 15:53:18.099676966 +0800 +@@ -6,7 +6,11 @@ + + AC_MSG_CHECKING(for ffmpeg headers) + for i in $PHP_FFMPEG /usr/local /usr ; do +- if test -f $i/include/ffmpeg/avcodec.h; then ++ if test -f $i/include/libavcodec/avcodec.h; then ++ FFMPEG_DIR=$i ++ FFMPEG_INCDIR="$i/include/libavcodec $i/include/libavformat" ++ break ++ elif test -f $i/include/ffmpeg/avcodec.h; then + FFMPEG_DIR=$i + FFMPEG_INCDIR=$i/include/ffmpeg + break +@@ -45,7 +49,10 @@ + + PHP_ADD_LIBRARY_WITH_PATH(avcodec, $FFMPEG_LIBDIR, FFMPEG_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(avformat, $FFMPEG_LIBDIR, FFMPEG_SHARED_LIBADD) +- PHP_ADD_INCLUDE($FFMPEG_INCDIR) ++ ++ for i in $FFMPEG_INCDIR; do ++ PHP_ADD_INCLUDE($i) ++ done + + PHP_NEW_EXTENSION(ffmpeg, ffmpeg-php.c ffmpeg_movie.c ffmpeg_frame.c ffmpeg_animated_gif.c, $ext_shared,, \\$(GDLIB_CFLAGS)) + PHP_SUBST(FFMPEG_SHARED_LIBADD) --- php4-ffmpeg-0.5.0_2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: