Commit b199f5d9 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

added --without-libavformat option to disable build of the FFmpeg video

2008-11-10  Sven Neumann  <sven@gimp.org>

	* configure.in: added --without-libavformat option to disable 
build
	of the FFmpeg video frame operations.

	* operations/external/Makefile.am
	* operations/workshop/external/Makefile.am: AVCODEC was folded 
into
	AVFORMAT.

	* operations/workshop/external/ff-save.c
	* operations/external/ff-load.c: include 
<libavformat/avformat.h>.


svn path=/trunk/; revision=2719
parent cadc17f1
2008-11-10 Sven Neumann <sven@gimp.org>
* configure.in: added --without-libavformat option to disable build
of the FFmpeg video frame operations.
* operations/external/Makefile.am
* operations/workshop/external/Makefile.am: AVCODEC was folded into
AVFORMAT.
* operations/workshop/external/ff-save.c
* operations/external/ff-load.c: include <libavformat/avformat.h>.
2008-11-10 Sven Neumann <sven@gimp.org> 2008-11-10 Sven Neumann <sven@gimp.org>
* operations/external/ff-load.c: fix include path for avformat.h. * operations/external/ff-load.c: fix include path for avformat.h.
......
...@@ -765,24 +765,20 @@ fi ...@@ -765,24 +765,20 @@ fi
AM_CONDITIONAL(HAVE_ASCIIDOC, test "x$have_asciidoc" = "xyes") AM_CONDITIONAL(HAVE_ASCIIDOC, test "x$have_asciidoc" = "xyes")
########################################## ####################################
# Check for avcodec and avformat libraries # Check for libavformat / libavcodec
########################################## ####################################
PKG_CHECK_MODULES(AVCODEC, libavcodec, AC_ARG_WITH(libavformat, [ --without-libavformat build without libavformat support])
have_libavcodec="yes",
have_libavcodec="no (usable libavcodec not found)")
AM_CONDITIONAL(HAVE_AVCODEC, test "x$have_libavcodec" = "xyes")
PKG_CHECK_MODULES(AVFORMAT, libavformat,
have_libavformat="yes",
have_libavformat="no (usable libavformat not found)")
AM_CONDITIONAL(HAVE_AVFORMAT, test "x$have_libavformat" = "xyes")
AC_SUBST(AVCODEC_CFLAGS) if test "x$with_libavformat" != xno; then
AC_SUBST(AVCODEC_LIBS) PKG_CHECK_MODULES(AVFORMAT, libavformat libavcodec,
AC_SUBST(AVFORMAT_CFLAGS) have_libavformat="yes",
AC_SUBST(AVFORMAT_LIBS) have_libavformat="no (libavformat not found)")
else
have_libavformat="no (disabled)"
fi
AM_CONDITIONAL(HAVE_AVFORMAT, test "x$have_libavformat" = "xyes")
############### ###############
...@@ -924,7 +920,6 @@ Optional dependencies: ...@@ -924,7 +920,6 @@ Optional dependencies:
asciidoc: $have_asciidoc asciidoc: $have_asciidoc
enscript: $have_enscript enscript: $have_enscript
graphviz: $have_graphviz graphviz: $have_graphviz
avcodec: $have_libavcodec
avformat: $have_libavformat avformat: $have_libavformat
V4L: $have_v4l V4L: $have_v4l
spiro: $spiro_ok spiro: $spiro_ok
......
...@@ -85,13 +85,11 @@ endif ...@@ -85,13 +85,11 @@ endif
EXTRA_DIST=v4lutils/v4lutils.c v4lutils/v4lutils.h EXTRA_DIST=v4lutils/v4lutils.c v4lutils/v4lutils.h
if HAVE_AVCODEC
if HAVE_AVFORMAT if HAVE_AVFORMAT
ops += ff-load.la ops += ff-load.la
ff_load_la_SOURCES = ff-load.c ff_load_la_SOURCES = ff-load.c
ff_load_la_LIBADD = $(op_libs) $(AVCODEC_LIBS) $(AVFORMAT_LIBS) ff_load_la_LIBADD = $(op_libs) $(AVFORMAT_LIBS)
ff_load_la_CFLAGS = $(AVCODEC_CFLAGS) $(AVFORMAT_CFLAGS) ff_load_la_CFLAGS = $(AVFORMAT_CFLAGS)
endif
endif endif
opdir = $(libdir)/gegl-@GEGL_API_VERSION@ opdir = $(libdir)/gegl-@GEGL_API_VERSION@
......
...@@ -32,7 +32,7 @@ gegl_chant_int (frame, _("Frame"), 0, 1000000, 0, _("frame number")) ...@@ -32,7 +32,7 @@ gegl_chant_int (frame, _("Frame"), 0, 1000000, 0, _("frame number"))
#include "gegl-chant.h" #include "gegl-chant.h"
#include <errno.h> #include <errno.h>
#include <avformat.h> #include <libavformat/avformat.h>
typedef struct typedef struct
{ {
......
...@@ -18,13 +18,11 @@ gtk_display_la_LIBADD = $(op_libs) $(GTK_LIBS) ...@@ -18,13 +18,11 @@ gtk_display_la_LIBADD = $(op_libs) $(GTK_LIBS)
gtk_display_la_CFLAGS = $(GTK_CFLAGS) gtk_display_la_CFLAGS = $(GTK_CFLAGS)
endif endif
if HAVE_AVCODEC
if HAVE_AVFORMAT if HAVE_AVFORMAT
ops += ff_save.la ops += ff_save.la
ff_save_la_SOURCES = ff-save.c ff_save_la_SOURCES = ff-save.c
ff_save_la_LIBADD = $(op_libs) $(AVCODEC_LIBS) $(AVFORMAT_LIBS) ff_save_la_LIBADD = $(op_libs) $(AVFORMAT_LIBS)
ff_save_la_CFLAGS = $(AVCODEC_CFLAGS) $(AVFORMAT_CFLAGS) ff_save_la_CFLAGS = $(AVFORMAT_CFLAGS)
endif
endif endif
if HAVE_LUA if HAVE_LUA
......
...@@ -32,7 +32,7 @@ gegl_chant_double (fps, _("FPS"), 0.0, 100.0, 25, _("frames per second")) ...@@ -32,7 +32,7 @@ gegl_chant_double (fps, _("FPS"), 0.0, 100.0, 25, _("frames per second"))
#define GEGL_CHANT_C_FILE "ff-save.c" #define GEGL_CHANT_C_FILE "ff-save.c"
#include "gegl-chant.h" #include "gegl-chant.h"
#include "ffmpeg/avformat.h" #include <libavformat/avformat.h>
typedef struct typedef struct
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment