alarm/kodi-rpi-git: fixup

Add back cmake arg to use tarball and align PKGBUILD with others in series
This commit is contained in:
graysky 2022-12-17 07:58:09 -05:00
parent 9d9f435de2
commit 8f284980e6

View file

@ -58,9 +58,9 @@ source=(
"libdvdread-$_libdvdread_version.tar.gz::https://github.com/xbmc/libdvdread/archive/$_libdvdread_version.tar.gz" "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" "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/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/crossguid-$_crossguid_version.tar.gz"
"http://mirrors.kodi.tv/build-deps/sources/fstrcmp-$_fstrcmp_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/flatbuffers-$_flatbuffers_version.tar.gz"
"http://mirrors.kodi.tv/build-deps/sources/libudfread-$_libudfread_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" "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" 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" CXXFLAGS+="${CFLAGS} -Wp,-D_GLIBCXX_ASSERTIONS"
# https://github.com/google/flatbuffers/issues/7404
CXXFLAGS+=' -Wno-error=restrict'
if [[ -n "$_clangbuild" ]]; then if [[ -n "$_clangbuild" ]]; then
export CC=clang CXX=clang++ export CC=clang CXX=clang++
# depending on your build system, optionally redefine DISTCC_HOSTS # depending on your build system, optionally redefine DISTCC_HOSTS
@ -140,6 +137,7 @@ build() {
-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_PREFIX=/usr
-DCMAKE_INSTALL_LIBDIR=/usr/lib -DCMAKE_INSTALL_LIBDIR=/usr/lib
-DUSE_LTO=OFF -DUSE_LTO=OFF
-DVERBOSE=ON
-DENABLE_LDGOLD=OFF -DENABLE_LDGOLD=OFF
-DENABLE_EVENTCLIENTS=ON -DENABLE_EVENTCLIENTS=ON
-DENABLE_INTERNAL_FFMPEG=ON -DENABLE_INTERNAL_FFMPEG=ON
@ -160,12 +158,16 @@ build() {
-DSPDLOG_URL="$srcdir/spdlog-$_spdlog_version.tar.gz" -DSPDLOG_URL="$srcdir/spdlog-$_spdlog_version.tar.gz"
-DCROSSGUID_URL="$srcdir/crossguid-$_crossguid_version.tar.gz" -DCROSSGUID_URL="$srcdir/crossguid-$_crossguid_version.tar.gz"
-DFSTRCMP_URL="$srcdir/fstrcmp-$_fstrcmp_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" -DUDFREAD_URL="$srcdir/libudfread-$_libudfread_version.tar.gz"
-DVERBOSE=ON
-DAPP_RENDER_SYSTEM=gles -DAPP_RENDER_SYSTEM=gles
-DCORE_PLATFORM_NAME="x11 gbm" -DCORE_PLATFORM_NAME="x11 gbm"
) )
# https://github.com/google/flatbuffers/issues/7404
CXXFLAGS+=' -Wno-error=restrict'
echo "building kodi"
cmake "${_args[@]}" ../"xbmc-$_commit" cmake "${_args[@]}" ../"xbmc-$_commit"
make make
} }