Merge remote branch 'origin/martin_jansa/srcpv' into shr/merge

Conflicts:
	recipes/webkit/webkit-efl_git.bb

10 files changed, 85 insertions, 78 deletions

diff --git a/classes/chicken.bbclass b/classes/chicken.bbclass
new file mode 100644
index 0000000000..5ebe1ff462
--- /dev/null
+++ b/classes/chicken.bbclass
@@ -0,0 +1,11 @@
+def chicken_arch(bb, d):
+    import re
+    arch_pattern = re.compile('^i.*86$')
+    target_arch = d.getVar("TARGET_ARCH", 1)
+    if arch_pattern.match(target_arch):
+        return 'x86'
+    else:
+        return target_arch
+
+CHICKEN_ARCH = "${@chicken_arch(bb, d)}"
+    
diff --git a/docs/usermanual/.gitignore b/docs/usermanual/.gitignore
index 6532057c27..67201710ad 100644
--- a/docs/usermanual/.gitignore
+++ b/docs/usermanual/.gitignore
@@ -2,3 +2,5 @@
 html/
 xhtml/
 *.sw?
+html-nochunks/
+*.ps
diff --git a/docs/usermanual/Makefile b/docs/usermanual/Makefile
index 75fdd9ebc7..36ea5e20a7 100644
--- a/docs/usermanual/Makefile
+++ b/docs/usermanual/Makefile
@@ -1,4 +1,4 @@
-# XSL sytlesheets downloaded from http://docbook.sourceforge.net/release/xsl/current/html/
+# XSL stylesheets downloaded from http://docbook.sourceforge.net/release/xsl/current/html/
 
 topdir = .
 manual = $(topdir)/usermanual.xml
diff --git a/recipes/chicken/chicken-cross_4.2.0.bb b/recipes/chicken/chicken-cross_4.2.0.bb
new file mode 100644
index 0000000000..14b929bac9
--- /dev/null
+++ b/recipes/chicken/chicken-cross_4.2.0.bb
@@ -0,0 +1,28 @@
+require chicken.inc
+
+DEPENDS = "gcc-cross-sdk chicken"
+RDEPENDS = "gcc-cross-sdk chicken"
+PR = "${INC_PR}.1"
+
+inherit cross
+
+do_compile() {
+    make PLATFORM="linux" PREFIX="${prefix}" TARGET_PREFIX="${STAGING_DIR}/${TARGET_SYS}/usr" TARGET_RUN_PREFIX="${layout_prefix}" TARGETSYSTEM="${TARGET_SYS}" C_COMPILER=gcc LIBRARIAN=ar
+}
+
+do_install() {
+    make PLATFORM="linux" PREFIX="${prefix}" TARGET_PREFIX="${STAGING_DIR}/${TARGET_SYS}/usr" TARGET_RUN_PREFIX="${layout_prefix}" TARGETSYSTEM="${TARGET_SYS}" C_COMPILER=gcc LIBRARIAN=ar install
+}
+
+do_stage() {
+    make PLATFORM="linux" PREFIX="${prefix}" TARGET_PREFIX="${STAGING_DIR}/${TARGET_SYS}/usr" TARGET_RUN_PREFIX="${layout_prefix}" TARGETSYSTEM="${TARGET_SYS}" C_COMPILER=gcc LIBRARIAN=ar install
+}
+
+PACKAGES += "chicken-bin libchicken libuchicken"
+
+FILES_${PN} = ""
+FILES_libchicken = "${libdir}/libchicken.so.*"
+FILES_libuchicken = "${libdir}/libuchicken.so.*"
+FILES_${PN}-bin = "${bindir}/* ${datadir}/chicken/*.* ${libdir}/chicken/*/*.so"
+FILES_${PN}-doc += "${datadir}/chicken/doc"
+FILES_${PN}-dbg += "${libdir}/chicken/*/.debug"
diff --git a/recipes/chicken/chicken-native_4.2.0.bb b/recipes/chicken/chicken-native_4.2.0.bb
deleted file mode 100644
index b3f5dfdaf5..0000000000
--- a/recipes/chicken/chicken-native_4.2.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require chicken_${PV}.bb
-
-DEPENDS = "gcc-native"
-RDEPENDS = "gcc-native"
-
-inherit native
-
diff --git a/recipes/chicken/chicken.inc b/recipes/chicken/chicken.inc
index 9aebc4f5d5..477a8a8c05 100644
--- a/recipes/chicken/chicken.inc
+++ b/recipes/chicken/chicken.inc
@@ -5,60 +5,10 @@ PRIORITY = "optional"
 LICENSE = "BSD"
 INC_PR = "r2"
 
-SRC_URI = "http://chicken.wiki.br/releases/${PV}/chicken-${PV}.tar.gz"
+SRC_URI = "http://chicken.wiki.br/releases/${PV}/chicken-${PV}.tar.gz \
+           file://soname.patch;patch=1"
 
 # Parallel building is not supported
 PARALLEL_MAKE = ""
 
-# Required environment values
-export PLATFORM="linux"
-export PREFIX="${prefix}"
-export HOSTSYSTEM="${HOST_SYS}"
-export TARGETSYSTEM="${TARGET_SYS}"
-export INSTALL_PROGRAM_SHARED_LIBRARY_OPTIONS="-m 755"
-export INSTALL_PROGRAM_STATIC_LIBRARY_OPTIONS="-m 644"
-export INSTALL_PROGRAM_EXECUTABLE_OPTIONS="-m 755"
-export INSTALL_PROGRAM_FILE_OPTIONS="-m 644"
-
-do_compile() {
-	case ${TARGET_ARCH} in
-	i*86)
-		ARCH=x86
-		;;
-	x86_64)
-		ARCH=x86-64
-		;;
-	*)
-		echo "Check ARCH value for ${TARGET_ARCH}"
-		exit 1
-		;;
-	esac
-
-    make ARCH=${ARCH} TARGET_C_COMPILER=gcc
-}
-
-do_install() {
-	case ${TARGET_ARCH} in
-	i*86)
-		ARCH=x86
-		;;
-	x86_64)
-		ARCH=x86-64
-		;;
-	*)
-		echo "Check ARCH value for ${TARGET_ARCH}"
-		exit 1
-		;;
-	esac
-
-    make ARCH=${ARCH} DESTDIR=${D} install
-}
-
-PACKAGES += "chicken-bin libchicken libuchicken"
-
-FILES_${PN} = ""
-FILES_libchicken = "${libdir}/libchicken.so.*"
-FILES_libuchicken = "${libdir}/libuchicken.so.*"
-FILES_${PN}-bin = "${bindir}/* ${datadir}/chicken/*.* ${libdir}/chicken/*/*.so"
-FILES_${PN}-doc += "${datadir}/chicken/doc"
-FILES_${PN}-dbg += "${libdir}/chicken/*/.debug"
+inherit chicken
diff --git a/recipes/chicken/chicken_4.2.0.bb b/recipes/chicken/chicken_4.2.0.bb
index 473c7ad817..35a4b8b046 100644
--- a/recipes/chicken/chicken_4.2.0.bb
+++ b/recipes/chicken/chicken_4.2.0.bb
@@ -1,5 +1,26 @@
 require chicken.inc
 
-SRC_URI += "file://soname.patch;patch=1"
-
+DEPENDS = "gcc-cross-sdk"
+RDEPENDS = "gcc-cross-sdk"
 PR = "${INC_PR}.1"
+
+do_compile() {
+    make PLATFORM="linux" PREFIX="${STAGING_DIR}/${TARGET_SYS}${layout_prefix}" HOSTSYSTEM="${TARGET_SYS}" ARCH=${CHICKEN_ARCH}
+}
+
+do_install() {
+    make PLATFORM="linux" PREFIX="${STAGING_DIR}/${TARGET_SYS}${layout_prefix}" HOSTSYSTEM="${TARGET_SYS}" ARCH=${CHICKEN_ARCH} install
+}
+
+do_stage() {
+    make PLATFORM="linux" PREFIX="${STAGING_DIR}/${TARGET_SYS}${layout_prefix}" HOSTSYSTEM="${TARGET_SYS}" ARCH=${CHICKEN_ARCH} install
+}
+
+PACKAGES += "chicken-bin libchicken libuchicken"
+
+FILES_${PN} = ""
+FILES_libchicken = "${libdir}/libchicken.so.*"
+FILES_libuchicken = "${libdir}/libuchicken.so.*"
+FILES_${PN}-bin = "${bindir}/* ${datadir}/chicken/*.* ${libdir}/chicken/*/*.so"
+FILES_${PN}-doc += "${datadir}/chicken/doc"
+FILES_${PN}-dbg += "${libdir}/chicken/*/.debug"
diff --git a/recipes/ffalarms/atd-over-fso_0.70.bb b/recipes/ffalarms/atd-over-fso_0.70.bb
index b042a0356a..b92169ea69 100644
--- a/recipes/ffalarms/atd-over-fso_0.70.bb
+++ b/recipes/ffalarms/atd-over-fso_0.70.bb
@@ -4,10 +4,16 @@ LICENSE = "GPLV2"
 RCONFLICTS_${PN} = "at atd"
 RREPLACES_${PN} = "at atd"
 RPROVIDES_${PN} = "atd"
+RCONFLICTS_${PN}-dbg = "at-dbg atd-dbg"
+RREPLACES_${PN}-dbg = "at-dbg atd-dbg"
+RPROVIDES_${PN}-dbg = "atd-dbg"
+RCONFLICTS_${PN}-dev = "at-dev atd-dev"
+RREPLACES_${PN}-dev = "at-dev atd-dev"
+RPROVIDES_${PN}-dev = "atd-dev"
 DEPENDS = "dbus-glib pkgconfig"
 RDEPENDS += "dbus dbus-glib frameworkd"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};module=apps/atd;tag=ATD-0_70 \
 			file://atd-startup.patch;patch=1;pnum=0 \
diff --git a/recipes/fltk/fltk2_svn.bb b/recipes/fltk/fltk2_svn.bb
index 0dddfa3e2f..d34af94654 100644
--- a/recipes/fltk/fltk2_svn.bb
+++ b/recipes/fltk/fltk2_svn.bb
@@ -3,16 +3,15 @@ HOMEPAGE = "http://www.fltk.org"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
-DEPENDS = "zlib jpeg libpng libxext libxft"
+DEPENDS = "zlib jpeg libpng libxext libxft xinput"
 
-SVNREL = "6671"
-PV = "1.9.9+svnr${SVNREL}"
+PV = "1.9.9+svnr${SRCPV}"
 
 SRC_URI = "\
-  http://ftp.easysw.com/pub/fltk/snapshots/fltk-2.0.x-r6671.tar.bz2 \
+  svn://svn.easysw.com/public/fltk/fltk;proto=http;module=trunk \
   file://fix-it-damnit.patch;patch=1 \
 "
-S = "${WORKDIR}/fltk-2.0.x-r6671"
+S = "${WORKDIR}/trunk"
 
 inherit autotools_stage binconfig
 
@@ -26,7 +25,7 @@ EXTRA_OECONF = "\
 "
 
 do_configure() {
-	gnu-configize
+	autoconf
 	oe_runconf
 }
 
diff --git a/recipes/libnl/libnl2_git.bb b/recipes/libnl/libnl2_git.bb
index 367d6a2c9e..f98a075049 100644
--- a/recipes/libnl/libnl2_git.bb
+++ b/recipes/libnl/libnl2_git.bb
@@ -4,21 +4,18 @@ LICENSE = "LGPL"
 HOMEPAGE = "http://people.suug.ch/~tgr/libnl"
 PV = "1.0+gitr${SRCPV}"
 PE = "1"
-PR = "r0"
+PR = "r1"
 
-inherit autotools pkgconfig
+inherit autotools
 
 #CFLAGS += '-DVLAN_FLAG_REORDER_HDR=1'
 
+includedir = ${prefix}/include/libnl2
+
 SRC_URI = "git://git.kernel.org/pub/scm/libs/netlink/libnl.git;protocol=git"
 S = "${WORKDIR}/git"
 
-do_stage () {
-	autotools_stage_all prefix=${prefix}
-}
-
 PACKAGES =+ "${PN}-route ${PN}-nf ${PN}-genl"
 FILES_${PN}-route = "${libdir}/libnl-route.so.*"
-FILES_${PN}-nf    = "${libdir}/libnl-nfd.so.*"
+FILES_${PN}-nf    = "${libdir}/libnl-nf.so.*"
 FILES_${PN}-genl  = "${libdir}/libnl-genl.so.*"
-