diff options
author | Edwin Groothuis <edwin@FreeBSD.org> | 2003-10-20 07:38:37 +0000 |
---|---|---|
committer | Edwin Groothuis <edwin@FreeBSD.org> | 2003-10-20 07:38:37 +0000 |
commit | f538329b137ab2b88d77133872f7bad04a9e1597 (patch) | |
tree | 0f12a7eed28ba5410f2f54dc1613ab42ee5e4627 /net/linphone | |
parent | 1b19d3a60ac567a856f99d97357c1a9791d2c891 (diff) |
Notes
Diffstat (limited to 'net/linphone')
-rw-r--r-- | net/linphone/files/patch-config.h.in | 14 | ||||
-rw-r--r-- | net/linphone/files/patch-configure | 36 | ||||
-rw-r--r-- | net/linphone/files/patch-console::Makefile.in | 25 | ||||
-rw-r--r-- | net/linphone/files/patch-coreapi::Makefile.in | 29 | ||||
-rw-r--r-- | net/linphone/files/patch-coreapi::misc.c | 23 | ||||
-rw-r--r-- | net/linphone/files/patch-gnome::Makefile.in | 45 | ||||
-rw-r--r-- | net/linphone/files/patch-lpc10-1.5::lpcini.c | 17 | ||||
-rw-r--r-- | net/linphone/files/patch-mediastreamer::Makefile.in | 23 | ||||
-rw-r--r-- | net/linphone/files/patch-mediastreamer::msfifo.c | 15 | ||||
-rw-r--r-- | net/linphone/files/patch-oRTP::configure | 13 | ||||
-rw-r--r-- | net/linphone/files/patch-oRTP::src::port_fct.c | 14 | ||||
-rw-r--r-- | net/linphone/files/patch-oRTP::src::scheduler.h | 14 | ||||
-rw-r--r-- | net/linphone/files/patch-osipua::src::osipua.c | 15 | ||||
-rw-r--r-- | net/linphone/files/patch-osipua::src::sdphandler.c | 13 |
14 files changed, 296 insertions, 0 deletions
diff --git a/net/linphone/files/patch-config.h.in b/net/linphone/files/patch-config.h.in new file mode 100644 index 000000000000..464bc65832ff --- /dev/null +++ b/net/linphone/files/patch-config.h.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- config.h.in 2003/02/27 23:47:19 1.1 ++++ config.h.in 2003/02/27 23:47:35 +@@ -122,8 +122,5 @@ + first (like Motorola and SPARC, unlike Intel and VAX). */ + #undef WORDS_BIGENDIAN + +-/* Defined if we are compiling for FreeBSD */ +-#undef __FreeBSD__ +- + /* Defined if we are compiling for linux */ + #undef __LINUX__ diff --git a/net/linphone/files/patch-configure b/net/linphone/files/patch-configure new file mode 100644 index 000000000000..f9505767cb37 --- /dev/null +++ b/net/linphone/files/patch-configure @@ -0,0 +1,36 @@ + +$FreeBSD$ + +--- configure.orig Mon May 19 12:00:43 2003 ++++ configure Fri Jun 13 15:20:49 2003 +@@ -8786,6 +8786,7 @@ + + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' +@@ -11056,19 +11057,19 @@ + + + cat >>confdefs.h <<_ACEOF +-#define PACKAGE_LOCALE_DIR "${realprefix}/${DATADIRNAME}/locale" ++#define PACKAGE_LOCALE_DIR "${realprefix}/share/locale" + _ACEOF + + + + cat >>confdefs.h <<_ACEOF +-#define PACKAGE_DATA_DIR "${realprefix}/${DATADIRNAME}" ++#define PACKAGE_DATA_DIR "${realprefix}/share/gnome" + _ACEOF + + + + cat >>confdefs.h <<_ACEOF +-#define PACKAGE_SOUND_DIR "${realprefix}/${DATADIRNAME}/sounds/linphone" ++#define PACKAGE_SOUND_DIR "${realprefix}/share/gnome/sounds/linphone" + _ACEOF + + diff --git a/net/linphone/files/patch-console::Makefile.in b/net/linphone/files/patch-console::Makefile.in new file mode 100644 index 000000000000..1a0933bc372c --- /dev/null +++ b/net/linphone/files/patch-console::Makefile.in @@ -0,0 +1,25 @@ + +$FreeBSD$ + +--- console/Makefile.in.orig Fri Feb 28 01:10:38 2003 ++++ console/Makefile.in Fri Feb 28 01:12:45 2003 +@@ -165,7 +165,8 @@ + $(top_srcdir)/osipua/src/libosipua.la \ + $(top_srcdir)/mediastreamer/audiostream.o \ + $(top_srcdir)/mediastreamer/libmediastreamer.la \ +- $(top_srcdir)/mediastreamer/libmsspeex.la ++ $(top_srcdir)/mediastreamer/.libs/libmsspeex.so \ ++ $(top_srcdir)/speex/libspeex/libspeex.la + + + sipomatic_SOURCES = \ +@@ -177,7 +178,8 @@ + $(top_srcdir)/osipua/src/libosipua.la \ + $(top_srcdir)/mediastreamer/audiostream.o \ + $(top_srcdir)/mediastreamer/libmediastreamer.la \ +- $(top_srcdir)/mediastreamer/libmsspeex.la ++ $(top_srcdir)/mediastreamer/.libs/libmsspeex.so \ ++ $(top_srcdir)/speex/libspeex/libspeex.la + + + noinst_PROGRAMS = wav2raw diff --git a/net/linphone/files/patch-coreapi::Makefile.in b/net/linphone/files/patch-coreapi::Makefile.in new file mode 100644 index 000000000000..0561a3d876ce --- /dev/null +++ b/net/linphone/files/patch-coreapi::Makefile.in @@ -0,0 +1,29 @@ + +$FreeBSD$ + +--- coreapi/Makefile.in 2003/02/28 01:08:22 1.1 ++++ coreapi/Makefile.in 2003/02/28 01:08:45 +@@ -171,9 +171,6 @@ + gnome-config.c gnome-config.h + + +-libcoreapignome_a_LIBADD = $(top_srcdir)/mediastreamer/audiostream.o +-libcoreapi_a_LIBADD = $(top_srcdir)/mediastreamer/audiostream.o +- + DEFS = @DEFS@ @SOUNDDEFS@ -DENABLE_TRACE + + CFLAGS = @CFLAGS@ $(GLIB_CFLAGS) -DG_LOG_DOMAIN=\"LinphoneCore\" +@@ -184,13 +181,10 @@ + LIBRARIES = $(noinst_LIBRARIES) + + libcoreapi_a_AR = $(AR) cru +-libcoreapi_a_DEPENDENCIES = $(top_srcdir)/mediastreamer/audiostream.o + am_libcoreapi_a_OBJECTS = linphonecore.$(OBJEXT) osipuacb.$(OBJEXT) \ + misc.$(OBJEXT) gnome-config.$(OBJEXT) + libcoreapi_a_OBJECTS = $(am_libcoreapi_a_OBJECTS) + libcoreapignome_a_AR = $(AR) cru +-libcoreapignome_a_DEPENDENCIES = \ +- $(top_srcdir)/mediastreamer/audiostream.o + am_libcoreapignome_a_OBJECTS = linphonecore.$(OBJEXT) osipuacb.$(OBJEXT) \ + misc.$(OBJEXT) + libcoreapignome_a_OBJECTS = $(am_libcoreapignome_a_OBJECTS) diff --git a/net/linphone/files/patch-coreapi::misc.c b/net/linphone/files/patch-coreapi::misc.c new file mode 100644 index 000000000000..dfeef28b9376 --- /dev/null +++ b/net/linphone/files/patch-coreapi::misc.c @@ -0,0 +1,23 @@ + + + +--- coreapi/misc.c.orig Wed Mar 12 09:52:05 2003 ++++ coreapi/misc.c Wed Mar 12 09:52:39 2003 +@@ -87,7 +87,7 @@ + pid_t pid; + + /* try to kill all artsd*/ +- command=g_strdup_printf("ps -u %s |grep artsd",getenv("LOGNAME")); ++ command=g_strdup_printf("ps -c %s |grep artsd",getenv("LOGNAME")); + out=popen(command,"r"); + if (out!=NULL) + { +@@ -102,7 +102,7 @@ + } + g_free(command); + /* do the same with esd*/ +- command=g_strdup_printf("ps -u %s |grep esd",getenv("LOGNAME")); ++ command=g_strdup_printf("ps -c %s |grep esd",getenv("LOGNAME")); + out=popen(command,"r"); + if (out!=NULL) + { diff --git a/net/linphone/files/patch-gnome::Makefile.in b/net/linphone/files/patch-gnome::Makefile.in new file mode 100644 index 000000000000..d0883e6a3b8d --- /dev/null +++ b/net/linphone/files/patch-gnome::Makefile.in @@ -0,0 +1,45 @@ + +$FreeBSD$ + +--- gnome/Makefile.in.orig Fri Feb 28 02:49:43 2003 ++++ gnome/Makefile.in Fri Feb 28 03:01:56 2003 +@@ -173,8 +173,10 @@ + @BUILD_GNOME_TRUE@ $(LIBGNOME_LIBS) \ + @BUILD_GNOME_TRUE@ $(top_srcdir)/coreapi/libcoreapignome.a \ + @BUILD_GNOME_TRUE@ $(top_srcdir)/osipua/src/libosipua.la \ ++@BUILD_GNOME_TRUE@ $(top_srcdir)/mediastreamer/audiostream.o \ + @BUILD_GNOME_TRUE@ $(top_srcdir)/mediastreamer/libmediastreamer.la \ +-@BUILD_GNOME_TRUE@ $(top_srcdir)/mediastreamer/libmsspeex.la ++@BUILD_GNOME_TRUE@ $(top_srcdir)/mediastreamer/.libs/libmsspeex.so \ ++@BUILD_GNOME_TRUE@ $(top_srcdir)/speex/libspeex/libspeex.la + + + CFLAGS = @CFLAGS@ $(LIBGNOMEUI_CFLAGS) $(LIBGNOME_CFLAGS) $(GNOME_APPLETS_CFLAGS) +@@ -199,8 +201,10 @@ + @BUILD_GNOME_APPLET_TRUE@ $(GNOME_APPLETS_LIBS) \ + @BUILD_GNOME_APPLET_TRUE@ $(top_srcdir)/coreapi/libcoreapignome.a \ + @BUILD_GNOME_APPLET_TRUE@ $(top_srcdir)/osipua/src/libosipua.la \ ++@BUILD_GNOME_APPLET_TRUE@ $(top_srcdir)/mediastreamer/audiostream.o \ + @BUILD_GNOME_APPLET_TRUE@ $(top_srcdir)/mediastreamer/libmediastreamer.la \ +-@BUILD_GNOME_APPLET_TRUE@ $(top_srcdir)/mediastreamer/libmsspeex.la ++@BUILD_GNOME_APPLET_TRUE@ $(top_srcdir)/mediastreamer/.libs/libmsspeex.so \ ++@BUILD_GNOME_APPLET_TRUE@ $(top_srcdir)/speex/libspeex/libspeex.la + + + +@@ -237,6 +241,7 @@ + @BUILD_GNOME_TRUE@linphone_DEPENDENCIES = \ + @BUILD_GNOME_TRUE@ $(top_srcdir)/coreapi/libcoreapignome.a \ + @BUILD_GNOME_TRUE@ $(top_srcdir)/osipua/src/libosipua.la \ ++@BUILD_GNOME_TRUE@ $(top_srcdir)/mediastreamer/audiostream.o \ + @BUILD_GNOME_TRUE@ $(top_srcdir)/mediastreamer/libmediastreamer.la \ + @BUILD_GNOME_TRUE@ $(top_srcdir)/mediastreamer/libmsspeex.la + @BUILD_GNOME_FALSE@linphone_DEPENDENCIES = +@@ -255,6 +260,7 @@ + @BUILD_GNOME_APPLET_TRUE@linphone_applet_DEPENDENCIES = \ + @BUILD_GNOME_APPLET_TRUE@ $(top_srcdir)/coreapi/libcoreapignome.a \ + @BUILD_GNOME_APPLET_TRUE@ $(top_srcdir)/osipua/src/libosipua.la \ ++@BUILD_GNOME_APPLET_TRUE@ $(top_srcdir)/mediastreamer/audiostream.o \ + @BUILD_GNOME_APPLET_TRUE@ $(top_srcdir)/mediastreamer/libmediastreamer.la \ + @BUILD_GNOME_APPLET_TRUE@ $(top_srcdir)/mediastreamer/libmsspeex.la + @BUILD_GNOME_APPLET_FALSE@linphone_applet_DEPENDENCIES = diff --git a/net/linphone/files/patch-lpc10-1.5::lpcini.c b/net/linphone/files/patch-lpc10-1.5::lpcini.c new file mode 100644 index 000000000000..4398a7075055 --- /dev/null +++ b/net/linphone/files/patch-lpc10-1.5::lpcini.c @@ -0,0 +1,17 @@ + +$FreeBSD$ + +--- lpc10-1.5/lpcini.c 2002/12/30 08:26:21 1.1 ++++ lpc10-1.5/lpcini.c 2002/12/30 08:28:01 +@@ -32,9 +32,9 @@ + -lf2c -lm (in that order) + */ + +-#include "f2c.h" ++#include <stdlib.h> + +-#include <malloc.h> ++#include "f2c.h" + + /* Common Block Declarations */ + diff --git a/net/linphone/files/patch-mediastreamer::Makefile.in b/net/linphone/files/patch-mediastreamer::Makefile.in new file mode 100644 index 000000000000..40badea3acd6 --- /dev/null +++ b/net/linphone/files/patch-mediastreamer::Makefile.in @@ -0,0 +1,23 @@ + +$FreeBSD$ + +--- mediastreamer/Makefile.in.orig Fri Feb 28 01:20:45 2003 ++++ mediastreamer/Makefile.in Fri Feb 28 01:20:45 2003 +@@ -163,7 +163,7 @@ + @BUILD_V4L_TRUE@V4L_PLUGIN_TEST = test_v4l + + @BUILD_MEDIASTREAMER_TRUE@lib_LTLIBRARIES = libmediastreamer.la $(XINE_PLUGIN) $(SMPEG_PLUGIN)\ +-@BUILD_MEDIASTREAMER_TRUE@ $(FFMPEG_PLUGIN) $(GDK_VO_PLUGIN) $(V4L_PLUGIN) libmsspeex.la ++@BUILD_MEDIASTREAMER_TRUE@ $(FFMPEG_PLUGIN) $(GDK_VO_PLUGIN) $(V4L_PLUGIN) libmsspeex.la $(top_srcdir)/speex/libspeex/libspeex.la + + + libmediastreamer_la_SOURCES = msfilter.c msfilter.h msutils.h\ +@@ -296,7 +296,7 @@ + + #the mediastream program that runs a processing that will be used in linphone + mediastream_SOURCES = mediastream.c audiostream.c mediastream.h +-mediastream_LDADD = libmediastreamer.la libmsspeex.la ++mediastream_LDADD = libmediastreamer.la libmsspeex.la $(top_srcdir)/speex/libspeex/libspeex.la + + DEFS = @DEFS@ -DG_LOG_DOMAIN=\"MediaStreamer\" + diff --git a/net/linphone/files/patch-mediastreamer::msfifo.c b/net/linphone/files/patch-mediastreamer::msfifo.c new file mode 100644 index 000000000000..f30f63710642 --- /dev/null +++ b/net/linphone/files/patch-mediastreamer::msfifo.c @@ -0,0 +1,15 @@ + +$FreeBSD$ + +--- mediastreamer/msfifo.c 2002/12/30 08:33:16 1.1 ++++ mediastreamer/msfifo.c 2002/12/30 08:33:36 +@@ -23,6 +23,9 @@ + #include "msutils.h" + #include "msfifo.h" + ++#ifndef ENODATA ++#define ENODATA 61 ++#endif + + MSFifo * ms_fifo_new(MSBuffer *buf, gint r_gran, gint w_gran, gint r_offset, gint w_offset) + { diff --git a/net/linphone/files/patch-oRTP::configure b/net/linphone/files/patch-oRTP::configure new file mode 100644 index 000000000000..23804098f77c --- /dev/null +++ b/net/linphone/files/patch-oRTP::configure @@ -0,0 +1,13 @@ + +$FreeBSD$ + +--- oRTP/configure 2003/02/27 23:48:28 1.1 ++++ oRTP/configure 2003/02/27 23:49:02 +@@ -7793,6 +7793,7 @@ + + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/net/linphone/files/patch-oRTP::src::port_fct.c b/net/linphone/files/patch-oRTP::src::port_fct.c new file mode 100644 index 000000000000..ececcc89e337 --- /dev/null +++ b/net/linphone/files/patch-oRTP::src::port_fct.c @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- oRTP/src/port_fct.c 2002/12/30 08:13:23 1.1 ++++ oRTP/src/port_fct.c 2002/12/30 08:13:35 +@@ -20,7 +20,7 @@ + + /* port_fct.h. define methods to help for portability between unix and win32 */ + +- ++#include <sched.h> + #include "rtpsession.h" + + #include "port_fct.h" diff --git a/net/linphone/files/patch-oRTP::src::scheduler.h b/net/linphone/files/patch-oRTP::src::scheduler.h new file mode 100644 index 000000000000..a872fc24fcbd --- /dev/null +++ b/net/linphone/files/patch-oRTP::src::scheduler.h @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- oRTP/src/scheduler.h 2002/12/30 08:15:08 1.1 ++++ oRTP/src/scheduler.h 2002/12/30 08:15:16 +@@ -20,6 +20,8 @@ + #ifndef SCHEDULER_H + #define SCHEDULER_H + ++#include <pthread.h> ++ + #include "rtpsession.h" + #include "rtptimer.h" + #include "sessionset.h" diff --git a/net/linphone/files/patch-osipua::src::osipua.c b/net/linphone/files/patch-osipua::src::osipua.c new file mode 100644 index 000000000000..b7111db391ab --- /dev/null +++ b/net/linphone/files/patch-osipua::src::osipua.c @@ -0,0 +1,15 @@ + +$FreeBSD$ + +--- osipua/src/osipua.c 2003/06/13 12:25:43 1.1 ++++ osipua/src/osipua.c 2003/06/13 12:58:48 +@@ -595,8 +595,7 @@ + if (ipaddr != NULL) + { + osip_trace(OSIP_INFO1,("osip_ua_find 1: %s <> %s \n",ua->ua_ipaddr,ipaddr)); +- if ((strcasecmp(ua->ua_ipaddr,ipaddr)==0) || (strcasecmp("127.0.0.1",ipaddr)==0) || +- IN6_IS_ADDR_LOOPBACK(res->ai_addr)) ++ if ((strcasecmp(ua->ua_ipaddr,ipaddr)==0) || (strcasecmp("127.0.0.1",ipaddr)==0)) + { + ret_ua=ua; /* ip addresses match */ + } diff --git a/net/linphone/files/patch-osipua::src::sdphandler.c b/net/linphone/files/patch-osipua::src::sdphandler.c new file mode 100644 index 000000000000..3af14a5dfbc1 --- /dev/null +++ b/net/linphone/files/patch-osipua::src::sdphandler.c @@ -0,0 +1,13 @@ + +$FreeBSD$ + +--- osipua/src/sdphandler.c 2003/06/13 13:02:40 1.1 ++++ osipua/src/sdphandler.c 2003/06/13 13:02:48 +@@ -26,6 +26,7 @@ + #include <string.h> + #include <sys/types.h> + #include <sys/socket.h> ++#include <netinet/in.h> + + #ifdef HAVE_IFADDRS_H + #include <ifaddrs.h> |