diff options
Diffstat (limited to 'yocto-poky/meta/recipes-graphics/xorg-lib')
11 files changed, 54 insertions, 38 deletions
diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb.inc b/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb_1.11.1.bb index e40ae77ab..0856c190a 100644 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb.inc +++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb_1.11.1.bb @@ -4,28 +4,32 @@ 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" - -BBCLASSEXTEND = "native nativesdk" - SECTION = "x11/libs" -LICENSE = "MIT-X" -DEPENDS = "xcb-proto xproto libxau xcb-proto-native libpthread-stubs" +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 \ " +SRC_URI[md5sum] = "f97a65e6158775de518ac391935634c2" +SRC_URI[sha256sum] = "b720fd6c7d200e5371affdb3f049cc8f88cff9aed942ff1b824d95eedbf69d30" + +BBCLASSEXTEND = "native nativesdk" + +DEPENDS = "xcb-proto xproto libxau libpthread-stubs libxdmcp" PACKAGES_DYNAMIC = "^libxcb-.*" FILES_${PN} = "${libdir}/libxcb.so.*" -inherit autotools pkgconfig pythonnative distro_features_check +inherit autotools pkgconfig distro_features_check # The libxau and others requires x11 in DISTRO_FEATURES REQUIRED_DISTRO_FEATURES = "x11" +REQUIRED_DISTRO_FEATURES_class-native = "" python populate_packages_prepend () { do_split_packages(d, '${libdir}', '^libxcb-(.*)\.so\..*$', 'libxcb-%s', 'XCB library module for %s', allow_links=True) diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb_1.11.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb_1.11.bb deleted file mode 100644 index c16270210..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb_1.11.bb +++ /dev/null @@ -1,10 +0,0 @@ -include libxcb.inc - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7" - - -DEPENDS += "libxdmcp" - -SRC_URI[md5sum] = "5a873ebd383d1a60612dd6ec6b42c781" -SRC_URI[sha256sum] = "03635d70045b9ede90778e67516135828a57de87ac508f987024f43c03620ff7" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb_git.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb_git.bb deleted file mode 100644 index 186636e1e..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb_git.bb +++ /dev/null @@ -1,10 +0,0 @@ -DEFAULT_PREFERENCE = "-1" - -include libxcb.inc - -SRCREV = "625ed596cae6dd8175aeb6cb6f26784928042f22" -PV = "1.1.90.1+gitr${SRCPV}" -PR = "r1" - -SRC_URI = "git://anongit.freedesktop.org/git/xcb/libxcb" -S = "${WORKDIR}/git" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxi_1.7.4.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxi_1.7.6.bb index 07033a3e7..752347969 100644 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxi_1.7.4.bb +++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxi_1.7.6.bb @@ -17,5 +17,5 @@ PE = "1" XORG_PN = "libXi" -SRC_URI[md5sum] = "9c4a69c34b19ec1e4212e849549544cb" -SRC_URI[sha256sum] = "2cffc2686618dc1803725636cd92b36342c512dc60a7a35cba34bf7192a42244" +SRC_URI[md5sum] = "510e555ecfffa8d2298a0f42b725e563" +SRC_URI[sha256sum] = "1f32a552cec0f056c0260bdb32e853cec0673d2f40646ce932ad5a9f0205b7ac" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxkbcommon_0.5.0.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxkbcommon_0.5.0.bb index a166b5760..de22a8197 100644 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxkbcommon_0.5.0.bb +++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxkbcommon_0.5.0.bb @@ -12,6 +12,8 @@ SRC_URI = "http://xkbcommon.org/download/${BPN}-${PV}.tar.xz" SRC_URI[md5sum] = "2e1faeafcc609c30af3a561a91e84158" SRC_URI[sha256sum] = "90bd7824742b9a6f52a6cf80e2cadd6f5349cf600a358d08260772615b89d19c" +UPSTREAM_CHECK_URI = "http://xkbcommon.org/" + inherit autotools pkgconfig EXTRA_OECONF = "--disable-docs" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch b/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch index a60df5fc0..6b7c1e62a 100644 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch +++ b/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch @@ -11,7 +11,7 @@ problematic code in test/utils.c. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Marek Vasut <marex@denx.de> -Upstream-Status: Submitted +Upstream-Status: Backport [commit 4297e9058] --- Changes v1 -> v2: diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/pixman_0.32.6.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/pixman_0.32.8.bb index 317a568bd..553ce369b 100644 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/pixman_0.32.6.bb +++ b/yocto-poky/meta/recipes-graphics/xorg-lib/pixman_0.32.8.bb @@ -7,6 +7,9 @@ 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 \ @@ -19,13 +22,12 @@ PE = "1" IWMMXT = "--disable-arm-iwmmxt" LOONGSON_MMI = "--disable-loongson-mmi" -NEON = " --disable-arm-neon " -NEON_class-nativesdk = " --disable-arm-neon " -NEON_armv7a = " " -NEON_armv7a-vfp-neon = " " +# 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 \ @@ -34,7 +36,7 @@ SRC_URI += "\ file://0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch \ " -SRC_URI[md5sum] = "8a9e8f14743a39cf303803f369c1f344" -SRC_URI[sha256sum] = "201fc0d7d6bc0017496f2bd27b3ca14224aea0df6b624c5ee2dc0307a4ff14a4" +SRC_URI[md5sum] = "18d6b62abdb7bc0f8e6b0ddf48986b2c" +SRC_URI[sha256sum] = "5c63dbb3523fc4d86ed4186677815918a941b7cb390d5eec4f55cb5d66b59fb1" REQUIRED_DISTRO_FEATURES = "" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-image/clang.patch b/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-image/clang.patch new file mode 100644 index 000000000..11e90940a --- /dev/null +++ b/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-image/clang.patch @@ -0,0 +1,24 @@ +Make clang happy since it squashes the control warning, ideally it will never reach that return value due to assert +but there is a chance when NDEBUG is defined + +| In file included from ../../xcb-util-image-0.4.0/image/xcb_image.c:37: +| ../../xcb-util-image-0.4.0/image/xcb_bitops.h:210:1: error: control may reach end of non-void function [-Werror,-Wreturn-type] +| } +| ^ +| 1 error generated. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending + +Index: xcb-util-image-0.4.0/image/xcb_bitops.h +=================================================================== +--- xcb-util-image-0.4.0.orig/image/xcb_bitops.h ++++ xcb-util-image-0.4.0/image/xcb_bitops.h +@@ -207,6 +207,7 @@ xcb_host_byte_order(void) { + return XCB_IMAGE_ORDER_LSB_FIRST; + } + assert(0); ++ return -1; + } + + #endif /* __XCB_BITOPS_H__ */ diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-image_0.4.0.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-image_0.4.0.bb index 91464b6c9..c6bb5a61c 100644 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-image_0.4.0.bb +++ b/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-image_0.4.0.bb @@ -6,5 +6,8 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://image/xcb_image.c;endline=24;md5=eafdf965cfb89955fdedf75054223fb4 \ file://image/xcb_image.h;beginline=4;endline=27;md5=48cd25ae55e7de525fe1e1a3a7672e1c" +SRC_URI += "file://clang.patch \ +" + SRC_URI[md5sum] = "08fe8ffecc8d4e37c0ade7906b3f4c87" -SRC_URI[sha256sum] = "2db96a37d78831d643538dd1b595d7d712e04bdccf8896a5e18ce0f398ea2ffc"
\ No newline at end of file +SRC_URI[sha256sum] = "2db96a37d78831d643538dd1b595d7d712e04bdccf8896a5e18ce0f398ea2ffc" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.15.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.16.bb index f41699039..16a1f4f31 100644 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.15.bb +++ b/yocto-poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.16.bb @@ -13,8 +13,8 @@ LICENSE = "MIT & MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9" SRC_URI = "${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "4af1deeb7c5f4cad62e65957d98d6758" -SRC_URI[sha256sum] = "0e443cf7ca2f0b40846472c029647a05933fc705d611e1478c4db8a48a6f38bf" +SRC_URI[md5sum] = "bf6aa31195584cfce01b2194c3e5ea26" +SRC_URI[sha256sum] = "1e8a1f212c96b7f71ca0b05da361cac1816d27baae1d8e03e7b53049b58d1d58" SECTION = "x11/libs" DEPENDS = "intltool-native virtual/gettext util-macros libxslt-native" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc b/yocto-poky/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc index 09df0109c..6f4e44454 100644 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc +++ b/yocto-poky/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc @@ -24,3 +24,4 @@ UNKNOWN_CONFIGURE_WHITELIST += "--enable-malloc0returnsnull --disable-malloc0ret " REQUIRED_DISTRO_FEATURES ?= "x11" +REQUIRED_DISTRO_FEATURES_class-native = "" |
