From patchwork Sun Apr 1 13:01:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 893986 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 40Db8G0DpQz9s0y for ; Sun, 1 Apr 2018 23:01:17 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 63A6587846; Sun, 1 Apr 2018 13:01:15 +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 1bz9MXNgipag; Sun, 1 Apr 2018 13:01:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id B77F3872E7; Sun, 1 Apr 2018 13:01:14 +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 D80801C01EF for ; Sun, 1 Apr 2018 13:01:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id D5319872E7 for ; Sun, 1 Apr 2018 13:01:13 +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 w8QHgue2wHHr for ; Sun, 1 Apr 2018 13:01:12 +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 82D79872C6 for ; Sun, 1 Apr 2018 13:01:12 +0000 (UTC) Received: from fwd21.aul.t-online.de (fwd21.aul.t-online.de [172.20.27.66]) by mailout08.t-online.de (Postfix) with SMTP id C12A741C00AC; Sun, 1 Apr 2018 15:01:10 +0200 (CEST) Received: from fli4l.lan.fli4l (bKFLXwZlYh8tNL5VBYUVa-yDQhORjF05JRowoHzKLl7krnQ+XBUbjPHtQ+ehhdHwc1@[84.161.178.224]) by fwd21.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1f2cbe-2GxUNE0; Sun, 1 Apr 2018 15:01:10 +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 1f2cbd-0000Jj-9k; Sun, 01 Apr 2018 15:01:09 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sun, 1 Apr 2018 15:01:07 +0200 Message-Id: <20180401130109.8006-1-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.14.2 X-ID: bKFLXwZlYh8tNL5VBYUVa-yDQhORjF05JRowoHzKLl7krnQ+XBUbjPHtQ+ehhdHwc1 X-TOI-MSGID: a076e6df-278c-4ace-a834-0dfa03a8f47e Subject: [Buildroot] [PATCH v2 1/3] package/kodi: remove X11-based OpenGL ES support 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" To prepare the bump to the next Kodi version 18.0-Leia we remove the current OpenGL ES support options. Kodi 18.0 will bring a major overhaul of the supported windowing platforms, x11-based gles support was removed, see upstream PR 12196. Signed-off-by: Bernd Kuhls --- v2: updated subject to make clear that this is about X11 package/kodi/Config.in | 13 +++---------- package/kodi/kodi.mk | 10 ---------- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index 071c03d640..fefed70e0d 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -15,21 +15,14 @@ comment "kodi needs python w/ .py modules, a uClibc or glibc toolchain w/ C++, t || !BR2_PACKAGE_PYTHON \ || BR2_PACKAGE_PYTHON_PYC_ONLY -config BR2_PACKAGE_KODI_EGL_GLES - bool - default y - depends on BR2_PACKAGE_HAS_LIBEGL - depends on BR2_PACKAGE_HAS_LIBGLES - depends on !BR2_PACKAGE_KODI_GL_EGL # prefer GL if available - config BR2_PACKAGE_KODI_GL_EGL bool default y depends on BR2_PACKAGE_HAS_LIBEGL depends on BR2_PACKAGE_HAS_LIBGL -comment "kodi needs an OpenGL EGL with either an openGL or an OpenGL ES backend" - depends on !BR2_PACKAGE_KODI_GL_EGL && !BR2_PACKAGE_KODI_EGL_GLES +comment "kodi needs an OpenGL EGL backend with OpenGL support" + depends on !BR2_PACKAGE_KODI_GL_EGL menuconfig BR2_PACKAGE_KODI bool "kodi" @@ -38,7 +31,7 @@ menuconfig BR2_PACKAGE_KODI depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_USES_MUSL - depends on BR2_PACKAGE_KODI_EGL_GLES || BR2_PACKAGE_KODI_GL_EGL + depends on BR2_PACKAGE_KODI_GL_EGL depends on BR2_USE_WCHAR depends on !BR2_STATIC_LIBS # python and others depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index 9d3b65ae91..aecbc994c4 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -254,16 +254,6 @@ else KODI_CONF_OPTS += -DENABLE_OPENGL=OFF -DENABLE_X11=OFF endif -ifeq ($(BR2_PACKAGE_KODI_EGL_GLES),y) -KODI_DEPENDENCIES += libegl libgles -KODI_CONF_OPTS += \ - -DENABLE_OPENGLES=ON -KODI_C_FLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags --libs egl` -KODI_CXX_FLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags --libs egl` -else -KODI_CONF_OPTS += -DENABLE_OPENGLES=OFF -endif - ifeq ($(BR2_PACKAGE_KODI_LIBMICROHTTPD),y) KODI_CONF_OPTS += -DENABLE_MICROHTTPD=ON KODI_DEPENDENCIES += libmicrohttpd