3 configure.in | 19 -------------------
4 lib/Makefile.am | 4 +---
5 lib/Makefile.in | 4 +---
6 lib/aviread/Makefile.am | 15 ++++-----------
7 lib/aviread/Makefile.in | 17 +++++------------
8 plugins/Makefile.am | 2 +-
9 plugins/Makefile.in | 2 +-
10 plugins/libffmpeg/Makefile.am | 5 +----
11 plugins/libffmpeg/Makefile.in | 5 +----
12 plugins/libffmpeg/fillplugins.h | 1 -
13 11 files changed, 16 insertions(+), 60 deletions(-)
15 --- avifile-0.7-0.7.45/Makefile.am 2006-03-20 03:22:48.000000000 +0100
16 +++ avifile-0.7-0.7.45.fixed/Makefile.am 2006-03-20 03:26:29.000000000 +0100
18 -SUBDIRS = m4 ffmpeg drivers lib plugins bin \
19 +SUBDIRS = m4 drivers lib plugins bin \
20 doc include debian libavqt player samples
22 EXTRA_DIST = INSTALL autogen.sh avifile.spec.in avifile.pc.in \
23 --- avifile-0.7-0.7.45/configure.in 2006-03-20 03:00:38.000000000 +0100
24 +++ avifile-0.7-0.7.45.fixed/configure.in 2006-03-20 02:55:30.000000000 +0100
29 -dnl =======================
30 -dnl Configure ffmpeg plugin
31 -dnl =======================
35 dnl not needed right now
36 dnl AC_CHECK_PROG(use_nasm, nasm, yes, no)
37 @@ -1014,20 +1009,6 @@
42 - ffmpeg/libavformat/Makefile
43 - ffmpeg/libavcodec/Makefile
44 - ffmpeg/libavcodec/alpha/Makefile
45 - ffmpeg/libavcodec/armv4l/Makefile
46 - ffmpeg/libavcodec/i386/Makefile
47 - ffmpeg/libavcodec/liba52/Makefile
48 - ffmpeg/libavcodec/libpostproc/Makefile
49 - ffmpeg/libavcodec/mlib/Makefile
50 - ffmpeg/libavcodec/ppc/Makefile
51 - ffmpeg/libavcodec/ps2/Makefile
52 - ffmpeg/libavcodec/sh4/Makefile
53 - ffmpeg/libavcodec/sparc/Makefile
54 - ffmpeg/libavutil/Makefile
56 drivers/libdha/Makefile
57 drivers/libdha/bin/Makefile
58 --- avifile-0.7-0.7.45/lib/aviread/Makefile.am 2005-08-28 23:46:49.000000000 +0200
59 +++ avifile-0.7-0.7.45.fixed/lib/aviread/Makefile.am 2006-03-20 02:48:38.000000000 +0100
64 - ../../ffmpeg/libavformat/libaviplayavformat.la \
65 - ../../ffmpeg/libavcodec/libaviplayavcodec.la \
66 - ../../ffmpeg/libavutil/libaviplayavutil.la
69 - ../../ffmpeg/libavformat/libavformat.la \
70 - ../../ffmpeg/libavcodec/libavcodec.la \
71 - ../../ffmpeg/libavutil/libavutil.la
72 + -lavformat -lavcodec -lavutil
75 libaviread_la_LIBADD = $(FF_LIB)
77 AM_CPPFLAGS = $(LTNOPIC) \
78 -I$(srcdir)/../common \
79 - -I$(srcdir)/../../ffmpeg/libavformat \
80 - -I$(srcdir)/../../ffmpeg/libavcodec \
81 - -I$(srcdir)/../../ffmpeg/libavutil
82 + -I/usr/include/ffmpeg
84 MAINTAINERCLEANFILES = Makefile.in
85 --- avifile-0.7-0.7.45/lib/aviread/Makefile.in 2006-03-06 10:11:38.000000000 +0100
86 +++ avifile-0.7-0.7.45.fixed/lib/aviread/Makefile.in 2006-03-20 02:56:58.000000000 +0100
91 -@AMM_LINK_SHARED_FALSE@FF_LIB = \
92 -@AMM_LINK_SHARED_FALSE@ ../../ffmpeg/libavformat/libavformat.la \
93 -@AMM_LINK_SHARED_FALSE@ ../../ffmpeg/libavcodec/libavcodec.la \
94 -@AMM_LINK_SHARED_FALSE@ ../../ffmpeg/libavutil/libavutil.la
96 -@AMM_LINK_SHARED_TRUE@FF_LIB = \
97 -@AMM_LINK_SHARED_TRUE@ ../../ffmpeg/libavformat/libaviplayavformat.la \
98 -@AMM_LINK_SHARED_TRUE@ ../../ffmpeg/libavcodec/libaviplayavcodec.la \
99 -@AMM_LINK_SHARED_TRUE@ ../../ffmpeg/libavutil/libaviplayavutil.la
101 + $(libdir)/libavformat.la \
102 + $(libdir)/libavcodec.la \
103 + $(libdir)/libavutil.la
105 libaviread_la_LIBADD = $(FF_LIB)
106 AM_CPPFLAGS = $(LTNOPIC) \
107 -I$(srcdir)/../common \
108 - -I$(srcdir)/../../ffmpeg/libavformat \
109 - -I$(srcdir)/../../ffmpeg/libavcodec \
110 - -I$(srcdir)/../../ffmpeg/libavutil
111 + -I/usr/include/ffmpeg
113 MAINTAINERCLEANFILES = Makefile.in
115 --- avifile-0.7-0.7.45/lib/Makefile.am 2005-08-28 23:39:25.000000000 +0200
116 +++ avifile-0.7-0.7.45.fixed/lib/Makefile.am 2006-03-20 02:52:26.000000000 +0100
118 noinst_HEADERS = Uncompressed.h
120 COMMONCFLAGS = $(DIVX4_CFLAGS) $(XVID_CFLAGS) -DPLUGIN_PATH=\"$(pkglibdir)\" \
121 - -I$(srcdir)/../ffmpeg/libavcodec \
122 - -I$(srcdir)/../ffmpeg/libavformat \
123 - -I$(srcdir)/../ffmpeg/libavutil
124 + -I/usr/include/ffmpeg
125 if AMM_USE_FAST_BUILD
126 AVISOURCES = libaviplay.cpp
128 --- avifile-0.7-0.7.45/lib/Makefile.in 2006-03-06 10:11:38.000000000 +0100
129 +++ avifile-0.7-0.7.45.fixed/lib/Makefile.in 2006-03-20 02:56:57.000000000 +0100
131 DIST_SUBDIRS = aviplay aviread aviwrite common subtitle video
132 noinst_HEADERS = Uncompressed.h
133 COMMONCFLAGS = $(DIVX4_CFLAGS) $(XVID_CFLAGS) -DPLUGIN_PATH=\"$(pkglibdir)\" \
134 - -I$(srcdir)/../ffmpeg/libavcodec \
135 - -I$(srcdir)/../ffmpeg/libavformat \
136 - -I$(srcdir)/../ffmpeg/libavutil
137 + -I/usr/include/ffmpeg
139 @AMM_USE_FAST_BUILD_FALSE@AVISOURCES = codeckeeper.cpp Uncompressed.cpp
140 @AMM_USE_FAST_BUILD_TRUE@AVISOURCES = libaviplay.cpp
141 --- avifile-0.7-0.7.45/plugins/libffmpeg/fillplugins.h 2006-03-06 09:47:18.000000000 +0100
142 +++ avifile-0.7-0.7.45.fixed/plugins/libffmpeg/fillplugins.h 2006-03-20 02:51:15.000000000 +0100
144 #define uint64_t_C(c) (c ## ULL)
146 #include "avformat.h"
151 --- avifile-0.7-0.7.45/plugins/libffmpeg/Makefile.am 2005-08-28 23:40:12.000000000 +0200
152 +++ avifile-0.7-0.7.45.fixed/plugins/libffmpeg/Makefile.am 2006-03-20 02:50:57.000000000 +0100
154 #KPROF_LIBS = -L/var/tmp/kprof/lib -lkprof
155 #INSTRUMENT = -finstrument-functions
156 AM_CPPFLAGS = $(LTNOPIC) $(INSTRUMENT) \
157 - -I$(srcdir)/../../ffmpeg/libavcodec \
158 - -I$(srcdir)/../../ffmpeg/libavformat \
159 - -I$(srcdir)/../../ffmpeg/libavutil \
160 - -I$(srcdir)/../../ffmpeg
161 + -I/usr/include/ffmpeg
162 AM_CXXFLAGS = $(CXXRTTIEXCEPT)
164 TEST_LIBS = ../../lib/libaviplay.la $(pkglib_LTLIBRARIES) $(SDL_LIBS) $(MPATROL_LIBS) $(EFENCE_LIBS) $(KPROF_LIBS)
165 --- avifile-0.7-0.7.45/plugins/libffmpeg/Makefile.in 2006-03-06 10:11:41.000000000 +0100
166 +++ avifile-0.7-0.7.45.fixed/plugins/libffmpeg/Makefile.in 2006-03-20 02:57:00.000000000 +0100
168 #KPROF_LIBS = -L/var/tmp/kprof/lib -lkprof
169 #INSTRUMENT = -finstrument-functions
170 AM_CPPFLAGS = $(LTNOPIC) $(INSTRUMENT) \
171 - -I$(srcdir)/../../ffmpeg/libavcodec \
172 - -I$(srcdir)/../../ffmpeg/libavformat \
173 - -I$(srcdir)/../../ffmpeg/libavutil \
174 - -I$(srcdir)/../../ffmpeg
175 + -I/usr/include/ffmpeg
177 AM_CXXFLAGS = $(CXXRTTIEXCEPT)
178 TEST_LIBS = ../../lib/libaviplay.la $(pkglib_LTLIBRARIES) $(SDL_LIBS) $(MPATROL_LIBS) $(EFENCE_LIBS) $(KPROF_LIBS)
179 --- avifile-0.7-0.7.45/plugins/Makefile.am 2004-02-09 10:43:30.000000000 +0100
180 +++ avifile-0.7-0.7.45.fixed/plugins/Makefile.am 2006-03-20 02:50:18.000000000 +0100
183 AM_CPPFLAGS = -Ilibac3pass -Ilibwin32 -Ilibwin32/audiodec \
184 -Ilibwin32/videocodec -Ilibwin32/loader \
185 - -Ilibwin32/loader/dshow -I../ffmpeg/libavcodec \
186 + -Ilibwin32/loader/dshow -I/usr/include/ffmpeg \
187 -DWIN32_PATH=\"$(WIN32_PATH)\" -D__WINE__ -DUNICODE \
188 -Ddbg_printf=__vprintf -DTRACE=__vprintf \
189 -Wmissing-prototypes -Wimplicit-function-declaration \
190 --- avifile-0.7-0.7.45/plugins/Makefile.in 2006-03-06 10:11:40.000000000 +0100
191 +++ avifile-0.7-0.7.45.fixed/plugins/Makefile.in 2006-03-20 02:57:00.000000000 +0100
193 #libplugins_la_SOURCES = libplugins.cpp plugins.c
194 AM_CPPFLAGS = -Ilibac3pass -Ilibwin32 -Ilibwin32/audiodec \
195 -Ilibwin32/videocodec -Ilibwin32/loader \
196 - -Ilibwin32/loader/dshow -I../ffmpeg/libavcodec \
197 + -Ilibwin32/loader/dshow -I/usr/include/ffmpeg \
198 -DWIN32_PATH=\"$(WIN32_PATH)\" -D__WINE__ -DUNICODE \
199 -Ddbg_printf=__vprintf -DTRACE=__vprintf \
200 -Wmissing-prototypes -Wimplicit-function-declaration \