Merge remote branch 'origin/org.openembedded.dev' into martin_jansa/xorg-7.5

Conflicts:
	conf/distro/include/angstrom-2008-preferred-versions.inc
	conf/distro/include/preferred-xorg-versions-X11R7.5.inc
	recipes/xorg-driver/xf86-input-evdev_2.3.0.bb
	recipes/xorg-font/encodings_1.0.3.bb
	recipes/xorg-font/font-adobe-100dpi_1.0.1.bb
	recipes/xorg-font/font-adobe-75dpi_1.0.1.bb
	recipes/xorg-font/font-adobe-utopia-100dpi_1.0.2.bb
	recipes/xorg-font/font-adobe-utopia-75dpi_1.0.2.bb
	recipes/xorg-font/font-adobe-utopia-type1_1.0.2.bb
	recipes/xorg-font/font-alias_1.0.2.bb
	recipes/xorg-font/font-arabic-misc_1.0.1.bb
	recipes/xorg-font/font-bh-100dpi_1.0.1.bb
	recipes/xorg-font/font-bh-75dpi_1.0.1.bb
	recipes/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.1.bb
	recipes/xorg-font/font-bh-lucidatypewriter-75dpi_1.0.1.bb
	recipes/xorg-font/font-bh-ttf_1.0.1.bb
	recipes/xorg-font/font-bh-type1_1.0.1.bb
	recipes/xorg-font/font-bitstream-100dpi_1.0.1.bb
	recipes/xorg-font/font-bitstream-75dpi_1.0.1.bb
	recipes/xorg-font/font-bitstream-speedo_1.0.1.bb
	recipes/xorg-font/font-bitstream-type1_1.0.1.bb
	recipes/xorg-font/font-cronyx-cyrillic_1.0.1.bb
	recipes/xorg-font/font-cursor-misc_1.0.1.bb
	recipes/xorg-font/font-daewoo-misc_1.0.1.bb
	recipes/xorg-font/font-dec-misc_1.0.1.bb
	recipes/xorg-font/font-ibm-type1_1.0.1.bb
	recipes/xorg-font/font-isas-misc_1.0.1.bb
	recipes/xorg-font/font-jis-misc_1.0.1.bb
	recipes/xorg-font/font-micro-misc_1.0.1.bb
	recipes/xorg-font/font-misc-cyrillic_1.0.1.bb
	recipes/xorg-font/font-misc-ethiopic_1.0.1.bb
	recipes/xorg-font/font-misc-meltho_1.0.1.bb
	recipes/xorg-font/font-mutt-misc_1.0.1.bb
	recipes/xorg-font/font-schumacher-misc_1.1.0.bb
	recipes/xorg-font/font-screen-cyrillic_1.0.2.bb
	recipes/xorg-font/font-sony-misc_1.0.1.bb
	recipes/xorg-font/font-sun-misc_1.0.1.bb
	recipes/xorg-font/font-util-native_1.1.1.bb
	recipes/xorg-font/font-util_1.1.1.bb
	recipes/xorg-font/font-winitzki-cyrillic_1.0.1.bb
	recipes/xorg-font/font-xfree86-type1_1.0.2.bb
	recipes/xorg-font/xorg-font-common.inc

6 files changed, 79 insertions, 6 deletions

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/fltk/fltkclock_svn.bb b/recipes/fltk/fltkclock_svn.bb
new file mode 100644
index 0000000000..bf7807425f
--- /dev/null
+++ b/recipes/fltk/fltkclock_svn.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "FLTK Worldclock Application"
+HOMEPAGE = "http://www.crash-override.net/omworldclock.html"
+AUTHOR = "Benjamin 'blindcoder' Schieder'
+LICENSE = "PD/GPLv2"
+SECTION = "x11/tool"
+DEPENDS = "fltk"
+SRCREV = "45"
+PV = "1.0+svnr${SRCPV}"
+PR = "r0"
+S = "${WORKDIR}/trunk"
+
+inherit autotools
+
+SRC_URI = "svn://scavenger.homeip.net/svn/fltkworldclock;module=trunk;proto=http"
diff --git a/recipes/fltk/fltkcocktailbar_svn.bb b/recipes/fltk/fltkcocktailbar_svn.bb
new file mode 100644
index 0000000000..bd74e99df0
--- /dev/null
+++ b/recipes/fltk/fltkcocktailbar_svn.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "FLTK Cocktail Bar Application"
+HOMEPAGE = "http://www.crash-override.net/omcocktailbar.html"
+AUTHOR = "Benjamin 'blindcoder' Schieder'
+LICENSE = "GPLv2"
+SECTION = "x11/tool"
+DEPENDS = "fltk zlib cairo"
+RDEPENDS = "curl"
+SRCREV = "52"
+PV = "1.0+svnr${SRCPV}"
+PR = "r0"
+S = "${WORKDIR}/trunk"
+
+inherit autotools
+
+SRC_URI = "svn://scavenger.homeip.net/svn/fltkcocktailbar;module=trunk;proto=http"
diff --git a/recipes/fltk/fltkcurrency_svn.bb b/recipes/fltk/fltkcurrency_svn.bb
new file mode 100644
index 0000000000..f0bd1ad087
--- /dev/null
+++ b/recipes/fltk/fltkcurrency_svn.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "FLTK Currency Converter"
+HOMEPAGE = ""
+AUTHOR = "Benjamin 'blindcoder' Schieder'
+LICENSE = "GPLv2"
+SECTION = "other/tool"
+DEPENDS = "fltk"
+RDEPENDS = "curl"
+SRCREV = "10"
+PV = "1.0+svnr${SRCPV}"
+PR = "r0"
+S = "${WORKDIR}/trunk"
+RDEPENDS = "bash wget"
+
+inherit autotools
+
+SRC_URI = "svn://scavenger.homeip.net/svn/fltkcurrency;module=trunk;proto=http"
diff --git a/recipes/fltk/fltkhackdiet_svn.bb b/recipes/fltk/fltkhackdiet_svn.bb
new file mode 100644
index 0000000000..7ff81bcb3d
--- /dev/null
+++ b/recipes/fltk/fltkhackdiet_svn.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "FLTK Hacker's Diet Application"
+HOMEPAGE = "http://www.crash-override.net/omhackersdiet.html"
+AUTHOR = "Benjamin 'blindcoder' Schieder'
+LICENSE = "GPLv2"
+SECTION = "x11/tool"
+DEPENDS = "fltk"
+RDEPENDS = "curl"
+SRCREV = "67"
+PV = "1.0+svnr${SRCPV}"
+PR = "r0"
+S = "${WORKDIR}/trunk"
+
+inherit autotools
+
+SRC_URI = "svn://scavenger.homeip.net/svn/fltkhackdiet;module=trunk;proto=http"
diff --git a/recipes/fltk/fltkwwpointcal_svn.bb b/recipes/fltk/fltkwwpointcal_svn.bb
new file mode 100644
index 0000000000..9ad34d2f29
--- /dev/null
+++ b/recipes/fltk/fltkwwpointcal_svn.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "FLTK Weight Watchers Points Calculator"
+HOMEPAGE = "http://www.crash-override.net/omwwpointcal.html"
+AUTHOR = "Benjamin 'blindcoder' Schieder'
+LICENSE = "GPLv2"
+SECTION = "x11/tool"
+DEPENDS = "fltk"
+SRCREV = "2"
+PV = "1.0+svnr${SRCPV}"
+PR = "r0"
+S = "${WORKDIR}/trunk"
+
+inherit autotools
+
+SRC_URI = "svn://scavenger.homeip.net/svn/fltkwwpointcal;module=trunk;proto=http"