From 7f839bf84fba628ccafd313e089e2521854d10ff Mon Sep 17 00:00:00 2001 From: graysky Date: Tue, 29 Aug 2023 07:54:40 -0400 Subject: [PATCH] alarm/kodi-rpi to 20.2-1 --- alarm/kodi-rpi/PKGBUILD | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/alarm/kodi-rpi/PKGBUILD b/alarm/kodi-rpi/PKGBUILD index de2037bfa..13c6b72c9 100644 --- a/alarm/kodi-rpi/PKGBUILD +++ b/alarm/kodi-rpi/PKGBUILD @@ -13,15 +13,15 @@ pkgname=( 'kodi-rpi-eventclients' 'kodi-rpi-tools-texturepacker' 'kodi-rpi-dev' ) -_commitnumber=62237 -_commit=91e174bc877be436f5abfd72cf509989158ed81b +_commitnumber=62264 +_commit=b4342dd18568c4234c6f2270654e14cfce3cd141 # set this to anything to build with clang # recommend manually setting -DUSE_LTO=OFF to -DUSE_LTO=$(nproc) in build() _clangbuild= pkgver=20.2 -pkgrel=3 +pkgrel=1 arch=('aarch64' 'armv7h') url="https://github.com/graysky2/xbmc/tree/gs-gbm_nexus" license=('GPL2') @@ -46,7 +46,7 @@ _libdvdread_version="6.1.3-Next-Nexus-Alpha2-2" _ffmpeg_version="5.1.3" _crossguid_version="ca1bf4b810e2d188d04cb6286f957008ee1b7681" _fstrcmp_version="0.7.D001" -_flatbuffers_version="2.0.0" +_flatbuffers_version="23.3.3" _libudfread_version="1.1.2" source=( "xbmc-$pkgver.${_commit:0:10}.tar.gz::https://github.com/graysky2/xbmc/archive/$_commit.tar.gz" @@ -61,7 +61,7 @@ source=( "ArchARM-kodi-init-v$_init_version.tar.gz::https://github.com/graysky2/kodi-standalone-service/archive/v$_init_version.tar.gz" kodi.config.txt 0001-ffmpeg-update-for-official-5.1.3.patch - kodi-fmt-10.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/23453.patch + flatbuffers-23.3.3.patch::https://github.com/xbmc/xbmc/commit/35be40daa39965a9ea5b3569eb7d515e6a14da5d.patch ) backup=(boot/kodi.config.txt etc/conf.d/kodi-standalone) noextract=( @@ -74,28 +74,28 @@ noextract=( "flatbuffers-$_flatbuffers_version.tar.gz" "libudfread-$_libudfread_version.tar.gz" ) -sha256sums=('8fca8b6258fe4f7a90b2484237b935662e3a7820c358ce22823d6116fc31345a' +sha256sums=('ebbc261a358cc924c147f121ddd9ba3471dfd4df8d04c05d57549cc6a146d5da' 'f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e' '584f62a3896794408d46368e2ecf2c6217ab9c676ce85921b2d68b8961f49dfc' '719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62' 'ac1b734adc57333ffbb603d9d5b70a4133f10d76380085c61c77fa3537f63e95' '6be27e0b3a4907f0cd3cfadec255ee1b925569e1bd06e67a4d2f4267299b69c4' 'e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476' - '9ddb9031798f4f8754d00fca2f1a68ecf9d0f83dfac7239af1311e4fd9a565c4' + '8aff985da30aaab37edf8e5b02fda33ed4cbdd962699a8e2af98fdef306f4e4d' '2bf16726ac98d093156195bb049a663e07d3323e079c26912546f4e05c77bac5' 'b94c70baa45e30346224ceecfab031dd183e09303b1f97d6522f9941da9b0067' '9ce6051a2157e6b677090f201d98870a33db6c90c91dc0d480a87fb7ab84e3e5' 'edb5cd7df4eb73535e94598f5cd06b922196e63cbe8518a116ffafa88af8c2d6' - '0c7ce50029029a937b970a79cfd468d0c336a6be80dcf048b33380d1ed39a66b') + 'ea7a409c4e260bd8f4f949cbd02b7a6609ac0ec5a6920b405abc63ec1a3e312b') prepare() { [[ -d kodi-build ]] && rm -rf kodi-build mkdir "$srcdir/kodi-build" cd "xbmc-$_commit" patch -p1 -i ../0001-ffmpeg-update-for-official-5.1.3.patch - - # fix build with fmt 10 - patch -p1 -i ../kodi-fmt-10.patch + + # use flatbuffers 23.3.3 + patch -p1 -i ../flatbuffers-23.3.3.patch } build() { @@ -140,6 +140,7 @@ build() { -DENABLE_CEC=ON -DENABLE_DBUS=ON -DENABLE_DVDCSS=ON + -DENABLE_EGL=ON -DENABLE_EVENTCLIENTS=ON -DENABLE_MICROHTTPD=ON -DENABLE_MYSQLCLIENT=ON @@ -152,6 +153,7 @@ build() { -DENABLE_VDPAU=OFF -DENABLE_XSLT=ON -DENABLE_LIRCCLIENT=ON + -DENABLE_INTERNAL_RapidJSON=OFF -DENABLE_INTERNAL_FFMPEG=ON -DENABLE_INTERNAL_CROSSGUID=ON -DENABLE_INTERNAL_FSTRCMP=ON