From patchwork Sun Feb 2 17:33:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1232418 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=t-online.de Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 489dNY5QWFz9sPK for ; Mon, 3 Feb 2020 04:33:49 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 24E90857BF; Sun, 2 Feb 2020 17:33:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Kv0WLDRF2A5Z; Sun, 2 Feb 2020 17:33:46 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id BED5F856E9; Sun, 2 Feb 2020 17:33:46 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 744471BF3F3 for ; Sun, 2 Feb 2020 17:33:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6EF1186246 for ; Sun, 2 Feb 2020 17:33:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CNd+4cmgYwsU for ; Sun, 2 Feb 2020 17:33:44 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout01.t-online.de (mailout01.t-online.de [194.25.134.80]) by whitealder.osuosl.org (Postfix) with ESMTPS id CA9E685381 for ; Sun, 2 Feb 2020 17:33:43 +0000 (UTC) Received: from fwd03.aul.t-online.de (fwd03.aul.t-online.de [172.20.27.148]) by mailout01.t-online.de (Postfix) with SMTP id 0C87E429DE0E; Sun, 2 Feb 2020 18:33:42 +0100 (CET) Received: from fli4l.lan.fli4l (EG4kEaZGQhZA5eBABPepmvXi7glDy3srIuHuS-OCQOVhyAzzd295zjNS0RhObNUwqf@[91.58.12.60]) by fwd03.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1iyJ7m-3XsFaC0; Sun, 2 Feb 2020 18:33:34 +0100 Received: from mahler.lan.fli4l ([192.168.1.1]:35912) by fli4l.lan.fli4l with esmtp (Exim 4.92.3) (envelope-from ) id 1iyJ7l-0002Rh-Ln; Sun, 02 Feb 2020 18:33:33 +0100 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sun, 2 Feb 2020 18:33:31 +0100 Message-Id: <20200202173333.305860-2-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200202173333.305860-1-bernd.kuhls@t-online.de> References: <20200202173333.305860-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-ID: EG4kEaZGQhZA5eBABPepmvXi7glDy3srIuHuS-OCQOVhyAzzd295zjNS0RhObNUwqf X-TOI-MSGID: ab2ca71e-98c9-456b-a516-db2229e97f3f Subject: [Buildroot] [PATCH v2 2/4] package/kodi: add optional support for wayland X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Naour , "Yann E . MORIN" , Thomas Petazzoni , Maxime Hadjinlian Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" For details see upstream PR 12664. Signed-off-by: Bernd Kuhls --- v2: no changes package/kodi/Config.in | 44 +++++++++++++++++++++++++++++++++++++++--- package/kodi/kodi.mk | 16 +++++++++++++++ 2 files changed, 57 insertions(+), 3 deletions(-) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index 2782da5953..0f2f4e2df2 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -27,6 +27,27 @@ config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_RBPI depends on BR2_PACKAGE_HAS_UDEV # libinput select BR2_PACKAGE_KODI_PLATFORM_SUPPORTS +config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_WAYLAND_GL + bool + default y + depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND # waylandpp + depends on BR2_HOST_GCC_AT_LEAST_4_9 # waylandpp + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # waylandpp + depends on BR2_PACKAGE_WAYLAND # waylandpp + select BR2_PACKAGE_WAYLANDPP + select BR2_PACKAGE_KODI_PLATFORM_SUPPORTS + +config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_WAYLAND_GLES + bool + default y + depends on BR2_PACKAGE_HAS_LIBGLES + depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND # waylandpp + depends on BR2_HOST_GCC_AT_LEAST_4_9 # waylandpp + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # waylandpp + depends on BR2_PACKAGE_WAYLAND # waylandpp + select BR2_PACKAGE_WAYLANDPP + select BR2_PACKAGE_KODI_PLATFORM_SUPPORTS + config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_X11_OPENGL bool default y @@ -189,6 +210,17 @@ config BR2_PACKAGE_KODI_PLATFORM_RBPI select BR2_PACKAGE_LIBINPUT select BR2_PACKAGE_LIBXKBCOMMON +config BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GL + bool "Wayland/OpenGL" + depends on BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_WAYLAND_GL + select BR2_PACKAGE_LIBGLU + select BR2_PACKAGE_LIBXKBCOMMON + +config BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GLES + bool "Wayland/GLES" + depends on BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_WAYLAND_GLES + select BR2_PACKAGE_LIBXKBCOMMON + config BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL bool "X11/OpenGL" depends on BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_X11_OPENGL @@ -242,13 +274,19 @@ config BR2_PACKAGE_KODI_LIBUSB config BR2_PACKAGE_KODI_LIBVA bool "va" - depends on BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL + depends on \ + BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GL || \ + BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GLES || \ + BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL select BR2_PACKAGE_LIBVA help Enable libva support. -comment "libva support needs platform 'X11/OpenGL'" - depends on !BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL +comment "libva support needs platform 'Wayland' or 'X11/OpenGL'" + depends on \ + !BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GL && \ + !BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GLES && \ + !BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL config BR2_PACKAGE_KODI_LIBVDPAU bool "vdpau" diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 1036151a89..2f2a92a889 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -174,6 +174,22 @@ KODI_CONF_OPTS += -DCORE_PLATFORM_NAME=rbpi KODI_DEPENDENCIES += libinput libxkbcommon rpi-userland endif +ifeq ($(BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GL),y) +KODI_CONF_OPTS += \ + -DCORE_PLATFORM_NAME=wayland \ + -DWAYLAND_RENDER_SYSTEM=gl +KODI_DEPENDENCIES += libegl libgl libglu libxkbcommon waylandpp +endif + +ifeq ($(BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GLES),y) +KODI_CONF_OPTS += \ + -DCORE_PLATFORM_NAME=wayland \ + -DWAYLAND_RENDER_SYSTEM=gles +KODI_C_FLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags egl` +KODI_CXX_FLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags egl` +KODI_DEPENDENCIES += libegl libgles libxkbcommon waylandpp +endif + ifeq ($(BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL),y) KODI_CONF_OPTS += -DCORE_PLATFORM_NAME=x11 KODI_DEPENDENCIES += libegl libglu libgl xlib_libX11 xlib_libXext \