rename packages/ to recipes/ per earlier agreement

See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816

Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>

12 files changed, 338 insertions, 0 deletions

diff --git a/recipes/linphone/files/disable-gtk-doc.patch b/recipes/linphone/files/disable-gtk-doc.patch
new file mode 100644
index 0000000000..c616037244
--- /dev/null
+++ b/recipes/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/recipes/linphone/linphone-0.12.2/osip-lossage.patch b/recipes/linphone/linphone-0.12.2/osip-lossage.patch
new file mode 100644
index 0000000000..d5d5cfcab8
--- /dev/null
+++ b/recipes/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/recipes/linphone/linphone-1.3.99.8/conf.patch b/recipes/linphone/linphone-1.3.99.8/conf.patch
new file mode 100644
index 0000000000..e8fbdf22c8
--- /dev/null
+++ b/recipes/linphone/linphone-1.3.99.8/conf.patch
@@ -0,0 +1,33 @@
+--- a/configure.in
++++ b/configure.in
+@@ -30,7 +30,7 @@
+ AM_PROG_CC_STDC
+ AC_HEADER_STDC
+ dnl localization tools
+-ifdef([IT_PROG_INTLTOOL],[IT_PROG_INTLTOOL],[AC_PROG_INTLTOOL])
++dnl ifdef([IT_PROG_INTLTOOL],[IT_PROG_INTLTOOL],[AC_PROG_INTLTOOL])
+ dnl Initialize libtool
+ AC_PROG_LIBTOOL
+ AM_PROG_LIBTOOL
+@@ -62,7 +62,7 @@
+   gnome_ui=false
+ fi
+ 
+-CFLAGS="$CFLAGS -I\$(prefix)/include"
++dnl CFLAGS="$CFLAGS -I\$(prefix)/include"
+ 
+ if test "$gnome_ui" = "true" ; then
+ 
+--- a/mediastreamer2/configure.ac
++++ b/mediastreamer2/configure.ac
+@@ -47,8 +47,8 @@
+ [wall_werror=yes]
+ )
+ 
+-CFLAGS="-DORTP_INET6 $CFLAGS -I\$(prefix)/include"
+-LIBS="$LIBS -L\$(prefix)/lib"
++dnl CFLAGS="-DORTP_INET6 $CFLAGS -I\$(prefix)/include"
++dnl LIBS="$LIBS -L\$(prefix)/lib"
+ 
+ dnl enable ipv6 support
+ AC_ARG_ENABLE(ipv6,
diff --git a/recipes/linphone/linphone-1.6.0/linphone-speex.diff b/recipes/linphone/linphone-1.6.0/linphone-speex.diff
new file mode 100644
index 0000000000..930c774a41
--- /dev/null
+++ b/recipes/linphone/linphone-1.6.0/linphone-speex.diff
@@ -0,0 +1,13 @@
+Index: linphone-1.6.0/mediastreamer2/configure.ac
+===================================================================
+--- linphone-1.6.0.orig/mediastreamer2/configure.ac	2008-11-04 03:41:04.936798321 +0300
++++ linphone-1.6.0/mediastreamer2/configure.ac	2008-11-04 03:41:09.589036036 +0300
+@@ -253,7 +253,7 @@ dnl	check for various codecs libraries
+ dnl	*************************************
+
+ dnl check for installed version of speex
+-PKG_CHECK_MODULES(SPEEX, speex >= 1.1.12,
++PKG_CHECK_MODULES(SPEEX, speex >= 1.1.12 speexdsp,
+	[ AC_DEFINE(HAVE_SPEEX_NOISE,1,[tells whether the noise arg of speex_echo_cancel can be used]) ],
+	[try_other_speex=yes]
+ )
diff --git a/recipes/linphone/linphone-hh-0.12.2.hh1/dotdesktop.patch b/recipes/linphone/linphone-hh-0.12.2.hh1/dotdesktop.patch
new file mode 100644
index 0000000000..0b50fc9873
--- /dev/null
+++ b/recipes/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/recipes/linphone/linphone-hh-0.12.2.hh1/gpe-cross-lossage.patch b/recipes/linphone/linphone-hh-0.12.2.hh1/gpe-cross-lossage.patch
new file mode 100644
index 0000000000..ed3bfc2cae
--- /dev/null
+++ b/recipes/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/recipes/linphone/linphone-hh-0.12.2.hh1/osipua-ipv6-lossage.patch b/recipes/linphone/linphone-hh-0.12.2.hh1/osipua-ipv6-lossage.patch
new file mode 100644
index 0000000000..928f9aad5e
--- /dev/null
+++ b/recipes/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/recipes/linphone/linphone-hh-0.12.2.hh1/segfault.patch b/recipes/linphone/linphone-hh-0.12.2.hh1/segfault.patch
new file mode 100644
index 0000000000..565ab5274b
--- /dev/null
+++ b/recipes/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/recipes/linphone/linphone-hh_0.12.2.hh1.bb b/recipes/linphone/linphone-hh_0.12.2.hh1.bb
new file mode 100644
index 0000000000..54a79390a7
--- /dev/null
+++ b/recipes/linphone/linphone-hh_0.12.2.hh1.bb
@@ -0,0 +1,36 @@
+LICENSE = "GPL"
+SECTION = "x11/utils"
+PR = "r4"
+
+DESCRIPTION = "SIP-based IP phone (GPE edition)"
+DEPENDS = "libosip gtk+ libogg alsa-lib"
+SRC_URI = "http://handhelds.org/packages/linphone/linphone-${PV}.tar.gz \
+	file://osipua-ipv6-lossage.patch;patch=1 \
+	file://gpe-cross-lossage.patch;patch=1 \
+	file://disable-gtk-doc.patch;patch=1 \
+	file://dotdesktop.patch;patch=1 \
+	file://segfault.patch;patch=1"
+
+S = "${WORKDIR}/linphone-${PV}"
+
+FILES_${PN} += "${datadir}/linphonec"
+
+inherit autotools
+
+EXTRA_OECONF = "--disable-gnome_ui --disable-gtk-doc"
+
+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
+}
diff --git a/recipes/linphone/linphone_0.12.2.bb b/recipes/linphone/linphone_0.12.2.bb
new file mode 100644
index 0000000000..7a5e17a981
--- /dev/null
+++ b/recipes/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
+}
diff --git a/recipes/linphone/linphone_1.3.99.8.bb b/recipes/linphone/linphone_1.3.99.8.bb
new file mode 100644
index 0000000000..f96bd66b82
--- /dev/null
+++ b/recipes/linphone/linphone_1.3.99.8.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "SIP-based IP phone (Console edition)"
+HOMEPAGE = "http://www.linphone.org/?lang=us"
+LICENSE = "GPL-2"
+DEPENDS = "libosip2 speex libogg alsa-lib readline"
+PR = "r0"
+
+SRC_URI = "http://download.savannah.nongnu.org/releases/linphone/unstable/source/linphone-${PV}.tar.gz \
+           file://conf.patch;patch=1"
+
+S = "${WORKDIR}/linphone-${PV}"
+
+FILES_${PN} += "${datadir}/linphonec"
+
+inherit autotools
+
+EXTRA_OECONF = "--disable-gnome_ui --disable-gtk-doc --without-ffmpeg \
+                --without-sdl --disable-video --enable-alsa \
+                --with-osip=${STAGING_DIR_HOST}${layout_exec_prefix} \
+                --with-readline=${STAGING_DIR_HOST}${layout_exec_prefix} \
+                --with-speex=${STAGING_DIR_HOST}${layout_exec_prefix} \
+                --disable-truespeech --disable-manual \
+                --disable-glibtest --disable-glib"
+
+do_install_append() {
+	rm -f ${D}${datadir}/sounds/linphone/hello*.wav
+	rm -f ${D}${datadir}/sounds/linphone/rings/oldphone.wav
+}
diff --git a/recipes/linphone/linphone_1.6.0.bb b/recipes/linphone/linphone_1.6.0.bb
new file mode 100644
index 0000000000..64b2dafdd2
--- /dev/null
+++ b/recipes/linphone/linphone_1.6.0.bb
@@ -0,0 +1,70 @@
+DESCRIPTION = "SIP-based IP phone (console edition)"
+HOMEPAGE = "http://www.linphone.org/?lang=us"
+SECTION = "x11/utils"
+LICENSE = "GPLv2"
+
+DEPENDS = "intltool libosip2 speex libogg alsa-lib readline"
+DEPENDS_${PN} = "liblinphone"
+DEPENDS_${PN}c = "liblinphone readline"
+DEPENDS_liblinphone = "libquickstream libmediastreamer libortp libosip2"
+DEPENDS_libquickstream = "speex libmediastreamer alsa-lib"
+DEPENDS_libmediastreamer = "speex libogg alsa-lib libortp"
+
+RDEPENDS_${PN} = "liblinphone"
+RDEPENDS_${PN}c = "liblinphone readline"
+RDEPENDS_liblinphone = "libquickstream libmediastreamer libortp libosip2"
+RDEPENDS_libquickstream = "speex libmediastreamer libasound"
+RDEPENDS_libmediastreamer = "speex libogg libasound libortp"
+
+PROVIDES += "linphone linphonec liblinphone"
+
+PR = "r3"
+
+SRC_URI = "http://download.savannah.nongnu.org/releases/linphone/1.6.x/sources/linphone-${PV}.tar.gz \
+           http://download.devbase.at/voip/linphone-1.6.0-pl0.patch;patch=1 \
+           file://linphone-speex.diff;patch=1"
+
+S = "${WORKDIR}/linphone-${PV}"
+
+inherit autotools pkgconfig
+
+export PKG_CONFIG=${STAGING_BINDIR_NATIVE}/pkg-config
+
+EXTRA_OECONF = "--disable-gtk-doc \
+                --without-ffmpeg --disable-video --without-sdl \
+                --enable-alsa \
+                --with-osip=${STAGING_DIR_HOST}${layout_exec_prefix} \
+                --with-readline=${STAGING_DIR_HOST}${layout_exec_prefix} \
+                --with-speex=${STAGING_DIR_HOST}${layout_exec_prefix} \
+                --disable-truespeech --disable-manual \
+                --disable-gnome_ui"
+
+PARALLEL_MAKE = ""
+
+do_stage () {
+        install -d ${STAGING_DATADIR}/aclocal
+        oe_libinstall -a -so liblinphone ${STAGING_LIBDIR}
+        install -d ${STAGING_INCDIR}/linphone
+        install -m 0644 ${S}/coreapi/linphonecore.h ${STAGING_INCDIR}/linphone
+        install -m 0644 ${S}/coreapi/lpconfig.h ${STAGING_INCDIR}/linphone
+        oe_libinstall -a -so libmediastreamer ${STAGING_LIBDIR}
+        oe_libinstall -a -so libquickstream ${STAGING_LIBDIR}
+        install -d ${STAGING_INCDIR}/mediastreamer2
+        install -m 0644 ${S}/mediastreamer2/include/mediastreamer2/*.h ${STAGING_INCDIR}/mediastreamer2
+        install -d ${STAGING_INCDIR}/ortp
+        oe_libinstall -a -so libortp ${STAGING_LIBDIR}/
+        install -m 0644 ${S}/oRTP/include/ortp/*.h ${STAGING_INCDIR}/ortp/
+        autotools_stage_all
+}
+
+PACKAGES += "linphonec linphone-rings liblinphone libquickstream libmediastreamer libortp"
+
+FILES_${PN} = "${bindir}/linphone ${datadir}/pixmaps ${datadir}/applications ${datadir}/gnome/apps"
+FILES_${PN}c = "${bindir}/linphonec ${bindir}/sipomatic ${datadir}/sounds/linphone/ringback.wav"
+FILES_${PN}-rings = "${datadir}/sounds/linphone/rings"
+FILES_liblinphone = "${libdir}/liblinphone.so.*"
+FILES_libquickstream = "${libdir}/libquickstream.so.*"
+FILES_libmediastreamer = "${libdir}/libmediastreamer.so.*"
+FILES_libortp = "${libdir}/libortp.so.*"
+FILES_${PN}-dev += "${libdir}/*.a ${libdir}/*.la ${libdir}/pkgconfig ${includedir}"
+