From 8c078b7ef764ff301767c90b19d18ab216492afa Mon Sep 17 00:00:00 2001
From: graysky <graysky@archlinux.us>
Date: Mon, 28 Sep 2020 11:03:03 -0400
Subject: [PATCH] alarm/kodi-rbp4-git to 19.0a1.56002.6b9c53e26f-1

---
 alarm/kodi-rbp4-git/PKGBUILD            | 30 ++++++++++++-------------
 alarm/kodi-rbp4-git/kodi-gbm.config.txt |  5 ++---
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/alarm/kodi-rbp4-git/PKGBUILD b/alarm/kodi-rbp4-git/PKGBUILD
index 48fec7e9e..4498b926b 100644
--- a/alarm/kodi-rbp4-git/PKGBUILD
+++ b/alarm/kodi-rbp4-git/PKGBUILD
@@ -17,16 +17,16 @@ pkgname=("kodi-$_suffix" "kodi-eventclients-$_suffix" "kodi-tools-texturepacker-
 # 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
+#_source=xbmc
+_source=popcornmix
 
 # vanilla kodi
-_commitnumber=55997
-_commit=79247902092c3a152723a7bcea233abd1f50ad10
+#_commitnumber=55997
+#_commit=79247902092c3a152723a7bcea233abd1f50ad10
 
 # popcornmix's gbm branch
-#_commitnumber=55973
-#_commit=7255ee24b014fa6c51d6d72c4b0783db7d12d3a4
+_commitnumber=56002
+_commit=6b9c53e26fc0c3686ac46e837396d66ca9107a77
 
 pkgver="19.0a1.$_commitnumber.${_commit:0:10}"
 pkgrel=1
@@ -96,11 +96,11 @@ noextract=(
   "flatbuffers-$_flatbuffers_version.tar.gz"
   "spdlog-$_spdlog_version.tar.gz"
 )
-sha256sums=('15862f26a7800930f24bba71ccf3aeb35af686e7521a2aee05dea3f3788b3f0c'
+sha256sums=('5ad50096d119efa936560fcb3f078ad7eb70c77fe9a6a4a54bac46e543ce9cb8'
             '84ee6e1f7872fb249799f1428d5ab79930912ab7e064122c5c008fbecd0b547a'
             '61a0648d4a5086f560ceb4e020f82472d00b99398f2cacba94fad3e96c4c362a'
             '5d38a895ee7b93689fab79124a3aad23a5e3e643abd08878d778d04066c8d26f'
-            '5f6cb12bc44aa7117118d7b4ef91a2cdea73a41c5aa0f8e1069152cd1316d4a5'
+            'c567165459afa633a6db1f674c8647fcafa1add2b8313b89adc0e718b957d150'
             '38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d'
             '071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a'
             'a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf'
@@ -131,20 +131,20 @@ 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"
 
-    #-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 \
+    -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" \
     -DENABLE_EVENTCLIENTS=ON \
     -DENABLE_INTERNAL_FFMPEG=ON \
     -DENABLE_INTERNAL_FMT=ON \
diff --git a/alarm/kodi-rbp4-git/kodi-gbm.config.txt b/alarm/kodi-rbp4-git/kodi-gbm.config.txt
index 05fe332ab..d204f21bd 100644
--- a/alarm/kodi-rbp4-git/kodi-gbm.config.txt
+++ b/alarm/kodi-rbp4-git/kodi-gbm.config.txt
@@ -1,5 +1,4 @@
-# https://github.com/LibreELEC/LibreELEC.tv/blob/master/projects/RPi/devices/RPi4/config/distroconfig.txt
-
-dtoverlay=vc4-kms-v3d-pi4,cma-size=402653184
+dtoverlay=vc4-fkms-v3d,cma-size=402653184
 dtoverlay=rpivid-v4l2
+dtparam=audio=on
 disable_overscan=1