Date: Mon, 28 Jul 2008 16:01:22 +0800 (CST) From: Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: acm@FreeBSD.org Subject: ports/126026: [PATCH] graphics/php4-ffmpeg: Fix build for ffmpeg 20080727 snapshot [SUMMARIZE CHANGES] Message-ID: <20080728080122.CDC2C1C71@sunpoet.net> Resent-Message-ID: <200807280810.m6S8A1Jp060109@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080728080122.CDC2C1C71>