diff --git a/alarm/kodi-rpi-git/PKGBUILD b/alarm/kodi-rpi-git/PKGBUILD index 2f80fb01d..caa30b7e3 100644 --- a/alarm/kodi-rpi-git/PKGBUILD +++ b/alarm/kodi-rpi-git/PKGBUILD @@ -13,8 +13,8 @@ _prefix=/usr pkgbase=kodi-rpi-git pkgname=('kodi-rpi-git' 'kodi-rpi-git-eventclients' 'kodi-rpi-git-tools-texturepacker' 'kodi-rpi-git-dev') -_commitnumber=56966 -_commit=acc15778e483bd3f19d2acf0bf1d45897315c39d +_commitnumber=56976 +_commit=8dc2c71f7b568733b7e6629013f05f67639a1938 pkgver="19.0rc1.$_commitnumber.${_commit:0:10}" pkgrel=1 @@ -71,7 +71,7 @@ source=( "http://mirrors.kodi.tv/build-deps/sources/spdlog-$_spdlog_version.tar.gz" sysusers.conf tmpfiles.conf - 0000-use-mcpu-avoiding-march-and-mtune.patch + use-mcpu-avoiding-march-and-mtune.patch 0001-mcpu-cortex-a72-for-RPi4-application-to-ffmpeg.patch 0002-Revert-jsonrpc-remove-ambiguous-and-duplicate-Player.patch ) @@ -87,7 +87,7 @@ noextract=( "flatbuffers-$_flatbuffers_version.tar.gz" "spdlog-$_spdlog_version.tar.gz" ) -sha256sums=('7aca6a5ac0abd6fe2d6e3bbdc2c4a9902043dd6ae081a42680e98fa98bbfd0ac' +sha256sums=('ead94bada5e271a83ac7ce7a1445371e5ae760a999a90aa6aeb99a1ec6f9b8d0' 'bb8f0c0fd03ff7c13c0503f2c96f86772d8bbd05adbc97d5b383f603a98456c0' '61a0648d4a5086f560ceb4e020f82472d00b99398f2cacba94fad3e96c4c362a' '5d38a895ee7b93689fab79124a3aad23a5e3e643abd08878d778d04066c8d26f' @@ -103,7 +103,7 @@ sha256sums=('7aca6a5ac0abd6fe2d6e3bbdc2c4a9902043dd6ae081a42680e98fa98bbfd0ac' 'b38e0bbef7faac2b82fed550a0c19b0d4e7f6737d5321d4fd8f216b80f8aee8a' 'f521b98232e5035b7cada46cf03975b8d753e93d0802bf22913fceed769f9d96' '9c5e79ed8719cd032a3b17dac585aeff28a198e37af1da9af68ef1b86bab4d18' - '39a54a2d9c429c27ed2a369568043a1e3c86e2fe6bf931932984a0ce7aee7391' + '444c84ff62d178db3c74473e422fb4b58e1540ac767dce100337d2df588eb68e' '05a140fa6da5ba0576611e31f2ed2e5d56255c480e58be4854db154d611b29da' '1816a6442574e46731a045227e4d4d8c09e2e2668ae271c63af051a0647c59a2') prepare() { @@ -113,7 +113,7 @@ prepare() { mkdir "$srcdir"/kodi-build # put patch in source tree so kodi build system can pick it up - cp ../0000-use-mcpu-avoiding-march-and-mtune.patch \ + cp ../use-mcpu-avoiding-march-and-mtune.patch \ tools/depends/target/ffmpeg/0002-use-mcpu-avoiding-march-and-mtune.patch # patch kodi build system to apply the patch we just copied over @@ -140,7 +140,7 @@ build() { # uses here so unset them and redefine below unset CFLAGS CXXFLAGS - CFLAGS="-O2 -pipe -fstack-protector-strong -fno-plt -mtune=cortex-a72" + CFLAGS="-O2 -pipe -fstack-protector-strong -fno-plt" CXXFLAGS="${CFLAGS}" if [[ $CARCH = "armv7h" ]]; then diff --git a/alarm/kodi-rpi-git/0000-use-mcpu-avoiding-march-and-mtune.patch b/alarm/kodi-rpi-git/use-mcpu-avoiding-march-and-mtune.patch similarity index 94% rename from alarm/kodi-rpi-git/0000-use-mcpu-avoiding-march-and-mtune.patch rename to alarm/kodi-rpi-git/use-mcpu-avoiding-march-and-mtune.patch index 9a9b9e573..ad174d8ce 100644 --- a/alarm/kodi-rpi-git/0000-use-mcpu-avoiding-march-and-mtune.patch +++ b/alarm/kodi-rpi-git/use-mcpu-avoiding-march-and-mtune.patch @@ -3,7 +3,7 @@ From: graysky Date: Sat, 12 Dec 2020 09:10:28 -0500 Subject: [PATCH] use -mcpu= avoiding -march and -mtune for armv7h -From what I understand, when building on ARM, it's best to avoid the -march= +From what I understand, when building on ARM, it's best to avoid the -march= flag and rather use -mcpu= flag due to differences in meaning on ARM vs x86[1]. Additionally, this patch avoids thousands of warns like the following when building for armv7h: