From 2c5f068be8981b1bb7aa04cbcb5232e689d354a7 Mon Sep 17 00:00:00 2001
From: 5schatten <supervisedthinking@gmail.com>
Date: Wed, 3 Apr 2019 11:55:30 +0200
Subject: [PATCH] libxkbcommon: updated to 0.8.4 / added meson opts

---
 packages/wayland/libxkbcommon/package.mk | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/packages/wayland/libxkbcommon/package.mk b/packages/wayland/libxkbcommon/package.mk
index 483fce9e5a..2340226a7f 100644
--- a/packages/wayland/libxkbcommon/package.mk
+++ b/packages/wayland/libxkbcommon/package.mk
@@ -1,17 +1,25 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libxkbcommon"
-PKG_VERSION="0.7.1"
-PKG_SHA256="ba59305d2e19e47c27ea065c2e0df96ebac6a3c6e97e28ae5620073b6084e68b"
-PKG_LICENSE="OSS"
+PKG_VERSION="0.8.4"
+PKG_SHA256="60ddcff932b7fd352752d51a5c4f04f3d0403230a584df9a2e0d5ed87c486c8b"
+PKG_LICENSE="MIT"
 PKG_SITE="http://xkbcommon.org"
 PKG_URL="http://xkbcommon.org/download/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain xkeyboard-config"
 PKG_LONGDESC="xkbcommon is a library to handle keyboard descriptions."
 
-if [ "$DISPLAYSERVER" = "x11" ]; then
-  PKG_CONFIGURE_OPTS_TARGET="--enable-x11"
+PKG_MESON_OPTS_TARGET="-Denable-docs=false"
+
+if [ "${DISPLAYSERVER}" = "x11" ]; then
+  PKG_MESON_OPTS_TARGET+=" -Denable-x11=true \
+                           -Denable-wayland=false"
+elif [ "${DISPLAYSERVER}" = "weston" ]; then
+  PKG_MESON_OPTS_TARGET+=" -Denable-x11=false \
+                           -Denable-wayland=true"
 else
-  PKG_CONFIGURE_OPTS_TARGET="--disable-x11"
+  PKG_MESON_OPTS_TARGET+=" -Denable-x11=false \
+                           -Denable-wayland=false"
 fi