Hi all!
Here are the patches used for the pre-build Fedora 9 version of cinelerra.
Howto (x86 and x86_64).
su -
rpm -ivh http://rpm.livna.org/livna-release-9.rpm
rpm -ivh http://rpms.kwizart.net/kwizart-release-9.rpm
yum install cinelerra
And that's all - no need to tweak anything more.
(the kernel.shmmax parameter will be handled in /etc/sysctl.conf)
Please note that mixing incompatibles repository with livna will lead to
well knwown problems.
About the patches:
Libaries:
- I would like to avoid using internals version of dependant libraries
to use system ones instead. This concern libmpeg3 ffmpeg and
mpeg2dec(which could be replaced with twolame i guess).
Fonts
- The cinelerra package bundles many fonts (used by the title plugins)
that doesn't seems even redistributable (usually found with the
mscorefonts package).
This should be avoided since this will leads to the fonts to be provided
twice; and it will save about 6Mb for the cinelerra package.
Instead cinelerra should scan in the system fonts directory
(/usr/share/fonts ) for system fonts.
Actually, it searches for the fonts.dir catalog file expected in each
directory. In a Fedora system, some fonts package bundled this kind
of file, but this is deprecated for at least two years. Packages should
use fontconfig or else to use system fonts.
The workaround would be to use ttmkfdir mkfontdir in each directories to
regenerate system fonts.
LibGL
The patch is aimed to fix a problem with libGL, but it fails on Fedora
(that has libGL.so for mesa and even nVidia) - This kind of workaround
should be handled in the specific distribution as it lead to fails in
Fedora. (or maybe i haven't used --enable-opengl whereas the configure
line suggest that it should be autodetected).
Others dynamic patches:
- The bundled cinelerra.spec suggest that :
ln -s ../../bin/mpeg2enc %{buildroot}%{_libdir}/cinelerra/mpeg2enc.plugin
But cinelerra complains not to be able to load a binary on loading. I
wonder what the purpose of this tweak ?
- sed -i -e 's|linux/time.h|time.h|' configure.in configure
The configure script test if v4l2 can be built with linux/time.h (and
fails) but this header isn't specified in the source codec elsewhere.
Instead time.h is found and the test will succeed if this file is used.
-sed -i -e 's|libavcodec/avcodec.h|ffmpeg/avcodec.h|' configure.in configure
Ffmpeg mess are a subject by itself. If you want to check for headers,
start with pathes specifics headers then check for <avcodec.h>, this
will save the false positive detection in case of multiple installation
of ffmpeg. (not so uncommon - we know why ).
My pov is that ffmpeg shoudn't even be bundled in the source. And if
ever built internally, it should follow the libmpeg3 example to be built
shared with something like :
ffmpeg_la_LDFLAGS = -version-info 1:0:0 -release 2.1.0
I hope some of theses can be picked or at least discussed.
Nicolas (kwizart)
diff -up cinelerra-2.1/cinelerra/Makefile.am.ffmpeg_external cinelerra-2.1/cinelerra/Makefile.am
--- cinelerra-2.1/cinelerra/Makefile.am.ffmpeg_external 2007-02-09 20:21:54.000000000 +0100
+++ cinelerra-2.1/cinelerra/Makefile.am 2007-11-12 19:03:43.000000000 +0100
@@ -687,6 +687,7 @@ cinelerra_LDADD = \
$(SOUND_LDFLAGS) \
$(FIREWIRE_LDFLAGS) \
$(LIBDV_LIBS) \
+ $(FFMPEG_LIBS) \
-luuid \
$(MJPEG_LIBS)
diff -up cinelerra-2.1/cinelerra/Makefile.in.ffmpeg_external cinelerra-2.1/cinelerra/Makefile.in
--- cinelerra-2.1/cinelerra/Makefile.in.ffmpeg_external 2007-11-11 02:44:18.000000000 +0100
+++ cinelerra-2.1/cinelerra/Makefile.in 2007-11-12 19:03:43.000000000 +0100
@@ -248,7 +248,7 @@ cinelerra_DEPENDENCIES = data/libimageda
$(top_builddir)/libmpeg3/libmpeg3hv.la $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -1118,6 +1118,7 @@ cinelerra_LDADD = \
$(SOUND_LDFLAGS) \
$(FIREWIRE_LDFLAGS) \
$(LIBDV_LIBS) \
+ $(FFMPEG_LIBS) \
-luuid \
$(MJPEG_LIBS)
diff -up cinelerra-2.1/configure.ffmpeg_external cinelerra-2.1/configure
--- cinelerra-2.1/configure.ffmpeg_external 2007-11-11 02:44:31.000000000 +0100
+++ cinelerra-2.1/configure 2007-11-12 19:03:43.000000000 +0100
@@ -27847,7 +27847,7 @@ OBJCOPYARCH=$ocarch
############## END of .png TO .o CONVERSION
-ac_config_files="$ac_config_files Makefile cinelerra-cvs-current.spec po/Makefile.in m4/Makefile libmpeg3/Makefile libmpeg3/video/Makefile libmpeg3/audio/Makefile quicktime/Makefile quicktime/encore50/Makefile quicktime/ffmpeg/Makefile quicktime/ffmpeg/libavcodec/Makefile quicktime/ffmpeg/libavcodec/i386/Makefile quicktime/ffmpeg/libavcodec/ppc/Makefile mpeg2enc/Makefile toolame-02l/Makefile guicast/Makefile cinelerra/Makefile cinelerra/data/Makefile mplexlo/Makefile plugins/colors/Makefile plugins/libfourier/Makefile plugins/libeffecttv/Makefile plugins/Makefile plugins/1080to540/Makefile plugins/histogram/Makefile plugins/720to480/Makefile plugins/bandslide/Makefile plugins/bandwipe/Makefile plugins/blur/Makefile plugins/brightness/Makefile plugins/burn/Makefile plugins/parametric/Makefile plugins/aging/Makefile plugins/cdripper/Makefile plugins/chromakey/Makefile plugins/chromakeyhsv/Makefile plugins/colorbalance/Makefile plugins/compressor/Makefile plugins/crossfade/Makefile plugins/decimate/Makefile plugins/deinterlace/Makefile plugins/delayaudio/Makefile plugins/delayvideo/Makefile plugins/denoise/Makefile plugins/denoisefft/Makefile plugins/denoisevideo/Makefile plugins/denoisemjpeg/Makefile plugins/despike/Makefile plugins/dissolve/Makefile plugins/dot/Makefile plugins/fieldframe/Makefile plugins/flip/Makefile plugins/framefield/Makefile plugins/freeverb/Makefile plugins/freezeframe/Makefile plugins/gain/Makefile plugins/gamma/Makefile plugins/holo/Makefile plugins/huesaturation/Makefile plugins/interpolate/Makefile plugins/interpolateaudio/Makefile plugins/interpolatevideo/Makefile plugins/invertaudio/Makefile plugins/invertvideo/Makefile plugins/irissquare/Makefile plugins/ivtc/Makefile plugins/liveaudio/Makefile plugins/livevideo/Makefile plugins/loopaudio/Makefile plugins/loopvideo/Makefile plugins/motion/Makefile plugins/motionblur/Makefile plugins/normalize/Makefile plugins/oilpainting/Makefile plugins/overlay/Makefile plugins/overlayaudio/Makefile plugins/pitch/Makefile plugins/polar/Makefile plugins/reroute/Makefile plugins/reframert/Makefile plugins/reframe/Makefile plugins/resample/Makefile plugins/reverb/Makefile plugins/reverseaudio/Makefile plugins/reversevideo/Makefile plugins/rgb601/Makefile plugins/rotate/Makefile plugins/scale/Makefile plugins/denoiseseltempavg/Makefile plugins/shapewipe/Makefile plugins/sharpen/Makefile plugins/shiftinterlace/Makefile plugins/slide/Makefile plugins/spectrogram/Makefile plugins/suv/Makefile plugins/suv/data/Makefile plugins/bluedottheme/Makefile plugins/bluedottheme/data/Makefile plugins/defaulttheme/Makefile plugins/defaulttheme/data/Makefile plugins/swapchannels/Makefile plugins/synthesizer/Makefile plugins/threshold/Makefile plugins/timeavg/Makefile plugins/timestretch/Makefile plugins/titler/Makefile plugins/translate/Makefile plugins/unsharp/Makefile plugins/videoscope/Makefile plugins/wave/Makefile plugins/whirl/Makefile plugins/wipe/Makefile plugins/yuv/Makefile plugins/downsample/Makefile plugins/flash/Makefile plugins/gradient/Makefile plugins/level/Makefile plugins/linearblur/Makefile plugins/perspective/Makefile plugins/radialblur/Makefile plugins/zoomblur/Makefile plugins/timefront/Makefile plugins/svg/Makefile plugins/diffkey/Makefile plugins/fonts/Makefile image/Makefile"
+ac_config_files="$ac_config_files Makefile cinelerra-cvs-current.spec po/Makefile.in m4/Makefile libmpeg3/Makefile libmpeg3/video/Makefile libmpeg3/audio/Makefile quicktime/Makefile quicktime/encore50/Makefile mpeg2enc/Makefile toolame-02l/Makefile guicast/Makefile cinelerra/Makefile cinelerra/data/Makefile mplexlo/Makefile plugins/colors/Makefile plugins/libfourier/Makefile plugins/libeffecttv/Makefile plugins/Makefile plugins/1080to540/Makefile plugins/histogram/Makefile plugins/720to480/Makefile plugins/bandslide/Makefile plugins/bandwipe/Makefile plugins/blur/Makefile plugins/brightness/Makefile plugins/burn/Makefile plugins/parametric/Makefile plugins/aging/Makefile plugins/cdripper/Makefile plugins/chromakey/Makefile plugins/chromakeyhsv/Makefile plugins/colorbalance/Makefile plugins/compressor/Makefile plugins/crossfade/Makefile plugins/decimate/Makefile plugins/deinterlace/Makefile plugins/delayaudio/Makefile plugins/delayvideo/Makefile plugins/denoise/Makefile plugins/denoisefft/Makefile plugins/denoisevideo/Makefile plugins/denoisemjpeg/Makefile plugins/despike/Makefile plugins/dissolve/Makefile plugins/dot/Makefile plugins/fieldframe/Makefile plugins/flip/Makefile plugins/framefield/Makefile plugins/freeverb/Makefile plugins/freezeframe/Makefile plugins/gain/Makefile plugins/gamma/Makefile plugins/holo/Makefile plugins/huesaturation/Makefile plugins/interpolate/Makefile plugins/interpolateaudio/Makefile plugins/interpolatevideo/Makefile plugins/invertaudio/Makefile plugins/invertvideo/Makefile plugins/irissquare/Makefile plugins/ivtc/Makefile plugins/liveaudio/Makefile plugins/livevideo/Makefile plugins/loopaudio/Makefile plugins/loopvideo/Makefile plugins/motion/Makefile plugins/motionblur/Makefile plugins/normalize/Makefile plugins/oilpainting/Makefile plugins/overlay/Makefile plugins/overlayaudio/Makefile plugins/pitch/Makefile plugins/polar/Makefile plugins/reroute/Makefile plugins/reframert/Makefile plugins/reframe/Makefile plugins/resample/Makefile plugins/reverb/Makefile plugins/reverseaudio/Makefile plugins/reversevideo/Makefile plugins/rgb601/Makefile plugins/rotate/Makefile plugins/scale/Makefile plugins/denoiseseltempavg/Makefile plugins/shapewipe/Makefile plugins/sharpen/Makefile plugins/shiftinterlace/Makefile plugins/slide/Makefile plugins/spectrogram/Makefile plugins/suv/Makefile plugins/suv/data/Makefile plugins/bluedottheme/Makefile plugins/bluedottheme/data/Makefile plugins/defaulttheme/Makefile plugins/defaulttheme/data/Makefile plugins/swapchannels/Makefile plugins/synthesizer/Makefile plugins/threshold/Makefile plugins/timeavg/Makefile plugins/timestretch/Makefile plugins/titler/Makefile plugins/translate/Makefile plugins/unsharp/Makefile plugins/videoscope/Makefile plugins/wave/Makefile plugins/whirl/Makefile plugins/wipe/Makefile plugins/yuv/Makefile plugins/downsample/Makefile plugins/flash/Makefile plugins/gradient/Makefile plugins/level/Makefile plugins/linearblur/Makefile plugins/perspective/Makefile plugins/radialblur/Makefile plugins/zoomblur/Makefile plugins/timefront/Makefile plugins/svg/Makefile plugins/diffkey/Makefile plugins/fonts/Makefile image/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -28543,10 +28543,6 @@ do
"libmpeg3/audio/Makefile") CONFIG_FILES="$CONFIG_FILES libmpeg3/audio/Makefile" ;;
"quicktime/Makefile") CONFIG_FILES="$CONFIG_FILES quicktime/Makefile" ;;
"quicktime/encore50/Makefile") CONFIG_FILES="$CONFIG_FILES quicktime/encore50/Makefile" ;;
- "quicktime/ffmpeg/Makefile") CONFIG_FILES="$CONFIG_FILES quicktime/ffmpeg/Makefile" ;;
- "quicktime/ffmpeg/libavcodec/Makefile") CONFIG_FILES="$CONFIG_FILES quicktime/ffmpeg/libavcodec/Makefile" ;;
- "quicktime/ffmpeg/libavcodec/i386/Makefile") CONFIG_FILES="$CONFIG_FILES quicktime/ffmpeg/libavcodec/i386/Makefile" ;;
- "quicktime/ffmpeg/libavcodec/ppc/Makefile") CONFIG_FILES="$CONFIG_FILES quicktime/ffmpeg/libavcodec/ppc/Makefile" ;;
"mpeg2enc/Makefile") CONFIG_FILES="$CONFIG_FILES mpeg2enc/Makefile" ;;
"toolame-02l/Makefile") CONFIG_FILES="$CONFIG_FILES toolame-02l/Makefile" ;;
"guicast/Makefile") CONFIG_FILES="$CONFIG_FILES guicast/Makefile" ;;
diff -up cinelerra-2.1/configure.in.ffmpeg_external cinelerra-2.1/configure.in
--- cinelerra-2.1/configure.in.ffmpeg_external 2007-10-29 20:16:37.000000000 +0100
+++ cinelerra-2.1/configure.in 2007-10-29 20:16:37.000000000 +0100
@@ -466,10 +466,6 @@ AC_OUTPUT(Makefile cinelerra-cvs-current
libmpeg3/Makefile libmpeg3/video/Makefile libmpeg3/audio/Makefile \
quicktime/Makefile \
quicktime/encore50/Makefile \
- quicktime/ffmpeg/Makefile \
- quicktime/ffmpeg/libavcodec/Makefile \
- quicktime/ffmpeg/libavcodec/i386/Makefile \
- quicktime/ffmpeg/libavcodec/ppc/Makefile \
mpeg2enc/Makefile toolame-02l/Makefile \
guicast/Makefile cinelerra/Makefile \
cinelerra/data/Makefile \
diff -up cinelerra-2.1/quicktime/qtffmpeg.h.ffmpeg_external cinelerra-2.1/quicktime/qtffmpeg.h
--- cinelerra-2.1/quicktime/qtffmpeg.h.ffmpeg_external 2005-09-28 21:11:18.000000000 +0200
+++ cinelerra-2.1/quicktime/qtffmpeg.h 2007-11-12 19:03:43.000000000 +0100
@@ -17,7 +17,7 @@
-#include "avcodec.h"
+#include <avcodec.h>
#include "qtprivate.h"
diff -up cinelerra-2.1/quicktime/qth264.c.ffmpeg_external cinelerra-2.1/quicktime/qth264.c
--- cinelerra-2.1/quicktime/qth264.c.ffmpeg_external 2006-09-12 04:10:57.000000000 +0200
+++ cinelerra-2.1/quicktime/qth264.c 2007-11-12 19:03:43.000000000 +0100
@@ -1,4 +1,4 @@
-#include "avcodec.h"
+#include <avcodec.h>
#include "colormodels.h"
#include "funcprotos.h"
#include <pthread.h>
diff -up cinelerra-2.1/quicktime/mpeg4.c.ffmpeg_external cinelerra-2.1/quicktime/mpeg4.c
--- cinelerra-2.1/quicktime/mpeg4.c.ffmpeg_external 2006-10-29 00:54:57.000000000 +0200
+++ cinelerra-2.1/quicktime/mpeg4.c 2007-11-12 19:03:43.000000000 +0100
@@ -7,7 +7,7 @@
-#include "avcodec.h"
+#include <avcodec.h>
#include "colormodels.h"
#include "funcprotos.h"
#include "qtffmpeg.h"
diff -up cinelerra-2.1/quicktime/wma.c.ffmpeg_external cinelerra-2.1/quicktime/wma.c
--- cinelerra-2.1/quicktime/wma.c.ffmpeg_external 2006-08-31 22:25:39.000000000 +0200
+++ cinelerra-2.1/quicktime/wma.c 2007-11-12 19:03:43.000000000 +0100
@@ -1,4 +1,4 @@
-#include "avcodec.h"
+#include <avcodec.h>
#include "funcprotos.h"
#include "quicktime.h"
#include <string.h>
diff -up cinelerra-2.1/guicast/Makefile.in.fix_lib cinelerra-2.1/guicast/Makefile.in
--- cinelerra-2.1/guicast/Makefile.in.fix_lib 2007-11-11 02:44:18.000000000 +0100
+++ cinelerra-2.1/guicast/Makefile.in 2007-11-12 21:26:44.000000000 +0100
@@ -304,7 +304,8 @@ target_vendor = @target_vendor@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
lib_LTLIBRARIES = libguicast.la
-libguicast_la_LIBADD = $(OPENGL_LIBS) -lXxf86vm -lXv -lXext -lX11 $(X_EXTRA_LIBS)
+libguicast_la_LIBADD = $(OPENGL_LIBS) -lXxf86vm -lXv -lXext -lX11 $(X_EXTRA_LIBS) \
+ $(PNG_LIBS) ../quicktime/libquicktimehv.la
libguicast_la_LDFLAGS = $(X_LIBS) -version-info 1:0:0
libguicast_la_SOURCES = \
bcbar.C \
diff -up cinelerra-2.1/guicast/Makefile.am.fix_lib cinelerra-2.1/guicast/Makefile.am
--- cinelerra-2.1/guicast/Makefile.am.fix_lib 2006-09-11 22:46:08.000000000 +0200
+++ cinelerra-2.1/guicast/Makefile.am 2007-11-12 21:26:13.000000000 +0100
@@ -1,7 +1,8 @@
lib_LTLIBRARIES = libguicast.la
noinst_PROGRAMS=bootstrap
-libguicast_la_LIBADD = $(OPENGL_LIBS) -lXxf86vm -lXv -lXext -lX11 $(X_EXTRA_LIBS)
+libguicast_la_LIBADD = $(OPENGL_LIBS) -lXxf86vm -lXv -lXext -lX11 $(X_EXTRA_LIBS) \
+ $(PNG_LIBS) ../quicktime/libquicktimehv.la
libguicast_la_LDFLAGS = $(X_LIBS) -version-info 1:0:0
libguicast_la_SOURCES = \
bcbar.C \
diff -up cinelerra-2.1/mpeg2enc/Makefile.am.fix_mpeg2enc cinelerra-2.1/mpeg2enc/Makefile.am
--- cinelerra-2.1/mpeg2enc/Makefile.am.fix_mpeg2enc 2005-03-30 23:10:42.000000000 +0200
+++ cinelerra-2.1/mpeg2enc/Makefile.am 2007-11-13 11:44:43.000000000 +0100
@@ -2,7 +2,7 @@
# Automake Makefile template for mpeg2enc...
# Modified for distrobution with Cinelerra
-noinst_LTLIBRARIES = libmpeg2enc.la
+lib_LTLIBRARIES = libmpeg2enc.la
INCLUDES = -I$(top_srcdir)/quicktime -I$(top_srcdir)/libmpeg3
AM_CFLAGS = $(LARGEFILE_CFLAGS)
@@ -31,5 +31,10 @@ noinst_HEADERS = attributes.h \
simd.h \
vlc.h
-libmpeg2enc_la_LIBADD=$(LIBM_LIBS)
+libmpeg2enc_la_LIBADD=$(LIBM_LIBS) \
+ ../quicktime/libquicktimehv.la \
+ ../libmpeg3/libmpeg3hv.la
+
+libmpeg2enc_la_LDFLAGS = -version-info 1:0:0 -release 2.1.0
+
LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTC_FLAGS)
diff -up cinelerra-2.1/plugins/titler/title.C.fonts cinelerra-2.1/plugins/titler/title.C
--- cinelerra-2.1/plugins/titler/title.C.fonts 2007-11-25 20:54:05.000000000 +0100
+++ cinelerra-2.1/plugins/titler/title.C 2008-05-15 16:06:43.000000000 +0200
@@ -34,7 +34,7 @@
#define ZERO (1.0 / 64.0)
-#define FONT_SEARCHPATH "fonts"
+#define FONT_SEARCHPATH "/usr/share/fonts"
//#define FONT_SEARCHPATH "/usr/X11R6/lib/X11/fonts"
@@ -1061,11 +1061,11 @@ void TitleMain::build_fonts()
if(!fonts)
{
fonts = new ArrayList<FontEntry*>;
-// Construct path from location of the plugin
+// Construct path from location of the plugin - bad idea : fonts are arch independant.
char search_path[BCTEXTLEN];
- strcpy(search_path, PluginClient::get_path());
- char *ptr = strrchr(search_path, '/');
- strcpy(ptr + 1, FONT_SEARCHPATH);
+ //strcpy(search_path, PluginClient::get_path());
+ strcpy(search_path, FONT_SEARCHPATH);
+ //char *ptr = strrchr(search_path, '/');
char command_line[BCTEXTLEN];
sprintf(command_line,
diff -Naupr cinelerra-2.1.orig/plugins/threshold/threshold.C cinelerra-2.1/plugins/threshold/threshold.C
--- cinelerra-2.1.orig/plugins/threshold/threshold.C 2007-09-24 21:20:06.000000000 +0200
+++ cinelerra-2.1/plugins/threshold/threshold.C 2008-05-13 00:52:51.000000000 +0200
@@ -461,13 +461,13 @@ static TYPE scale_to_range(int v)
}
template<>
-static inline float scale_to_range(int v)
+inline float scale_to_range(int v)
{
return (float) v / 0xff;
}
template<>
-static inline uint16_t scale_to_range(int v)
+inline uint16_t scale_to_range(int v)
{
return v << 8 | v;
}
diff -up cinelerra-2.1/configure.in.libGL_fix cinelerra-2.1/configure.in
--- cinelerra-2.1/configure.in.libGL_fix 2008-05-15 22:50:48.000000000 +0200
+++ cinelerra-2.1/configure.in 2008-05-15 23:00:58.000000000 +0200
@@ -435,26 +435,11 @@ AC_ARG_ENABLE(opengl,
[ enable_opengl=$enableval ],
[ enable_opengl=yes ])
if test "x$enableval" = "xyes"; then
- AC_CHECK_LIB([GL], [glUseProgram],
- [OPENGL_LIBS="-lGL"; libGL=yes],
-# On SUSE/OpenSUSE, NVidia places the OpenGL 2.0 capable library in /usr/X11R6/lib
-# but it doesn't place a libGL.so there, so the linker won't pick it up
-# we have to use the explicit libGL.so.1 path.
- save_LIBS="$LIBS"
- for l in /usr/X11R6/lib /usr/X11R6/lib64; do
- LIBS="$l/libGL.so.1"
- AC_MSG_CHECKING(for glUseProgram in $l/libGL.so.1)
- AC_TRY_LINK([],[extern int glUseProgram(); glUseProgram();],
- [OPENGL_LIBS="$l/libGL.so.1"; libGL=yes],[libGL=no])
- AC_MSG_RESULT([$libGL])
- test $libGL = yes && break
- done
- LIBS="$save_LIBS"
- )
+ AC_CHECK_LIB([GL], [glUseProgram],[libGL=yes],[libGL=no])
fi
if test "x$libGL" = "xyes"; then
enable_opengl=ok
- OPENGL_LIBS="-lGLU $OPENGL_LIBS"
+ OPENGL_LIBS="-lGL -lGLU "
AC_DEFINE(HAVE_GL)
fi
AC_SUBST(OPENGL_LIBS)
diff -up cinelerra-2.1/plugins/Makefile.in.no_font cinelerra-2.1/plugins/Makefile.in
--- cinelerra-2.1/plugins/Makefile.in.no_font 2008-05-15 18:52:45.000000000 +0200
+++ cinelerra-2.1/plugins/Makefile.in 2008-05-15 18:54:25.000000000 +0200
@@ -357,8 +357,7 @@ SUBDIRS = \
whirl \
wipe \
yuv \
- zoomblur \
- fonts
+ zoomblur
AUTOMAKE_OPTIONS = foreign
EXTRA_DIST =
diff -up cinelerra-2.1/plugins/Makefile.am.no_font cinelerra-2.1/plugins/Makefile.am
--- cinelerra-2.1/plugins/Makefile.am.no_font 2008-05-15 18:52:13.000000000 +0200
+++ cinelerra-2.1/plugins/Makefile.am 2008-05-15 18:54:18.000000000 +0200
@@ -102,8 +102,7 @@ SUBDIRS= \
whirl \
wipe \
yuv \
- zoomblur \
- fonts
+ zoomblur
AUTOMAKE_OPTIONS=foreign
