diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-08-21 16:06:04 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-08-21 16:06:04 +0000 |
| commit | effcca74529751434282b23536d3adbd213ef75f (patch) | |
| tree | 13068b7f18984c53cfdebc15d59ce9f93addc38c /media-video/coriander | |
| parent | old (diff) | |
| download | gentoo-2-effcca74529751434282b23536d3adbd213ef75f.tar.gz gentoo-2-effcca74529751434282b23536d3adbd213ef75f.tar.bz2 gentoo-2-effcca74529751434282b23536d3adbd213ef75f.zip | |
old
(Portage version: 2.2_rc38/cvs/Linux x86_64)
Diffstat (limited to 'media-video/coriander')
| -rw-r--r-- | media-video/coriander/Manifest | 1 | ||||
| -rw-r--r-- | media-video/coriander/files/coriander-2.0.0_rc1-ffmpeg-configure.patch | 87 |
2 files changed, 0 insertions, 88 deletions
diff --git a/media-video/coriander/Manifest b/media-video/coriander/Manifest index 6a9c96fff0b7..380ef7105169 100644 --- a/media-video/coriander/Manifest +++ b/media-video/coriander/Manifest @@ -1,4 +1,3 @@ -AUX coriander-2.0.0_rc1-ffmpeg-configure.patch 2812 RMD160 5670ae9c81024be22c406375973fec066b803009 SHA1 cff65cfa383a0df7bdb0275455f3a56b89079b2f SHA256 b26b9e659c4a190ab8e9db729076309999de8f0f3773ae49dd8b1ae7b087dc5a DIST coriander-2.0.0-rc6.tar.gz 298298 RMD160 9e1c803524e58988fd7c96373af0d616acfcac19 SHA1 e869057d120793b76bc37b16f8e6460cac925179 SHA256 8c8ad8bba08c97cc7945c796fe8d0914a037bc302267be8ebeae05e1e9dd6e05 DIST coriander-2.0.0.tar.gz 309365 RMD160 085893a7cd49230990bff6ef82080004e1ec5180 SHA1 8a71763b5d72fd70eec479da801526ce541755dc SHA256 e248a5adf836cc7e103abb0d95cee826cabd1982d8faf96a5cc2c610529d09f0 EBUILD coriander-2.0.0.ebuild 1220 RMD160 e373c3efecaf5fa69d3b69e722e3cb4649b7c58f SHA1 0260ed1a73b2032193fc2b6a2b906f4c26847747 SHA256 d0d5dfd08f1d584d24847628cfe5eda975ecec70ea4e42198ed9fbd9c508607e 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 deleted file mode 100644 index 597e3ea68a74..000000000000 --- a/media-video/coriander/files/coriander-2.0.0_rc1-ffmpeg-configure.patch +++ /dev/null @@ -1,87 +0,0 @@ -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 |