1 --- linphone-0.11.0/mediastreamer/Makefile.am.orig Mon May 5 16:30:01 2003
2 +++ linphone-0.11.0/mediastreamer/Makefile.am Fri Jun 27 12:12:12 2003
6 libmediastreamer_la_LIBADD= $(GLIB_LIBS) \
7 - ../gsmlib/libgsm.la \
8 - ../lpc10-1.5/liblpc10.la \
11 ../oRTP/src/libortp.la
13 #the xine wrapper video output */
15 #the ffmpeg wrapper video encoder and decoder
16 libmsffmpeg_la_SOURCES=msavencoder.c msavencoder.h\
17 msavdecoder.c msavdecoder.h
18 -libmsffmpeg_la_LIBADD=libmediastreamer.la ../ffmpeg/libavcodec/libavcodec.la
19 +libmsffmpeg_la_LIBADD=libmediastreamer.la -lavcodec
21 #the gdk video output plugin
22 libmsgdkvo_la_SOURCES=msvideooutput.c msvideooutput.h
25 #the speex encoder and decoder
26 libmsspeex_la_SOURCES=msspeexenc.c msspeexenc.h msspeexdec.c msspeexdec.h
27 -libmsspeex_la_LIBADD=libmediastreamer.la $(top_srcdir)/speex/libspeex/libspeex.la
28 +libmsspeex_la_LIBADD=libmediastreamer.la -lspeex
31 libmsv4l_la_SOURCES=msv4l.c msv4l.h
33 -I$(top_srcdir)/mediastreamer \
34 -I$(top_srcdir)/oRTP/src \
35 -I$(top_srcdir)/oRTP \
36 - -I$(top_srcdir)/gsmlib \
37 - -I$(top_srcdir)/lpc10-1.5 \
38 - -I$(top_srcdir)/ffmpeg/libavcodec \
39 + -I/usr/include/ffmpeg \
40 -I/usr/X11R6/include/X11 \
41 - -I/usr/include/SDL \
42 - -I$(top_srcdir)/speex/libspeex
44 --- linphone-0.11.0/media_api/Makefile.am.orig Mon Sep 23 14:13:20 2002
45 +++ linphone-0.11.0/media_api/Makefile.am Fri Jun 27 12:10:21 2003
47 DEFS=@DEFS@ @SOUNDDEFS@ -DDEBUG -DG_LOG_DOMAIN=\"MediaApi\"
49 INCLUDES=-I$(top_srcdir)/mediastreamer \
50 - -I$(top_srcdir)/speex \
51 - -I$(top_srcdir)/gsmlib \
52 -I$(top_srcdir)/oRTP \
53 - -I$(top_srcdir)/oRTP/src \
54 - -I$(top_srcdir)/lpc10-1.5 \
55 - -I$(top_srcdir)/ffmpeg
56 + -I$(top_srcdir)/oRTP/src
59 --- linphone-0.11.0/coreapi/Makefile.am.orig Thu Mar 27 11:31:16 2003
60 +++ linphone-0.11.0/coreapi/Makefile.am Fri Jun 27 12:08:45 2003
62 -I$(top_srcdir)/oRTP/src \
63 -I$(top_srcdir)/oRTP/ \
64 -I$(top_srcdir)/mediastreamer \
65 - -I$(top_srcdir)/speex/libspeex \
66 -I$(osip_prefix)/include/
68 EXTRA_DIST= parse-path.cP
69 --- linphone-0.11.0/console/Makefile.am.orig Fri Feb 28 15:48:37 2003
70 +++ linphone-0.11.0/console/Makefile.am Fri Jun 27 12:08:55 2003
72 -I$(top_srcdir)/oRTP/src \
73 -I$(top_srcdir)/oRTP/ \
74 -I$(top_srcdir)/mediastreamer \
75 - -I$(top_srcdir)/speex/libspeex \
76 -I$(osip_prefix)/include/
79 --- linphone-0.11.0/gnome/Makefile.am.orig Thu Mar 27 11:31:09 2003
80 +++ linphone-0.11.0/gnome/Makefile.am Fri Jun 27 12:09:31 2003
82 -I$(top_srcdir)/oRTP/src \
83 -I$(top_srcdir)/oRTP/ \
84 -I$(top_srcdir)/mediastreamer \
85 - -I$(top_srcdir)/speex/libspeex \
86 -I$(top_srcdir)/coreapi \
87 -I$(top_srcdir)/osipua/src
89 --- linphone-0.11.0/Makefile.am.orig Wed Mar 12 18:22:51 2003
90 +++ linphone-0.11.0/Makefile.am Fri Jun 27 11:54:50 2003
92 ## Process this file with automake to produce Makefile.in
94 -SUBDIRS = pixmaps ffmpeg po macros debian ipkg oRTP gsmlib lpc10-1.5 speex mediastreamer \
95 +SUBDIRS = pixmaps po macros debian ipkg oRTP mediastreamer \
96 media_api osipua coreapi console gnome share developer-docs
98 EXTRA_DIST = config.rpath mkinstalldirs linphone2.glade BUGS linphone.kdevprj \
99 --- linphone-0.11.0/configure.in.orig Mon May 19 10:43:31 2003
100 +++ linphone-0.11.0/configure.in Fri Jun 27 11:57:03 2003
101 @@ -178,24 +178,12 @@
103 if test "$video" = "true"; then
104 echo "WARNING: Video support is under developpement, nothing works."
105 - dnl check if nasm is present (needed to compile ffmpeg )
106 - AC_CHECK_PROG(NASM, nasm, true, false)
109 - cd $(top_builddir2)/ffmpeg; ln -sf Makefile.orig Makefile; cd ..
110 - cd $(top_builddir2)/ffmpeg/libavcodec; ln -sf Makefile.libtool Makefile; cd .. ;cd ..
111 - echo "Video support will be build, although it is not functionnal for the moment."
112 - AVCODEC_LIBS="../ffmpeg/libavcodec/libavcodec.la"
113 + AVCODEC_LIBS="-lavcodec"
114 AC_SUBST(AVCODEC_LIBS)
115 AC_DEFINE(HAVE_AVCODEC,1,[Defines if we can use libavcodec library])
117 - AC_MSG_ERROR("nasm is missing ! You require nasm to build the video support in linphone.")
119 PKG_CHECK_MODULES(GDK,gdk-2.0 >= 2.0.0)
123 - cd $(top_builddir2)/ffmpeg; ln -sf Makefile.null Makefile ; cd ..
126 dnl mediastreamer configuration
131 -AC_CONFIG_SUBDIRS( ffmpeg speex oRTP osipua)
132 +AC_CONFIG_SUBDIRS( oRTP osipua)
134 ##################################################
137 mediastreamer/Makefile