From patchwork Sun Feb 2 16:20:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1232402 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.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 489bm94P56z9sRQ for ; Mon, 3 Feb 2020 03:20:40 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 2210A87807; Sun, 2 Feb 2020 16:20:35 +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 jcebaZF+QNoK; Sun, 2 Feb 2020 16:20:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 57F9387818; Sun, 2 Feb 2020 16:20:34 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 04C7E1BF2B8 for ; Sun, 2 Feb 2020 16:20:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 5B0F21FFFE for ; Sun, 2 Feb 2020 16:20:32 +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 0N0FW1XbZqcw for ; Sun, 2 Feb 2020 16:20:30 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout11.t-online.de (mailout11.t-online.de [194.25.134.85]) by silver.osuosl.org (Postfix) with ESMTPS id 7C45A203D3 for ; Sun, 2 Feb 2020 16:20:30 +0000 (UTC) Received: from fwd28.aul.t-online.de (fwd28.aul.t-online.de [172.20.26.133]) by mailout11.t-online.de (Postfix) with SMTP id 52FA94218AA3; Sun, 2 Feb 2020 17:20:28 +0100 (CET) Received: from fli4l.lan.fli4l (TtihruZ-8hr+fTie7+5+dv2gYjh3di2AJQXpcXi9izFbADwYHTmevEll1OlfwYyZBA@[91.58.12.60]) by fwd28.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1iyHyz-1OcPA00; Sun, 2 Feb 2020 17:20:25 +0100 Received: from mahler.lan.fli4l ([192.168.1.1]:34946) by fli4l.lan.fli4l with esmtp (Exim 4.92.3) (envelope-from ) id 1iyHyz-00037f-0Y; Sun, 02 Feb 2020 17:20:25 +0100 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sun, 2 Feb 2020 17:20:22 +0100 Message-Id: <20200202162024.21405-1-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-ID: TtihruZ-8hr+fTie7+5+dv2gYjh3di2AJQXpcXi9izFbADwYHTmevEll1OlfwYyZBA X-TOI-MSGID: 843d6c61-0fdc-4034-a0d0-3ce38688eab7 Subject: [Buildroot] [PATCH 1/3] 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 , Maxime Hadjinlian 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 65e7768d6d..0a793abe37 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -28,6 +28,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 @@ -190,6 +211,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 @@ -243,13 +275,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 \ From patchwork Sun Feb 2 16:20:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1232400 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 489bm92Xc7z9s3x for ; Mon, 3 Feb 2020 03:20:39 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id ABBF0856CB; Sun, 2 Feb 2020 16:20:35 +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 UiDvpzg0IoyE; Sun, 2 Feb 2020 16:20:33 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 592DA85247; Sun, 2 Feb 2020 16:20:33 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 256451BF957 for ; Sun, 2 Feb 2020 16:20:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 1E06B87820 for ; Sun, 2 Feb 2020 16:20:31 +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 McDWP0FNK1WF for ; Sun, 2 Feb 2020 16:20:30 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout10.t-online.de (mailout10.t-online.de [194.25.134.21]) by hemlock.osuosl.org (Postfix) with ESMTPS id B5C1887807 for ; Sun, 2 Feb 2020 16:20:29 +0000 (UTC) Received: from fwd25.aul.t-online.de (fwd25.aul.t-online.de [172.20.26.130]) by mailout10.t-online.de (Postfix) with SMTP id 6077E417E784; Sun, 2 Feb 2020 17:20:27 +0100 (CET) Received: from fli4l.lan.fli4l (ZkctIoZSQhD0aHa7JLIQ7TeRD6X6xg3FVa0CtYpBf5TgqSfMwRMP4gMUuQa3YYcwgU@[91.58.12.60]) by fwd25.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1iyHz0-0Cmm000; Sun, 2 Feb 2020 17:20:26 +0100 Received: from mahler.lan.fli4l ([192.168.1.1]:34946) by fli4l.lan.fli4l with esmtp (Exim 4.92.3) (envelope-from ) id 1iyHyz-00037f-O1; Sun, 02 Feb 2020 17:20:26 +0100 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sun, 2 Feb 2020 17:20:24 +0100 Message-Id: <20200202162024.21405-3-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200202162024.21405-1-bernd.kuhls@t-online.de> References: <20200202162024.21405-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-ID: ZkctIoZSQhD0aHa7JLIQ7TeRD6X6xg3FVa0CtYpBf5TgqSfMwRMP4gMUuQa3YYcwgU X-TOI-MSGID: 215e0507-39e9-4d4e-918e-b3ac99be3ce4 Subject: [Buildroot] [PATCH 3/3] 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: , Cc: Romain Naour , Maxime Hadjinlian 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 0a793abe37..1bd9c1234f 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -17,6 +17,25 @@ comment "kodi needs python w/ .py modules, a uClibc or glibc toolchain w/ C++, t config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS bool +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 @@ -205,6 +224,26 @@ choice prompt "platform" default BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL +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 @@ -276,6 +315,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 @@ -283,8 +324,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 2f2a92a889..34f7a9dbe7 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -169,6 +169,20 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) KODI_CXX_FLAGS += -latomic 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 += libinput libxkbcommon rpi-userland