From patchwork Sun Jun 30 14:05:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1124912 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.136; helo=silver.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 silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45cC426rD1z9sBr for ; Mon, 1 Jul 2019 00:06:58 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 388D520030; Sun, 30 Jun 2019 14:06:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LPYXytizmA66; Sun, 30 Jun 2019 14:06:55 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 0948620119; Sun, 30 Jun 2019 14:06:55 +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 9B0831BF336 for ; Sun, 30 Jun 2019 14:06:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 97B838550D for ; Sun, 30 Jun 2019 14:06:06 +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 ohKtacbm4ZcO for ; Sun, 30 Jun 2019 14:06:06 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout08.t-online.de (mailout08.t-online.de [194.25.134.20]) by fraxinus.osuosl.org (Postfix) with ESMTPS id BE9EA85429 for ; Sun, 30 Jun 2019 14:06:05 +0000 (UTC) Received: from fwd27.aul.t-online.de (fwd27.aul.t-online.de [172.20.26.132]) by mailout08.t-online.de (Postfix) with SMTP id 6185641B6D9A for ; Sun, 30 Jun 2019 16:06:04 +0200 (CEST) Received: from fli4l.lan.fli4l (Zq5N0sZbYhUkHHXEXqxReOCyQmFt-fW7ntxuXi05zrpKSAjOwOG+gp5b4p2DEiKwHP@[91.58.12.45]) by fwd27.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1hhaSr-206YWe0; Sun, 30 Jun 2019 16:05:57 +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-VI for buildroot@buildroot.org; Sun, 30 Jun 2019 16:05:57 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sun, 30 Jun 2019 16:05:09 +0200 Message-Id: <20190630140525.6537-16-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: Zq5N0sZbYhUkHHXEXqxReOCyQmFt-fW7ntxuXi05zrpKSAjOwOG+gp5b4p2DEiKwHP X-TOI-MSGID: 67c9ef58-2859-41ac-8fe1-d063803b1294 Subject: [Buildroot] [PATCH 15/31] package/kodi: add optional support for gbm 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 11955. Signed-off-by: Bernd Kuhls --- package/kodi/Config.in | 45 +++++++++++++++++++++++++++++++++++++++++- package/kodi/kodi.mk | 14 +++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index 4ae91e0389..955b09f971 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -25,6 +25,25 @@ config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_AML depends on BR2_PACKAGE_ODROID_MALI select BR2_PACKAGE_KODI_PLATFORM_SUPPORTS +config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_GBM_GL + bool + default y + depends on BR2_ENABLE_LOCALE # libinput + depends on BR2_PACKAGE_HAS_LIBGL + depends on BR2_PACKAGE_HAS_LIBEGL + depends on BR2_PACKAGE_MESA3D_GBM + depends on BR2_PACKAGE_HAS_UDEV # libinput + select BR2_PACKAGE_KODI_PLATFORM_SUPPORTS + +config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_GBM_GLES + bool + default y + depends on BR2_ENABLE_LOCALE # libinput + depends on BR2_PACKAGE_HAS_LIBGLES + depends on BR2_PACKAGE_MESA3D_GBM + depends on BR2_PACKAGE_HAS_UDEV # libinput + select BR2_PACKAGE_KODI_PLATFORM_SUPPORTS + config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_RBPI bool default y @@ -224,6 +243,26 @@ config BR2_PACKAGE_KODI_PLATFORM_AML bool "AMLogic" depends on BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_AML +config BR2_PACKAGE_KODI_PLATFORM_GBM_GL + bool "gbm/OpenGL" + depends on BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_GBM_GL + select BR2_PACKAGE_LIBGLU + select BR2_PACKAGE_LIBINPUT + select BR2_PACKAGE_LIBXKBCOMMON + +config BR2_PACKAGE_KODI_PLATFORM_GBM_GLES + bool "gbm/GLES" + depends on BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_GBM_GLES + select BR2_PACKAGE_LIBGLU + select BR2_PACKAGE_LIBINPUT + select BR2_PACKAGE_LIBXKBCOMMON + +comment "gbm support needs OpenGL or GLES support" + depends on \ + BR2_PACKAGE_MESA3D_GBM && \ + !BR2_PACKAGE_HAS_LIBEGL && \ + !BR2_PACKAGE_HAS_LIBGLES + config BR2_PACKAGE_KODI_PLATFORM_RBPI bool "Raspberry Pi" depends on BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_RBPI @@ -293,6 +332,8 @@ config BR2_PACKAGE_KODI_LIBUSB config BR2_PACKAGE_KODI_LIBVA bool "va" depends on \ + BR2_PACKAGE_KODI_PLATFORM_GBM_GL || \ + BR2_PACKAGE_KODI_PLATFORM_GBM_GLES || \ BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GL || \ BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GLES || \ BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL @@ -300,8 +341,10 @@ config BR2_PACKAGE_KODI_LIBVA help Enable libva support. -comment "libva support needs platform 'Wayland' or 'X11/OpenGL'" +comment "libva support needs platform 'gbm', 'Wayland' or 'X11/OpenGL'" depends on \ + !BR2_PACKAGE_KODI_PLATFORM_GBM_GL && \ + !BR2_PACKAGE_KODI_PLATFORM_GBM_GLES && \ !BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GL && \ !BR2_PACKAGE_KODI_PLATFORM_WAYLAND_GLES && \ !BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 1a825b0029..db5618d519 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -180,6 +180,20 @@ else KODI_CONF_OPTS += -DENABLE_AML=OFF endif +ifeq ($(BR2_PACKAGE_KODI_PLATFORM_GBM_GL),y) +KODI_CONF_OPTS += \ + -DCORE_PLATFORM_NAME=gbm \ + -DGBM_RENDER_SYSTEM=gl +KODI_DEPENDENCIES += libegl libglu libinput libxkbcommon mesa3d +endif + +ifeq ($(BR2_PACKAGE_KODI_PLATFORM_GBM_GLES),y) +KODI_CONF_OPTS += \ + -DCORE_PLATFORM_NAME=gbm \ + -DGBM_RENDER_SYSTEM=gles +KODI_DEPENDENCIES += libgles libinput libxkbcommon mesa3d +endif + ifeq ($(BR2_PACKAGE_KODI_PLATFORM_RBPI),y) KODI_CONF_OPTS += -DCORE_PLATFORM_NAME=rbpi KODI_DEPENDENCIES += rpi-userland