diff options
Diffstat (limited to 'poky/meta/recipes-graphics/xorg-lib')
44 files changed, 215 insertions, 285 deletions
diff --git a/poky/meta/recipes-graphics/xorg-lib/libdmx_1.1.3.bb b/poky/meta/recipes-graphics/xorg-lib/libdmx_1.1.4.bb index e623cee42..66172cb30 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libdmx_1.1.3.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libdmx_1.1.4.bb @@ -11,10 +11,10 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=a3c3499231a8035efd0e004cfbd3b72a \ file://src/dmx.c;endline=33;md5=c43f19af03c7c8619cadc9724ed9afe1" -DEPENDS += "libxext dmxproto" +DEPENDS += "libxext xorgproto" PE = "1" -SRC_URI[md5sum] = "ba983eba5a9f05d152a0725b8e863151" -SRC_URI[sha256sum] = "c97da36d2e56a2d7b6e4f896241785acc95e97eb9557465fd66ba2a155a7b201" +SRC_URI[md5sum] = "d2f1f0ec68ac3932dd7f1d9aa0a7a11c" +SRC_URI[sha256sum] = "253f90005d134fa7a209fbcbc5a3024335367c930adf0f3203e754cf32747243" diff --git a/poky/meta/recipes-graphics/xorg-lib/libfontenc_1.1.3.bb b/poky/meta/recipes-graphics/xorg-lib/libfontenc_1.1.3.bb index a181f05c2..34d5fc448 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libfontenc_1.1.3.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libfontenc_1.1.3.bb @@ -8,7 +8,7 @@ require xorg-lib-common.inc LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=96254c20ab81c63e65b26f0dbcd4a1c1" -DEPENDS += "zlib xproto font-util" +DEPENDS += "zlib xorgproto font-util" PE = "1" BBCLASSEXTEND = "native" diff --git a/poky/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb b/poky/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb index 5ccd1d8c3..999434ee5 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb @@ -11,7 +11,7 @@ require xorg-lib-common.inc LICENSE = "MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=d162b1b3c6fa812da9d804dcf8584a93" -DEPENDS += "xproto xtrans" +DEPENDS += "xorgproto xtrans" PROVIDES = "ice" PE = "1" diff --git a/poky/meta/recipes-graphics/xorg-lib/libpciaccess_0.14.bb b/poky/meta/recipes-graphics/xorg-lib/libpciaccess_0.14.bb index a44a5c892..d030c31bd 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libpciaccess_0.14.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libpciaccess_0.14.bb @@ -16,3 +16,5 @@ LICENSE = "MIT & MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=277aada5222b9a22fbf3471ff3687068" REQUIRED_DISTRO_FEATURES = "" + +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb b/poky/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb index 48922cb99..fdc693be1 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb @@ -11,7 +11,7 @@ require xorg-lib-common.inc LICENSE = "MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb37f44e02bdbde80546024400728d" -DEPENDS += "libice xproto xtrans" +DEPENDS += "libice xorgproto xtrans" # libSM can work without libuuid, we explicitly disable it to break the following circular dependency # when DISTRO_FEATURES contains 'systemd' and 'x11'. diff --git a/poky/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.5.bb b/poky/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.6.bb index 295f96a2e..a4ba4e54e 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.5.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.6.bb @@ -3,16 +3,16 @@ require libx11.inc DESCRIPTION += " Support for XCMS and XLOCALE is disabled in \ this version." -SRC_URI += "file://X18NCMSstubs.diff \ - file://fix-disable-xlocale.diff \ +SRC_URI += "file://X18NCMSstubs.patch \ + file://fix-disable-xlocale.patch \ file://fix-utf8-wrong-define.patch \ " RPROVIDES_${PN}-dev = "libx11-dev" RPROVIDES_${PN}-locale = "libx11-locale" -SRC_URI[md5sum] = "0f618db70c4054ca67cee0cc156a4255" -SRC_URI[sha256sum] = "4d3890db2ba225ba8c55ca63c6409c1ebb078a2806de59fb16342768ae63435d" +SRC_URI[md5sum] = "6b0f83e851b3b469dd660f3a95ac3e42" +SRC_URI[sha256sum] = "65fe181d40ec77f45417710c6a67431814ab252d21c2e85c75dd1ed568af414f" EXTRA_OECONF += "--disable-xlocale" diff --git a/poky/meta/recipes-graphics/xorg-lib/libx11.inc b/poky/meta/recipes-graphics/xorg-lib/libx11.inc index 4af40ab8a..36c950ad3 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libx11.inc +++ b/poky/meta/recipes-graphics/xorg-lib/libx11.inc @@ -6,8 +6,6 @@ basic functions of the window system." require xorg-lib-common.inc -inherit siteinfo - FILESEXTRAPATHS =. "${FILE_DIRNAME}/libx11:" PE = "1" @@ -18,8 +16,8 @@ XORG_PN = "libX11" LICENSE = "MIT & MIT-style & BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" -DEPENDS += "xproto xextproto xtrans libxcb kbproto inputproto" -DEPENDS += "xproto-native" +DEPENDS += "xorgproto xtrans libxcb" +DEPENDS += "xorgproto-native" EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/ --disable-xf86bigfont" EXTRA_OEMAKE += 'CWARNFLAGS=""' diff --git a/poky/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff b/poky/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.patch index 744cedc77..c1172147a 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff +++ b/poky/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.patch @@ -1,52 +1,50 @@ -Upstream-Status: Pending +From 62005ad019d6afb81da100b3113292a16472d241 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Mon, 10 Sep 2018 09:08:27 +0800 +Subject: [PATCH] Stub out x18n +Update patch to version 1.6.6 +Signed-off-by: Changqing Li <changqing.li@windriver.com> Upstream-Status: Inappropriate [configuration] -Index: libX11-1.3/src/imConv.c -=================================================================== ---- libX11-1.3.orig/src/imConv.c -+++ libX11-1.3/src/imConv.c -@@ -83,6 +83,7 @@ static const struct SubstRec SubstTable[ - * from UCS char to specified charset char. - * This converter is needed for _XimGetCharCode subroutine. - */ -+#ifdef XLOCALE - XPointer - _XimGetLocaleCode ( - _Xconst char* encoding_name) -@@ -96,6 +97,7 @@ _XimGetLocaleCode ( - } - return cvt; - } -+#endif +--- + src/Makefile.am | 5 +- + src/X18NCMSstubs.c | 426 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/imConv.c | 5 +- + src/locking.c | 4 + + 4 files changed, 438 insertions(+), 2 deletions(-) + create mode 100644 src/X18NCMSstubs.c + +diff --git a/src/Makefile.am b/src/Makefile.am +index f8c476d..cdbcbbd 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -336,13 +336,16 @@ if THRSTUBS + libX11_la_SOURCES+=UIThrStubs.c + endif - /* - * Returns the locale dependent representation of a keysym. -@@ -106,6 +108,7 @@ _XimGetLocaleCode ( - * terminating NUL byte. Return 0 if the keysym is not representable in the - * locale - */ -+#ifdef XLOCALE - /*ARGSUSED*/ - int - _XimGetCharCode ( -@@ -135,6 +138,7 @@ _XimGetCharCode ( - buf[count]= '\0'; - return count; - } -+#endif ++libX11_la_SOURCES+=X18NCMSstubs.c ++ + x11datadir = @X11_DATADIR@ + x11data_DATA = XErrorDB - #ifdef XKB - static int lookup_string( -Index: libX11-1.3/src/X18NCMSstubs.c -=================================================================== + EXTRA_DIST = \ + $(x11data_DATA) \ + os2Stubs.c \ +- UIThrStubs.c ++ UIThrStubs.c \ ++ X18NCMSstubs.c + + libX11_xcb_la_SOURCES = x11_xcb.c Xxcbint.h + libX11_xcb_la_LDFLAGS = -version-number 1:0:0 -no-undefined +diff --git a/src/X18NCMSstubs.c b/src/X18NCMSstubs.c +new file mode 100644 +index 0000000..429cb31 --- /dev/null -+++ libX11-1.3/src/X18NCMSstubs.c -@@ -0,0 +1,428 @@ -+/* -+ * X18NCMSstubs.c -+ * - Provides stubs and dummy funcs needed when Xcms and XLocale stuff removed ++++ b/src/X18NCMSstubs.c +@@ -0,0 +1,426 @@ ++ /* - Provides stubs and dummy funcs needed when Xcms and XLocale stuff removed + * -+ * Copyright © 2003 Matthew Allum ++ * Copyright © 2003 Matthew Allum + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that @@ -470,33 +468,48 @@ Index: libX11-1.3/src/X18NCMSstubs.c +} + +#endif -Index: libX11-1.3/src/Makefile.am -=================================================================== ---- libX11-1.3.orig/src/Makefile.am -+++ libX11-1.3/src/Makefile.am -@@ -335,6 +335,8 @@ if THRSTUBS - libX11_la_SOURCES+=UIThrStubs.c - endif - -+libX11_la_SOURCES+=X18NCMSstubs.c -+ - x11datadir = @X11_DATADIR@ - x11data_DATA = XKeysymDB XErrorDB - -@@ -342,6 +344,7 @@ EXTRA_DIST = \ - $(x11data_DATA) \ - os2Stubs.c \ -- UIThrStubs.c -+ UIThrStubs.c \ -+ X18NCMSstubs.c - - if XCB - libX11_la_SOURCES += \ -Index: libX11-1.3/src/locking.c -=================================================================== ---- libX11-1.3.orig/src/locking.c -+++ libX11-1.3/src/locking.c -@@ -66,7 +66,9 @@ in this Software without prior written a +diff --git a/src/imConv.c b/src/imConv.c +index c3c1974..04ecc81 100644 +--- a/src/imConv.c ++++ b/src/imConv.c +@@ -80,6 +80,7 @@ static const struct SubstRec SubstTable[] = { + * from UCS char to specified charset char. + * This converter is needed for _XimGetCharCode subroutine. + */ ++#ifdef XLOCALE + XPointer + _XimGetLocaleCode ( + _Xconst char* encoding_name) +@@ -93,7 +94,7 @@ _XimGetLocaleCode ( + } + return cvt; + } +- ++#endif + /* + * Returns the locale dependent representation of a keysym. + * The locale's encoding is passed in form of pointer to UCS convertor. +@@ -105,6 +105,7 @@ _XimGetLocaleCode ( + * locale + */ + /*ARGSUSED*/ ++#ifdef XLOCALE + int + _XimGetCharCode ( + XPointer ucs_conv, +@@ -133,6 +134,7 @@ _XimGetCharCode ( + buf[count]= '\0'; + return count; + } ++#endif + + #ifdef XKB + static int lookup_string( +diff --git a/src/locking.c b/src/locking.c +index 9f4fe06..e6967ee 100644 +--- a/src/locking.c ++++ b/src/locking.c +@@ -65,7 +65,9 @@ in this Software without prior written authorization from The Open Group. #define NUM_FREE_CVLS 4 /* in lcWrap.c */ @@ -506,7 +519,7 @@ Index: libX11-1.3/src/locking.c #ifdef WIN32 static DWORD _X_TlsIndex = (DWORD)-1; -@@ -594,9 +596,11 @@ Status XInitThreads(void) +@@ -597,9 +599,11 @@ Status XInitThreads(void) _Xglobal_lock = &global_lock; xmutex_init(_Xglobal_lock->lock); xmutex_set_name(_Xglobal_lock->lock, "Xlib global"); @@ -518,3 +531,6 @@ Index: libX11-1.3/src/locking.c _XLockMutex_fn = _XLockMutex; _XUnlockMutex_fn = _XUnlockMutex; _XCreateMutex_fn = _XCreateMutex; +-- +2.7.4 + diff --git a/poky/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff b/poky/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff deleted file mode 100644 index a7c3984fd..000000000 --- a/poky/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff +++ /dev/null @@ -1,17 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> ---- libX11-X11R7.0-1.0.0/src/Font.c.orig 2006-03-12 18:35:42.000000000 +0100 -+++ libX11-X11R7.0-1.0.0/src/Font.c 2006-03-12 18:40:27.000000000 +0100 -@@ -701,7 +701,11 @@ - } - if (l - 2 - (p - charset) < 0) - return 0; -+#ifdef XLOCALE - if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset)) -+#else -+ if (strncasecmp(name + l - 2 - (p - charset), charset, p - charset)) -+#endif - return 0; - if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1) - return 0; diff --git a/poky/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.patch b/poky/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.patch new file mode 100644 index 000000000..09cf74fff --- /dev/null +++ b/poky/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.patch @@ -0,0 +1,33 @@ +From 5c1693028ef12ab767d7cdbc349c27efa1ada87a Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Mon, 10 Sep 2018 09:13:38 +0800 +Subject: [PATCH] Fix build when xlocale disabled + +Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> + +Update patch to version 1.6.6 +Signed-off-by: Changqing Li <changqing.li@windriver.com> +Upstream-Status: Pending +--- + src/Font.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/Font.c b/src/Font.c +index a73f9b1..8f4d210 100644 +--- a/src/Font.c ++++ b/src/Font.c +@@ -675,7 +675,11 @@ int _XF86LoadQueryLocaleFont( + } + if (l - 2 - (p - charset) < 0) + return 0; ++#ifdef XLOCALE + if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset)) ++#else ++ if (strncasecmp(name + l - 2 - (p - charset), charset, p - charset)) ++#endif + return 0; + if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1) + return 0; +-- +2.7.4 + diff --git a/poky/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch b/poky/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch index c6347f5be..0b57e0b06 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch +++ b/poky/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch @@ -1,19 +1,31 @@ -Upstream-Status: Pending +From 046703373055c7029c19d171e415ff3caaa87372 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Mon, 10 Sep 2018 09:16:33 +0800 +Subject: [PATCH] Disable unicode Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# +Update patch to version 1.6.6 + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +Upstream-Status: Pending +--- + include/X11/Xlib.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) ---- libX11-X11R7.0-1.0.0/include/X11/Xlib.h~fix-utf8-wrong-define -+++ libX11-X11R7.0-1.0.0/include/X11/Xlib.h -@@ -103,7 +103,7 @@ +diff --git a/include/X11/Xlib.h b/include/X11/Xlib.h +index 84403f7..56be654 100644 +--- a/include/X11/Xlib.h ++++ b/include/X11/Xlib.h +@@ -67,7 +67,7 @@ _Xmblen( /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in November 2000. Its presence is indicated through the following macro. */ -#define X_HAVE_UTF8_STRING 1 +#undef X_HAVE_UTF8_STRING - typedef char *XPointer; - + /* The Xlib structs are full of implicit padding to properly align members. + We can't clean that up without breaking ABI, so tell clang not to bother +-- +2.7.4 + diff --git a/poky/meta/recipes-graphics/xorg-lib/libx11_1.6.5.bb b/poky/meta/recipes-graphics/xorg-lib/libx11_1.6.6.bb index 427bf28ce..0fee1a908 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libx11_1.6.5.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libx11_1.6.6.bb @@ -10,5 +10,5 @@ do_configure_append () { sed -i -e "/X11_CFLAGS/d" ${B}/src/util/Makefile } -SRC_URI[md5sum] = "0f618db70c4054ca67cee0cc156a4255" -SRC_URI[sha256sum] = "4d3890db2ba225ba8c55ca63c6409c1ebb078a2806de59fb16342768ae63435d" +SRC_URI[md5sum] = "6b0f83e851b3b469dd660f3a95ac3e42" +SRC_URI[sha256sum] = "65fe181d40ec77f45417710c6a67431814ab252d21c2e85c75dd1ed568af414f" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxau_1.0.8.bb b/poky/meta/recipes-graphics/xorg-lib/libxau_1.0.8.bb index 2ef8bfa8b..8c52475b8 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxau_1.0.8.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxau_1.0.8.bb @@ -11,7 +11,7 @@ inherit gettext LICENSE = "MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=7908e342491198401321cec1956807ec" -DEPENDS += " xproto" +DEPENDS += " xorgproto" PROVIDES = "xau" PE = "1" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch b/poky/meta/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch deleted file mode 100644 index d6148834a..000000000 --- a/poky/meta/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch +++ /dev/null @@ -1,29 +0,0 @@ -Upstream-Status: Pending - -There is no extra reply data and if we say not to disgard it, xcb -throws fatal asserts. - -RP - 26/11/09 - -Index: git/xcalibrate.c -=================================================================== ---- git.orig/xcalibrate.c 2009-11-26 08:11:48.000000000 +0000 -+++ git/xcalibrate.c 2009-11-26 08:09:55.000000000 +0000 -@@ -216,7 +216,7 @@ - req->reqType = info->codes->major_opcode; - req->xCalibrateReqType = X_XCalibrateRawMode; - req->on = enable; -- if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) -+ if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) - { - UnlockDisplay (dpy); - SyncHandle (); -@@ -240,7 +240,7 @@ - req->xCalibrateReqType = X_XCalibrateScreenToCoord; - req->x = *x; - req->y = *y; -- if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) -+ if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) - { - UnlockDisplay (dpy); - SyncHandle (); diff --git a/poky/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb b/poky/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb deleted file mode 100644 index 0fe65318b..000000000 --- a/poky/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "XCalibrate: Touchscreen calibration library" - -DESCRIPTION = "libXCalibrate is a library for performing touchscreen \ -calibration with the kdrive tslib touchscreen driver." - -require xorg-lib-common.inc - -LICENSE = "MIT-style" -LIC_FILES_CHKSUM = "file://xcalibrate.h;endline=21;md5=fa572df6439f0f235f2612f370f153d7 \ - file://xcalibrate.c;endline=21;md5=fa572df6439f0f235f2612f370f153d7" - -DEPENDS = "virtual/libx11 calibrateproto libxext" - -SRCREV = "209d83af61ed38a002c8096377deac292b3e396c" -PV = "0.0+git${SRCPV}" - -SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate \ - file://fix-xcb.patch" -UPSTREAM_CHECK_COMMITS = "1" - -S = "${WORKDIR}/git" - -FILES_${PN}-locale += "${datadir}/X11/locale" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxcb/Fix-inconsistent-use-of-tabs-vs.-space.patch b/poky/meta/recipes-graphics/xorg-lib/libxcb/Fix-inconsistent-use-of-tabs-vs.-space.patch deleted file mode 100644 index 899238635..000000000 --- a/poky/meta/recipes-graphics/xorg-lib/libxcb/Fix-inconsistent-use-of-tabs-vs.-space.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 8740a288ca468433141341347aa115b9544891d3 Mon Sep 17 00:00:00 2001 -From: Thomas Klausner <wiz@NetBSD.org> -Date: Thu, 19 May 2016 17:31:18 +0200 -Subject: [PATCH] Fix inconsistent use of tabs vs. space. - -Needed for at least python-3.5.x. - -Signed-off-by: Thomas Klausner <wiz@NetBSD.org> -Signed-off-by: Uli Schlachter <psychon@znc.in> - -Upstream-Status: Backport - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- - src/c_client.py | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/src/c_client.py b/src/c_client.py -index 57de3fb..043338d 100644 ---- a/src/c_client.py -+++ b/src/c_client.py -@@ -1364,7 +1364,7 @@ def _c_serialize(context, self): - _c(' unsigned int xcb_align_to = 0;') - if self.is_switch: - _c(' unsigned int xcb_padding_offset = %d;', -- self.get_align_offset() ) -+ self.get_align_offset() ) - prefix = [('_aux', '->', self)] - aux_ptr = 'xcb_out' - -@@ -1390,7 +1390,7 @@ def _c_serialize(context, self): - _c(' unsigned int xcb_align_to = 0;') - if self.is_switch: - _c(' unsigned int xcb_padding_offset = %d;', -- self.get_align_offset() ) -+ self.get_align_offset() ) - - elif 'sizeof' == context: - param_names = [p[2] for p in params] -@@ -1930,14 +1930,14 @@ def _c_accessors_list(self, field): - # from the request size and divide that by the member size - return '(((R->length * 4) - sizeof('+ self.c_type + '))/'+'sizeof('+field.type.member.c_wiretype+'))' - else: -- # use the accessor to get the start of the list, then -- # compute the length of it by subtracting it from -+ # use the accessor to get the start of the list, then -+ # compute the length of it by subtracting it from - # the adress of the first byte after the end of the - # request -- after_end_of_request = '(((char*)R) + R->length * 4)' -- start_of_list = '%s(R)' % (field.c_accessor_name) -+ after_end_of_request = '(((char*)R) + R->length * 4)' -+ start_of_list = '%s(R)' % (field.c_accessor_name) - bytesize_of_list = '%s - (char*)(%s)' % (after_end_of_request, start_of_list) -- return '(%s) / sizeof(%s)' % (bytesize_of_list, field.type.member.c_wiretype) -+ return '(%s) / sizeof(%s)' % (bytesize_of_list, field.type.member.c_wiretype) - else: - raise Exception( - "lengthless lists with varsized members are not supported. Fieldname '%s'" --- -2.9.0 - diff --git a/poky/meta/recipes-graphics/xorg-lib/libxcb_1.12.bb b/poky/meta/recipes-graphics/xorg-lib/libxcb_1.13.bb index a38bdea5d..a8e0307e1 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxcb_1.12.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxcb_1.13.bb @@ -13,14 +13,14 @@ SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2 \ file://xcbincludedir.patch \ file://disable-check.patch \ file://gcc-mips-pr68302-mips-workaround.patch \ - file://Fix-inconsistent-use-of-tabs-vs.-space.patch \ " -SRC_URI[md5sum] = "28e552bd78bc1050b6b26ca1db0e5bb6" -SRC_URI[sha256sum] = "4adfb1b7c67e99bc9c2ccb110b2f175686576d2f792c8a71b9c8b19014057b5b" + +SRC_URI[md5sum] = "c2b6cf928afa16b0047c974e7aaa783f" +SRC_URI[sha256sum] = "188c8752193c50ff2dbe89db4554c63df2e26a2e47b0fa415a70918b5b851daa" BBCLASSEXTEND = "native nativesdk" -DEPENDS = "xcb-proto xproto libxau libpthread-stubs libxdmcp" +DEPENDS = "xcb-proto xorgproto libxau libpthread-stubs libxdmcp" PACKAGES_DYNAMIC = "^libxcb-.*" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.4.bb b/poky/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.4.bb index 70257194a..73e294840 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.4.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.4.bb @@ -14,7 +14,7 @@ require xorg-lib-common.inc LICENSE = "MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=3f2907aad541f6f226fbc58cc1b3cdf1" -DEPENDS += " compositeproto virtual/libx11 libxfixes libxext" +DEPENDS += " xorgproto virtual/libx11 libxfixes libxext" PROVIDES = "xcomposite" BBCLASSEXTEND = "native" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxdamage_1.1.4.bb b/poky/meta/recipes-graphics/xorg-lib/libxdamage_1.1.4.bb index c3d70043c..6d6ffadf2 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxdamage_1.1.4.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxdamage_1.1.4.bb @@ -16,7 +16,7 @@ require xorg-lib-common.inc LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=9fe101f30dd24134cf43146863241868" -DEPENDS += "virtual/libx11 damageproto libxfixes" +DEPENDS += "virtual/libx11 xorgproto libxfixes" PROVIDES = "xdamage" BBCLASSEXTEND = "native" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.2.bb b/poky/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.2.bb index f4e30d93d..466f3491f 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.2.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.2.bb @@ -13,7 +13,7 @@ inherit gettext LICENSE = "MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=d559fb26e129626022e052a5e6e0e123" -DEPENDS += "xproto" +DEPENDS += "xorgproto" PROVIDES = "xdmcp" PE = "1" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxext_1.3.3.bb b/poky/meta/recipes-graphics/xorg-lib/libxext_1.3.3.bb index 063e531c0..aae8f2af6 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxext_1.3.3.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxext_1.3.3.bb @@ -13,7 +13,7 @@ require xorg-lib-common.inc LICENSE = "MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=879ce266785414bd1cbc3bc2f4d9d7c8" -DEPENDS += "xproto virtual/libx11 xextproto" +DEPENDS += "xorgproto virtual/libx11" PROVIDES = "xext" PE = "1" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxfixes_5.0.3.bb b/poky/meta/recipes-graphics/xorg-lib/libxfixes_5.0.3.bb index c80042d34..f0e2f606c 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxfixes_5.0.3.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxfixes_5.0.3.bb @@ -10,7 +10,7 @@ require xorg-lib-common.inc LICENSE = "MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=3c1ce42c334a6f5cccb0277556a053e0" -DEPENDS += "virtual/libx11 xproto fixesproto xextproto" +DEPENDS += "virtual/libx11 xorgproto" PE = "1" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxfont2_2.0.3.bb b/poky/meta/recipes-graphics/xorg-lib/libxfont2_2.0.3.bb index 5f27a5582..2b72d6750 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxfont2_2.0.3.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxfont2_2.0.3.bb @@ -9,7 +9,7 @@ require xorg-lib-common.inc LICENSE = "MIT & MIT-style & BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=a46c8040f2f737bcd0c435feb2ab1c2c" -DEPENDS += "freetype xtrans fontsproto libfontenc zlib" +DEPENDS += "freetype xtrans xorgproto libfontenc zlib" XORG_PN = "libXfont2" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxfont_1.5.4.bb b/poky/meta/recipes-graphics/xorg-lib/libxfont_1.5.4.bb index 79f77fcea..94c6c66e8 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxfont_1.5.4.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxfont_1.5.4.bb @@ -9,7 +9,7 @@ require xorg-lib-common.inc LICENSE = "MIT & MIT-style & BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=a46c8040f2f737bcd0c435feb2ab1c2c" -DEPENDS += "freetype xtrans fontsproto libfontenc zlib" +DEPENDS += "freetype xtrans xorgproto libfontenc zlib" PROVIDES = "xfont" PE = "1" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxi_1.7.9.bb b/poky/meta/recipes-graphics/xorg-lib/libxi_1.7.9.bb index 74f0527b7..08381d9c4 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxi_1.7.9.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxi_1.7.9.bb @@ -11,7 +11,7 @@ LICENSE = "MIT & MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=17b064789fab936a1c58c4e13d965b0f \ file://src/XIGetDevFocus.c;endline=23;md5=cdfb0d435a33ec57ea0d1e8e395b729f" -DEPENDS += "libxext inputproto libxfixes" +DEPENDS += "libxext xorgproto libxfixes" PE = "1" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxinerama_1.1.3.bb b/poky/meta/recipes-graphics/xorg-lib/libxinerama_1.1.4.bb index bb03f44e2..edce35da5 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxinerama_1.1.3.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxinerama_1.1.4.bb @@ -10,13 +10,13 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=6f4f634d1643a2e638bba3fcd19c2536 \ file://src/Xinerama.c;beginline=2;endline=25;md5=fcef273bfb66339256411dd06ea79c02" -DEPENDS += "libxext xineramaproto" +DEPENDS += "libxext xorgproto" PROVIDES = "xinerama" PE = "1" XORG_PN = "libXinerama" -SRC_URI[md5sum] = "9336dc46ae3bf5f81c247f7131461efd" -SRC_URI[sha256sum] = "7a45699f1773095a3f821e491cbd5e10c887c5a5fce5d8d3fced15c2ff7698e2" +SRC_URI[md5sum] = "0d5f826a197dae74da67af4a9ef35885" +SRC_URI[sha256sum] = "0008dbd7ecf717e1e507eed1856ab0d9cf946d03201b85d5dcf61489bb02d720" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxkbcommon_0.8.0.bb b/poky/meta/recipes-graphics/xorg-lib/libxkbcommon_0.8.2.bb index 050d0b740..8cf508b0b 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxkbcommon_0.8.0.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxkbcommon_0.8.2.bb @@ -9,8 +9,8 @@ DEPENDS = "util-macros flex-native bison-native" SRC_URI = "http://xkbcommon.org/download/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "7d0e4c4a137d0ac45bf6b328c84c3a81" -SRC_URI[sha256sum] = "e829265db04e0aebfb0591b6dc3377b64599558167846c3f5ee5c5e53641fe6d" +SRC_URI[md5sum] = "5f7f8533f907ebcfb1cf8dceb9501264" +SRC_URI[sha256sum] = "7ab8c4b3403d89d01898066b72cb6069bddeb5af94905a65368f671a026ed58c" UPSTREAM_CHECK_URI = "http://xkbcommon.org/" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxkbfile_1.0.9.bb b/poky/meta/recipes-graphics/xorg-lib/libxkbfile_1.0.9.bb index 39a344cca..f5c18607a 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxkbfile_1.0.9.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxkbfile_1.0.9.bb @@ -8,7 +8,7 @@ require xorg-lib-common.inc LICENSE = "MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=8be7367f7e5d605a426f76bb37d4d61f" -DEPENDS += "virtual/libx11 kbproto" +DEPENDS += "virtual/libx11 xorgproto" PE = "1" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxrandr_1.5.1.bb b/poky/meta/recipes-graphics/xorg-lib/libxrandr_1.5.1.bb index 48e88d20a..b90ebc623 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxrandr_1.5.1.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxrandr_1.5.1.bb @@ -11,7 +11,7 @@ require xorg-lib-common.inc LICENSE = "MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=c9d1a2118a6cd5727521db8e7a2fee69" -DEPENDS += "virtual/libx11 randrproto libxrender libxext" +DEPENDS += "virtual/libx11 xorgproto libxrender libxext" PE = "1" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxrender_0.9.10.bb b/poky/meta/recipes-graphics/xorg-lib/libxrender_0.9.10.bb index 92b310270..9b1836613 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxrender_0.9.10.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxrender_0.9.10.bb @@ -11,7 +11,7 @@ require xorg-lib-common.inc LICENSE = "MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=d8bc71986d3b9b3639f6dfd6fac8f196" -DEPENDS += "virtual/libx11 renderproto xproto" +DEPENDS += "virtual/libx11 xorgproto" PE = "1" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxres_1.2.0.bb b/poky/meta/recipes-graphics/xorg-lib/libxres_1.2.0.bb index 8c34e47b4..af6bb19a2 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxres_1.2.0.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxres_1.2.0.bb @@ -10,7 +10,7 @@ require xorg-lib-common.inc LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=8c89441a8df261bdc56587465e13c7fa" -DEPENDS += "libxext resourceproto" +DEPENDS += "libxext xorgproto" PE = "1" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.2.bb b/poky/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.3.bb index 354e5de7f..aed52e75e 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.2.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.3.bb @@ -12,12 +12,12 @@ image is to be displayed and to provide the graphics." LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=21fd154ee757813632ada871a34113fb" -DEPENDS += "libxext scrnsaverproto" +DEPENDS += "libxext xorgproto" PROVIDES = "libxss" RREPLACES_${PN} = "libxss" PE = "1" XORG_PN = "libXScrnSaver" -SRC_URI[md5sum] = "7a773b16165e39e938650bcc9027c1d5" -SRC_URI[sha256sum] = "8ff1efa7341c7f34bcf9b17c89648d6325ddaae22e3904e091794e0b4426ce1d" +SRC_URI[md5sum] = "eeea9d5af3e6c143d0ea1721d27a5e49" +SRC_URI[sha256sum] = "f917075a1b7b5a38d67a8b0238eaab14acd2557679835b154cf2bca576e89bf8" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxshmfence/extensions.patch b/poky/meta/recipes-graphics/xorg-lib/libxshmfence/extensions.patch deleted file mode 100644 index 4cc9e05ab..000000000 --- a/poky/meta/recipes-graphics/xorg-lib/libxshmfence/extensions.patch +++ /dev/null @@ -1,17 +0,0 @@ -With glibc 2.27 memfd_create is behind a _GNU_SOURCE guard, so call -AC_USE_SYSTEM_EXTENSIONS to get that defined. - -Upstream-Status: Submitted -Signed-off-by: Ross Burton <ross.burton@intel.com> - -diff --git a/configure.ac b/configure.ac -index 0c98875..ebf4dee 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -29,4 +29,6 @@ AC_CONFIG_SRCDIR([Makefile.am]) - AC_CONFIG_HEADERS([config.h]) - -+AC_USE_SYSTEM_EXTENSIONS -+ - # Initialize Automake - AM_INIT_AUTOMAKE([foreign dist-bzip2]) diff --git a/poky/meta/recipes-graphics/xorg-lib/libxshmfence_1.2.bb b/poky/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb index 1df068d1b..85a48e4c5 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxshmfence_1.2.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb @@ -13,7 +13,5 @@ DEPENDS += "virtual/libx11" BBCLASSEXTEND = "native nativesdk" -SRC_URI += "file://extensions.patch" - -SRC_URI[md5sum] = "66662e76899112c0f99e22f2fc775a7e" -SRC_URI[sha256sum] = "d21b2d1fd78c1efbe1f2c16dae1cb23f8fd231dcf891465b8debe636a9054b0c" +SRC_URI[md5sum] = "42dda8016943dc12aff2c03a036e0937" +SRC_URI[sha256sum] = "b884300d26a14961a076fbebc762a39831cb75f92bed5ccf9836345b459220c7" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb b/poky/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb index 180d00d9b..f8d94a2f5 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb @@ -16,7 +16,7 @@ LICENSE = "MIT & MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=6565b1e0094ea1caae0971cc4035f343" -DEPENDS += "util-linux libxcb libsm virtual/libx11 kbproto libxdmcp" +DEPENDS += "util-linux libxcb libsm virtual/libx11 xorgproto libxdmcp" PROVIDES = "xt" PE = "1" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxtst_1.2.3.bb b/poky/meta/recipes-graphics/xorg-lib/libxtst_1.2.3.bb index 5717fa5b7..266bd1ca5 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxtst_1.2.3.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxtst_1.2.3.bb @@ -10,7 +10,7 @@ LICENSE = "MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=bb4f89972c3869f617f61c1a79ad1952 \ file://src/XTest.c;beginline=2;endline=32;md5=b1c8c9dff842b4d5b89ca5fa32c40e99" -DEPENDS += "libxext recordproto inputproto libxi" +DEPENDS += "libxext xorgproto libxi" PROVIDES = "xtst" PE = "1" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxv_1.0.11.bb b/poky/meta/recipes-graphics/xorg-lib/libxv_1.0.11.bb index a226c2753..c6027233e 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxv_1.0.11.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxv_1.0.11.bb @@ -10,7 +10,7 @@ require xorg-lib-common.inc LICENSE = "MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=827da9afab1f727f2a66574629e0f39c" -DEPENDS += "libxext videoproto" +DEPENDS += "libxext xorgproto" XORG_PN = "libXv" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxvmc_1.0.10.bb b/poky/meta/recipes-graphics/xorg-lib/libxvmc_1.0.10.bb index 6ed49b1f3..7e49a98dd 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxvmc_1.0.10.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxvmc_1.0.10.bb @@ -9,7 +9,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=0a207f08d4961489c55046c9a5e500da \ file://wrapper/XvMCWrapper.c;endline=26;md5=5151daa8172a3f1bb0cb0e0ff157d9de" -DEPENDS += "libxext libxv videoproto" +DEPENDS += "libxext libxv xorgproto" PE = "1" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.4.bb b/poky/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.4.bb index 695a39637..626199e09 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.4.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.4.bb @@ -9,7 +9,7 @@ emulators for games." LIC_FILES_CHKSUM = "file://COPYING;md5=abb99ac125f84f424a4278153988e32f" -DEPENDS += "libxext xf86dgaproto" +DEPENDS += "libxext" PE = "1" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.3.bb b/poky/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.4.bb index af6f1f76a..45b0673e7 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.3.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.4.bb @@ -8,13 +8,12 @@ require xorg-lib-common.inc LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=27c91ecc435bd3d2bfad868914c94b45" -DEPENDS += "libxext xf86miscproto" +DEPENDS += "libxext" PROVIDES = "xxf86misc" PE = "1" XORG_PN = "libXxf86misc" -SRC_URI[md5sum] = "6bc0bf78909fd71021c466c793d4385c" -SRC_URI[sha256sum] = "563f4200862efd3334c33a669e0a0aae5bab31f3998db75b87a99a697cc26b5b" - +SRC_URI[md5sum] = "37ad70f8b53b94b550f9290be97fbe2d" +SRC_URI[sha256sum] = "a89c03e2b0f16239d67a2031b9003f31b5a686106bbdb3c797fb88ae472af380" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.4.bb b/poky/meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.4.bb index 35f87d271..95fc0b642 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.4.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.4.bb @@ -10,7 +10,7 @@ require xorg-lib-common.inc LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=fa0b9c462d8f2f13eba26492d42ea63d" -DEPENDS += "libxext xf86vidmodeproto" +DEPENDS += "libxext xorgproto" PE = "1" diff --git a/poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.22.bb b/poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.24.bb index 4fd894fd7..7d0e608e7 100644 --- a/poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.22.bb +++ b/poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.24.bb @@ -14,8 +14,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9" SRC_URI = "${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "eb61fb3fd419e817df572b0c8d94a883" -SRC_URI[sha256sum] = "deaec9989fbc443358b43864437b7b6d39caff07890a4a8055105ce9fcaa59bd" +SRC_URI[md5sum] = "74c4bdf52382127cb5802c3f2ab441e0" +SRC_URI[sha256sum] = "91b18580f46b4e4ea913707f6c8d68ab5286879c3a6591462f3b9e760d3ac4d7" SECTION = "x11/libs" DEPENDS = "intltool-native util-macros libxslt-native" diff --git a/poky/meta/recipes-graphics/xorg-lib/xtrans/multilibfix.patch b/poky/meta/recipes-graphics/xorg-lib/xtrans/multilibfix.patch new file mode 100644 index 000000000..c513bad20 --- /dev/null +++ b/poky/meta/recipes-graphics/xorg-lib/xtrans/multilibfix.patch @@ -0,0 +1,18 @@ +The xtrans.pc file is installed into a non-arch directory yet contains libdir +which can vary depending on which multilib is configured. The .pc file does +not require libdir so remove this to fix multilib builds. + +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> +Upstream-Status: Pending + +Index: xtrans-1.3.5/xtrans.pc.in +=================================================================== +--- xtrans-1.3.5.orig/xtrans.pc.in ++++ xtrans-1.3.5/xtrans.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ + + Name: XTrans diff --git a/poky/meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb b/poky/meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb index d5b7f1a2c..200716fb0 100644 --- a/poky/meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb +++ b/poky/meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb @@ -12,6 +12,8 @@ require xorg-lib-common.inc LICENSE = "MIT & MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=49347921d4d5268021a999f250edc9ca" +SRC_URI += "file://multilibfix.patch" + PE = "1" RDEPENDS_${PN}-dev = "" |
