diff options
Diffstat (limited to 'poky/meta/recipes-graphics/xorg-lib')
-rw-r--r-- | poky/meta/recipes-graphics/xorg-lib/libx11_1.8.bb (renamed from poky/meta/recipes-graphics/xorg-lib/libx11_1.7.5.bb) | 2 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch | 25 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/xorg-lib/libxcb_1.15.bb (renamed from poky/meta/recipes-graphics/xorg-lib/libxcb_1.14.bb) | 6 |
3 files changed, 3 insertions, 30 deletions
diff --git a/poky/meta/recipes-graphics/xorg-lib/libx11_1.7.5.bb b/poky/meta/recipes-graphics/xorg-lib/libx11_1.8.bb index 2a6f66957c..6d5a8626d6 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libx11_1.7.5.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libx11_1.8.bb @@ -16,7 +16,7 @@ SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.xz" SRC_URI += "file://disable_tests.patch \ " -SRC_URI[sha256sum] = "5a1847e2e2c248e1a203a24a1338a5586d6f48472eac58f6f08539110a965151" +SRC_URI[sha256sum] = "081bf42ebab023aa92cfdb20c7af8c5ae13d13e88a5e22f90f4453ef80bbdde4" PROVIDES = "virtual/libx11" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch b/poky/meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch deleted file mode 100644 index c0efbdc213..0000000000 --- a/poky/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/poky/meta/recipes-graphics/xorg-lib/libxcb_1.14.bb b/poky/meta/recipes-graphics/xorg-lib/libxcb_1.15.bb index 5341bbd4bc..839577326e 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxcb_1.14.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxcb_1.15.bb @@ -9,11 +9,9 @@ SECTION = "x11/libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7" -SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.xz \ - file://disable-check.patch \ - " +SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.xz" -SRC_URI[sha256sum] = "a55ed6db98d43469801262d81dc2572ed124edc3db31059d4e9916eb9f844c34" +SRC_URI[sha256sum] = "cc38744f817cf6814c847e2df37fcb8997357d72fa4bcbc228ae0fe47219a059" BBCLASSEXTEND = "native nativesdk" |