Update to r61877.50f1eec9a22-1

2 files changed, 43 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 848cab0c7faf..48c2de4bd7df 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = kodi-nexus-git
-	pkgver = r61834.ec5b71680e6
-	pkgrel = 2
+	pkgver = r61877.50f1eec9a22
+	pkgrel = 1
 	url = https://kodi.tv
 	arch = x86_64
 	license = GPL2
@@ -15,6 +15,7 @@ pkgbase = kodi-nexus-git
 	makedepends = gperf
 	makedepends = hicolor-icon-theme
 	makedepends = java-runtime
+	makedepends = fmt
 	makedepends = libaacs
 	makedepends = libass
 	makedepends = libbluray
@@ -36,17 +37,21 @@ pkgbase = kodi-nexus-git
 	makedepends = lzo
 	makedepends = mesa
 	makedepends = nasm
+	makedepends = pipewire
 	makedepends = python-pycryptodomex
 	makedepends = python-pillow
 	makedepends = python-pybluez
 	makedepends = python-simplejson
 	makedepends = shairplay
 	makedepends = smbclient
+	makedepends = sndio
+	makedepends = spdlog
 	makedepends = taglib
 	makedepends = tinyxml
 	makedepends = swig
 	makedepends = upower
 	makedepends = giflib
+	makedepends = rapidjson
 	makedepends = ghostscript
 	makedepends = meson
 	makedepends = gtest
@@ -59,8 +64,6 @@ pkgbase = kodi-nexus-git
 	noextract = libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz
 	noextract = libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz
 	noextract = ffmpeg-4.4.1-Nexus-Alpha1.tar.gz
-	noextract = fmt-9.1.0.tar.gz
-	noextract = spdlog-1.10.0.tar.gz
 	noextract = crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz
 	noextract = fstrcmp-0.7.D001.tar.gz
 	noextract = flatbuffers-2.0.0.tar.gz
@@ -71,8 +74,6 @@ pkgbase = kodi-nexus-git
 	source = libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz::https://github.com/xbmc/libdvdnav/archive/6.1.1-Next-Nexus-Alpha2-2.tar.gz
 	source = libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz::https://github.com/xbmc/libdvdread/archive/6.1.3-Next-Nexus-Alpha2-2.tar.gz
 	source = ffmpeg-4.4.1-Nexus-Alpha1.tar.gz::https://github.com/xbmc/FFmpeg/archive/4.4.1-Nexus-Alpha1.tar.gz
-	source = https://mirrors.kodi.tv/build-deps/sources/fmt-9.1.0.tar.gz
-	source = https://mirrors.kodi.tv/build-deps/sources/spdlog-1.10.0.tar.gz
 	source = https://mirrors.kodi.tv/build-deps/sources/crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz
 	source = https://mirrors.kodi.tv/build-deps/sources/fstrcmp-0.7.D001.tar.gz
 	source = https://mirrors.kodi.tv/build-deps/sources/flatbuffers-2.0.0.tar.gz
@@ -83,8 +84,6 @@ pkgbase = kodi-nexus-git
 	b2sums = db4d05836d8fbb3637ae50bdbfc0e4b612ee6b3be24addfea94ce772c3bf28d58b63a3f252d6f9f016f72f8cbb841cc1820b091226b136f4c4664385a32da73c
 	b2sums = c94feb5a03a12efa5b7767965118d2500a088299ea36f3b82e46d157e45893e6b04503cb50f179ca681bac914457607fab26acfa6e304752b355c407578572d1
 	b2sums = 51d310e7000aeba657d55341c5fdb540474e197b85062228ab4b314c8309ec11985aa7f105193333fc6106529e8e58c86eafe268190894be8532d0e0b9065fa6
-	b2sums = ff1daa43140615b63aeb1ecd0aa1c32d24decfd5006805080293ef3db04d544c0445a30e8da0d985a6f5a25ad48ce4f6ae61e52da5ea4a4d3b031c212da38b18
-	b2sums = e40afa9fd1dd791e1f703392f0f54fc798ed70537a9f1ee9c8598dd449f4cd4dd03bc4ce95e416cbbe224711a17e70708a106f0432384542d6316cf232cf8757
 	b2sums = 0f78a8ab5a420297f666b3b8156d499a9141ec25c049d4d2bb2ba594dc585abe211a149b83c605cce4f5530207231a065d5f3a87a0c969781de8c6381afa2527
 	b2sums = a8b68fcb8613f0d30e5ff7b862b37408472162585ca71cdff328e3299ff50476fd265467bbd77b352b22bb88c590969044f74d91c5468475504568fd269fa69e
 	b2sums = ccd827a43da39cf831727b439beed0cea216cdf50dbfe70954854bbe388b2c47ed4e78cc87e3fc0d5568034b13baa2ea96480914cc8129747bccbf8ea928847c
@@ -113,11 +112,14 @@ pkgname = kodi-nexus-git
 	depends = lirc
 	depends = mariadb-libs
 	depends = mesa
+	depends = pipewire
 	depends = python-pillow
 	depends = python-pycryptodomex
 	depends = python-simplejson
 	depends = shairplay
 	depends = smbclient
+	depends = sndio
+	depends = spdlog
 	depends = sqlite
 	depends = taglib
 	depends = tinyxml
@@ -131,7 +133,7 @@ pkgname = kodi-nexus-git
 	optdepends = python-pybluez: Bluetooth support
 	optdepends = pulseaudio: PulseAudio support
 	optdepends = upower: Display battery level
-	provides = kodi=r61834.ec5b71680e6
+	provides = kodi=r61877.50f1eec9a22
 	provides = kodi-x11
 	provides = kodi-wayland
 	provides = kodi-gbm
@@ -144,7 +146,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=r61834.ec5b71680e6
+	provides = kodi-eventclients=r61877.50f1eec9a22
 	conflicts = kodi-eventclients
 
 pkgname = kodi-nexus-git-tools-texturepacker
@@ -153,11 +155,11 @@ pkgname = kodi-nexus-git-tools-texturepacker
 	depends = giflib
 	depends = libjpeg-turbo
 	depends = lzo
-	provides = kodi-tools-texturepacker=r61834.ec5b71680e6
+	provides = kodi-tools-texturepacker=r61877.50f1eec9a22
 	conflicts = kodi-tools-texturepacker
 
 pkgname = kodi-nexus-git-dev
 	pkgdesc = Kodi dev files (Nexus branch)
 	depends = kodi-nexus-git
-	provides = kodi-nexus-dev=r61834.ec5b71680e6
+	provides = kodi-nexus-dev=r61877.50f1eec9a22
 	conflicts = kodi-nexus-dev
diff --git a/PKGBUILD b/PKGBUILD
index 59e9daa8606e..451585db3cb8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,20 +22,21 @@ _clangbuild=
 
 pkgbase=kodi-nexus-git
 pkgname=("$pkgbase" "$pkgbase-eventclients" "$pkgbase-tools-texturepacker" "$pkgbase-dev")
-pkgver=r61834.ec5b71680e6
-pkgrel=2
+pkgver=r61877.50f1eec9a22
+pkgrel=1
 arch=('x86_64')
 url="https://kodi.tv"
 license=('GPL2')
 makedepends=(
   'afpfs-ng' 'bluez-libs' 'cmake' 'curl' 'dav1d' 'doxygen' 'git' 'glew'
-  'gperf' 'hicolor-icon-theme' 'java-runtime' 'libaacs' 'libass'
+  'gperf' 'hicolor-icon-theme' 'java-runtime' 'fmt' 'libaacs' 'libass'
   'libbluray' 'libcdio' 'libcec' 'libgl' 'mariadb-libs' 'libmicrohttpd'
   'libmodplug' 'libmpeg2' 'libnfs' 'libplist' 'libpulse' 'libva'
   'libva-vdpau-driver' 'libxrandr' 'libxslt' 'lirc' 'lzo' 'mesa' 'nasm'
-  'python-pycryptodomex' 'python-pillow' 'python-pybluez'
-  'python-simplejson' 'shairplay' 'smbclient' 'taglib' 'tinyxml' 'swig'
-  'upower' 'giflib'             'ghostscript' 'meson' 'gtest' 'graphviz'
+  'pipewire' 'python-pycryptodomex' 'python-pillow' 'python-pybluez'
+  'python-simplejson' 'shairplay' 'smbclient' 'sndio' 'spdlog' 'taglib'
+  'tinyxml' 'swig' 'upower' 'giflib' 'rapidjson' 'ghostscript' 'meson' 'gtest'
+  'graphviz'
   # wayland
   'wayland-protocols' 'waylandpp' 'libxkbcommon'
   # gbm
@@ -64,8 +65,6 @@ _libdvdcss_version="1.4.3-Next-Nexus-Alpha2-2"
 _libdvdnav_version="6.1.1-Next-Nexus-Alpha2-2"
 _libdvdread_version="6.1.3-Next-Nexus-Alpha2-2"
 _ffmpeg_version="4.4.1-Nexus-Alpha1"
-_fmt_version="9.1.0"
-_spdlog_version="1.10.0"
 _crossguid_version="ca1bf4b810e2d188d04cb6286f957008ee1b7681"
 _fstrcmp_version="0.7.D001"
 _flatbuffers_version="2.0.0"
@@ -76,8 +75,6 @@ source=(
   "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"
   "ffmpeg-$_ffmpeg_version.tar.gz::https://github.com/xbmc/FFmpeg/archive/$_ffmpeg_version.tar.gz"
-  "https://mirrors.kodi.tv/build-deps/sources/fmt-$_fmt_version.tar.gz"
-  "https://mirrors.kodi.tv/build-deps/sources/spdlog-$_spdlog_version.tar.gz"
   "https://mirrors.kodi.tv/build-deps/sources/crossguid-$_crossguid_version.tar.gz"
   "https://mirrors.kodi.tv/build-deps/sources/fstrcmp-$_fstrcmp_version.tar.gz"
   "https://mirrors.kodi.tv/build-deps/sources/flatbuffers-$_flatbuffers_version.tar.gz"
@@ -89,8 +86,6 @@ noextract=(
   "libdvdnav-$_libdvdnav_version.tar.gz"
   "libdvdread-$_libdvdread_version.tar.gz"
   "ffmpeg-$_ffmpeg_version.tar.gz"
-  "fmt-$_fmt_version.tar.gz"
-  "spdlog-$_spdlog_version.tar.gz"
   "crossguid-$_crossguid_version.tar.gz"
   "fstrcmp-$_fstrcmp_version.tar.gz"
   "flatbuffers-$_flatbuffers_version.tar.gz"
@@ -101,8 +96,6 @@ b2sums=('SKIP'
         'db4d05836d8fbb3637ae50bdbfc0e4b612ee6b3be24addfea94ce772c3bf28d58b63a3f252d6f9f016f72f8cbb841cc1820b091226b136f4c4664385a32da73c'
         'c94feb5a03a12efa5b7767965118d2500a088299ea36f3b82e46d157e45893e6b04503cb50f179ca681bac914457607fab26acfa6e304752b355c407578572d1'
         '51d310e7000aeba657d55341c5fdb540474e197b85062228ab4b314c8309ec11985aa7f105193333fc6106529e8e58c86eafe268190894be8532d0e0b9065fa6'
-        'ff1daa43140615b63aeb1ecd0aa1c32d24decfd5006805080293ef3db04d544c0445a30e8da0d985a6f5a25ad48ce4f6ae61e52da5ea4a4d3b031c212da38b18'
-        'e40afa9fd1dd791e1f703392f0f54fc798ed70537a9f1ee9c8598dd449f4cd4dd03bc4ce95e416cbbe224711a17e70708a106f0432384542d6316cf232cf8757'
         '0f78a8ab5a420297f666b3b8156d499a9141ec25c049d4d2bb2ba594dc585abe211a149b83c605cce4f5530207231a065d5f3a87a0c969781de8c6381afa2527'
         'a8b68fcb8613f0d30e5ff7b862b37408472162585ca71cdff328e3299ff50476fd265467bbd77b352b22bb88c590969044f74d91c5468475504568fd269fa69e'
         'ccd827a43da39cf831727b439beed0cea216cdf50dbfe70954854bbe388b2c47ed4e78cc87e3fc0d5568034b13baa2ea96480914cc8129747bccbf8ea928847c'
@@ -135,26 +128,37 @@ build() {
     -DCMAKE_BUILD_TYPE=Release
     -DCMAKE_INSTALL_PREFIX=/usr
     -DCMAKE_INSTALL_LIBDIR=/usr/lib
-    -DUSE_LTO=$(nproc)
+    -DUSE_LTO=OFF
     -DVERBOSE=ON
     -DENABLE_LDGOLD=OFF
+    -DENABLE_AIRTUNES=ON
+    -DENABLE_AVAHI=ON
+    -DENABLE_BLURAY=ON
+    -DENABLE_CEC=ON
+    -DENABLE_DBUS=ON
+    -DENABLE_DVDCSS=ON
+    -DENABLE_EGL=ON
     -DENABLE_EVENTCLIENTS=ON
+    -DENABLE_MICROHTTPD=ON
+    -DENABLE_MYSQLCLIENT=ON
+    -DENABLE_NFS=ON
+    -DENABLE_OPTICAL=ON
+    -DENABLE_SMBCLIENT=ON
+    -DENABLE_UDEV=ON
+    -DENABLE_UPNP=ON
+    -DENABLE_VAAPI=ON
+    -DENABLE_VDPAU=ON
+    -DENABLE_XSLT=ON
+    -DENABLE_LIRCCLIENT=ON
     -DENABLE_INTERNAL_FFMPEG=ON
-    -DENABLE_INTERNAL_FMT=ON
-    -DENABLE_INTERNAL_SPDLOG=ON
     -DENABLE_INTERNAL_CROSSGUID=ON
     -DENABLE_INTERNAL_FSTRCMP=ON
     -DENABLE_INTERNAL_FLATBUFFERS=ON
     -DENABLE_INTERNAL_UDFREAD=ON
-    -DENABLE_MYSQLCLIENT=ON
-    -DENABLE_VAAPI=ON
-    -DENABLE_VDPAU=ON
     -Dlibdvdcss_URL="$srcdir/libdvdcss-$_libdvdcss_version.tar.gz"
     -Dlibdvdnav_URL="$srcdir/libdvdnav-$_libdvdnav_version.tar.gz"
     -Dlibdvdread_URL="$srcdir/libdvdread-$_libdvdread_version.tar.gz"
     -DFFMPEG_URL="$srcdir/ffmpeg-$_ffmpeg_version.tar.gz"
-    -DFMT_URL="$srcdir/fmt-$_fmt_version.tar.gz"
-    -DSPDLOG_URL="$srcdir/spdlog-$_spdlog_version.tar.gz"
     -DCROSSGUID_URL="$srcdir/crossguid-$_crossguid_version.tar.gz"
     -DFSTRCMP_URL="$srcdir/fstrcmp-$_fstrcmp_version.tar.gz"
     -DFLATBUFFERS_URL="$srcdir/flatbuffers-$_flatbuffers_version.tar.gz"
@@ -178,9 +182,9 @@ package_kodi-nexus-git() {
     'bluez-libs' 'curl' 'dav1d' 'desktop-file-utils' 'hicolor-icon-theme'
     'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec' 'libmicrohttpd' 'libnfs'
     'libplist' 'libpulse' 'libva' 'libvdpau' 'libxslt' 'lirc' 'mariadb-libs'
-    'mesa' 'python-pillow' 'python-pycryptodomex' 'python-simplejson'
-    'shairplay' 'smbclient' 'sqlite' 'taglib' 'tinyxml'
-    'libxrandr' 'libxkbcommon' 'waylandpp' 'libinput'
+    'mesa' 'pipewire' 'python-pillow' 'python-pycryptodomex'
+    'python-simplejson' 'shairplay' 'smbclient' 'sndio' 'spdlog' 'sqlite'
+    'taglib' 'tinyxml' 'libxrandr' 'libxkbcommon' 'waylandpp' 'libinput'
     'pcre'
   )
   [[ -n "$_clangbuild" ]] && depends+=('glu')