summaryrefslogtreecommitdiff
path: root/poky/meta/recipes-graphics/wayland
diff options
context:
space:
mode:
authorAndrew Geissler <geissonator@yahoo.com>2020-05-15 22:13:32 +0300
committerAndrew Geissler <geissonator@yahoo.com>2020-05-21 23:43:47 +0300
commitc182c62dd929fe69b57a12bc04099fcd09b5d436 (patch)
treea34e6d5c7dc6d91fc51f43b738099b458764e165 /poky/meta/recipes-graphics/wayland
parent7f40b7168b897da48694d6e71fd3fd45861bfb19 (diff)
downloadopenbmc-c182c62dd929fe69b57a12bc04099fcd09b5d436.tar.xz
poky: subtree update:b5763b2f48..f468a73523
Adrian Bunk (13): iproute2: Remove -fcommon libxcrypt2: Remove -fcommon xorg-xserver: Remove -fcommon mesa: Remove -fcommon at-spi2-atk: Remove -fcommon menu-cache: Replace -fcommon with fix matchbox-wm: Replace -fcommon with fix llvm: Remove -fcommon vte: Remove workaround for gcc 4.8 python-numpy: Remove workaround for host gcc < 5 libtasn1: Remove workaround for host gcc < 5 nettle: Remove workaround for gcc < 5 wireless-regdb: Upgrade 2019.06.03 -> 2020.04.29 Alejandro Hernandez (1): connman: Include vpn-script in FILES Alexander Kanavin (30): libinput: add ptest libinput: update 1.15.2 -> 1.15.5 avahi: merge avahi-ui into the main recipe avahi: update to 0.8 testsdkext/devtool: initialize the test component's git repo git: update to 2.26.2 libcap: update to 2.33 libhandy: add a recipe from meta-oe libdazzle: update to 3.36.0 epiphany: update to 3.36.1 patchelf: switch to git powertop: switch to Arjan's git meson: fix upstream version check rpcsvc-proto: update to 1.4.1 vulkan-headers: upgrade 1.1.126.0 -> 1.2.135.0 vulkan-loader: upgrade 1.1.126.0 -> 1.2.135.0 vulkan-tools: upgrade 1.1.126.0 -> 1.2.135.0 vulkan-demos: upgrade to latest revision e2fsprogs: update to 1.45.6 build-compare: update to latest revision ovmf: update to 202002 cdrtools-native: fix upstream version check re2c: correct upstream location vte: add icu dependency mesa: enable x11 for native/nativesdk runqemu: set host DRI driver path for all instances of virgl usage libepoxy: do not strip RUNPATH from native/nativesdk virgl: skip test on Debian 9 runqemu: force software x11 renderer for SDL when GL is not in use gcr: correct a build race between vapi files Andrej Valek (1): icu: upgrade 66.1 -> 67.1 Anton Eliasson (1): meson.bbclass: Close the log file after reading Bartosz Golaszewski (1): busybox: disable i2ctransfer Changqing Li (2): rpm: fix file conflicts for MIPS64 N32 lib/oe/package_manager: update default rpm config %_prefer_color Jacob Kroon (1): pseudo: Fix enum typedef Joe Slater (1): wget: improve reproducible build Joshua Watt (3): libnewt: Backport patch to fix reproducibility bitbake.conf: Prevent git from detecting parent repo in recipe classes/kernel: Generate reproducible kernel module tarball Kai Kang (1): python3-git: 3.0.5 -> 3.1.2 Khem Raj (9): avahi: Cover gtk packageconfig with x11/wayland distro features tunes: Add new tune files for cortexa55 and cortexa73-cortexa53 gcc-runtime: Avoid march conflicts with newer cortex-a55 CPUs gcc10: Update to GCC 10.1 Release glibc: Update to latest on 2.31 branch gcc10: Default back to -fcommon gcc10: Revert using __getauxval in libgcc glib-2.0: Fix stpcpy detection for mingw wayland: fix condition for strndup detection Konrad Weihmann (2): pypi.bbclass: mind package suffix on version check file: add PACKAGECONFIG for auto options Mingli Yu (1): python3-setuptools: add the missing rdepends Peter Kjellerstedt (2): sstate.bbclass: Do not fail if files cannot be touched file: Remove unneccessary override of PACKAGECONFIG for native Pierre-Jean Texier (1): sysklogd: upgrade 2.1.1 -> 2.1.2 Richard Leitner (6): gdbm: add patch to fix link failure against gcc 10 dtc: update to 1.6.0 libtirpc: remove extra "-fcommon" from CFLAGS libcomps: update to 0.1.15 binutils: add patch to fix issues with gcc 10 cpio: add patch to fix issues with gcc 10 Richard Purdie (4): recipes: Remove remaining INC_PR variables insane: Promote warnings into errors poky: We now match OE-Core's error/warning config so simplify poky.conf: Post release version bump Robert P. J. Day (1): documentation.conf: Add variables supported by features_check.bbclass Tim Orling (1): pypi.bbclass: use new pypi UPSTREAM_CHECK_URI Wang Mingyu (1): nettle: upgrade 3.5.1 -> 3.6 Yeoh Ee Peng (1): selftest/imagefeatures: Enable sanity test for IMAGE_GEN_DEBUGFS Yi Zhao (1): opkg-keyrings: check if opkg-key exists before run postinst Zoltan Boszormenyi (4): libva: Factor out base parts into an include file libva-initial: New bootstrap recipe mesa: Add PACKAGECONFIG knob to enable VAAPI mesa: Add PACKAGECONFIG knob to enable VDPAU state tracker and drivers jan (1): scripts/tiny/ksize: Fix for more recent kernels wenlin.kang@windriver.com (1): populate_sdk_base.bbclass: fix warning: name not matched Change-Id: Icd73153270a6cb7ab63257211350aa564867c2db Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'poky/meta/recipes-graphics/wayland')
-rw-r--r--poky/meta/recipes-graphics/wayland/libinput/run-ptest9
-rw-r--r--poky/meta/recipes-graphics/wayland/libinput_1.15.5.bb (renamed from poky/meta/recipes-graphics/wayland/libinput_1.15.2.bb)20
-rw-r--r--poky/meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch7
3 files changed, 25 insertions, 11 deletions
diff --git a/poky/meta/recipes-graphics/wayland/libinput/run-ptest b/poky/meta/recipes-graphics/wayland/libinput/run-ptest
new file mode 100644
index 0000000000..5a84c568b9
--- /dev/null
+++ b/poky/meta/recipes-graphics/wayland/libinput/run-ptest
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+/usr/libexec/libinput/libinput-test-suite
+if [ $? -eq 0 ]; then
+ echo 'PASS: libinput-test-suite'
+else
+ echo 'FAIL: libinput-test-suite'
+fi
+
diff --git a/poky/meta/recipes-graphics/wayland/libinput_1.15.2.bb b/poky/meta/recipes-graphics/wayland/libinput_1.15.5.bb
index 810532774e..e56f181bf5 100644
--- a/poky/meta/recipes-graphics/wayland/libinput_1.15.2.bb
+++ b/poky/meta/recipes-graphics/wayland/libinput_1.15.5.bb
@@ -10,17 +10,26 @@ SECTION = "libs"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=1f2ea9ebff3a2c6d458faf58492efb63"
-DEPENDS = "libevdev udev mtdev"
+DEPENDS = "libevdev udev mtdev libcheck"
SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \
+ file://run-ptest \
file://determinism.patch \
"
-SRC_URI[md5sum] = "eb6bd2907ad33d53954d70dfb881a643"
-SRC_URI[sha256sum] = "971c3fbfb624f95c911adeb2803c372e4e3647d1b98f278f660051f834597747"
+SRC_URI[md5sum] = "c9a1b15bb932eaf22f840efe4c3f84eb"
+SRC_URI[sha256sum] = "a90efc8f423c3094f2f9f372fb92381b2f3aad62e8b5882a8abe333aa8249c97"
UPSTREAM_CHECK_REGEX = "libinput-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)"
-inherit meson pkgconfig lib_package
+inherit meson pkgconfig lib_package ptest
+
+# Patch out build directory, otherwise it leaks into ptest binary
+do_configure_append() {
+ sed -i -e "s,${WORKDIR},,g" config.h
+ if [ -e "litest-config.h" ]; then
+ sed -i -e "s,${WORKDIR},,g" litest-config.h
+ fi
+}
PACKAGECONFIG ??= ""
PACKAGECONFIG[libwacom] = "-Dlibwacom=true,-Dlibwacom=false,libwacom"
@@ -30,7 +39,7 @@ UDEVDIR = "`pkg-config --variable=udevdir udev`"
EXTRA_OEMESON += "-Dudev-dir=${UDEVDIR} \
-Ddocumentation=false \
- -Dtests=false \
+ ${@bb.utils.contains('PTEST_ENABLED', '1', '-Dtests=true -Dinstall-tests=true', '-Dtests=false -Dinstall-tests=false', d)} \
-Dzshcompletiondir=no"
# package name changed in 1.8.1 upgrade: make sure package upgrades work
@@ -38,3 +47,4 @@ RPROVIDES_${PN} = "libinput"
RREPLACES_${PN} = "libinput"
RCONFLICTS_${PN} = "libinput"
+FILES_${PN}-ptest += "${libexecdir}/libinput/libinput-test-suite"
diff --git a/poky/meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch b/poky/meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch
index e445838750..c2ceae4a47 100644
--- a/poky/meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch
+++ b/poky/meta/recipes-graphics/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch
@@ -17,8 +17,6 @@ Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/wayland/merge
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/meson.build b/meson.build
-index 26b084f..c05d019 100644
--- a/meson.build
+++ b/meson.build
@@ -36,11 +36,11 @@ have_funcs = [
@@ -30,10 +28,7 @@ index 26b084f..c05d019 100644
foreach f: have_funcs
config_h.set('HAVE_' + f.underscorify().to_upper(), cc.has_function(f))
endforeach
-+config_h.set('HAVE_STRNDUP', cc.has_function('strndup', prefix:'#include <string.h>'))
++config_h.set('HAVE_STRNDUP', cc.has_function('strndup') and cc.has_header_symbol('string.h', 'strndup'))
if get_option('libraries')
ffi_dep = dependency('libffi')
---
-2.17.1
-