From patchwork Sat Feb 20 08:59:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1442564 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=) 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 4DjMv52TyBz9sVS for ; Sat, 20 Feb 2021 20:04:01 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id E1B6286FA2; Sat, 20 Feb 2021 09:03:59 +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 HOEiv0vmmP2V; Sat, 20 Feb 2021 09:03:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 0963787527; Sat, 20 Feb 2021 09:03:59 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id A82991BF23B for ; Sat, 20 Feb 2021 08:59:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 9756983C36 for ; Sat, 20 Feb 2021 08:59:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xTcnDCeksOEM for ; Sat, 20 Feb 2021 08:59:47 +0000 (UTC) Received: by smtp1.osuosl.org (Postfix, from userid 1001) id 6AE8D83CB5; Sat, 20 Feb 2021 08:59:47 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mailout01.t-online.de (mailout01.t-online.de [194.25.134.80]) by smtp1.osuosl.org (Postfix) with ESMTPS id 3C71883C36 for ; Sat, 20 Feb 2021 08:59:45 +0000 (UTC) Received: from fwd13.aul.t-online.de (fwd13.aul.t-online.de [172.20.27.62]) by mailout01.t-online.de (Postfix) with SMTP id C61178E44; Sat, 20 Feb 2021 09:59:43 +0100 (CET) Received: from fli4l.lan.fli4l (VT0T2+ZbohVbtAcagTH1J85NQQ6rEEN0W52R9XwsH1INHd0+Qjg4WV336ya89e7g1j@[79.214.203.99]) by fwd13.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1lDO73-29vuu80; Sat, 20 Feb 2021 09:59:41 +0100 Received: from mahler.lan.fli4l ([192.168.1.1]:51224) by fli4l.lan.fli4l with esmtp (Exim 4.94) (envelope-from ) id 1lDO72-0000SX-KD; Sat, 20 Feb 2021 09:59:41 +0100 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 20 Feb 2021 09:59:13 +0100 Message-Id: <20210220085913.888324-55-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210220085913.888324-1-bernd.kuhls@t-online.de> References: <20210220085913.888324-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-ID: VT0T2+ZbohVbtAcagTH1J85NQQ6rEEN0W52R9XwsH1INHd0+Qjg4WV336ya89e7g1j X-TOI-EXPURGATEID: 150726::1613811581-00000B2E-1BE07558/0/0 CLEAN NORMAL X-TOI-MSGID: 016c3b98-84ef-4fa0-83f1-41b86c4fe5ea Subject: [Buildroot] [PATCH/next 54/54] package/kodi-platform: remove package 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: Samuel Martin , Thomas Petazzoni , Maxime Hadjinlian Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This package is not used by kodi addons anymore. No legacy handling needed because this package was never selectable. Signed-off-by: Bernd Kuhls --- ...nfig.cmake-fix-for-cross-compilation.patch | 56 ------------------- package/kodi-platform/Config.in | 7 --- package/kodi-platform/kodi-platform.hash | 3 - package/kodi-platform/kodi-platform.mk | 14 ----- package/kodi/Config.in | 2 - 5 files changed, 82 deletions(-) delete mode 100644 package/kodi-platform/0001-kodiplatform-config.cmake-fix-for-cross-compilation.patch delete mode 100644 package/kodi-platform/Config.in delete mode 100644 package/kodi-platform/kodi-platform.hash delete mode 100644 package/kodi-platform/kodi-platform.mk diff --git a/package/kodi-platform/0001-kodiplatform-config.cmake-fix-for-cross-compilation.patch b/package/kodi-platform/0001-kodiplatform-config.cmake-fix-for-cross-compilation.patch deleted file mode 100644 index cc514b002b..0000000000 --- a/package/kodi-platform/0001-kodiplatform-config.cmake-fix-for-cross-compilation.patch +++ /dev/null @@ -1,56 +0,0 @@ -From a6e25dba4b5c1d911a4644a0ca116abc642cd72a Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 30 Jul 2015 09:28:24 +0200 -Subject: [PATCH] kodiplatform-config.cmake: fix for cross-compilation - -Use CMAKE_FIND_ROOT_PATH in kodiplatform-config.cmake in order to make -it cross-compilation friendly. - -Patch sent upstream: https://github.com/xbmc/kodi-platform/pull/30 - -Signed-off-by: Thomas Petazzoni ---- - CMakeLists.txt | 2 +- - kodiplatform-config.cmake.in | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 25d8004..db23dc9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -22,7 +22,7 @@ if(NOT WIN32) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") - endif() - --set(kodiplatform_INCLUDE_DIRS ${TINYXML_INCLUDE_DIR} "${CMAKE_INSTALL_PREFIX}/include/kodi") -+set(kodiplatform_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/kodi") - IF(WIN32) - LIST(APPEND kodiplatform_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/kodi/windows") - ENDIF(WIN32) -diff --git a/kodiplatform-config.cmake.in b/kodiplatform-config.cmake.in -index 3fc5273..1bc437a 100644 ---- a/kodiplatform-config.cmake.in -+++ b/kodiplatform-config.cmake.in -@@ -10,16 +10,16 @@ - # - # propagate these properties from one build system to the other - set (kodiplatform_VERSION "@kodiplatform_VERSION_MAJOR@.@kodiplatform_VERSION_MINOR@") --set (kodiplatform_INCLUDE_DIRS @kodiplatform_INCLUDE_DIRS@ @CMAKE_INSTALL_PREFIX@/include) -+set (kodiplatform_INCLUDE_DIRS @TINYXML_INCLUDE_DIR@ ${CMAKE_FIND_ROOT_PATH}@kodiplatform_INCLUDE_DIRS@ ${CMAKE_FIND_ROOT_PATH}@CMAKE_INSTALL_PREFIX@/include) - set (kodiplatform_LIBRARY_DIRS "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@") - set (kodiplatform_LINKER_FLAGS "@kodiplatform_LINKER_FLAGS@") - set (kodiplatform_CONFIG_VARS "@kodiplatform_CONFIG_VARS@") - - # libraries come from the build tree where this file was generated - if(WIN32) -- set (kodiplatform_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/kodiplatform.lib") -+ set (kodiplatform_LIBRARY "${CMAKE_FIND_ROOT_PATH}@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/kodiplatform.lib") - else(WIN32) -- set (kodiplatform_LIBRARY "-L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lkodiplatform") -+ set (kodiplatform_LIBRARY "-L${CMAKE_FIND_ROOT_PATH}@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lkodiplatform") - endif(WIN32) - set (kodiplatform_LIBRARIES ${kodiplatform_LIBRARY} "@kodiplatform_LIBRARIES@") - mark_as_advanced (kodiplatform_LIBRARY) --- -2.5.0 - diff --git a/package/kodi-platform/Config.in b/package/kodi-platform/Config.in deleted file mode 100644 index cde1925c07..0000000000 --- a/package/kodi-platform/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_KODI_PLATFORM - bool - select BR2_PACKAGE_LIBPLATFORM - help - Kodi add-on platform support library - - https://github.com/xbmc/kodi-platform diff --git a/package/kodi-platform/kodi-platform.hash b/package/kodi-platform/kodi-platform.hash deleted file mode 100644 index 29a43cf021..0000000000 --- a/package/kodi-platform/kodi-platform.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed -sha256 159165ae641da5eb273885ce53b8a4b84e62a595c4974f9d12c1b5d1428ef25c kodi-platform-809c5e9d711e378561440a896fcb7dbcd009eb3d.tar.gz -sha256 2f4bc4c1244b679121749378ff1a2b4b4e318897dac3d346a236432948ebeea7 debian/copyright diff --git a/package/kodi-platform/kodi-platform.mk b/package/kodi-platform/kodi-platform.mk deleted file mode 100644 index f1b97e3259..0000000000 --- a/package/kodi-platform/kodi-platform.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# kodi-platform -# -################################################################################ - -KODI_PLATFORM_VERSION = 809c5e9d711e378561440a896fcb7dbcd009eb3d -KODI_PLATFORM_SITE = $(call github,xbmc,kodi-platform,$(KODI_PLATFORM_VERSION)) -KODI_PLATFORM_LICENSE = GPL-2.0+ -KODI_PLATFORM_LICENSE_FILES = debian/copyright -KODI_PLATFORM_INSTALL_STAGING = YES -KODI_PLATFORM_DEPENDENCIES = libplatform kodi - -$(eval $(cmake-package)) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index 01d068da44..782cca3c18 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -109,8 +109,6 @@ menuconfig BR2_PACKAGE_KODI if BR2_PACKAGE_KODI -source "package/kodi-platform/Config.in" - config BR2_PACKAGE_KODI_ALSA_LIB bool "alsa" select BR2_PACKAGE_ALSA_LIB