diff options
Diffstat (limited to 'meta/recipes-graphics/xorg-lib')
14 files changed, 33 insertions, 157 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.2.bb b/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.3.bb index d837bbd047..bbba24eb9a 100644 --- a/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.2.bb +++ b/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.3.bb @@ -8,7 +8,7 @@ require xorg-lib-common.inc LICENSE = "MIT & MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=277aada5222b9a22fbf3471ff3687068" -SRC_URI[md5sum] = "b7c0d3afce14eedca57312a3141ec13a" -SRC_URI[sha256sum] = "abab8c2b050afb89bc29280e9c6b50ec5867174960d88bfb81a01036ec20de19" +SRC_URI[md5sum] = "1f65be5ffc55641c1846c2f41d180d00" +SRC_URI[sha256sum] = "6cd76ccae4e06eee47d3ead84a118740e9406e2a9b7adc9b08e92c69ce89c2e3" REQUIRED_DISTRO_FEATURES = "" diff --git a/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.3.bb b/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.3.bb index 3e7ef27bed..5514c7f5e8 100644 --- a/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.3.bb +++ b/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.3.bb @@ -7,7 +7,6 @@ SECTION = "x11/libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=6edc1fea03d959f0c2d743fe5ca746ad" -PARALLEL_MAKE = "" #DEPENDS = "xcb-proto xproto libxau libxslt-native" # DEPENDS += "xsltproc-native gperf-native" diff --git a/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb b/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb index 180acfae0b..1925136369 100644 --- a/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb +++ b/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb @@ -11,7 +11,12 @@ require xorg-lib-common.inc LICENSE = "MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb37f44e02bdbde80546024400728d" -DEPENDS += "libice xproto xtrans e2fsprogs" +DEPENDS += "libice xproto xtrans" + +# libSM can work without libuuid, we explicitly disable it to break the following circular dependency +# when DISTRO_FEATURES contains 'systemd' and 'x11'. +# systemd -> dbus -> libsm -> util-linux -> systemd +EXTRA_OECONF += "--without-libuuid" PE = "1" diff --git a/meta/recipes-graphics/xorg-lib/libxcb/ensure-xcb-owns-socket-and-no-other-threads-are-writ.patch b/meta/recipes-graphics/xorg-lib/libxcb/ensure-xcb-owns-socket-and-no-other-threads-are-writ.patch deleted file mode 100644 index 14cefa3f29..0000000000 --- a/meta/recipes-graphics/xorg-lib/libxcb/ensure-xcb-owns-socket-and-no-other-threads-are-writ.patch +++ /dev/null @@ -1,121 +0,0 @@ -From be0fe56c3bcad5124dcc6c47a2fad01acd16f71a Mon Sep 17 00:00:00 2001 -From: Keith Packard <keithp@keithp.com> -Date: Mon, 23 Dec 2013 21:15:20 -0800 -Subject: [PATCH] Ensure xcb owns socket and no other threads are writing - before send_request - -send_request may only write to out.queue if no other thread is busy -writing to the network (as that thread may be writing from out.queue). - -send_request may only allocate request sequence numbers if XCB owns -the socket. - -Therefore, send_request must make sure that both conditions are true -when it holds iolock, which can only be done by looping until both -conditions are true without having dropped the lock waiting for the -second condition. - -We choose to get the socket back from Xlib first as get_socket_back -has a complicated test and checking for other threads writing is a -simple in-lined check. - -This also changes the sequence number checks (64k requests with no -reply, 4M request wrapping) to ensure that both conditions are true -before queueing the request. - -Signed-off-by: Keith Packard <keithp@keithp.com> -Reviewed-by: Uli Schlachter <psychon@znc.in> ---- - src/xcb_out.c | 57 ++++++++++++++++++++++++++++++++++++++++----------------- - 1 file changed, 40 insertions(+), 17 deletions(-) - -diff --git a/src/xcb_out.c b/src/xcb_out.c -index 18bb5f9..dc42954 100644 ---- a/src/xcb_out.c -+++ b/src/xcb_out.c -@@ -103,6 +103,33 @@ static void get_socket_back(xcb_connection_t *c) - _xcb_in_replies_done(c); - } - -+static void prepare_socket_request(xcb_connection_t *c) -+{ -+ /* We're about to append data to out.queue, so we need to -+ * atomically test for an external socket owner *and* some other -+ * thread currently writing. -+ * -+ * If we have an external socket owner, we have to get the socket back -+ * before we can use it again. -+ * -+ * If some other thread is writing to the socket, we assume it's -+ * writing from out.queue, and so we can't stick data there. -+ * -+ * We satisfy this condition by first calling get_socket_back -+ * (which may drop the lock, but will return when XCB owns the -+ * socket again) and then checking for another writing thread and -+ * escaping the loop if we're ready to go. -+ */ -+ for (;;) { -+ if(c->has_error) -+ return; -+ get_socket_back(c); -+ if (!c->out.writing) -+ break; -+ pthread_cond_wait(&c->out.cond, &c->iolock); -+ } -+} -+ - /* Public interface */ - - void xcb_prefetch_maximum_request_length(xcb_connection_t *c) -@@ -236,24 +263,23 @@ unsigned int xcb_send_request(xcb_connection_t *c, int flags, struct iovec *vect - - /* get a sequence number and arrange for delivery. */ - pthread_mutex_lock(&c->iolock); -- /* wait for other writing threads to get out of my way. */ -- while(c->out.writing) -- pthread_cond_wait(&c->out.cond, &c->iolock); -- get_socket_back(c); -+ -+ prepare_socket_request(c); - - /* send GetInputFocus (sync_req) when 64k-2 requests have been sent without -- * a reply. */ -- if(req->isvoid && c->out.request == c->in.request_expected + (1 << 16) - 2) -- send_sync(c); -- /* Also send sync_req (could use NoOp) at 32-bit wrap to avoid having -+ * a reply. -+ * Also send sync_req (could use NoOp) at 32-bit wrap to avoid having - * applications see sequence 0 as that is used to indicate -- * an error in sending the request */ -- if((unsigned int) (c->out.request + 1) == 0) -+ * an error in sending the request -+ */ -+ -+ while ((req->isvoid && c->out.request == c->in.request_expected + (1 << 16) - 2) || -+ (unsigned int) (c->out.request + 1) == 0) -+ { - send_sync(c); -+ prepare_socket_request(c); -+ } - -- /* The above send_sync calls could drop the I/O lock, but this -- * thread will still exclude any other thread that tries to write, -- * so the sequence number postconditions still hold. */ - send_request(c, req->isvoid, workaround, flags, vector, veclen); - request = c->has_error ? 0 : c->out.request; - pthread_mutex_unlock(&c->iolock); -@@ -373,10 +399,7 @@ int _xcb_out_send(xcb_connection_t *c, struct iovec *vector, int count) - - void _xcb_out_send_sync(xcb_connection_t *c) - { -- /* wait for other writing threads to get out of my way. */ -- while(c->out.writing) -- pthread_cond_wait(&c->out.cond, &c->iolock); -- get_socket_back(c); -+ prepare_socket_request(c); - send_sync(c); - } - --- -1.9.1 - diff --git a/meta/recipes-graphics/xorg-lib/libxcb_1.10.bb b/meta/recipes-graphics/xorg-lib/libxcb_1.10.bb deleted file mode 100644 index 5bb5f0be88..0000000000 --- a/meta/recipes-graphics/xorg-lib/libxcb_1.10.bb +++ /dev/null @@ -1,13 +0,0 @@ -include libxcb.inc - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7" - - -DEPENDS += "libxdmcp" - -SRC_URI += "file://ensure-xcb-owns-socket-and-no-other-threads-are-writ.patch \ -" - -SRC_URI[md5sum] = "074c335cc4453467eeb234e3dadda700" -SRC_URI[sha256sum] = "98d9ab05b636dd088603b64229dd1ab2d2cc02ab807892e107d674f9c3f2d5b5" diff --git a/meta/recipes-graphics/xorg-lib/libxcb_1.11.bb b/meta/recipes-graphics/xorg-lib/libxcb_1.11.bb new file mode 100644 index 0000000000..c162702105 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxcb_1.11.bb @@ -0,0 +1,10 @@ +include libxcb.inc + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7" + + +DEPENDS += "libxdmcp" + +SRC_URI[md5sum] = "5a873ebd383d1a60612dd6ec6b42c781" +SRC_URI[sha256sum] = "03635d70045b9ede90778e67516135828a57de87ac508f987024f43c03620ff7" diff --git a/meta/recipes-graphics/xorg-lib/libxext_1.3.2.bb b/meta/recipes-graphics/xorg-lib/libxext_1.3.3.bb index ec66175684..efa8b65ace 100644 --- a/meta/recipes-graphics/xorg-lib/libxext_1.3.2.bb +++ b/meta/recipes-graphics/xorg-lib/libxext_1.3.3.bb @@ -22,5 +22,5 @@ XORG_PN = "libXext" BBCLASSEXTEND = "native nativesdk" -SRC_URI[md5sum] = "4376101e51bb2c6c44d9ab14344e85ad" -SRC_URI[sha256sum] = "f829075bc646cdc085fa25d98d5885d83b1759ceb355933127c257e8e50432e0" +SRC_URI[md5sum] = "52df7c4c1f0badd9f82ab124fb32eb97" +SRC_URI[sha256sum] = "b518d4d332231f313371fdefac59e3776f4f0823bcb23cf7c7305bfb57b16e35" diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.3.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.5.0.bb index 0dd295678e..a166b57603 100644 --- a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.3.bb +++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.5.0.bb @@ -2,15 +2,15 @@ SUMMARY = "Generic XKB keymap library" DESCRIPTION = "libxkbcommon is a keymap compiler and support library which \ processes a reduced subset of keymaps as defined by the XKB specification." HOMEPAGE = "http://www.xkbcommon.org" -LIC_FILES_CHKSUM = "file://COPYING;md5=9c0b824e72a22f9d2c40b9c93b1f0ddc" +LIC_FILES_CHKSUM = "file://COPYING;md5=09457b156e3155972abebcaaaa0cb434" LICENSE = "MIT & MIT-style" DEPENDS = "util-macros flex-native bison-native" SRC_URI = "http://xkbcommon.org/download/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "26c57ff21438ed45de2a4ca609177db9" -SRC_URI[sha256sum] = "9a52d5d0419e76c49c0ece86208c205ffacb1cf0ff8ffbaba98d3d4dd40c4e41" +SRC_URI[md5sum] = "2e1faeafcc609c30af3a561a91e84158" +SRC_URI[sha256sum] = "90bd7824742b9a6f52a6cf80e2cadd6f5349cf600a358d08260772615b89d19c" inherit autotools pkgconfig diff --git a/meta/recipes-graphics/xorg-lib/xcb-util-image_0.3.9.bb b/meta/recipes-graphics/xorg-lib/xcb-util-image_0.4.0.bb index 1d36893f93..91464b6c98 100644 --- a/meta/recipes-graphics/xorg-lib/xcb-util-image_0.3.9.bb +++ b/meta/recipes-graphics/xorg-lib/xcb-util-image_0.4.0.bb @@ -6,6 +6,5 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://image/xcb_image.c;endline=24;md5=eafdf965cfb89955fdedf75054223fb4 \ file://image/xcb_image.h;beginline=4;endline=27;md5=48cd25ae55e7de525fe1e1a3a7672e1c" -SRC_URI[md5sum] = "fabb80b36490b00fc91289e2c7f66770" -SRC_URI[sha256sum] = "d35a3c0eaae171f5081ec127fb9cec174b716ce5d78196a87f2785376da021df" - +SRC_URI[md5sum] = "08fe8ffecc8d4e37c0ade7906b3f4c87" +SRC_URI[sha256sum] = "2db96a37d78831d643538dd1b595d7d712e04bdccf8896a5e18ce0f398ea2ffc"
\ No newline at end of file diff --git a/meta/recipes-graphics/xorg-lib/xcb-util-keysyms_0.3.9.bb b/meta/recipes-graphics/xorg-lib/xcb-util-keysyms_0.4.0.bb index 39ead34e92..bca64ed61f 100644 --- a/meta/recipes-graphics/xorg-lib/xcb-util-keysyms_0.3.9.bb +++ b/meta/recipes-graphics/xorg-lib/xcb-util-keysyms_0.4.0.bb @@ -3,8 +3,7 @@ require xcb-util.inc LICENSE = "MIT" LIC_FILES_CHKSUM = "file://keysyms/keysyms.c;endline=30;md5=2f8de023ed823bb92f0b47900574ea9e \ " - -SRC_URI[md5sum] = "64e4aad2d48cd4a92e2da13b9f35bfd2" -SRC_URI[sha256sum] = "7be1acf053bd68a1910fc861b2cbcbad7637b5618590dd5484d43a96f7995c6e" +SRC_URI[md5sum] = "1022293083eec9e62d5659261c29e367" +SRC_URI[sha256sum] = "0ef8490ff1dede52b7de533158547f8b454b241aa3e4dcca369507f66f216dd9" diff --git a/meta/recipes-graphics/xorg-lib/xcb-util.inc b/meta/recipes-graphics/xorg-lib/xcb-util.inc index 7dad545c33..d15cf9fba1 100644 --- a/meta/recipes-graphics/xorg-lib/xcb-util.inc +++ b/meta/recipes-graphics/xorg-lib/xcb-util.inc @@ -16,8 +16,6 @@ SECTION = "x11/libs" DEPENDS = "libxcb" DEPENDS += "gperf-native" -PARALLEL_MAKE = "" - SRC_URI = "http://xcb.freedesktop.org/dist/${BPN}-${PV}.tar.bz2" inherit autotools pkgconfig diff --git a/meta/recipes-graphics/xorg-lib/xcb-util_0.3.9.bb b/meta/recipes-graphics/xorg-lib/xcb-util_0.4.0.bb index c5d8858115..206f07a65c 100644 --- a/meta/recipes-graphics/xorg-lib/xcb-util_0.3.9.bb +++ b/meta/recipes-graphics/xorg-lib/xcb-util_0.4.0.bb @@ -4,5 +4,5 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://src/xcb_aux.c;endline=30;md5=ae305b9c2a38f9ba27060191046a6460 \ file://src/xcb_event.h;endline=27;md5=627be355aee59e1b8ade80d5bd90fad9" -SRC_URI[md5sum] = "01dcc7a16d5020530552712710646ea2" -SRC_URI[sha256sum] = "c611259c0ab20fd76f79f48f4684843c18ea9c967eba78a45e8b3636315c18c4" +SRC_URI[md5sum] = "2e97feed81919465a04ccc71e4073313" +SRC_URI[sha256sum] = "46e49469cb3b594af1d33176cd7565def2be3fa8be4371d62271fabb5eae50e9" diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.12.bb b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.13.bb index adac0eedd8..5536b6217a 100644 --- a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.12.bb +++ b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.13.bb @@ -13,8 +13,8 @@ LICENSE = "MIT & MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9" SRC_URI="${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "1fd54ceb9092d1dbcaabaf03653092bc" -SRC_URI[sha256sum] = "65b62b95b77b609cb6c0439e0148c48c3ab7dcb5c90eb8d34cf1cb8f360cca44" +SRC_URI[md5sum] = "a415775ca8ecf4dfafc9488b8cbd7114" +SRC_URI[sha256sum] = "7b5be9f2b9a30102512b15308aec55f7f54289df24ac21de82ebb4bf145f9fce" SECTION = "x11/libs" DEPENDS = "intltool-native virtual/gettext util-macros libxslt-native" diff --git a/meta/recipes-graphics/xorg-lib/xtrans_1.3.4.bb b/meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb index f2b89217bb..d5b7f1a2c6 100644 --- a/meta/recipes-graphics/xorg-lib/xtrans_1.3.4.bb +++ b/meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb @@ -20,5 +20,5 @@ inherit gettext BBCLASSEXTEND = "native nativesdk" -SRC_URI[md5sum] = "a615e17d9fee6f097fc3b716eacb3dca" -SRC_URI[sha256sum] = "054d4ee3efd52508c753e9f7bc655ef185a29bd2850dd9e2fc2ccc33544f583a" +SRC_URI[md5sum] = "c5ba432dd1514d858053ffe9f4737dd8" +SRC_URI[sha256sum] = "adbd3b36932ce4c062cd10f57d78a156ba98d618bdb6f50664da327502bc8301" |