diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-05-18 12:58:03 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-05-20 22:52:22 +0100 |
commit | 373984df4dc14601a2dd7b6a44bf06090811fe34 (patch) | |
tree | 931ae146a763f65ad61ec6cd8db04a0a1ae5af49 | |
parent | ad57d49a4f9cc19d4e6275c82208dce3e60f990c (diff) | |
download | poky-373984df4dc14601a2dd7b6a44bf06090811fe34.tar.gz |
libxcb: update 1.14 -> 1.15
Drop disable-check.patch, with recipe-specific sysroots
it is no longer necessary.
(From OE-Core rev: 300afee4835c451db139aff6d5a2a465ca6b14f5)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch | 25 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxcb_1.15.bb (renamed from meta/recipes-graphics/xorg-lib/libxcb_1.14.bb) | 6 |
2 files changed, 2 insertions, 29 deletions
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 @@ | |||
1 | The "check" package is checked for without an explicit enable/disable option, | ||
2 | which can lead to non-deterministic build issues with both check and libxslt. | ||
3 | |||
4 | As the unit test suite is minimal at present, simply disable the test suite. In | ||
5 | the future if the test suite is expanded this can be made conditional on the | ||
6 | ptest DISTRO_FEATURE. | ||
7 | |||
8 | Upstream-Status: Inappropriate | ||
9 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
10 | |||
11 | |||
12 | Index: libxcb-1.12/configure.ac | ||
13 | =================================================================== | ||
14 | --- libxcb-1.12.orig/configure.ac | ||
15 | +++ libxcb-1.12/configure.ac | ||
16 | @@ -36,7 +36,8 @@ if test x"$HAVE_DOT" = xno; then | ||
17 | AC_MSG_WARN([dot not found - doxygen targets will be skipped]) | ||
18 | fi | ||
19 | |||
20 | -PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no]) | ||
21 | +dnl PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no]) | ||
22 | +HAVE_CHECK=no | ||
23 | AM_CONDITIONAL(HAVE_CHECK, test x$HAVE_CHECK = xyes) | ||
24 | |||
25 | XSLTPROC=no | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxcb_1.14.bb b/meta/recipes-graphics/xorg-lib/libxcb_1.15.bb index 5341bbd4bc..839577326e 100644 --- a/meta/recipes-graphics/xorg-lib/libxcb_1.14.bb +++ b/meta/recipes-graphics/xorg-lib/libxcb_1.15.bb | |||
@@ -9,11 +9,9 @@ SECTION = "x11/libs" | |||
9 | LICENSE = "MIT" | 9 | LICENSE = "MIT" |
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7" | 10 | LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7" |
11 | 11 | ||
12 | SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.xz \ | 12 | SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.xz" |
13 | file://disable-check.patch \ | ||
14 | " | ||
15 | 13 | ||
16 | SRC_URI[sha256sum] = "a55ed6db98d43469801262d81dc2572ed124edc3db31059d4e9916eb9f844c34" | 14 | SRC_URI[sha256sum] = "cc38744f817cf6814c847e2df37fcb8997357d72fa4bcbc228ae0fe47219a059" |
17 | 15 | ||
18 | BBCLASSEXTEND = "native nativesdk" | 16 | BBCLASSEXTEND = "native nativesdk" |
19 | 17 | ||