apply randr/render cleanup patch from Glenn McGrath

BKrev: 40d42d3eUecPVQUtQYT2kyLoI5y21g

diff --git a/libgpewidget/libgpewidget_0.79.oe b/libgpewidget/libgpewidget_0.79.oe
index e458b2c..c9b3ece 100644 (file)
--- a/libgpewidget/libgpewidget_0.79.oe
+++ b/libgpewidget/libgpewidget_0.79.oe
@@ -3,7 +3,7 @@ DESCRIPTION = "libgpewidget contains a collection of widgets and other common co
 SECTION = "gpe/libs"
 PRIORITY = "optional"
 MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "gtk+ cairo xrender"
+DEPENDS = "gtk+ cairo libxrender"
 
 inherit pkgconfig gpe
 

diff --git a/libgpewidget/libgpewidget_0.80.oe b/libgpewidget/libgpewidget_0.80.oe
index e69de29..653bf40 100644 (file)
--- a/libgpewidget/libgpewidget_0.80.oe
+++ b/libgpewidget/libgpewidget_0.80.oe
@@ -0,0 +1,21 @@
+PR = "r1"
+DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+DEPENDS = "gtk+ cairo libxrender"
+
+inherit pkgconfig gpe
+
+SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz"
+
+headers = "init.h render.h errorbox.h smallbox.h pixmaps.h gpetimesel.h gtkdatecombo.h dirbrowser.h stylus.h picturebutton.h popup_menu.h spacing.h translabel.h question.h windows.h gpe-iconlist.h gtksimplemenu.h gpewindowlist.h tray.h popup.h gpeiconlistview.h"
+
+do_stage () {
+       oe_libinstall -so libgpewidget ${STAGING_LIBDIR}
+
+       mkdir -p ${STAGING_INCDIR}/gpe
+       for h in ${headers}; do
+               install -m 0644 ${S}/gpe/$h ${STAGING_INCDIR}/gpe/$h
+       done
+}

diff --git a/libgpewidget/libgpewidget_0.82.oe b/libgpewidget/libgpewidget_0.82.oe
index 71b9df0..b69a2ce 100644 (file)
--- a/libgpewidget/libgpewidget_0.82.oe
+++ b/libgpewidget/libgpewidget_0.82.oe
@@ -3,7 +3,7 @@ DESCRIPTION = "libgpewidget contains a collection of widgets and other common co
 SECTION = "gpe/libs"
 PRIORITY = "optional"
 MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "gtk+ cairo xrender"
+DEPENDS = "gtk+ cairo libxrender"
 
 inherit pkgconfig gpe
 

diff --git a/libgpewidget/libgpewidget_0.83.oe b/libgpewidget/libgpewidget_0.83.oe
index c78aba1..0a669cc 100644 (file)
--- a/libgpewidget/libgpewidget_0.83.oe
+++ b/libgpewidget/libgpewidget_0.83.oe
@@ -3,7 +3,7 @@ DESCRIPTION = "libgpewidget contains a collection of widgets and other common co
 SECTION = "gpe/libs"
 PRIORITY = "optional"
 MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "gtk+ cairo xrender"
+DEPENDS = "gtk+ cairo libxrender"
 
 inherit pkgconfig gpe
 

diff --git a/libxrender/libxrender_cvs.oe b/libxrender/libxrender_cvs.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/matchbox-wm/matchbox-wm_0.8.1.oe b/matchbox-wm/matchbox-wm_0.8.1.oe
index 3d3909e..ebcfd5a 100644 (file)
--- a/matchbox-wm/matchbox-wm_0.8.1.oe
+++ b/matchbox-wm/matchbox-wm_0.8.1.oe
@@ -1,6 +1,6 @@
 DESCRIPTION = "Matchbox window manager"
 LICENSE = "GPL"
-DEPENDS = "libmatchbox x11 xext xcomposite xfixes xdamage xrender startup-notification expat gconf"
+DEPENDS = "libmatchbox x11 xext xcomposite xfixes xdamage libxrender startup-notification expat gconf"
 
 SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-window-manager/0.8/matchbox-window-manager-${PV}.tar.bz2 \
           file://m4.patch;patch=1"

diff --git a/matchbox-wm/matchbox-wm_0.8.2.oe b/matchbox-wm/matchbox-wm_0.8.2.oe
index 73120aa..0d21590 100644 (file)
--- a/matchbox-wm/matchbox-wm_0.8.2.oe
+++ b/matchbox-wm/matchbox-wm_0.8.2.oe
@@ -1,7 +1,7 @@
 PR = "r1"
 DESCRIPTION = "Matchbox window manager"
 LICENSE = "GPL"
-DEPENDS = "libmatchbox x11 xext xcomposite xfixes xdamage xrender startup-notification expat gconf"
+DEPENDS = "libmatchbox x11 xext xcomposite xfixes xdamage libxrender startup-notification expat gconf"
 
 SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-window-manager/0.8/matchbox-window-manager-${PV}.tar.bz2 \
        file://net-showing-desktop.patch;patch=1"

diff --git a/matchbox-wm/matchbox-wm_0.8.oe b/matchbox-wm/matchbox-wm_0.8.oe
index 2d8cd6f..c1f6a31 100644 (file)
--- a/matchbox-wm/matchbox-wm_0.8.oe
+++ b/matchbox-wm/matchbox-wm_0.8.oe
@@ -1,6 +1,6 @@
 DESCRIPTION = "Matchbox window manager"
 LICENSE = "GPL"
-DEPENDS = "libmatchbox x11 xext xcomposite xfixes xdamage xrender gconf"
+DEPENDS = "libmatchbox x11 xext xcomposite xfixes xdamage libxrender gconf"
 RDEPENDS = "libmatchbox"
 
 SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-window-manager/${PV}/matchbox-window-manager-${PV}.tar.bz2 \

diff --git a/randr/randr_cvs.oe b/randr/randr_cvs.oe
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/randrext/randrext_cvs.oe b/randrext/randrext_cvs.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/render/render_cvs.oe b/render/render_cvs.oe
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/renderext/renderext_cvs.oe b/renderext/renderext_cvs.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/rosetta/rosetta_cvs.oe b/rosetta/rosetta_cvs.oe
index e69de29..0147072 100644 (file)
--- a/rosetta/rosetta_cvs.oe
+++ b/rosetta/rosetta_cvs.oe
@@ -0,0 +1,16 @@
+PV = "0.0cvs${CVSDATE}"
+DEPENDS = "gtk+ libgpewidget x11 libxrandr xft xinerama xtst xext xau"
+DESCRIPTION = "Multistroke / full word handwriting recognition for X"
+
+SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=rosetta \
+       file://rosetta-makefile.patch;patch=1"
+S = "${WORKDIR}/rosetta"
+
+inherit pkgconfig
+
+FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps ${datadir}/applications ${datadir}/rosetta"
+
+do_install () {
+        oe_runmake PREFIX=${prefix} DESTDIR=${D} install-program
+}
+

diff --git a/xcompmgr/xcompmgr_cvs.oe b/xcompmgr/xcompmgr_cvs.oe
index e69de29..d5f94fe 100644 (file)
--- a/xcompmgr/xcompmgr_cvs.oe
+++ b/xcompmgr/xcompmgr_cvs.oe
@@ -0,0 +1,11 @@
+PV = "0.0cvs${CVSDATE}"
+SECTION = "x11"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+DEPENDS = "x11 xdamage xcomposite libxrender"
+DESCRIPTION = "X Compositing Manager"
+
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xapps;module=xcompmgr"
+S = "${WORKDIR}/xcompmgr"
+
+inherit autotools 

diff --git a/xrandr/xrandr_cvs.oe b/xrandr/xrandr_cvs.oe
index e69de29..9277cc5 100644 (file)
--- a/xrandr/xrandr_cvs.oe
+++ b/xrandr/xrandr_cvs.oe
@@ -0,0 +1,8 @@
+PV = "0.0cvs${CVSDATE}"
+DEPENDS = "libxrandr x11 xext"
+DESCRIPTION = "X Resize and Rotate extension command."
+
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xapps;module=xrandr"
+S = "${WORKDIR}/xrandr"
+
+inherit autotools pkgconfig 

diff --git a/xrender/xrender_cvs.oe b/xrender/xrender_cvs.oe
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/xserver/xserver-kdrive_cvs.oe b/xserver/xserver-kdrive_cvs.oe
index 022bd03..ab9249a 100644 (file)
--- a/xserver/xserver-kdrive_cvs.oe
+++ b/xserver/xserver-kdrive_cvs.oe
@@ -1,5 +1,5 @@
 PV = "0.0cvs${CVSDATE}"
-DEPENDS = "tslib xproto xdmcp xextensions xtrans xau x11 xext randr render xrender libxrandr fixesext damageext xfont resourceext compositeext xcalibrateext"
+DEPENDS = "tslib xproto xdmcp xextensions xtrans xau x11 xext libxrandr fixesext damageext xfont resourceext compositeext xcalibrateext"
 PROVIDES = "virtual/xserver"
 PACKAGES = "xserver-kdrive-fbdev xserver-kdrive-ati ${PN}-doc ${PN}-dev ${PN}-locale"
 DESCRIPTION = "X server from freedesktop.org"

diff --git a/xserver/xserver-xorg_cvs.oe b/xserver/xserver-xorg_cvs.oe
index def9578..e65419f 100644 (file)
--- a/xserver/xserver-xorg_cvs.oe
+++ b/xserver/xserver-xorg_cvs.oe
@@ -1,5 +1,5 @@
 PV = "0.0cvs${CVSDATE}"
-DEPENDS = "tslib xproto xdmcp xextensions xtrans xau x11 xext randr render xrender libxrandr fixesext damageext xfont resourceext compositeext"
+DEPENDS = "tslib xproto xdmcp xextensions xtrans xau x11 xext libxrandr fixesext damageext xfont resourceext compositeext"
 PROVIDES = "virtual/xserver"
 DESCRIPTION = "X server from freedesktop.org"