From 55fd20c3e0c8f34cfb78d82bbbe397da14075eec Mon Sep 17 00:00:00 2001 From: graysky Date: Tue, 22 Sep 2020 09:02:30 -0400 Subject: [PATCH] alarm/kodi-rbp4-git to 19.0a1.55969.fbef8cf4ac-1 --- alarm/kodi-rbp4-git/PKGBUILD | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/alarm/kodi-rbp4-git/PKGBUILD b/alarm/kodi-rbp4-git/PKGBUILD index 3e937f775..af71e2cfb 100644 --- a/alarm/kodi-rbp4-git/PKGBUILD +++ b/alarm/kodi-rbp4-git/PKGBUILD @@ -18,15 +18,15 @@ pkgname=("kodi-$_suffix" "kodi-eventclients-$_suffix" "kodi-tools-texturepacker- # popcornmix has this code which is under review by ffmpeg for inclusion _source=xbmc -#_source=popcornmix +#_source=popcornmix # vanilla kodi -_commit=e29db7f3918460193c89c486e34e26d0d3ffe6b8 -_commitnumber=55946 +_commitnumber=55969 +_commit=fbef8cf4aca97418eb04f231a973ed4e4945c164 # popcornmix's gbm branch -#_commit=c131e47adabe4065ea36b51a1e3dbd10f7459c2b -#_commitnumber=55946 +#_commitnumber=55973 +#_commit=7255ee24b014fa6c51d6d72c4b0783db7d12d3a4 pkgver="19.0a1.$_commitnumber.${_commit:0:10}" pkgrel=1 @@ -96,7 +96,7 @@ noextract=( "flatbuffers-$_flatbuffers_version.tar.gz" "spdlog-$_spdlog_version.tar.gz" ) -sha256sums=('9c4925f58f5db091472c5fafafca809c5a019452afaae1e65aee17df85beb520' +sha256sums=('ce2459ae7180e044139ec8f6a274fa463a0afbf9275fa0e28ce0fb404302fb3b' '84ee6e1f7872fb249799f1428d5ab79930912ab7e064122c5c008fbecd0b547a' '61a0648d4a5086f560ceb4e020f82472d00b99398f2cacba94fad3e96c4c362a' '5d38a895ee7b93689fab79124a3aad23a5e3e643abd08878d778d04066c8d26f' @@ -128,7 +128,7 @@ build() { # the build system expects to find /usr/include/drm/drm_fourcc.h however we provide this # in /usr/lib/modules/x.y.z-1-ARCH/build/include/uapi/drm/drm_fourcc.h - # + # # credit to Kevin for the following hack: #_kernel_release="$(pacman -Q linux-raspberrypi4-headers | grep -Eo "[^\ ]+$")-ARCH" @@ -136,12 +136,12 @@ build() { #ln -s /usr/lib/modules/$_kernel_release/build/include/uapi/drm/drm_fourcc.h "$srcdir/uapi/drm" #export CPPFLAGS+=" -I$srcdir/uapi" - unset CFLAGS CXXFLAGS - export CFLAGS="-march=armv8-a+crc+simd -mtune=cortex-a72 -mfpu=neon-fp-armv8 -mfloat-abi=hard -O2 -pipe -fstack-protector-strong -fno-plt" - export CXXFLAGS="${CFLAGS}" #-DCMAKE_EXE_LINKER_FLAGS_INIT="-L/opt/vc/lib -lvcsm" \ #-DCMAKE_EXE_LINKER_FLAGS="-L/opt/vc/lib -lvcsm" \ #-DCMAKE_CXX_FLAGS="-Wl,-L/opt/vc/lib -Wl,-lvcsm" \ + unset CFLAGS CXXFLAGS + export CFLAGS="-march=armv8-a+crc+simd -mtune=cortex-a72 -mfpu=neon-fp-armv8 -mfloat-abi=hard -O2 -pipe -fstack-protector-strong -fno-plt" + export CXXFLAGS="${CFLAGS}" cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=/usr/lib \ @@ -171,7 +171,6 @@ build() { ../"xbmc-$_commit" make make preinstall - } package_kodi-rbp4-git() {