rename alarm/kodi-rbp4-git --> alarm/kodi-rpi-git

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

@@ -1,7 +0,0 @@
-# the recommended vc4 driver is vc4-kms-v3d however support for 4k modes is
-# not yet mature and the vc4-fkms-v3d may be substituted but it is known to
-# cause tearing artifacts
-dtoverlay=vc4-kms-v3d,cma-384
-dtoverlay=rpivid-v4l2
-disable_overscan=1
-disable_fw_kms_setup=1

alarm/kodi-rbp4-git/kodi.install

@@ -1,15 +0,0 @@
-post_install() {
-  echo "--> Remove any tweaks made to /boot/config.txt now!"
-  echo "--> This includes lines such as gpu_mem=..."
-  echo "--> Add the following to /boot/config.txt or else kodi will not work."
-  echo "  [all]"
-  echo "  include kodi-gbm.config.txt"
-}
-
-post_remove() {
-  echo "==> Optionally remove /var/lib/kodi/"
-}
-
-post_upgrade() {
-  post_install
-}

alarm/kodi-rpi-git/PKGBUILD

@@ -10,9 +10,8 @@ buildarch=4
 
 _prefix=/usr
 
-pkgbase=kodi-rbp4-git
-_suffix=rbp4-git
-pkgname=("kodi-$_suffix" "kodi-eventclients-$_suffix" "kodi-tools-texturepacker-$_suffix" "kodi-dev-$_suffix")
+pkgbase=kodi-rpi-git
+pkgname=('kodi-rpi-git' 'kodi-rpi-git-eventclients' 'kodi-rpi-git-tools-texturepacker' 'kodi-rpi-git-dev')
 
 _commitnumber=56808
 _commit=0f75c910145f31dcb48219bc6174b0a15156ceaa
@@ -60,7 +59,7 @@ source=(
   kodi.service
   99-kodi.rules
   polkit.rules
-  kodi-gbm.config.txt
+  kodi.config.txt
   appliance.xml
   "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"
@@ -74,7 +73,7 @@ source=(
   sysusers.conf
   tmpfiles.conf
 )
-backup=(boot/kodi-gbm.config.txt)
+backup=(boot/kodi.config.txt)
 noextract=(
   "libdvdcss-$_libdvdcss_version.tar.gz"
   "libdvdnav-$_libdvdnav_version.tar.gz"
@@ -90,7 +89,7 @@ sha256sums=('561a6d316fffa6d6559f7172d96f19e7c9159e5a14f139b86014140b306e7adb'
             '91dd278d46eed0cb05ba733647c99379330f197daa87d33bf2b18032e5af5055'
             '61a0648d4a5086f560ceb4e020f82472d00b99398f2cacba94fad3e96c4c362a'
             '5d38a895ee7b93689fab79124a3aad23a5e3e643abd08878d778d04066c8d26f'
-            '7477c243de3fb628e89d5f95787b7497f5a3052c75294ec20d5cdabd092d7b35'
+            '2a36ee05a8e023d2ba4bbe36f66768e5a9f3982582e0266103f95e117c1d684a'
             '0154744086fd34bdf8c4210875783bd6dd8c57bc327257e49955caf1b7acc957'
             '38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d'
             '071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a'
@@ -151,7 +150,7 @@ build() {
   make preinstall
 }
 
-package_kodi-rbp4-git() {
+package_kodi-rpi-git() {
   pkgdesc="A software media player and entertainment hub for digital media (Raspberry Pi4/gbm only)"
   depends=(
     'desktop-file-utils' 'hicolor-icon-theme' 'mesa' 'python-pycryptodomex'
@@ -169,8 +168,8 @@ package_kodi-rbp4-git() {
   )
   install='kodi.install'
   provides=('xbmc' 'kodi')
-  conflicts=('xbmc' 'kodi' 'arm-mem-git' 'shairplay-git')
-  replaces=('xbmc-rbp-git')
+  conflicts=('xbmc' 'kodi' 'arm-mem-git' 'shairplay-git' 'kodi-rbp4-git' 'kodi-rpi')
+  replaces=('xbmc-rbp-git' 'kodi-rbp4-git')
   _components=('kodi' 'kodi-bin')
 
   export PATH="$srcdir/path:$PATH"
@@ -197,7 +196,7 @@ package_kodi-rbp4-git() {
   chmod 0750 "$pkgdir/usr/share/polkit-1/rules.d/"
 
   # setup video drivers for kodi-gbm on RPi4
-  install -Dm0644 "$srcdir/kodi-gbm.config.txt" "$pkgdir/boot/kodi-gbm.config.txt"
+  install -Dm0644 "$srcdir/kodi.config.txt" "$pkgdir/boot/kodi.config.txt"
 
   # enable hw accel decoding by default
   # https://github.com/xbmc/xbmc/pull/18534
@@ -205,10 +204,11 @@ package_kodi-rbp4-git() {
   install -Dm0644 "$srcdir"/appliance.xml "$pkgdir/usr/share/kodi/system/settings/appliance.xml"
 }
 
-package_kodi-eventclients-rbp4-git() {
+package_kodi-rpi-git-eventclients() {
   pkgdesc="Kodi Event Clients (master branch)"
   provides=('kodi-eventclients')
-  conflicts=('kodi-eventclients')
+  replaces=('kodi-eventclients-rbp4-git')
+  conflicts=('kodi-eventclients' 'kodi-eventclients-rbp4-git' 'kodi-rpi-eventclients')
   optdepends=('python: most eventclients are implemented in python')
 
   _components=(
@@ -227,9 +227,11 @@ package_kodi-eventclients-rbp4-git() {
   done
 }
 
-package_kodi-tools-texturepacker-rbp4-git() {
+package_kodi-rpi-git-tools-texturepacker() {
   pkgdesc="Kodi Texturepacker tool (master branch)"
   depends=('libpng' 'giflib' 'libjpeg-turbo' 'lzo')
+  replaces=('kodi-tools-texturepacker-rbp4-git')
+  conflicts=('kodi-eventclients' 'kodi-tools-texturepacker-rbp4-git' 'kodi-rpi-texturepacker')
   _components=('kodi-tools-texturepacker')
 
   export PATH="$srcdir/path:$PATH"
@@ -242,9 +244,11 @@ package_kodi-tools-texturepacker-rbp4-git() {
   done
 }
 
-package_kodi-dev-rbp4-git() {
+package_kodi-rpi-git-dev() {
   pkgdesc="Kodi dev files (master branch)"
   depends=('kodi')
+  replaces=('kodi-dev-rbp4-git')
+  conflicts=('kodi-dev-rbp4-git' 'kodi-rpi-dev')
   provides=('kodi-dev')
 
   _components=('kodi-addon-dev'

alarm/kodi-rpi-git/kodi.config.txt

@@ -0,0 +1,4 @@
+dtoverlay=vc4-kms-v3d,cma-384
+dtoverlay=rpivid-v4l2
+disable_overscan=1
+disable_fw_kms_setup=1

alarm/kodi-rpi-git/kodi.install

@@ -0,0 +1,11 @@
+post_install() {
+  echo "-> Remove any tweaks made to /boot/config.txt now!"
+  echo "-> This includes lines such as gpu_mem=..."
+  echo "-> Add the following to /boot/config.txt or else kodi will not work."
+  echo "   [all]"
+  echo "   include kodi.config.txt"
+}
+
+post_remove() {
+  echo "==> Optionally remove /var/lib/kodi/"
+}