import clean BK tree at cset 1.3670

11 files changed, 159 insertions, 0 deletions

diff --git a/packages/linphone/.mtn2git_empty b/packages/linphone/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linphone/.mtn2git_empty
diff --git a/packages/linphone/files/.mtn2git_empty b/packages/linphone/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linphone/files/.mtn2git_empty
diff --git a/packages/linphone/files/disable-gtk-doc.patch b/packages/linphone/files/disable-gtk-doc.patch
index e69de29bb2..c616037244 100644
--- a/packages/linphone/files/disable-gtk-doc.patch
+++ b/packages/linphone/files/disable-gtk-doc.patch
@@ -0,0 +1,14 @@
+--- linphone-0.12.2/configure.in	2004-03-31 21:22:55.000000000 +0100
++++ linphone-0.12.2.hh1/configure.in	2004-08-31 19:44:48.000000000 +0100
+@@ -313,7 +358,10 @@
+ fi
+ 
+ AC_SUBST(HTML_DIR)
+-PKG_CHECK_MODULES(GTK_DOC,gtk-doc >= 0.4, enable_gtk_doc=yes,enable_gtk_doc=no )
++AC_ARG_ENABLE(gtk-doc, [  --enable-gtk-doc  enable documentation build])
++if test "x$enable_gtk_doc" != "xno" ; then
++  PKG_CHECK_MODULES(GTK_DOC,gtk-doc >= 0.4, enable_gtk_doc=yes,enable_gtk_doc=no )
++fi
+ AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes )
+ 
+ LINPHONE_CFLAGS="$GLIB_CFLAGS -I${includedir} -I${includedir}/linphone -I${includedir}/osipua -I${includedir}/ortp "
diff --git a/packages/linphone/linphone-0.12.2/.mtn2git_empty b/packages/linphone/linphone-0.12.2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linphone/linphone-0.12.2/.mtn2git_empty
diff --git a/packages/linphone/linphone-0.12.2/osip-lossage.patch b/packages/linphone/linphone-0.12.2/osip-lossage.patch
index e69de29bb2..d5d5cfcab8 100644
--- a/packages/linphone/linphone-0.12.2/osip-lossage.patch
+++ b/packages/linphone/linphone-0.12.2/osip-lossage.patch
@@ -0,0 +1,36 @@
+--- linphone-0.12.2/console/Makefile.am.old	2004-07-03 10:15:37.000000000 +0100
++++ linphone-0.12.2/console/Makefile.am	2004-07-03 10:15:42.000000000 +0100
+@@ -8,8 +8,7 @@
+ 	-I$(top_srcdir)/oRTP/src \
+ 	-I$(top_srcdir)/oRTP/ \
+ 	-I$(top_srcdir)/mediastreamer \
+-	$(SPEEX_CFLAGS) \
+-	-I$(osip_prefix)/include/ 
++	$(SPEEX_CFLAGS)
+ 
+ 
+ 
+--- linphone-0.12.2/coreapi/Makefile.am.old	2004-07-03 10:15:47.000000000 +0100
++++ linphone-0.12.2/coreapi/Makefile.am	2004-07-03 10:15:51.000000000 +0100
+@@ -10,8 +10,7 @@
+ 	-I$(top_srcdir)/oRTP/src \
+ 	-I$(top_srcdir)/oRTP/ \
+ 	-I$(top_srcdir)/mediastreamer \
+-	$(SPEEX_CFLAGS) \
+-	-I$(osip_prefix)/include/ 
++	$(SPEEX_CFLAGS)
+ 
+ EXTRA_DIST= parse-path.cP 
+ 
+--- linphone-0.12.2/gnome/Makefile.am.old	2004-07-03 10:15:55.000000000 +0100
++++ linphone-0.12.2/gnome/Makefile.am	2004-07-03 10:16:00.000000000 +0100
+@@ -23,8 +23,7 @@
+ 	-I$(top_srcdir)/speex/libspeex \
+ 	-I$(top_srcdir)/coreapi \
+ 	-I$(top_srcdir)/osipua/ \
+-	-I$(top_srcdir)/osipua/src \
+-	-I$(osip_prefix)/include/ 
++	-I$(top_srcdir)/osipua/src
+ 
+ 
+ 
diff --git a/packages/linphone/linphone-hh-0.12.2.hh1/.mtn2git_empty b/packages/linphone/linphone-hh-0.12.2.hh1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linphone/linphone-hh-0.12.2.hh1/.mtn2git_empty
diff --git a/packages/linphone/linphone-hh-0.12.2.hh1/dotdesktop.patch b/packages/linphone/linphone-hh-0.12.2.hh1/dotdesktop.patch
index e69de29bb2..0b50fc9873 100644
--- a/packages/linphone/linphone-hh-0.12.2.hh1/dotdesktop.patch
+++ b/packages/linphone/linphone-hh-0.12.2.hh1/dotdesktop.patch
@@ -0,0 +1,12 @@
+diff -Nru linphone-0.12.2.orig/share/linphone.desktop linphone-0.12.2/share/linphone.desktop
+--- linphone-0.12.2.orig/share/linphone.desktop 2005-03-02 22:11:15.000000000 +0100
++++ linphone-0.12.2/share/linphone.desktop      2005-03-02 22:11:27.000000000 +0100
+@@ -4,7 +4,7 @@
+ Comment[fr]=Linphone est un web-phone.
+ Comment[de]=Linphone ist ein web-phone.
+ Type=Application
+-Exec=linphone
++Exec=linphone-gpe
+ Icon=linphone/linphone2.png
+ Terminal=0
+ Categories=Application;Network;
diff --git a/packages/linphone/linphone-hh-0.12.2.hh1/gpe-cross-lossage.patch b/packages/linphone/linphone-hh-0.12.2.hh1/gpe-cross-lossage.patch
index e69de29bb2..ed3bfc2cae 100644
--- a/packages/linphone/linphone-hh-0.12.2.hh1/gpe-cross-lossage.patch
+++ b/packages/linphone/linphone-hh-0.12.2.hh1/gpe-cross-lossage.patch
@@ -0,0 +1,27 @@
+--- linphone-0.12.2.hh1/gpe/Makefile.am.old	2004-08-29 21:16:33.000000000 +0100
++++ linphone-0.12.2.hh1/gpe/Makefile.am	2004-08-29 21:16:52.000000000 +0100
+@@ -28,23 +28,6 @@
+ 	propertybox.c propertybox.h \
+ 	linphone-gpe.c linphone-gpe.h
+ 
+-linphone_gpe_LDADD = $(LIBOSIP_LIBS) $(GTK_LIBS) $(XML_LIBS) \
++linphone_gpe_LDADD = $(LIBOSIP_LIBS) $(GTK_LIBS) $(XML_LIBS) $(ALSA_LIBS) \
+ 	$(top_srcdir)/coreapi/liblinphone.la
+ 
+-if CROSS_COMPILING
+-
+-CROSS_ALSA_CFLAGS = -I/usr/local/arm/familiar/usr/include
+-CROSS_ALSA_LIBS = -L/usr/local/arm/familiar/usr/lib -lasound
+-
+-linphone_gpe_LDFLAGS = /usr/local/arm/familiar/usr/X11R6/lib/libX11.so \
+-		/usr/local/arm/familiar/usr/X11R6/lib/libXi.so \
+-		/usr/local/arm/familiar/usr/X11R6/lib/libXext.so \
+-		/usr/local/arm/familiar/usr/X11R6/lib/libXrender.so \
+-		/usr/local/arm/familiar/usr/X11R6/lib/libXft.so \
+-		/usr/local/arm/familiar/usr/lib/libfontconfig.so \
+-		/usr/local/arm/familiar/usr/lib/libfreetype.so \
+-		/usr/local/arm/familiar/usr/lib/libexpat.so \
+-		$(CROSS_ALSA_LIBS)
+-else
+-linphone_gpe_LDFLAGS = $(ALSA_LIBS)
+-endif
diff --git a/packages/linphone/linphone-hh-0.12.2.hh1/osipua-ipv6-lossage.patch b/packages/linphone/linphone-hh-0.12.2.hh1/osipua-ipv6-lossage.patch
index e69de29bb2..928f9aad5e 100644
--- a/packages/linphone/linphone-hh-0.12.2.hh1/osipua-ipv6-lossage.patch
+++ b/packages/linphone/linphone-hh-0.12.2.hh1/osipua-ipv6-lossage.patch
@@ -0,0 +1,16 @@
+--- linphone-0.12.2.hh1/osipua/src/Makefile.am~osipua-ipv6-lossage.patch	2004-05-14 22:04:13.000000000 +0100
++++ linphone-0.12.2.hh1/osipua/src/Makefile.am	2004-08-29 21:06:30.000000000 +0100
+@@ -41,11 +41,11 @@
+ 
+ noinst_PROGRAMS = osipua_tester test_sdphandler
+ osipua_tester_SOURCES = osipua_tester.c  osipua_tester.h
+-osipua_tester_CFLAGS = $(OSIP_CFLAGS)
++osipua_tester_CFLAGS = $(OSIP_CFLAGS) $(IPV6_CFLAGS)
+ osipua_tester_LDADD   = libosipua.la
+ osipua_tester_LDFLAGS = $(OSIP_LDFLAGS)
+ 
+ test_sdphandler_SOURCES = test_sdphandler.c
+-test_sdphandler_CFLAGS = $(OSIP_CFLAGS)
++test_sdphandler_CFLAGS = $(OSIP_CFLAGS) $(IPV6_CFLAGS)
+ test_sdphandler_LDADD = libosipua.la
+ test_sdphandler_LDFLAGS = $(OSIP_LDFLAGS)
diff --git a/packages/linphone/linphone-hh-0.12.2.hh1/segfault.patch b/packages/linphone/linphone-hh-0.12.2.hh1/segfault.patch
index e69de29bb2..565ab5274b 100644
--- a/packages/linphone/linphone-hh-0.12.2.hh1/segfault.patch
+++ b/packages/linphone/linphone-hh-0.12.2.hh1/segfault.patch
@@ -0,0 +1,23 @@
+--- linphone-0.12.2.hh1/coreapi/misc.c~	2004-05-14 15:41:04.000000000 +0100
++++ linphone-0.12.2.hh1/coreapi/misc.c	2005-01-05 20:04:49.000000000 +0000
+@@ -197,6 +197,8 @@
+ {
+ 	int len;
+ 	char *prim_contact;
++	if (lc->sip_conf.username == NULL)
++	  abort ();
+ #ifdef LINPHONE_DEPRECATED
+ #ifdef INET6
+ 	len=32+strlen(lc->sip_conf.username) + 2;
+--- linphone-0.12.2.hh1/coreapi/linphonecore.c~	2004-05-14 20:40:19.000000000 +0100
++++ linphone-0.12.2.hh1/coreapi/linphonecore.c	2005-01-05 20:04:12.000000000 +0000
+@@ -454,8 +454,8 @@
+ 	if (def){
+ 		port=5060;
+ 	}
+-	linphone_core_set_sip_port(lc,port);
+ 	linphone_core_set_primary_contact(lc,g_strdup_printf("sip:%s@%s",username,hostname));
++	linphone_core_set_sip_port(lc,port);
+ 	registrar_config_read(lc);
+ }
+ 
diff --git a/packages/linphone/linphone_0.12.2.bb b/packages/linphone/linphone_0.12.2.bb
index e69de29bb2..bb3e1cddc7 100644
--- a/packages/linphone/linphone_0.12.2.bb
+++ b/packages/linphone/linphone_0.12.2.bb
@@ -0,0 +1,31 @@
+LICENSE = GPL
+SECTION = "x11/utils"
+PR = "r2"
+
+DESCRIPTION = "SIP-based IP phone (GPE edition)"
+DEPENDS = "libosip gtk+ libogg libgnomeui"
+SRC_URI = "http://simon.morlat.free.fr/download/0.12.2/source/linphone-${PV}.tar.gz \
+	file://osip-lossage.patch;patch=1 \
+	file://disable-gtk-doc.patch;patch=1"
+
+FILES_${PN} += "${datadir}/linphonec"
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+inherit autotools
+
+do_configure() {
+	# ffmpeg is in AC_SUBDIRS, but doesn't actually use autoconf.
+	# Autoreconf will try to recurse into there and blow up.
+	for dir in . speex oRTP osipua; do
+		( cd $dir; libtoolize --force; aclocal; automake; autoconf )
+	done
+
+	oe_runconf
+}
+
+do_install_append() {
+	mv ${D}${datadir}/gnome/apps/Internet ${D}${datadir}/applications
+	rm -f ${D}${datadir}/sounds/linphone/hello*.wav
+	rm -f ${D}${datadir}/sounds/linphone/rings/oldphone.wav
+}