]>
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 | |
a087f479 AM |
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 | |
33 | @@ -11,6 +11,7 @@ | |
34 | ||
35 | if USEMMX | |
36 | libmpeg3_video_la_SOURCES += mmxidct.S reconmmx.s | |
37 | +AM_LIBTOOLFLAGS=--tag=CC | |
38 | else | |
39 | libmpeg3_video_la_SOURCES += | |
40 | endif | |
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 | |
43 | @@ -17,6 +17,7 @@ | |
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 | |
48 | endif | |
49 | ||
50 | noinst_HEADERS = attributes.h \ | |
57efc803 AM |
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 | |
53 | @@ -356,12 +356,7 @@ | |
54 | dnl if not, that means that libswscale is compiled in | |
55 | ||
56 | AC_MSG_CHECKING(for ffmpeg swscale support) | |
57 | - saved_LIBS="$LIBS" | |
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) | |
62 | - LIBS="$saved_LIBS" | |
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 | |
69 | @@ -2,6 +2,7 @@ | |
70 | ||
71 | #ifdef HAVE_SWSCALER | |
72 | extern "C" { | |
73 | +#include <avcodec.h> | |
74 | #include <swscale.h> | |
75 | } | |
76 | #endif | |
dbbee1b8 JR |
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 | |
79 | @@ -29,6 +29,8 @@ | |
80 | #include <string.h> | |
81 | #include <errno.h> | |
82 | #include <sys/mman.h> | |
83 | +#include <sys/types.h> | |
84 | +#include <sys/stat.h> | |
85 | ||
86 | ||
87 | #include <libintl.h> | |
b1359752 AM |
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 | |
90 | @@ -19,26 +19,26 @@ | |
91 | ||
92 | if BUILDINFO_GIT | |
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 | |
97 | else | |
98 | ||
99 | if BUILDINFO_SVN | |
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 | |
104 | ||
105 | else | |
106 | if BUILDINFO_CUST | |
107 | ||
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 | |
111 | ||
112 | ||
113 | else # (no repository) | |
114 | ||
115 | ||
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 | |
119 | endif | |
120 | endif | |
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 | |
123 | @@ -1,7 +1,7 @@ | |
124 | lib_LTLIBRARIES = libguicast.la | |
125 | noinst_PROGRAMS=bootstrap | |
126 | ||
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 = \ | |
131 | bcbar.C \ |