From cfe12efb5ec9586dab6961f141d52b103bd8b1d1 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Mon, 22 Nov 2010 13:57:13 +0000 Subject: Meta: Recipe Reogranization This is the next stage of recipe reorganization, in this stage many recipes where moved to a new meta-demoapps layer since this is more appropriate for demo usage then the core. Additional some recipes were moved to meta-extras to indicate they may be depercated at a future time. A number of recipes were modified since dependencies need to be corrected. Signed-off-by: Saul Wold --- meta/recipes-graphics/xorg-app/xbacklight_1.1.bb | 4 -- meta/recipes-graphics/xorg-app/xev/diet-x11.patch | 80 ---------------------- meta/recipes-graphics/xorg-app/xev_1.0.3.bb | 7 -- meta/recipes-graphics/xorg-app/xeyes_1.0.1.bb | 4 -- meta/recipes-graphics/xorg-app/xrdb/60XDefaults.sh | 3 - meta/recipes-graphics/xorg-app/xrdb_1.0.5.bb | 14 ---- 6 files changed, 112 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-app/xbacklight_1.1.bb delete mode 100644 meta/recipes-graphics/xorg-app/xev/diet-x11.patch delete mode 100644 meta/recipes-graphics/xorg-app/xev_1.0.3.bb delete mode 100644 meta/recipes-graphics/xorg-app/xeyes_1.0.1.bb delete mode 100644 meta/recipes-graphics/xorg-app/xrdb/60XDefaults.sh delete mode 100644 meta/recipes-graphics/xorg-app/xrdb_1.0.5.bb (limited to 'meta/recipes-graphics/xorg-app') diff --git a/meta/recipes-graphics/xorg-app/xbacklight_1.1.bb b/meta/recipes-graphics/xorg-app/xbacklight_1.1.bb deleted file mode 100644 index 78804d734e..0000000000 --- a/meta/recipes-graphics/xorg-app/xbacklight_1.1.bb +++ /dev/null @@ -1,4 +0,0 @@ -require xorg-app-common.inc - -DESCRIPTION = "X Backlight Utility" -DEPENDS += "libxrender libxrandr" diff --git a/meta/recipes-graphics/xorg-app/xev/diet-x11.patch b/meta/recipes-graphics/xorg-app/xev/diet-x11.patch deleted file mode 100644 index 9f515e8c73..0000000000 --- a/meta/recipes-graphics/xorg-app/xev/diet-x11.patch +++ /dev/null @@ -1,80 +0,0 @@ ---- - xev.c | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -Index: xev-1.0.2/xev.c -=================================================================== ---- xev-1.0.2.orig/xev.c 2006-06-02 00:25:44.000000000 +0100 -+++ xev-1.0.2/xev.c 2007-05-10 15:22:07.000000000 +0100 -@@ -109,7 +109,7 @@ do_KeyPress (XEvent *eventp) - nbytes = XLookupString (e, str, 256, &ks, NULL); - - /* not supposed to call XmbLookupString on a key release event */ -- if (e->type == KeyPress && xic) { -+ /*if (e->type == KeyPress && xic) { - do { - nmbbytes = XmbLookupString (xic, e, buf, bsize - 1, &ks, &status); - buf[nmbbytes] = '\0'; -@@ -119,7 +119,7 @@ do_KeyPress (XEvent *eventp) - buf = realloc (buf, bsize); - } - } while (status == XBufferOverflow); -- } -+ }*/ - - if (ks == NoSymbol) - ksname = "NoSymbol"; -@@ -149,7 +149,7 @@ do_KeyPress (XEvent *eventp) - } - - /* not supposed to call XmbLookupString on a key release event */ -- if (e->type == KeyPress && xic) { -+ /*if (e->type == KeyPress && xic) { - printf (" XmbLookupString gives %d bytes: ", nmbbytes); - if (nmbbytes > 0) { - dump (buf, nmbbytes); -@@ -157,7 +157,7 @@ do_KeyPress (XEvent *eventp) - } else { - printf ("\n"); - } -- } -+ } */ - - printf (" XFilterEvent returns: %s\n", - XFilterEvent (eventp, e->window) ? "True" : "False"); -@@ -804,7 +804,7 @@ main (int argc, char **argv) - fprintf (stderr, "%s: XSetLocaleModifiers failed\n", ProgramName); - } - -- xim = XOpenIM (dpy, NULL, NULL, NULL); -+ /*xim = XOpenIM (dpy, NULL, NULL, NULL); - if (xim == NULL) { - fprintf (stderr, "%s: XOpenIM failed\n", ProgramName); - } -@@ -831,7 +831,7 @@ main (int argc, char **argv) - } - XFree (xim_styles); - } -- } -+ }*/ - - screen = DefaultScreen (dpy); - -@@ -891,7 +891,7 @@ main (int argc, char **argv) - printf ("Outer window is 0x%lx, inner window is 0x%lx\n", w, subw); - } - -- if (xim && xim_style) { -+ /*if (xim && xim_style) { - xic = XCreateIC (xim, - XNInputStyle, xim_style, - XNClientWindow, w, -@@ -901,7 +901,7 @@ main (int argc, char **argv) - if (xic == NULL) { - fprintf (stderr, "XCreateIC failed\n"); - } -- } -+ }*/ - - for (done = 0; !done; ) { - XEvent event; diff --git a/meta/recipes-graphics/xorg-app/xev_1.0.3.bb b/meta/recipes-graphics/xorg-app/xev_1.0.3.bb deleted file mode 100644 index b7a4070a8f..0000000000 --- a/meta/recipes-graphics/xorg-app/xev_1.0.3.bb +++ /dev/null @@ -1,7 +0,0 @@ -require xorg-app-common.inc - -DESCRIPTION = "X Event Viewer" -LICENSE = "MIT" -PE = "1" - -SRC_URI += "file://diet-x11.patch;patch=1" diff --git a/meta/recipes-graphics/xorg-app/xeyes_1.0.1.bb b/meta/recipes-graphics/xorg-app/xeyes_1.0.1.bb deleted file mode 100644 index 07ce0724fa..0000000000 --- a/meta/recipes-graphics/xorg-app/xeyes_1.0.1.bb +++ /dev/null @@ -1,4 +0,0 @@ -require xorg-app-common.inc -PE = "1" - -DEPENDS += " virtual/libx11 libxau libxt libxext libxmu" diff --git a/meta/recipes-graphics/xorg-app/xrdb/60XDefaults.sh b/meta/recipes-graphics/xorg-app/xrdb/60XDefaults.sh deleted file mode 100644 index 08d8beca33..0000000000 --- a/meta/recipes-graphics/xorg-app/xrdb/60XDefaults.sh +++ /dev/null @@ -1,3 +0,0 @@ -if [ -e $HOME/.Xdefaults ]; then - xrdb -merge -nocpp < $HOME/.Xdefaults -fi diff --git a/meta/recipes-graphics/xorg-app/xrdb_1.0.5.bb b/meta/recipes-graphics/xorg-app/xrdb_1.0.5.bb deleted file mode 100644 index 906d7d8527..0000000000 --- a/meta/recipes-graphics/xorg-app/xrdb_1.0.5.bb +++ /dev/null @@ -1,14 +0,0 @@ -require xorg-app-common.inc - -DESCRIPTION = "X server resource database utility" -LICENSE = "xrdb" -DEPENDS += "libxmu" -PE = "1" -PR = "r2" - -SRC_URI += "file://60XDefaults.sh" - -do_install_append() { - install -d ${D}${sysconfdir}/X11/Xsession.d/ - install -m 0755 ${WORKDIR}/60XDefaults.sh ${D}${sysconfdir}/X11/Xsession.d/ -} -- cgit v1.2.3-54-g00ecf