diff options
Diffstat (limited to 'meta/recipes-graphics/xorg-lib')
76 files changed, 614 insertions, 1387 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libdmx_1.1.3.bb b/meta/recipes-graphics/xorg-lib/libdmx_1.1.3.bb deleted file mode 100644 index e623cee421..0000000000 --- a/meta/recipes-graphics/xorg-lib/libdmx_1.1.3.bb +++ /dev/null @@ -1,20 +0,0 @@ -require xorg-lib-common.inc - -SUMMARY = "DMX: Distributed Multihead X extension library" - -DESCRIPTION = "The DMX extension provides support for communication with \ -and control of Xdmx(1) server. Attributes of the Xdmx(1) server and of \ -the back-end screens attached to the server can be queried and modified \ -via this protocol." - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=a3c3499231a8035efd0e004cfbd3b72a \ - file://src/dmx.c;endline=33;md5=c43f19af03c7c8619cadc9724ed9afe1" - -DEPENDS += "libxext dmxproto" - -PE = "1" - -SRC_URI[md5sum] = "ba983eba5a9f05d152a0725b8e863151" -SRC_URI[sha256sum] = "c97da36d2e56a2d7b6e4f896241785acc95e97eb9557465fd66ba2a155a7b201" - diff --git a/meta/recipes-graphics/xorg-lib/libfontenc_1.1.3.bb b/meta/recipes-graphics/xorg-lib/libfontenc_1.1.8.bb index a181f05c29..0fc117fc58 100644 --- a/meta/recipes-graphics/xorg-lib/libfontenc_1.1.3.bb +++ b/meta/recipes-graphics/xorg-lib/libfontenc_1.1.8.bb @@ -8,10 +8,9 @@ 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" +SRC_URI[sha256sum] = "7b02c3d405236e0d86806b1de9d6868fe60c313628b38350b032914aa4fd14c6" -SRC_URI[md5sum] = "0920924c3a9ebc1265517bdd2f9fde50" -SRC_URI[sha256sum] = "70588930e6fc9542ff38e0884778fbc6e6febf21adbab92fd8f524fe60aefd21" +BBCLASSEXTEND = "native" diff --git a/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb b/meta/recipes-graphics/xorg-lib/libice_1.1.1.bb index f069749ce0..d5e3d28e06 100644 --- a/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb +++ b/meta/recipes-graphics/xorg-lib/libice_1.1.1.bb @@ -8,20 +8,19 @@ negotiating versions, and for reporting errors. " require xorg-lib-common.inc -LICENSE = "MIT-style" +LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=d162b1b3c6fa812da9d804dcf8584a93" -DEPENDS += "xproto xtrans" +DEPENDS += "xorgproto xtrans" PROVIDES = "ice" PE = "1" XORG_PN = "libICE" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" -SRC_URI[md5sum] = "addfb1e897ca8079531669c7c7711726" -SRC_URI[sha256sum] = "8f7032f2c1c64352b5423f6b48a8ebdc339cc63064af34d66a6c9aa79759e202" +SRC_URI[sha256sum] = "03e77afaf72942c7ac02ccebb19034e6e20f456dcf8dddadfeb572aa5ad3e451" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[arc4] = "ac_cv_lib_bsd_arc4random_buf=yes,ac_cv_lib_bsd_arc4random_buf=no,libbsd" diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess/0004-Don-t-include-sys-io.h-on-arm.patch b/meta/recipes-graphics/xorg-lib/libpciaccess/0004-Don-t-include-sys-io.h-on-arm.patch deleted file mode 100644 index f532858244..0000000000 --- a/meta/recipes-graphics/xorg-lib/libpciaccess/0004-Don-t-include-sys-io.h-on-arm.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b6df5202306bd71158b482f25ca2e6919645d4dd Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 4 Jun 2015 20:55:06 -0700 -Subject: [PATCH 4/4] Don't include sys/io.h on arm - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - src/linux_sysfs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/linux_sysfs.c b/src/linux_sysfs.c -index 3f95e53..1e3aad3 100644 ---- a/src/linux_sysfs.c -+++ b/src/linux_sysfs.c -@@ -50,7 +50,7 @@ - #include <dirent.h> - #include <errno.h> - --#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) -+#if defined(__i386__) || defined(__x86_64__) - #include <sys/io.h> - #else - #define inb(x) -1 --- -2.1.4 - diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess_0.14.bb b/meta/recipes-graphics/xorg-lib/libpciaccess_0.14.bb deleted file mode 100644 index a44a5c8927..0000000000 --- a/meta/recipes-graphics/xorg-lib/libpciaccess_0.14.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Generic PCI access library for X" - -DESCRIPTION = "libpciaccess provides functionality for X to access the \ -PCI bus and devices in a platform-independent way." - -require xorg-lib-common.inc - -SRC_URI += "\ - file://0004-Don-t-include-sys-io.h-on-arm.patch \ -" - -SRC_URI[md5sum] = "8f436e151d5106a9cfaa71857a066d33" -SRC_URI[sha256sum] = "3df543e12afd41fea8eac817e48cbfde5aed8817b81670a4e9e493bb2f5bf2a4" - -LICENSE = "MIT & MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=277aada5222b9a22fbf3471ff3687068" - -REQUIRED_DISTRO_FEATURES = "" diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess_0.18.1.bb b/meta/recipes-graphics/xorg-lib/libpciaccess_0.18.1.bb new file mode 100644 index 0000000000..d311fd95e0 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libpciaccess_0.18.1.bb @@ -0,0 +1,26 @@ +SUMMARY = "Generic PCI access library for X" + +DESCRIPTION = "libpciaccess provides functionality for X to access the \ +PCI bus and devices in a platform-independent way." + +HOMEPAGE = "http://www.x.org" +BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg" + +SECTION = "x11/libs" +LICENSE = "MIT" +DEPENDS = "util-macros" + +SRC_URI = "${XORG_MIRROR}/individual/lib/${BP}.tar.xz" + +inherit features_check pkgconfig meson + +REQUIRED_DISTRO_FEATURES ?= "x11" + +SRC_URI[sha256sum] = "4af43444b38adb5545d0ed1c2ce46d9608cc47b31c2387fc5181656765a6fa76" + +LICENSE = "MIT & MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=54c978968e565218eea36cf03ef24352" + +REQUIRED_DISTRO_FEATURES = "" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.4.bb b/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.5.bb index a699841255..62384e6d2e 100644 --- a/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.4.bb +++ b/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.5.bb @@ -7,19 +7,12 @@ SECTION = "x11/libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=6edc1fea03d959f0c2d743fe5ca746ad" -#DEPENDS = "xcb-proto xproto libxau libxslt-native" -# DEPENDS += "xsltproc-native gperf-native" +SRC_URI = "http://xcb.freedesktop.org/dist/${BP}.tar.xz" +SRC_URI[sha256sum] = "59da566decceba7c2a7970a4a03b48d9905f1262ff94410a649224e33d2442bc" -ALLOW_EMPTY_${PN} = "1" +inherit autotools -SRC_URI = "http://xcb.freedesktop.org/dist/libpthread-stubs-${PV}.tar.bz2" - -SRC_URI[md5sum] = "48c1544854a94db0e51499cc3afd797f" -SRC_URI[sha256sum] = "e4d05911a3165d3b18321cc067fdd2f023f06436e391c6a28dff618a78d2e733" - -inherit autotools pkgconfig - -RDEPENDS_${PN}-dev = "" -RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" +DEV_PKG_DEPENDENCY = "" +RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb b/meta/recipes-graphics/xorg-lib/libsm_1.2.4.bb index 48922cb992..ab030723c6 100644 --- a/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb +++ b/meta/recipes-graphics/xorg-lib/libsm_1.2.4.bb @@ -8,10 +8,10 @@ has a particular state." require xorg-lib-common.inc -LICENSE = "MIT-style" +LICENSE = "MIT" 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'. @@ -22,10 +22,9 @@ PE = "1" XORG_PN = "libSM" -BBCLASSEXTEND = "native" - -SRC_URI[md5sum] = "499a7773c65aba513609fe651853c5f3" -SRC_URI[sha256sum] = "0baca8c9f5d934450a70896c4ad38d06475521255ca63b717a6510fdb6e287bd" +SRC_URI[sha256sum] = "fdcbe51e4d1276b1183da77a8a4e74a137ca203e0bcfb20972dd5f3347e97b84" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/xorg-lib/libx11-compose-data/0001-Drop-x11-dependencies.patch b/meta/recipes-graphics/xorg-lib/libx11-compose-data/0001-Drop-x11-dependencies.patch new file mode 100644 index 0000000000..61af98d95e --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11-compose-data/0001-Drop-x11-dependencies.patch @@ -0,0 +1,90 @@ +From e1f9b0b531c6ddb11a85c0664051e2e4efc589fb Mon Sep 17 00:00:00 2001 +From: Ming Liu <ming.liu@toradex.com> +Date: Sun, 5 May 2019 11:55:14 +0200 +Subject: [PATCH] Drop x11 dependencies + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Ming Liu <ming.liu@toradex.com> + +Rebase for version 1.8.3. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + configure.ac | 44 -------------------------------------------- + 1 file changed, 44 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 33d0102..50e2d93 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -76,27 +76,8 @@ fi + AC_SUBST([EXEEXT_FOR_BUILD]) + + # Checks for pkg-config packages +- +-# Always required +-X11_REQUIRES='xproto >= 7.0.25 xextproto xtrans xcb >= 1.11.1' +-X11_EXTRA_DEPS="xcb >= 1.11.1" +- + PKG_PROG_PKG_CONFIG() + +-AC_SUBST(X11_EXTRA_DEPS) +- +-# Issue an error if xtrans.m4 was not found and XTRANS_CONNECTION_FLAGS macro +-# was not expanded, since libX11 with no transport types is rather useless. +-# +-# If you're seeing an error here, be sure you installed the lib/xtrans module +-# first and if it's not in the default location, that you set the ACLOCAL +-# environment variable to find it, such as: +-# ACLOCAL="aclocal -I ${PREFIX}/share/aclocal" +-m4_pattern_forbid([^XTRANS_CONNECTION_FLAGS$]) +- +-# Transport selection macro from xtrans.m4 +-XTRANS_CONNECTION_FLAGS +- + # Check for dlopen + AC_MSG_CHECKING([if run-time linking is supported]) + AC_SEARCH_LIBS(dlopen,[dl svld]) +@@ -255,30 +236,6 @@ AC_SUBST(USE_THREAD_LIBS) + + AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], ) + +-# +-# Find keysymdef.h +-# +-AC_MSG_CHECKING([keysym definitions]) +-AC_ARG_WITH([keysymdefdir], +- [AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h (defaults to xproto include dir)])], +- [KEYSYMDEFDIR=$withval], +- [KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11]) +- +-if test ! -d "$KEYSYMDEFDIR"; then +- AC_MSG_ERROR([$KEYSYMDEFDIR doesn't exist or isn't a directory]) +-fi +- +-FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h" +-for i in $FILES; do +- if test -f "$KEYSYMDEFDIR/$i"; then +- KEYSYMDEFS="$KEYSYMDEFS $KEYSYMDEFDIR/$i" +- elif test "x$i" = "xkeysymdef.h"; then +- AC_MSG_ERROR([Cannot find keysymdef.h]) +- fi +-done +-AC_MSG_RESULT([$KEYSYMDEFS]) +-AC_SUBST(KEYSYMDEFS) +- + AC_ARG_ENABLE(xcms, + AS_HELP_STRING([--disable-xcms], + [Disable Xlib support for CMS *EXPERIMENTAL*]), +@@ -358,7 +315,6 @@ X11_LIBDIR="${libdir}/X11" + AX_DEFINE_DIR(X11_LIBDIR, X11_LIBDIR, [Location of libX11 library data]) + AC_SUBST(X11_LIBDIR) + +-PKG_CHECK_MODULES(X11, [$X11_REQUIRES]) + X11_CFLAGS="$X11_CFLAGS $XTHREAD_CFLAGS" + + # +-- +2.7.4 + diff --git a/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.8.4.bb b/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.8.4.bb new file mode 100644 index 0000000000..2131f46213 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.8.4.bb @@ -0,0 +1,35 @@ +SUMMARY = "Xlib: Compose data files for libx11" +DESCRIPTION = "This package provides the compose data files for libx11." + +python () { + if bb.utils.contains('DISTRO_FEATURES', 'x11', True, False, d): + raise bb.parse.SkipRecipe("libx11-compose-data is incompatible with x11 distro feature, use libx11 instead.") +} + +require xorg-lib-common.inc + +LICENSE = "MIT & BSD-1-Clause & HPND & HPND-sell-variant & ISC" +LIC_FILES_CHKSUM = "file://COPYING;md5=1d49cdd2b386c5db11ec636d680b7116" + +XORG_PN = "libX11" + +SRC_URI += "file://0001-Drop-x11-dependencies.patch \ + " + +SRC_URI[sha256sum] = "c9a287a5aefa9804ce3cfafcf516fe96ed3f7e8e45c0e2ee59e84c86757df518" + +REQUIRED_DISTRO_FEATURES = "" + +EXTRA_OECONF += "--disable-xkb" + +do_compile() { + oe_runmake -C nls +} + +do_install() { + oe_runmake DESTDIR=${D} -C nls install +} + +PACKAGES = "${PN}" + +FILES:${PN} = "${datadir}/X11/locale ${libdir}/X11/locale" diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.5.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.5.bb deleted file mode 100644 index 295f96a2e7..0000000000 --- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.5.bb +++ /dev/null @@ -1,19 +0,0 @@ -require libx11.inc - -DESCRIPTION += " Support for XCMS and XLOCALE is disabled in \ -this version." - -SRC_URI += "file://X18NCMSstubs.diff \ - file://fix-disable-xlocale.diff \ - file://fix-utf8-wrong-define.patch \ - " - -RPROVIDES_${PN}-dev = "libx11-dev" -RPROVIDES_${PN}-locale = "libx11-locale" - -SRC_URI[md5sum] = "0f618db70c4054ca67cee0cc156a4255" -SRC_URI[sha256sum] = "4d3890db2ba225ba8c55ca63c6409c1ebb078a2806de59fb16342768ae63435d" - -EXTRA_OECONF += "--disable-xlocale" - -PACKAGECONFIG ??= "" diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc deleted file mode 100644 index b04eafbdf2..0000000000 --- a/meta/recipes-graphics/xorg-lib/libx11.inc +++ /dev/null @@ -1,41 +0,0 @@ -SUMMARY = "Xlib: C Language X Interface library" - -DESCRIPTION = "This package provides a client interface to the X Window \ -System, otherwise known as 'Xlib'. It provides a complete API for the \ -basic functions of the window system." - -require xorg-lib-common.inc - -inherit siteinfo - -FILESEXTRAPATHS =. "${FILE_DIRNAME}/libx11:" - -PE = "1" - -PROVIDES = "virtual/libx11" - -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" - -EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/ --disable-xf86bigfont" -EXTRA_OEMAKE += 'CWARNFLAGS=""' - -PACKAGECONFIG ??= "xcms" -PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms" - -# src/util/makekeys is built natively but needs -D_GNU_SOURCE defined. -CPPFLAGS_FOR_BUILD += "-D_GNU_SOURCE" - -PACKAGES =+ "${PN}-xcb" - -FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${datadir}/X11/Xcms.txt" -FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*" -FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" - -# Multiple libx11 derivatives from from this file and are selected by virtual/libx11 -# A world build should only build the correct version, not all of them. -EXCLUDE_FROM_WORLD = "1" diff --git a/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch b/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch deleted file mode 100644 index 897882b8d8..0000000000 --- a/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 5235a7f3692a4c3c90dd4ac1be3c670388904bbe Mon Sep 17 00:00:00 2001 -From: Tatu Frisk <tatu.frisk@ge.com> -Date: Tue, 14 Mar 2017 14:41:27 +0200 -Subject: [PATCH] Fix hanging issue in _XReply - -Assume event queue is empty if another thread is blocking waiting for event. - -If one thread was blocking waiting for an event and another thread sent a -reply to the X server, both threads got blocked until an event was -received. - -Upstream-Status: Submitted [https://patchwork.freedesktop.org/patch/171458/] - -This patch needs to be removed once the corresponding patch has been merged upstream. - -https://patchwork.freedesktop.org/patch/171458/ - -Signed-off-by: Tatu Frisk <tatu.frisk@ge.com> -Signed-off-by: Jose Alarcon <jose.alarcon@ge.com> ---- - src/xcb_io.c | 19 +++++++------------ - 1 file changed, 7 insertions(+), 12 deletions(-) - -diff --git a/src/xcb_io.c b/src/xcb_io.c -index 5987329..c64eb04 100644 ---- a/src/xcb_io.c -+++ b/src/xcb_io.c -@@ -609,22 +609,17 @@ Status _XReply(Display *dpy, xReply *rep, int extra, Bool discard) - * letting anyone else process this sequence number, we - * need to process any events that should have come - * earlier. */ -- - if(dpy->xcb->event_owner == XlibOwnsEventQueue) - { - xcb_generic_reply_t *event; -- /* If some thread is already waiting for events, -- * it will get the first one. That thread must -- * process that event before we can continue. */ -- /* FIXME: That event might be after this reply, -- * and might never even come--or there might be -- * multiple threads trying to get events. */ -- while(dpy->xcb->event_waiter) -- { /* need braces around ConditionWait */ -- ConditionWait(dpy, dpy->xcb->event_notify); -+ -+ /* Assume event queue is empty if another thread is blocking -+ * waiting for event. */ -+ if(!dpy->xcb->event_waiter) -+ { -+ while((event = poll_for_response(dpy))) -+ handle_response(dpy, event, True); - } -- while((event = poll_for_event(dpy))) -- handle_response(dpy, event, True); - } - - req->reply_waiter = 0; --- -2.10.1 - diff --git a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff deleted file mode 100644 index 744cedc777..0000000000 --- a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff +++ /dev/null @@ -1,520 +0,0 @@ -Upstream-Status: Pending - -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 - - /* - * 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 - - #ifdef XKB - static int lookup_string( -Index: libX11-1.3/src/X18NCMSstubs.c -=================================================================== ---- /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 -+ * -+ * 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 -+ * the above copyright notice appear in all copies and that both that -+ * copyright notice and this permission notice appear in supporting -+ * documentation, and that the name of Matthew Allum not be used in -+ * advertising or publicity pertaining to distribution of the software without -+ * specific, written prior permission. Keith Packard and Compaq makes no -+ * representations about the suitability of this software for any purpose. It -+ * is provided "as is" without express or implied warranty. -+ * -+ * MATTHEW ALLUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS -+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, -+ * IN NO EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -+ * PERFORMANCE OF THIS SOFTWARE. -+ */ -+ -+#include <stdlib.h> -+#include "Xlibint.h" -+#include "Xlcint.h" -+#include <X11/Xlocale.h> -+#include <X11/Xos.h> -+#ifdef WIN32 -+#undef close -+#endif -+#include <X11/Xutil.h> -+#include "XlcPubI.h" -+ -+#include "Xcmsint.h" /* for XcmsCCC type */ -+#include "XlcPubI.h" /* for XLCd type */ -+#include "config.h" -+ -+#if ! XLOCALE -+ -+Bool -+XSupportsLocale() -+{ -+ return False; -+} -+ -+char * -+XSetLocaleModifiers( -+ const char *modifiers) -+{ -+ return NULL; -+} -+ -+XLCd -+_XOpenLC( -+ char *name) -+{ -+ return NULL; -+} -+ -+XLCd -+_XlcCurrentLC() -+{ -+ return NULL; -+} -+ -+void -+_XlcVaToArgList( -+ va_list var, -+ int count, -+ XlcArgList *args_ret) -+{ -+ return; -+} -+ -+void -+_XlcCountVaList( -+ va_list var, -+ int *count_ret) -+{ -+ return; -+} -+ -+void -+_XCloseLC( -+ XLCd lcd) -+{ -+ return; -+} -+ -+int -+_XlcConvert( -+ XlcConv conv, -+ XPointer *from, -+ int *from_left, -+ XPointer *to, -+ int *to_left, -+ XPointer *args, -+ int num_args) -+{ -+ return 0; -+} -+ -+/* XIM Stubs */ -+ -+XPointer -+_XimGetLocaleCode ( _Xconst char* encoding_name ) -+{ -+ return NULL; -+} -+ -+int -+_XimGetCharCode ( -+ XPointer ucs_conv, -+ KeySym keysym, -+ unsigned char* buf, -+ int nbytes) -+{ -+ return 0; -+} -+ -+/* Xrm Stubs */ -+ -+XrmMethods -+_XrmInitParseInfo( -+ XPointer *state) -+{ -+ return (XrmMethods) NULL; -+} -+ -+/* Xwc Stubs */ -+ -+int -+XwcTextExtents( -+ XFontSet font_set, -+ _Xconst wchar_t *text, -+ int text_len, -+ XRectangle *overall_ink_extents, -+ XRectangle *overall_logical_extents) -+{ -+ return 0; -+} -+ -+void -+XwcDrawString(Display *display, -+ Drawable d, -+ XFontSet font_set, -+ GC gc, -+ int x, int y, -+ _Xconst wchar_t *string, -+ int num_wchars) -+{ -+ ; -+} -+ -+void -+XwcDrawText( -+ Display *dpy, -+ Drawable d, -+ GC gc, -+ int x, -+ int y, -+ XwcTextItem *text_items, -+ int nitems) -+{ -+ ; -+} -+ -+void -+XwcDrawImageString( -+ Display *dpy, -+ Drawable d, -+ XFontSet font_set, -+ GC gc, -+ int x, -+ int y, -+ _Xconst wchar_t *text, -+ int text_len) -+{ -+ ; -+} -+ -+int -+XwcTextEscapement( -+ XFontSet font_set, -+ _Xconst wchar_t *text, -+ int text_len) -+{ -+ return 0; -+} -+ -+Status -+XwcTextPerCharExtents( -+ XFontSet font_set, -+ _Xconst wchar_t *text, -+ int text_len, -+ XRectangle *ink_extents_buffer, -+ XRectangle *logical_extents_buffer, -+ int buffer_size, -+ int *num_chars, -+ XRectangle *max_ink_extents, -+ XRectangle *max_logical_extents) -+{ -+ return(XcmsFailure); -+} -+ -+int -+XwcTextPropertyToTextList( -+ Display *dpy, -+ const XTextProperty *text_prop, -+ wchar_t ***list_ret, -+ int *count_ret) -+{ -+ return 0; -+} -+ -+int -+XwcTextListToTextProperty( -+ Display *dpy, -+ wchar_t **list, -+ int count, -+ XICCEncodingStyle style, -+ XTextProperty *text_prop) -+{ -+ return 0; -+} -+ -+void -+XwcFreeStringList(wchar_t **list) -+{ -+ return; -+} -+ -+ -+void XmbSetWMProperties ( /* Actually from mbWMProps.c */ -+ Display *dpy, -+ Window w, -+ _Xconst char *windowName, -+ _Xconst char *iconName, -+ char **argv, -+ int argc, -+ XSizeHints *sizeHints, -+ XWMHints *wmHints, -+ XClassHint *classHints) -+{ -+ return; -+} -+ -+int -+XmbTextPropertyToTextList( -+ Display *dpy, -+ const XTextProperty *text_prop, -+ char ***list_ret, -+ int *count_ret) -+{ -+ return XLocaleNotSupported; -+} -+ -+int -+XmbTextListToTextProperty( -+ Display *dpy, -+ char **list, -+ int count, -+ XICCEncodingStyle style, -+ XTextProperty *text_prop) -+{ -+ return XLocaleNotSupported; -+} -+ -+int -+XmbTextExtents( -+ XFontSet font_set, -+ _Xconst char *text, -+ int text_len, -+ XRectangle *overall_ink_extents, -+ XRectangle *overall_logical_extents) -+{ -+ return 0; -+} -+ -+void -+XmbDrawText( -+ Display *dpy, -+ Drawable d, -+ GC gc, -+ int x, -+ int y, -+ XmbTextItem *text_items, -+ int nitems) -+{ -+ ; -+} -+ -+void -+XmbDrawString( -+ Display *dpy, -+ Drawable d, -+ XFontSet font_set, -+ GC gc, -+ int x, -+ int y, -+ _Xconst char *text, -+ int text_len) -+{ -+ ; -+} -+ -+void -+XmbDrawImageString( -+ Display *dpy, -+ Drawable d, -+ XFontSet font_set, -+ GC gc, -+ int x, -+ int y, -+ _Xconst char *text, -+ int text_len) -+{ -+ ; -+} -+ -+int -+XmbTextEscapement( -+ XFontSet font_set, -+ _Xconst char *text, -+ int text_len) -+{ -+ return 0; -+} -+ -+Status -+XmbTextPerCharExtents( -+ XFontSet font_set, -+ _Xconst char *text, -+ int text_len, -+ XRectangle *ink_extents_buffer, -+ XRectangle *logical_extents_buffer, -+ int buffer_size, -+ int *num_chars, -+ XRectangle *max_ink_extents, -+ XRectangle *max_logical_extents) -+{ -+ return 0; -+} -+ -+unsigned int -+KeySymToUcs4(KeySym keysym) -+{ -+ return 0; -+} -+ -+#endif -+ -+#if ! XCMS -+ -+XcmsCCC -+XcmsCCCOfColormap(dpy, cmap) -+ Display *dpy; -+ Colormap cmap; -+{ -+ return NULL; -+} -+ -+Status -+_XcmsResolveColorString ( -+ XcmsCCC ccc, -+ const char **color_string, -+ XcmsColor *pColor_exact_return, -+ XcmsColorFormat result_format) -+{ -+ return(XcmsFailure); -+} -+ -+void -+_XcmsUnresolveColor( -+ XcmsCCC ccc, -+ XcmsColor *pColor) -+{ -+ return; -+} -+ -+void -+_XUnresolveColor( -+ XcmsCCC ccc, -+ XColor *pXColor) -+{ -+ return; -+} -+ -+XcmsCmapRec * -+_XcmsAddCmapRec(dpy, cmap, windowID, visual) -+ Display *dpy; -+ Colormap cmap; -+ Window windowID; -+ Visual *visual; -+{ -+ return NULL; -+} -+ -+void -+_XcmsRGB_to_XColor( -+ XcmsColor *pColors, -+ XColor *pXColors, -+ unsigned int nColors) -+{ -+ return; -+} -+ -+XcmsCmapRec * -+_XcmsCopyCmapRecAndFree( -+ Display *dpy, -+ Colormap src_cmap, -+ Colormap copy_cmap) -+{ -+ return NULL; -+} -+ -+void -+_XcmsDeleteCmapRec( -+ Display *dpy, -+ Colormap cmap) -+{ -+ return; -+} -+ -+#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 - #define NUM_FREE_CVLS 4 - - /* in lcWrap.c */ -+#ifdef XLOCALE - extern LockInfoPtr _Xi18n_lock; -+#endif - - #ifdef WIN32 - static DWORD _X_TlsIndex = (DWORD)-1; -@@ -594,9 +596,11 @@ Status XInitThreads(void) - _Xglobal_lock = &global_lock; - xmutex_init(_Xglobal_lock->lock); - xmutex_set_name(_Xglobal_lock->lock, "Xlib global"); -+#ifdef XLOCALE - _Xi18n_lock = &i18n_lock; - xmutex_init(_Xi18n_lock->lock); - xmutex_set_name(_Xi18n_lock->lock, "Xlib i18n"); -+#endif - _XLockMutex_fn = _XLockMutex; - _XUnlockMutex_fn = _XUnlockMutex; - _XCreateMutex_fn = _XCreateMutex; diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff b/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff deleted file mode 100644 index a7c3984fd5..0000000000 --- a/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/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch b/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch deleted file mode 100644 index c6347f5be1..0000000000 --- a/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch +++ /dev/null @@ -1,19 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- 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 @@ - - /* 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; - diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.6.5.bb b/meta/recipes-graphics/xorg-lib/libx11_1.6.5.bb deleted file mode 100644 index 427bf28ceb..0000000000 --- a/meta/recipes-graphics/xorg-lib/libx11_1.6.5.bb +++ /dev/null @@ -1,14 +0,0 @@ -require libx11.inc -inherit gettext - -BBCLASSEXTEND = "native nativesdk" - -SRC_URI += "file://disable_tests.patch \ - file://Fix-hanging-issue-in-_XReply.patch \ - " -do_configure_append () { - sed -i -e "/X11_CFLAGS/d" ${B}/src/util/Makefile -} - -SRC_URI[md5sum] = "0f618db70c4054ca67cee0cc156a4255" -SRC_URI[sha256sum] = "4d3890db2ba225ba8c55ca63c6409c1ebb078a2806de59fb16342768ae63435d" diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.8.9.bb b/meta/recipes-graphics/xorg-lib/libx11_1.8.9.bb new file mode 100644 index 0000000000..5dcb063473 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11_1.8.9.bb @@ -0,0 +1,43 @@ +SUMMARY = "Xlib: C Language X Interface library" + +DESCRIPTION = "This package provides a client interface to the X Window \ +System, otherwise known as 'Xlib'. It provides a complete API for the \ +basic functions of the window system." + +require xorg-lib-common.inc + +LICENSE = "MIT & BSD-1-Clause & HPND & HPND-sell-variant & ISC" +LIC_FILES_CHKSUM = "file://COPYING;md5=1d49cdd2b386c5db11ec636d680b7116" + +DEPENDS += "xorgproto \ + xtrans \ + libxcb \ + xorgproto-native \ + autoconf-archive-native \ + " + +PROVIDES = "virtual/libx11" + +PE = "1" + +XORG_PN = "libX11" + +SRC_URI += "file://disable_tests.patch" + +SRC_URI[sha256sum] = "779d8f111d144ef93e2daa5f23a762ce9555affc99592844e71c4243d3bd3262" + +inherit gettext + +EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/ --disable-xf86bigfont" +EXTRA_OEMAKE += 'CWARNFLAGS=""' + +PACKAGECONFIG ??= "xcms" +PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms" + +PACKAGES =+ "${PN}-xcb" + +FILES:${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${datadir}/X11/Xcms.txt" +FILES:${PN}-xcb += "${libdir}/libX11-xcb.so.*" +FILES:${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/xorg-lib/libxau_1.0.8.bb b/meta/recipes-graphics/xorg-lib/libxau_1.0.11.bb index 2ef8bfa8b6..f1b492c39f 100644 --- a/meta/recipes-graphics/xorg-lib/libxau_1.0.8.bb +++ b/meta/recipes-graphics/xorg-lib/libxau_1.0.11.bb @@ -8,10 +8,10 @@ require xorg-lib-common.inc inherit gettext -LICENSE = "MIT-style" +LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=7908e342491198401321cec1956807ec" -DEPENDS += " xproto" +DEPENDS += " xorgproto" PROVIDES = "xau" PE = "1" @@ -20,5 +20,4 @@ XORG_PN = "libXau" BBCLASSEXTEND = "native nativesdk" -SRC_URI[md5sum] = "685f8abbffa6d145c0f930f00703b21b" -SRC_URI[sha256sum] = "fdd477320aeb5cdd67272838722d6b7d544887dfe7de46e1e7cc0c27c2bea4f2" +SRC_URI[sha256sum] = "f3fa3282f5570c3f6bd620244438dbfbdd580fc80f02f549587a0f8ab329bbeb" diff --git a/meta/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch b/meta/recipes-graphics/xorg-lib/libxcalibrate/fix-xcb.patch deleted file mode 100644 index d6148834a6..0000000000 --- a/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/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb b/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb deleted file mode 100644 index 0fe65318be..0000000000 --- a/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/meta/recipes-graphics/xorg-lib/libxcb/0001-use-_Alignof-to-avoid-UB-in-ALIGNOF.patch b/meta/recipes-graphics/xorg-lib/libxcb/0001-use-_Alignof-to-avoid-UB-in-ALIGNOF.patch new file mode 100644 index 0000000000..5b159d646d --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxcb/0001-use-_Alignof-to-avoid-UB-in-ALIGNOF.patch @@ -0,0 +1,45 @@ +From d55b6b1fa87700f3eae3a29522972d2e7be7d53e Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 14 Jan 2023 10:11:35 -0800 +Subject: [PATCH] use _Alignof to avoid UB in ALIGNOF + +WG14 N2350 clearly says that it is an UB having type definitions +within "offsetof" [1]. Clang 16+ has started diagnosing it [2]. +This patch changes the implementation of macro +"ALIGNOF" to builtin "_Alignof" to avoid undefined behavior. + +_Alignof() return the ABI required minimum alignment. + +[1] https://www.open-std.org/jtc1/sc22/wg14/www/docs/n2350.htm +[2] https://reviews.llvm.org/D133574 + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/xorg/lib/libxcb/-/merge_requests/42] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/c_client.py | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/c_client.py b/src/c_client.py +index fd256f0..4e48f13 100644 +--- a/src/c_client.py ++++ b/src/c_client.py +@@ -288,7 +288,6 @@ def c_open(self): + _c('#include "%s.h"', _ns.header) + + _c('') +- _c('#define ALIGNOF(type) offsetof(struct { char dummy; type member; }, member)') + + if _ns.is_ext: + for (n, h) in self.direct_imports: +@@ -1266,7 +1265,7 @@ def _c_serialize_helper_fields(context, self, + count += 1 + + code_lines.append( +- '%s xcb_align_to = ALIGNOF(%s);' ++ '%s xcb_align_to = _Alignof(%s);' + % (space, + 'char' + if field.c_field_type == 'void' or field.type.is_switch +-- +2.39.0 + diff --git a/meta/recipes-graphics/xorg-lib/libxcb/Fix-inconsistent-use-of-tabs-vs.-space.patch b/meta/recipes-graphics/xorg-lib/libxcb/Fix-inconsistent-use-of-tabs-vs.-space.patch deleted file mode 100644 index 8992386359..0000000000 --- a/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/meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch b/meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch deleted file mode 100644 index 5641c0fe95..0000000000 --- a/meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch +++ /dev/null @@ -1,25 +0,0 @@ -The "check" package is checked for without an explicit enable/disable option, -which can lead to non-deterministic build issues with both check and libxslt. - -As the unit test suite is minimal at present, simply disable the test suite. In -the future if the test suite is expanded this can be made conditional on the -ptest DISTRO_FEATURE. - -Upstream-Status: Inappropriate -Signed-off-by: Ross Burton <ross.burton@intel.com> - - -diff --git a/configure.ac b/configure.ac -index 6d7c9a5..22cceb9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -21,7 +21,8 @@ AC_USE_SYSTEM_EXTENSIONS - - AM_PATH_PYTHON([2.6]) - --PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no]) -+dnl PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no]) -+HAVE_CHECK=no - AM_CONDITIONAL(HAVE_CHECK, test x$HAVE_CHECK = xyes) - - AC_CONFIG_HEADERS([src/config.h]) diff --git a/meta/recipes-graphics/xorg-lib/libxcb/gcc-mips-pr68302-mips-workaround.patch b/meta/recipes-graphics/xorg-lib/libxcb/gcc-mips-pr68302-mips-workaround.patch deleted file mode 100644 index 698d038f90..0000000000 --- a/meta/recipes-graphics/xorg-lib/libxcb/gcc-mips-pr68302-mips-workaround.patch +++ /dev/null @@ -1,22 +0,0 @@ -Reduce debug info for xcb.c since on mips we run into a gcc5 bug - -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68302 - -This patch is a workaround to get past the gcc bug until its resolved. -it should have minimal impact on libxcb while make it work. - -Upstream-Status: Inappropriate [OE-Specific] -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Index: libxcb-1.11.1/src/Makefile.am -=================================================================== ---- libxcb-1.11.1.orig/src/Makefile.am -+++ libxcb-1.11.1/src/Makefile.am -@@ -188,6 +188,7 @@ EXTSOURCES += xkb.c - if BUILD_XKB - lib_LTLIBRARIES += libxcb-xkb.la - libxcb_xkb_la_LDFLAGS = -version-info 1:0:0 -no-undefined -+CFLAGS += -g1 - libxcb_xkb_la_LIBADD = $(XCB_LIBS) - nodist_libxcb_xkb_la_SOURCES = xkb.c xkb.h - endif diff --git a/meta/recipes-graphics/xorg-lib/libxcb/xcbincludedir.patch b/meta/recipes-graphics/xorg-lib/libxcb/xcbincludedir.patch deleted file mode 100644 index 46297c33c3..0000000000 --- a/meta/recipes-graphics/xorg-lib/libxcb/xcbincludedir.patch +++ /dev/null @@ -1,28 +0,0 @@ -As pkg-config --variable doesn't respect the sysroot, add the pkg-config sysroot -to the beginning of variables that are used later on the host. - -Upstream-Status: Pending -Signed-off-by: Ross Burton <ross.burton@intel.com> - -diff --git a/configure.ac b/configure.ac -index 94da4f7..d29cd6a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -64,7 +64,7 @@ AC_SUBST(NEEDED) - - # Find the xcb-proto protocol descriptions - AC_MSG_CHECKING(XCBPROTO_XCBINCLUDEDIR) --XCBPROTO_XCBINCLUDEDIR=`$PKG_CONFIG --variable=xcbincludedir xcb-proto` -+XCBPROTO_XCBINCLUDEDIR=$PKG_CONFIG_SYSROOT_DIR/`$PKG_CONFIG --variable=xcbincludedir xcb-proto` - AC_MSG_RESULT($XCBPROTO_XCBINCLUDEDIR) - AC_SUBST(XCBPROTO_XCBINCLUDEDIR) - -@@ -74,7 +74,7 @@ AC_SUBST(XCBPROTO_VERSION) - - # Find the xcbgen Python package - AC_MSG_CHECKING(XCBPROTO_XCBPYTHONDIR) --XCBPROTO_XCBPYTHONDIR=`$PKG_CONFIG --variable=pythondir xcb-proto` -+XCBPROTO_XCBPYTHONDIR=$PKG_CONFIG_SYSROOT_DIR/`$PKG_CONFIG --variable=pythondir xcb-proto` - AC_MSG_RESULT($XCBPROTO_XCBPYTHONDIR) - AC_SUBST(XCBPROTO_XCBPYTHONDIR) - diff --git a/meta/recipes-graphics/xorg-lib/libxcb_1.12.bb b/meta/recipes-graphics/xorg-lib/libxcb_1.12.bb deleted file mode 100644 index a38bdea5df..0000000000 --- a/meta/recipes-graphics/xorg-lib/libxcb_1.12.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "XCB: The X protocol C binding library" -DESCRIPTION = "The X protocol C-language Binding (XCB) is a replacement \ -for Xlib featuring a small footprint, latency hiding, direct access to \ -the protocol, improved threading support, and extensibility." -HOMEPAGE = "http://xcb.freedesktop.org" -BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=XCB" -SECTION = "x11/libs" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7" - -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" - -BBCLASSEXTEND = "native nativesdk" - -DEPENDS = "xcb-proto xproto libxau libpthread-stubs libxdmcp" - -PACKAGES_DYNAMIC = "^libxcb-.*" - -FILES_${PN} = "${libdir}/libxcb.so.*" - -inherit autotools pkgconfig distro_features_check - -# The libxau and others requires x11 in DISTRO_FEATURES -REQUIRED_DISTRO_FEATURES = "x11" -REQUIRED_DISTRO_FEATURES_class-native = "" - -export PYTHON = "python3" - -python populate_packages_prepend () { - do_split_packages(d, '${libdir}', '^libxcb-(.*)\.so\..*$', 'libxcb-%s', 'XCB library module for %s', allow_links=True) -} diff --git a/meta/recipes-graphics/xorg-lib/libxcb_1.16.1.bb b/meta/recipes-graphics/xorg-lib/libxcb_1.16.1.bb new file mode 100644 index 0000000000..de3290aa9f --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxcb_1.16.1.bb @@ -0,0 +1,38 @@ +SUMMARY = "XCB: The X protocol C binding library" +DESCRIPTION = "The X protocol C-language Binding (XCB) is a replacement \ +for Xlib featuring a small footprint, latency hiding, direct access to \ +the protocol, improved threading support, and extensibility." +HOMEPAGE = "http://xcb.freedesktop.org" +BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=XCB" +SECTION = "x11/libs" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7" + +SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.xz \ + file://0001-use-_Alignof-to-avoid-UB-in-ALIGNOF.patch" + +SRC_URI[sha256sum] = "f24d187154c8e027b358fc7cb6588e35e33e6a92f11c668fe77396a7ae66e311" + +BBCLASSEXTEND = "native nativesdk" + +DEPENDS = "xcb-proto xorgproto libxau libpthread-stubs libxdmcp" + +PACKAGES_DYNAMIC = "^${PN}-.*" + +FILES:${PN} = "${libdir}/libxcb.so.*" + +inherit autotools pkgconfig features_check + +# The libxau and others requires x11 in DISTRO_FEATURES +REQUIRED_DISTRO_FEATURES = "x11" + +export PYTHON = "python3" + +do_install:append () { + chown root.root ${D}${datadir}/doc/${BPN}/tutorial -R +} + +python populate_packages:prepend () { + do_split_packages(d, '${libdir}', r'^libxcb-(.*)\.so\..*$', '${PN}-%s', 'XCB library module for %s', allow_links=True) +} diff --git a/meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch b/meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch deleted file mode 100644 index 60331f6e78..0000000000 --- a/meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch +++ /dev/null @@ -1,18 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -This patch makes the build use its own Xcomposite.h over rather than an -older Xcomposite.h that might already be installed in the staging dir. - -Index: libXcomposite-0.4.3/src/Makefile.am -=================================================================== ---- libXcomposite-0.4.3.orig/src/Makefile.am 2010-06-30 22:42:53.000000000 -0700 -+++ libXcomposite-0.4.3/src/Makefile.am 2010-11-23 23:09:34.544322930 -0800 -@@ -19,7 +19,7 @@ - # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - # PERFORMANCE OF THIS SOFTWARE. - --AM_CFLAGS = $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(XFIXES_CFLAGS) -+AM_CFLAGS = -I$(top_srcdir)/include $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(XFIXES_CFLAGS) - AM_CPPFLAGS = -I$(top_srcdir)/include - - lib_LTLIBRARIES = libXcomposite.la diff --git a/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.4.bb b/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.6.bb index 70257194a9..881f579695 100644 --- a/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.4.bb +++ b/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.6.bb @@ -11,18 +11,15 @@ compositing transformations through a client." require xorg-lib-common.inc -LICENSE = "MIT-style" +LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=3f2907aad541f6f226fbc58cc1b3cdf1" -DEPENDS += " compositeproto virtual/libx11 libxfixes libxext" +DEPENDS += " xorgproto virtual/libx11 libxfixes libxext" PROVIDES = "xcomposite" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" PE = "1" XORG_PN = "libXcomposite" -SRC_URI += " file://change-include-order.patch" - -SRC_URI[md5sum] = "f7a218dcbf6f0848599c6c36fc65c51a" -SRC_URI[sha256sum] = "ede250cd207d8bee4a338265c3007d7a68d5aca791b6ac41af18e9a2aeb34178" +SRC_URI[sha256sum] = "fe40bcf0ae1a09070eba24088a5eb9810efe57453779ec1e20a55080c6dc2c87" diff --git a/meta/recipes-graphics/xorg-lib/libxcursor_1.1.14.bb b/meta/recipes-graphics/xorg-lib/libxcursor_1.2.2.bb index 17629047b7..159ac4f7fa 100644 --- a/meta/recipes-graphics/xorg-lib/libxcursor_1.1.14.bb +++ b/meta/recipes-graphics/xorg-lib/libxcursor_1.2.2.bb @@ -7,16 +7,17 @@ can exist in several sizes and the library automatically picks the best \ size." require xorg-lib-common.inc +SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.xz" -LICENSE = "MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=8902e6643f7bcd7793b23dcd5d8031a4" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=dbf3bd0f2348eeccd0f217146ba26250" DEPENDS += "libxrender libxfixes" -BBCLASSEXTEND = "native nativesdk" PE = "1" XORG_PN = "libXcursor" -SRC_URI[md5sum] = "1e7c17afbbce83e2215917047c57d1b3" -SRC_URI[sha256sum] = "9bc6acb21ca14da51bda5bc912c8955bc6e5e433f0ab00c5e8bef842596c33df" +SRC_URI[sha256sum] = "53d071bd2cc56e517a30998d5e685c8a74556ddada43c6985d14da9a023a88ee" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/xorg-lib/libxcvt_0.1.2.bb b/meta/recipes-graphics/xorg-lib/libxcvt_0.1.2.bb new file mode 100644 index 0000000000..e62fabdf58 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxcvt_0.1.2.bb @@ -0,0 +1,19 @@ +SUMMARY = "Library providing a standalone version of the X server \ +implementation of the VESA CVT standard timing modelines generator" +HOMEPAGE = "https://gitlab.freedesktop.org/xorg/lib/libxcvt" +BUGTRACKER = "https://gitlab.freedesktop.org/xorg/lib/libxcvt/-/issues" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=129947a06984d6faa6f9a9788fa2a03f" +SECTION = "x11/libs" + +SRC_URI = "git://gitlab.freedesktop.org/xorg/lib/libxcvt.git;protocol=https;branch=master" +SRCREV = "d9ca87eea9eecddaccc3a77227bcb3acf84e89df" + +S = "${WORKDIR}/git" + +inherit meson + +FILES:${PN} = " \ + ${libdir}/libxcvt.so.0* \ + ${bindir}/cvt \ +" diff --git a/meta/recipes-graphics/xorg-lib/libxdamage_1.1.4.bb b/meta/recipes-graphics/xorg-lib/libxdamage_1.1.6.bb index c3d70043ca..279d6c33dc 100644 --- a/meta/recipes-graphics/xorg-lib/libxdamage_1.1.4.bb +++ b/meta/recipes-graphics/xorg-lib/libxdamage_1.1.6.bb @@ -16,13 +16,13 @@ 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" PE = "1" XORG_PN = "libXdamage" -SRC_URI[md5sum] = "0cf292de2a9fa2e9a939aefde68fd34f" -SRC_URI[sha256sum] = "7c3fe7c657e83547f4822bfde30a90d84524efb56365448768409b77f05355ad" +SRC_URI[sha256sum] = "52733c1f5262fca35f64e7d5060c6fcd81a880ba8e1e65c9621cf0727afb5d11" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.2.bb b/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.5.bb index f4e30d93d4..d1a1a2e7f9 100644 --- a/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.2.bb +++ b/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.5.bb @@ -10,10 +10,10 @@ require xorg-lib-common.inc inherit gettext -LICENSE = "MIT-style" +LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=d559fb26e129626022e052a5e6e0e123" -DEPENDS += "xproto" +DEPENDS += "xorgproto" PROVIDES = "xdmcp" PE = "1" @@ -22,8 +22,7 @@ XORG_PN = "libXdmcp" BBCLASSEXTEND = "native nativesdk" -SRC_URI[md5sum] = "18aa5c1279b01f9d18e3299969665b2e" -SRC_URI[sha256sum] = "81fe09867918fff258296e1e1e159f0dc639cb30d201c53519f25ab73af4e4e2" +SRC_URI[sha256sum] = "d8a5222828c3adab70adf69a5583f1d32eb5ece04304f7f8392b6a353aa2228c" PACKAGECONFIG ??= "" PACKAGECONFIG[arc4] = "ac_cv_lib_bsd_arc4random_buf=yes,ac_cv_lib_bsd_arc4random_buf=no,libbsd" diff --git a/meta/recipes-graphics/xorg-lib/libxext_1.3.3.bb b/meta/recipes-graphics/xorg-lib/libxext_1.3.6.bb index 063e531c02..275926a885 100644 --- a/meta/recipes-graphics/xorg-lib/libxext_1.3.3.bb +++ b/meta/recipes-graphics/xorg-lib/libxext_1.3.6.bb @@ -10,17 +10,15 @@ extensions." require xorg-lib-common.inc -LICENSE = "MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=879ce266785414bd1cbc3bc2f4d9d7c8" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=4234bb3b2f1521ea101e4e9db7c33c69" -DEPENDS += "xproto virtual/libx11 xextproto" +DEPENDS += "xorgproto virtual/libx11" PROVIDES = "xext" PE = "1" XORG_PN = "libXext" - BBCLASSEXTEND = "native nativesdk" -SRC_URI[md5sum] = "52df7c4c1f0badd9f82ab124fb32eb97" -SRC_URI[sha256sum] = "b518d4d332231f313371fdefac59e3776f4f0823bcb23cf7c7305bfb57b16e35" +SRC_URI[sha256sum] = "edb59fa23994e405fdc5b400afdf5820ae6160b94f35e3dc3da4457a16e89753" diff --git a/meta/recipes-graphics/xorg-lib/libxfixes_5.0.3.bb b/meta/recipes-graphics/xorg-lib/libxfixes_6.0.1.bb index c80042d349..28df7bb805 100644 --- a/meta/recipes-graphics/xorg-lib/libxfixes_5.0.3.bb +++ b/meta/recipes-graphics/xorg-lib/libxfixes_6.0.1.bb @@ -6,18 +6,16 @@ provide the minimal server-side support necessary to eliminate problems \ caused by these workarounds." require xorg-lib-common.inc +SRC_URI[sha256sum] = "b695f93cd2499421ab02d22744458e650ccc88c1d4c8130d60200213abc02d58" -LICENSE = "MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=3c1ce42c334a6f5cccb0277556a053e0" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=a5a9755c8921cc7dc08a5cfe4267d0ff" -DEPENDS += "virtual/libx11 xproto fixesproto xextproto" +DEPENDS += "virtual/libx11 xorgproto" PE = "1" XORG_PN = "libXfixes" +XORG_EXT = "tar.xz" BBCLASSEXTEND = "native nativesdk" - -SRC_URI[md5sum] = "07e01e046a0215574f36a3aacb148be0" -SRC_URI[sha256sum] = "de1cd33aff226e08cefd0e6759341c2c8e8c9faf8ce9ac6ec38d43e287b22ad6" - diff --git a/meta/recipes-graphics/xorg-lib/libxfont2_2.0.2.bb b/meta/recipes-graphics/xorg-lib/libxfont2_2.0.6.bb index 08d11237ef..535e7f629e 100644 --- a/meta/recipes-graphics/xorg-lib/libxfont2_2.0.2.bb +++ b/meta/recipes-graphics/xorg-lib/libxfont2_2.0.6.bb @@ -6,17 +6,18 @@ such as freetype)." require xorg-lib-common.inc -LICENSE = "MIT & MIT-style & BSD" +LICENSE = "MIT & MIT & BSD-4-Clause & BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=a46c8040f2f737bcd0c435feb2ab1c2c" -DEPENDS += "freetype xtrans fontsproto libfontenc zlib" +DEPENDS += "freetype xtrans xorgproto libfontenc zlib" XORG_PN = "libXfont2" BBCLASSEXTEND = "native" -SRC_URI[md5sum] = "d39e6446e46f939486d1a8b856e8b67b" -SRC_URI[sha256sum] = "94088d3b87f7d42c7116d9adaad155859e93330c6e47f5989f2de600b9a6c111" +SRC_URI[sha256sum] = "74ca20017eb0fb3f56d8d5e60685f560fc85e5ff3d84c61c4cb891e40c27aef4" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," + +CVE_PRODUCT = "libxfont libxfont2" diff --git a/meta/recipes-graphics/xorg-lib/libxfont_1.5.3.bb b/meta/recipes-graphics/xorg-lib/libxfont_1.5.4.bb index 5b15a4ea97..fa6585d6dc 100644 --- a/meta/recipes-graphics/xorg-lib/libxfont_1.5.3.bb +++ b/meta/recipes-graphics/xorg-lib/libxfont_1.5.4.bb @@ -6,20 +6,21 @@ such as freetype)." require xorg-lib-common.inc -LICENSE = "MIT & MIT-style & BSD" +LICENSE = "MIT & MIT & BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=a46c8040f2f737bcd0c435feb2ab1c2c" -DEPENDS += "freetype xtrans fontsproto libfontenc zlib" +DEPENDS += "freetype xtrans xorgproto libfontenc zlib" PROVIDES = "xfont" PE = "1" XORG_PN = "libXfont" +XORG_EXT = "tar.bz2" BBCLASSEXTEND = "native" -SRC_URI[md5sum] = "9ba75bf38ba62a6ad52550ab716da9b3" -SRC_URI[sha256sum] = "ab85c10fd2683481dfef672a77fe60e6a2039558cbc0e9bf56b5e1df471c93d0" +SRC_URI[md5sum] = "16eaf156edd79b68038b6a7c44aa9e9b" +SRC_URI[sha256sum] = "1a7f7490774c87f2052d146d1e0e64518d32e6848184a18654e8d0bb57883242" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/meta/recipes-graphics/xorg-lib/libxft_2.3.2.bb b/meta/recipes-graphics/xorg-lib/libxft_2.3.8.bb index b4547819f2..2699c1dfd7 100644 --- a/meta/recipes-graphics/xorg-lib/libxft_2.3.2.bb +++ b/meta/recipes-graphics/xorg-lib/libxft_2.3.8.bb @@ -20,14 +20,13 @@ PROVIDES = "xft" PE = "1" -SRC_URI[md5sum] = "331b3a2a3a1a78b5b44cfbd43f86fcfe" -SRC_URI[sha256sum] = "f5a3c824761df351ca91827ac221090943ef28b248573486050de89f4bfcdc4c" +SRC_URI[sha256sum] = "5e8c3c4bc2d4c0a40aef6b4b38ed2fb74301640da29f6528154b5009b1c6dd49" XORG_PN = "libXft" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" -python () { - if d.getVar('DEBIAN_NAMES'): - d.setVar('PKG_${PN}', '${MLPREFIX}libxft2') +python populate_packages:prepend () { + if d.getVar('DEBIAN_NAMES'): + d.setVar('PKG:${PN}', '${MLPREFIX}libxft2') } diff --git a/meta/recipes-graphics/xorg-lib/libxi_1.7.9.bb b/meta/recipes-graphics/xorg-lib/libxi_1.8.1.bb index 74f0527b78..00bd46ef13 100644 --- a/meta/recipes-graphics/xorg-lib/libxi_1.7.9.bb +++ b/meta/recipes-graphics/xorg-lib/libxi_1.8.1.bb @@ -7,16 +7,17 @@ input devices other than the core X keyboard and pointer. It allows \ client programs to select input from these devices independently from \ each other and independently from the core devices." -LICENSE = "MIT & MIT-style" +LICENSE = "MIT & MIT" 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" XORG_PN = "libXi" +XORG_EXT = "tar.xz" -SRC_URI[md5sum] = "1f0f2719c020655a60aee334ddd26d67" -SRC_URI[sha256sum] = "c2e6b8ff84f9448386c1b5510a5cf5a16d788f76db018194dacdc200180faf45" +SRC_URI[sha256sum] = "89bfc0e814f288f784202e6e5f9b362b788ccecdeb078670145eacd8749656a7" +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/xorg-lib/libxinerama_1.1.3.bb b/meta/recipes-graphics/xorg-lib/libxinerama_1.1.5.bb index bb03f44e25..421b64e68d 100644 --- a/meta/recipes-graphics/xorg-lib/libxinerama_1.1.3.bb +++ b/meta/recipes-graphics/xorg-lib/libxinerama_1.1.5.bb @@ -10,13 +10,11 @@ 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[sha256sum] = "5094d1f0fcc1828cb1696d0d39d9e866ae32520c54d01f618f1a3c1e30c2085c" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.7.2.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.7.2.bb deleted file mode 100644 index e32dc809f2..0000000000 --- a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.7.2.bb +++ /dev/null @@ -1,22 +0,0 @@ -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://LICENSE;md5=e525ed9809e1f8a07cf4bce8b09e8b87" -LICENSE = "MIT & MIT-style" - -DEPENDS = "util-macros flex-native bison-native" - -SRC_URI = "http://xkbcommon.org/download/${BPN}-${PV}.tar.xz" - -SRC_URI[md5sum] = "f53fa65beb5ae4b6a6b7f08f9dedabc4" -SRC_URI[sha256sum] = "28a4dc2735863bec2dba238de07fcdff28c5dd2300ae9dfdb47282206cd9b9d8" - -UPSTREAM_CHECK_URI = "http://xkbcommon.org/" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-docs" - -PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" -PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,libxcb xkeyboard-config," diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.7.0.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.7.0.bb new file mode 100644 index 0000000000..40cf616f0b --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.7.0.bb @@ -0,0 +1,40 @@ +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://LICENSE;md5=e525ed9809e1f8a07cf4bce8b09e8b87" +LICENSE = "MIT & MIT" + +DEPENDS = "flex-native bison-native" + +SRC_URI = "http://xkbcommon.org/download/${BPN}-${PV}.tar.xz" + +SRC_URI[sha256sum] = "65782f0a10a4b455af9c6baab7040e2f537520caa2ec2092805cdfd36863b247" + +UPSTREAM_CHECK_URI = "http://xkbcommon.org/" + +inherit meson pkgconfig bash-completion + +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)} xkbregistry" + +PACKAGECONFIG[docs] = "-Denable-docs=true,-Denable-docs=false,doxygen-native" +PACKAGECONFIG[wayland] = "-Denable-wayland=true,-Denable-wayland=false,wayland-native wayland wayland-protocols," +PACKAGECONFIG[x11] = "-Denable-x11=true,-Denable-x11=false,libxcb xkeyboard-config," +PACKAGECONFIG[xkbregistry] = "-Denable-xkbregistry=true,-Denable-xkbregistry=false,libxml2" + +PACKAGE_BEFORE_PN += "xkbcli" +FILES:${PN} = "" +FILES:xkbcli = "${bindir}/xkbcli ${libexecdir}/xkbcommon/xkbcli-*" + +python populate_packages:prepend () { + # Put the libraries into separate packages to avoid dependency creep + do_split_packages(d, d.expand('${libdir}'), r'^(lib.*)\.so\.*', '%s', '%s library', extra_depends='', allow_links=True) +} + +# Fix a following runtime error: +# xkbcommon: ERROR: couldn't find a Compose file for locale "C" +RDEPENDS:${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', 'libx11-compose-data', d)}" + +BBCLASSEXTEND += "native" + +CVE_PRODUCT += "xkbcommon:libxkbcommon" diff --git a/meta/recipes-graphics/xorg-lib/libxkbfile_1.0.9.bb b/meta/recipes-graphics/xorg-lib/libxkbfile_1.1.3.bb index 39a344ccad..aab6284384 100644 --- a/meta/recipes-graphics/xorg-lib/libxkbfile_1.0.9.bb +++ b/meta/recipes-graphics/xorg-lib/libxkbfile_1.1.3.bb @@ -5,14 +5,12 @@ description files for XKB, the X11 keyboard configuration extension." require xorg-lib-common.inc -LICENSE = "MIT-style" +LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=8be7367f7e5d605a426f76bb37d4d61f" -DEPENDS += "virtual/libx11 kbproto" +DEPENDS += "virtual/libx11 xorgproto" PE = "1" BBCLASSEXTEND = "native" - -SRC_URI[md5sum] = "4a4cfeaf24dab1b991903455d6d7d404" -SRC_URI[sha256sum] = "51817e0530961975d9513b773960b4edd275f7d5c72293d5a151ed4f42aeb16a" +SRC_URI[sha256sum] = "a9b63eea997abb9ee6a8b4fbb515831c841f471af845a09de443b28003874bec" diff --git a/meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb b/meta/recipes-graphics/xorg-lib/libxmu_1.2.1.bb index 4740c15732..51faf170bf 100644 --- a/meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb +++ b/meta/recipes-graphics/xorg-lib/libxmu_1.2.1.bb @@ -7,11 +7,10 @@ Widgets. A subset of the functions that do not rely on the Athena \ Widgets (libXaw) or X Toolkit Instrinsics (libXt) are provided in a \ second library, libXmuu." - require xorg-lib-common.inc -LICENSE = "MIT & MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=def3d8e4e9c42004f1941fa22f01dc18" +LICENSE = "MIT & MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=e79ad4fcc53b9bfe0fc38507a56446b9" DEPENDS += "libxt libxext" PROVIDES = "xmu" @@ -24,12 +23,8 @@ LEAD_SONAME = "libXmu" PACKAGES =+ "libxmuu" -FILES_libxmuu = "${libdir}/libXmuu.so.*" +FILES:libxmuu = "${libdir}/libXmuu.so.*" BBCLASSEXTEND = "native" -SRC_URI[md5sum] = "41d92ab627dfa06568076043f3e089e4" -SRC_URI[sha256sum] = "756edc7c383254eef8b4e1b733c3bf1dc061b523c9f9833ac7058378b8349d0b" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," +SRC_URI[sha256sum] = "fcb27793248a39e5fcc5b9c4aec40cc0734b3ca76aac3d7d1c264e7f7e14e8b2" diff --git a/meta/recipes-graphics/xorg-lib/libxpm_3.5.12.bb b/meta/recipes-graphics/xorg-lib/libxpm_3.5.17.bb index 13a1b919ed..8e15ecc0d4 100644 --- a/meta/recipes-graphics/xorg-lib/libxpm_3.5.12.bb +++ b/meta/recipes-graphics/xorg-lib/libxpm_3.5.17.bb @@ -10,18 +10,18 @@ pixmap format, which is commonly used in legacy X applications. XPM is \ an extension of the monochrome XBM bitmap specificied in the X \ protocol." -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=51f4270b012ecd4ab1a164f5f4ed6cf7" -DEPENDS += "libxext libsm libxt" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=903942ebc9d807dfb68540f40bae5aff" +DEPENDS += "libxext libsm libxt gettext-native" PE = "1" XORG_PN = "libXpm" +EXTRA_OECONF += "--disable-open-zfile" PACKAGES =+ "sxpm cxpm" -FILES_cxpm = "${bindir}/cxpm" -FILES_sxpm = "${bindir}/sxpm" +FILES:cxpm = "${bindir}/cxpm" +FILES:sxpm = "${bindir}/sxpm" -SRC_URI[md5sum] = "20f4627672edb2bd06a749f11aa97302" -SRC_URI[sha256sum] = "fd6a6de3da48de8d1bb738ab6be4ad67f7cb0986c39bd3f7d51dd24f7854bdec" +SRC_URI[sha256sum] = "64b31f81019e7d388c822b0b28af8d51c4622b83f1f0cb6fa3fc95e271226e43" BBCLASSEXTEND = "native" diff --git a/meta/recipes-graphics/xorg-lib/libxrandr_1.5.1.bb b/meta/recipes-graphics/xorg-lib/libxrandr_1.5.4.bb index 48e88d20a7..3e2825b916 100644 --- a/meta/recipes-graphics/xorg-lib/libxrandr_1.5.1.bb +++ b/meta/recipes-graphics/xorg-lib/libxrandr_1.5.4.bb @@ -8,10 +8,10 @@ specified in the Proceedings of the 2001 Usenix Technical Conference \ require xorg-lib-common.inc -LICENSE = "MIT-style" +LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=c9d1a2118a6cd5727521db8e7a2fee69" -DEPENDS += "virtual/libx11 randrproto libxrender libxext" +DEPENDS += "virtual/libx11 xorgproto libxrender libxext" PE = "1" @@ -19,5 +19,4 @@ XORG_PN = "libXrandr" BBCLASSEXTEND = "native nativesdk" -SRC_URI[md5sum] = "28e486f1d491b757173dd85ba34ee884" -SRC_URI[sha256sum] = "1ff9e7fa0e4adea912b16a5f0cfa7c1d35b0dcda0e216831f7715c8a3abcf51a" +SRC_URI[sha256sum] = "1ad5b065375f4a85915aa60611cc6407c060492a214d7f9daf214be752c3b4d3" diff --git a/meta/recipes-graphics/xorg-lib/libxrender_0.9.10.bb b/meta/recipes-graphics/xorg-lib/libxrender_0.9.11.bb index 92b3102704..e138764dff 100644 --- a/meta/recipes-graphics/xorg-lib/libxrender_0.9.10.bb +++ b/meta/recipes-graphics/xorg-lib/libxrender_0.9.11.bb @@ -8,17 +8,15 @@ drawn by loading glyphs into the server and rendering sets of them." require xorg-lib-common.inc -LICENSE = "MIT-style" +LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=d8bc71986d3b9b3639f6dfd6fac8f196" -DEPENDS += "virtual/libx11 renderproto xproto" +DEPENDS += "virtual/libx11 xorgproto" PE = "1" XORG_PN = "libXrender" BBCLASSEXTEND = "native nativesdk" - -SRC_URI[md5sum] = "802179a76bded0b658f4e9ec5e1830a4" -SRC_URI[sha256sum] = "c06d5979f86e64cabbde57c223938db0b939dff49fdb5a793a1d3d0396650949" +SRC_URI[sha256sum] = "bc53759a3a83d1ff702fb59641b3d2f7c56e05051fa0cfa93501166fa782dc24" diff --git a/meta/recipes-graphics/xorg-lib/libxres_1.2.0.bb b/meta/recipes-graphics/xorg-lib/libxres_1.2.2.bb index 8c34e47b43..72b28d9107 100644 --- a/meta/recipes-graphics/xorg-lib/libxres_1.2.0.bb +++ b/meta/recipes-graphics/xorg-lib/libxres_1.2.2.bb @@ -10,11 +10,10 @@ require xorg-lib-common.inc LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=8c89441a8df261bdc56587465e13c7fa" -DEPENDS += "libxext resourceproto" +DEPENDS += "libxext xorgproto" PE = "1" XORG_PN = "libXres" -SRC_URI[md5sum] = "5d6d443d1abc8e1f6fc1c57fb27729bb" -SRC_URI[sha256sum] = "ff75c1643488e64a7cfbced27486f0f944801319c84c18d3bd3da6bf28c812d4" +SRC_URI[sha256sum] = "9a7446f3484b9b7538ac5ee30d2c1ce9e5b7fbbaf1440e02f6cca186a1fa745f" diff --git a/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.2.bb b/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.4.bb index 354e5de7fd..1b407f52f0 100644 --- a/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.2.bb +++ b/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.4.bb @@ -12,12 +12,11 @@ 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" +RREPLACES:${PN} = "libxss" PE = "1" XORG_PN = "libXScrnSaver" -SRC_URI[md5sum] = "7a773b16165e39e938650bcc9027c1d5" -SRC_URI[sha256sum] = "8ff1efa7341c7f34bcf9b17c89648d6325ddaae22e3904e091794e0b4426ce1d" +SRC_URI[sha256sum] = "75cd2859f38e207a090cac980d76bc71e9da99d48d09703584e00585abc920fe" diff --git a/meta/recipes-graphics/xorg-lib/libxshmfence/0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch b/meta/recipes-graphics/xorg-lib/libxshmfence/0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch new file mode 100644 index 0000000000..3e87794d20 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxshmfence/0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch @@ -0,0 +1,39 @@ +From 5827f6389a227157958d14a687fb29223cb3a03a Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Wed, 7 Apr 2021 07:48:42 +0000 +Subject: [PATCH] xshmfence_futex.h: Define SYS_futex if it does not exist + +_NR_futex is not defines by newer architectures e.g. riscv32 as +they only have 64bit variant of time_t. Glibc defines SYS_futex +interface based on __NR_futex, since this is used in applications, +such applications start to fail to build for these newer architectures. +This patch defines a fallback to alias __NR_futex to __NR_futex_time64 +to make SYS_futex keep working. + +Reference: https://git.openembedded.org/openembedded-core/commit/?id=7a218adf9990f5e18d0b6a33eb34091969f979c7 + +Upstream-Status: Pending + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + src/xshmfence_futex.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/xshmfence_futex.h b/src/xshmfence_futex.h +index 673ac0e..a71efa5 100644 +--- a/src/xshmfence_futex.h ++++ b/src/xshmfence_futex.h +@@ -53,6 +53,10 @@ static inline int futex_wait(int32_t *addr, int32_t value) { + #include <sys/time.h> + #include <sys/syscall.h> + ++#if !defined(SYS_futex) && defined(SYS_futex_time64) ++#define SYS_futex SYS_futex_time64 ++#endif ++ + static inline long sys_futex(void *addr1, int op, int val1, struct timespec *timeout, void *addr2, int val3) + { + return syscall(SYS_futex, addr1, op, val1, timeout, addr2, val3); +-- +2.29.2 + diff --git a/meta/recipes-graphics/xorg-lib/libxshmfence_1.2.bb b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.2.bb index ae34b1fe46..0a7da938e1 100644 --- a/meta/recipes-graphics/xorg-lib/libxshmfence_1.2.bb +++ b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.2.bb @@ -6,12 +6,15 @@ using file descriptor passing." require xorg-lib-common.inc -LICENSE = "MIT-style" +LICENSE = "HPND" LIC_FILES_CHKSUM = "file://COPYING;md5=47e508ca280fde97906eacb77892c3ac" DEPENDS += "virtual/libx11" -BBCLASSEXTEND = "native nativesdk" +EXTRA_OECONF += "--with-shared-memory-dir=/dev/shm" + +SRC_URI += "file://0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch" -SRC_URI[md5sum] = "66662e76899112c0f99e22f2fc775a7e" -SRC_URI[sha256sum] = "d21b2d1fd78c1efbe1f2c16dae1cb23f8fd231dcf891465b8debe636a9054b0c" +SRC_URI[sha256sum] = "870df257bc40b126d91b5a8f1da6ca8a524555268c50b59c0acd1a27f361606f" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/xorg-lib/libxt/0001-libXt-util-don-t-link-makestrs-with-target-cflags.patch b/meta/recipes-graphics/xorg-lib/libxt/0001-libXt-util-don-t-link-makestrs-with-target-cflags.patch deleted file mode 100644 index 1a691a3d5e..0000000000 --- a/meta/recipes-graphics/xorg-lib/libxt/0001-libXt-util-don-t-link-makestrs-with-target-cflags.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b0c0e6d90bd99a699701c9542640adb218f5d536 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> -Date: Mon, 10 Jul 2017 16:51:13 +0300 -Subject: [PATCH] libXt: util: don't link makestrs with target cflags - -The line: AM_CFLAGS = $(XT_CFLAGS) -in util/Makefile.am is wrong because it adds target cflags to the -compilation of makestrs, which is built for the build machine, which -leads to build failures when cross-compiling. - -Upstream-Status: Pending - -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> -Signed-off-by: Maxin B. John <maxin.john@intel.com> ---- - util/Makefile.am | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/util/Makefile.am b/util/Makefile.am -index 800b35b..f2dd1f9 100644 ---- a/util/Makefile.am -+++ b/util/Makefile.am -@@ -11,7 +11,6 @@ EXTRA_DIST = \ - StrDefs.ht \ - string.list - --AM_CFLAGS = $(XT_CFLAGS) - makestrs_SOURCES = makestrs.c - - --- -2.4.0 - diff --git a/meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch b/meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch index ffc2c15d71..ff8c675dbd 100644 --- a/meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch +++ b/meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch @@ -1,3 +1,8 @@ +From f069b0a430fe96f3ece2106d34375008833599d3 Mon Sep 17 00:00:00 2001 +From: Nitin A Kamble <nitin.a.kamble@intel.com> +Date: Fri, 2 Dec 2011 12:20:05 -0800 +Subject: [PATCH] libxt: fix compilatoin with x32 toolchain + Upstream-Status: Pending This fixes compilation with x32 toolchain. @@ -5,10 +10,15 @@ This fixes compilation with x32 toolchain. Received this patch from H.J. Lu <hjl.tools@gmail.com> Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/1 +--- + include/X11/Xtos.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) ---- libXt-1.1.1/include/X11/Xtos.h.x32 2011-02-08 07:56:40.000000000 -0800 -+++ libXt-1.1.1/include/X11/Xtos.h 2011-11-30 17:19:27.473349770 -0800 -@@ -62,7 +62,7 @@ SOFTWARE. +diff --git a/include/X11/Xtos.h b/include/X11/Xtos.h +index 64b2da8..44f52c2 100644 +--- a/include/X11/Xtos.h ++++ b/include/X11/Xtos.h +@@ -59,7 +59,7 @@ SOFTWARE. defined(__sparc64__) || \ defined(__s390x__) || \ (defined(__hppa__) && defined(__LP64__)) || \ diff --git a/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb b/meta/recipes-graphics/xorg-lib/libxt_1.3.0.bb index 180d00d9b0..1805dae772 100644 --- a/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb +++ b/meta/recipes-graphics/xorg-lib/libxt_1.3.0.bb @@ -12,24 +12,21 @@ independent of any particular user interface policy or style." require xorg-lib-common.inc -LICENSE = "MIT & MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=6565b1e0094ea1caae0971cc4035f343" +LICENSE = "MIT & MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=d6e9ca2c4b2276625afe025b0a2a4d8c" - -DEPENDS += "util-linux libxcb libsm virtual/libx11 kbproto libxdmcp" +DEPENDS += "util-linux libxcb libsm virtual/libx11 xorgproto libxdmcp" PROVIDES = "xt" PE = "1" XORG_PN = "libXt" +XORG_EXT = "tar.xz" -SRC_URI += "file://libxt_fix_for_x32.patch \ - file://0001-libXt-util-don-t-link-makestrs-with-target-cflags.patch \ - " +SRC_URI += "file://libxt_fix_for_x32.patch" -BBCLASSEXTEND = "native" +SRC_URI[sha256sum] = "52820b3cdb827d08dc90bdfd1b0022a3ad8919b57a39808b12591973b331bf91" -EXTRA_OECONF += "--disable-xkb" +BBCLASSEXTEND = "native nativesdk" -SRC_URI[md5sum] = "8f5b5576fbabba29a05f3ca2226f74d3" -SRC_URI[sha256sum] = "46eeb6be780211fdd98c5109286618f6707712235fdd19df4ce1e6954f349f1a" +EXTRA_OECONF += "--disable-xkb" diff --git a/meta/recipes-graphics/xorg-lib/libxtst_1.2.3.bb b/meta/recipes-graphics/xorg-lib/libxtst_1.2.4.bb index 5717fa5b79..db0621ba2e 100644 --- a/meta/recipes-graphics/xorg-lib/libxtst_1.2.3.bb +++ b/meta/recipes-graphics/xorg-lib/libxtst_1.2.4.bb @@ -6,16 +6,15 @@ DESCRIPTION = "This extension is a minimal set of client and server \ extensions required to completely test the X11 server with no user \ intervention." -LICENSE = "MIT-style" +LICENSE = "MIT" 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" XORG_PN = "libXtst" +SRC_URI[sha256sum] = "84f5f30b9254b4ffee14b5b0940e2622153b0d3aed8286a3c5b7eeb340ca33c8" -SRC_URI[md5sum] = "ef8c2c1d16a00bd95b9fdcef63b8a2ca" -SRC_URI[sha256sum] = "4655498a1b8e844e3d6f21f3b2c4e2b571effb5fd83199d428a6ba7ea4bf5204" - +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/xorg-lib/libxv_1.0.11.bb b/meta/recipes-graphics/xorg-lib/libxv_1.0.12.bb index a226c2753a..7f9c5e5cbc 100644 --- a/meta/recipes-graphics/xorg-lib/libxv_1.0.11.bb +++ b/meta/recipes-graphics/xorg-lib/libxv_1.0.12.bb @@ -7,13 +7,12 @@ clients, which may draw in a number of colourspaces, including YUV." require xorg-lib-common.inc -LICENSE = "MIT-style" +LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=827da9afab1f727f2a66574629e0f39c" -DEPENDS += "libxext videoproto" +DEPENDS += "libxext xorgproto" XORG_PN = "libXv" -SRC_URI[md5sum] = "210b6ef30dda2256d54763136faa37b9" -SRC_URI[sha256sum] = "d26c13eac99ac4504c532e8e76a1c8e4bd526471eb8a0a4ff2a88db60cb0b088" +SRC_URI[sha256sum] = "aaf7fa09f689f7a2000fe493c0d64d1487a1210db154053e9e2336b860c63848" diff --git a/meta/recipes-graphics/xorg-lib/libxvmc_1.0.10.bb b/meta/recipes-graphics/xorg-lib/libxvmc_1.0.14.bb index 6ed49b1f37..af18afc62d 100644 --- a/meta/recipes-graphics/xorg-lib/libxvmc_1.0.10.bb +++ b/meta/recipes-graphics/xorg-lib/libxvmc_1.0.14.bb @@ -4,16 +4,16 @@ DESCRIPTION = "XvMC extends the X Video extension (Xv) and enables \ hardware rendered motion compensation support." require xorg-lib-common.inc +SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.xz" 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" XORG_PN = "libXvMC" -SRC_URI[md5sum] = "4cbe1c1def7a5e1b0ed5fce8e512f4c6" -SRC_URI[sha256sum] = "e501a079b5dfaef0897c56152770c77e05e362065cec58910289aa567277ee2e" +SRC_URI[sha256sum] = "e4be9eb6b6bafdbbf81f47f7163047215376e45e2dc786d0ea6181c930725ed9" diff --git a/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.4.bb b/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.4.bb deleted file mode 100644 index 695a39637c..0000000000 --- a/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.4.bb +++ /dev/null @@ -1,19 +0,0 @@ -require xorg-lib-common.inc - -SUMMARY = "XFree86-DGA: XFree86 Direct Graphics Access extension library" - -DESCRIPTION = "libXxf86dga provides the XFree86-DGA extension, which \ -allows direct graphics access to a framebuffer-like region, and also \ -allows relative mouse reporting, et al. It is mainly used by games and \ -emulators for games." - -LIC_FILES_CHKSUM = "file://COPYING;md5=abb99ac125f84f424a4278153988e32f" - -DEPENDS += "libxext xf86dgaproto" - -PE = "1" - -SRC_URI[md5sum] = "d7dd9b9df336b7dd4028b6b56542ff2c" -SRC_URI[sha256sum] = "8eecd4b6c1df9a3704c04733c2f4fa93ef469b55028af5510b25818e2456c77e" - -XORG_PN = "libXxf86dga" diff --git a/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.3.bb b/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.3.bb deleted file mode 100644 index af6f1f76a2..0000000000 --- a/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.3.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "XFree86-Misc: XFree86 miscellaneous extension library" - -DESCRIPTION = "The XFree86-Misc extension, provides a means to access \ -input device configuration settings specific to the XFree86/Xorg DDX." - -require xorg-lib-common.inc - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=27c91ecc435bd3d2bfad868914c94b45" - -DEPENDS += "libxext xf86miscproto" -PROVIDES = "xxf86misc" - -PE = "1" - -XORG_PN = "libXxf86misc" - -SRC_URI[md5sum] = "6bc0bf78909fd71021c466c793d4385c" -SRC_URI[sha256sum] = "563f4200862efd3334c33a669e0a0aae5bab31f3998db75b87a99a697cc26b5b" - diff --git a/meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.4.bb b/meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.5.bb index 35f87d2719..16fd29ebcd 100644 --- a/meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.4.bb +++ b/meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.5.bb @@ -10,11 +10,11 @@ require xorg-lib-common.inc LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=fa0b9c462d8f2f13eba26492d42ea63d" -DEPENDS += "libxext xf86vidmodeproto" +DEPENDS += "libxext xorgproto" PE = "1" XORG_PN = "libXxf86vm" +SRC_URI[sha256sum] = "247fef48b3e0e7e67129e41f1e789e8d006ba47dba1c0cdce684b9b703f888e7" -SRC_URI[md5sum] = "298b8fff82df17304dfdb5fe4066fe3a" -SRC_URI[sha256sum] = "afee27f93c5f31c0ad582852c0fb36d50e4de7cd585fcf655e278a633d85cd57" +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch b/meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch deleted file mode 100644 index 782c1db022..0000000000 --- a/meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0ccd906b904d21536d5ab41c6196760e3e5d72cb Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 17 May 2016 17:30:00 -0700 -Subject: [PATCH] test/utils: Check for FE_INVALID definition before use - -Some architectures e.g. nios2 do not support all exceptions - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted - - test/utils.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/test/utils.c b/test/utils.c -index f8e42a5..fe32b1e 100644 ---- a/test/utils.c -+++ b/test/utils.c -@@ -978,9 +978,11 @@ enable_invalid_exceptions (void) - { - #ifdef HAVE_FENV_H - #ifdef HAVE_FEENABLEEXCEPT -+#ifdef FE_INVALID - feenableexcept (FE_INVALID); - #endif - #endif -+#endif - } - - void * --- -2.8.2 - diff --git a/meta/recipes-graphics/xorg-lib/pixman/asm_include.patch b/meta/recipes-graphics/xorg-lib/pixman/asm_include.patch deleted file mode 100644 index b52a5707d6..0000000000 --- a/meta/recipes-graphics/xorg-lib/pixman/asm_include.patch +++ /dev/null @@ -1,29 +0,0 @@ -Fixes errors like - -Assembler messages: -Fatal error: can't create .libs/pixman-mips-dspr2-asm.o: No such file or directory - -it works with glibc because it uses gcc fixed-headers but thats not right. - -We move the include under C block - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending -Index: pixman-0.32.6/pixman/pixman-private.h -=================================================================== ---- pixman-0.32.6.orig/pixman/pixman-private.h -+++ pixman-0.32.6/pixman/pixman-private.h -@@ -1,4 +1,3 @@ --#include <float.h> - - #ifndef PIXMAN_PRIVATE_H - #define PIXMAN_PRIVATE_H -@@ -17,6 +16,8 @@ - - #ifndef __ASSEMBLER__ - -+#include <float.h> -+ - #ifndef PACKAGE - # error config.h must be included before pixman-private.h - #endif diff --git a/meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb b/meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb deleted file mode 100644 index c4ca621a8a..0000000000 --- a/meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb +++ /dev/null @@ -1,41 +0,0 @@ -SUMMARY = "Pixman: Pixel Manipulation library" - -DESCRIPTION = "Pixman provides a library for manipulating pixel regions \ --- a set of Y-X banded rectangles, image compositing using the \ -Porter/Duff model and implicit mask generation for geometric primitives \ -including trapezoids, triangles, and rectangles." - -require xorg-lib-common.inc - -# see http://cairographics.org/releases/ - only even minor versions are stable -UPSTREAM_CHECK_REGEX = "pixman-(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)" - -LICENSE = "MIT & MIT-style & PD" -LIC_FILES_CHKSUM = "file://COPYING;md5=14096c769ae0cbb5fcb94ec468be11b3 \ - file://pixman/pixman-matrix.c;endline=25;md5=ba6e8769bfaaee2c41698755af04c4be \ - file://pixman/pixman-arm-neon-asm.h;endline=24;md5=9a9cc1e51abbf1da58f4d9528ec9d49b \ - " -DEPENDS += "zlib libpng" -BBCLASSEXTEND = "native nativesdk" - -PE = "1" - -IWMMXT = "--disable-arm-iwmmxt" -LOONGSON_MMI = "--disable-loongson-mmi" -# If target supports neon then disable the 'simd' (ie VFPv2) fallback, otherwise disable neon. -NEON = "${@bb.utils.contains("TUNE_FEATURES", "neon", "--disable-arm-simd", "--disable-arm-neon" ,d)}" - -EXTRA_OECONF = "--disable-gtk ${IWMMXT} ${LOONGSON_MMI} ${NEON}" -EXTRA_OECONF_class-native = "--disable-gtk" -EXTRA_OECONF_class-nativesdk = "--disable-gtk" - -SRC_URI += "\ - file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \ - file://asm_include.patch \ - file://0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch \ -" - -SRC_URI[md5sum] = "002a4fcb644ddfcb4b0e4191576a0d59" -SRC_URI[sha256sum] = "39ba3438f3d17c464b0cb8be006dacbca0ab5aee97ebde69fec7ecdbf85794a0" - -REQUIRED_DISTRO_FEATURES = "" diff --git a/meta/recipes-graphics/xorg-lib/pixman_0.42.2.bb b/meta/recipes-graphics/xorg-lib/pixman_0.42.2.bb new file mode 100644 index 0000000000..23ae0cbb27 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/pixman_0.42.2.bb @@ -0,0 +1,47 @@ +SUMMARY = "Pixman: Pixel Manipulation library" +DESCRIPTION = "Pixman provides a library for manipulating pixel regions \ +-- a set of Y-X banded rectangles, image compositing using the \ +Porter/Duff model and implicit mask generation for geometric primitives \ +including trapezoids, triangles, and rectangles." +HOMEPAGE = "http://www.pixman.org" +SECTION = "x11/libs" +DEPENDS = "zlib" + +SRC_URI = "https://www.cairographics.org/releases/${BP}.tar.gz \ + file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \ + " +SRC_URI[sha256sum] = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e" + +# see http://cairographics.org/releases/ - only even minor versions are stable +UPSTREAM_CHECK_REGEX = "pixman-(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)" + +PE = "1" + +LICENSE = "MIT & PD" +LIC_FILES_CHKSUM = "file://COPYING;md5=14096c769ae0cbb5fcb94ec468be11b3 \ + file://pixman/pixman-matrix.c;endline=21;md5=4a018dff3e4e25302724c88ff95c2456 \ + file://pixman/pixman-arm-neon-asm.h;endline=24;md5=9a9cc1e51abbf1da58f4d9528ec9d49b \ + " + +inherit meson pkgconfig + +# These are for the tests and demos, which we don't install +EXTRA_OEMESON = "-Dgtk=disabled -Dlibpng=disabled" +# ld: pixman/libpixman-mmx.a(pixman-mmx.c.o): +# linking mips:loongson_2f module with previous mips:isa64 modules +EXTRA_OEMESON += "-Dloongson-mmi=disabled" +# disable iwmmxt due to compile fails on most arm platforms. +EXTRA_OEMESON += "-Diwmmxt=disabled" + +EXTRA_OEMESON:append:class-target:powerpc = " ${@bb.utils.contains("TUNE_FEATURES", "altivec", "-Dvmx=enabled", "-Dvmx=disabled", d)}" +EXTRA_OEMESON:append:class-target:powerpc64 = " ${@bb.utils.contains("TUNE_FEATURES", "altivec", "-Dvmx=enabled", "-Dvmx=disabled", d)}" +EXTRA_OEMESON:append:class-target:powerpc64le = " ${@bb.utils.contains("TUNE_FEATURES", "altivec", "-Dvmx=enabled", "-Dvmx=disabled", d)}" + +EXTRA_OEMESON:append:armv7a = "${@bb.utils.contains("TUNE_FEATURES","neon",""," -Dneon=disabled",d)}" +EXTRA_OEMESON:append:armv7ve = "${@bb.utils.contains("TUNE_FEATURES","neon",""," -Dneon=disabled",d)}" + +EXTRA_OEMESON:append:class-native = " -Dopenmp=disabled" + +BBCLASSEXTEND = "native nativesdk" + +CVE_STATUS[CVE-2023-37769] = "not-applicable-config: stress-test is an uninstalled test" diff --git a/meta/recipes-graphics/xorg-lib/xcb-util-cursor_0.1.4.bb b/meta/recipes-graphics/xorg-lib/xcb-util-cursor_0.1.4.bb new file mode 100644 index 0000000000..047697845c --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/xcb-util-cursor_0.1.4.bb @@ -0,0 +1,10 @@ +require recipes-graphics/xorg-lib/xcb-util.inc + +SUMMARY = "XCB port of libXcursor" + +DEPENDS += "xcb-util xcb-util-renderutil xcb-util-image" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=ce469b61c70ff8d7cce0547476891974" + +SRC_URI[sha256sum] = "28dcfe90bcab7b3561abe0dd58eb6832aa9cc77cfe42fcdfa4ebe20d605231fb" diff --git a/meta/recipes-graphics/xorg-lib/xcb-util-image_0.4.0.bb b/meta/recipes-graphics/xorg-lib/xcb-util-image_0.4.1.bb index c6bb5a61cd..018ac913bf 100644 --- a/meta/recipes-graphics/xorg-lib/xcb-util-image_0.4.0.bb +++ b/meta/recipes-graphics/xorg-lib/xcb-util-image_0.4.1.bb @@ -9,5 +9,4 @@ LIC_FILES_CHKSUM = "file://image/xcb_image.c;endline=24;md5=eafdf965cfb89955fded SRC_URI += "file://clang.patch \ " -SRC_URI[md5sum] = "08fe8ffecc8d4e37c0ade7906b3f4c87" -SRC_URI[sha256sum] = "2db96a37d78831d643538dd1b595d7d712e04bdccf8896a5e18ce0f398ea2ffc" +SRC_URI[sha256sum] = "ccad8ee5dadb1271fd4727ad14d9bd77a64e505608766c4e98267d9aede40d3d" diff --git a/meta/recipes-graphics/xorg-lib/xcb-util-keysyms_0.4.0.bb b/meta/recipes-graphics/xorg-lib/xcb-util-keysyms_0.4.1.bb index bca64ed61f..f1a4c3e500 100644 --- a/meta/recipes-graphics/xorg-lib/xcb-util-keysyms_0.4.0.bb +++ b/meta/recipes-graphics/xorg-lib/xcb-util-keysyms_0.4.1.bb @@ -3,7 +3,6 @@ require xcb-util.inc LICENSE = "MIT" LIC_FILES_CHKSUM = "file://keysyms/keysyms.c;endline=30;md5=2f8de023ed823bb92f0b47900574ea9e \ " -SRC_URI[md5sum] = "1022293083eec9e62d5659261c29e367" -SRC_URI[sha256sum] = "0ef8490ff1dede52b7de533158547f8b454b241aa3e4dcca369507f66f216dd9" +SRC_URI[sha256sum] = "7c260a5294412aed429df1da2f8afd3bd07b7cba3fec772fba15a613a6d5c638" diff --git a/meta/recipes-graphics/xorg-lib/xcb-util-renderutil_0.3.9.bb b/meta/recipes-graphics/xorg-lib/xcb-util-renderutil_0.3.10.bb index 25c22e5fa7..6590fa3301 100644 --- a/meta/recipes-graphics/xorg-lib/xcb-util-renderutil_0.3.9.bb +++ b/meta/recipes-graphics/xorg-lib/xcb-util-renderutil_0.3.10.bb @@ -6,5 +6,4 @@ LIC_FILES_CHKSUM = "file://renderutil/glyph.c;endline=24;md5=c517c483b8d726234ec file://renderutil/xcb_renderutil.h;endline=24;md5=d0ddab3052dd4949c93cfcb0891c96df \ " -SRC_URI[md5sum] = "468b119c94da910e1291f3ffab91019a" -SRC_URI[sha256sum] = "c6e97e48fb1286d6394dddb1c1732f00227c70bd1bedb7d1acabefdd340bea5b" +SRC_URI[sha256sum] = "3e15d4f0e22d8ddbfbb9f5d77db43eacd7a304029bf25a6166cc63caa96d04ba" diff --git a/meta/recipes-graphics/xorg-lib/xcb-util-wm_0.4.1.bb b/meta/recipes-graphics/xorg-lib/xcb-util-wm_0.4.2.bb index 39f1383299..65d340f88c 100644 --- a/meta/recipes-graphics/xorg-lib/xcb-util-wm_0.4.1.bb +++ b/meta/recipes-graphics/xorg-lib/xcb-util-wm_0.4.2.bb @@ -7,5 +7,4 @@ LIC_FILES_CHKSUM = "file://ewmh/ewmh.c.m4;endline=27;md5=63fd80552d7dc886f4eb267 file://icccm/xcb_icccm.h;beginline=4;endline=31;md5=393772b7b07b9868d479d538238c1d8a \ " -SRC_URI[md5sum] = "87b19a1cd7bfcb65a24e36c300e03129" -SRC_URI[sha256sum] = "28bf8179640eaa89276d2b0f1ce4285103d136be6c98262b6151aaee1d3c2a3f" +SRC_URI[sha256sum] = "62c34e21d06264687faea7edbf63632c9f04d55e72114aa4a57bb95e4f888a0b" diff --git a/meta/recipes-graphics/xorg-lib/xcb-util.inc b/meta/recipes-graphics/xorg-lib/xcb-util.inc index 99d04f9d44..9898a6a13e 100644 --- a/meta/recipes-graphics/xorg-lib/xcb-util.inc +++ b/meta/recipes-graphics/xorg-lib/xcb-util.inc @@ -16,8 +16,8 @@ SECTION = "x11/libs" DEPENDS = "libxcb" DEPENDS += "gperf-native" -SRC_URI = "http://xcb.freedesktop.org/dist/${BPN}-${PV}.tar.bz2" +SRC_URI = "http://xcb.freedesktop.org/dist/${BPN}-${PV}.tar.xz" -inherit autotools pkgconfig distro_features_check +inherit autotools pkgconfig features_check REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta/recipes-graphics/xorg-lib/xcb-util_0.4.0.bb b/meta/recipes-graphics/xorg-lib/xcb-util_0.4.1.bb index 206f07a65c..0da004f907 100644 --- a/meta/recipes-graphics/xorg-lib/xcb-util_0.4.0.bb +++ b/meta/recipes-graphics/xorg-lib/xcb-util_0.4.1.bb @@ -1,8 +1,9 @@ require xcb-util.inc +SRC_URI = "http://xcb.freedesktop.org/dist/${BPN}-${PV}.tar.xz" + 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] = "2e97feed81919465a04ccc71e4073313" -SRC_URI[sha256sum] = "46e49469cb3b594af1d33176cd7565def2be3fa8be4371d62271fabb5eae50e9" +SRC_URI[sha256sum] = "5abe3bbbd8e54f0fa3ec945291b7e8fa8cfd3cccc43718f8758430f94126e512" diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.22.bb b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.41.bb index 4fd894fd79..79ce7dea35 100644 --- a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.22.bb +++ b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.41.bb @@ -9,24 +9,24 @@ systems." HOMEPAGE = "http://freedesktop.org/wiki/Software/XKeyboardConfig" BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xkeyboard-config" -LICENSE = "MIT & MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9" +LICENSE = "MIT & MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=8fc8ae699974c360e2e2e883a63ce264" -SRC_URI = "${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2" - -SRC_URI[md5sum] = "eb61fb3fd419e817df572b0c8d94a883" -SRC_URI[sha256sum] = "deaec9989fbc443358b43864437b7b6d39caff07890a4a8055105ce9fcaa59bd" +SRC_URI = "${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.xz" +SRC_URI[sha256sum] = "f02cd6b957295e0d50236a3db15825256c92f67ef1f73bf1c77a4b179edf728f" SECTION = "x11/libs" -DEPENDS = "intltool-native util-macros libxslt-native" +DEPENDS = "util-macros libxslt-native" EXTRA_OECONF = "--with-xkb-rules-symlink=xorg --disable-runtime-deps" -FILES_${PN} += "${datadir}/X11/xkb" +FILES:${PN} += "${datadir}/X11/xkb" -inherit autotools pkgconfig gettext +inherit meson pkgconfig gettext python3native -do_install_append () { +do_install:append () { install -d ${D}${datadir}/X11/xkb/compiled cd ${D}${datadir}/X11/xkb/rules && ln -sf base xorg } + +BBCLASSEXTEND += "native" diff --git a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc index 6f4e44454f..15c7ecf782 100644 --- a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc +++ b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc @@ -2,26 +2,26 @@ HOMEPAGE = "http://www.x.org" BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg" SECTION = "x11/libs" -LICENSE = "MIT-X" +LICENSE = "MIT" DEPENDS = "util-macros" XORG_PN = "${BPN}" +XORG_EXT ?= "tar.xz" -SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.bz2" +SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.${XORG_EXT}" S = "${WORKDIR}/${XORG_PN}-${PV}" -inherit autotools distro_features_check pkgconfig +inherit autotools features_check pkgconfig EXTRA_OECONF = "--disable-specs --without-groff --without-ps2pdf --without-fop" PACKAGECONFIG ??= "" PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" -UNKNOWN_CONFIGURE_WHITELIST += "--enable-malloc0returnsnull --disable-malloc0returnsnull \ +UNKNOWN_CONFIGURE_OPT_IGNORE += "--enable-malloc0returnsnull --disable-malloc0returnsnull \ --disable-specs --without-groff --without-ps2pdf --without-fop \ --without-xmlto --with-xmlto \ " REQUIRED_DISTRO_FEATURES ?= "x11" -REQUIRED_DISTRO_FEATURES_class-native = "" diff --git a/meta/recipes-graphics/xorg-lib/xtrans/multilibfix.patch b/meta/recipes-graphics/xorg-lib/xtrans/multilibfix.patch new file mode 100644 index 0000000000..c513bad20e --- /dev/null +++ b/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/meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb b/meta/recipes-graphics/xorg-lib/xtrans_1.5.0.bb index d5b7f1a2c6..781382e516 100644 --- a/meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb +++ b/meta/recipes-graphics/xorg-lib/xtrans_1.5.0.bb @@ -9,16 +9,17 @@ except in the X Transport Interface code." require xorg-lib-common.inc -LICENSE = "MIT & MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=49347921d4d5268021a999f250edc9ca" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=bc875e1c864f4f62b29f7d8651f627fa" + +SRC_URI += "file://multilibfix.patch" PE = "1" -RDEPENDS_${PN}-dev = "" +DEV_PKG_DEPENDENCY = "" inherit gettext BBCLASSEXTEND = "native nativesdk" -SRC_URI[md5sum] = "c5ba432dd1514d858053ffe9f4737dd8" -SRC_URI[sha256sum] = "adbd3b36932ce4c062cd10f57d78a156ba98d618bdb6f50664da327502bc8301" +SRC_URI[sha256sum] = "1ba4b703696bfddbf40bacf25bce4e3efb2a0088878f017a50e9884b0c8fb1bd" |