From patchwork Sun Apr 1 13:01:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 893988 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.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 AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40Db8W2cjNz9s0y for ; Sun, 1 Apr 2018 23:01:31 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A195A879E9; Sun, 1 Apr 2018 13:01:29 +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 KN1ogEfcadyz; Sun, 1 Apr 2018 13:01:28 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 104F88769C; Sun, 1 Apr 2018 13:01:28 +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 F08591C01EF for ; Sun, 1 Apr 2018 13:01:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id ED62A88415 for ; Sun, 1 Apr 2018 13:01:26 +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 kOyV69rm7umS for ; Sun, 1 Apr 2018 13:01:25 +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 whitealder.osuosl.org (Postfix) with ESMTPS id 5F4CE883EC for ; Sun, 1 Apr 2018 13:01:25 +0000 (UTC) Received: from fwd08.aul.t-online.de (fwd08.aul.t-online.de [172.20.26.151]) by mailout08.t-online.de (Postfix) with SMTP id F3DA541C00A8; Sun, 1 Apr 2018 15:01:22 +0200 (CEST) Received: from fli4l.lan.fli4l (G5WJQsZ1Yh5Pp2dgSeOu77hjbOGGqY8v3GE+L6d-7BizPUL9vXypZkauW7ReDi4Z1v@[84.161.178.224]) by fwd08.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1f2cbf-3GTllg0; Sun, 1 Apr 2018 15:01:11 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:43700 helo=kuhls.lan.fli4l) by fli4l.lan.fli4l with esmtp (Exim 4.90_1) (envelope-from ) id 1f2cbe-0000Jj-HI; Sun, 01 Apr 2018 15:01:10 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sun, 1 Apr 2018 15:01:09 +0200 Message-Id: <20180401130109.8006-3-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180401130109.8006-1-bernd.kuhls@t-online.de> References: <20180401130109.8006-1-bernd.kuhls@t-online.de> X-ID: G5WJQsZ1Yh5Pp2dgSeOu77hjbOGGqY8v3GE+L6d-7BizPUL9vXypZkauW7ReDi4Z1v X-TOI-MSGID: b60d7752-f09d-498d-9684-d4cabe8fea23 Subject: [Buildroot] [PATCH v2 3/3] package/kodi: Add windowing support for Raspberry Pi & AMLogic X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Maxime Hadjinlian MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Bernd Kuhls --- v2: added AML support package/kodi/Config.in | 24 ++++++++++++++++++++++++ package/kodi/kodi.mk | 44 +++++++++++++++++++++++--------------------- 2 files changed, 47 insertions(+), 21 deletions(-) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index 649896df4e..603b63a4da 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -18,6 +18,22 @@ 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_AML + bool + default y + depends on BR2_PACKAGE_LIBAMCODEC + depends on BR2_PACKAGE_ODROID_MALI + select BR2_PACKAGE_KODI_PLATFORM_SUPPORTS + +config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_RBPI + bool + default y + # 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_PACKAGE_RPI_USERLAND + select BR2_PACKAGE_KODI_PLATFORM_SUPPORTS + config BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_X11_OPENGL bool default y @@ -189,6 +205,14 @@ choice prompt "platform" default BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL +config BR2_PACKAGE_KODI_PLATFORM_AML + bool "AMLogic" + depends on BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_AML + +config BR2_PACKAGE_KODI_PLATFORM_RBPI + bool "Raspberry Pi" + depends on BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_RBPI + config BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL bool "X11/OpenGL" depends on BR2_PACKAGE_KODI_PLATFORM_SUPPORTS_X11_OPENGL diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 4891bb734f..810567f06e 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -78,9 +78,7 @@ ifeq ($(BR2_ENABLE_LOCALE),) KODI_DEPENDENCIES += libiconv endif -ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) -KODI_CONF_OPTS += -DCORE_SYSTEM_NAME=rbpi -KODI_DEPENDENCIES += rpi-userland +ifeq ($(BR2_PACKAGE_KODI_PLATFORM_RBPI),y) # These CPU-specific options are only used on rbpi: # https://github.com/xbmc/xbmc/blob/Krypton/project/cmake/scripts/rbpi/ArchSetup.cmake#L13 ifeq ($(BR2_arm1176jzf_s)$(BR2_cortex_a7)$(BR2_cortex_a53),y) @@ -161,6 +159,28 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) KODI_CXX_FLAGS += -latomic endif +ifeq ($(BR2_PACKAGE_KODI_PLATFORM_AML),y) +KODI_CONF_OPTS += -DENABLE_AML=ON -DENABLE_OPENGLES=ON +# The following line can be removed when bumping to 18.0-Leia, +# see upstream PR 13425 +KODI_CXX_FLAGS += -DMESA_EGL_NO_X11_HEADERS +KODI_DEPENDENCIES += libamcodec odroid-mali +else +KODI_CONF_OPTS += -DENABLE_AML=OFF +endif + +ifeq ($(BR2_PACKAGE_KODI_PLATFORM_RBPI),y) +KODI_CONF_OPTS += -DCORE_SYSTEM_NAME=rbpi -DENABLE_OPENGLES=ON +KODI_DEPENDENCIES += rpi-userland +else +# Kodi considers "rpbi" and "linux" as two separate platforms. The +# below options, defined in +# project/cmake/scripts/linux/ArchSetup.cmake are only valid for the +# "linux" platforms. The "rpbi" platform has a different set of +# options, defined in project/cmake/scripts/rbpi/ +KODI_CONF_OPTS += -DENABLE_LDGOLD=OFF +endif + ifeq ($(BR2_PACKAGE_KODI_PLATFORM_X11_OPENGL),y) KODI_CONF_OPTS += \ -DENABLE_OPENGL=ON \ @@ -187,24 +207,6 @@ else KODI_CONF_OPTS += -DENABLE_NONFREE=OFF endif -ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) -KODI_CONF_OPTS += -DCORE_SYSTEM_NAME=rbpi -KODI_DEPENDENCIES += rpi-userland -else -# Kodi considers "rpbi" and "linux" as two separate platforms. The -# below options, defined in -# project/cmake/scripts/linux/ArchSetup.cmake are only valid for the -# "linux" platforms. The "rpbi" platform has a different set of -# options, defined in project/cmake/scripts/rbpi/ -KODI_CONF_OPTS += -DENABLE_LDGOLD=OFF -ifeq ($(BR2_PACKAGE_LIBAMCODEC),y) -KODI_CONF_OPTS += -DENABLE_AML=ON -KODI_DEPENDENCIES += libamcodec -else -KODI_CONF_OPTS += -DENABLE_AML=OFF -endif -endif - ifeq ($(BR2_PACKAGE_HAS_UDEV),y) KODI_CONF_OPTS += -DENABLE_UDEV=ON KODI_DEPENDENCIES += udev