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

Package-Manager: portage-2.1.2_rc2-r5

diff --git a/media-video/coriander/ChangeLog b/media-video/coriander/ChangeLog
index 50714b953834214d85c47dd48e034baf3fc8e557..5b33b1b21fed552f140d9ff667cc7309685482df 100644 (file)
--- 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/Manifest b/media-video/coriander/Manifest
index 3246b7e44befbf2891dbb1cc1660a4d5f65637fa..227a901a99f1d9cc8420e41ebd79d7cd8c8f46f3 100644 (file)
--- a/media-video/coriander/Manifest
+++ b/media-video/coriander/Manifest
@@ -1,3 +1,7 @@
+AUX coriander-2.0.0_rc1-ffmpeg-configure.patch 2812 RMD160 5670ae9c81024be22c406375973fec066b803009 SHA1 cff65cfa383a0df7bdb0275455f3a56b89079b2f SHA256 b26b9e659c4a190ab8e9db729076309999de8f0f3773ae49dd8b1ae7b087dc5a
+MD5 bb83417381eed11b8911a0013d2bb75d files/coriander-2.0.0_rc1-ffmpeg-configure.patch 2812
+RMD160 5670ae9c81024be22c406375973fec066b803009 files/coriander-2.0.0_rc1-ffmpeg-configure.patch 2812
+SHA256 b26b9e659c4a190ab8e9db729076309999de8f0f3773ae49dd8b1ae7b087dc5a files/coriander-2.0.0_rc1-ffmpeg-configure.patch 2812
 DIST coriander-1.0.0.tar.gz 235134 RMD160 87630777533af7585771f73cc9be9bf7a4d8464f SHA1 7740a305001a546f0c547b38220ce0a1b57c6b12 SHA256 9860a531e4ee1e356d6ad9e52a06b83df352ee205405015a0d4943cd13df709e
 DIST coriander-2.0.0-pre3.tar.gz 273463
 DIST coriander-2.0.0-pre5.tar.gz 277406 RMD160 c19ca306946833bf581033059dfdd4698d846163 SHA1 c4e07ca53ffa2aa6302153e698a52b47ec0eca85 SHA256 19e30b81a2a61daaf22585dee2ce28eaa36f90fc807415e5331d3ccfe76e33d0
@@ -19,14 +23,18 @@ EBUILD coriander-2.0.0_pre6.ebuild 975 RMD160 a1b79ae95cdc92aac083437174db51820e
 MD5 3bb1deaeb8b93a4bddc12fb35d089e75 coriander-2.0.0_pre6.ebuild 975
 RMD160 a1b79ae95cdc92aac083437174db51820e1b95f3 coriander-2.0.0_pre6.ebuild 975
 SHA256 8a4dfec2bc25bad696cf67497920e968a0b202d2db1c76179f7c262ebcb3b648 coriander-2.0.0_pre6.ebuild 975
+EBUILD coriander-2.0.0_rc1-r1.ebuild 1118 RMD160 7257ee2a0db774f1955aff4090daa35d0ddc7c37 SHA1 670a2ab4e7dba60cd2c3edd46cb0a7072a95e4ba SHA256 c93c9646b156856367e34e80d08ba40ea6cd83a852e8879d88a9bc2c6cf2fa82
+MD5 91c661cbcc0b2592c2e09ff0bfe7a229 coriander-2.0.0_rc1-r1.ebuild 1118
+RMD160 7257ee2a0db774f1955aff4090daa35d0ddc7c37 coriander-2.0.0_rc1-r1.ebuild 1118
+SHA256 c93c9646b156856367e34e80d08ba40ea6cd83a852e8879d88a9bc2c6cf2fa82 coriander-2.0.0_rc1-r1.ebuild 1118
 EBUILD coriander-2.0.0_rc1.ebuild 969 RMD160 a28f57818a697ab93192022ef831e9714af78931 SHA1 210d7f0748455791068eb15ead66017c423b5b06 SHA256 68ba4813202dcd5bb1b8d78e131d176bd3d94733bf2bed78dadd6e58e398aa62
 MD5 697b051bce8ccb664c277a11c9027a1f coriander-2.0.0_rc1.ebuild 969
 RMD160 a28f57818a697ab93192022ef831e9714af78931 coriander-2.0.0_rc1.ebuild 969
 SHA256 68ba4813202dcd5bb1b8d78e131d176bd3d94733bf2bed78dadd6e58e398aa62 coriander-2.0.0_rc1.ebuild 969
-MISC ChangeLog 2527 RMD160 849f94503476f23b7bf86e32401939a4b3a6438c SHA1 962d038d9de57759a643dd82698f9e21c9e36aee SHA256 068b9f2284a6a98499169ad4b4c3dd3ea3c5fe6c9c09e7a7db931c7d47b2af4d
-MD5 82a7d6cd2a04f1176760375579a8552a ChangeLog 2527
-RMD160 849f94503476f23b7bf86e32401939a4b3a6438c ChangeLog 2527
-SHA256 068b9f2284a6a98499169ad4b4c3dd3ea3c5fe6c9c09e7a7db931c7d47b2af4d ChangeLog 2527
+MISC ChangeLog 2773 RMD160 a0984de7d139b14b15a0ed5d54f8ebdc6f15aacb SHA1 615c6504f415f2c858444f4d60fb4bf8c1603a4d SHA256 55a66b853c111615f20a093692855dc64181e3862bbac4c730f9dc883aefb574
+MD5 80d95ca2c75714b2928e3ace5dc2fde7 ChangeLog 2773
+RMD160 a0984de7d139b14b15a0ed5d54f8ebdc6f15aacb ChangeLog 2773
+SHA256 55a66b853c111615f20a093692855dc64181e3862bbac4c730f9dc883aefb574 ChangeLog 2773
 MISC metadata.xml 254 RMD160 e443fb2011869d9fa797e4d71e336cac9b91a57c SHA1 3a978a742ce76f4f08724d0956e0e20586063e8e SHA256 10f669506638ebd14d588da05f936dd27b3ffcc7a69e6063cbd77f6439edea0c
 MD5 8c508b7fe8782ef51c759979f02e6110 metadata.xml 254
 RMD160 e443fb2011869d9fa797e4d71e336cac9b91a57c metadata.xml 254
@@ -46,3 +54,6 @@ SHA256 9f37887cf231a3f6728194c5f387ebfe088314b9062c0758332f3dfcd407afb3 files/di
 MD5 d4ecfd3ed980e2efb70a8163a14d6353 files/digest-coriander-2.0.0_rc1 259
 RMD160 071a7bb3891bbf1766229cf8f0ae659fb31d74b6 files/digest-coriander-2.0.0_rc1 259
 SHA256 3aea6b29afaee36b104c74b405817de49ab3e993197b1b00745e9e05095a0767 files/digest-coriander-2.0.0_rc1 259
+MD5 d4ecfd3ed980e2efb70a8163a14d6353 files/digest-coriander-2.0.0_rc1-r1 259
+RMD160 071a7bb3891bbf1766229cf8f0ae659fb31d74b6 files/digest-coriander-2.0.0_rc1-r1 259
+SHA256 3aea6b29afaee36b104c74b405817de49ab3e993197b1b00745e9e05095a0767 files/digest-coriander-2.0.0_rc1-r1 259

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 (file)
index 0000000..4d06c5d
--- /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 (file)
index 0000000..597e3ea
--- /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 (file)
index 0000000..04f37a3
--- /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