From 0423ca8c23141846a4fe3166c4682023740c75cd Mon Sep 17 00:00:00 2001
From: graysky <graysky@archlinux.us>
Date: Fri, 9 Jul 2021 09:55:43 -0400
Subject: [PATCH] alarm/kodi-rpi-git to 19.x.57340.111952329d-1

Remove tweaks to kodi.config.txt as new kernel supplies proper fixes
---
 alarm/kodi-rpi-git/PKGBUILD        | 19 ++++++++-----------
 alarm/kodi-rpi-git/kodi.config.txt |  2 --
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/alarm/kodi-rpi-git/PKGBUILD b/alarm/kodi-rpi-git/PKGBUILD
index 19b755f30..66b5d8bed 100644
--- a/alarm/kodi-rpi-git/PKGBUILD
+++ b/alarm/kodi-rpi-git/PKGBUILD
@@ -15,8 +15,8 @@ pkgname=(
   'kodi-rpi-git-eventclients' 'kodi-rpi-git-tools-texturepacker' 'kodi-rpi-git-dev'
 )
 
-_commitnumber=57336
-_commit=a561c219c76b71cebeec07e5abc6d9b64e379489
+_commitnumber=57340
+_commit=111952329d811fa331e86b0fe93a226899ce1a71
 
 # set this to anything to build with clang
 # recommend manually setting -DUSE_LTO=OFF to -DUSE_LTO=$(nproc) in build()
@@ -69,8 +69,7 @@ source=(
   kodi.config.txt
   use-mcpu-avoiding-march-and-mtune.patch
   0001-mcpu-cortex-application-to-ffmpeg.patch
-  0002-PR19891.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/19891.patch
-  0003-PR19892.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/19892.patch
+  0002-PR19892.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/19892.patch
 )
 backup=(boot/kodi.config.txt etc/conf.d/kodi-standalone)
 noextract=(
@@ -85,7 +84,7 @@ noextract=(
   "flatbuffers-$_flatbuffers_version.tar.gz"
   "libudfread-$_libudfread_version.tar.gz"
 )
-sha256sums=('1e23983a66d14448338e6470f3de0da7d2f89b557e34e9e5fc553d33b1e0038e'
+sha256sums=('1c0e0671f7cdd7dc83984cca625f959411bb6b5599ffbd5508bb3bc864f5a96a'
             '38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d'
             '071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a'
             'a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf'
@@ -97,11 +96,10 @@ sha256sums=('1e23983a66d14448338e6470f3de0da7d2f89b557e34e9e5fc553d33b1e0038e'
             'b38e0bbef7faac2b82fed550a0c19b0d4e7f6737d5321d4fd8f216b80f8aee8a'
             '5ad9f95c53e8f29853c1fefa0a20a301be4045e2c7ae49d1164bc74d94155627'
             '41bc9a846de2468a1cb90485b7d02dc7a761a65a2e82c36e64876812573fa64e'
-            '33916114f9c73d113cf8835775220aeef6089329c76dee07750eba9bbd5b29aa'
+            '272a4bcfb302b63ba46b0f7cc55f448d83795c9b621c3c679b268b236e44b6e0'
             '16d6c79ff3a3d3653f21d77a36326a0335c8cec49a9c06dbc2de0ed143e50a9f'
             '76eafede11af936bb554932b2be71ce91d4bf1c07107d847500ebbf3ff7d7245'
-            '4f639508d1d9e7467aa37008ee2ceb71784b1dec4859bdb750a2066f5328cbde'
-            '6233ef319e08a3cb64fa3c989e7b13b794849aef261473d7ff14681996f94acc')
+            '49ba2cfe10ce24ffb8fd77d83457b3e8684286b38ee22ddeb29792a42b6deb23')
 
 prepare() {
   [[ -d kodi-build ]] && rm -rf kodi-build
@@ -116,9 +114,8 @@ prepare() {
   # patch kodi build system to apply the patch we just copied over
   patch -Np1 -i ../0001-mcpu-cortex-application-to-ffmpeg.patch
 
-  # fix for java >=9 and clang support
-  patch -Np1 -i ../0002-PR19891.patch
-  patch -Np1 -i ../0003-PR19892.patch
+  # fix add clang support
+  patch -Np1 -i ../0002-PR19892.patch
 }
 
 build() {
diff --git a/alarm/kodi-rpi-git/kodi.config.txt b/alarm/kodi-rpi-git/kodi.config.txt
index 4c751a019..f82e7e9d1 100644
--- a/alarm/kodi-rpi-git/kodi.config.txt
+++ b/alarm/kodi-rpi-git/kodi.config.txt
@@ -3,8 +3,6 @@ dtoverlay=rpivid-v4l2
 disable_overscan=1
 disable_fw_kms_setup=1
 hdmi_enable_4kp60=1
-max_framebuffer_width=1920
-max_framebuffer_width=1080
 
 ### uncomment to use the analog audio jack
 ### the 2nd option prevents crackling audio when HW accel decoding is active