summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-app
diff options
context:
space:
mode:
authorSaul Wold <Saul.Wold@intel.com>2010-11-22 13:57:13 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-11-22 13:57:13 +0000
commitcfe12efb5ec9586dab6961f141d52b103bd8b1d1 (patch)
tree7108e22aa7ddf6cfc2f1b6c6b73a811187706ecb /meta/recipes-graphics/xorg-app
parent762fd6b7b3b22d7a8cb80ef9e9ba62e7ef21af3e (diff)
downloadpoky-cfe12efb5ec9586dab6961f141d52b103bd8b1d1.tar.gz
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 <Saul.Wold@intel.com>
Diffstat (limited to 'meta/recipes-graphics/xorg-app')
-rw-r--r--meta/recipes-graphics/xorg-app/xbacklight_1.1.bb4
-rw-r--r--meta/recipes-graphics/xorg-app/xev/diet-x11.patch80
-rw-r--r--meta/recipes-graphics/xorg-app/xev_1.0.3.bb7
-rw-r--r--meta/recipes-graphics/xorg-app/xeyes_1.0.1.bb4
-rw-r--r--meta/recipes-graphics/xorg-app/xrdb/60XDefaults.sh3
-rw-r--r--meta/recipes-graphics/xorg-app/xrdb_1.0.5.bb14
6 files changed, 0 insertions, 112 deletions
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 @@
1require xorg-app-common.inc
2
3DESCRIPTION = "X Backlight Utility"
4DEPENDS += "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 @@
1---
2 xev.c | 16 ++++++++--------
3 1 file changed, 8 insertions(+), 8 deletions(-)
4
5Index: xev-1.0.2/xev.c
6===================================================================
7--- xev-1.0.2.orig/xev.c 2006-06-02 00:25:44.000000000 +0100
8+++ xev-1.0.2/xev.c 2007-05-10 15:22:07.000000000 +0100
9@@ -109,7 +109,7 @@ do_KeyPress (XEvent *eventp)
10 nbytes = XLookupString (e, str, 256, &ks, NULL);
11
12 /* not supposed to call XmbLookupString on a key release event */
13- if (e->type == KeyPress && xic) {
14+ /*if (e->type == KeyPress && xic) {
15 do {
16 nmbbytes = XmbLookupString (xic, e, buf, bsize - 1, &ks, &status);
17 buf[nmbbytes] = '\0';
18@@ -119,7 +119,7 @@ do_KeyPress (XEvent *eventp)
19 buf = realloc (buf, bsize);
20 }
21 } while (status == XBufferOverflow);
22- }
23+ }*/
24
25 if (ks == NoSymbol)
26 ksname = "NoSymbol";
27@@ -149,7 +149,7 @@ do_KeyPress (XEvent *eventp)
28 }
29
30 /* not supposed to call XmbLookupString on a key release event */
31- if (e->type == KeyPress && xic) {
32+ /*if (e->type == KeyPress && xic) {
33 printf (" XmbLookupString gives %d bytes: ", nmbbytes);
34 if (nmbbytes > 0) {
35 dump (buf, nmbbytes);
36@@ -157,7 +157,7 @@ do_KeyPress (XEvent *eventp)
37 } else {
38 printf ("\n");
39 }
40- }
41+ } */
42
43 printf (" XFilterEvent returns: %s\n",
44 XFilterEvent (eventp, e->window) ? "True" : "False");
45@@ -804,7 +804,7 @@ main (int argc, char **argv)
46 fprintf (stderr, "%s: XSetLocaleModifiers failed\n", ProgramName);
47 }
48
49- xim = XOpenIM (dpy, NULL, NULL, NULL);
50+ /*xim = XOpenIM (dpy, NULL, NULL, NULL);
51 if (xim == NULL) {
52 fprintf (stderr, "%s: XOpenIM failed\n", ProgramName);
53 }
54@@ -831,7 +831,7 @@ main (int argc, char **argv)
55 }
56 XFree (xim_styles);
57 }
58- }
59+ }*/
60
61 screen = DefaultScreen (dpy);
62
63@@ -891,7 +891,7 @@ main (int argc, char **argv)
64 printf ("Outer window is 0x%lx, inner window is 0x%lx\n", w, subw);
65 }
66
67- if (xim && xim_style) {
68+ /*if (xim && xim_style) {
69 xic = XCreateIC (xim,
70 XNInputStyle, xim_style,
71 XNClientWindow, w,
72@@ -901,7 +901,7 @@ main (int argc, char **argv)
73 if (xic == NULL) {
74 fprintf (stderr, "XCreateIC failed\n");
75 }
76- }
77+ }*/
78
79 for (done = 0; !done; ) {
80 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 @@
1require xorg-app-common.inc
2
3DESCRIPTION = "X Event Viewer"
4LICENSE = "MIT"
5PE = "1"
6
7SRC_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 @@
1require xorg-app-common.inc
2PE = "1"
3
4DEPENDS += " 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 @@
1if [ -e $HOME/.Xdefaults ]; then
2 xrdb -merge -nocpp < $HOME/.Xdefaults
3fi
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 @@
1require xorg-app-common.inc
2
3DESCRIPTION = "X server resource database utility"
4LICENSE = "xrdb"
5DEPENDS += "libxmu"
6PE = "1"
7PR = "r2"
8
9SRC_URI += "file://60XDefaults.sh"
10
11do_install_append() {
12 install -d ${D}${sysconfdir}/X11/Xsession.d/
13 install -m 0755 ${WORKDIR}/60XDefaults.sh ${D}${sysconfdir}/X11/Xsession.d/
14}