Update to r61967.93376f096b9-1

2 files changed, 29 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9f0bfef9e347..3500f1cf513d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = kodi-nexus-git
-	pkgver = r61896.e9f58cbf138
+	pkgver = r61967.93376f096b9
 	pkgrel = 1
 	url = https://kodi.tv
 	arch = x86_64
@@ -79,6 +79,8 @@ pkgbase = kodi-nexus-git
 	source = https://mirrors.kodi.tv/build-deps/sources/flatbuffers-2.0.0.tar.gz
 	source = https://mirrors.kodi.tv/build-deps/sources/libudfread-1.1.2.tar.gz
 	source = cheat-sse-build.patch
+	source = https://github.com/xbmc/xbmc/pull/22658.patch
+	source = https://github.com/xbmc/xbmc/pull/22714.patch
 	b2sums = SKIP
 	b2sums = 2f503d3ab767094958f7ec10b4ad11ffd02665deee571c8f3c739bef5fc7e2ff84babc5a3fdee638dc095f896b72fe3ce65e6b688674cb5f7b7b77190992688c
 	b2sums = db4d05836d8fbb3637ae50bdbfc0e4b612ee6b3be24addfea94ce772c3bf28d58b63a3f252d6f9f016f72f8cbb841cc1820b091226b136f4c4664385a32da73c
@@ -89,6 +91,8 @@ pkgbase = kodi-nexus-git
 	b2sums = ccd827a43da39cf831727b439beed0cea216cdf50dbfe70954854bbe388b2c47ed4e78cc87e3fc0d5568034b13baa2ea96480914cc8129747bccbf8ea928847c
 	b2sums = 1801d84a0ca38410a78f23e7d44f37e6d53346753c853df2e7380d259ce1ae7f0c712825b95a5753ad0bc6360cfffe1888b9e7bc30da8b84549e0f1198248f61
 	b2sums = 6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0
+	b2sums = 931d330fba1504dd457f3da3c062e0f1c4187f43121231e3c6504bd636aacfb553e1de9873666d060b4569cc04c9e3eefadc34efc64813cb48e30f0ec0cc41e3
+	b2sums = bc092d345bd32f9425f92485da2f6bdecceffa37dce06cd8e750de467702e402c134a6b07a5132da70722bc215c0232e4d9c49484370ba2274542925e41d4733
 
 pkgname = kodi-nexus-git
 	pkgdesc = A software media player and entertainment hub for digital media (Nexus branch)
@@ -113,7 +117,7 @@ pkgname = kodi-nexus-git
 	depends = lirc
 	depends = mariadb-libs
 	depends = mesa
-	depends = pipewire
+	depends = libpipewire
 	depends = python-pillow
 	depends = python-pycryptodomex
 	depends = python-simplejson
@@ -133,8 +137,9 @@ pkgname = kodi-nexus-git
 	optdepends = bluez: Blutooth support
 	optdepends = python-pybluez: Bluetooth support
 	optdepends = pulseaudio: PulseAudio support
+	optdepends = pipewire: PipeWire support
 	optdepends = upower: Display battery level
-	provides = kodi=r61896.e9f58cbf138
+	provides = kodi=r61967.93376f096b9
 	provides = kodi-x11
 	provides = kodi-wayland
 	provides = kodi-gbm
@@ -147,7 +152,7 @@ pkgname = kodi-nexus-git-eventclients
 	pkgdesc = Kodi Event Clients (Nexus branch)
 	optdepends = kodi: local machine eventclient use
 	optdepends = python: most eventclients are implemented in python
-	provides = kodi-eventclients=r61896.e9f58cbf138
+	provides = kodi-eventclients=r61967.93376f096b9
 	conflicts = kodi-eventclients
 
 pkgname = kodi-nexus-git-tools-texturepacker
@@ -156,11 +161,11 @@ pkgname = kodi-nexus-git-tools-texturepacker
 	depends = giflib
 	depends = libjpeg-turbo
 	depends = lzo
-	provides = kodi-tools-texturepacker=r61896.e9f58cbf138
+	provides = kodi-tools-texturepacker=r61967.93376f096b9
 	conflicts = kodi-tools-texturepacker
 
 pkgname = kodi-nexus-git-dev
 	pkgdesc = Kodi dev files (Nexus branch)
 	depends = kodi-nexus-git
-	provides = kodi-nexus-dev=r61896.e9f58cbf138
+	provides = kodi-nexus-dev=r61967.93376f096b9
 	conflicts = kodi-nexus-dev
diff --git a/PKGBUILD b/PKGBUILD
index 56b0e76ca9df..678b62ea91ce 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,7 +22,7 @@ _clangbuild=
 
 pkgbase=kodi-nexus-git
 pkgname=("$pkgbase" "$pkgbase-eventclients" "$pkgbase-tools-texturepacker" "$pkgbase-dev")
-pkgver=r61896.e9f58cbf138
+pkgver=r61967.93376f096b9
 pkgrel=1
 arch=('x86_64')
 url="https://kodi.tv"
@@ -80,6 +80,8 @@ source=(
   "https://mirrors.kodi.tv/build-deps/sources/flatbuffers-$_flatbuffers_version.tar.gz"
   "https://mirrors.kodi.tv/build-deps/sources/libudfread-$_libudfread_version.tar.gz"
   cheat-sse-build.patch
+  "https://github.com/xbmc/xbmc/pull/22658.patch"  # FS#77390
+  "https://github.com/xbmc/xbmc/pull/22714.patch"  # FS#77565
 )
 noextract=(
   "libdvdcss-$_libdvdcss_version.tar.gz"
@@ -100,7 +102,9 @@ b2sums=('SKIP'
         'a8b68fcb8613f0d30e5ff7b862b37408472162585ca71cdff328e3299ff50476fd265467bbd77b352b22bb88c590969044f74d91c5468475504568fd269fa69e'
         'ccd827a43da39cf831727b439beed0cea216cdf50dbfe70954854bbe388b2c47ed4e78cc87e3fc0d5568034b13baa2ea96480914cc8129747bccbf8ea928847c'
         '1801d84a0ca38410a78f23e7d44f37e6d53346753c853df2e7380d259ce1ae7f0c712825b95a5753ad0bc6360cfffe1888b9e7bc30da8b84549e0f1198248f61'
-        '6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0')
+        '6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0'
+        '931d330fba1504dd457f3da3c062e0f1c4187f43121231e3c6504bd636aacfb553e1de9873666d060b4569cc04c9e3eefadc34efc64813cb48e30f0ec0cc41e3'
+        'bc092d345bd32f9425f92485da2f6bdecceffa37dce06cd8e750de467702e402c134a6b07a5132da70722bc215c0232e4d9c49484370ba2274542925e41d4733')
 
 pkgver() {
   cd "$_gitname"
@@ -119,6 +123,14 @@ prepare() {
     msg "Building with clang"
     export CC=clang CXX=clang++
   fi
+
+   # Fix a crash when browsing unicode glyphs
+  # https://bugs.archlinux.org/task/77390
+  patch -p1 -i "$srcdir/22658.patch"
+
+  # NFSv4 fix
+  # https://bugs.archlinux.org/task/77565
+  patch -p1 -i "$srcdir/22714.patch"
 }
 
 build() {
@@ -182,7 +194,7 @@ package_kodi-nexus-git() {
     'bluez-libs' 'curl' 'dav1d' 'desktop-file-utils' 'hicolor-icon-theme' 'fmt'
     'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec' 'libmicrohttpd' 'libnfs'
     'libplist' 'libpulse' 'libva' 'libvdpau' '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' 'libxrandr' 'libxkbcommon' 'waylandpp' 'libinput'
     'pcre'
@@ -194,6 +206,7 @@ package_kodi-nexus-git() {
     'bluez: Blutooth support'
     'python-pybluez: Bluetooth support'
     'pulseaudio: PulseAudio support'
+    'pipewire: PipeWire support'
     'upower: Display battery level'
   )
   provides=("kodi=${pkgver}" 'kodi-x11' 'kodi-wayland' 'kodi-gbm')
@@ -210,8 +223,9 @@ package_kodi-nexus-git() {
     -DCMAKE_INSTALL_COMPONENT="$_cmp" \
      -P cmake_install.cmake
   done
-  
+
   # avoid error <general>: GetDirectory - Error getting /usr/lib/kodi/addons
+  # https://bugs.archlinux.org/task/77366
   mkdir -p "$pkgdir"/usr/lib/kodi/addons
 }