Fix ffmpeg configure-time behaviour thanks to Gad Kadosh in bug #133143

(Portage version: 2.1.2_rc2-r5)

4 files changed, 148 insertions, 1 deletions

diff --git a/media-video/coriander/ChangeLog b/media-video/coriander/ChangeLog
index 50714b953834..5b33b1b21fed 100644
--- a/media-video/coriander/ChangeLog
+++ b/media-video/coriander/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/coriander
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/coriander/ChangeLog,v 1.7 2006/09/15 14:05:10 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/coriander/ChangeLog,v 1.8 2006/12/07 18:28:28 dsd Exp $
+
+*coriander-2.0.0_rc1-r1 (07 Dec 2006)
+
+  07 Dec 2006; Daniel Drake <dsd@gentoo.org>
+  +files/coriander-2.0.0_rc1-ffmpeg-configure.patch,
+  +coriander-2.0.0_rc1-r1.ebuild:
+  Fix ffmpeg configure-time behaviour thanks to Gad Kadosh in bug #133143
 
 *coriander-2.0.0_rc1 (15 Sep 2006)
 
diff --git a/media-video/coriander/coriander-2.0.0_rc1-r1.ebuild b/media-video/coriander/coriander-2.0.0_rc1-r1.ebuild
new file mode 100644
index 000000000000..4d06c5d8ffc4
--- /dev/null
+++ b/media-video/coriander/coriander-2.0.0_rc1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2006 Gentoo Foundation and Pieter Van den Abeele
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/coriander/coriander-2.0.0_rc1-r1.ebuild,v 1.1 2006/12/07 18:28:28 dsd Exp $
+
+inherit eutils
+
+MY_P=${P/_/-}
+
+DESCRIPTION="A Gnome2 GUI for firewire camera control and capture"
+HOMEPAGE="http://sourceforge.net/projects/coriander/"
+
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="ffmpeg"
+
+S=${WORKDIR}/${MY_P}
+
+
+RDEPEND=">=media-libs/libdc1394-2.0.0_rc3
+	ffmpeg? ( media-video/ffmpeg )
+	media-libs/libsdl
+	gnome-base/libgnomeui
+	gnome-base/libbonoboui
+	gnome-base/libgnomecanvas
+	gnome-base/libgnome
+	gnome-base/orbit"
+
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Bug #133143, already merged upstream
+	epatch ${FILESDIR}/${P}-ffmpeg-configure.patch
+}
+
+src_compile() {
+	export SSE_CFLAGS="${CFLAGS}"
+	econf || die
+	emake SSE_CFLAGS="${CFLAGS}" || die
+}
+
+src_install() {
+	emake DESTDIR=${D} install || die
+	dodoc NEWS README AUTHORS
+}
diff --git a/media-video/coriander/files/coriander-2.0.0_rc1-ffmpeg-configure.patch b/media-video/coriander/files/coriander-2.0.0_rc1-ffmpeg-configure.patch
new file mode 100644
index 000000000000..597e3ea68a74
--- /dev/null
+++ b/media-video/coriander/files/coriander-2.0.0_rc1-ffmpeg-configure.patch
@@ -0,0 +1,87 @@
+Index: coriander-2.0.0-rc1/configure.in
+===================================================================
+--- coriander-2.0.0-rc1.orig/configure.in
++++ coriander-2.0.0-rc1/configure.in
+@@ -315,34 +315,43 @@ AC_DEFUN([AC_CHECK_LFS],[
+ ])
+ 
+ AC_DEFUN([AC_CHECK_FFMPEG],[
++	PKG_CHECK_MODULES(FFMPEG, libavformat libavcodec,
++		have_ffmpeg=yes, have_ffmpeg=no)
+ 	AC_SUBST(FFMPEG_CFLAGS)
+ 	AC_SUBST(FFMPEG_LIBS)
+-	AC_CHECK_PROG(have_ffmpeg_config, ffmpeg-config, "found", "no")
+-	if test x$have_ffmpeg_config = xfound; then 
+-	     AC_MSG_CHECKING(ffmpeg version)    
+-	     AC_TRY_COMPILE([
+-	     #include <ffmpeg/avformat.h>
+-	     ],[
+-	     int main(void) {
+-               AVFormatContext *oc;
+-	       AVCodecContext *c;
+-               AVStream *st;
+-               st = av_new_stream(oc, 0);
+-  	       c = st->codec;
+-               return 0;
+-	     }
+-	     ],ffmpeg=ok,ffmpeg=outdated);
+-	     AC_MSG_RESULT($ffmpeg)
+- 	     if test x$ffmpeg = xok; then
+-	          FFMPEG_LIBS=`ffmpeg-config --libs avformat avcodec`
+-	          FFMPEG_CFLAGS=`ffmpeg-config --cflags`
+-	          AC_DEFINE(HAVE_FFMPEG,1,[defined if ffmpeg is available])
+-	     else
+-                  AC_ERROR([ffmpeg is too old. 
++
++	# Older ffmpeg releases have ffmpeg-config rather than installing .pc files
++	if test x$have_ffmpeg = xno; then
++		AC_CHECK_PROG(have_ffmpeg, ffmpeg-config, "yes", "no")
++		if test x$have_ffmpeg = xyes; then
++			FFMPEG_LIBS=`ffmpeg-config --libs avformat avcodec`
++			FFMPEG_CFLAGS=`ffmpeg-config --cflags`
++		fi
++	fi
++
++	if test x$have_ffmpeg = xyes; then
++		AC_MSG_CHECKING(ffmpeg version)
++		AC_TRY_COMPILE([#include <ffmpeg/avformat.h>],[
++			int main(void) {
++			AVFormatContext *oc;
++			AVCodecContext *c;
++			AVStream *st;
++			st = av_new_stream(oc, 0);
++			c = st->codec;
++			return 0;
++			}
++			],ffmpeg=ok,ffmpeg=outdated);
++		AC_MSG_RESULT($ffmpeg)
++		if test x$ffmpeg = xok; then
++			AC_DEFINE(HAVE_FFMPEG,1,[defined if ffmpeg is available])
++		else
++			if test "x$want_ffmpeg" = "xyes"; then
++				AC_ERROR([ffmpeg is too old.
+ **************************************************************************
+ **   Please install ffmpeg version 0.4.9 minimum                        **
+ **************************************************************************])
+-             fi
++			fi
++		fi
+ 	else
+ 	  AC_MSG_RESULT([ffmpeg required for MPEG video saving.
+ **************************************************************************
+@@ -371,7 +380,14 @@ AC_CHECK_LIBRAW
+ AC_CHECK_LIBDC
+ AC_CHECK_FTPLIB
+ AC_CHECK_SDLLIB
+-AC_CHECK_FFMPEG
++
++AC_ARG_ENABLE(ffmpeg,
++	AS_HELP_STRING(--enable-ffmpeg, [enable MPEG video saving (default auto)]),
++	want_ffmpeg=$enableval, want_ffmpeg=auto)
++
++if test "x$want_ffmpeg" != "xno"; then
++	AC_CHECK_FFMPEG
++fi
+ 
+ dnl deprecated:
+ dnl AC_CHECK_GDK_PIXBUF
diff --git a/media-video/coriander/files/digest-coriander-2.0.0_rc1-r1 b/media-video/coriander/files/digest-coriander-2.0.0_rc1-r1
new file mode 100644
index 000000000000..04f37a35543d
--- /dev/null
+++ b/media-video/coriander/files/digest-coriander-2.0.0_rc1-r1
@@ -0,0 +1,3 @@
+MD5 9b546b423953c92c18bda8273af866a8 coriander-2.0.0-rc1.tar.gz 274285
+RMD160 c0eeef9b12b41d09355d1001f0c9f3ccf726da07 coriander-2.0.0-rc1.tar.gz 274285
+SHA256 fc728756807f031cf3b3cb0dfbfff16d313a6238bab74b6c28268275f9a3c257 coriander-2.0.0-rc1.tar.gz 274285