alarm/kodi-rbp4-git to 19.0a1.55946.e29db7f391-1

alarm/kodi-rbp4-git/PKGBUILD

@@ -14,9 +14,19 @@ pkgbase=kodi-rbp4-git
 _suffix=rbp4-git
 pkgname=("kodi-$_suffix" "kodi-eventclients-$_suffix" "kodi-tools-texturepacker-$_suffix" "kodi-dev-$_suffix")
 
+# xbmc is vanilla upstream which currently lacks HEVC decoding in ffmpeg
+# popcornmix has this code which is under review by ffmpeg for inclusion
+
+_source=xbmc
+#_source=popcornmix
+
+# vanilla kodi
+_commit=e29db7f3918460193c89c486e34e26d0d3ffe6b8
+_commitnumber=55946
+
 # popcornmix's gbm branch
-_commit=7f4e0bc00d76cf5f773945f63a929653f8aa0c96
-_commitnumber=55870
+#_commit=c131e47adabe4065ea36b51a1e3dbd10f7459c2b
+#_commitnumber=55946
 
 pkgver="19.0a1.$_commitnumber.${_commit:0:10}"
 pkgrel=1
@@ -56,7 +66,7 @@ _fstrcmp_version="0.7.D001"
 _flatbuffers_version="1.11.0"
 _spdlog_version="1.5.0"
 source=(
-  "xbmc-$pkgver.tar.gz::https://github.com/popcornmix/xbmc/archive/$_commit.tar.gz"
+  "xbmc-$pkgver.tar.gz::https://github.com/$_source/xbmc/archive/$_commit.tar.gz"
   kodi.service
   99-kodi.rules
   polkit.rules
@@ -86,11 +96,11 @@ noextract=(
   "flatbuffers-$_flatbuffers_version.tar.gz"
   "spdlog-$_spdlog_version.tar.gz"
 )
-sha256sums=('637235c9e2ec88a5f77020c79660d6a9607b943438c75cee037aa4754b07ac81'
+sha256sums=('9c4925f58f5db091472c5fafafca809c5a019452afaae1e65aee17df85beb520'
             '84ee6e1f7872fb249799f1428d5ab79930912ab7e064122c5c008fbecd0b547a'
             '61a0648d4a5086f560ceb4e020f82472d00b99398f2cacba94fad3e96c4c362a'
             '5d38a895ee7b93689fab79124a3aad23a5e3e643abd08878d778d04066c8d26f'
-            '4d4dfdd510a66f1dcf1c1a80650935c83683b1a8a0fc9072b8c2319969e7e3a9'
+            '5f6cb12bc44aa7117118d7b4ef91a2cdea73a41c5aa0f8e1069152cd1316d4a5'
             '38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d'
             '071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a'
             'a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf'
@@ -121,19 +131,19 @@ build() {
   # 
   # credit to Kevin for the following hack:
 
-  _kernel_release="$(pacman -Q linux-raspberrypi4-headers | grep -Eo "[^\ ]+$")-ARCH"
-  mkdir -p "$srcdir/uapi/drm"
-  ln -s /usr/lib/modules/$_kernel_release/build/include/uapi/drm/drm_fourcc.h "$srcdir/uapi/drm"
-  export CPPFLAGS+=" -I$srcdir/uapi"
+  #_kernel_release="$(pacman -Q linux-raspberrypi4-headers | grep -Eo "[^\ ]+$")-ARCH"
+  #mkdir -p "$srcdir/uapi/drm"
+  #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" \
 
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
-    -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" \
     -DCMAKE_INSTALL_LIBDIR=/usr/lib \
     -DENABLE_EVENTCLIENTS=ON \
     -DENABLE_INTERNAL_FFMPEG=ON \

alarm/kodi-rbp4-git/kodi-gbm.config.txt

@@ -1,5 +1,5 @@
-# Taken from LibreELEC Testbuilds
-# edit at your own risk
+# https://github.com/LibreELEC/LibreELEC.tv/blob/master/projects/RPi/devices/RPi4/config/distroconfig.txt
+
 dtoverlay=vc4-kms-v3d-pi4,cma-size=402653184
 dtoverlay=rpivid-v4l2
 disable_overscan=1