diff --git a/alarm/kodi-rpi-git/PKGBUILD b/alarm/kodi-rpi-git/PKGBUILD index d8c5d9a6b..b0cfe7070 100644 --- a/alarm/kodi-rpi-git/PKGBUILD +++ b/alarm/kodi-rpi-git/PKGBUILD @@ -13,15 +13,15 @@ pkgname=( 'kodi-rpi-git-eventclients' 'kodi-rpi-git-tools-texturepacker' 'kodi-rpi-git-dev' ) -_commitnumber=60428 -_commit=6e62e8180239febcba72c21248cc8b95a293735f +_commitnumber=60448 +_commit=26e7070ac986a5d13f3a9c742d6771853bf5da11 # set this to anything to build with clang # recommend manually setting -DUSE_LTO=OFF to -DUSE_LTO=$(nproc) in build() _clangbuild= pkgver="20.x.$_commitnumber.${_commit:0:10}" -pkgrel=2 +pkgrel=1 arch=('armv7h' 'aarch64') url="https://github.com/graysky2/xbmc/tree/gs-gbm_nexus-v4" license=('GPL2') @@ -34,7 +34,7 @@ makedepends=( 'python-pycryptodomex' 'python-pillow' 'python-pybluez' 'python-simplejson' 'shairplay' 'smbclient' 'taglib' 'tinyxml' 'swig' 'upower' 'giflib' 'rapidjson' 'ghostscript' 'meson' 'gtest' 'graphviz' - 'libinput' 'libxkbcommon' + 'libinput' 'libxkbcommon' 'flatbuffers' ) [[ -n "$_clangbuild" ]] && makedepends+=('clang' 'lld' 'llvm') @@ -48,7 +48,6 @@ _fmt_version="8.0.1" _spdlog_version="1.9.2" _crossguid_version="ca1bf4b810e2d188d04cb6286f957008ee1b7681" _fstrcmp_version="0.7.D001" -_flatbuffers_version="2.0.0" _libudfread_version="1.1.2" _name="gbm_nexus-$pkgver-$_codename" source=( @@ -60,7 +59,6 @@ source=( "http://mirrors.kodi.tv/build-deps/sources/fmt-$_fmt_version.tar.gz" "http://mirrors.kodi.tv/build-deps/sources/crossguid-$_crossguid_version.tar.gz" "http://mirrors.kodi.tv/build-deps/sources/fstrcmp-$_fstrcmp_version.tar.gz" - "http://mirrors.kodi.tv/build-deps/sources/flatbuffers-$_flatbuffers_version.tar.gz" "http://mirrors.kodi.tv/build-deps/sources/spdlog-$_spdlog_version.tar.gz" "http://mirrors.kodi.tv/build-deps/sources/libudfread-$_libudfread_version.tar.gz" "ArchARM-kodi-init-v$_init_version.tar.gz::https://github.com/graysky2/kodi-standalone-service/archive/v$_init_version.tar.gz" @@ -78,10 +76,9 @@ noextract=( "spdlog-$_spdlog_version.tar.gz" "crossguid-$_crossguid_version.tar.gz" "fstrcmp-$_fstrcmp_version.tar.gz" - "flatbuffers-$_flatbuffers_version.tar.gz" "libudfread-$_libudfread_version.tar.gz" ) -sha256sums=('8e41497151dd2cba005db86cc83d1c3970130c3d1fdca72b2be16c16ab452dc7' +sha256sums=('d645731d4b05eb8ac35173dae0b86b441077b78127f69fc6c27472240ba4f8c5' '38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d' '071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a' 'a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf' @@ -89,7 +86,6 @@ sha256sums=('8e41497151dd2cba005db86cc83d1c3970130c3d1fdca72b2be16c16ab452dc7' 'b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01' '6be27e0b3a4907f0cd3cfadec255ee1b925569e1bd06e67a4d2f4267299b69c4' 'e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476' - '9ddb9031798f4f8754d00fca2f1a68ecf9d0f83dfac7239af1311e4fd9a565c4' '6fff9215f5cb81760be4cc16d033526d1080427d236e86d70bb02994f85e3d38' '2bf16726ac98d093156195bb049a663e07d3323e079c26912546f4e05c77bac5' 'b94c70baa45e30346224ceecfab031dd183e09303b1f97d6522f9941da9b0067' @@ -129,7 +125,7 @@ build() { CFLAGS="-mcpu=cortex-a53" fi - export CFLAGS+=" -O2 -pipe -fstack-protector-strong -fno-plt -fexceptions -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -fstack-clash-protection -Wno-error" + export CFLAGS+=" -O2 -pipe -fstack-protector-strong -fno-plt -fexceptions -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -fstack-clash-protection" export CXXFLAGS+="${CFLAGS} -Wp,-D_GLIBCXX_ASSERTIONS" if [[ -n "$_clangbuild" ]]; then @@ -152,7 +148,6 @@ build() { -DENABLE_INTERNAL_SPDLOG=ON -DENABLE_INTERNAL_CROSSGUID=ON -DENABLE_INTERNAL_FSTRCMP=ON - -DENABLE_INTERNAL_FLATBUFFERS=ON -DENABLE_INTERNAL_UDFREAD=ON -DENABLE_MYSQLCLIENT=ON -DENABLE_VAAPI=OFF @@ -165,7 +160,6 @@ build() { -DSPDLOG_URL="$srcdir/spdlog-$_spdlog_version.tar.gz" -DCROSSGUID_URL="$srcdir/crossguid-$_crossguid_version.tar.gz" -DFSTRCMP_URL="$srcdir/fstrcmp-$_fstrcmp_version.tar.gz" - -DFLATBUFFERS_URL="$srcdir/flatbuffers-$_flatbuffers_version.tar.gz" -DUDFREAD_URL="$srcdir/libudfread-$_libudfread_version.tar.gz" -DVERBOSE=ON -DAPP_RENDER_SYSTEM=gles @@ -184,7 +178,7 @@ package_kodi-rpi-git() { 'libplist' 'libpulse' 'libxslt' 'lirc' 'mariadb-libs' 'mesa' 'python-pillow' 'python-pycryptodomex' 'python-simplejson' 'shairplay' 'smbclient' 'sqlite' 'taglib' 'tinyxml' - 'libinput' 'libxkbcommon' 'polkit' 'linux>=5.4.35' 'lzo' + 'libinput' 'libxkbcommon' 'polkit' 'linux>=5.4.35' 'lzo' 'flatbuffers' ) [[ -n "$_clangbuild" ]] && depends+=('glu')