diff options
Diffstat (limited to 'meta/recipes-graphics/xorg-lib')
-rw-r--r-- | meta/recipes-graphics/xorg-lib/files/libx11-whitespace.patch | 56 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libdmx_1.1.4.bb | 20 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libfontenc_1.1.8.bb (renamed from meta/recipes-graphics/xorg-lib/libfontenc_1.1.4.bb) | 3 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libice_1.1.1.bb (renamed from meta/recipes-graphics/xorg-lib/libice_1.0.10.bb) | 5 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libpciaccess_0.16.bb | 19 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libpciaccess_0.18.1.bb | 26 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libpthread-stubs_0.5.bb (renamed from meta/recipes-graphics/xorg-lib/libpthread-stubs_0.4.bb) | 9 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libsm_1.2.4.bb (renamed from meta/recipes-graphics/xorg-lib/libsm_1.2.3.bb) | 5 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11-compose-data/0001-Drop-x11-dependencies.patch | 12 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11-compose-data_1.8.4.bb (renamed from meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb) | 21 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch | 58 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11_1.6.9.bb | 46 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11_1.8.9.bb | 43 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxau_1.0.11.bb (renamed from meta/recipes-graphics/xorg-lib/libxau_1.0.9.bb) | 5 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxcb/0001-use-_Alignof-to-avoid-UB-in-ALIGNOF.patch | 45 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch | 25 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxcb_1.16.1.bb (renamed from meta/recipes-graphics/xorg-lib/libxcb_1.14.bb) | 17 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxcomposite/change-include-order.patch | 18 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxcomposite_0.4.6.bb (renamed from meta/recipes-graphics/xorg-lib/libxcomposite_0.4.5.bb) | 7 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxcursor_1.2.2.bb (renamed from meta/recipes-graphics/xorg-lib/libxcursor_1.2.0.bb) | 8 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxcvt_0.1.2.bb | 19 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxdamage_1.1.6.bb (renamed from meta/recipes-graphics/xorg-lib/libxdamage_1.1.5.bb) | 3 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxdmcp_1.1.5.bb (renamed from meta/recipes-graphics/xorg-lib/libxdmcp_1.1.3.bb) | 5 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxext_1.3.6.bb (renamed from meta/recipes-graphics/xorg-lib/libxext_1.3.4.bb) | 8 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxfixes_6.0.1.bb (renamed from meta/recipes-graphics/xorg-lib/libxfixes_5.0.3.bb) | 10 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxfont2_2.0.6.bb (renamed from meta/recipes-graphics/xorg-lib/libxfont2_2.0.4.bb) | 5 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxfont_1.5.4.bb | 3 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxft_2.3.8.bb (renamed from meta/recipes-graphics/xorg-lib/libxft_2.3.3.bb) | 9 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxi_1.8.1.bb (renamed from meta/recipes-graphics/xorg-lib/libxi_1.7.10.bb) | 6 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxinerama_1.1.5.bb (renamed from meta/recipes-graphics/xorg-lib/libxinerama_1.1.4.bb) | 4 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxkbcommon_0.10.0.bb | 27 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxkbcommon_1.7.0.bb | 40 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxkbfile_1.1.3.bb (renamed from meta/recipes-graphics/xorg-lib/libxkbfile_1.1.0.bb) | 6 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxmu_1.2.1.bb (renamed from meta/recipes-graphics/xorg-lib/libxmu_1.1.3.bb) | 12 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxpm_3.5.17.bb (renamed from meta/recipes-graphics/xorg-lib/libxpm_3.5.13.bb) | 10 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxrandr_1.5.4.bb (renamed from meta/recipes-graphics/xorg-lib/libxrandr_1.5.2.bb) | 5 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxrender_0.9.11.bb (renamed from meta/recipes-graphics/xorg-lib/libxrender_0.9.10.bb) | 6 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxres_1.2.2.bb (renamed from meta/recipes-graphics/xorg-lib/libxres_1.2.0.bb) | 3 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.4.bb (renamed from meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.3.bb) | 5 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxshmfence/0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch | 39 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxshmfence_1.3.2.bb (renamed from meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb) | 9 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxt_1.3.0.bb (renamed from meta/recipes-graphics/xorg-lib/libxt_1.2.0.bb) | 8 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxtst_1.2.4.bb (renamed from meta/recipes-graphics/xorg-lib/libxtst_1.2.3.bb) | 6 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxv_1.0.12.bb (renamed from meta/recipes-graphics/xorg-lib/libxv_1.0.11.bb) | 5 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxvmc_1.0.14.bb (renamed from meta/recipes-graphics/xorg-lib/libxvmc_1.0.12.bb) | 4 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.5.bb (renamed from meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.4.bb) | 4 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/pixman_0.42.2.bb (renamed from meta/recipes-graphics/xorg-lib/pixman_0.40.0.bb) | 18 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/xcb-util-cursor_0.1.4.bb | 10 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/xcb-util-image_0.4.1.bb (renamed from meta/recipes-graphics/xorg-lib/xcb-util-image_0.4.0.bb) | 3 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/xcb-util-keysyms_0.4.1.bb (renamed from meta/recipes-graphics/xorg-lib/xcb-util-keysyms_0.4.0.bb) | 3 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/xcb-util-renderutil_0.3.10.bb (renamed from meta/recipes-graphics/xorg-lib/xcb-util-renderutil_0.3.9.bb) | 3 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/xcb-util-wm_0.4.2.bb (renamed from meta/recipes-graphics/xorg-lib/xcb-util-wm_0.4.1.bb) | 3 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/xcb-util.inc | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/xcb-util_0.4.1.bb (renamed from meta/recipes-graphics/xorg-lib/xcb-util_0.4.0.bb) | 5 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/xkeyboard-config_2.41.bb (renamed from meta/recipes-graphics/xorg-lib/xkeyboard-config_2.30.bb) | 16 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/xorg-lib-common.inc | 7 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/xtrans_1.5.0.bb (renamed from meta/recipes-graphics/xorg-lib/xtrans_1.4.0.bb) | 9 |
57 files changed, 363 insertions, 425 deletions
diff --git a/meta/recipes-graphics/xorg-lib/files/libx11-whitespace.patch b/meta/recipes-graphics/xorg-lib/files/libx11-whitespace.patch deleted file mode 100644 index 3f97143082..0000000000 --- a/meta/recipes-graphics/xorg-lib/files/libx11-whitespace.patch +++ /dev/null @@ -1,56 +0,0 @@ -Upstream-Status: Submitted [https://gitlab.freedesktop.org/xorg/lib/libx11/merge_requests/33] -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From b41469c5f08b1f3365667ff3c430b104c9b8e25f Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@intel.com> -Date: Wed, 22 Jan 2020 17:11:23 +0000 -Subject: [PATCH libX11] cpprules.in: squash whitespace in generated files - -CPP is used to generate files, but as cpp reads files from the build host the -output has a number of blank lines at the beginning which varies depending on -what GCC and friends is used. - -Pathalogical example: - - $ cpp -undef -traditional /dev/null - # 1 "/dev/null" - # 1 "<built-in>" - # 1 "<command-line>" - # 31 "<command-line>" - # 1 "/usr/include/stdc-predef.h" 1 3 4 - - # 17 "/usr/include/stdc-predef.h" 3 4 - - [ 40 blank line ] - - # 32 "<command-line>" 2 - # 1 "/dev/null" - -So depending on the content of stdc-predef.h and what other headers CPP will -load, the amount of whitespace in the generates files varies. This can result in -differences in reproducible environments, and file conflicts in multilib -environments. - -As whitespace is irrelevant to these machine-readable files, extend the sed to -just delete blank lines. ---- - cpprules.in | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/cpprules.in b/cpprules.in -index 03d6701e..ce6b3c98 100644 ---- a/cpprules.in -+++ b/cpprules.in -@@ -23,7 +23,8 @@ CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \ - -e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \ - -e '/^[ ]*XHASH/s/XHASH/\#/' \ - -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \ -- -e '/\@\@$$/s/\@\@$$/\\/' -+ -e '/\@\@$$/s/\@\@$$/\\/' \ -+ -e '/^$$/d' - - .pre: - @$(MKDIR_P) $(@D) --- -2.20.1 - diff --git a/meta/recipes-graphics/xorg-lib/libdmx_1.1.4.bb b/meta/recipes-graphics/xorg-lib/libdmx_1.1.4.bb deleted file mode 100644 index 66172cb30c..0000000000 --- a/meta/recipes-graphics/xorg-lib/libdmx_1.1.4.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 xorgproto" - -PE = "1" - -SRC_URI[md5sum] = "d2f1f0ec68ac3932dd7f1d9aa0a7a11c" -SRC_URI[sha256sum] = "253f90005d134fa7a209fbcbc5a3024335367c930adf0f3203e754cf32747243" - diff --git a/meta/recipes-graphics/xorg-lib/libfontenc_1.1.4.bb b/meta/recipes-graphics/xorg-lib/libfontenc_1.1.8.bb index 1fc74b1995..0fc117fc58 100644 --- a/meta/recipes-graphics/xorg-lib/libfontenc_1.1.4.bb +++ b/meta/recipes-graphics/xorg-lib/libfontenc_1.1.8.bb @@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=96254c20ab81c63e65b26f0dbcd4a1c1" DEPENDS += "zlib xorgproto font-util" PE = "1" -SRC_URI[md5sum] = "6447db6a689fb530c218f0f8328c3abc" -SRC_URI[sha256sum] = "2cfcce810ddd48f2e5dc658d28c1808e86dcf303eaff16728b9aa3dbc0092079" +SRC_URI[sha256sum] = "7b02c3d405236e0d86806b1de9d6868fe60c313628b38350b032914aa4fd14c6" BBCLASSEXTEND = "native" diff --git a/meta/recipes-graphics/xorg-lib/libice_1.0.10.bb b/meta/recipes-graphics/xorg-lib/libice_1.1.1.bb index 6a6316f320..d5e3d28e06 100644 --- a/meta/recipes-graphics/xorg-lib/libice_1.0.10.bb +++ b/meta/recipes-graphics/xorg-lib/libice_1.1.1.bb @@ -8,7 +8,7 @@ negotiating versions, and for reporting errors. " require xorg-lib-common.inc -LICENSE = "MIT-style" +LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=d162b1b3c6fa812da9d804dcf8584a93" DEPENDS += "xorgproto xtrans" @@ -20,8 +20,7 @@ XORG_PN = "libICE" BBCLASSEXTEND = "native nativesdk" -SRC_URI[md5sum] = "76d77499ee7120a56566891ca2c0dbcf" -SRC_URI[sha256sum] = "6f86dce12cf4bcaf5c37dddd8b1b64ed2ddf1ef7b218f22b9942595fb747c348" +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_0.16.bb b/meta/recipes-graphics/xorg-lib/libpciaccess_0.16.bb deleted file mode 100644 index b58cb80dc3..0000000000 --- a/meta/recipes-graphics/xorg-lib/libpciaccess_0.16.bb +++ /dev/null @@ -1,19 +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 += "\ -" - -SRC_URI[md5sum] = "b34e2cbdd6aa8f9cc3fa613fd401a6d6" -SRC_URI[sha256sum] = "214c9d0d884fdd7375ec8da8dcb91a8d3169f263294c9a90c575bf1938b9f489" - -LICENSE = "MIT & MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=277aada5222b9a22fbf3471ff3687068" - -REQUIRED_DISTRO_FEATURES = "" - -BBCLASSEXTEND = "native nativesdk" 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 ffa1c859d6..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,13 +7,12 @@ SECTION = "x11/libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=6edc1fea03d959f0c2d743fe5ca746ad" -SRC_URI = "http://xcb.freedesktop.org/dist/${BP}.tar.bz2" -SRC_URI[md5sum] = "48c1544854a94db0e51499cc3afd797f" -SRC_URI[sha256sum] = "e4d05911a3165d3b18321cc067fdd2f023f06436e391c6a28dff618a78d2e733" +SRC_URI = "http://xcb.freedesktop.org/dist/${BP}.tar.xz" +SRC_URI[sha256sum] = "59da566decceba7c2a7970a4a03b48d9905f1262ff94410a649224e33d2442bc" inherit autotools -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.3.bb b/meta/recipes-graphics/xorg-lib/libsm_1.2.4.bb index 49df690f0a..ab030723c6 100644 --- a/meta/recipes-graphics/xorg-lib/libsm_1.2.3.bb +++ b/meta/recipes-graphics/xorg-lib/libsm_1.2.4.bb @@ -8,7 +8,7 @@ has a particular state." require xorg-lib-common.inc -LICENSE = "MIT-style" +LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb37f44e02bdbde80546024400728d" DEPENDS += "libice xorgproto xtrans" @@ -22,8 +22,7 @@ PE = "1" XORG_PN = "libSM" -SRC_URI[md5sum] = "87c7fad1c1813517979184c8ccd76628" -SRC_URI[sha256sum] = "2d264499dcb05f56438dee12a1b4b71d76736ce7ba7aa6efbf15ebb113769cbb" +SRC_URI[sha256sum] = "fdcbe51e4d1276b1183da77a8a4e74a137ca203e0bcfb20972dd5f3347e97b84" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," 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 index 46a53a17f2..61af98d95e 100644 --- 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 @@ -6,12 +6,16 @@ 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 a5fd706..b42488c 100644 +index 33d0102..50e2d93 100644 --- a/configure.ac +++ b/configure.ac @@ -76,27 +76,8 @@ fi @@ -20,7 +24,7 @@ index a5fd706..b42488c 100644 # Checks for pkg-config packages - -# Always required --X11_REQUIRES='xproto >= 7.0.17 xextproto xtrans xcb >= 1.11.1' +-X11_REQUIRES='xproto >= 7.0.25 xextproto xtrans xcb >= 1.11.1' -X11_EXTRA_DEPS="xcb >= 1.11.1" - PKG_PROG_PKG_CONFIG() @@ -42,7 +46,7 @@ index a5fd706..b42488c 100644 # Check for dlopen AC_MSG_CHECKING([if run-time linking is supported]) AC_SEARCH_LIBS(dlopen,[dl svld]) -@@ -237,30 +218,6 @@ AC_SUBST(XTHREAD_CFLAGS) +@@ -255,30 +236,6 @@ AC_SUBST(USE_THREAD_LIBS) AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], ) @@ -73,7 +77,7 @@ index a5fd706..b42488c 100644 AC_ARG_ENABLE(xcms, AS_HELP_STRING([--disable-xcms], [Disable Xlib support for CMS *EXPERIMENTAL*]), -@@ -340,7 +297,6 @@ X11_LIBDIR="${libdir}/X11" +@@ -358,7 +315,6 @@ X11_LIBDIR="${libdir}/X11" AX_DEFINE_DIR(X11_LIBDIR, X11_LIBDIR, [Location of libX11 library data]) AC_SUBST(X11_LIBDIR) diff --git a/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb b/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.8.4.bb index 3d97ad78d2..2131f46213 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.8.4.bb @@ -8,22 +8,19 @@ python () { require xorg-lib-common.inc -LICENSE = "MIT & MIT-style & BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" +LICENSE = "MIT & BSD-1-Clause & HPND & HPND-sell-variant & ISC" +LIC_FILES_CHKSUM = "file://COPYING;md5=1d49cdd2b386c5db11ec636d680b7116" -SRC_URI[md5sum] = "c5fa5a86a20e3591bed6c046498d4b8f" -SRC_URI[sha256sum] = "b289a845c189e251e0e884cc0f9269bbe97c238df3741e854ec4c17c21e473d5" +XORG_PN = "libX11" SRC_URI += "file://0001-Drop-x11-dependencies.patch \ - file://libx11-whitespace.patch" + " -XORG_PN = "libX11" +SRC_URI[sha256sum] = "c9a287a5aefa9804ce3cfafcf516fe96ed3f7e8e45c0e2ee59e84c86757df518" -EXTRA_OECONF += "--disable-xkb" - -PACKAGES = "${PN}" +REQUIRED_DISTRO_FEATURES = "" -FILES_${PN} = "${datadir}/X11/locale ${libdir}/X11/locale" +EXTRA_OECONF += "--disable-xkb" do_compile() { oe_runmake -C nls @@ -33,4 +30,6 @@ do_install() { oe_runmake DESTDIR=${D} -C nls install } -REQUIRED_DISTRO_FEATURES = "" +PACKAGES = "${PN}" + +FILES:${PN} = "${datadir}/X11/locale ${libdir}/X11/locale" 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 2a723b7e43..0000000000 --- a/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch +++ /dev/null @@ -1,58 +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> - -[Refreshed for 1.6.7 update] -Signed-off-by: Armin Kuster <akuster808@gmail.com> - ---- - src/xcb_io.c | 19 +++++++------------ - 1 file changed, 7 insertions(+), 12 deletions(-) - -Index: libX11-1.6.7/src/xcb_io.c -=================================================================== ---- libX11-1.6.7.orig/src/xcb_io.c -+++ libX11-1.6.7/src/xcb_io.c -@@ -620,18 +620,14 @@ Status _XReply(Display *dpy, xReply *rep - 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); -- } -- while((event = poll_for_event(dpy, True))) -- handle_response(dpy, event, True); -+ -+ /* 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); -+ } - } - - req->reply_waiter = 0; diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.6.9.bb b/meta/recipes-graphics/xorg-lib/libx11_1.6.9.bb deleted file mode 100644 index ff60a4240c..0000000000 --- a/meta/recipes-graphics/xorg-lib/libx11_1.6.9.bb +++ /dev/null @@ -1,46 +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 - -FILESEXTRAPATHS =. "${FILE_DIRNAME}/libx11:" - -PE = "1" - -SRC_URI += "file://Fix-hanging-issue-in-_XReply.patch \ - file://disable_tests.patch \ - file://libx11-whitespace.patch" - -SRC_URI[md5sum] = "55adbfb6d4370ecac5e70598c4e7eed2" -SRC_URI[sha256sum] = "9cc7e8d000d6193fa5af580d50d689380b8287052270f5bb26a5fb6b58b2bed1" - -PROVIDES = "virtual/libx11" - -XORG_PN = "libX11" -LICENSE = "MIT & MIT-style & BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" - -DEPENDS += "xorgproto xtrans libxcb" -DEPENDS += "xorgproto-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" - -inherit gettext - -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/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.9.bb b/meta/recipes-graphics/xorg-lib/libxau_1.0.11.bb index dcfc66652a..f1b492c39f 100644 --- a/meta/recipes-graphics/xorg-lib/libxau_1.0.9.bb +++ b/meta/recipes-graphics/xorg-lib/libxau_1.0.11.bb @@ -8,7 +8,7 @@ require xorg-lib-common.inc inherit gettext -LICENSE = "MIT-style" +LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=7908e342491198401321cec1956807ec" DEPENDS += " xorgproto" @@ -20,5 +20,4 @@ XORG_PN = "libXau" BBCLASSEXTEND = "native nativesdk" -SRC_URI[md5sum] = "c5f16288f2da9f071b29111d68797480" -SRC_URI[sha256sum] = "ccf8cbf0dbf676faa2ea0a6d64bcc3b6746064722b606c8c52917ed00dcb73ec" +SRC_URI[sha256sum] = "f3fa3282f5570c3f6bd620244438dbfbdd580fc80f02f549587a0f8ab329bbeb" 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/disable-check.patch b/meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch deleted file mode 100644 index c0efbdc213..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> - - -Index: libxcb-1.12/configure.ac -=================================================================== ---- libxcb-1.12.orig/configure.ac -+++ libxcb-1.12/configure.ac -@@ -36,7 +36,8 @@ if test x"$HAVE_DOT" = xno; then - AC_MSG_WARN([dot not found - doxygen targets will be skipped]) - fi - --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) - - XSLTPROC=no diff --git a/meta/recipes-graphics/xorg-lib/libxcb_1.14.bb b/meta/recipes-graphics/xorg-lib/libxcb_1.16.1.bb index f27c5daa61..de3290aa9f 100644 --- a/meta/recipes-graphics/xorg-lib/libxcb_1.14.bb +++ b/meta/recipes-graphics/xorg-lib/libxcb_1.16.1.bb @@ -10,18 +10,17 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7" SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.xz \ - file://disable-check.patch \ - " + file://0001-use-_Alignof-to-avoid-UB-in-ALIGNOF.patch" -SRC_URI[sha256sum] = "a55ed6db98d43469801262d81dc2572ed124edc3db31059d4e9916eb9f844c34" +SRC_URI[sha256sum] = "f24d187154c8e027b358fc7cb6588e35e33e6a92f11c668fe77396a7ae66e311" BBCLASSEXTEND = "native nativesdk" DEPENDS = "xcb-proto xorgproto libxau libpthread-stubs libxdmcp" -PACKAGES_DYNAMIC = "^libxcb-.*" +PACKAGES_DYNAMIC = "^${PN}-.*" -FILES_${PN} = "${libdir}/libxcb.so.*" +FILES:${PN} = "${libdir}/libxcb.so.*" inherit autotools pkgconfig features_check @@ -30,6 +29,10 @@ REQUIRED_DISTRO_FEATURES = "x11" export PYTHON = "python3" -python populate_packages_prepend () { - do_split_packages(d, '${libdir}', r'^libxcb-(.*)\.so\..*$', 'libxcb-%s', 'XCB library module for %s', allow_links=True) +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.5.bb b/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.6.bb index 3ef3ddb817..881f579695 100644 --- a/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.5.bb +++ b/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.6.bb @@ -11,7 +11,7 @@ compositing transformations through a client." require xorg-lib-common.inc -LICENSE = "MIT-style" +LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=3f2907aad541f6f226fbc58cc1b3cdf1" DEPENDS += " xorgproto virtual/libx11 libxfixes libxext" @@ -22,7 +22,4 @@ PE = "1" XORG_PN = "libXcomposite" -SRC_URI += " file://change-include-order.patch" - -SRC_URI[md5sum] = "3fa0841ea89024719b20cd702a9b54e0" -SRC_URI[sha256sum] = "b3218a2c15bab8035d16810df5b8251ffc7132ff3aa70651a1fba0bfe9634e8f" +SRC_URI[sha256sum] = "fe40bcf0ae1a09070eba24088a5eb9810efe57453779ec1e20a55080c6dc2c87" diff --git a/meta/recipes-graphics/xorg-lib/libxcursor_1.2.0.bb b/meta/recipes-graphics/xorg-lib/libxcursor_1.2.2.bb index 2df7a3a4f2..159ac4f7fa 100644 --- a/meta/recipes-graphics/xorg-lib/libxcursor_1.2.0.bb +++ b/meta/recipes-graphics/xorg-lib/libxcursor_1.2.2.bb @@ -7,9 +7,10 @@ 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" @@ -17,7 +18,6 @@ PE = "1" XORG_PN = "libXcursor" -SRC_URI[md5sum] = "9b9be0e289130fb820aedf67705fc549" -SRC_URI[sha256sum] = "3ad3e9f8251094af6fe8cb4afcf63e28df504d46bfa5a5529db74a505d628782" +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.5.bb b/meta/recipes-graphics/xorg-lib/libxdamage_1.1.6.bb index b201124d86..279d6c33dc 100644 --- a/meta/recipes-graphics/xorg-lib/libxdamage_1.1.5.bb +++ b/meta/recipes-graphics/xorg-lib/libxdamage_1.1.6.bb @@ -23,7 +23,6 @@ PE = "1" XORG_PN = "libXdamage" -SRC_URI[md5sum] = "e3f554267a7a04b042dc1f6352bd6d99" -SRC_URI[sha256sum] = "b734068643cac3b5f3d2c8279dd366b5bf28c7219d9e9d8717e1383995e0ea45" +SRC_URI[sha256sum] = "52733c1f5262fca35f64e7d5060c6fcd81a880ba8e1e65c9621cf0727afb5d11" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.3.bb b/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.5.bb index d43a146fd7..d1a1a2e7f9 100644 --- a/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.3.bb +++ b/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.5.bb @@ -10,7 +10,7 @@ require xorg-lib-common.inc inherit gettext -LICENSE = "MIT-style" +LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=d559fb26e129626022e052a5e6e0e123" DEPENDS += "xorgproto" @@ -22,8 +22,7 @@ XORG_PN = "libXdmcp" BBCLASSEXTEND = "native nativesdk" -SRC_URI[md5sum] = "115c5c12ecce0e749cd91d999a5fd160" -SRC_URI[sha256sum] = "20523b44aaa513e17c009e873ad7bbc301507a3224c232610ce2e099011c6529" +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.4.bb b/meta/recipes-graphics/xorg-lib/libxext_1.3.6.bb index 9493111a67..275926a885 100644 --- a/meta/recipes-graphics/xorg-lib/libxext_1.3.4.bb +++ b/meta/recipes-graphics/xorg-lib/libxext_1.3.6.bb @@ -10,8 +10,8 @@ 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 += "xorgproto virtual/libx11" PROVIDES = "xext" @@ -19,8 +19,6 @@ PROVIDES = "xext" PE = "1" XORG_PN = "libXext" - BBCLASSEXTEND = "native nativesdk" -SRC_URI[md5sum] = "f5b48bb76ba327cd2a8dc7a383532a95" -SRC_URI[sha256sum] = "59ad6fcce98deaecc14d39a672cf218ca37aba617c9a0f691cac3bcd28edf82b" +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 f0e2f606ce..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 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.4.bb b/meta/recipes-graphics/xorg-lib/libxfont2_2.0.6.bb index 1c9cc0a21d..535e7f629e 100644 --- a/meta/recipes-graphics/xorg-lib/libxfont2_2.0.4.bb +++ b/meta/recipes-graphics/xorg-lib/libxfont2_2.0.6.bb @@ -6,7 +6,7 @@ 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 xorgproto libfontenc zlib" @@ -15,8 +15,7 @@ XORG_PN = "libXfont2" BBCLASSEXTEND = "native" -SRC_URI[md5sum] = "00516bed7ec1453d56974560379fff2f" -SRC_URI[sha256sum] = "6d151b3368e5035efede4b6264c0fdc6662c1c99dbc2de425e3480cababc69e6" +SRC_URI[sha256sum] = "74ca20017eb0fb3f56d8d5e60685f560fc85e5ff3d84c61c4cb891e40c27aef4" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/meta/recipes-graphics/xorg-lib/libxfont_1.5.4.bb b/meta/recipes-graphics/xorg-lib/libxfont_1.5.4.bb index 94c6c66e87..fa6585d6dc 100644 --- a/meta/recipes-graphics/xorg-lib/libxfont_1.5.4.bb +++ b/meta/recipes-graphics/xorg-lib/libxfont_1.5.4.bb @@ -6,7 +6,7 @@ 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 xorgproto libfontenc zlib" @@ -15,6 +15,7 @@ PROVIDES = "xfont" PE = "1" XORG_PN = "libXfont" +XORG_EXT = "tar.bz2" BBCLASSEXTEND = "native" diff --git a/meta/recipes-graphics/xorg-lib/libxft_2.3.3.bb b/meta/recipes-graphics/xorg-lib/libxft_2.3.8.bb index 65bd9ae494..2699c1dfd7 100644 --- a/meta/recipes-graphics/xorg-lib/libxft_2.3.3.bb +++ b/meta/recipes-graphics/xorg-lib/libxft_2.3.8.bb @@ -20,14 +20,13 @@ PROVIDES = "xft" PE = "1" -SRC_URI[md5sum] = "4a433c24627b4ff60a4dd403a0990796" -SRC_URI[sha256sum] = "225c68e616dd29dbb27809e45e9eadf18e4d74c50be43020ef20015274529216" +SRC_URI[sha256sum] = "5e8c3c4bc2d4c0a40aef6b4b38ed2fb74301640da29f6528154b5009b1c6dd49" XORG_PN = "libXft" 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.10.bb b/meta/recipes-graphics/xorg-lib/libxi_1.8.1.bb index 5a08e07362..00bd46ef13 100644 --- a/meta/recipes-graphics/xorg-lib/libxi_1.7.10.bb +++ b/meta/recipes-graphics/xorg-lib/libxi_1.8.1.bb @@ -7,7 +7,7 @@ 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" @@ -16,8 +16,8 @@ DEPENDS += "libxext xorgproto libxfixes" PE = "1" XORG_PN = "libXi" +XORG_EXT = "tar.xz" -SRC_URI[md5sum] = "62c4af0839072024b4b1c8cbe84216c7" -SRC_URI[sha256sum] = "36a30d8f6383a72e7ce060298b4b181fd298bc3a135c8e201b7ca847f5f81061" +SRC_URI[sha256sum] = "89bfc0e814f288f784202e6e5f9b362b788ccecdeb078670145eacd8749656a7" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/xorg-lib/libxinerama_1.1.4.bb b/meta/recipes-graphics/xorg-lib/libxinerama_1.1.5.bb index edce35da5d..421b64e68d 100644 --- a/meta/recipes-graphics/xorg-lib/libxinerama_1.1.4.bb +++ b/meta/recipes-graphics/xorg-lib/libxinerama_1.1.5.bb @@ -15,8 +15,6 @@ PROVIDES = "xinerama" PE = "1" XORG_PN = "libXinerama" - -SRC_URI[md5sum] = "0d5f826a197dae74da67af4a9ef35885" -SRC_URI[sha256sum] = "0008dbd7ecf717e1e507eed1856ab0d9cf946d03201b85d5dcf61489bb02d720" +SRC_URI[sha256sum] = "5094d1f0fcc1828cb1696d0d39d9e866ae32520c54d01f618f1a3c1e30c2085c" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.10.0.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.10.0.bb deleted file mode 100644 index 16d9c36eae..0000000000 --- a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.10.0.bb +++ /dev/null @@ -1,27 +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] = "2d9ad3a46b317138b5e72a91cf105451" -SRC_URI[sha256sum] = "57c3630cdc38fb4734cd57fa349e92244f5ae3862813e533cedbd86721a0b6f2" - -UPSTREAM_CHECK_URI = "http://xkbcommon.org/" - -inherit meson pkgconfig - -EXTRA_OEMESON = "-Denable-docs=false" - -PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)}" -PACKAGECONFIG[x11] = "-Denable-x11=true,-Denable-x11=false,libxcb xkeyboard-config," -PACKAGECONFIG[wayland] = "-Denable-wayland=true,-Denable-wayland=false,wayland-native wayland wayland-protocols," - -# 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)}" 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.1.0.bb b/meta/recipes-graphics/xorg-lib/libxkbfile_1.1.3.bb index 3a6c50ca21..aab6284384 100644 --- a/meta/recipes-graphics/xorg-lib/libxkbfile_1.1.0.bb +++ b/meta/recipes-graphics/xorg-lib/libxkbfile_1.1.3.bb @@ -5,7 +5,7 @@ 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 xorgproto" @@ -13,6 +13,4 @@ DEPENDS += "virtual/libx11 xorgproto" PE = "1" BBCLASSEXTEND = "native" - -SRC_URI[md5sum] = "dd7e1e946def674e78c0efbc5c7d5b3b" -SRC_URI[sha256sum] = "758dbdaa20add2db4902df0b1b7c936564b7376c02a0acd1f2a331bd334b38c7" +SRC_URI[sha256sum] = "a9b63eea997abb9ee6a8b4fbb515831c841f471af845a09de443b28003874bec" diff --git a/meta/recipes-graphics/xorg-lib/libxmu_1.1.3.bb b/meta/recipes-graphics/xorg-lib/libxmu_1.2.1.bb index dc3179f53e..51faf170bf 100644 --- a/meta/recipes-graphics/xorg-lib/libxmu_1.1.3.bb +++ b/meta/recipes-graphics/xorg-lib/libxmu_1.2.1.bb @@ -9,8 +9,8 @@ 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" @@ -23,12 +23,8 @@ LEAD_SONAME = "libXmu" PACKAGES =+ "libxmuu" -FILES_libxmuu = "${libdir}/libXmuu.so.*" +FILES:libxmuu = "${libdir}/libXmuu.so.*" BBCLASSEXTEND = "native" -SRC_URI[md5sum] = "ac774cff8b493f566088a255dbf91201" -SRC_URI[sha256sum] = "9c343225e7c3dc0904f2122b562278da5fed639b1b5e880d25111561bac5b731" - -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.13.bb b/meta/recipes-graphics/xorg-lib/libxpm_3.5.17.bb index fda8e32d2c..8e15ecc0d4 100644 --- a/meta/recipes-graphics/xorg-lib/libxpm_3.5.13.bb +++ b/meta/recipes-graphics/xorg-lib/libxpm_3.5.17.bb @@ -11,17 +11,17 @@ an extension of the monochrome XBM bitmap specificied in the X \ protocol." LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=51f4270b012ecd4ab1a164f5f4ed6cf7" +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] = "6f0ecf8d103d528cfc803aa475137afa" -SRC_URI[sha256sum] = "9cd1da57588b6cb71450eff2273ef6b657537a9ac4d02d0014228845b935ac25" +SRC_URI[sha256sum] = "64b31f81019e7d388c822b0b28af8d51c4622b83f1f0cb6fa3fc95e271226e43" BBCLASSEXTEND = "native" diff --git a/meta/recipes-graphics/xorg-lib/libxrandr_1.5.2.bb b/meta/recipes-graphics/xorg-lib/libxrandr_1.5.4.bb index 53a8335d64..3e2825b916 100644 --- a/meta/recipes-graphics/xorg-lib/libxrandr_1.5.2.bb +++ b/meta/recipes-graphics/xorg-lib/libxrandr_1.5.4.bb @@ -8,7 +8,7 @@ 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 xorgproto libxrender libxext" @@ -19,5 +19,4 @@ XORG_PN = "libXrandr" BBCLASSEXTEND = "native nativesdk" -SRC_URI[md5sum] = "18f3b20d522f45e4dadd34afb5bea048" -SRC_URI[sha256sum] = "8aea0ebe403d62330bb741ed595b53741acf45033d3bda1792f1d4cc3daee023" +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 9b18366138..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,7 +8,7 @@ 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 xorgproto" @@ -18,7 +18,5 @@ 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 af6bb19a25..72b28d9107 100644 --- a/meta/recipes-graphics/xorg-lib/libxres_1.2.0.bb +++ b/meta/recipes-graphics/xorg-lib/libxres_1.2.2.bb @@ -16,5 +16,4 @@ 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.3.bb b/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.4.bb index aed52e75ee..1b407f52f0 100644 --- a/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.3.bb +++ b/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.4.bb @@ -14,10 +14,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=21fd154ee757813632ada871a34113fb" DEPENDS += "libxext xorgproto" PROVIDES = "libxss" -RREPLACES_${PN} = "libxss" +RREPLACES:${PN} = "libxss" PE = "1" XORG_PN = "libXScrnSaver" -SRC_URI[md5sum] = "eeea9d5af3e6c143d0ea1721d27a5e49" -SRC_URI[sha256sum] = "f917075a1b7b5a38d67a8b0238eaab14acd2557679835b154cf2bca576e89bf8" +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.3.bb b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.2.bb index cc45696530..0a7da938e1 100644 --- a/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.bb +++ b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.2.bb @@ -6,14 +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" EXTRA_OECONF += "--with-shared-memory-dir=/dev/shm" -BBCLASSEXTEND = "native nativesdk" +SRC_URI += "file://0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch" + +SRC_URI[sha256sum] = "870df257bc40b126d91b5a8f1da6ca8a524555268c50b59c0acd1a27f361606f" -SRC_URI[md5sum] = "42dda8016943dc12aff2c03a036e0937" -SRC_URI[sha256sum] = "b884300d26a14961a076fbebc762a39831cb75f92bed5ccf9836345b459220c7" +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/xorg-lib/libxt_1.2.0.bb b/meta/recipes-graphics/xorg-lib/libxt_1.3.0.bb index 54384521c8..1805dae772 100644 --- a/meta/recipes-graphics/xorg-lib/libxt_1.2.0.bb +++ b/meta/recipes-graphics/xorg-lib/libxt_1.3.0.bb @@ -12,8 +12,8 @@ independent of any particular user interface policy or style." require xorg-lib-common.inc -LICENSE = "MIT & MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=73d55cea4d27ca1a09a5d23378b3ecf8" +LICENSE = "MIT & MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=d6e9ca2c4b2276625afe025b0a2a4d8c" DEPENDS += "util-linux libxcb libsm virtual/libx11 xorgproto libxdmcp" PROVIDES = "xt" @@ -21,11 +21,11 @@ PROVIDES = "xt" PE = "1" XORG_PN = "libXt" +XORG_EXT = "tar.xz" SRC_URI += "file://libxt_fix_for_x32.patch" -SRC_URI[md5sum] = "a9019421d3ee8b4937b6afd9025f018a" -SRC_URI[sha256sum] = "b31df531dabed9f4611fc8980bc51d7782967e2aff44c4105251a1acb5a77831" +SRC_URI[sha256sum] = "52820b3cdb827d08dc90bdfd1b0022a3ad8919b57a39808b12591973b331bf91" BBCLASSEXTEND = "native nativesdk" 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 7837f69d38..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,7 +6,7 @@ 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" @@ -15,8 +15,6 @@ PROVIDES = "xtst" PE = "1" XORG_PN = "libXtst" - -SRC_URI[md5sum] = "ef8c2c1d16a00bd95b9fdcef63b8a2ca" -SRC_URI[sha256sum] = "4655498a1b8e844e3d6f21f3b2c4e2b571effb5fd83199d428a6ba7ea4bf5204" +SRC_URI[sha256sum] = "84f5f30b9254b4ffee14b5b0940e2622153b0d3aed8286a3c5b7eeb340ca33c8" 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 c6027233ef..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 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.12.bb b/meta/recipes-graphics/xorg-lib/libxvmc_1.0.14.bb index 29ed0c43d1..af18afc62d 100644 --- a/meta/recipes-graphics/xorg-lib/libxvmc_1.0.12.bb +++ b/meta/recipes-graphics/xorg-lib/libxvmc_1.0.14.bb @@ -4,6 +4,7 @@ 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 \ @@ -15,5 +16,4 @@ PE = "1" XORG_PN = "libXvMC" -SRC_URI[md5sum] = "3569ff7f3e26864d986d6a21147eaa58" -SRC_URI[sha256sum] = "6b3da7977b3f7eaf4f0ac6470ab1e562298d82c4e79077765787963ab7966dcd" +SRC_URI[sha256sum] = "e4be9eb6b6bafdbbf81f47f7163047215376e45e2dc786d0ea6181c930725ed9" 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 1612a50f19..16fd29ebcd 100644 --- a/meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.4.bb +++ b/meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.5.bb @@ -15,8 +15,6 @@ DEPENDS += "libxext xorgproto" PE = "1" XORG_PN = "libXxf86vm" - -SRC_URI[md5sum] = "298b8fff82df17304dfdb5fe4066fe3a" -SRC_URI[sha256sum] = "afee27f93c5f31c0ad582852c0fb36d50e4de7cd585fcf655e278a633d85cd57" +SRC_URI[sha256sum] = "247fef48b3e0e7e67129e41f1e789e8d006ba47dba1c0cdce684b9b703f888e7" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/xorg-lib/pixman_0.40.0.bb b/meta/recipes-graphics/xorg-lib/pixman_0.42.2.bb index 5a3bb22ec3..23ae0cbb27 100644 --- a/meta/recipes-graphics/xorg-lib/pixman_0.40.0.bb +++ b/meta/recipes-graphics/xorg-lib/pixman_0.42.2.bb @@ -10,15 +10,14 @@ 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[md5sum] = "73858c0862dd9896fb5f62ae267084a4" -SRC_URI[sha256sum] = "6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc" +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 & MIT-style & PD" +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 \ @@ -31,5 +30,18 @@ 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 0e5ab70b2d..9898a6a13e 100644 --- a/meta/recipes-graphics/xorg-lib/xcb-util.inc +++ b/meta/recipes-graphics/xorg-lib/xcb-util.inc @@ -16,7 +16,7 @@ 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 features_check 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.30.bb b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.41.bb index a4d67cd2ce..79ce7dea35 100644 --- a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.30.bb +++ b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.41.bb @@ -9,22 +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[sha256sum] = "095a524f7b633ed257617202d06c9c71fe020c8897b106cf0dcdd0c6e8b797d4" +SRC_URI = "${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.xz" +SRC_URI[sha256sum] = "f02cd6b957295e0d50236a3db15825256c92f67ef1f73bf1c77a4b179edf728f" SECTION = "x11/libs" 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 a566eaa45e..15c7ecf782 100644 --- a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc +++ b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc @@ -2,12 +2,13 @@ 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}" @@ -18,7 +19,7 @@ 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 \ " diff --git a/meta/recipes-graphics/xorg-lib/xtrans_1.4.0.bb b/meta/recipes-graphics/xorg-lib/xtrans_1.5.0.bb index 5bf134b5f8..781382e516 100644 --- a/meta/recipes-graphics/xorg-lib/xtrans_1.4.0.bb +++ b/meta/recipes-graphics/xorg-lib/xtrans_1.5.0.bb @@ -9,18 +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] = "ce2fb8100c6647ee81451ebe388b17ad" -SRC_URI[sha256sum] = "377c4491593c417946efcd2c7600d1e62639f7a8bbca391887e2c4679807d773" +SRC_URI[sha256sum] = "1ba4b703696bfddbf40bacf25bce4e3efb2a0088878f017a50e9884b0c8fb1bd" |