diff --git a/alarm/kodi-rpi-git/PKGBUILD b/alarm/kodi-rpi-git/PKGBUILD
index 37dec075a..65b8a8acb 100644
--- a/alarm/kodi-rpi-git/PKGBUILD
+++ b/alarm/kodi-rpi-git/PKGBUILD
@@ -13,15 +13,12 @@ pkgname=(
   'kodi-rpi-git-eventclients' 'kodi-rpi-git-tools-texturepacker' 'kodi-rpi-git-dev'
 )
 
-_commitnumber=64945
-_commit=ae8850704e323b53f68080ee955ce8cfb99691e9
-
 # set this to anything to build with clang
 # recommend manually setting -DUSE_LTO=OFF to -DUSE_LTO=$(nproc) in build()
 _clangbuild=
 
-pkgver="21.x.$_commitnumber.${_commit:0:10}"
-pkgrel=2
+pkgver=21.x.65018.8107ed0fc4
+pkgrel=1
 arch=('aarch64' 'armv7h')
 url="https://github.com/graysky2/xbmc/tree/gs-gbm_omega"
 license=('GPL2')
@@ -45,6 +42,8 @@ makedepends_aarch64=('java-environment<21')
 
 [[ -n "$_clangbuild" ]] && makedepends+=('clang' 'lld' 'llvm')
 
+_gitname="gs-gbm_omega"
+_majorver="21.x"
 _init_version=1.137
 _libdvdcss_version="1.4.3-Next-Nexus-Alpha2-2"
 _libdvdnav_version="6.1.1-Next-Nexus-Alpha2-2"
@@ -55,7 +54,7 @@ _fstrcmp_version="0.7.D001"
 _flatbuffers_version="23.3.3"
 _libudfread_version="1.1.2"
 source=(
-  "xbmc-$pkgver.tar.gz::https://github.com/graysky2/xbmc/archive/$_commit.tar.gz"
+  "xbmc-$_gitname"::git+https://github.com/graysky2/xbmc.git#branch=gs-gbm_omega
   "libdvdcss-$_libdvdcss_version.tar.gz::https://github.com/xbmc/libdvdcss/archive/$_libdvdcss_version.tar.gz"
   "libdvdnav-$_libdvdnav_version.tar.gz::https://github.com/xbmc/libdvdnav/archive/$_libdvdnav_version.tar.gz"
   "libdvdread-$_libdvdread_version.tar.gz::https://github.com/xbmc/libdvdread/archive/$_libdvdread_version.tar.gz"
@@ -66,7 +65,6 @@ source=(
   "https://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"
   kodi.config.txt
-  0001-Revert-Merge-pull-request-24394-from-CrystalP-add-it.patch
 )
 backup=(boot/kodi.config.txt etc/conf.d/kodi-standalone)
 noextract=(
@@ -79,7 +77,7 @@ noextract=(
   "flatbuffers-$_flatbuffers_version.tar.gz"
   "libudfread-$_libudfread_version.tar.gz"
 )
-sha256sums=('a9386c17ca22d6fd3a377dad5e64aa18528957597ef7ac01c4c7d80f7e21f521'
+sha256sums=('SKIP'
             'f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e'
             '584f62a3896794408d46368e2ecf2c6217ab9c676ce85921b2d68b8961f49dfc'
             '719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62'
@@ -89,22 +87,24 @@ sha256sums=('a9386c17ca22d6fd3a377dad5e64aa18528957597ef7ac01c4c7d80f7e21f521'
             '8aff985da30aaab37edf8e5b02fda33ed4cbdd962699a8e2af98fdef306f4e4d'
             '2bf16726ac98d093156195bb049a663e07d3323e079c26912546f4e05c77bac5'
             '8f8ab84a0cf3bd382edb118e475b336ca2fe1e1d4da3ad8e4637f8278ed9179c'
-            '9ba55fd29b3ef64de3869b092493a233eeb83a23d5ae378299ef9d335f271123'
-            'e2da23f24d66a109e627f55fee42b98f746809900b29d1a9983807f094707fed')
+            '9ba55fd29b3ef64de3869b092493a233eeb83a23d5ae378299ef9d335f271123')
+pkgver() {
+  cd "xbmc-$_gitname"
+
+  printf "$_majorver.%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
 
 prepare() {
   [[ -d kodi-build ]] && rm -rf kodi-build
   mkdir "$srcdir/kodi-build"
-  cd "xbmc-$_commit"
+
+  cd "xbmc-$_gitname"
 
   rm -rf system/certs # remove not needed cacert
-
-  # fix broken build/bad commit
-  patch -p1 -i ../0001-Revert-Merge-pull-request-24394-from-CrystalP-add-it.patch
 }
 
 build() {
-  cd "$srcdir/kodi-build"
+  cd kodi-build
 
   # -march= defined in /etc/makepkg.conf will override the value for -mcpu we
   # uses here so unset them and redefine below
@@ -176,11 +176,8 @@ build() {
     -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-$_gitname"
   make
 }