gegl r2719 - in trunk: . operations/external operations/workshop/external

[neo svn gnome org]

Author: neo
Date: Mon Nov 10 20:05:12 2008
New Revision: 2719
URL: http://svn.gnome.org/viewvc/gegl?rev=2719&view=rev

Log:
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>.



Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/operations/external/Makefile.am
   trunk/operations/external/ff-load.c
   trunk/operations/workshop/external/Makefile.am
   trunk/operations/workshop/external/ff-save.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Nov 10 20:05:12 2008
@@ -765,25 +765,21 @@
 AM_CONDITIONAL(HAVE_ASCIIDOC, test "x$have_asciidoc" = "xyes")
 
 
-##########################################
-# Check for avcodec and avformat libraries
-##########################################
-
-PKG_CHECK_MODULES(AVCODEC, libavcodec,
-  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)")
+####################################
+# Check for libavformat / libavcodec
+####################################
+
+AC_ARG_WITH(libavformat,  [  --without-libavformat   build without libavformat support])
+
+if test "x$with_libavformat" != xno; then
+  PKG_CHECK_MODULES(AVFORMAT, libavformat libavcodec,
+    have_libavformat="yes",
+    have_libavformat="no  (libavformat not found)")
+else
+  have_libavformat="no  (disabled)"
+fi
 AM_CONDITIONAL(HAVE_AVFORMAT, test "x$have_libavformat" = "xyes")
 
-AC_SUBST(AVCODEC_CFLAGS) 
-AC_SUBST(AVCODEC_LIBS) 
-AC_SUBST(AVFORMAT_CFLAGS) 
-AC_SUBST(AVFORMAT_LIBS) 
-
 
 ###############
 # Check for V4L
@@ -924,7 +920,6 @@
   asciidoc:       $have_asciidoc
   enscript:       $have_enscript
   graphviz:       $have_graphviz
-  avcodec:        $have_libavcodec
   avformat:       $have_libavformat
   V4L:            $have_v4l
   spiro:          $spiro_ok

Modified: trunk/operations/external/Makefile.am
==============================================================================
--- trunk/operations/external/Makefile.am	(original)
+++ trunk/operations/external/Makefile.am	Mon Nov 10 20:05:12 2008
@@ -85,13 +85,11 @@
 
 EXTRA_DIST=v4lutils/v4lutils.c v4lutils/v4lutils.h
 
-if HAVE_AVCODEC
 if HAVE_AVFORMAT
 ops += ff-load.la
 ff_load_la_SOURCES = ff-load.c
-ff_load_la_LIBADD = $(op_libs) $(AVCODEC_LIBS) $(AVFORMAT_LIBS)
-ff_load_la_CFLAGS = $(AVCODEC_CFLAGS) $(AVFORMAT_CFLAGS)
-endif
+ff_load_la_LIBADD = $(op_libs) $(AVFORMAT_LIBS)
+ff_load_la_CFLAGS = $(AVFORMAT_CFLAGS)
 endif
 
 opdir = $(libdir)/gegl- GEGL_API_VERSION@

Modified: trunk/operations/external/ff-load.c
==============================================================================
--- trunk/operations/external/ff-load.c	(original)
+++ trunk/operations/external/ff-load.c	Mon Nov 10 20:05:12 2008
@@ -32,7 +32,7 @@
 
 #include "gegl-chant.h"
 #include <errno.h>
-#include <avformat.h>
+#include <libavformat/avformat.h>
 
 typedef struct
 {

Modified: trunk/operations/workshop/external/Makefile.am
==============================================================================
--- trunk/operations/workshop/external/Makefile.am	(original)
+++ trunk/operations/workshop/external/Makefile.am	Mon Nov 10 20:05:12 2008
@@ -18,13 +18,11 @@
 gtk_display_la_CFLAGS  = $(GTK_CFLAGS)
 endif
 
-if HAVE_AVCODEC
 if HAVE_AVFORMAT
 ops += ff_save.la
 ff_save_la_SOURCES = ff-save.c
-ff_save_la_LIBADD = $(op_libs) $(AVCODEC_LIBS) $(AVFORMAT_LIBS)
-ff_save_la_CFLAGS = $(AVCODEC_CFLAGS) $(AVFORMAT_CFLAGS)
-endif
+ff_save_la_LIBADD = $(op_libs) $(AVFORMAT_LIBS)
+ff_save_la_CFLAGS = $(AVFORMAT_CFLAGS)
 endif
 
 if HAVE_LUA

Modified: trunk/operations/workshop/external/ff-save.c
==============================================================================
--- trunk/operations/workshop/external/ff-save.c	(original)
+++ trunk/operations/workshop/external/ff-save.c	Mon Nov 10 20:05:12 2008
@@ -32,7 +32,7 @@
 #define GEGL_CHANT_C_FILE       "ff-save.c"
 
 #include "gegl-chant.h"
-#include "ffmpeg/avformat.h"
+#include <libavformat/avformat.h>
 
 typedef struct
 {