--- cinelerra-cv-2.1/configure.in.org	2006-11-26 03:33:50.056844000 +0100
+++ cinelerra-cv-2.1/configure.in	2006-11-26 03:33:55.053156250 +0100
@@ -7,7 +7,11 @@
 
 AM_INIT_AUTOMAKE
 AC_CONFIG_HEADER(config.h)
-AM_GNU_GETTEXT([external])
+
+AC_PROG_CC
+AC_GNU_SOURCE
+
+AM_GNU_GETTEXT
 AM_GNU_GETTEXT_VERSION(0.12.1)
 AM_PROG_AS
 
--- cinelerra-cv-2.1/cinelerra/Makefile.am.org	2006-11-26 01:42:58.101122750 +0100
+++ cinelerra-cv-2.1/cinelerra/Makefile.am	2006-11-26 01:43:09.741850250 +0100
@@ -29,7 +29,7 @@
 	echo '#define REPOABOUTPREFTXT "SVN Version: $(SVNVERSION) $(BUILDINFO_NONRC_S)"' >> versioninfo.h
 
 else # (no repository)
-	echo '#define REPOMAINTXT      "(C) 2006 Heroine Virtual Ltd.\nCompiled on $(BUILDDATE)"' >> versioninfo.h
+	echo '#define REPOMAINTXT      "(C) 2006 Heroine Virtual Ltd. Compiled on $(BUILDDATE)"' >> versioninfo.h
 	echo '#define REPOABOUTPREFTXT ""' >> versioninfo.h
 endif
 endif

--- cinelerra/configure.in~	2008-08-22 23:54:27.115850559 +0200
+++ cinelerra/configure.in	2008-08-22 23:58:19.452702168 +0200
@@ -300,6 +300,7 @@
      PKG_CHECK_MODULES([FFMPEG], [libavcodec libpostproc])
      FFMPEG_FOLDER=""
      FFMPEG_EXTERNALTEXT="External ffmpeg"
+     FFMPEG_CFLAGS="-I/usr/include/libavcodec"
 else
      FFMPEG_FOLDER=ffmpeg
      FFMPEG_CFLAGS="-I\$(srcdir)/ffmpeg/libavcodec"
--- cinelerra-cv-2.1/cinelerra/playback3d.h~	2006-11-26 00:41:51.000000000 +0100
+++ cinelerra-cv-2.1/cinelerra/playback3d.h	2008-08-23 00:02:01.015805393 +0200
@@ -225,7 +225,7 @@
 // output - passed when rendering refresh frame.  If 0, the canvas is cleared.
 	void clear_output(Canvas *canvas, VFrame *output);
 
-	void do_fade(Canvas *canvas, VFrame *fade, float fade);
+	void do_fade(Canvas *canvas, VFrame *fade, float fadex);
 
 	void do_mask(Canvas *canvas,
 		VFrame *output,