From owner-svn-ports-all@freebsd.org Wed Dec 18 05:41:38 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 83FDF1D4BA9; Wed, 18 Dec 2019 05:41:38 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47d3m22nvBz4CCb; Wed, 18 Dec 2019 05:41:38 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5B30A218B3; Wed, 18 Dec 2019 05:41:38 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBI5fcL4033585; Wed, 18 Dec 2019 05:41:38 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBI5fcjp033584; Wed, 18 Dec 2019 05:41:38 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201912180541.xBI5fcjp033584@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Wed, 18 Dec 2019 05:41:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r520362 - head/multimedia/kodi-devel/files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/multimedia/kodi-devel/files X-SVN-Commit-Revision: 520362 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Dec 2019 05:41:38 -0000 Author: tobik Date: Wed Dec 18 05:41:37 2019 New Revision: 520362 URL: https://svnweb.freebsd.org/changeset/ports/520362 Log: multimedia/kodi-devel: Unbreak on arm xbmc/platform/freebsd/CPUInfoFreebsd.cpp:18:10: fatal error: 'asm/hwcap.h' file not found #include ^~~~~~~~~~~~~ 1 error generated. PR: 242688 Submitted by: jbeich Added: head/multimedia/kodi-devel/files/patch-neon (contents, props changed) Added: head/multimedia/kodi-devel/files/patch-neon ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/kodi-devel/files/patch-neon Wed Dec 18 05:41:37 2019 (r520362) @@ -0,0 +1,35 @@ +--- xbmc/platform/freebsd/CPUInfoFreebsd.cpp.orig ++++ xbmc/platform/freebsd/CPUInfoFreebsd.cpp +@@ -14,11 +14,10 @@ + #include + #include + +-#if (defined(__arm__) && defined(HAS_NEON)) || defined(__aarch64__) +-#include +-#include +-#elif defined(__i386__) || defined(__x86_64__) ++#if defined(__i386__) || defined(__x86_64__) + #include ++#elif __has_include() ++#include + #endif + + #include +@@ -155,9 +154,15 @@ CCPUInfoFreebsd::CCPUInfoFreebsd() + } + #endif + +-#if defined(HAS_NEON) && defined(__arm__) +- if (getauxval(AT_HWCAP) & HWCAP_NEON) ++#if defined(HAS_NEON) ++#if defined(__ARM_NEON) ++ m_cpuFeatures |= CPU_FEATURE_NEON; ++#elif __has_include() ++ unsigned long hwcap = 0; ++ elf_aux_info(AT_HWCAP, &hwcap, sizeof(hwcap)); ++ if (hwcap & HWCAP_NEON) + m_cpuFeatures |= CPU_FEATURE_NEON; ++#endif + #endif + } +