diff --git a/alarm/kodi-rpi/PKGBUILD b/alarm/kodi-rpi/PKGBUILD index 564d92d8c..cb6d7cc8b 100644 --- a/alarm/kodi-rpi/PKGBUILD +++ b/alarm/kodi-rpi/PKGBUILD @@ -13,7 +13,7 @@ pkgname=( 'kodi-rpi-eventclients' 'kodi-rpi-tools-texturepacker' 'kodi-rpi-dev' ) pkgver=19.4 -pkgrel=3 +pkgrel=4 _commit=51a36cca9f6dd2bc717e41153fb2d0aa9caf11ca arch=('armv7h' 'aarch64') url="https://github.com/graysky2/xbmc/tree/gs-gbm_matrix" @@ -27,7 +27,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' ) _codename=Matrix _init_version=1.136 @@ -39,7 +39,6 @@ _fmt_version="6.1.2" _spdlog_version="1.5.0" _crossguid_version="8f399e8bd4" _fstrcmp_version="0.7.D001" -_flatbuffers_version="1.12.0" _libudfread_version="1.1.0" source=( "xbmc-$pkgver.tar.gz::https://github.com/graysky2/xbmc/archive/$_commit.tar.gz" @@ -50,7 +49,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" @@ -70,7 +68,6 @@ 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=('ea57f7d2339bede8086082865afbb47c953f195dbfbaf54c43aeb4b46b8f9f2e' @@ -81,7 +78,6 @@ sha256sums=('ea57f7d2339bede8086082865afbb47c953f195dbfbaf54c43aeb4b46b8f9f2e' '1cafc80701b746085dddf41bd9193e6d35089e1c6ec1940e037fcb9c98f62365' '3d77d09a5df0de510aeeb940df4cb534787ddff3bb1828779753f5dfa1229d10' 'e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476' - '62f2223fb9181d1d6338451375628975775f7522185266cd5296571ac152bc45' 'b38e0bbef7faac2b82fed550a0c19b0d4e7f6737d5321d4fd8f216b80f8aee8a' '5ad9f95c53e8f29853c1fefa0a20a301be4045e2c7ae49d1164bc74d94155627' 'b94c70baa45e30346224ceecfab031dd183e09303b1f97d6522f9941da9b0067' @@ -127,7 +123,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" _args=( @@ -142,7 +138,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 @@ -155,7 +150,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" -DAPP_RENDER_SYSTEM=gles -DCORE_PLATFORM_NAME="x11 gbm" @@ -173,7 +167,7 @@ package_kodi-rpi() { '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' ) optdepends=( 'afpfs-ng: Apple shares support'