From 193236933b0f4ab91b1625b64e2187e2db4e0e8f Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 5 Apr 2019 15:28:33 -0400 Subject: reset upstream subtrees to HEAD Reset the following subtrees on HEAD: poky: 8217b477a1(master) meta-xilinx: 64aa3d35ae(master) meta-openembedded: 0435c9e193(master) meta-raspberrypi: 490a4441ac(master) meta-security: cb6d1c85ee(master) Squashed patches: meta-phosphor: drop systemd 239 patches meta-phosphor: mrw-api: use correct install path Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d Signed-off-by: Brad Bishop --- .../recipes-graphics/xorg-app/xev/diet-x11.patch | 133 +++++++++++++-------- poky/meta/recipes-graphics/xorg-app/xev_1.2.2.bb | 18 --- poky/meta/recipes-graphics/xorg-app/xev_1.2.3.bb | 18 +++ poky/meta/recipes-graphics/xorg-app/xhost_1.0.7.bb | 20 ---- poky/meta/recipes-graphics/xorg-app/xhost_1.0.8.bb | 20 ++++ poky/meta/recipes-graphics/xorg-app/xinit_1.4.0.bb | 20 ---- poky/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb | 20 ++++ .../recipes-graphics/xorg-app/xmodmap_1.0.10.bb | 16 +++ .../recipes-graphics/xorg-app/xmodmap_1.0.9.bb | 17 --- poky/meta/recipes-graphics/xorg-app/xprop_1.2.3.bb | 18 --- poky/meta/recipes-graphics/xorg-app/xprop_1.2.4.bb | 18 +++ .../meta/recipes-graphics/xorg-app/xvinfo_1.1.3.bb | 14 --- .../meta/recipes-graphics/xorg-app/xvinfo_1.1.4.bb | 14 +++ 13 files changed, 186 insertions(+), 160 deletions(-) delete mode 100644 poky/meta/recipes-graphics/xorg-app/xev_1.2.2.bb create mode 100644 poky/meta/recipes-graphics/xorg-app/xev_1.2.3.bb delete mode 100644 poky/meta/recipes-graphics/xorg-app/xhost_1.0.7.bb create mode 100644 poky/meta/recipes-graphics/xorg-app/xhost_1.0.8.bb delete mode 100644 poky/meta/recipes-graphics/xorg-app/xinit_1.4.0.bb create mode 100644 poky/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb create mode 100644 poky/meta/recipes-graphics/xorg-app/xmodmap_1.0.10.bb delete mode 100644 poky/meta/recipes-graphics/xorg-app/xmodmap_1.0.9.bb delete mode 100644 poky/meta/recipes-graphics/xorg-app/xprop_1.2.3.bb create mode 100644 poky/meta/recipes-graphics/xorg-app/xprop_1.2.4.bb delete mode 100644 poky/meta/recipes-graphics/xorg-app/xvinfo_1.1.3.bb create mode 100644 poky/meta/recipes-graphics/xorg-app/xvinfo_1.1.4.bb (limited to 'poky/meta/recipes-graphics/xorg-app') diff --git a/poky/meta/recipes-graphics/xorg-app/xev/diet-x11.patch b/poky/meta/recipes-graphics/xorg-app/xev/diet-x11.patch index 6130959f8..53c0ac2e6 100644 --- a/poky/meta/recipes-graphics/xorg-app/xev/diet-x11.patch +++ b/poky/meta/recipes-graphics/xorg-app/xev/diet-x11.patch @@ -4,79 +4,106 @@ Upstream-Status: Inappropriate [disable feature] xev.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) -Index: xev-1.2.0/xev.c +Index: xev-1.2.3/xev.c =================================================================== ---- xev-1.2.0.orig/xev.c -+++ xev-1.2.0/xev.c -@@ -116,7 +116,7 @@ do_KeyPress (XEvent *eventp) - nbytes = XLookupString (e, str, 256, &ks, NULL); +--- xev-1.2.3.orig/xev.c ++++ xev-1.2.3/xev.c +@@ -125,17 +125,6 @@ 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'; -@@ -126,7 +126,7 @@ do_KeyPress (XEvent *eventp) - buf = realloc (buf, bsize); - } - } while (status == XBufferOverflow); +- do { +- nmbbytes = XmbLookupString(xic, e, buf, bsize - 1, &ks, &status); +- buf[nmbbytes] = '\0'; +- +- if (status == XBufferOverflow) { +- bsize = nmbbytes + 1; +- buf = realloc(buf, bsize); +- } +- } while (status == XBufferOverflow); - } -+ }*/ if (ks == NoSymbol) - ksname = "NoSymbol"; -@@ -156,7 +156,7 @@ do_KeyPress (XEvent *eventp) + ksname = "NoSymbol"; +@@ -168,16 +157,6 @@ 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); -@@ -164,7 +164,7 @@ do_KeyPress (XEvent *eventp) - } else { - printf ("\n"); +- printf(" XmbLookupString gives %d bytes: ", nmbbytes); +- if (nmbbytes > 0) { +- dump(buf, nmbbytes); +- printf(" \"%s\"\n", buf); +- } +- else { +- printf("\n"); +- } +- } + + printf(" XFilterEvent returns: %s\n", + XFilterEvent(eventp, e->window) ? "True" : "False"); +@@ -1141,7 +1120,7 @@ parse_event_mask(const char *s, long eve + if (s) + return True; } - } -+ } */ ++ } - printf (" XFilterEvent returns: %s\n", - XFilterEvent (eventp, e->window) ? "True" : "False"); -@@ -1015,7 +1015,7 @@ main (int argc, char **argv) - fprintf (stderr, "%s: XSetLocaleModifiers failed\n", ProgramName); + if (s != NULL) + fprintf(stderr, "%s: unrecognized event mask '%s'\n", ProgramName, s); +@@ -1288,37 +1267,6 @@ 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); - } -@@ -1042,7 +1042,7 @@ main (int argc, char **argv) - } - XFree (xim_styles); - } +- xim = XOpenIM(dpy, NULL, NULL, NULL); +- if (xim == NULL) { +- fprintf(stderr, "%s: XOpenIM failed\n", ProgramName); - } -+ }*/ - - screen = DefaultScreen (dpy); +- +- if (xim) { +- imvalret = XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL); +- if (imvalret != NULL || xim_styles == NULL) { +- fprintf(stderr, "%s: input method doesn't support any styles\n", +- ProgramName); +- } +- +- if (xim_styles) { +- xim_style = 0; +- for (i = 0; i < xim_styles->count_styles; i++) { +- if (xim_styles->supported_styles[i] == +- (XIMPreeditNothing | XIMStatusNothing)) { +- xim_style = xim_styles->supported_styles[i]; +- break; +- } +- } +- +- if (xim_style == 0) { +- fprintf(stderr, +- "%s: input method doesn't support the style we support\n", +- ProgramName); +- } +- XFree(xim_styles); +- } +- } +- + screen = DefaultScreen(dpy); -@@ -1109,7 +1109,7 @@ main (int argc, char **argv) - printf ("Outer window is 0x%lx, inner window is 0x%lx\n", w, subw); + attr.event_mask = event_masks[EVENT_MASK_INDEX_CORE]; +@@ -1373,16 +1321,6 @@ 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, -@@ -1119,7 +1119,7 @@ main (int argc, char **argv) - if (xic == NULL) { - fprintf (stderr, "XCreateIC failed\n"); - } +- xic = XCreateIC(xim, +- XNInputStyle, xim_style, +- XNClientWindow, w, XNFocusWindow, w, NULL); +- +- if (xic == NULL) { +- fprintf(stderr, "XCreateIC failed\n"); +- } - } -+ }*/ - - have_rr = XRRQueryExtension (dpy, &rr_event_base, &rr_error_base); +- + have_rr = XRRQueryExtension(dpy, &rr_event_base, &rr_error_base); if (have_rr) { + int rr_major, rr_minor; diff --git a/poky/meta/recipes-graphics/xorg-app/xev_1.2.2.bb b/poky/meta/recipes-graphics/xorg-app/xev_1.2.2.bb deleted file mode 100644 index 0705b7f7f..000000000 --- a/poky/meta/recipes-graphics/xorg-app/xev_1.2.2.bb +++ /dev/null @@ -1,18 +0,0 @@ -require xorg-app-common.inc - -SUMMARY = "X Event Viewer" -DESCRIPTION = "Xev creates a window and then asks the X server to send it events \ -whenever anything happens to the window (such as it being moved, resized, \ -typed in, clicked in, etc.). You can also attach it to an existing window." - -LIC_FILES_CHKSUM = "file://xev.c;beginline=1;endline=33;md5=577c99421f1803b891d2c79097ae4682" -LICENSE = "MIT" - -PE = "1" - -DEPENDS += "libxrandr xorgproto" - -SRC_URI += "file://diet-x11.patch" - -SRC_URI[md5sum] = "249bdde90f01c0d861af52dc8fec379e" -SRC_URI[sha256sum] = "d94ae62a6c1af56c2961d71f5782076ac4116f0fa4e401420ac7e0db33dc314f" diff --git a/poky/meta/recipes-graphics/xorg-app/xev_1.2.3.bb b/poky/meta/recipes-graphics/xorg-app/xev_1.2.3.bb new file mode 100644 index 000000000..6a69e747a --- /dev/null +++ b/poky/meta/recipes-graphics/xorg-app/xev_1.2.3.bb @@ -0,0 +1,18 @@ +require xorg-app-common.inc + +SUMMARY = "X Event Viewer" +DESCRIPTION = "Xev creates a window and then asks the X server to send it events \ +whenever anything happens to the window (such as it being moved, resized, \ +typed in, clicked in, etc.). You can also attach it to an existing window." + +LIC_FILES_CHKSUM = "file://xev.c;beginline=1;endline=33;md5=577c99421f1803b891d2c79097ae4682" +LICENSE = "MIT" + +PE = "1" + +DEPENDS += "libxrandr xorgproto" + +SRC_URI += "file://diet-x11.patch" + +SRC_URI[md5sum] = "eec82a5d4b599736f0fa637e96136746" +SRC_URI[sha256sum] = "66bc4f1cfa1946d62612737815c34164e4ce40fcebd2c9e1d7e7a1117ad3ad09" diff --git a/poky/meta/recipes-graphics/xorg-app/xhost_1.0.7.bb b/poky/meta/recipes-graphics/xorg-app/xhost_1.0.7.bb deleted file mode 100644 index 77490f548..000000000 --- a/poky/meta/recipes-graphics/xorg-app/xhost_1.0.7.bb +++ /dev/null @@ -1,20 +0,0 @@ -require xorg-app-common.inc - -SUMMARY = "Server access control program for X" - -DESCRIPTION = "The xhost program is used to add and delete host names or \ -user names to the list allowed to make connections to the X server. In \ -the case of hosts, this provides a rudimentary form of privacy control \ -and security. Environments which require more sophisticated measures \ -should implement the user-based mechanism or use the hooks in the \ -protocol for passing other authentication data to the server." - -LIC_FILES_CHKSUM = "file://COPYING;md5=8fbed71dddf48541818cef8079124199" -DEPENDS += "libxmu libxau" -PE = "1" - -SRC_URI[md5sum] = "f5d490738b148cb7f2fe760f40f92516" -SRC_URI[sha256sum] = "93e619ee15471f576cfb30c663e18f5bc70aca577a63d2c2c03f006a7837c29a" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/poky/meta/recipes-graphics/xorg-app/xhost_1.0.8.bb b/poky/meta/recipes-graphics/xorg-app/xhost_1.0.8.bb new file mode 100644 index 000000000..26bec3f0d --- /dev/null +++ b/poky/meta/recipes-graphics/xorg-app/xhost_1.0.8.bb @@ -0,0 +1,20 @@ +require xorg-app-common.inc + +SUMMARY = "Server access control program for X" + +DESCRIPTION = "The xhost program is used to add and delete host names or \ +user names to the list allowed to make connections to the X server. In \ +the case of hosts, this provides a rudimentary form of privacy control \ +and security. Environments which require more sophisticated measures \ +should implement the user-based mechanism or use the hooks in the \ +protocol for passing other authentication data to the server." + +LIC_FILES_CHKSUM = "file://COPYING;md5=8fbed71dddf48541818cef8079124199" +DEPENDS += "libxmu libxau" +PE = "1" + +SRC_URI[md5sum] = "a48c72954ae6665e0616f6653636da8c" +SRC_URI[sha256sum] = "a2dc3c579e13674947395ef8ccc1b3763f89012a216c2cc6277096489aadc396" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/poky/meta/recipes-graphics/xorg-app/xinit_1.4.0.bb b/poky/meta/recipes-graphics/xorg-app/xinit_1.4.0.bb deleted file mode 100644 index dc2a06b58..000000000 --- a/poky/meta/recipes-graphics/xorg-app/xinit_1.4.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -require xorg-app-common.inc - -SUMMARY = "X Window System initializer" - -DESCRIPTION = "The xinit program is used to start the X Window System \ -server and a first client program on systems that cannot start X \ -directly from /etc/init or in environments that use multiple window \ -systems. When this first client exits, xinit will kill the X server and \ -then terminate." - -LIC_FILES_CHKSUM = "file://COPYING;md5=18f01e7b39807bebe2b8df101a039b68" - -PE = "1" - -SRC_URI[md5sum] = "2da154b2f80ca9637b1a17b13af0880c" -SRC_URI[sha256sum] = "230835eef2f5978a1e1344928168119373f6df1d0a32c09515e545721ee582ef" - -EXTRA_OECONF = "ac_cv_path_MCOOKIE=${bindir}/mcookie" - -RDEPENDS_${PN} += "util-linux-mcookie" diff --git a/poky/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb b/poky/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb new file mode 100644 index 000000000..5626ebbd5 --- /dev/null +++ b/poky/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb @@ -0,0 +1,20 @@ +require xorg-app-common.inc + +SUMMARY = "X Window System initializer" + +DESCRIPTION = "The xinit program is used to start the X Window System \ +server and a first client program on systems that cannot start X \ +directly from /etc/init or in environments that use multiple window \ +systems. When this first client exits, xinit will kill the X server and \ +then terminate." + +LIC_FILES_CHKSUM = "file://COPYING;md5=18f01e7b39807bebe2b8df101a039b68" + +PE = "1" + +SRC_URI[md5sum] = "6d506ab2efc17a08e87778654e099d37" +SRC_URI[sha256sum] = "de9b8f617b68a70f6caf87da01fcf0ebd2b75690cdcba9c921d0ef54fa54abb9" + +EXTRA_OECONF = "ac_cv_path_MCOOKIE=${bindir}/mcookie" + +RDEPENDS_${PN} += "util-linux-mcookie" diff --git a/poky/meta/recipes-graphics/xorg-app/xmodmap_1.0.10.bb b/poky/meta/recipes-graphics/xorg-app/xmodmap_1.0.10.bb new file mode 100644 index 000000000..7dedb03a2 --- /dev/null +++ b/poky/meta/recipes-graphics/xorg-app/xmodmap_1.0.10.bb @@ -0,0 +1,16 @@ +require xorg-app-common.inc + +SUMMARY = "Utility for modifying keymaps and pointer button mappings in X" + +DESCRIPTION = "The xmodmap program is used to edit and display the \ +keyboard modifier map and keymap table that are used by client \ +applications to convert event keycodes into keysyms. It is usually run \ +from the user's session startup script to configure the keyboard \ +according to personal tastes." + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=272c17e96370e1e74773fa22d9989621" + +PE = "1" +SRC_URI[md5sum] = "51f1d30a525e9903280ffeea2744b1f6" +SRC_URI[sha256sum] = "473f0941d7439d501bb895ff358832b936ec34c749b9704c37a15e11c318487c" diff --git a/poky/meta/recipes-graphics/xorg-app/xmodmap_1.0.9.bb b/poky/meta/recipes-graphics/xorg-app/xmodmap_1.0.9.bb deleted file mode 100644 index 2deac6a05..000000000 --- a/poky/meta/recipes-graphics/xorg-app/xmodmap_1.0.9.bb +++ /dev/null @@ -1,17 +0,0 @@ -require xorg-app-common.inc - -SUMMARY = "Utility for modifying keymaps and pointer button mappings in X" - -DESCRIPTION = "The xmodmap program is used to edit and display the \ -keyboard modifier map and keymap table that are used by client \ -applications to convert event keycodes into keysyms. It is usually run \ -from the user's session startup script to configure the keyboard \ -according to personal tastes." - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=272c17e96370e1e74773fa22d9989621" - -PE = "1" - -SRC_URI[md5sum] = "723f02d3a5f98450554556205f0a9497" -SRC_URI[sha256sum] = "b7b0e5cc5f10d0fb6d2d6ea4f00c77e8ac0e847cc5a73be94cd86139ac4ac478" diff --git a/poky/meta/recipes-graphics/xorg-app/xprop_1.2.3.bb b/poky/meta/recipes-graphics/xorg-app/xprop_1.2.3.bb deleted file mode 100644 index ca58d4751..000000000 --- a/poky/meta/recipes-graphics/xorg-app/xprop_1.2.3.bb +++ /dev/null @@ -1,18 +0,0 @@ -require xorg-app-common.inc - -SUMMARY = "Utility to display window and font properties of an X server" - -DESCRIPTION = "The xprop utility is for displaying window and font \ -properties in an X server. One window or font is selected using the \ -command line arguments or possibly in the case of a window, by clicking \ -on the desired window. A list of properties is then given, possibly with \ -formatting information." - -LIC_FILES_CHKSUM = "file://COPYING;md5=e226ab8db88ac0bc0391673be40c9f91" - -DEPENDS += "libxmu" - -PE = "1" - -SRC_URI[md5sum] = "4becb3ddc4674d741487189e4ce3d0b6" -SRC_URI[sha256sum] = "d22afb28c86d85fff10a50156a7d0fa930c80ae865d70b26d805fd28a17a521b" diff --git a/poky/meta/recipes-graphics/xorg-app/xprop_1.2.4.bb b/poky/meta/recipes-graphics/xorg-app/xprop_1.2.4.bb new file mode 100644 index 000000000..3280813ef --- /dev/null +++ b/poky/meta/recipes-graphics/xorg-app/xprop_1.2.4.bb @@ -0,0 +1,18 @@ +require xorg-app-common.inc + +SUMMARY = "Utility to display window and font properties of an X server" + +DESCRIPTION = "The xprop utility is for displaying window and font \ +properties in an X server. One window or font is selected using the \ +command line arguments or possibly in the case of a window, by clicking \ +on the desired window. A list of properties is then given, possibly with \ +formatting information." + +LIC_FILES_CHKSUM = "file://COPYING;md5=e226ab8db88ac0bc0391673be40c9f91" + +DEPENDS += "libxmu" + +PE = "1" + +SRC_URI[md5sum] = "cc369c28383a5d7144e7197ee7d30bfa" +SRC_URI[sha256sum] = "8c77fb096e46c60032b7e2bde9492c3ffcc18734f50b395085a5f10bfd3cf753" diff --git a/poky/meta/recipes-graphics/xorg-app/xvinfo_1.1.3.bb b/poky/meta/recipes-graphics/xorg-app/xvinfo_1.1.3.bb deleted file mode 100644 index 2965ef7f8..000000000 --- a/poky/meta/recipes-graphics/xorg-app/xvinfo_1.1.3.bb +++ /dev/null @@ -1,14 +0,0 @@ -require xorg-app-common.inc - -SUMMARY = "Print out X-Video extension adaptor information" - -DESCRIPTION = "xvinfo prints out the capabilities of any video adaptors \ -associated with the display that are accessible through the X-Video \ -extension." - -LIC_FILES_CHKSUM = "file://COPYING;md5=b664101ad7a1dc758a4c4109bf978e68" -DEPENDS += " libxv" -PE = "1" - -SRC_URI[md5sum] = "558360176b718dee3c39bc0648c0d10c" -SRC_URI[sha256sum] = "9fba8b68daf53863e66d5004fa9c703fcecf69db4d151ea2d3d885d621e6e5eb" diff --git a/poky/meta/recipes-graphics/xorg-app/xvinfo_1.1.4.bb b/poky/meta/recipes-graphics/xorg-app/xvinfo_1.1.4.bb new file mode 100644 index 000000000..a913ae11f --- /dev/null +++ b/poky/meta/recipes-graphics/xorg-app/xvinfo_1.1.4.bb @@ -0,0 +1,14 @@ +require xorg-app-common.inc + +SUMMARY = "Print out X-Video extension adaptor information" + +DESCRIPTION = "xvinfo prints out the capabilities of any video adaptors \ +associated with the display that are accessible through the X-Video \ +extension." + +LIC_FILES_CHKSUM = "file://COPYING;md5=b664101ad7a1dc758a4c4109bf978e68" +DEPENDS += " libxv" +PE = "1" + +SRC_URI[md5sum] = "b13afec137b9b331814a9824ab03ec80" +SRC_URI[sha256sum] = "0353220d6606077ba42363db65f50410759f9815352f77adc799e2adfa76e73f" -- cgit v1.2.3