diff --git a/alarm/kodi-rpi-git/PKGBUILD b/alarm/kodi-rpi-git/PKGBUILD
index 1d69e53d1..482b7829c 100644
--- a/alarm/kodi-rpi-git/PKGBUILD
+++ b/alarm/kodi-rpi-git/PKGBUILD
@@ -15,13 +15,13 @@ pkgname=(
   'kodi-rpi-git-eventclients' 'kodi-rpi-git-tools-texturepacker' 'kodi-rpi-git-dev'
 )
 
-_commitnumber=57039
-_commit=46685b10c76b523eac8f38119c4705b618213235
+_commitnumber=57255
+_commit=59eb628292f2596b51ea93f1846ba8eccd1eb24c
 
-pkgver="19.0rc1.$_commitnumber.${_commit:0:10}"
-pkgrel=2
+pkgver="19.x.$_commitnumber.${_commit:0:10}"
+pkgrel=1
 arch=('armv7h' 'aarch64')
-url="https://github.com/popcornmix/xbmc/tree/gbm"
+url="https://github.com/graysky2/xbmc/tree/gs-gbm_matrix"
 license=('GPL2')
 makedepends=(
   'afpfs-ng' 'bluez-libs' 'cmake' 'curl' 'dav1d' 'doxygen' 'git' 'glew'
@@ -48,7 +48,7 @@ _flatbuffers_version="1.11.0"
 _libudfread_version="1.1.0"
 _name="gbm_matrix-$pkgver-$_codename"
 source=(
-  "xbmc-$pkgver.tar.gz::https://github.com/popcornmix/xbmc/archive/$_commit.tar.gz"
+  "xbmc-$pkgver.tar.gz::https://github.com/graysky2/xbmc/archive/$_commit.tar.gz"
   "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"
@@ -77,7 +77,7 @@ noextract=(
   "flatbuffers-$_flatbuffers_version.tar.gz"
   "libudfread-$_libudfread_version.tar.gz"
 )
-sha256sums=('1df796866093cc8cb69ebc0d14190e5e74686fa6cb0b3a841d2410f3aadc7d4c'
+sha256sums=('3738cabe9e723761d13126acbb83af7ff996a8b706f62d42d8addbc59d04ac3a'
             '38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d'
             '071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a'
             'a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf'
@@ -147,7 +147,6 @@ build() {
     -DAPP_RENDER_SYSTEM=gles
     -DCMAKE_INSTALL_PREFIX=/usr
     -DCMAKE_INSTALL_LIBDIR=/usr/lib
-    -DVERBOSE=ON
     -DUSE_LTO=OFF
     -DENABLE_LDGOLD=OFF
     -DENABLE_EVENTCLIENTS=ON
@@ -176,7 +175,7 @@ build() {
 }
 
 package_kodi-rpi-git() {
-  pkgdesc="Media player and entertainment hub for Raspberry Pi 3/4/400, gbm fork"
+  pkgdesc="Media player and entertainment hub for Raspberry Pi 3/4/400, gbm_matrix fork"
   depends=(
     'bluez-libs' 'curl' 'dav1d' 'desktop-file-utils' 'hicolor-icon-theme'
     'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec-rpi' 'libmicrohttpd' 'libnfs'
@@ -234,7 +233,7 @@ package_kodi-rpi-git() {
 }
 
 package_kodi-rpi-git-eventclients() {
-  pkgdesc="Kodi Event Clients for Raspberry Pi 3/4/400, gbm fork"
+  pkgdesc="Kodi Event Clients for Raspberry Pi 3/4/400, gbm_matrix fork"
   provides=("kodi-eventclients=${pkgver}")
   conflicts=('kodi-eventclients' 'kodi-eventclients-rbp4-git' 'kodi-rpi-eventclients' 'kodi-rpi-legacy-eventclients')
   replaces=('kodi-eventclients-rbp4-git')
@@ -258,7 +257,7 @@ package_kodi-rpi-git-eventclients() {
 }
 
 package_kodi-rpi-git-tools-texturepacker() {
-  pkgdesc="Kodi Texturepacker Tool for Raspberry Pi 3/4/400, gbm fork"
+  pkgdesc="Kodi Texturepacker Tool for Raspberry Pi 3/4/400, gbm_matrix fork"
   depends=('libpng' 'giflib' 'libjpeg-turbo' 'lzo')
   conflicts=('kodi-tools-texturepacker' 'kodi-tools-texturepacker-rbp4-git' 'kodi-rpi-tools-texturepacker' 'kodi-rpi-legacy-tools-texturepacker')
   replaces=('kodi-tools-texturepacker-rbp4-git')
@@ -276,7 +275,7 @@ package_kodi-rpi-git-tools-texturepacker() {
 }
 
 package_kodi-rpi-git-dev() {
-  pkgdesc="Kodi dev files for Raspberry Pi 3/4/400, gbm fork"
+  pkgdesc="Kodi dev files for Raspberry Pi 3/4/400, gbm_matrix fork"
   depends=('kodi')
   conflicts=('kodi-dev-rbp4-git' 'kodi-rpi-dev' 'kodi-rpi-legacy-dev')
   replaces=('kodi-dev-rbp4-git')