1 --- cinelerra-cv-2.1/configure.in.org 2006-11-26 03:33:50.056844000 +0100
2 +++ cinelerra-cv-2.1/configure.in 2006-11-26 03:33:55.053156250 +0100
6 AC_CONFIG_HEADER(config.h)
7 -AM_GNU_GETTEXT([external])
13 AM_GNU_GETTEXT_VERSION(0.12.1)
17 LIBS=`echo "$LIBS" | sed -e s/-lasound//g`
20 -if test "x$enable_esd" = "xyes"; then
21 - AM_PATH_ESD(,[esound=yes])
22 - if test "x$esound" = xyes; then
23 - SOUND_CFLAGS="$ESD_CFLAGS -DHAVE_ESOUND $SOUND_CFLAGS"
24 - SOUND_LDFLAGS="$ESD_LIBS $SOUND_LDFLAGS"
28 AC_SUBST(SOUND_CFLAGS)
29 AC_SUBST(SOUND_LDFLAGS)
30 ############### END OF SOUND
31 --- cinelerra-cv-2.1/libmpeg3/video/Makefile.am 2008-08-23 14:53:19.959321239 +0000
32 +++ cinelerra-cv-2.1/libmpeg3/video/Makefile.am.org 2008-08-23 14:53:15.609327436 +0000
36 libmpeg3_video_la_SOURCES += mmxidct.S reconmmx.s
37 +AM_LIBTOOLFLAGS=--tag=CC
39 libmpeg3_video_la_SOURCES +=
41 --- cinelerra-cv-2.1/mpeg2enc/Makefile.am~ 2008-08-23 16:56:56.992840914 +0200
42 +++ cinelerra-cv-2.1/mpeg2enc/Makefile.am 2008-08-23 17:00:05.433238449 +0200
44 libmpeg2enc_la_SOURCES += fdct_mmx.s fdctdata.c idct_mmx.s idctdata.c \
45 quant_mmx.s quantize_x86.c predict_mmx.s \
46 predcomp_mmxe.s predcomp_mmx.s
47 +AM_LIBTOOLFLAGS=--tag=CC
50 noinst_HEADERS = attributes.h \
51 --- cv/configure.in.org 2008-10-27 10:15:06.091895546 +0100
52 +++ cv/configure.in 2008-10-27 10:15:21.304615704 +0100
54 dnl if not, that means that libswscale is compiled in
56 AC_MSG_CHECKING(for ffmpeg swscale support)
58 - LIBS="$saved_LIBS $FFMPEG_TEMP_LIBS"
59 - AC_TRY_LINK([#include <libavcodec/avcodec.h>],
60 - [img_convert(0, 0, 0,0,0,0)],
61 - enable_ffmpeg_swscale=no,enable_ffmpeg_swscale=yes)
63 + enable_ffmpeg_swscale=yes
64 AC_MSG_RESULT($enable_ffmpeg_swscale)
65 if test x"$enable_ffmpeg_swscale" = xyes; then
66 dnl AC_DEFINE(HAVE_SWSCALER)
67 --- cv/cinelerra/ffmpeg.C.org 2008-10-27 10:26:46.890782761 +0100
68 +++ cv/cinelerra/ffmpeg.C 2008-10-27 10:27:19.937445860 +0100
77 --- cinelerra-cv/plugins/svg/svg.C~ 2010-01-09 15:12:21.000000000 +0100
78 +++ cinelerra-cv/plugins/svg/svg.C 2010-06-03 17:56:46.125079418 +0200
83 +#include <sys/types.h>
84 +#include <sys/stat.h>
88 --- cinelerra-cv/cinelerra/Makefile.am~ 2011-04-06 19:57:22.664917219 +0200
89 +++ cinelerra-cv/cinelerra/Makefile.am 2011-04-06 20:02:23.865421062 +0200
93 GITVERSION=$(shell if [ -d $(top_srcdir)/.git ]; then cd $(top_srcdir); git rev-parse HEAD; else echo "unknown"; fi)
94 - echo '#define REPOMAINTXT " GIT::$(GITVERSION) $(BUILDINFO_NONRC_S) (C) 2010 Heroine Virtual Ltd.\n@FFMPEG_EXTERNALTEXT@\nCompiled on $(BUILDDATE)"' >> versioninfo.h
95 + echo '#define REPOMAINTXT " GIT::$(GITVERSION) $(BUILDINFO_NONRC_S) (C) 2010 Heroine Virtual Ltd. @FFMPEG_EXTERNALTEXT@ Compiled on $(BUILDDATE)"' >> versioninfo.h
96 echo '#define REPOABOUTPREFTXT "Git SHA-1: $(GITVERSION)"' >> versioninfo.h
100 SVNVERSION=$(shell if [ -d $(top_srcdir)/.svn ]; then svnversion $(top_srcdir); else echo "unknown"; fi)
101 - echo '#define REPOMAINTXT " SVN $(SVNVERSION) $(BUILDINFO_NONRC_S) (C) 2010 Heroine Virtual Ltd.\n@FFMPEG_EXTERNALTEXT@\nCompiled on $(BUILDDATE)"' >> versioninfo.h
102 + echo '#define REPOMAINTXT " SVN $(SVNVERSION) $(BUILDINFO_NONRC_S) (C) 2010 Heroine Virtual Ltd. @FFMPEG_EXTERNALTEXT@ Compiled on $(BUILDDATE)"' >> versioninfo.h
103 echo '#define REPOABOUTPREFTXT "SVN Version: $(SVNVERSION) $(BUILDINFO_NONRC_S)"' >> versioninfo.h
108 - echo '#define REPOMAINTXT " $(BUILDINFO_CUSTOM_TAG) (C) 2010 Heroine Virtual Ltd.\n@FFMPEG_EXTERNALTEXT@\nCompiled on $(BUILDDATE)"' >> versioninfo.h
109 + echo '#define REPOMAINTXT " $(BUILDINFO_CUSTOM_TAG) (C) 2010 Heroine Virtual Ltd. @FFMPEG_EXTERNALTEXT@ Compiled on $(BUILDDATE)"' >> versioninfo.h
110 echo '#define REPOABOUTPREFTXT "$(BUILDINFO_CUSTOM_TAG)"' >> versioninfo.h
113 else # (no repository)
116 - echo '#define REPOMAINTXT "(C) 2010 Heroine Virtual Ltd.\nCompiled on $(BUILDDATE)"' >> versioninfo.h
117 + echo '#define REPOMAINTXT "(C) 2010 Heroine Virtual Ltd. Compiled on $(BUILDDATE)"' >> versioninfo.h
118 echo '#define REPOABOUTPREFTXT ""' >> versioninfo.h
121 --- cinelerra-cv/guicast/Makefile.am~ 2011-04-06 20:40:24.939828081 +0200
122 +++ cinelerra-cv/guicast/Makefile.am 2011-04-06 20:47:51.613590918 +0200
124 lib_LTLIBRARIES = libguicast.la
125 noinst_PROGRAMS=bootstrap
127 -libguicast_la_LIBADD = $(OPENGL_LIBS) -lXxf86vm -lXv -lXext -lX11 $(X_EXTRA_LIBS)
128 +libguicast_la_LIBADD = $(OPENGL_LIBS) -lXxf86vm -lXv -lXext -lX11 $(X_EXTRA_LIBS) -lpng $(top_builddir)/quicktime/libquicktimehv.la
129 libguicast_la_LDFLAGS = $(X_LIBS) -version-info 1:0:0
130 libguicast_la_SOURCES = \