alarm/kodi-rpi to 20.2-7

Fix armv7h build using compatible java which is different for aarch64
This commit is contained in:
graysky 2023-10-09 14:04:05 -04:00
parent 81bc857c8d
commit 726407e325

View file

@ -21,13 +21,13 @@ _commit=b4342dd18568c4234c6f2270654e14cfce3cd141
_clangbuild=
pkgver=20.2
pkgrel=6
pkgrel=7
arch=('aarch64' 'armv7h')
url="https://github.com/graysky2/xbmc/tree/gs-gbm_nexus"
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'
)
# 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