alarm/kodi-rpi-git to 21.x.64168.5122788f7b-1

Fix armv7h build using compatible java which is different for aarch64
This commit is contained in:
graysky 2023-10-09 15:11:43 -04:00
parent 1d0638a173
commit 81bc857c8d

View file

@ -13,8 +13,8 @@ pkgname=(
'kodi-rpi-git-eventclients' 'kodi-rpi-git-tools-texturepacker' 'kodi-rpi-git-dev'
)
_commitnumber=64154
_commit=1de19a678c19f4ae307692a38cfe40f88e4359c7
_commitnumber=64168
_commit=5122788f7b368bfc0fe48c50b29f648f062d39de
# set this to anything to build with clang
# recommend manually setting -DUSE_LTO=OFF to -DUSE_LTO=$(nproc) in build()
@ -27,7 +27,7 @@ url="https://github.com/graysky2/xbmc/tree/gs-gbm_omega"
license=('GPL2')
makedepends=(
'afpfs-ng' 'bluez-libs' 'cmake' 'curl' 'dav1d' 'doxygen' 'git' 'glew'
'gperf' 'hicolor-icon-theme' 'java-environment<21' 'fmt' 'libaacs' 'libass'
'gperf' 'hicolor-icon-theme' 'fmt' 'libaacs' 'libass'
'libbluray' 'libcdio' 'libcec-rpi' 'libgl' 'mariadb-libs' 'libmicrohttpd'
'libmodplug' 'libmpeg2' 'libnfs' 'libplist' 'libpulse'
'libxrandr' 'libxslt' 'lirc' 'lzo' 'mesa' 'nasm'
@ -36,6 +36,13 @@ makedepends=(
'tinyxml' 'swig' 'upower' 'giflib' 'rapidjson' 'ghostscript' 'meson' 'gtest'
'graphviz' 'libinput' 'libxkbcommon' 'pcre' 'libdisplay-info' 'tinyxml2'
)
# there are incompatibilities with recent java releases
# see: sttps://bugs.archlinux.org/task/79844
# armv7h needs v17 but aarch64 be use a later one
makedepends_armv7h=('jdk17-openjdk')
makedepends_aarch64=('java-environment<21')
[[ -n "$_clangbuild" ]] && makedepends+=('clang' 'lld' 'llvm')
_codename=Nexus
@ -72,7 +79,7 @@ noextract=(
"flatbuffers-$_flatbuffers_version.tar.gz"
"libudfread-$_libudfread_version.tar.gz"
)
sha256sums=('9dcd644fefb2c620d1f45c1294818b478a8a6a07c7d356d006bce5fbf8ac9e1c'
sha256sums=('4551d583484ee87ef02075ca46c1e71e06e7d234089799e261c5af1fd55052f6'
'f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e'
'584f62a3896794408d46368e2ecf2c6217ab9c676ce85921b2d68b8961f49dfc'
'719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62'