From patchwork Sat Jul 28 11:42:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 950478 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 41d3py3j8Tz9s1x for ; Sat, 28 Jul 2018 21:42:34 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3441E88447; Sat, 28 Jul 2018 11:42:30 +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 APjU6vutqhn4; Sat, 28 Jul 2018 11:42:26 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9D3E788443; Sat, 28 Jul 2018 11:42:26 +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 E2D781C120D for ; Sat, 28 Jul 2018 11:42:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id DECF523492 for ; Sat, 28 Jul 2018 11:42:25 +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 Bv4g93V15-8G for ; Sat, 28 Jul 2018 11:42:24 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout12.t-online.de (mailout12.t-online.de [194.25.134.22]) by silver.osuosl.org (Postfix) with ESMTPS id 40C2A23115 for ; Sat, 28 Jul 2018 11:42:24 +0000 (UTC) Received: from fwd18.aul.t-online.de (fwd18.aul.t-online.de [172.20.26.244]) by mailout12.t-online.de (Postfix) with SMTP id D188F41FDB28; Sat, 28 Jul 2018 13:42:21 +0200 (CEST) Received: from fli4l.lan.fli4l (rPURKTZ-8hL5f8sD3aNeuygHlyVY5j4pWruG5sYt9Yao5ay-YXbkWe8eWFUuHdHgTe@[91.58.13.130]) by fwd18.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1fjNc0-0NhEJM0; Sat, 28 Jul 2018 13:42:16 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:54876 helo=kuhls.lan.fli4l) by fli4l.lan.fli4l with esmtp (Exim 4.91) (envelope-from ) id 1fjNbz-0004vA-81; Sat, 28 Jul 2018 13:42:15 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 28 Jul 2018 13:42:15 +0200 Message-Id: <20180728114215.12530-1-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.18.0 X-ID: rPURKTZ-8hL5f8sD3aNeuygHlyVY5j4pWruG5sYt9Yao5ay-YXbkWe8eWFUuHdHgTe X-TOI-MSGID: 7a695610-23ba-4b29-95c1-20811fc4555f Subject: [Buildroot] [PATCH 1/1] package/kodi: Fix build on openrisc 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" Patch for kodi.mk is needed to fix configure error: CMake Error at scripts/linux/ArchSetup.cmake:24 (message): Unknown CPU: or1k Tested using this defconfig: BR2_or1k=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-openrisc-full-2018.02-925-gd4158df.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_5=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_16=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y BR2_TOOLCHAIN_EXTERNAL_CXX=y BR2_PACKAGE_KODI=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_XORG7=y BR2_PACKAGE_PYTHON=y BR2_PACKAGE_PYTHON_PY_ONLY=y Signed-off-by: Bernd Kuhls --- package/kodi/0004-or1k.patch | 62 ++++++++++++++++++++++++++++++++++++ package/kodi/kodi.mk | 2 ++ 2 files changed, 64 insertions(+) create mode 100644 package/kodi/0004-or1k.patch diff --git a/package/kodi/0004-or1k.patch b/package/kodi/0004-or1k.patch new file mode 100644 index 0000000000..2bfce1a57e --- /dev/null +++ b/package/kodi/0004-or1k.patch @@ -0,0 +1,62 @@ +Fix build on openrisc + +Patch for master branch sent upstream as PR 14236. +This patch is a backport to Krypton branch. + +Signed-off-by: Bernd Kuhls + +diff -uNr xbmc-17.6-Krypton.org/xbmc/cores/DllLoader/DllLoader.h xbmc-17.6-Krypton/xbmc/cores/DllLoader/DllLoader.h +--- xbmc-17.6-Krypton.org/xbmc/cores/DllLoader/DllLoader.h 2017-11-14 17:55:01.000000000 +0100 ++++ xbmc-17.6-Krypton/xbmc/cores/DllLoader/DllLoader.h 2018-07-28 12:24:36.686332911 +0200 +@@ -31,6 +31,7 @@ + !defined(__SH4__) && \ + !defined(__sparc__) && \ + !defined(__arc__) && \ ++ !defined(__or1k__) && \ + !defined(__xtensa__) + #define USE_LDT_KEEPER + #include "ldt_keeper.h" +diff -uNr xbmc-17.6-Krypton.org/xbmc/cores/DllLoader/ldt_keeper.c xbmc-17.6-Krypton/xbmc/cores/DllLoader/ldt_keeper.c +--- xbmc-17.6-Krypton.org/xbmc/cores/DllLoader/ldt_keeper.c 2017-11-14 17:55:01.000000000 +0100 ++++ xbmc-17.6-Krypton/xbmc/cores/DllLoader/ldt_keeper.c 2018-07-28 12:17:18.052505833 +0200 +@@ -27,6 +27,7 @@ + !defined(__SH4__) && \ + !defined(__sparc__) && \ + !defined(__arc__) && \ ++ !defined(__or1k__) && \ + !defined(__xtensa__) + + #include "ldt_keeper.h" +diff -uNr xbmc-17.6-Krypton.org/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h xbmc-17.6-Krypton/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h +--- xbmc-17.6-Krypton.org/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h 2017-11-14 17:55:01.000000000 +0100 ++++ xbmc-17.6-Krypton/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h 2018-07-28 12:24:13.573134108 +0200 +@@ -302,6 +302,7 @@ + !defined(__SH4__) && \ + !defined(__sparc__) && \ + !defined(__arc__) && \ ++ !defined(__or1k__) && \ + !defined(__xtensa__) + // If there are any issues compiling this, just append a ' && 0' + // to the above to make it '#if defined(TARGET_POSIX) && 0' +diff -uNr xbmc-17.6-Krypton.org/xbmc/threads/Atomics.cpp xbmc-17.6-Krypton/xbmc/threads/Atomics.cpp +--- xbmc-17.6-Krypton.org/xbmc/threads/Atomics.cpp 2017-11-14 17:55:01.000000000 +0100 ++++ xbmc-17.6-Krypton/xbmc/threads/Atomics.cpp 2018-07-28 12:25:57.176022980 +0200 +@@ -113,6 +113,7 @@ + defined(__SH4__) || \ + defined(__sparc__) || \ + defined(__arc__) || \ ++ defined(__or1k__) || \ + defined(__xtensa__) + // Not available/required + // Hack to allow compilation +diff -uNr xbmc-17.6-Krypton.org/xbmc/utils/MathUtils.h xbmc-17.6-Krypton/xbmc/utils/MathUtils.h +--- xbmc-17.6-Krypton.org/xbmc/utils/MathUtils.h 2017-11-14 17:55:01.000000000 +0100 ++++ xbmc-17.6-Krypton/xbmc/utils/MathUtils.h 2018-07-28 12:10:22.595053280 +0200 +@@ -40,6 +40,7 @@ + defined(__SH4__) || \ + defined(__sparc__) || \ + defined(__arc__) || \ ++ defined(__or1k__) || \ + defined(__xtensa__) + #define DISABLE_MATHUTILS_ASM_ROUND_INT + #endif diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index f3fa0b55b0..1ccc6bb8d6 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -95,6 +95,8 @@ else ifeq ($(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el),y) KODI_CONF_OPTS += \ -DWITH_ARCH=mips$(if $(BR2_ARCH_IS_64),64) \ -DWITH_CPU=mips$(if $(BR2_ARCH_IS_64),64) +else ifeq ($(BR2_or1k),y) +KODI_CONF_OPTS += -DWITH_ARCH=or1k -DWITH_CPU=or1k else ifeq ($(BR2_powerpc)$(BR2_powerpc64le),y) KODI_CONF_OPTS += \ -DWITH_ARCH=powerpc$(if $(BR2_ARCH_IS_64),64) \