From f127c9d4b13de45482941d824d9895b4b66eb1a8 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Mon, 13 Aug 2012 18:19:53 +0200
Subject: [PATCH] update README and files to work with lastest angstrom and
 bitbake

---
 build/openembedded/README              | 15 ++++++---------
 build/openembedded/conf/layer.conf     |  9 +++++++++
 build/openembedded/linphone-common.inc |  2 +-
 build/openembedded/speex_git.bb        |  2 +-
 4 files changed, 17 insertions(+), 11 deletions(-)
 create mode 100644 build/openembedded/conf/layer.conf

diff --git a/build/openembedded/README b/build/openembedded/README
index b8e895451..347ae761e 100644
--- a/build/openembedded/README
+++ b/build/openembedded/README
@@ -12,15 +12,12 @@ Instructions for compilation from sources: (requires 10 Go of free space)
   For example, to build Angstrom follow the guide at http://www.angstrom-distribution.org/building-angstrom
   For IGEPv2 use environment variable MACHINE=igep0020
 
-- Add recipes to the pool with an higher priority).
-  See http://bitbake.berlios.de/manual/ch04s02.html#id870544 Example 4.8. Using “bbfile collections”
-  Example:
-  BBFILES = "/Data/work/angstrom/angstrom-setup-scripts/sources/openembedded/recipes/*/*.bb /home/guillaume/dev/linphone-daemon/build/openembedded/*.bb"
-  BBFILE_COLLECTIONS = "upstream local"
-  BBFILE_PATTERN_upstream = "^/Data/"
-  BBFILE_PATTERN_local = "^/home/"
-  BBFILE_PRIORITY_upstream = "5"
-  BBFILE_PRIORITY_local = "10"
+- Add linphone recipes to the pool with an higher priority:
+  Edit conf/bblayers.conf to set EXTRA_LAYERS to the source repository of linphone:
+     # Add your overlay location to EXTRALAYERS
+     # Make sure to have a conf/layers.conf in there
+     EXTRALAYERS ?= "/home/smorlat/sources/git/linphone-daemon/build/openembedded"
+
 
 - Prepare compilation
   Source appropriate environment with "~/.oe/enviro*"  
diff --git a/build/openembedded/conf/layer.conf b/build/openembedded/conf/layer.conf
new file mode 100644
index 000000000..ababd17e0
--- /dev/null
+++ b/build/openembedded/conf/layer.conf
@@ -0,0 +1,9 @@
+# We have a conf and classes directory, append to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have a recipes directory, add to BBFILES
+BBFILES += "${LAYERDIR}/*.bb "
+
+BBFILE_COLLECTIONS += "linphone-layer"
+BBFILE_PATTERN_linphone-layer := "^${LAYERDIR}/"
+BBFILE_PRIORITY_linphone-layer = "50"
diff --git a/build/openembedded/linphone-common.inc b/build/openembedded/linphone-common.inc
index ac794a325..dada4c92e 100644
--- a/build/openembedded/linphone-common.inc
+++ b/build/openembedded/linphone-common.inc
@@ -23,7 +23,7 @@ PROVIDES_gtk = "linphone linphonec liblinphone libmediastreamer libortp"
 
 inherit autotools pkgconfig gettext
 
-export PKG_CONFIG=${STAGING_BINDIR_NATIVE}/pkg-config
+#export PKG_CONFIG=${STAGING_BINDIR_NATIVE}/pkg-config
 
 LINPHONE_OE_ENABLE_TESTS = "--disable-tests"
 LINPHONE_OE_ENABLE_VIDEO = "--disable-video"
diff --git a/build/openembedded/speex_git.bb b/build/openembedded/speex_git.bb
index b61a2eed1..3ecc83123 100644
--- a/build/openembedded/speex_git.bb
+++ b/build/openembedded/speex_git.bb
@@ -7,8 +7,8 @@ PV = "1.1+git"
 PR = "r3"
 SPEEX_TMP_DIR="${HOME}/SPEEX_TMP"
 SRC_URI = "file://${SPEEX_TMP_DIR}/speex.tar.gz"
-
 S = "${WORKDIR}/speex"
+LIC_FILES_CHKSUM = "file://COPYING;md5=314649d8ba9dd7045dfb6683f298d0a8"
 
 PARALLEL_MAKE = ""