]>
Commit | Line | Data |
---|---|---|
3e490e15 AM |
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 | |
3 | @@ -7,7 +7,11 @@ | |
4 | ||
5 | AM_INIT_AUTOMAKE | |
6 | AC_CONFIG_HEADER(config.h) | |
7 | -AM_GNU_GETTEXT([external]) | |
8 | + | |
9 | +AC_PROG_CC | |
10 | +AC_GNU_SOURCE | |
11 | + | |
12 | +AM_GNU_GETTEXT | |
13 | AM_GNU_GETTEXT_VERSION(0.12.1) | |
14 | AM_PROG_AS | |
15 | ||
9a2d9fed JR |
16 | @@ -99,14 +99,6 @@ |
17 | LIBS=`echo "$LIBS" | sed -e s/-lasound//g` | |
18 | fi | |
19 | ||
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" | |
25 | - enable_esd=ok | |
26 | - fi | |
27 | -fi | |
28 | AC_SUBST(SOUND_CFLAGS) | |
29 | AC_SUBST(SOUND_LDFLAGS) | |
30 | ############### END OF SOUND | |
d838d933 AM |
31 | --- cinelerra-cv-2.1/cinelerra/Makefile.am.org 2006-11-26 01:42:58.101122750 +0100 |
32 | +++ cinelerra-cv-2.1/cinelerra/Makefile.am 2006-11-26 01:43:09.741850250 +0100 | |
57efc803 AM |
33 | @@ -19,26 +19,26 @@ |
34 | ||
35 | if BUILDINFO_GIT | |
36 | GITVERSION=$(shell if [ -d $(top_srcdir)/.git ]; then cd $(top_srcdir); git rev-parse HEAD; else echo "unknown"; fi) | |
37 | - echo '#define REPOMAINTXT " GIT::$(GITVERSION) $(BUILDINFO_NONRC_S) (C) 2006 Heroine Virtual Ltd.\n@FFMPEG_EXTERNALTEXT@\nCompiled on $(BUILDDATE)"' >> versioninfo.h | |
38 | + echo '#define REPOMAINTXT " GIT::$(GITVERSION) $(BUILDINFO_NONRC_S) (C) 2006 Heroine Virtual Ltd. @FFMPEG_EXTERNALTEXT@ Compiled on $(BUILDDATE)"' >> versioninfo.h | |
39 | echo '#define REPOABOUTPREFTXT "Git SHA-1: $(GITVERSION)"' >> versioninfo.h | |
40 | else | |
41 | ||
42 | if BUILDINFO_SVN | |
43 | SVNVERSION=$(shell if [ -d $(top_srcdir)/.svn ]; then svnversion $(top_srcdir); else echo "unknown"; fi) | |
44 | - echo '#define REPOMAINTXT " SVN $(SVNVERSION) $(BUILDINFO_NONRC_S) (C) 2006 Heroine Virtual Ltd.\n@FFMPEG_EXTERNALTEXT@\nCompiled on $(BUILDDATE)"' >> versioninfo.h | |
45 | + echo '#define REPOMAINTXT " SVN $(SVNVERSION) $(BUILDINFO_NONRC_S) (C) 2006 Heroine Virtual Ltd. @FFMPEG_EXTERNALTEXT@ Compiled on $(BUILDDATE)"' >> versioninfo.h | |
d838d933 AM |
46 | echo '#define REPOABOUTPREFTXT "SVN Version: $(SVNVERSION) $(BUILDINFO_NONRC_S)"' >> versioninfo.h |
47 | ||
57efc803 AM |
48 | else |
49 | if BUILDINFO_CUST | |
50 | ||
51 | - echo '#define REPOMAINTXT " $(BUILDINFO_CUSTOM_TAG) (C) 2006 Heroine Virtual Ltd.\n@FFMPEG_EXTERNALTEXT@\nCompiled on $(BUILDDATE)"' >> versioninfo.h | |
52 | + echo '#define REPOMAINTXT " $(BUILDINFO_CUSTOM_TAG) (C) 2006 Heroine Virtual Ltd. @FFMPEG_EXTERNALTEXT@ Compiled on $(BUILDDATE)"' >> versioninfo.h | |
53 | echo '#define REPOABOUTPREFTXT "$(BUILDINFO_CUSTOM_TAG)"' >> versioninfo.h | |
54 | ||
55 | ||
d838d933 | 56 | else # (no repository) |
57efc803 AM |
57 | |
58 | ||
d838d933 AM |
59 | - echo '#define REPOMAINTXT "(C) 2006 Heroine Virtual Ltd.\nCompiled on $(BUILDDATE)"' >> versioninfo.h |
60 | + echo '#define REPOMAINTXT "(C) 2006 Heroine Virtual Ltd. Compiled on $(BUILDDATE)"' >> versioninfo.h | |
61 | echo '#define REPOABOUTPREFTXT ""' >> versioninfo.h | |
62 | endif | |
63 | endif | |
a087f479 AM |
64 | --- cinelerra-cv-2.1/libmpeg3/video/Makefile.am 2008-08-23 14:53:19.959321239 +0000 |
65 | +++ cinelerra-cv-2.1/libmpeg3/video/Makefile.am.org 2008-08-23 14:53:15.609327436 +0000 | |
66 | @@ -11,6 +11,7 @@ | |
67 | ||
68 | if USEMMX | |
69 | libmpeg3_video_la_SOURCES += mmxidct.S reconmmx.s | |
70 | +AM_LIBTOOLFLAGS=--tag=CC | |
71 | else | |
72 | libmpeg3_video_la_SOURCES += | |
73 | endif | |
74 | --- cinelerra-cv-2.1/mpeg2enc/Makefile.am~ 2008-08-23 16:56:56.992840914 +0200 | |
75 | +++ cinelerra-cv-2.1/mpeg2enc/Makefile.am 2008-08-23 17:00:05.433238449 +0200 | |
76 | @@ -17,6 +17,7 @@ | |
77 | libmpeg2enc_la_SOURCES += fdct_mmx.s fdctdata.c idct_mmx.s idctdata.c \ | |
78 | quant_mmx.s quantize_x86.c predict_mmx.s \ | |
79 | predcomp_mmxe.s predcomp_mmx.s | |
80 | +AM_LIBTOOLFLAGS=--tag=CC | |
81 | endif | |
82 | ||
83 | noinst_HEADERS = attributes.h \ | |
57efc803 AM |
84 | --- cv/configure.in.org 2008-10-27 10:15:06.091895546 +0100 |
85 | +++ cv/configure.in 2008-10-27 10:15:21.304615704 +0100 | |
86 | @@ -356,12 +356,7 @@ | |
87 | dnl if not, that means that libswscale is compiled in | |
88 | ||
89 | AC_MSG_CHECKING(for ffmpeg swscale support) | |
90 | - saved_LIBS="$LIBS" | |
91 | - LIBS="$saved_LIBS $FFMPEG_TEMP_LIBS" | |
92 | - AC_TRY_LINK([#include <libavcodec/avcodec.h>], | |
93 | - [img_convert(0, 0, 0,0,0,0)], | |
94 | - enable_ffmpeg_swscale=no,enable_ffmpeg_swscale=yes) | |
95 | - LIBS="$saved_LIBS" | |
96 | + enable_ffmpeg_swscale=yes | |
97 | AC_MSG_RESULT($enable_ffmpeg_swscale) | |
98 | if test x"$enable_ffmpeg_swscale" = xyes; then | |
99 | dnl AC_DEFINE(HAVE_SWSCALER) | |
100 | --- cv/cinelerra/ffmpeg.C.org 2008-10-27 10:26:46.890782761 +0100 | |
101 | +++ cv/cinelerra/ffmpeg.C 2008-10-27 10:27:19.937445860 +0100 | |
102 | @@ -2,6 +2,7 @@ | |
103 | ||
104 | #ifdef HAVE_SWSCALER | |
105 | extern "C" { | |
106 | +#include <avcodec.h> | |
107 | #include <swscale.h> | |
108 | } | |
109 | #endif | |
71a08519 AM |
110 | --- cinelerra-cv/cinelerra/edits.C~ 2010-01-09 15:12:19.000000000 +0100 |
111 | +++ cinelerra-cv/cinelerra/edits.C 2010-04-26 09:13:43.381588613 +0200 | |
112 | @@ -47,7 +47,6 @@ | |
113 | this->edl = edl; | |
114 | this->track = track; | |
115 | ||
116 | - List<Edit>::List<Edit>(); | |
117 | default_edit->edl = edl; | |
118 | default_edit->track = track; | |
119 | default_edit->startproject = 0; | |
dbbee1b8 JR |
120 | --- cinelerra-cv/plugins/svg/svg.C~ 2010-01-09 15:12:21.000000000 +0100 |
121 | +++ cinelerra-cv/plugins/svg/svg.C 2010-06-03 17:56:46.125079418 +0200 | |
122 | @@ -29,6 +29,8 @@ | |
123 | #include <string.h> | |
124 | #include <errno.h> | |
125 | #include <sys/mman.h> | |
126 | +#include <sys/types.h> | |
127 | +#include <sys/stat.h> | |
128 | ||
129 | ||
130 | #include <libintl.h> |