From 8f284980e6f7fadfa693de77d7bc325ea96b52ba Mon Sep 17 00:00:00 2001 From: graysky Date: Sat, 17 Dec 2022 07:58:09 -0500 Subject: [PATCH] alarm/kodi-rpi-git: fixup Add back cmake arg to use tarball and align PKGBUILD with others in series --- alarm/kodi-rpi-git/PKGBUILD | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/alarm/kodi-rpi-git/PKGBUILD b/alarm/kodi-rpi-git/PKGBUILD index 85d0587f8..2d4899462 100644 --- a/alarm/kodi-rpi-git/PKGBUILD +++ b/alarm/kodi-rpi-git/PKGBUILD @@ -58,9 +58,9 @@ source=( "libdvdread-$_libdvdread_version.tar.gz::https://github.com/xbmc/libdvdread/archive/$_libdvdread_version.tar.gz" "ffmpeg-$_ffmpeg_version.tar.gz::https://github.com/xbmc/FFmpeg/archive/$_ffmpeg_version.tar.gz" "http://mirrors.kodi.tv/build-deps/sources/fmt-$_fmt_version.tar.gz" + "http://mirrors.kodi.tv/build-deps/sources/spdlog-$_spdlog_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/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" "ArchARM-kodi-init-v$_init_version.tar.gz::https://github.com/graysky2/kodi-standalone-service/archive/v$_init_version.tar.gz" @@ -124,9 +124,6 @@ build() { 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++ # depending on your build system, optionally redefine DISTCC_HOSTS @@ -140,6 +137,7 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib -DUSE_LTO=OFF + -DVERBOSE=ON -DENABLE_LDGOLD=OFF -DENABLE_EVENTCLIENTS=ON -DENABLE_INTERNAL_FFMPEG=ON @@ -160,12 +158,16 @@ 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 -DCORE_PLATFORM_NAME="x11 gbm" ) + # https://github.com/google/flatbuffers/issues/7404 + CXXFLAGS+=' -Wno-error=restrict' + + echo "building kodi" cmake "${_args[@]}" ../"xbmc-$_commit" make }