From f405dd37d399050cdf023724a5bf435ebeb4cb09 Mon Sep 17 00:00:00 2001 From: graysky Date: Fri, 16 Dec 2022 06:28:38 -0500 Subject: [PATCH] alarm/kodi-rpi-git to 20.x.61791.7bfec0e7a9-1 * new upstream url follows Nexus not master * use external rapidjson * use internal flatbuffers * fix build for mesa >22.3.0 --- alarm/kodi-rpi-git/PKGBUILD | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/alarm/kodi-rpi-git/PKGBUILD b/alarm/kodi-rpi-git/PKGBUILD index 07c29fc412..85d0587f85 100644 --- a/alarm/kodi-rpi-git/PKGBUILD +++ b/alarm/kodi-rpi-git/PKGBUILD @@ -13,8 +13,8 @@ pkgname=( 'kodi-rpi-git-eventclients' 'kodi-rpi-git-tools-texturepacker' 'kodi-rpi-git-dev' ) -_commitnumber=61790 -_commit=358fa5b8f32217b100e88d16e5e9271f468e1335 +_commitnumber=61791 +_commit=7bfec0e7a9ce0cdf3f4cea2b499bb896e74716ed # set this to anything to build with clang # recommend manually setting -DUSE_LTO=OFF to -DUSE_LTO=$(nproc) in build() @@ -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' 'flatbuffers' 'pipewire' + 'libinput' 'libxkbcommon' 'pipewire' 'pcre' ) [[ -n "$_clangbuild" ]] && makedepends+=('clang' 'lld' 'llvm') @@ -48,8 +48,8 @@ _fmt_version="9.1.0" _spdlog_version="1.10.0" _crossguid_version="ca1bf4b810e2d188d04cb6286f957008ee1b7681" _fstrcmp_version="0.7.D001" +_flatbuffers_version="2.0.0" _libudfread_version="1.1.2" -_rapidjson_version="1.1.0" _name="gbm_nexus-$pkgver-$_codename" source=( "xbmc-$pkgver.tar.gz::https://github.com/graysky2/xbmc/archive/$_commit.tar.gz" @@ -61,10 +61,11 @@ source=( "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/spdlog-$_spdlog_version.tar.gz" + "http://mirrors.kodi.tv/build-deps/sources/flatbuffers-$_flatbuffers_version.tar.gz" "http://mirrors.kodi.tv/build-deps/sources/libudfread-$_libudfread_version.tar.gz" - "http://mirrors.kodi.tv/build-deps/sources/rapidjson-$_rapidjson_version.tar.gz" "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-fix-mesa-22.3.0-build.patch::https://raw.githubusercontent.com/LibreELEC/LibreELEC.tv/master/packages/mediacenter/kodi/patches/kodi-100.01.fix-mesa-22.3.0-build.patch" ) backup=(boot/kodi.config.txt etc/conf.d/kodi-standalone) noextract=( @@ -76,10 +77,10 @@ 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" - "rapidjson-$_rapidjson_version.tar.gz" ) -sha256sums=('904b5fe0315a0b0ea998c081e6270fe219fc92b2b9277abf7999b12ea9aadc88' +sha256sums=('7942ea4e031e0c4334ab9ed8f7a27c754ed8bf3288a72166bae67cbdbe134ba4' 'f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e' '584f62a3896794408d46368e2ecf2c6217ab9c676ce85921b2d68b8961f49dfc' '719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62' @@ -88,16 +89,18 @@ sha256sums=('904b5fe0315a0b0ea998c081e6270fe219fc92b2b9277abf7999b12ea9aadc88' '6be27e0b3a4907f0cd3cfadec255ee1b925569e1bd06e67a4d2f4267299b69c4' 'e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476' '697f91700237dbae2326b90469be32b876b2b44888302afbc7aceb68bcfe8224' + '9ddb9031798f4f8754d00fca2f1a68ecf9d0f83dfac7239af1311e4fd9a565c4' '2bf16726ac98d093156195bb049a663e07d3323e079c26912546f4e05c77bac5' - 'bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e' 'b94c70baa45e30346224ceecfab031dd183e09303b1f97d6522f9941da9b0067' - '92d063169017bf9e1770d8a7cce77c0c55d197692d10820a7e4aecad9e58178c') + '92d063169017bf9e1770d8a7cce77c0c55d197692d10820a7e4aecad9e58178c' + '4ef526800e59f733ad7185d1487b3ac4dd6da4b0d9753be98a9347f13cf979f1') prepare() { [[ -d kodi-build ]] && rm -rf kodi-build mkdir "$srcdir/kodi-build" cd "xbmc-$_commit" - # patches go here + + patch -p1 -i ../0001-fix-mesa-22.3.0-build.patch } build() { @@ -118,8 +121,11 @@ 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" - export CXXFLAGS+="${CFLAGS} -Wp,-D_GLIBCXX_ASSERTIONS" + CFLAGS+=" -O2 -pipe -fstack-protector-strong -fno-plt -fexceptions -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -fstack-clash-protection" + CXXFLAGS+="${CFLAGS} -Wp,-D_GLIBCXX_ASSERTIONS" + + # https://github.com/google/flatbuffers/issues/7404 + CXXFLAGS+=' -Wno-error=restrict' if [[ -n "$_clangbuild" ]]; then export CC=clang CXX=clang++ @@ -141,8 +147,8 @@ build() { -DENABLE_INTERNAL_SPDLOG=ON -DENABLE_INTERNAL_CROSSGUID=ON -DENABLE_INTERNAL_FSTRCMP=ON + -DENABLE_INTERNAL_FLATBUFFERS=ON -DENABLE_INTERNAL_UDFREAD=ON - -DENABLE_INTERNAL_RAPIDJSON=ON -DENABLE_MYSQLCLIENT=ON -DENABLE_VAAPI=OFF -DENABLE_VDPAU=OFF @@ -155,7 +161,6 @@ build() { -DCROSSGUID_URL="$srcdir/crossguid-$_crossguid_version.tar.gz" -DFSTRCMP_URL="$srcdir/fstrcmp-$_fstrcmp_version.tar.gz" -DUDFREAD_URL="$srcdir/libudfread-$_libudfread_version.tar.gz" - -DRAPIDJSON_URL="$srcdir/rapidjson-$_rapidjson_version.tar.gz" -DVERBOSE=ON -DAPP_RENDER_SYSTEM=gles -DCORE_PLATFORM_NAME="x11 gbm" @@ -173,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' 'flatbuffers' 'pipewire' + 'libinput' 'libxkbcommon' 'polkit' 'linux>=5.4.35' 'lzo' 'pipewire' 'pcre' ) [[ -n "$_clangbuild" ]] && depends+=('glu')