add xft and correct misc. dependencies for recent x builds. X experts, please have...

BKrev: 40fce5e4IxZ9FAU4FaKttWqjaN0sAw

diff --git a/meta/meta-gpe.oe b/meta/meta-gpe.oe
index 7526664..4e80a5e 100644 (file)
--- a/meta/meta-gpe.oe
+++ b/meta/meta-gpe.oe
@@ -21,7 +21,7 @@ gpe-base = "\
     libgtkstylus \
     xst"
 
-RDEPENDS_gpe-task-base := "${gpe-base} libfontconfig-utils"
+RDEPENDS_gpe-task-base := "${gpe-base} fontconfig-utils"
 DEPENDS += " ${gpe-base}"
 
 gpe-task-pim = "\

diff --git a/xft/xft_cvs.oe b/xft/xft_cvs.oe
new file mode 100644 (file)
index 0000000..5ac2843
--- /dev/null
+++ b/xft/xft_cvs.oe
@@ -0,0 +1,19 @@
+PV = "0.0cvs${CVSDATE}"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "fontconfig freetype libxrender"
+DESCRIPTION = "X freetype libary (used by the X server)."
+
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xft"
+S = "${WORKDIR}/Xft"
+
+inherit autotools pkgconfig 
+
+do_stage() {
+       oe_runmake install prefix=${STAGING_DIR} \
+              bindir=${STAGING_BINDIR} \
+              includedir=${STAGING_INCDIR} \
+              libdir=${STAGING_LIBDIR} \
+              datadir=${STAGING_DATADIR} \
+              mandir=${STAGING_DATADIR}/man
+}

diff --git a/xstroke/xstroke_0.6.oe b/xstroke/xstroke_0.6.oe
index 999346a..8ceb6a4 100644 (file)
--- a/xstroke/xstroke_0.6.oe
+++ b/xstroke/xstroke_0.6.oe
@@ -1,7 +1,7 @@
 SECTION = "x11"
 PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-DEPENDS = "x11"
+DEPENDS = "x11 xft xtst"
 DESCRIPTION = "Gesture recognition input method for X11"
 
 SRC_URI = "http://xstroke.org/releases/xstroke-0.6.tar.gz"

diff --git a/xstroke/xstroke_cvs.oe b/xstroke/xstroke_cvs.oe
index e69de29..21fc3e6 100644 (file)
--- a/xstroke/xstroke_cvs.oe
+++ b/xstroke/xstroke_cvs.oe
@@ -0,0 +1,11 @@
+PV = "0.0cvs${CVSDATE}"
+SECTION = "x11"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "x11 xft xtst"
+DESCRIPTION = "Gesture recognition input method for X11"
+
+SRC_URI = "cvs://anoncvs:anoncvs@xstroke.org/cvs/xstroke;module=xstroke"
+S = "${WORKDIR}/xstroke"
+
+inherit autotools pkgconfig 

diff --git a/xtst/xtst_cvs.oe b/xtst/xtst_cvs.oe
index e69de29..bf51de5 100644 (file)
--- a/xtst/xtst_cvs.oe
+++ b/xtst/xtst_cvs.oe
@@ -0,0 +1,20 @@
+PV = "0.0cvs${CVSDATE}"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "x11 recordext xext"
+DESCRIPTION = "X Test Extension: client side library"
+
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xtst \
+           file://no-xrecord.patch;patch=1;pnum=0"
+S = "${WORKDIR}/Xtst"
+
+inherit autotools pkgconfig 
+
+do_stage() {
+       oe_runmake install prefix=${STAGING_DIR} \
+              bindir=${STAGING_BINDIR} \
+              includedir=${STAGING_INCDIR} \
+              libdir=${STAGING_LIBDIR} \
+              datadir=${STAGING_DATADIR}
+}