From patchwork Sun Jun 30 14:05:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1124916 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.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 hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45cC48231Vz9sBp for ; Mon, 1 Jul 2019 00:07:04 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id BD873878D1; Sun, 30 Jun 2019 14:06:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id l4NZ2kkhSWfa; Sun, 30 Jun 2019 14:06:57 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 5D51A87695; Sun, 30 Jun 2019 14:06:57 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id A91D71BF336 for ; Sun, 30 Jun 2019 14:06:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4733485429 for ; Sun, 30 Jun 2019 14:06:10 +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 W4Vo_i6nEbH3 for ; Sun, 30 Jun 2019 14:06:09 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout03.t-online.de (mailout03.t-online.de [194.25.134.81]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 1ECE585549 for ; Sun, 30 Jun 2019 14:06:08 +0000 (UTC) Received: from fwd18.aul.t-online.de (fwd18.aul.t-online.de [172.20.26.244]) by mailout03.t-online.de (Postfix) with SMTP id 3D19542B0D15 for ; Sun, 30 Jun 2019 16:06:06 +0200 (CEST) Received: from fli4l.lan.fli4l (bdt7tUZbZhTMULjmqvpKhtbjn8JzG3vwJV70YEnjtKm2rOhBkI3B2p+c943-ba5wKb@[91.58.12.45]) by fwd18.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1hhaSq-2Oiz0i0; Sun, 30 Jun 2019 16:05:56 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:48398) by fli4l.lan.fli4l with esmtp (Exim 4.92) (envelope-from ) id 1hhaSq-0001eG-3I for buildroot@buildroot.org; Sun, 30 Jun 2019 16:05:56 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sun, 30 Jun 2019 16:05:07 +0200 Message-Id: <20190630140525.6537-14-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190630140525.6537-1-bernd.kuhls@t-online.de> References: <20190630140525.6537-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-ID: bdt7tUZbZhTMULjmqvpKhtbjn8JzG3vwJV70YEnjtKm2rOhBkI3B2p+c943-ba5wKb X-TOI-MSGID: e148c633-f42e-467a-b743-1036fb0374ab Subject: [Buildroot] [PATCH 13/31] 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: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" For details see upstream PR 12664. Signed-off-by: Bernd Kuhls --- 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 228d298e7d..4ae91e0389 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -34,6 +34,27 @@ config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_RBPI depends on BR2_PACKAGE_RPI_USERLAND 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 @@ -207,6 +228,17 @@ config BR2_PACKAGE_KODI_PLATFORM_RBPI bool "Raspberry Pi" depends on BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_RBPI +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 @@ -260,13 +292,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 b016190906..1a825b0029 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -185,6 +185,22 @@ KODI_CONF_OPTS += -DCORE_PLATFORM_NAME=rbpi KODI_DEPENDENCIES += 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 \