From patchwork Sun Feb 2 17:33:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1232416 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 489dNT4LpYz9sPK for ; Mon, 3 Feb 2020 04:33:45 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id EE9B18575B; Sun, 2 Feb 2020 17:33:42 +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 MFZqcabvCPKc; Sun, 2 Feb 2020 17:33:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id B2CF585691; Sun, 2 Feb 2020 17:33:40 +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 02A0A1BF3F3 for ; Sun, 2 Feb 2020 17:33:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D9FBC2048A for ; Sun, 2 Feb 2020 17:33:39 +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 RZ+dA437CwqH for ; Sun, 2 Feb 2020 17:33:38 +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 C76A220028 for ; Sun, 2 Feb 2020 17:33:37 +0000 (UTC) Received: from fwd16.aul.t-online.de (fwd16.aul.t-online.de [172.20.26.243]) by mailout11.t-online.de (Postfix) with SMTP id BC063425DFF4; Sun, 2 Feb 2020 18:33:35 +0100 (CET) Received: from fli4l.lan.fli4l (EkKMHyZBghIIjnAL7S5TCTx9LJ3dqXoVEh9W8B-LdsihfEQg8F6WKyffn-LlfrTw62@[91.58.12.60]) by fwd16.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1iyJ7m-4AV4W80; 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-86; Sun, 02 Feb 2020 18:33:33 +0100 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sun, 2 Feb 2020 18:33:30 +0100 Message-Id: <20200202173333.305860-1-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-ID: EkKMHyZBghIIjnAL7S5TCTx9LJ3dqXoVEh9W8B-LdsihfEQg8F6WKyffn-LlfrTw62 X-TOI-MSGID: 0ca054b7-23f4-4012-a09e-b6f4f5a88f3f Subject: [Buildroot] [PATCH 1/4] package/libinput: remove dependency on BR2_ENABLE_LOCALE 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" Upstream commit https://gitlab.freedesktop.org/libinput/libinput/commit/99bb0ee7cb35f7d7a932e7cf28885782bad17613 removed the dependency on locale support provided by the toolchain. Removed reverse dependencies as well. Signed-off-by: Bernd Kuhls --- v1: initial revision package/efl/Config.in | 10 ++++------ package/kodi/Config.in | 1 - package/libinput/Config.in | 5 ++--- package/weston-imx/Config.in | 1 - package/weston/Config.in | 1 - package/x11r7/xdriver_xf86-input-libinput/Config.in | 5 ++--- 6 files changed, 8 insertions(+), 15 deletions(-) diff --git a/package/efl/Config.in b/package/efl/Config.in index 98b5b0731a..ff49161163 100644 --- a/package/efl/Config.in +++ b/package/efl/Config.in @@ -219,7 +219,6 @@ endchoice # OpenGL support config BR2_PACKAGE_EFL_ELPUT bool "Elput" - depends on BR2_ENABLE_LOCALE # libinput depends on BR2_PACKAGE_EFL_EEZE select BR2_PACKAGE_LIBINPUT select BR2_PACKAGE_LIBXKBCOMMON @@ -230,24 +229,23 @@ config BR2_PACKAGE_EFL_ELPUT libinput without having to duplicate the code in each subsystem. -comment "Elput support needs udev /dev management (eeze), locales" - depends on !BR2_PACKAGE_EFL_EEZE || !BR2_ENABLE_LOCALE +comment "Elput support needs udev /dev management (eeze)" + depends on !BR2_PACKAGE_EFL_EEZE config BR2_PACKAGE_EFL_DRM bool "Evas DRM Engine" depends on BR2_PACKAGE_EFL_EEZE depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # require libgbm from mesa3d - depends on BR2_ENABLE_LOCALE # efl-elput <- libinput select BR2_PACKAGE_EFL_ELPUT select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBXKBCOMMON help This option enable building support for the Evas DRM Engine. -comment "Evas DRM Engine needs udev /dev management (eeze), mesa3d w/ EGL support, threads, locales" +comment "Evas DRM Engine needs udev /dev management (eeze), mesa3d w/ EGL support, threads" depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_MESA3D_OPENGL_EGL \ - || !BR2_PACKAGE_EFL_EEZE || !BR2_ENABLE_LOCALE + || !BR2_PACKAGE_EFL_EEZE comment "libevas loaders" diff --git a/package/kodi/Config.in b/package/kodi/Config.in index 65e7768d6d..2782da5953 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -23,7 +23,6 @@ config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_RBPI # List of valid CPUs can be found here: # https://github.com/xbmc/xbmc/blob/Krypton/project/cmake/scripts/rbpi/ArchSetup.cmake#L12 depends on BR2_arm1176jzf_s || BR2_cortex_a7 || BR2_cortex_a53 - depends on BR2_ENABLE_LOCALE # libinput depends on BR2_PACKAGE_RPI_USERLAND depends on BR2_PACKAGE_HAS_UDEV # libinput select BR2_PACKAGE_KODI_PLATFORM_SUPPORTS diff --git a/package/libinput/Config.in b/package/libinput/Config.in index f7793df84f..14e4e70f96 100644 --- a/package/libinput/Config.in +++ b/package/libinput/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_LIBINPUT bool "libinput" - depends on BR2_ENABLE_LOCALE depends on BR2_PACKAGE_HAS_UDEV select BR2_PACKAGE_LIBEVDEV select BR2_PACKAGE_MTDEV @@ -14,5 +13,5 @@ config BR2_PACKAGE_LIBINPUT http://freedesktop.org/wiki/Software/libinput/ -comment "libinput needs udev /dev management and a toolchain w/ locale" - depends on !BR2_PACKAGE_HAS_UDEV || !BR2_ENABLE_LOCALE +comment "libinput needs udev /dev management" + depends on !BR2_PACKAGE_HAS_UDEV diff --git a/package/weston-imx/Config.in b/package/weston-imx/Config.in index 712341b24e..36ff7ae5ab 100644 --- a/package/weston-imx/Config.in +++ b/package/weston-imx/Config.in @@ -15,7 +15,6 @@ config BR2_PACKAGE_WESTON_IMX depends on !BR2_STATIC_LIBS # wayland depends on BR2_TOOLCHAIN_HAS_THREADS # wayland depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 - depends on BR2_ENABLE_LOCALE # libinput depends on BR2_PACKAGE_HAS_UDEV depends on BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_WL depends on !BR2_PACKAGE_WESTON diff --git a/package/weston/Config.in b/package/weston/Config.in index f874b0cc6a..696b85b54d 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -5,7 +5,6 @@ comment "weston needs udev and a toolchain w/ locale, threads, dynamic library, config BR2_PACKAGE_WESTON bool "weston" - depends on BR2_ENABLE_LOCALE # libinput depends on BR2_PACKAGE_HAS_UDEV depends on !BR2_STATIC_LIBS # wayland depends on BR2_TOOLCHAIN_HAS_THREADS # wayland diff --git a/package/x11r7/xdriver_xf86-input-libinput/Config.in b/package/x11r7/xdriver_xf86-input-libinput/Config.in index 0cfbfc664a..f66196a52b 100644 --- a/package/x11r7/xdriver_xf86-input-libinput/Config.in +++ b/package/x11r7/xdriver_xf86-input-libinput/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_LIBINPUT bool "xf86-input-libinput" - depends on BR2_ENABLE_LOCALE # libinput depends on BR2_PACKAGE_HAS_UDEV # libinput select BR2_PACKAGE_LIBINPUT select BR2_PACKAGE_XORGPROTO @@ -9,5 +8,5 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_LIBINPUT around libinput, so while it does provide all features that libinput supports it does little beyond. -comment "xf86-input-libinput needs udev /dev management and a toolchain w/ locale" - depends on !BR2_PACKAGE_HAS_UDEV || !BR2_ENABLE_LOCALE +comment "xf86-input-libinput needs udev /dev management" + depends on !BR2_PACKAGE_HAS_UDEV 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 \ From patchwork Sun Feb 2 17:33:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1232417 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.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 489dNW63WNz9sPK for ; Mon, 3 Feb 2020 04:33:47 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B06D22049F; Sun, 2 Feb 2020 17:33:41 +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 1WoQPcUnbsa1; Sun, 2 Feb 2020 17:33:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 864452039A; Sun, 2 Feb 2020 17:33:39 +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 916431BF3F3 for ; Sun, 2 Feb 2020 17:33:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8B2D685691 for ; Sun, 2 Feb 2020 17:33:38 +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 jf1ZVgwlQpwQ for ; Sun, 2 Feb 2020 17:33:37 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout05.t-online.de (mailout05.t-online.de [194.25.134.82]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 365B985660 for ; Sun, 2 Feb 2020 17:33:37 +0000 (UTC) Received: from fwd12.aul.t-online.de (fwd12.aul.t-online.de [172.20.26.241]) by mailout05.t-online.de (Postfix) with SMTP id E0ABB420F78C; Sun, 2 Feb 2020 18:33:34 +0100 (CET) Received: from fli4l.lan.fli4l (XLRErGZ6ohCq+9CvPrF-Ec9Klp+dynUI9wu1j5tvkSiBcoFQ3nUBKpYqvuD+YPiZS1@[91.58.12.60]) by fwd12.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1iyJ7m-1LmxxQ0; 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 1iyJ7m-0002Rh-18; Sun, 02 Feb 2020 18:33:34 +0100 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sun, 2 Feb 2020 18:33:32 +0100 Message-Id: <20200202173333.305860-3-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: XLRErGZ6ohCq+9CvPrF-Ec9Klp+dynUI9wu1j5tvkSiBcoFQ3nUBKpYqvuD+YPiZS1 X-TOI-MSGID: 0950dd41-7da1-4c68-abb5-4bc9cf17b9b4 Subject: [Buildroot] [PATCH v2 3/4] package/mesa3d: add option to configure gbm support 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" Kodi 18.0-Leia will implement stand-alone gbm support alongside x11 & wayland. To enable building gbm support in mesa3d without x11 & wayland we need to add a specific configure option for it. Signed-off-by: Bernd Kuhls --- v2: no changes package/mesa3d/Config.in | 6 ++++++ package/mesa3d/mesa3d.mk | 9 ++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 14adb407b4..5929e15442 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -355,6 +355,11 @@ if BR2_PACKAGE_MESA3D_DRIVER comment "OpenGL API Support" +config BR2_PACKAGE_MESA3D_GBM + bool "gbm" + help + Enable Generic Buffer Management (gbm) + config BR2_PACKAGE_MESA3D_OPENGL_GLX bool "OpenGL GLX" depends on BR2_PACKAGE_XORG7 @@ -370,6 +375,7 @@ config BR2_PACKAGE_MESA3D_OPENGL_EGL bool "OpenGL EGL" select BR2_PACKAGE_HAS_LIBEGL select BR2_PACKAGE_HAS_LIBEGL_WAYLAND + select BR2_PACKAGE_MESA3D_GBM help Use the Khronos EGL APIs. EGL is a window manager for OpenGL applications similar to GLX, for X, and WGL, for Windows. diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index f0e889a400..c7e5be55a0 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -200,10 +200,17 @@ endif MESA3D_CONF_OPTS += \ -Dplatforms=$(subst $(space),$(comma),$(MESA3D_PLATFORMS)) +ifeq ($(BR2_PACKAGE_MESA3D_GBM),y) +MESA3D_CONF_OPTS += \ + -Dgbm=true +else +MESA3D_CONF_OPTS += \ + -Dgbm=false +endif + ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) MESA3D_PROVIDES += libegl MESA3D_CONF_OPTS += \ - -Dgbm=true \ -Degl=true else MESA3D_CONF_OPTS += \ From patchwork Sun Feb 2 17:33:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1232419 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.138; helo=whitealder.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 whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 489dNZ0G0rz9sRh for ; Mon, 3 Feb 2020 04:33:50 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 34577862F4; Sun, 2 Feb 2020 17:33:47 +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 sQrmZy3nyG-o; Sun, 2 Feb 2020 17:33:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id A4C2786132; Sun, 2 Feb 2020 17:33:45 +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 C28A91BF3F3 for ; Sun, 2 Feb 2020 17:33:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id BA5542039A for ; Sun, 2 Feb 2020 17:33:43 +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 6JrGksSfYSKR for ; Sun, 2 Feb 2020 17:33:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout05.t-online.de (mailout05.t-online.de [194.25.134.82]) by silver.osuosl.org (Postfix) with ESMTPS id 274F820028 for ; Sun, 2 Feb 2020 17:33:42 +0000 (UTC) Received: from fwd06.aul.t-online.de (fwd06.aul.t-online.de [172.20.26.150]) by mailout05.t-online.de (Postfix) with SMTP id 15F78420F78E; Sun, 2 Feb 2020 18:33:40 +0100 (CET) Received: from fli4l.lan.fli4l (rCvs3oZH8hgRBs+GOlSeTvwgU0p+zBI0h5pk6oOZ5tk8n8f2BFT0ye3Ej59j93tQg-@[91.58.12.60]) by fwd06.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1iyJ7n-0CL03k0; Sun, 2 Feb 2020 18:33:35 +0100 Received: from mahler.lan.fli4l ([192.168.1.1]:35912) by fli4l.lan.fli4l with esmtp (Exim 4.92.3) (envelope-from ) id 1iyJ7m-0002Rh-Bv; Sun, 02 Feb 2020 18:33:34 +0100 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sun, 2 Feb 2020 18:33:33 +0100 Message-Id: <20200202173333.305860-4-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: rCvs3oZH8hgRBs+GOlSeTvwgU0p+zBI0h5pk6oOZ5tk8n8f2BFT0ye3Ej59j93tQg- X-TOI-MSGID: cb101e57-02f1-4e1f-9157-594d9d0b619b Subject: [Buildroot] [PATCH v2 4/4] 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 , "Yann E . MORIN" , Thomas Petazzoni , Maxime Hadjinlian Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" For details see upstream PR 11955. Signed-off-by: Bernd Kuhls --- v2: removed dependency on BR2_ENABLE_LOCALE package/kodi/Config.in | 43 +++++++++++++++++++++++++++++++++++++++++- package/kodi/kodi.mk | 14 ++++++++++++++ 2 files changed, 56 insertions(+), 1 deletion(-) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index 0f2f4e2df2..f8b95c2234 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -17,6 +17,23 @@ 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_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_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 @@ -204,6 +221,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 @@ -275,6 +312,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 @@ -282,8 +321,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