multimedia/kodi: Updated for version 20.1.

Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 62 insertions, 26 deletions

diff --git a/multimedia/kodi/kodi.SlackBuild b/multimedia/kodi/kodi.SlackBuild
index 0fdcff9779..61e4e03224 100644
--- a/multimedia/kodi/kodi.SlackBuild
+++ b/multimedia/kodi/kodi.SlackBuild
@@ -27,12 +27,23 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=kodi
 SRCNAM=xbmc
-CODNAM=Matrix
-VERSION=${VERSION:-19.5}
+CODNAM=Nexus
+VERSION=${VERSION:-20.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
+# Versions used below
+crossguidVER=${crossguiVER:-ca1bf4b810e2d188d04cb6286f957008ee1b7681}
+fmtVER=${fmtVER:-9.1.0}
+fstrcmpVER=${fstrcmpVER:-0.7.D001}
+libdvdcssVER=${libdvdcssVER:-1.4.3-Next-Nexus-Alpha2-2}
+libdvdnavVER=${libdvdnavVER:-6.1.1-Next-Nexus-Alpha2-2}
+libdvdreadVER=${libdvdreadVER:-6.1.3-Next-Nexus-Alpha2-2}
+rapidjsonVER=${rapidjsonVER:-1.1.0}
+spdlogVER=${spdlogVER:-1.10.0}
+udfreadVER=${udfreadVER:-1.1.2}
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -92,17 +103,33 @@ if pkg-config --exists libnfs ; then NFS=ON; else NFS=OFF; fi
 if pkg-config --exists lirc ; then LIRC=ON; else LIRC=OFF; fi
 if [ -f /usr/bin/shairplay ] ; then AIRPLAY=ON; else AIRPLAY=OFF; fi
 
+# Adding early support for wayland. Needs waylandpp submitted to SBo.
+PLATFORM="x11 gbm"
+if pkg-config --exists wayland-client++; then PLATFORM="$PLATFORM wayland"; fi
+
 mkdir -p $TMP/$PRGNAM-build
 cd $TMP/$PRGNAM-build
+
+# Reasons for internal programs
+# (so I can remember in the future why we're using them)
+
+# Internal crossguid & rapidjson is recommended by upstream
+# fstrcmp and udfread currently unavailable on SBo
+# Using external spdlog & fmt breaks inputstream.adaptive
+
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \
     -DAPP_RENDER_SYSTEM=gl \
-    -DCORE_PLATFORM_NAME="x11" \
+    -DCORE_PLATFORM_NAME="$PLATFORM" \
+    -DENABLE_INTERNAL_CROSSGUID=ON \
+    -DENABLE_INTERNAL_RapidJSON=ON \
     -DENABLE_INTERNAL_FSTRCMP=ON \
     -DENABLE_INTERNAL_UDFREAD=ON \
+    -DENABLE_INTERNAL_FMT=ON \
+    -DENABLE_INTERNAL_SPDLOG=ON \
     -DENABLE_AIRTUNES=$AIRPLAY \
     -DENABLE_AVAHI=$AVAHI \
     -DENABLE_CEC=$CEC \
@@ -111,12 +138,15 @@ cd $TMP/$PRGNAM-build
     -DENABLE_LIRCCLIENT=$LIRC \
     -DENABLE_MICROHTTPD=$WEBSERVER \
     -DENABLE_NFS=$NFS \
-    -Dlibdvdcss_URL=$CWD/libdvdcss-1.4.2-Leia-Beta-5.tar.gz \
-    -Dlibdvdnav_URL=$CWD/libdvdnav-6.0.0-Leia-Alpha-3.tar.gz \
-    -Dlibdvdread_URL=$CWD/libdvdread-6.0.0-Leia-Alpha-3.tar.gz \
-    -DCROSSGUID_URL=$CWD/crossguid-8f399e8bd4252be9952f3dfa8199924cc8487ca4.tar.gz \
-    -DFSTRCMP_URL=$CWD/fstrcmp-0.7.D001.tar.gz \
-    -DUDFREAD_URL=$CWD/libudfread-1.1.0.tar.gz \
+    -DCROSSGUID_URL=$CWD/crossguid-$crossguidVER.tar.gz \
+    -DFMT_URL=$CWD/fmt-$fmtVER.tar.gz \
+    -DFSTRCMP_URL=$CWD/fstrcmp-$fstrcmpVER.tar.gz \
+    -Dlibdvdcss_URL=$CWD/libdvdcss-$libdvdcssVER.tar.gz \
+    -Dlibdvdnav_URL=$CWD/libdvdnav-$libdvdnavVER.tar.gz \
+    -Dlibdvdread_URL=$CWD/libdvdread-$libdvdreadVER.tar.gz \
+    -DRAPIDJSON_URL=$CWD/rapidjson-$rapidjsonVER.tar.gz \
+    -DSPDLOG_URL=$CWD/spdlog-$spdlogVER.tar.gz \
+    -DUDFREAD_URL=$CWD/libudfread-$udfreadVER.tar.gz \
     -DCMAKE_BUILD_TYPE=Release ../$SRCNAM-$VERSION-$CODNAM
   make
   make install/strip DESTDIR=$PKG
@@ -127,7 +157,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 
 # Install manpages
 mkdir -p $PKG/usr/man/man1
-for i in {$PRGNAM{,.bin,-standalone},TexturePacker}.1; do
+for i in $PRGNAM{,.bin,-standalone,-TexturePacker}.1; do
   install -m 0644 $SRCNAM-$VERSION-$CODNAM/docs/manpages/$i $PKG/usr/man/man1/$i
 done
 
diff --git a/multimedia/kodi/kodi.info b/multimedia/kodi/kodi.info
index db3339db14..d9ffbe7e65 100644
--- a/multimedia/kodi/kodi.info
+++ b/multimedia/kodi/kodi.info
@@ -1,22 +1,28 @@
 PRGNAM="kodi"
-VERSION="19.5"
+VERSION="20.1"
 HOMEPAGE="https://kodi.tv/"
-DOWNLOAD="https://github.com/xbmc/xbmc/archive/19.5-Matrix/xbmc-19.5-Matrix.tar.gz \
-          https://github.com/xbmc/libdvdcss/archive/refs/tags/1.4.2-Leia-Beta-5/libdvdcss-1.4.2-Leia-Beta-5.tar.gz \
-          https://github.com/xbmc/libdvdnav/archive/refs/tags/6.0.0-Leia-Alpha-3/libdvdnav-6.0.0-Leia-Alpha-3.tar.gz \
-          https://github.com/xbmc/libdvdread/archive/refs/tags/6.0.0-Leia-Alpha-3/libdvdread-6.0.0-Leia-Alpha-3.tar.gz \
-          https://github.com/xbmc/crossguid/archive/8f399e8/crossguid-8f399e8bd4252be9952f3dfa8199924cc8487ca4.tar.gz \
-          https://fstrcmp.sourceforge.net/fstrcmp-0.7.D001.tar.gz \
-          https://code.videolan.org/videolan/libudfread/-/archive/1.1.0/libudfread-1.1.0.tar.gz"
-MD5SUM="44f78712d1752af1c9c3d43dd5a56a17 \
-        fb2824210a4eab2efeef36e7501e4979 \
-        2aec5f8c790449126118abc6bb3cb5cd \
-        f3244e7b002d37f91cc6a77461c4f619 \
-        696a6573286d6fdbfde18686aa9f6489 \
-        9c440bbdfcad9fd22e38f2388715b0cc \
-        cb71fa46a29183e01692e9fe738ec373"
+DOWNLOAD="https://github.com/xbmc/xbmc/archive/20.1-Nexus/xbmc-20.1-Nexus.tar.gz \
+          https://github.com/xbmc/crossguid/archive/ca1bf4b/crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz \
+          https://github.com/xbmc/libdvdcss/archive/refs/tags/1.4.3-Next-Nexus-Alpha2-2/libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz \
+          https://github.com/xbmc/libdvdnav/archive/refs/tags/6.1.1-Next-Nexus-Alpha2-2/libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz \
+          https://github.com/xbmc/libdvdread/archive/refs/tags/6.1.3-Next-Nexus-Alpha2-2/libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz \
+          https://github.com/fmtlib/fmt/archive/refs/tags/9.1.0/fmt-9.1.0.tar.gz \
+          https://github.com/gabime/spdlog/archive/refs/tags/v1.10.0/spdlog-1.10.0.tar.gz \
+          https://github.com/miloyip/rapidjson/archive/v1.1.0/rapidjson-1.1.0.tar.gz \
+          https://code.videolan.org/videolan/libudfread/-/archive/1.1.2/libudfread-1.1.2.tar.gz \
+          https://fstrcmp.sourceforge.net/fstrcmp-0.7.D001.tar.gz"
+MD5SUM="ed115f2fac4d425fdd4fd228065ef2c4 \
+        d4a8d62f3f8d6d946be75cf5bfa92687 \
+        42dc3770ae928103e8033a18b007e79d \
+        2349cde54d950af21fa4936371ad3349 \
+        0d24c950abfef9dc02e231dda56912ac \
+        21fac48cae8f3b4a5783ae06b443973a \
+        effea813cd81cfb5588806c5754e14f1 \
+        badd12c511e081fec6c89c43a7027bce \
+        e53c37085c3bf01d5c6623021563dcae \
+        9c440bbdfcad9fd22e38f2388715b0cc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="zulu-openjdk11 libass flatbuffers fmt rapidjson spdlog tinyxml gtest"
+REQUIRES="zulu-openjdk11 libass flatbuffers tinyxml gtest"
 MAINTAINER="Jeremy Hansen"
 EMAIL="jebrhansen+SBo@gmail.com"