From 3724165baa5721311c907b5a816e9620f2684573 Mon Sep 17 00:00:00 2001
From: Yann Diorcet <yann.diorcet@belledonne-communications.com>
Date: Tue, 22 May 2012 22:44:49 +0200
Subject: [PATCH] Update osip/exosip 3.6.0 recipe add x11 recipe

---
 .../{libexosip2_3.5.0.bb => libexosip2_3.6.0.bb} |  4 ++--
 build/openembedded/libosip2_3.6.0.bb             | 11 +++++++++++
 build/openembedded/linphone-common.inc           |  5 +++++
 .../linphone_+git-nogtk-gsm-video-x11.bb         | 16 ++++++++++++++++
 .../linphone_+local-nogtk-gsm-video-x11.bb       | 16 ++++++++++++++++
 5 files changed, 50 insertions(+), 2 deletions(-)
 rename build/openembedded/{libexosip2_3.5.0.bb => libexosip2_3.6.0.bb} (74%)
 create mode 100644 build/openembedded/libosip2_3.6.0.bb
 create mode 100644 build/openembedded/linphone_+git-nogtk-gsm-video-x11.bb
 create mode 100644 build/openembedded/linphone_+local-nogtk-gsm-video-x11.bb

diff --git a/build/openembedded/libexosip2_3.5.0.bb b/build/openembedded/libexosip2_3.6.0.bb
similarity index 74%
rename from build/openembedded/libexosip2_3.5.0.bb
rename to build/openembedded/libexosip2_3.6.0.bb
index 706494064..ef6716afb 100644
--- a/build/openembedded/libexosip2_3.5.0.bb
+++ b/build/openembedded/libexosip2_3.6.0.bb
@@ -13,5 +13,5 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
 inherit autotools pkgconfig
 EXTRA_OECONF = "--disable-josua"
 DEFAULT_PREFERENCE = "3"
-SRC_URI[md5sum] = "51e85725571870614e448f63c33c8996"
-SRC_URI[sha256sum] = "46010e62a6f675df13e5be759d033b6bce1bd5882eebb4acd553f9dd3b461afc"
+SRC_URI[md5sum] = "6fef4c110f1305048a8b307f440933d9"
+SRC_URI[sha256sum] = "91da1a084c9ab663afe04b493342e075ad59ac54a1af011c7f2ba4543a923564"
diff --git a/build/openembedded/libosip2_3.6.0.bb b/build/openembedded/libosip2_3.6.0.bb
new file mode 100644
index 000000000..61e4ec33e
--- /dev/null
+++ b/build/openembedded/libosip2_3.6.0.bb
@@ -0,0 +1,11 @@
+SECTION = "libs"
+DESCRIPTION = "Session Initiation Protocol (SIP) library"
+LEAD_SONAME = "libosip2\..*"
+PR = "r0"
+LICENSE = "LGPL"
+SRC_URI = "${GNU_MIRROR}/osip/libosip2-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+DEFAULT_PREFERENCE = "3"
+SRC_URI[md5sum] = "92fd1c1698235a798497887db159c9b3"
+SRC_URI[sha256sum] = "c9a18b0c760506d150017cdb1fa5c1cefe12b8dcbbf9a7e784eb75af376e96cd"
diff --git a/build/openembedded/linphone-common.inc b/build/openembedded/linphone-common.inc
index d6cd80d22..ac794a325 100644
--- a/build/openembedded/linphone-common.inc
+++ b/build/openembedded/linphone-common.inc
@@ -28,6 +28,8 @@ export PKG_CONFIG=${STAGING_BINDIR_NATIVE}/pkg-config
 LINPHONE_OE_ENABLE_TESTS = "--disable-tests"
 LINPHONE_OE_ENABLE_VIDEO = "--disable-video"
 LINPHONE_OE_ENABLE_VIDEO_video = "--with-ffmpeg=${STAGING_DIR_HOST}${layout_exec_prefix} --enable-video"
+LINPHONE_OE_ENABLE_X11 = "--disable-x11 --disable-xv"
+LINPHONE_OE_ENABLE_X11_x11 = ""
 
 LINPHONE_OE_ENABLE_CONSOLE_UI = "no"
 LINPHONE_OE_ENABLE_CONSOLE_UI_console = "yes"
@@ -42,6 +44,7 @@ do_install_append(){
 EXTRA_OECONF = " \
 		${LINPHONE_OE_ENABLE_TESTS} \
                 ${LINPHONE_OE_ENABLE_VIDEO} \
+		${LINPHONE_OE_ENABLE_X11} \
                 --enable-alsa \
                 --with-osip=${STAGING_DIR_HOST}${layout_exec_prefix} \
                 --with-readline=${STAGING_DIR_HOST}${layout_exec_prefix} \
@@ -52,6 +55,8 @@ EXTRA_OECONF = " \
 		--with-realprefix=/usr \
 		"
 
+EXTRA_OEMAKE = " V=1"
+
 PACKAGES_gtk = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale ${PN}c linphone-rings liblinphone libmediastreamer-bin libmediastreamer libortp ${PN}-utils"
 PACKAGES = "${PN}-dbg ${PN}-dev ${PN}c linphone-rings liblinphone libmediastreamer-bin libmediastreamer libortp ${PN}-utils"
 
diff --git a/build/openembedded/linphone_+git-nogtk-gsm-video-x11.bb b/build/openembedded/linphone_+git-nogtk-gsm-video-x11.bb
new file mode 100644
index 000000000..57735e6ac
--- /dev/null
+++ b/build/openembedded/linphone_+git-nogtk-gsm-video-x11.bb
@@ -0,0 +1,16 @@
+## THIS unusable work in progress ##
+
+DESCRIPTION = "Audio/video SIP-based IP phone (console edition)"
+HOMEPAGE = "http://www.linphone.org/?lang=us"
+LICENSE = "GPLv2"
+PR="r9"
+
+DEFAULT_PREFERENCE = "3"
+OVERRIDES_append = ":console"
+OVERRIDES_append = ":gsm"
+OVERRIDES_append = ":video"
+OVERRIDES_append = ":x11"
+
+#PARALLEL_MAKE="V=1"
+
+require linphone-common_git.inc
diff --git a/build/openembedded/linphone_+local-nogtk-gsm-video-x11.bb b/build/openembedded/linphone_+local-nogtk-gsm-video-x11.bb
new file mode 100644
index 000000000..427eb94bc
--- /dev/null
+++ b/build/openembedded/linphone_+local-nogtk-gsm-video-x11.bb
@@ -0,0 +1,16 @@
+## THIS unusable work in progress ##
+
+DESCRIPTION = "Audio/video SIP-based IP phone (console edition)"
+HOMEPAGE = "http://www.linphone.org/?lang=us"
+LICENSE = "GPLv2"
+PR="r9"
+
+DEFAULT_PREFERENCE = "-1"
+OVERRIDES_append = ":console"
+OVERRIDES_append = ":gsm"
+OVERRIDES_append = ":video"
+OVERRIDES_append = ":x11"
+
+#PARALLEL_MAKE="V=1"
+
+require linphone-common_local.inc