alarm/kodi-rpi to 20.0-7

alarm/kodi-rpi/PKGBUILD

@@ -21,7 +21,7 @@ _commit=2464903eb19ac84f8883a78f4f8cb626bed225d7
 _clangbuild=
 
 pkgver=20.0
-pkgrel=6
+pkgrel=7
 arch=('aarch64' 'armv7h')
 url="https://github.com/graysky2/xbmc/tree/gs-gbm_nexus"
 license=('GPL2')
@@ -60,7 +60,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
-  "https://github.com/xbmc/xbmc/pull/22658.patch"
   "https://github.com/xbmc/xbmc/pull/22714.patch"
 )
 backup=(boot/kodi.config.txt etc/conf.d/kodi-standalone)
@@ -85,16 +84,13 @@ sha256sums=('82a64bc1eb2112679db74a49c1ed1a6e5ddcad1334b71320f48ad1089475b8d3'
             '2bf16726ac98d093156195bb049a663e07d3323e079c26912546f4e05c77bac5'
             'b94c70baa45e30346224ceecfab031dd183e09303b1f97d6522f9941da9b0067'
             '9ce6051a2157e6b677090f201d98870a33db6c90c91dc0d480a87fb7ab84e3e5'
-            'b970818a13508aacee149bfa7a791b442efd8522a6f6eba6d923c20f2927d1c5'
-            '6ff6dec4e7fca2357602a9fad4ca46f5e96430ec6dde9e3938fcd9963d715b4e')
+            '677745404a2b000674c74eefe1ce345331260906d3bc449c6fe79c8f4c014845')
 
 prepare() {
   [[ -d kodi-build ]] && rm -rf kodi-build
   mkdir "$srcdir/kodi-build"
   cd "xbmc-$_commit"
 
-  # FS#77390
-  patch -p1 -i ../22658.patch
   # fix nfsv4 lockout
   patch -p1 -i ../22714.patch
 }
@@ -184,7 +180,7 @@ package_kodi-rpi() {
     'bluez-libs' 'curl' 'dav1d' 'desktop-file-utils' 'hicolor-icon-theme' 'fmt'
     'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec-rpi' 'libmicrohttpd' 'libnfs'
     'libplist' 'libpulse' 'libxslt' 'lirc' 'mariadb-libs'
-    'mesa' 'pipewire' 'python-pillow' 'python-pycryptodomex'
+    'mesa' 'libpipewire' 'python-pillow' 'python-pycryptodomex'
     'python-simplejson' 'shairplay' 'smbclient' 'sndio' 'spdlog' 'sqlite'
     'taglib' 'tinyxml' 'libxkbcommon' 'polkit' 'linux>=5.4.35' 'lzo' 'libinput'
     'pcre'
@@ -197,6 +193,7 @@ package_kodi-rpi() {
     'linux-rpi: HW accelerated decoding'
     'python-pybluez: Bluetooth support'
     'pulseaudio: PulseAudio support'
+    'pipewire: PipeWire support'
   )
   install='kodi.install'
   provides=('xbmc' "kodi=${pkgver}" "kodi-common=${pkgver}")
@@ -242,6 +239,7 @@ package_kodi-rpi() {
   install -Dm0644 "$_initshit/doc/kodi.service.1" "$pkgdir/usr/share/man/man1/kodi.service.1"
 
   # avoid error <general>: GetDirectory - Error getting /usr/lib/kodi/addons
+  # https://bugs.archlinux.org/task/77366
   mkdir -p "$pkgdir"/usr/lib/kodi/addons
 }
 

alarm/kodi-rpi/kodi.install

@@ -24,16 +24,6 @@ post_install() {
 
 post_upgrade() {
   post_install
-
-  # https://bugs.archlinux.org/task/77341
-  if ! grep -q -r '^KODI_AE_SINK=ALSA' /etc/conf.d/kodi-standalone; then
-  cat <<END
-
->>> If audio is broken, add the following line to /etc/conf.d/kodi-standalone
-    then restart kodi.service:  KODI_AE_SINK=ALSA
-
-END
-  fi
 }
 
 post_remove() {